diff options
-rw-r--r-- | libraries/Theme.class.php | 2 | ||||
-rw-r--r-- | libraries/Theme_Manager.class.php | 2 | ||||
-rw-r--r-- | libraries/tbl_info.inc.php | 1 | ||||
-rw-r--r-- | libraries/tbl_links.inc.php | 1 | ||||
-rw-r--r-- | libraries/tbl_triggers.lib.php | 1 | ||||
-rw-r--r-- | libraries/transformations.lib.php | 1 | ||||
-rw-r--r-- | libraries/url_generating.lib.php | 7 | ||||
-rw-r--r-- | tbl_addfield.php | 33 | ||||
-rw-r--r-- | tbl_alter.php | 1 | ||||
-rw-r--r-- | tbl_change.php | 9 | ||||
-rw-r--r-- | tbl_create.php | 23 | ||||
-rw-r--r-- | tbl_export.php | 1 | ||||
-rw-r--r-- | tbl_import.php | 1 | ||||
-rw-r--r-- | tbl_indexes.php | 21 | ||||
-rw-r--r-- | tbl_move_copy.php | 5 | ||||
-rw-r--r-- | tbl_operations.php | 7 | ||||
-rw-r--r-- | tbl_printview.php | 1 | ||||
-rw-r--r-- | tbl_relation.php | 3 | ||||
-rw-r--r-- | tbl_replace.php | 1 | ||||
-rw-r--r-- | tbl_row_action.php | 1 | ||||
-rw-r--r-- | tbl_select.php | 1 | ||||
-rw-r--r-- | tbl_sql.php | 1 | ||||
-rw-r--r-- | tbl_structure.php | 13 | ||||
-rw-r--r-- | themes.php | 1 | ||||
-rw-r--r-- | transformation_overview.php | 1 | ||||
-rw-r--r-- | transformation_wrapper.php | 1 | ||||
-rw-r--r-- | user_password.php | 1 |
27 files changed, 85 insertions, 56 deletions
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 7f8f222103..30cfff224d 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -4,6 +4,7 @@ * hold PMA_Theme class * * @version $Id$ + * @package phpMyAdmin */ /** @@ -14,6 +15,7 @@ * @todo make css optionally replacing 'parent' css or extending it (by appending at the end) * @todo add an optional global css file - which will be used for both frames * + * @package phpMyAdmin */ class PMA_Theme { /** diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 194cab24f8..418f40b5af 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** @@ -12,6 +13,7 @@ require_once './libraries/Theme.class.php'; /** * + * @package phpMyAdmin */ class PMA_Theme_Manager { diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index 11f91c1f96..d4c10935e8 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -7,6 +7,7 @@ * @todo this should be recoded as functions, to avoid messing with global variables * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 362ba08ff7..2212ae1d31 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/tbl_triggers.lib.php b/libraries/tbl_triggers.lib.php index 14f290653a..3055688cd9 100644 --- a/libraries/tbl_triggers.lib.php +++ b/libraries/tbl_triggers.lib.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index edd9652d07..b966395ef1 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -4,6 +4,7 @@ * Set of functions used with the relation and pdf feature * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index 78c03dc490..659c63e2a3 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -4,6 +4,7 @@ * URL/hidden inputs generating. * * @version $Id$ + * @package phpMyAdmin */ /** @@ -124,7 +125,7 @@ function PMA_getHiddenFields($values, $pre = '') if (is_array($value)) { $fields .= PMA_getHiddenFields($value, $name); } else { - // do not generate an ending "\n" because + // do not generate an ending "\n" because // PMA_generate_common_hidden_inputs() is sometimes called // from a JS document.write() $fields .= '<input type="hidden" name="' . htmlspecialchars($name) @@ -188,11 +189,11 @@ function PMA_getHiddenFields($values, $pre = '') * on the resulting URL (for a normal URL displayed in HTML) * or something else to avoid using htmlspecialchars() (for * a URL sent via a header); if not set,'html' is assumed - * - if first param is not array: optional table name + * - if first param is not array: optional table name * * @param string - if first param is array: optional character to * use instead of '?' - * - if first param is not array: optional character to use + * - if first param is not array: optional character to use * instead of '&' for dividing URL parameters * @return string string with URL parameters * @access public diff --git a/tbl_addfield.php b/tbl_addfield.php index 8d0e998ee8..e0a8122e32 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** @@ -67,7 +68,7 @@ if (isset($_REQUEST['do_save_data'])) { } } // end if } // end for - + // Builds the field creation statement and alters the table for ($i = 0; $i < $field_cnt; ++$i) { // '0' is also empty for php :-( @@ -76,23 +77,23 @@ if (isset($_REQUEST['do_save_data'])) { } $definition = ' ADD ' . PMA_Table::generateFieldSpec( - $_REQUEST['field_name'][$i], + $_REQUEST['field_name'][$i], $_REQUEST['field_type'][$i], - $_REQUEST['field_length'][$i], + $_REQUEST['field_length'][$i], $_REQUEST['field_attribute'][$i], - isset($_REQUEST['field_collation'][$i]) - ? $_REQUEST['field_collation'][$i] + isset($_REQUEST['field_collation'][$i]) + ? $_REQUEST['field_collation'][$i] : '', - isset($_REQUEST['field_null'][$i]) - ? $_REQUEST['field_null'][$i] + isset($_REQUEST['field_null'][$i]) + ? $_REQUEST['field_null'][$i] : 'NOT NULL', - $_REQUEST['field_default_type'][$i], + $_REQUEST['field_default_type'][$i], $_REQUEST['field_default_value'][$i], isset($_REQUEST['field_extra'][$i]) ? $_REQUEST['field_extra'][$i] : false, - isset($_REQUEST['field_comments'][$i]) - ? $_REQUEST['field_comments'][$i] + isset($_REQUEST['field_comments'][$i]) + ? $_REQUEST['field_comments'][$i] : '', $field_primary, $i @@ -121,7 +122,7 @@ if (isset($_REQUEST['do_save_data'])) { } $definitions[] = ' ADD PRIMARY KEY (' . implode(', ', $fields) . ') '; } - + // Builds the indexes statements and updates the table if (count($field_index)) { $fields = array(); @@ -130,7 +131,7 @@ if (isset($_REQUEST['do_save_data'])) { } $definitions[] = ' ADD INDEX (' . implode(', ', $fields) . ') '; } - + // Builds the uniques statements and updates the table if (count($field_unique)) { $fields = array(); @@ -167,10 +168,10 @@ if (isset($_REQUEST['do_save_data'])) { foreach ($_REQUEST['field_mimetype'] as $fieldindex => $mimetype) { if (isset($_REQUEST['field_name'][$fieldindex]) && strlen($_REQUEST['field_name'][$fieldindex])) { - PMA_setMIME($db, $table, - $_REQUEST['field_name'][$fieldindex], - $mimetype, - $_REQUEST['field_transformation'][$fieldindex], + PMA_setMIME($db, $table, + $_REQUEST['field_name'][$fieldindex], + $mimetype, + $_REQUEST['field_transformation'][$fieldindex], $_REQUEST['field_transformation_options'][$fieldindex]); } } diff --git a/tbl_alter.php b/tbl_alter.php index 6947e32dfb..53a1628c2a 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -7,6 +7,7 @@ * form and handles this form data * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/tbl_change.php b/tbl_change.php index c07e3ad9d7..ab1ca0f3ea 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -6,6 +6,7 @@ * register_globals_save (mark this file save for disabling register globals) * * @version $Id$ + * @package phpMyAdmin */ /** @@ -426,10 +427,10 @@ foreach ($rows as $row_id => $vrow) { } else { // loic1: special binary "characters" if ($field['is_binary'] || $field['is_blob']) { - $vrow[$field['Field']] = PMA_replace_binary_contents($vrow[$field['Field']]); + $vrow[$field['Field']] = PMA_replace_binary_contents($vrow[$field['Field']]); } // end if $special_chars = htmlspecialchars($vrow[$field['Field']]); - + //We need to duplicate the first \n or otherwise we will lose the first newline entered in a VARCHAR or TEXT column $special_chars_encoded = PMA_duplicateFirstNewline($special_chars); @@ -452,7 +453,7 @@ foreach ($rows as $row_id => $vrow) { $data = $field['Default']; } if ($field['True_Type'] == 'bit') { - $special_chars = PMA_printable_bit_value($field['Default'], $extracted_fieldspec['spec_in_brackets']); + $special_chars = PMA_printable_bit_value($field['Default'], $extracted_fieldspec['spec_in_brackets']); } else { $special_chars = htmlspecialchars($field['Default']); } @@ -925,7 +926,7 @@ foreach ($rows as $row_id => $vrow) { if (!empty($bs_tables) && strlen($db) > 0) { $bs_tables = $bs_tables[$db]; - + // check if reference to BLOBStreaming tables exists if (isset($bs_tables)) { diff --git a/tbl_create.php b/tbl_create.php index a8404fae2a..c86934c85f 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -32,6 +32,7 @@ * @uses sprintf() * @uses htmlspecialchars() * @version $Id$ + * @package phpMyAdmin */ /** @@ -99,7 +100,7 @@ if (isset($_REQUEST['do_save_data'])) { } } // end if } // end for - + // Builds the fields creation statements for ($i = 0; $i < $field_cnt; $i++) { // '0' is also empty for php :-( @@ -108,25 +109,25 @@ if (isset($_REQUEST['do_save_data'])) { } $query = PMA_Table::generateFieldSpec( - $_REQUEST['field_name'][$i], + $_REQUEST['field_name'][$i], $_REQUEST['field_type'][$i], - $_REQUEST['field_length'][$i], + $_REQUEST['field_length'][$i], $_REQUEST['field_attribute'][$i], - isset($_REQUEST['field_collation'][$i]) - ? $_REQUEST['field_collation'][$i] + isset($_REQUEST['field_collation'][$i]) + ? $_REQUEST['field_collation'][$i] : '', - isset($_REQUEST['field_null'][$i]) - ? $_REQUEST['field_null'][$i] + isset($_REQUEST['field_null'][$i]) + ? $_REQUEST['field_null'][$i] : 'NOT NULL', - $_REQUEST['field_default_type'][$i], + $_REQUEST['field_default_type'][$i], $_REQUEST['field_default_value'][$i], isset($_REQUEST['field_extra'][$i]) ? $_REQUEST['field_extra'][$i] : false, - isset($_REQUEST['field_comments'][$i]) - ? $_REQUEST['field_comments'][$i] + isset($_REQUEST['field_comments'][$i]) + ? $_REQUEST['field_comments'][$i] : '', - $field_primary, + $field_primary, $i); $query .= ', '; diff --git a/tbl_export.php b/tbl_export.php index d86942eeb4..ed13551cf7 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/tbl_import.php b/tbl_import.php index 242c91146c..a0500fd07c 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/tbl_indexes.php b/tbl_indexes.php index 899bd99528..d1500f51da 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -4,6 +4,7 @@ * Displays index edit/creation form and handles it * * @version $Id$ + * @package phpMyAdmin */ /** @@ -44,7 +45,7 @@ if (isset($_REQUEST['index'])) { */ if (isset($_REQUEST['do_save_data'])) { $error = false; - + // $sql_query is the one displayed in the query box $sql_query = 'ALTER TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table); @@ -77,7 +78,7 @@ if (isset($_REQUEST['do_save_data'])) { . ($index->getName() ? PMA_backquote($index->getName()) : ''); break; } // end switch - + $index_fields = array(); foreach ($index->getColumns() as $key => $column) { $index_fields[$key] = PMA_backquote($column->getName()); @@ -85,18 +86,18 @@ if (isset($_REQUEST['do_save_data'])) { $index_fields[$key] .= '(' . $column->getSubPart() . ')'; } } // end while - + if (empty($index_fields)){ $error = PMA_Message::error('strNoIndexPartsDefined'); } else { $sql_query .= ' (' . implode(', ', $index_fields) . ')'; } - + if (! $error) { PMA_DBI_query($sql_query); $message = PMA_Message::success('strTableAlteredSuccessfully'); $message->addParam($table); - + $active_page = 'tbl_structure.php'; require './tbl_structure.php'; exit; @@ -119,7 +120,7 @@ require_once './libraries/tbl_links.inc.php'; if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) { // coming already from form - $add_fields = + $add_fields = count($_REQUEST['index']['columns']['names']) - $index->getColumnCount(); if (isset($_REQUEST['add_fields'])) { $add_fields += $_REQUEST['added_fields']; @@ -155,8 +156,8 @@ echo PMA_generate_common_hidden_inputs($form_params); <fieldset> <legend> <?php -echo (isset($_REQUEST['create_index']) - ? $strCreateIndexTopic +echo (isset($_REQUEST['create_index']) + ? $strCreateIndexTopic : $strModifyIndexTopic); ?> </legend> @@ -201,7 +202,7 @@ foreach ($index->getColumns() as $column) { || preg_match('/(char|text)/i', $field_type)) { echo '<option value="' . htmlspecialchars($field_name) . '"' . (($field_name == $column->getName()) ? ' selected="selected"' : '') . '>' - . htmlspecialchars($field_name) . ' [' . $field_type . ']' + . htmlspecialchars($field_name) . ' [' . $field_type . ']' . '</option>' . "\n"; } } // end foreach $fields @@ -223,7 +224,7 @@ for ($i = 0; $i < $add_fields; $i++) { <?php foreach ($fields as $field_name => $field_type) { echo '<option value="' . htmlspecialchars($field_name) . '">' - . htmlspecialchars($field_name) . ' [' . $field_type . ']' + . htmlspecialchars($field_name) . ' [' . $field_type . ']' . '</option>' . "\n"; } // end foreach $fields ?> diff --git a/tbl_move_copy.php b/tbl_move_copy.php index 7885b75933..208dcd6274 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** @@ -28,8 +29,8 @@ PMA_DBI_select_db($db); $goto = $cfg['DefaultTabTable']; -/** - * $_REQUEST['target_db'] could be empty in case we came from an input field +/** + * $_REQUEST['target_db'] could be empty in case we came from an input field * (when there are many databases, no drop-down) */ if (empty($_REQUEST['target_db'])) { diff --git a/tbl_operations.php b/tbl_operations.php index 22fe71fc47..b6dd060a0f 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** @@ -190,7 +191,7 @@ unset($reread_info); require_once './libraries/tbl_links.inc.php'; if (isset($result)) { - // set to success by default, because result set could be empty + // set to success by default, because result set could be empty // (for example, a table rename) $_type = 'success'; if (empty($_message)) { @@ -701,13 +702,13 @@ if ($cfgRelation['relwork'] && ! $is_innodb) { require_once './libraries/footer.inc.php'; -function PMA_set_global_variables_for_engine($tbl_type) +function PMA_set_global_variables_for_engine($tbl_type) { global $is_myisam_or_maria, $is_innodb, $is_isam, $is_berkeleydb, $is_maria, $is_pbxt; $is_myisam_or_maria = $is_isam = $is_innodb = $is_berkeleydb = $is_maria = $is_pbxt = false; $upper_tbl_type = strtoupper($tbl_type); - + //Options that apply to MYISAM usually apply to MARIA $is_myisam_or_maria = ($upper_tbl_type == 'MYISAM' || $upper_tbl_type == 'MARIA'); $is_maria = ($upper_tbl_type == 'MARIA'); diff --git a/tbl_printview.php b/tbl_printview.php index 744037dd71..eef2a2d9db 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/tbl_relation.php b/tbl_relation.php index 32fb38dd6a..31844dde4e 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -11,6 +11,7 @@ * @todo add an link to create an index required for constraints, or an option to do automatically * @todo if above todos are fullfilled we can add all fields meet requirements in the select dropdown * @version $Id$ + * @package phpMyAdmin */ /** @@ -304,7 +305,7 @@ echo PMA_generate_common_hidden_inputs($db, $table); if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) { // To choose relations we first need all tables names in current db - // and if the main table supports foreign keys + // and if the main table supports foreign keys // we use SHOW TABLE STATUS because we need to find other tables of the // same engine. diff --git a/tbl_replace.php b/tbl_replace.php index 44d2f161cc..e8ea8c1000 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -36,6 +36,7 @@ * @uses $GLOBALS['goto'] * @uses $GLOBALS['sql_query'] * @uses PMA_File::getRecentBLOBReference() + * @package phpMyAdmin */ /** diff --git a/tbl_row_action.php b/tbl_row_action.php index e6497783bb..912898b1bb 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -4,6 +4,7 @@ * handle row specifc actions like edit, delete, export * * @version $Id$ + * @package phpMyAdmin */ diff --git a/tbl_select.php b/tbl_select.php index afac61b4bc..0ce57e94d6 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -8,6 +8,7 @@ * * @todo display search form again if no results from previous search * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/tbl_sql.php b/tbl_sql.php index 76500597c3..5565d923b7 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/tbl_structure.php b/tbl_structure.php index e786cf1307..c077a75684 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -4,6 +4,7 @@ * Displays table structure infos like fields/columns, indexes, size, rows * and allows manipulation of indexes and columns/fields * @version $Id$ + * @package phpMyAdmin */ /** @@ -213,8 +214,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { $type = $row['Type']; $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); - if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) { - $type = $extracted_fieldspec['type'] . '(' . $extracted_fieldspec['spec_in_brackets'] . ')'; + if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) { + $type = $extracted_fieldspec['type'] . '(' . $extracted_fieldspec['spec_in_brackets'] . ')'; // for the case ENUM('–','“') $type = htmlspecialchars($type); @@ -334,11 +335,11 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <td nowrap="nowrap" style="font-size: 70%"><?php echo $attribute; ?></td> <td><?php echo (($row['Null'] == 'YES') ? $strYes : $strNo); ?></td> <td nowrap="nowrap"><?php - if (isset($row['Default'])) { + if (isset($row['Default'])) { if ($extracted_fieldspec['type'] == 'bit') { echo PMA_printable_bit_value($row['Default'], $extracted_fieldspec['spec_in_brackets']); } else { - echo $row['Default']; + echo $row['Default']; } } else { @@ -481,7 +482,7 @@ echo $strPrintView; <?php if (! $tbl_is_view && ! $db_is_information_schema) { - // if internal relations are available, or foreign keys are supported + // if internal relations are available, or foreign keys are supported // ($tbl_type comes from libraries/tbl_info.inc.php) if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) { ?> @@ -527,7 +528,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { $choices = array( 'last' => $strAtEndOfTable, 'first' => $strAtBeginningOfTable, - 'after' => sprintf($strAfter, $fieldOptions) + 'after' => sprintf($strAfter, $fieldOptions) ); PMA_generate_html_radio('field_where', $choices, 'last', false, false); unset($fieldOptions, $choices); diff --git a/themes.php b/themes.php index d12c9fe85a..1ff89e5350 100644 --- a/themes.php +++ b/themes.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/transformation_overview.php b/transformation_overview.php index 386386917e..738896f8bb 100644 --- a/transformation_overview.php +++ b/transformation_overview.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/transformation_wrapper.php b/transformation_wrapper.php index c965f14825..d79e89de5a 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -3,6 +3,7 @@ /** * * @version $Id$ + * @package phpMyAdmin */ /** diff --git a/user_password.php b/user_password.php index 3bc0a31973..787c7fba8c 100644 --- a/user_password.php +++ b/user_password.php @@ -26,6 +26,7 @@ * @uses PMA_showMessage() * @uses define() * @version $Id$ + * @package phpMyAdmin */ /** |