diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 89977902d..34e4cb60b 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -295,7 +295,7 @@ require_once './libraries/List.class.php'; } foreach ($this->getLimitedItems($offset, $count) as $key => $db) { - // garvin: Get comments from PMA comments table + // Get comments from PMA comments table $db_tooltip = ''; if (isset($db_tooltips[$db])) { diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 25e3709ec..9e80660d6 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -720,7 +720,7 @@ class PMA_Table $GLOBALS['sql_query'] .= "\n" . $drop_query . ';'; - // garvin: If an existing table gets deleted, maintain any + // If an existing table gets deleted, maintain any // entries for the PMA_* tables $maintain_relations = true; } @@ -800,7 +800,7 @@ class PMA_Table $sql_drop_query .= ' ' . $source; PMA_DBI_query($sql_drop_query); - // garvin: Move old entries from PMA-DBs to new table + // Move old entries from PMA-DBs to new table if ($GLOBALS['cfgRelation']['commwork']) { $remove_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info']) . ' SET table_name = \'' . PMA_sqlAddslashes($target_table) . '\', ' @@ -811,7 +811,7 @@ class PMA_Table unset($remove_query); } - // garvin: updating bookmarks is not possible since only a single table is moved, + // updating bookmarks is not possible since only a single table is moved, // and not the whole DB. if ($GLOBALS['cfgRelation']['displaywork']) { @@ -843,7 +843,7 @@ class PMA_Table } /** - * @todo garvin: Can't get moving PDFs the right way. The page numbers + * @todo Can't get moving PDFs the right way. The page numbers * always get screwed up independently from duplication because the * numbers do not seem to be stored on a per-database basis. Would * the author of pdf support please have a look at it? @@ -890,7 +890,7 @@ class PMA_Table // end if ($move) } else { // we are copying - // garvin: Create new entries as duplicates from old PMA DBs + // Create new entries as duplicates from old PMA DBs if ($what != 'dataonly' && !isset($maintain_relations)) { if ($GLOBALS['cfgRelation']['commwork']) { // Get all comments and MIME-Types for current table @@ -951,7 +951,7 @@ class PMA_Table PMA_Table::duplicateInfo('designerwork', 'designer_coords', $get_fields, $where_fields, $new_fields); /** - * @todo garvin: Can't get duplicating PDFs the right way. The + * @todo Can't get duplicating PDFs the right way. The * page numbers always get screwed up independently from * duplication because the numbers do not seem to be stored on a * per-database basis. Would the author of pdf support please @@ -1057,7 +1057,7 @@ class PMA_Table /** * @todo move into extra function PMA_Relation::renameTable($new_name, $old_name, $new_db, $old_db) */ - // garvin: Move old entries from comments to new table + // Move old entries from comments to new table require_once './libraries/relation.lib.php'; $GLOBALS['cfgRelation'] = PMA_getRelationsParam(); if ($GLOBALS['cfgRelation']['commwork']) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 16c3dfb14..a9333ad32 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -596,7 +596,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', $error_msg_output .= '
' . "\n"; } // --- - // modified to show me the help on sql errors (Michael Keck) + // modified to show the help on sql errors $error_msg_output .= '

' . $GLOBALS['strSQLQuery'] . ':' . "\n"; if (strstr(strtolower($formatted_sql), 'select')) { // please show me help to the error on select $error_msg_output .= PMA_showMySQLDocu('SQL-Syntax', 'SELECT'); @@ -633,7 +633,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', $error_message = htmlspecialchars($error_message); $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message); } - // modified to show me the help on error-returns (Michael Keck) + // modified to show the help on error-returns // (now error-messages-server) $error_msg_output .= '

' . "\n" . ' ' . $GLOBALS['strMySQLSaid'] . '' @@ -2150,7 +2150,7 @@ function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1, $pages[] = $i; } - // garvin: Based on the number of results we add the specified + // Based on the number of results we add the specified // $percent percentage to each page number, // so that we have a representing page number every now and then to // immediately jump to specific pages. diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index acc08c806..13eb09301 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -173,7 +173,7 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total) // so don't test this number here, it would remove the possibility // of sorting VIEW results. if (isset($unlim_num_rows) && $unlim_num_rows < 2 && ! PMA_Table::isView($db, $table)) { - // garvin: force display of navbar for vertical/horizontal display-choice. + // force display of navbar for vertical/horizontal display-choice. // $do_display['nav_bar'] = (string) '0'; $do_display['sort_lnk'] = (string) '0'; } @@ -723,8 +723,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $select_expr = $analyzed_sql[0]['select_expr_clause']; } - // garvin: See if we have to highlight any header fields of a WHERE query. - // Uses SQL-Parser results. + // See if we have to highlight any header fields of a WHERE query. + // Uses SQL-Parser results. $highlight_columns = array(); if (isset($analyzed_sql) && isset($analyzed_sql[0]) && isset($analyzed_sql[0]['where_clause_identifiers'])) { @@ -738,7 +738,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ } for ($i = 0; $i < $fields_cnt; $i++) { - // garvin: See if this column should get highlight because it's used in the + // See if this column should get highlight because it's used in the // where-query. if (isset($highlight_columns[$fields_meta[$i]->name]) || isset($highlight_columns[PMA_backquote($fields_meta[$i]->name)])) { $condition_field = true; @@ -841,8 +841,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $order_url = 'sql.php' . PMA_generate_common_url($_url_params); // 2.1.5 Displays the sorting URL - // added 20004-06-09: Michael Keck - // enable sort order swapping for image + // enable sort order swapping for image $order_link_params = array(); if (isset($order_img) && $order_img!='') { if (strstr($order_img, 'asc')) { @@ -1191,7 +1190,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { for ($i = 0; $i < $fields_cnt; ++$i) { $meta = $fields_meta[$i]; $pointer = $i; - // garvin: See if this column should get highlight because it's used in the + // See if this column should get highlight because it's used in the // where-query. if (isset($highlight_columns) && (isset($highlight_columns[$meta->name]) || isset($highlight_columns[PMA_backquote($meta->name)]))) { $condition_field = true; @@ -1212,7 +1211,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } }// end if - // garvin: Wrap MIME-transformations. [MIME] + // Wrap MIME-transformations. [MIME] $default_function = 'default_function'; // default_function $transform_function = $default_function; $transform_options = array(); @@ -1334,7 +1333,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = ' NULL' . "\n"; } elseif ($row[$i] != '') { - // garvin: if a transform function for blob is set, none of these replacements will be made + // if a transform function for blob is set, none of these replacements will be made if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P') { $row[$i] = PMA_substr($row[$i], 0, $GLOBALS['cfg']['LimitChars']) . '...'; } @@ -1385,7 +1384,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } } - // garvin: transform functions may enable no-wrapping: + // transform functions may enable no-wrapping: $function_nowrap = $transform_function . '_nowrap'; $bool_nowrap = (($default_function != $transform_function && function_exists($function_nowrap)) ? $function_nowrap($transform_options) : false); diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php index 8d904c0e8..40a3fd153 100644 --- a/libraries/display_tbl_links.lib.php +++ b/libraries/display_tbl_links.lib.php @@ -1,7 +1,7 @@ + * * - bugfix for select all checkboxes * - copy right to left (or left to right) if user click on a check box * - reversed the right modify links: 1. drop, 2. edit, 3. checkbox diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 24423a5fa..18a327b48 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -22,7 +22,7 @@ if (empty($GLOBALS['is_header_sent'])) { require_once './libraries/ob.lib.php'; PMA_outBufferPre(); - // garvin: For re-usability, moved http-headers and stylesheets + // For re-usability, moved http-headers and stylesheets // to a seperate file. It can now be included by header.inc.php, // querywindow.php. diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index 6c37db0ce..962c5906b 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -21,8 +21,8 @@ PMA_outBufferPre(); PMA_checkParameters(array('db', 'full_sql_query')); -// garvin: For re-usability, moved http-headers -// to a seperate file. It can now be included by libraries/header.inc.php, +// For re-usability, moved http-headers +// to a separate file. It can now be included by libraries/header.inc.php, // querywindow.php. require_once './libraries/header_http.inc.php'; diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 30d471724..3688f2fd0 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -146,9 +146,9 @@ if ($cfgRelation['mimework'] && $cfg['BrowseMIME']) { . PMA_showHint($strMIME_transformation_options_note . $hint); } -// garvin: workaround for field_fulltext, because its submitted indizes contain -// the index as a value, not a key. Inserted here for easier maintaineance -// and less code to change in existing files. +// workaround for field_fulltext, because its submitted indizes contain +// the index as a value, not a key. Inserted here for easier maintaineance +// and less code to change in existing files. if (isset($field_fulltext) && is_array($field_fulltext)) { foreach ($field_fulltext as $fulltext_nr => $fulltext_indexkey) { $submit_fulltext[$fulltext_indexkey] = $fulltext_indexkey; diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index bd34ae226..2d5b8e7ad 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -3,16 +3,16 @@ /** * handle field values (possibly uploaded from a file) * - * garvin: original if-clause checked, whether input was stored in a possible + * original if-clause checked, whether input was stored in a possible * fields_upload_XX var. Now check, if the field is set. If it is empty or a * malicious file, do not alter fields contents. If an empty or invalid file is * specified, the binary data gets deleter. Maybe a nice new text-variable is * appropriate to document this behaviour. * - * garvin: security cautions! You could trick the form and submit any file the + * security cautions! You could trick the form and submit any file the * webserver has access to for upload to a binary field. Shouldn't be that easy! ;) * - * garvin: default is to advance to the field-value parsing. Will only be set to + * default is to advance to the field-value parsing. Will only be set to * true when a binary file is uploaded, thus bypassing further manipulation of $val. * * note: grab_globals has extracted the fields from _FILES or HTTP_POST_FILES @@ -93,7 +93,7 @@ if (false !== $possibly_uploaded_val) { // fields array, so we do not change the field value // but we can still handle field upload - // garvin: when in UPDATE mode, do not alter field's contents. When in INSERT + // when in UPDATE mode, do not alter field's contents. When in INSERT // mode, insert empty field because no values were submitted. If protected // blobs where set, insert original fields content. if (! empty($prot_row[$me_fields_name[$key]])) { diff --git a/main.php b/main.php index 36a81252d..8c65bc588 100644 --- a/main.php +++ b/main.php @@ -147,7 +147,6 @@ if (empty($cfg['Lang'])) { echo ''; } -// added by Michael Keck // ThemeManager if available if ($GLOBALS['cfg']['ThemeManager']) { diff --git a/navigation.php b/navigation.php index 864456e2a..cb031edb0 100644 --- a/navigation.php +++ b/navigation.php @@ -124,7 +124,7 @@ require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); /** - * garvin: For re-usability, moved http-headers to a seperate file. + * For re-usability, moved http-headers to a seperate file. * It can now be included by libraries/header.inc.php, querywindow.php. */ require_once './libraries/header_http.inc.php'; diff --git a/pdf_pages.php b/pdf_pages.php index aff73850c..b7f93c533 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -332,7 +332,7 @@ while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) { $array_sh_page[] = $temp_sh_page; } -// garvin: Display WYSIWYG-PDF parts? +// Display WYSIWYG-PDF parts? if ($cfg['WYSIWYG-PDF']) { if (!isset($_POST['with_field_names']) && !isset($_POST['showwysiwyg'])) { $with_field_names = TRUE; diff --git a/sql.php b/sql.php index 4da90d1cb..864034c7c 100644 --- a/sql.php +++ b/sql.php @@ -302,7 +302,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { session_write_close(); } - // garvin: Measure query time. + // Measure query time. // TODO-Item http://sourceforge.net/tracker/index.php?func=detail&aid=571934&group_id=23067&atid=377411 $querytime_before = array_sum(explode(' ', microtime())); @@ -458,7 +458,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { $unlim_num_rows = 0; } // end rows total count - // garvin: if a table or database gets dropped, check column comments. + // if a table or database gets dropped, check column comments. if (isset($purge) && $purge == '1') { /** * Cleanup relations. @@ -470,11 +470,11 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { } elseif (strlen($db)) { PMA_relationsCleanupDatabase($db); } else { - // garvin: VOID. No DB/Table gets deleted. + // VOID. No DB/Table gets deleted. } // end if relation-stuff } // end if ($purge) - // garvin: If a column gets dropped, do relation magic. + // If a column gets dropped, do relation magic. if (isset($cpurge) && $cpurge == '1' && isset($purgekey) && strlen($db) && strlen($table) && !empty($purgekey)) { require_once './libraries/relation_cleanup.lib.php'; diff --git a/tbl_addfield.php b/tbl_addfield.php index cfa25f549..c5d6ce9e1 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -166,11 +166,11 @@ if (isset($_REQUEST['do_save_data'])) { $result = PMA_DBI_try_query($sql_query); if ($result === true) { - // garvin: If comments were sent, enable relation stuff + // If comments were sent, enable relation stuff require_once './libraries/relation.lib.php'; require_once './libraries/transformations.lib.php'; - // garvin: Update comment table for mime types [MIME] + // Update comment table for mime types [MIME] if (isset($_REQUEST['field_mimetype']) && is_array($_REQUEST['field_mimetype']) && $cfg['BrowseMIME']) { @@ -193,7 +193,7 @@ if (isset($_REQUEST['do_save_data'])) { require './tbl_structure.php'; } else { PMA_mysqlDie('', '', '', $err_url, false); - // garvin: An error happened while inserting/updating a table definition. + // An error happened while inserting/updating a table definition. // to prevent total loss of that data, we embed the form once again. // The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php $num_fields = $_REQUEST['orig_num_fields']; diff --git a/tbl_alter.php b/tbl_alter.php index a399073c8..bd82396a7 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -139,7 +139,7 @@ if (isset($_REQUEST['do_save_data'])) { require './tbl_structure.php'; } else { PMA_mysqlDie('', '', '', $err_url, false); - // garvin: An error happened while inserting/updating a table definition. + // An error happened while inserting/updating a table definition. // to prevent total loss of that data, we embed the form once again. // The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php if (isset($_REQUEST['orig_field'])) { diff --git a/tbl_change.php b/tbl_change.php index 0c89a173e..263e4ab36 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -507,7 +507,7 @@ foreach ($rows as $row_id => $vrow) { $vrow) { $default_function = 'UNHEX'; } - // garvin: loop on the dropdown array and print all available options for that field. + // loop on the dropdown array and print all available options for that field. foreach ($dropdown as $each_dropdown){ echo ' $vrow) { $op_spacing_needed = TRUE; } - // garvin: For compatibility's sake, do not let out all other functions. Instead + // For compatibility's sake, do not let out all other functions. Instead // print a separator (blank) and then show ALL functions which weren't shown // yet. $cnt_functions = count($cfg['Functions']); diff --git a/tbl_create.php b/tbl_create.php index 5fcecb7c4..b83955a83 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -228,11 +228,11 @@ if (isset($_REQUEST['do_save_data'])) { if ($result) { - // garvin: If comments were sent, enable relation stuff + // If comments were sent, enable relation stuff require_once './libraries/relation.lib.php'; require_once './libraries/transformations.lib.php'; - // garvin: Update comment table for mime types [MIME] + // Update comment table for mime types [MIME] if (isset($_REQUEST['field_mimetype']) && is_array($_REQUEST['field_mimetype']) && $cfg['BrowseMIME']) { @@ -266,7 +266,7 @@ if (isset($_REQUEST['do_save_data'])) { exit; } else { PMA_mysqlDie('', '', '', $err_url, false); - // garvin: An error happened while inserting/updating a table definition. + // An error happened while inserting/updating a table definition. // to prevent total loss of that data, we embed the form once again. // The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php $num_fields = $_REQUEST['orig_num_fields']; diff --git a/tbl_row_action.php b/tbl_row_action.php index efcc74d7b..5cc50336c 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -79,7 +79,7 @@ require_once './libraries/header.inc.php'; if (!empty($submit_mult)) { switch($submit_mult) { case 'row_edit': - // garvin: As we got the fields to be edited from the + // As we got the fields to be edited from the // 'rows_to_delete' checkbox, we use the index of it as the // indicating WHERE clause. Then we build the array which is used // for the tbl_change.php script. @@ -96,7 +96,7 @@ if (!empty($submit_mult)) { // Needed to allow SQL export $single_table = TRUE; - // garvin: As we got the fields to be edited from the + // As we got the fields to be edited from the // 'rows_to_delete' checkbox, we use the index of it as the // indicating WHERE clause. Then we build the array which is used // for the tbl_change.php script. diff --git a/tbl_structure.php b/tbl_structure.php index 01c12a57b..0f3aae294 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -282,7 +282,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { $field_charset = ''; } - // garvin: Display basic mimetype [MIME] + // Display basic mimetype [MIME] if ($cfgRelation['commwork'] && $cfgRelation['mimework'] && $cfg['BrowseMIME'] && isset($mime_map[$row['Field']]['mimetype'])) { $type_mime = '
MIME: ' . str_replace('_', '/', $mime_map[$row['Field']]['mimetype']); } else { @@ -326,7 +326,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { $field_name = htmlspecialchars($row['Field']); $displayed_field_name = $field_name; - // garvin: underline commented fields and display a hover-title (CSS only) + // underline commented fields and display a hover-title (CSS only) $comment_style = ''; if (isset($comments_map[$row['Field']])) { diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 011effeb3..a231d49a7 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -56,7 +56,7 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework']) { } } -// garvin: For re-usability, moved http-headers and stylesheets +// For re-usability, moved http-headers and stylesheets // to a seperate file. It can now be included by libraries/header.inc.php, // querywindow.php.