nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove author names

Browse Source
This commit is contained in:
Marc Delisle
2010-03-26 17:44:10 -04:00
parent f6e3ae57c5
commit 9785bbc561
20 changed files with 52 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/List_Database.class.php
View File

@@ -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])) {

14
libraries/Table.class.php
View File

@@ -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']) {

6
libraries/common.lib.php
View File

@@ -596,7 +596,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
$error_msg_output .= '<br />' . "\n";
}
// ---
// modified to show me the help on sql errors (Michael Keck)
// modified to show the help on sql errors
$error_msg_output .= ' <p><strong>' . $GLOBALS['strSQLQuery'] . ':</strong>' . "\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 .= '<p>' . "\n"
. ' <strong>' . $GLOBALS['strMySQLSaid'] . '</strong>'
@@ -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.

15
libraries/display_tbl.lib.php
View File

@@ -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,7 +723,7 @@ 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.
// 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]) &&
@@ -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,7 +841,6 @@ 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 <mail@michaelkeck.de>
// enable sort order swapping for image
$order_link_params = array();
if (isset($order_img) && $order_img!='') {
@@ -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] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\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);

2
libraries/display_tbl_links.lib.php
View File

@@ -1,7 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* modified 2004-05-08 by Michael Keck <mail_at_michaelkeck_dot_de>
*
* - 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

2
libraries/header.inc.php
View File

@@ -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.

4
libraries/header_printview.inc.php
View File

@@ -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';

2
libraries/tbl_properties.inc.php
View File

@@ -146,7 +146,7 @@ if ($cfgRelation['mimework'] && $cfg['BrowseMIME']) {
. PMA_showHint($strMIME_transformation_options_note . $hint);
}
// garvin: workaround for field_fulltext, because its submitted indizes contain
// 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)) {

8
libraries/tbl_replace_fields.inc.php
View File

@@ -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]])) {

1
main.php
View File

@@ -147,7 +147,6 @@ if (empty($cfg['Lang'])) {
echo '</li>';
}
// added by Michael Keck <mail_at_michaelkeck_dot_de>
// ThemeManager if available
if ($GLOBALS['cfg']['ThemeManager']) {

2
navigation.php
View File

@@ -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';

2
pdf_pages.php
View File

@@ -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;

8
sql.php
View File

@@ -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';

6
tbl_addfield.php
View File

@@ -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'];

2
tbl_alter.php
View File

@@ -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'])) {

6
tbl_change.php
View File

@@ -507,7 +507,7 @@ foreach ($rows as $row_id => $vrow) {
<?php
$selected = '';
// garvin: Find the current type in the RestrictColumnTypes. Will result in 'FUNC_CHAR'
// Find the current type in the RestrictColumnTypes. Will result in 'FUNC_CHAR'
// or something similar. Then directly look up the entry in the RestrictFunctions array,
// which will then reveal the available dropdown options
if (isset($cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])])
@@ -550,7 +550,7 @@ foreach ($rows as $row_id => $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 '<option';
if ($default_function === $each_dropdown) {
@@ -561,7 +561,7 @@ foreach ($rows as $row_id => $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']);

6
tbl_create.php
View File

@@ -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'];

4
tbl_row_action.php
View File

@@ -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.

4
tbl_structure.php
View File

@@ -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 = '<br />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']])) {

2
transformation_wrapper.php
View File

@@ -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.