diff options
| author | Michal Čihař <michal@cihar.com> | 2008-11-24 14:05:40 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2008-11-24 14:05:40 +0300 |
| commit | 56941e509cc8d9f41d4e6f75226b8aaab2731283 (patch) | |
| tree | 38cd67e5542e9064d8975cb65d82bf2b2a406441 | |
| parent | 688c9986de652999730e558bb53f5557057de878 (diff) | |
Adding @package, second part.
97 files changed, 283 insertions, 142 deletions
@@ -4,9 +4,12 @@ * phpMyAdmin fatal error display page * * @version $Id$ + * @package phpMyAdmin */ -/* Input sanitizing */ +/** + * Input sanitizing. + */ require_once './libraries/sanitizing.lib.php'; /* Get variables */ diff --git a/export.php b/export.php index 666cbd0687..a4681a6dea 100644 --- a/export.php +++ b/export.php @@ -3,6 +3,7 @@ /** * @todo too much die here, or? * @version $Id$ + * @package phpMyAdmin */ /** @@ -362,7 +363,7 @@ if (!$save_on_server) { } else { header('Pragma: no-cache'); // test case: exporting a database into a .gz file with Safari - // would produce files not having the current time + // would produce files not having the current time // (added this header for Safari but should not harm other browsers) header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); } diff --git a/import.php b/import.php index 5f9b79a5c5..a361b1ba78 100644 --- a/import.php +++ b/import.php @@ -5,6 +5,7 @@ * * @uses PMA_Bookmark_getList() * @version $Id$ + * @package phpMyAdmin */ /** @@ -26,6 +26,7 @@ * @uses time() * @uses PMA_getenv() * @uses header() to send charset + * @package phpMyAdmin */ /** diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 1b8b88814f..6b737cb40c 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -4,6 +4,7 @@ * Holds class PMA_Error * * @version $Id$ + * @package phpMyAdmin */ /** @@ -14,6 +15,7 @@ require_once './libraries/Message.class.php'; /** * a single error * + * @package phpMyAdmin */ class PMA_Error extends PMA_Message { diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index 4e4b2eab51..b260b2f603 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -4,6 +4,7 @@ * Holds class PMA_Error_Handler * * @version $Id$ + * @package phpMyAdmin */ /** @@ -14,6 +15,7 @@ require_once './libraries/Error.class.php'; /** * handling errors * + * @package phpMyAdmin */ class PMA_Error_Handler { diff --git a/libraries/File.class.php b/libraries/File.class.php index cac9856033..03e70c529e 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -12,8 +12,8 @@ * @todo replace error messages with localized string * @todo when uploading a file into a blob field, should we also consider using * chunks like in import? UPDATE `table` SET `field` = `field` + [chunk] + * @package phpMyAdmin */ - class PMA_File { /** diff --git a/libraries/Index.class.php b/libraries/Index.class.php index aaed558c7e..ee65ccd280 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -10,6 +10,7 @@ /** * @since phpMyAdmin 3.0.0 * + * @package phpMyAdmin */ class PMA_Index { @@ -582,6 +583,9 @@ class PMA_Index } } +/** + * @package phpMyAdmin + */ class PMA_Index_Column { /** diff --git a/libraries/List.class.php b/libraries/List.class.php index 07b4f847bc..029b6fc3d7 100644 --- a/libraries/List.class.php +++ b/libraries/List.class.php @@ -4,12 +4,14 @@ * hold the PMA_List base class * * @version $Id$ + * @package phpMyAdmin */ /** * @todo add caching * @since phpMyAdmin 2.9.10 * @abstract + * @package phpMyAdmin */ abstract class PMA_List extends ArrayObject { diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index ddb141dad1..df3a6b403c 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -4,6 +4,7 @@ * holds the PMA_List_Database class * * @version $Id$ + * @package phpMyAdmin */ /** @@ -23,6 +24,7 @@ require_once './libraries/List.class.php'; * @todo ? support --skip-showdatabases and user has only global rights * @access public * @since phpMyAdmin 2.9.10 + * @package phpMyAdmin */ /*public*/ class PMA_List_Database extends PMA_List { @@ -46,7 +48,7 @@ require_once './libraries/List.class.php'; * @access protected */ protected $_show_databases_disabled = false; - + /** * @var string command to retrieve databases from server */ @@ -111,11 +113,11 @@ require_once './libraries/List.class.php'; if ($this->_show_databases_disabled) { return array(); } - + if (null !== $like_db_name) { $command = "SHOW DATABASES LIKE '" . $like_db_name . "'"; } elseif (null === $this->_command) { - $command = str_replace('#user#', $GLOBALS['cfg']['Server']['user'], + $command = str_replace('#user#', $GLOBALS['cfg']['Server']['user'], $GLOBALS['cfg']['Server']['ShowDatabasesCommand']); $this->_command = $command; } else { @@ -165,7 +167,7 @@ require_once './libraries/List.class.php'; } $this->exchangeArray($items); } - + $this->_checkHideDatabase(); } @@ -197,7 +199,7 @@ require_once './libraries/List.class.php'; if (! is_array($GLOBALS['cfg']['Server']['only_db'])) { return false; } - + $items = array(); foreach ($GLOBALS['cfg']['Server']['only_db'] as $each_only_db) { @@ -224,7 +226,7 @@ require_once './libraries/List.class.php'; // @todo induce error, about not using wildcards with SHOW DATABASE disabled? } - + $this->exchangeArray($items); return true; @@ -313,7 +315,7 @@ require_once './libraries/List.class.php'; 'disp_name' => $disp_name, 'comment' => $db_tooltip, ); - + if ($GLOBALS['cfg']['Server']['CountTables']) { $dbgroups[$group][$db]['num_tables'] = PMA_getTableCount($db); } @@ -371,7 +373,7 @@ require_once './libraries/List.class.php'; } else { $return .= htmlspecialchars($db['disp_name']); } - + if (! empty($db['num_tables'])) { $return .= ' (' . $db['num_tables'] . ')'; } diff --git a/libraries/Message.class.php b/libraries/Message.class.php index 50245e0cf9..2c69206427 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -4,6 +4,7 @@ * Holds class PMA_Message * * @version $Id: Error.class.php 10738 2007-10-08 16:02:58Z cybot_tm $ + * @package phpMyAdmin */ /** @@ -47,6 +48,7 @@ * // strSomeLocaleMessage <sup>1</sup> strSomeMoreLocale<br /> * // strSomeEvenMoreLocale - some final words * </code> + * @package phpMyAdmin */ class PMA_Message { diff --git a/libraries/PMA.php b/libraries/PMA.php index b85f04c7a6..4b391c2cc9 100644 --- a/libraries/PMA.php +++ b/libraries/PMA.php @@ -1,15 +1,21 @@ <?php /** * Enter description here... + * @package phpMyAdmin * */ + +/** + * Database listing. + */ require_once './libraries/List_Database.class.php'; /** * phpMyAdmin main Controller - * - * * + * + * + * @package phpMyAdmin */ class PMA { @@ -19,21 +25,21 @@ class PMA * @var PMA_List_Database */ protected $databases = null; - + /** * DBMS user link * * @var resource */ protected $userlink = null; - + /** * DBMS control link * * @var resource */ protected $controllink = null; - + /** * magic access to protected/inaccessible members/properties * @@ -52,10 +58,10 @@ class PMA return $this->controllink; break; } - + return null; } - + /** * magic access to protected/inaccessible members/properties * @@ -72,7 +78,7 @@ class PMA break; } } - + /** * Accessor to PMA::$databases * @@ -87,7 +93,7 @@ class PMA if (null === $this->databases) { $this->databases = new PMA_List_Database($this->userlink, $this->controllink); } - + return $this->databases; } } diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php index bf6209093b..cd696338a6 100644 --- a/libraries/Partition.class.php +++ b/libraries/Partition.class.php @@ -4,16 +4,18 @@ * Library for extracting information about the partitions * * @version $Id$ + * @package phpMyAdmin */ /** * base Partition Class + * @package phpMyAdmin */ class PMA_Partition { /** - * returns array of partition names for a specific db/table + * returns array of partition names for a specific db/table * * @access public * @uses PMA_DBI_fetch_result() @@ -29,14 +31,14 @@ class PMA_Partition } /** - * checks if MySQL server supports partitioning + * checks if MySQL server supports partitioning * * @static * @staticvar boolean $have_partitioning * @staticvar boolean $already_checked * @access public * @uses PMA_DBI_fetch_result() - * @return boolean + * @return boolean */ static public function havePartitioning() { diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index 69d51e557e..5b621b9f13 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -4,6 +4,7 @@ * Library for extracting information about the available storage engines * * @version $Id$ + * @package phpMyAdmin */ /** @@ -21,6 +22,7 @@ define('PMA_ENGINE_DETAILS_TYPE_BOOLEAN', 3); // 'ON' or 'OFF' /** * base Storage Engine Class + * @package phpMyAdmin */ class PMA_StorageEngine { diff --git a/libraries/Table.class.php b/libraries/Table.class.php index acb806761b..6e21ced5fc 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -3,16 +3,18 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** * @todo make use of PMA_Message and PMA_Error + * @package phpMyAdmin */ class PMA_Table { static $cache = array(); - + /** * @var string table name */ @@ -248,10 +250,10 @@ class PMA_Table $comment = strtoupper(PMA_Table::sGetStatusInfo($db, $table, 'Comment')); return substr($comment, 0, 4) == 'VIEW'; } - + static public function sGetToolTip($db, $table) { - return PMA_Table::sGetStatusInfo($db, $table, 'Comment') + return PMA_Table::sGetStatusInfo($db, $table, 'Comment') . ' (' . PMA_Table::countRecords($db, $table, true) . ')'; } @@ -260,11 +262,11 @@ class PMA_Table if (! isset(PMA_Table::$cache[$db][$table]) || $force_read) { PMA_Table::$cache[$db][$table] = PMA_DBI_fetch_single_row('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . $table . '\''); } - + if (null === $info) { return PMA_Table::$cache[$db][$table]; } - + if (! isset(PMA_Table::$cache[$db][$table][$info]) || $force_read) { PMA_Table::$cache[$db][$table] = PMA_DBI_fetch_single_row('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . $table . '\''); } @@ -327,7 +329,7 @@ class PMA_Table $query .= ' NOT NULL'; } } - + switch ($default_type) { case 'USER_DEFINED' : if ($is_timestamp && $default_value === '0') { @@ -352,7 +354,7 @@ class PMA_Table if (!empty($extra)) { $query .= ' ' . $extra; // Force an auto_increment field to be part of the primary key - // even if user did not tick the PK box; + // even if user did not tick the PK box; if ($extra == 'AUTO_INCREMENT') { $primary_cnt = count($field_primary); if (1 == $primary_cnt) { @@ -401,25 +403,25 @@ class PMA_Table * * @access public */ - static public function countRecords($db, $table, $ret = false, + static public function countRecords($db, $table, $ret = false, $force_exact = false, $is_view = null) { if (isset(PMA_Table::$cache[$db][$table]['ExactRows'])) { $row_count = PMA_Table::$cache[$db][$table]['ExactRows']; } else { $row_count = false; - + if (null === $is_view) { $is_view = PMA_Table::isView($db, $table); } - + if (! $force_exact) { if (! isset(PMA_Table::$cache[$db][$table]['Rows']) && ! $is_view) { PMA_Table::$cache[$db][$table] = PMA_DBI_fetch_single_row('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddslashes($table, true) . '\''); } $row_count = PMA_Table::$cache[$db][$table]['Rows']; } - + // for a VIEW, $row_count is always false at this point if (false === $row_count || $row_count < $GLOBALS['cfg']['MaxExactCount']) { if (! $is_view) { @@ -431,7 +433,7 @@ class PMA_Table // count could bring down a server, so we offer an // alternative: setting MaxExactCountViews to 0 will bypass // completely the record counting for views - + if ($GLOBALS['cfg']['MaxExactCountViews'] == 0) { $row_count = 0; } else { diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php index 233172fe70..5e0683ac07 100644 --- a/libraries/dbg/setup.php +++ b/libraries/dbg/setup.php @@ -2,6 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @version $Id$ + * @package phpMyAdmin-DBG */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php index 3ebff87f2d..e454a44928 100644 --- a/libraries/display_change_password.lib.php +++ b/libraries/display_change_password.lib.php @@ -4,13 +4,16 @@ * Displays form for password change * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; } -// loic1: autocomplete feature of IE kills the "onchange" event handler and it -// must be replaced by the "onpropertychange" one in this case +/** + * loic1: autocomplete feature of IE kills the "onchange" event handler and it + * must be replaced by the "onpropertychange" one in this case + */ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5) ? 'onpropertychange' : 'onchange'; diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php index 7bf4e613b9..2a26873574 100644 --- a/libraries/display_create_database.lib.php +++ b/libraries/display_create_database.lib.php @@ -4,6 +4,7 @@ * Displays form for creating database (if user has privileges for that) * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php index d76a70cf87..cde2f21e2c 100644 --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -23,6 +23,7 @@ * on MySQL 5.0.18. * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 0d7956df8c..ad07a404bc 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 69d4194f29..00f5156893 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index a7a1f84be6..831f8c5cc2 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -4,6 +4,7 @@ * Code for displaying language selection * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 2a0cfdaea8..f1ffa40444 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -4,6 +4,7 @@ * library for displaying table with results from all sort of select queries * * @version $Id$ + * @package phpMyAdmin */ /** @@ -467,7 +468,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $unsorted_sql_query = $analyzed_sql[0]['unsorted_query']; } // Handles the case of multiple clicks on a column's header - // which would add many spaces before "ORDER BY" in the + // which would add many spaces before "ORDER BY" in the // generated query. $unsorted_sql_query = trim($unsorted_sql_query); @@ -507,15 +508,15 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $asc_sort = '`' . implode('` ASC, `', array_keys($index->getColumns())) . '` ASC'; $desc_sort = '`' . implode('` DESC, `', array_keys($index->getColumns())) . '` DESC'; $used_index = $used_index || $local_order == $asc_sort || $local_order == $desc_sort; - echo '<option value="' - . htmlspecialchars($unsorted_sql_query . ' ORDER BY ' . $asc_sort) - . '"' . ($local_order == $asc_sort ? ' selected="selected"' : '') - . '>' . htmlspecialchars($index->getName()) . ' (' + echo '<option value="' + . htmlspecialchars($unsorted_sql_query . ' ORDER BY ' . $asc_sort) + . '"' . ($local_order == $asc_sort ? ' selected="selected"' : '') + . '>' . htmlspecialchars($index->getName()) . ' (' . $GLOBALS['strAscending'] . ')</option>'; - echo '<option value="' - . htmlspecialchars($unsorted_sql_query . ' ORDER BY ' . $desc_sort) - . '"' . ($local_order == $desc_sort ? ' selected="selected"' : '') - . '>' . htmlspecialchars($index->getName()) . ' (' + echo '<option value="' + . htmlspecialchars($unsorted_sql_query . ' ORDER BY ' . $desc_sort) + . '"' . ($local_order == $desc_sort ? ' selected="selected"' : '') + . '>' . htmlspecialchars($index->getName()) . ' (' . $GLOBALS['strDescending'] . ')</option>'; } echo '<option value="' . htmlspecialchars($unsorted_sql_query) . '"' . ($used_index ? '' : ' selected="selected"') . '>' . $GLOBALS['strNone'] . '</option>'; @@ -588,7 +589,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ echo '</form>'; } - // Start of form for multi-rows edit/delete/export + // Start of form for multi-rows edit/delete/export if ($is_display['del_lnk'] == 'dr' || $is_display['del_lnk'] == 'kp') { echo '<form method="post" action="tbl_row_action.php" name="rowsDeleteForm" id="rowsDeleteForm">' . "\n"; @@ -749,9 +750,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ if (isset($fields_meta[$i]->orgname)) { $name_to_use_in_sort = $fields_meta[$i]->orgname; } - // $name_to_use_in_sort might contain a space due to + // $name_to_use_in_sort might contain a space due to // formatting of function expressions like "COUNT(name )" - // so we remove the space in this situation + // so we remove the space in this situation $name_to_use_in_sort = str_replace(' )', ')', $name_to_use_in_sort); if (empty($sort_expression)) { @@ -1327,9 +1328,9 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $row[$i] = PMA_printable_bit_value($row[$i], $meta->length); } elseif (stristr($field_flags, 'BINARY') && $meta->type == 'string') { if ($_SESSION['userconf']['display_binary'] || (isset($GLOBALS['is_analyse']) && $GLOBALS['is_analyse'])) { - // user asked to see the real contents of BINARY - // fields, or we detected a PROCEDURE ANALYSE in - // the query (results are reported as being + // user asked to see the real contents of BINARY + // fields, or we detected a PROCEDURE ANALYSE in + // the query (results are reported as being // binary strings) $row[$i] = PMA_replace_binary_contents($row[$i]); } else { @@ -1681,7 +1682,7 @@ function PMA_displayTable_checkConfigParams() // we know that the checkbox was unchecked unset($_SESSION['userconf']['query'][$sql_key]['hide_transformation']); } - + // move current query to the last position, to be removed last // so only least executed query will be removed if maximum remembered queries // limit is reached @@ -1815,8 +1816,8 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) $sort_expression = $sort_expression_nodirection = $sort_direction = ''; } - // 1.4 Prepares display of first and last value of the sorted column - + // 1.4 Prepares display of first and last value of the sorted column + if (! empty($sort_expression_nodirection)) { list($sort_table, $sort_column) = explode('.', $sort_expression_nodirection); $sort_table = PMA_unQuote($sort_table); @@ -1833,11 +1834,11 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) if ($sorted_column_index !== false) { // fetch first row of the result set $row = PMA_DBI_fetch_row($dt_result); - $column_for_first_row = $row[$sorted_column_index]; + $column_for_first_row = $row[$sorted_column_index]; // fetch last row of the result set PMA_DBI_data_seek($dt_result, $num_rows - 1); $row = PMA_DBI_fetch_row($dt_result); - $column_for_last_row = $row[$sorted_column_index]; + $column_for_last_row = $row[$sorted_column_index]; // reset to first row for the loop in PMA_displayTableBody() PMA_DBI_data_seek($dt_result, 0); // we could also use here $sort_expression_nodirection @@ -1846,7 +1847,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) } unset($sorted_column_index, $sort_table, $sort_column); } - + // 2. ----- Displays the top of the page ----- // 2.1 Displays a messages with position informations @@ -2109,7 +2110,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { // (the url_query has extra parameters that won't be used to export) // (the single_table parameter is used in display_export.lib.php // to hide the SQL and the structure export dialogs) - // If the parser found a PROCEDURE clause + // If the parser found a PROCEDURE clause // (most probably PROCEDURE ANALYSE()) it makes no sense to // display the Export link). if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && !isset($printview) && ! isset($analyzed_sql[0]['queryflags']['procedure'])) { @@ -2151,10 +2152,10 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { } /** - * Verifies what to do with non-printable contents (binary or BLOB) + * Verifies what to do with non-printable contents (binary or BLOB) * in Browse mode. * - * @uses is_null() + * @uses is_null() * @uses isset() * @uses strlen() * @uses PMA_formatByteDown() @@ -2162,10 +2163,10 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { * @uses str_replace() * @param string $category BLOB|BINARY * @param string $content the binary content - * @param string $transform_function + * @param string $transform_function * @param string $transform_options * @param string $default_function - * @param object $meta the meta-information about this field + * @param object $meta the meta-information about this field * @return mixed string or float */ function PMA_handle_non_printable_contents($category, $content, $transform_function, $transform_options, $default_function, $meta) { @@ -2190,7 +2191,7 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct $result = $default_function($result, array(), $meta); if (stristr($meta->type, 'BLOB') && $_SESSION['userconf']['display_blob']) { // in this case, restart from the original $content - $result = PMA_replace_binary_contents($content); + $result = PMA_replace_binary_contents($content); } } } @@ -2202,20 +2203,20 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct * taking into account foreign key description field and transformations * * @uses is_array() - * @uses PMA_backquote() - * @uses PMA_DBI_try_query() - * @uses PMA_DBI_num_rows() - * @uses PMA_DBI_fetch_row() - * @uses $GLOBALS['strLinkNotFound'] - * @uses PMA_DBI_free_result() - * @uses $GLOBALS['printview'] - * @uses htmlspecialchars() - * @uses PMA_generate_common_url() - * @param string $mouse_events + * @uses PMA_backquote() + * @uses PMA_DBI_try_query() + * @uses PMA_DBI_num_rows() + * @uses PMA_DBI_fetch_row() + * @uses $GLOBALS['strLinkNotFound'] + * @uses PMA_DBI_free_result() + * @uses $GLOBALS['printview'] + * @uses htmlspecialchars() + * @uses PMA_generate_common_url() + * @param string $mouse_events * @param string $class * @param string $condition_field * @param string $analyzed_sql - * @param object $meta the meta-information about this field + * @param object $meta the meta-information about this field * @param string $map * @param string $data * @param string $transform_function @@ -2240,17 +2241,17 @@ function PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed $meta->name = $true_column; } // end if } // end if - } // end foreach + } // end foreach } // end if if (isset($map[$meta->name])) { // Field to display from the foreign table? if (isset($map[$meta->name][2]) && strlen($map[$meta->name][2])) { $dispsql = 'SELECT ' . PMA_backquote($map[$meta->name][2]) - . ' FROM ' . PMA_backquote($map[$meta->name][3]) + . ' FROM ' . PMA_backquote($map[$meta->name][3]) . '.' . PMA_backquote($map[$meta->name][0]) . ' WHERE ' . PMA_backquote($map[$meta->name][1]) - . $where_comparison; + . $where_comparison; $dispresult = PMA_DBI_try_query($dispsql, null, PMA_DBI_QUERY_STORE); if ($dispresult && PMA_DBI_num_rows($dispresult) > 0) { list($dispval) = PMA_DBI_fetch_row($dispresult, 0); @@ -2285,15 +2286,15 @@ function PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed ); $result .= '<a href="sql.php' . PMA_generate_common_url($_url_params) . '"' . $title . '>'; - + if ($transform_function != $default_function) { - // always apply a transformation on the real data, + // always apply a transformation on the real data, // not on the display field $result .= $transform_function($data, $transform_options, $meta); } else { if ('D' == $_SESSION['userconf']['relational_display']) { - // user chose "relational display field" in the - // display options, so show display field in the cell + // user chose "relational display field" in the + // display options, so show display field in the cell $result .= $transform_function($dispval, array(), $meta); } else { // otherwise display data in the cell diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php index 9888b37e30..092ad55b20 100644 --- a/libraries/display_tbl_links.lib.php +++ b/libraries/display_tbl_links.lib.php @@ -8,6 +8,7 @@ * - also changes made in js/functions.js * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index d4367c5147..8512ad7670 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -36,8 +36,10 @@ if (isset($plugin_list)) { define('PMA_PDF_FONT', 'DejaVuSans'); require_once './libraries/tcpdf/tcpdf.php'; -// Adapted from a LGPL script by Philip Clarke - +/** + * Adapted from a LGPL script by Philip Clarke + * @package phpMyAdmin-Export-PDF + */ class PMA_PDF extends TCPDF { var $tablewidths; diff --git a/libraries/export/xml.php b/libraries/export/xml.php index bc99eb0063..e903afa019 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -4,6 +4,7 @@ * Set of functions used to build XML dumps of tables * * @version $Id$ + * @package phpMyAdmin-Export-XML */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/file_listing.php b/libraries/file_listing.php index 8f6c0a6cda..ff9e1a8c88 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -5,6 +5,7 @@ * * @todo rename to file_listing.lib.php * @version $Id$ + * @package phpMyAdmin */ /** @@ -23,7 +24,7 @@ function PMA_getDirContent($dir, $expression = '') } while ($file = @readdir($handle)) { // for PHP < 5.2.4, is_file() gives a warning when using open_basedir - // and verifying '..' or '.' + // and verifying '..' or '.' if ('.' != $file && '..' != $file && is_file($dir . $file) && ($expression == '' || preg_match($expression, $file))) { $result[] = $file; } diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index 09036b5770..ead3e41441 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -42,6 +42,7 @@ * @uses basename() * @uses file_exists() * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index 72a63e56b2..2b626da78e 100644 --- a/libraries/grab_globals.lib.php +++ b/libraries/grab_globals.lib.php @@ -2,11 +2,12 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * This library grabs the names and values of the variables sent or posted to a - * script in $_GET, $_POST and $_FILES superglobals and sets simple globals - * variables from them. It does the same work for $HTTP_ACCEPT_LANGUAGE and + * script in $_GET, $_POST and $_FILES superglobals and sets simple globals + * variables from them. It does the same work for $HTTP_ACCEPT_LANGUAGE and * $HTTP_AUTHORIZATION. * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 52dc941939..1f0dc81a8c 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php index a75c3488ec..9d2025f029 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 96183fce2e..66b6561a43 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index 04e03960fc..70996f761e 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index 8ed8b534af..1281937072 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -3,6 +3,7 @@ /** * * @version $Id: header.inc.php 10719 2007-10-04 15:03:44Z cybot_tm $ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php index 26566e7286..2a69f2a459 100644 --- a/libraries/iconv_wrapper.lib.php +++ b/libraries/iconv_wrapper.lib.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 7d9a102323..9984968fff 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -4,6 +4,7 @@ * Library that provides common import functions that are used by import plugins * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; @@ -82,7 +83,7 @@ function PMA_detectCompression($filepath) function PMA_importRunQuery($sql = '', $full = '', $controluser = false) { global $import_run_buffer, $go_sql, $complete_query, $display_query, - $sql_query, $my_die, $error, $reload, + $sql_query, $my_die, $error, $reload, $skip_queries, $executed_queries, $max_sql_len, $read_multiply, $cfg, $sql_query_disabled, $db, $run_query, $is_superuser; $read_multiply = 1; diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php index a982f78bc1..6a1ee0b758 100644 --- a/libraries/import/docsql.php +++ b/libraries/import/docsql.php @@ -10,6 +10,9 @@ if (! defined('PHPMYADMIN')) { exit; } +/** + * Load relations. + */ require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); diff --git a/libraries/information_schema_relations.lib.php b/libraries/information_schema_relations.lib.php index 8255360bf3..670cd310f5 100644 --- a/libraries/information_schema_relations.lib.php +++ b/libraries/information_schema_relations.lib.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 2f03b2601a..d67e7cd426 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -5,6 +5,7 @@ * feature * * @version $Id$ + * @package phpMyAdmin */ diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php index f9e58b2660..00a81c56fb 100644 --- a/libraries/kanji-encoding.lib.php +++ b/libraries/kanji-encoding.lib.php @@ -10,6 +10,7 @@ * 2002/2/22 - by Yukihiro Kawada <kawada@den.fujifilm.co.jp> * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 89bb4f6ac0..306e00816d 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 518b92a4f5..b0274d2233 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index fbe649ce9f..4e90938f13 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -4,6 +4,7 @@ * displays the pma logo, links and db and server selection in left frame * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php index 0c970f830d..df1c97101e 100644 --- a/libraries/ob.lib.php +++ b/libraries/ob.lib.php @@ -10,6 +10,7 @@ * Make some wrappers for the top and bottoms of our files. * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php index dfa27ffc88..b81d7594cd 100644 --- a/libraries/opendocument.lib.php +++ b/libraries/opendocument.lib.php @@ -4,13 +4,14 @@ * Simple interface for creating OASIS OpenDocument files. * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; } /** - * + * Load ZIP handler. */ require_once './libraries/zip.lib.php'; diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php index ad05fb0d38..59e59129e4 100644 --- a/libraries/parse_analyze.lib.php +++ b/libraries/parse_analyze.lib.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index 144dc6fbb1..61226823e5 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -4,6 +4,7 @@ * Generic plugin interface. * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 50a9b4137d..d8f73b49e4 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -4,6 +4,7 @@ * Set of functions used with the relation and pdf feature * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; @@ -44,7 +45,7 @@ function PMA_query_as_cu($sql, $show_error = true, $options = 0) /** * @uses $_SESSION['relation' . $GLOBALS['server']] for caching * @uses $GLOBALS['cfgRelation'] to set it - * @uses $GLOBALS['server'] to ensure we are using server-specific pmadb + * @uses $GLOBALS['server'] to ensure we are using server-specific pmadb * @uses PMA__getRelationsParam() * @uses PMA_printRelationsParamDiagnostic() * @param bool $verbose whether to print diagnostic info @@ -391,7 +392,7 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') if (count($one_key['index_list']) == 1) { foreach ($one_key['index_list'] as $i => $field) { // If a foreign key is defined in the 'internal' source (pmadb) - // and as a native foreign key, we won't get it twice + // and as a native foreign key, we won't get it twice // if $source='both' because we use $field as key // The parser looks for a CONSTRAINT clause just before @@ -1096,7 +1097,7 @@ function PMA_getRelatives($from) /** * Rename a field in relation tables - * + * * usually called after a field in a table was renamed in tbl_alter.php * * @uses PMA_getRelationsParam() @@ -1111,7 +1112,7 @@ function PMA_getRelatives($from) function PMA_REL_renameField($db, $table, $field, $new_name) { $cfgRelation = PMA_getRelationsParam(); - + if ($cfgRelation['displaywork']) { $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info']) . ' SET display_field = \'' . PMA_sqlAddslashes($new_name) . '\'' @@ -1140,7 +1141,7 @@ function PMA_REL_renameField($db, $table, $field, $new_name) /** * Create a PDF page - * + * * @uses $GLOBALS['strNoDescription'] * @uses PMA_backquote() * @uses $GLOBALS['cfgRelation']['db'] @@ -1152,7 +1153,7 @@ function PMA_REL_renameField($db, $table, $field, $new_name) * @param array $cfgRelation * @param string $db * @param string $query_default_option - * @return string $pdf_page_number + * @return string $pdf_page_number */ function PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option) { if (! isset($newpage) || $newpage == '') { diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php index 391fd6af7d..60bc6fd14f 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -4,6 +4,7 @@ * Set of functions used for cleaning up phpMyAdmin tables * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; @@ -28,7 +29,7 @@ require_once './libraries/relation.lib.php'; function PMA_relationsCleanupColumn($db, $table, $column) { $cfgRelation = PMA_getRelationsParam(); - + if ($cfgRelation['commwork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 858ce487a1..2b54bf197c 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -1,9 +1,10 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** + * This is in a separate script because it's called from a number of scripts * * @version $Id$ - * This is in a separate script because it's called from a number of scripts + * @package phpMyAdmin */ /** diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index 4db374c3d8..8023041999 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -4,6 +4,7 @@ * Code for displaying server selection written by nijel * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index 07005ffe2f..89e468bf61 100644 --- a/libraries/server_common.inc.php +++ b/libraries/server_common.inc.php @@ -8,6 +8,7 @@ * @uses PMA_DBI_QUERY_STORE * @uses $userlink * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 2aff2acc30..9b1d90b020 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/session.inc.php b/libraries/session.inc.php index 559b62f790..c8ab06bb78 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -10,6 +10,7 @@ * @uses session_name() * @uses session_start() * @uses ini_set() + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; @@ -20,7 +21,7 @@ if (! defined('PHPMYADMIN')) { if (!@function_exists('session_name')) { PMA_fatalError('strCantLoad', 'session'); } elseif (ini_get('session.auto_start') == true && session_name() != 'phpMyAdmin') { - // Do not delete the existing session, it might be used by other + // Do not delete the existing session, it might be used by other // applications; instead just close it. session_write_close(); } diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index e62fc10540..a142aaee9d 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -19,7 +19,8 @@ * It's easier to use only uppercase for proper sorting. In case of * doubt, use the DEBUG code after this function's definition. * - * @version$Id$ + * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; @@ -695,7 +696,7 @@ $PMA_SQPdata_reserved_word = array ( */ $PMA_SQPdata_reserved_word_cnt = 288; /** - * The previous array must be sorted so that the binary search work. + * The previous array must be sorted so that the binary search work. * Sometimes a word is not added in the correct order, so * this debugging code shows the problem. The same should be * done for all arrays. diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index ee3d6dac77..e9e4f1976b 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -28,6 +28,7 @@ * href="syntax.css.php" />' at the moment.) * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; @@ -1150,7 +1151,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { break; } // end switch - if ($subresult['querytype'] == 'SELECT' + if ($subresult['querytype'] == 'SELECT' && ! $in_group_concat && ! ($seen_subquery && $arr[$i - 1]['type'] == 'punct_bracket_close_round')) { if (!$seen_from) { @@ -1705,7 +1706,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $limit_clause .= $sep; } } - if ($after_limit && $seen_limit) { + if ($after_limit && $seen_limit) { $section_after_limit .= $arr[$i]['data'] . $sep; } diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php index 24e9c05d4d..c44728e188 100644 --- a/libraries/sqlvalidator.class.php +++ b/libraries/sqlvalidator.class.php @@ -1,32 +1,33 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** -* PHP interface to MimerSQL Validator -* -* Copyright 2002, 2003 Robin Johnson <robbat2@users.sourceforge.net> -* http://www.orbis-terrarum.net/?l=people.robbat2 -* -* All data is transported over HTTP-SOAP -* And uses the PEAR SOAP Module -* -* Install instructions for PEAR SOAP -* Make sure you have a really recent PHP with PEAR support -* run this: "pear install Mail_Mime Net_DIME SOAP" -* -* If you got this file from somewhere other than phpMyAdmin -* please be aware that the latest copy will always be in the -* phpMyAdmin subversion tree as -* $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/libraries/sqlvalidator.class.php $ -* -* This code that also used to depend on the PHP overload module, but that has been -* removed now. -* -* @access public -* -* @author Robin Johnson <robbat2@users.sourceforge.net> -* -* @version $Id$ -*/ + * PHP interface to MimerSQL Validator + * + * Copyright 2002, 2003 Robin Johnson <robbat2@users.sourceforge.net> + * http://www.orbis-terrarum.net/?l=people.robbat2 + * + * All data is transported over HTTP-SOAP + * And uses the PEAR SOAP Module + * + * Install instructions for PEAR SOAP + * Make sure you have a really recent PHP with PEAR support + * run this: "pear install Mail_Mime Net_DIME SOAP" + * + * If you got this file from somewhere other than phpMyAdmin + * please be aware that the latest copy will always be in the + * phpMyAdmin subversion tree as + * $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/libraries/sqlvalidator.class.php $ + * + * This code that also used to depend on the PHP overload module, but that has been + * removed now. + * + * @access public + * + * @author Robin Johnson <robbat2@users.sourceforge.net> + * + * @version $Id$ + * @package phpMyAdmin + */ if (! defined('PHPMYADMIN')) { exit; } diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php index 4c75f3d0ec..533dfdb445 100644 --- a/libraries/sqlvalidator.lib.php +++ b/libraries/sqlvalidator.lib.php @@ -28,6 +28,7 @@ * Also set a username and password if you have a private one * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/string.lib.php b/libraries/string.lib.php index 8ca51c9edc..3b38383bd0 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -19,6 +19,7 @@ * @uses mb_internal_encoding() * @uses defined() * @todo a .lib filename should not have code in main(), split or rename file + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/transformations/global.inc.php b/libraries/transformations/global.inc.php index 6648b7b31e..1e662ee6d5 100644 --- a/libraries/transformations/global.inc.php +++ b/libraries/transformations/global.inc.php @@ -20,6 +20,7 @@ * Please provide a comment for your function, what it does and what parameters are available. * * @version $Id$ + * @package phpMyAdmin-Transformation */ /** diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php index 2d377cc081..6ba8d48bf2 100644 --- a/libraries/zip.lib.php +++ b/libraries/zip.lib.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** @@ -23,6 +24,7 @@ * Official ZIP file format: http://www.pkware.com/appnote.txt * * @access public + * @package phpMyAdmin */ class zipfile { diff --git a/license.php b/license.php index 91927f41ae..0f03fcdbb3 100644 --- a/license.php +++ b/license.php @@ -7,6 +7,7 @@ * that would read any file using a GET parameter, it would open a hole * * @version $Id$ + * @package phpMyAdmin */ /** @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/pdf_pages.php b/pdf_pages.php index 7457aca59c..ed61de2b5f 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** @@ -74,7 +75,7 @@ if ($cfgRelation['pdfwork']) { } break; case 'createpage': - $pdf_page_number = PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option); + $pdf_page_number = PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option); // A u t o m a t i c l a y o u t // ================================ @@ -85,10 +86,10 @@ if ($cfgRelation['pdfwork']) { if (isset($auto_layout_foreign)) { // get the tables list $tables = PMA_DBI_get_tables_full($db); - // find the ones who support FOREIGN KEY; it's not + // find the ones who support FOREIGN KEY; it's not // important that we group together InnoDB tables // and PBXT tables, as this logic is just to put - // the tables on the layout, not to determine relations + // the tables on the layout, not to determine relations $foreignkey_tables = array(); foreach($tables as $table_name => $table_properties) { if (PMA_foreignkey_supported($table_properties['ENGINE'])) { diff --git a/pdf_schema.php b/pdf_schema.php index 56d82cbb93..d06185bf88 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -48,6 +48,7 @@ require_once './libraries/tcpdf/tcpdf.php'; * * @access public * @see FPDF + * @package phpMyAdmin */ class PMA_PDF extends TCPDF { /** @@ -496,6 +497,7 @@ class PMA_PDF extends TCPDF { * * @access private * @see PMA_RT + * @package phpMyAdmin */ class PMA_RT_Table { /** @@ -680,6 +682,7 @@ class PMA_RT_Table { * * @access private * @see PMA_RT + * @package phpMyAdmin */ class PMA_RT_Relation { /** @@ -806,6 +809,7 @@ class PMA_RT_Relation { * * @access public * @see PMA_PDF + * @package phpMyAdmin */ class PMA_RT { /** diff --git a/phpinfo.php b/phpinfo.php index e740315b1f..043db95639 100644 --- a/phpinfo.php +++ b/phpinfo.php @@ -1,8 +1,9 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * + * phpinfo() wrapper to allow displaying only when configured to do so. * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php index 32ae550682..ebf48bb365 100644 --- a/phpmyadmin.css.php +++ b/phpmyadmin.css.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/querywindow.php b/querywindow.php index f3946aa894..15bbd1a50d 100644 --- a/querywindow.php +++ b/querywindow.php @@ -39,6 +39,7 @@ * @uses preg_replace() * @uses htmlspecialchars() * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/readme.php b/readme.php index 34fecce0eb..c457cb3d30 100644 --- a/readme.php +++ b/readme.php @@ -7,6 +7,7 @@ * that would read any file using a GET parameter, it would open a hole * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/server_binlog.php b/server_binlog.php index 762f12938f..98ea12d249 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -36,6 +36,7 @@ * @uses implode() * @uses htmlspecialchars() * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/server_collations.php b/server_collations.php index 4d68b24210..aa228130b3 100644 --- a/server_collations.php +++ b/server_collations.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/server_databases.php b/server_databases.php index d076d3b7df..50f971eaf5 100644 --- a/server_databases.php +++ b/server_databases.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/server_engines.php b/server_engines.php index 51dfa8a63a..62cf545d41 100644 --- a/server_engines.php +++ b/server_engines.php @@ -5,6 +5,7 @@ * * @version $Id$ * @todo falcon storage enginge is not listed under dev.mysql.com/doc/refman but dev.mysql.com/doc/falcon/ + * @package phpMyAdmin */ /** diff --git a/server_export.php b/server_export.php index bc39f43c8d..271e6e32ce 100644 --- a/server_export.php +++ b/server_export.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/server_import.php b/server_import.php index 4622ab9822..d0ec6872f0 100644 --- a/server_import.php +++ b/server_import.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/server_privileges.php b/server_privileges.php index b3255ba775..5d937a065a 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/server_processlist.php b/server_processlist.php index d0195b0a4a..0adf7ea513 100644 --- a/server_processlist.php +++ b/server_processlist.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/server_sql.php b/server_sql.php index de6bd7f9b3..54141b101d 100644 --- a/server_sql.php +++ b/server_sql.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/server_status.php b/server_status.php index 3993833e75..3bbf2e033a 100644 --- a/server_status.php +++ b/server_status.php @@ -5,6 +5,7 @@ * + reset status variables * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/server_variables.php b/server_variables.php index 9750228054..4c25690e85 100644 --- a/server_variables.php +++ b/server_variables.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/setup/lib/FormDisplay.class.php b/setup/lib/FormDisplay.class.php index 09174f7226..6650b58d0b 100644 --- a/setup/lib/FormDisplay.class.php +++ b/setup/lib/FormDisplay.class.php @@ -23,6 +23,7 @@ require_once './libraries/js_escape.lib.php'; /** * Form management class, displays and processes forms + * @package phpMyAdmin-setup */ class FormDisplay { diff --git a/show_config_errors.php b/show_config_errors.php index 2b6508fd03..e9bb4e5b62 100644 --- a/show_config_errors.php +++ b/show_config_errors.php @@ -4,14 +4,15 @@ * Simple wrapper just to enable error reporting and include config * * @version $Id$ + * @package phpMyAdmin */ -/** - * - */ echo "Starting to parse config file...\n"; error_reporting(E_ALL); +/** + * Read config file. + */ require './config.inc.php'; ?> @@ -4,6 +4,7 @@ * @todo we must handle the case if sql.php is called directly with a query * what returns 0 rows - to prevent cyclic redirects or includes * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/test/Environment_test.php b/test/Environment_test.php index e3775f16a8..7bc16e75e5 100644 --- a/test/Environment_test.php +++ b/test/Environment_test.php @@ -12,6 +12,9 @@ */ require_once 'PHPUnit/Framework.php'; +/** + * @package phpMyAdmin-test + */ class Environment_test extends PHPUnit_Framework_TestCase { public function testPhpVersion() diff --git a/test/FailTest.php b/test/FailTest.php index e11ca4af88..0cecf6934d 100644 --- a/test/FailTest.php +++ b/test/FailTest.php @@ -12,6 +12,9 @@ */ require_once 'PHPUnit/Framework.php'; +/** + * @package phpMyAdmin-test + */ class FailTest extends PHPUnit_Framework_TestCase { public function testFail() diff --git a/test/PMA_STR_sub_test.php b/test/PMA_STR_sub_test.php index 0ed9de428d..e29426e937 100644 --- a/test/PMA_STR_sub_test.php +++ b/test/PMA_STR_sub_test.php @@ -32,6 +32,9 @@ $GLOBALS['charset'] = 'UTF-8'; require_once './libraries/string.lib.php'; +/** + * @package phpMyAdmin-test + */ class PMA_STR_sub_test extends PHPUnit_Framework_TestCase { public function testMultiByte() diff --git a/test/PMA_blowfish_test.php b/test/PMA_blowfish_test.php index 4bb9d0c0aa..307d966ab2 100644 --- a/test/PMA_blowfish_test.php +++ b/test/PMA_blowfish_test.php @@ -20,6 +20,7 @@ require_once './libraries/blowfish.php'; /** * Test java script escaping. * + * @package phpMyAdmin-test */ class PMA_blowfish_test extends PHPUnit_Framework_TestCase { @@ -27,7 +28,7 @@ class PMA_blowfish_test extends PHPUnit_Framework_TestCase { $secret = '$%ÄüfuDFRR'; $string = '12345678'; - $this->assertEquals($string, + $this->assertEquals($string, PMA_blowfish_decrypt(PMA_blowfish_encrypt($string, $secret), $secret)); } @@ -35,7 +36,7 @@ class PMA_blowfish_test extends PHPUnit_Framework_TestCase { $secret = '$%ÄüfuDFRR'; $string = 'abcDEF012!"§$%&/()=?`´"\',.;:-_#+*~öäüÖÄÜ^°²³'; - $this->assertEquals($string, + $this->assertEquals($string, PMA_blowfish_decrypt(PMA_blowfish_encrypt($string, $secret), $secret)); } diff --git a/test/PMA_escapeJsString_test.php b/test/PMA_escapeJsString_test.php index b4d70ed9f1..350ce371c9 100644 --- a/test/PMA_escapeJsString_test.php +++ b/test/PMA_escapeJsString_test.php @@ -21,6 +21,7 @@ require_once './libraries/js_escape.lib.php'; /** * Test java script escaping. * + * @package phpMyAdmin-test */ class PMA_escapeJsString_test extends PHPUnit_Framework_TestCase { diff --git a/test/PMA_escapeMySqlWildcards_test.php b/test/PMA_escapeMySqlWildcards_test.php index 289067c4b5..229e0161c4 100644 --- a/test/PMA_escapeMySqlWildcards_test.php +++ b/test/PMA_escapeMySqlWildcards_test.php @@ -21,12 +21,13 @@ require_once './libraries/common.lib.php'; /** * Test MySQL escaping. * + * @package phpMyAdmin-test */ class PMA_escapeMySqlWildcards_test extends PHPUnit_Framework_TestCase { - /** - * PMA_escape_mysql_wildcards tests + /** + * PMA_escape_mysql_wildcards tests */ public function testEscape_1() @@ -54,8 +55,8 @@ class PMA_escapeMySqlWildcards_test extends PHPUnit_Framework_TestCase $this->assertEquals('\\\_\\\%', PMA_escape_mysql_wildcards('\_\%')); } - /** - * PMA_unescape_mysql_wildcards tests + /** + * PMA_unescape_mysql_wildcards tests */ public function testUnEscape_1() @@ -77,7 +78,7 @@ class PMA_escapeMySqlWildcards_test extends PHPUnit_Framework_TestCase { $this->assertEquals('%_', PMA_unescape_mysql_wildcards('%\_')); } - + public function testUnEscape_5() { $this->assertEquals('\%\_', PMA_unescape_mysql_wildcards('\\\%\\\_')); diff --git a/test/PMA_generateCommonUrl_test.php b/test/PMA_generateCommonUrl_test.php index 3c6115557b..2d69574960 100644 --- a/test/PMA_generateCommonUrl_test.php +++ b/test/PMA_generateCommonUrl_test.php @@ -14,6 +14,9 @@ require_once 'PHPUnit/Framework.php'; require_once './libraries/core.lib.php'; require_once './libraries/url_generating.lib.php'; +/** + * @package phpMyAdmin-test + */ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase { public function setUp() diff --git a/test/PMA_get_real_size_test.php b/test/PMA_get_real_size_test.php index 71ca5248ed..baad230eb7 100644 --- a/test/PMA_get_real_size_test.php +++ b/test/PMA_get_real_size_test.php @@ -13,6 +13,9 @@ require_once 'PHPUnit/Framework.php'; require_once './libraries/core.lib.php'; +/** + * @package phpMyAdmin-test + */ class PMA_get_real_size_test extends PHPUnit_Framework_TestCase { public function testNull() diff --git a/test/PMA_isValid_test.php b/test/PMA_isValid_test.php index e33deaed3a..fd561ff5dc 100644 --- a/test/PMA_isValid_test.php +++ b/test/PMA_isValid_test.php @@ -13,6 +13,9 @@ require_once 'PHPUnit/Framework.php'; require_once './libraries/core.lib.php'; +/** + * @package phpMyAdmin-test + */ class PMA_isValid_test extends PHPUnit_Framework_TestCase { public function testVarNotSetAfterTest() diff --git a/test/PMA_pow_test.php b/test/PMA_pow_test.php index 15c0182e54..e9b9441b56 100644 --- a/test/PMA_pow_test.php +++ b/test/PMA_pow_test.php @@ -13,6 +13,9 @@ require_once 'PHPUnit/Framework.php'; require_once './libraries/common.lib.php'; +/** + * @package phpMyAdmin-test + */ class PMA_pow_test extends PHPUnit_Framework_TestCase { public function testIntOverflow() diff --git a/test/PMA_sanitize_test.php b/test/PMA_sanitize_test.php index 25168c8f4f..396daa6046 100644 --- a/test/PMA_sanitize_test.php +++ b/test/PMA_sanitize_test.php @@ -13,6 +13,9 @@ require_once 'PHPUnit/Framework.php'; require_once './libraries/sanitizing.lib.php'; +/** + * @package phpMyAdmin-test + */ class PMA_sanitize_test extends PHPUnit_Framework_TestCase { public function testXssInHref() diff --git a/test/PMA_transformation_getOptions_test.php b/test/PMA_transformation_getOptions_test.php index dba3f6b097..b47812df57 100644 --- a/test/PMA_transformation_getOptions_test.php +++ b/test/PMA_transformation_getOptions_test.php @@ -13,6 +13,9 @@ require_once 'PHPUnit/Framework.php'; require_once './libraries/transformations.lib.php'; +/** + * @package phpMyAdmin-test + */ class PMA_transformation_getOptions_test extends PHPUnit_Framework_TestCase { public function testDefault() diff --git a/view_create.php b/view_create.php index 5eb63b927c..b3b06a0f79 100644 --- a/view_create.php +++ b/view_create.php @@ -6,6 +6,7 @@ * @todo js error when view name is empty (strFormEmpty) * @todo (also validate if js is disabled, after form submission?) * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/webapp.php b/webapp.php index 9c21162fb2..db65ad87f3 100644 --- a/webapp.php +++ b/webapp.php @@ -3,6 +3,7 @@ * generate an WebApp file for Prism / WebRunner * * @see http://wiki.mozilla.org/Prism + * @package phpMyAdmin */ /** |