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

remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software

Browse Source
This commit is contained in:
Marc Delisle
2010-03-06 18:04:17 +00:00
parent 94b50c6f53
commit 819324ede6
94 changed files with 74 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bs_change_mime_type.php
View File

@@ -1,7 +1,6 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* @author Raj Kissu Rajandran
* @version 1.0 * @version 1.0
* @package BLOBStreaming * @package BLOBStreaming
*/ */

1
bs_disp_as_mime_type.php
View File

@@ -1,7 +1,6 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* @author Raj Kissu Rajandran
* @version 1.0 * @version 1.0
* @package BLOBStreaming * @package BLOBStreaming
*/ */

1
bs_play_media.php
View File

@@ -1,7 +1,6 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* @author Raj Kissu Rajandran
* @version 1.0 * @version 1.0
* @package BLOBStreaming * @package BLOBStreaming
*/ */

4
db_datadict.php
View File

@@ -195,8 +195,8 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
$row['Null'] = 'NO'; $row['Null'] = 'NO';
} }
$type = $row['Type']; $type = $row['Type'];
// reformat mysql query output - staybyte - 9. June 2001 // reformat mysql query output
// loic1: set or enum types: slashes single quotes inside options // set or enum types: slashes single quotes inside options
if (preg_match('@^(set|enum)\((.+)\)$@i', $type, $tmp)) { if (preg_match('@^(set|enum)\((.+)\)$@i', $type, $tmp)) {
$tmp[2] = substr(preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1); $tmp[2] = substr(preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1);
$type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';

4
db_printview.php
View File

@@ -36,7 +36,7 @@ $cfgRelation = PMA_getRelationsParam();
* *
* @todo merge this speedup _optionaly_ into PMA_DBI_get_tables_full() * @todo merge this speedup _optionaly_ into PMA_DBI_get_tables_full()
* *
// staybyte: speedup view on locked tables - 11 June 2001 // speedup view on locked tables
// Special speedup for newer MySQL Versions (in 4.0 format changed) // Special speedup for newer MySQL Versions (in 4.0 format changed)
if ($cfg['SkipLockedTables'] == true) { if ($cfg['SkipLockedTables'] == true) {
$result = PMA_DBI_query('SHOW OPEN TABLES FROM ' . PMA_backquote($db) . ';'); $result = PMA_DBI_query('SHOW OPEN TABLES FROM ' . PMA_backquote($db) . ';');
@@ -95,7 +95,7 @@ echo '<br />';
if ($num_tables == 0) { if ($num_tables == 0) {
echo $strNoTablesFound; echo $strNoTablesFound;
} }
// 2. Shows table informations on mysql >= 3.23.03 - staybyte - 11 June 2001 // 2. Shows table informations on mysql >= 3.23.03
else { else {
?> ?>
<table> <table>

1
db_search.php
View File

@@ -47,7 +47,6 @@
* @uses sprintf() * @uses sprintf()
* @uses in_array() * @uses in_array()
* @version $Id$ * @version $Id$
* @author Thomas Chaumeny <chaume92 at aol.com>
* @package phpMyAdmin * @package phpMyAdmin
*/ */

5
db_structure.php
View File

@@ -62,7 +62,7 @@ if ($num_tables == 0) {
} }
// else // else
// 2. Shows table informations - staybyte - 11 June 2001 // 2. Shows table informations
require_once './libraries/bookmark.lib.php'; require_once './libraries/bookmark.lib.php';
@@ -172,8 +172,7 @@ foreach ($tables as $keyname => $each_table) {
} }
} }
// loic1: Patch from Joshua Nye <josh at boxcarmedia.com> to get valid // Get valid statistics whatever is the table type
// statistics whatever is the table type
$table_is_view = false; $table_is_view = false;
$table_encoded = urlencode($each_table['TABLE_NAME']); $table_encoded = urlencode($each_table['TABLE_NAME']);

1
db_tracking.php
View File

@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* @version $Id$ * @version $Id$
* @author Alexander Rutkowski
* @package phpMyAdmin * @package phpMyAdmin
*/ */

2
export.php
View File

@@ -334,7 +334,7 @@ if (!$save_on_server) {
header('Content-Type: ' . $mime_type); header('Content-Type: ' . $mime_type);
header('Expires: ' . gmdate('D, d M Y H:i:s') . ' GMT'); header('Expires: ' . gmdate('D, d M Y H:i:s') . ' GMT');
// lem9: Tested behavior of // Tested behavior of
// IE 5.50.4807.2300 // IE 5.50.4807.2300
// IE 6.0.2800.1106 (small glitch, asks twice when I click Open) // IE 6.0.2800.1106 (small glitch, asks twice when I click Open)
// IE 6.0.2900.2180 // IE 6.0.2900.2180

1
js/functions.js
View File

@@ -1123,7 +1123,6 @@ function setPointer(theRow, theRowNum, theAction, theDefaultColor, thePointerCol
* *
* @return boolean whether pointer is set or not * @return boolean whether pointer is set or not
* *
* @author Garvin Hicking <me@supergarv.de> (rewrite of setPointer.)
*/ */
function setVerticalPointer(theRow, theColNum, theAction, theDefaultClass1, theDefaultClass2, thePointerClass, theMarkClass) { function setVerticalPointer(theRow, theColNum, theAction, theDefaultClass1, theDefaultClass2, thePointerClass, theMarkClass) {
// 1. Pointer and mark feature are disabled or the browser can't get the // 1. Pointer and mark feature are disabled or the browser can't get the

1
libraries/Index.class.php
View File

@@ -419,7 +419,6 @@ class PMA_Index
* @param boolean $print_mode * @param boolean $print_mode
* @access public * @access public
* @return array Index collection array * @return array Index collection array
* @author Garvin Hicking (pma@supergarv.de)
*/ */
static public function getView($table, $schema, $print_mode = false) static public function getView($table, $schema, $print_mode = false)
{ {

6
libraries/List_Database.class.php
View File

@@ -468,7 +468,7 @@ require_once './libraries/List.class.php';
protected function _checkAgainstPrivTables() protected function _checkAgainstPrivTables()
{ {
// 1. get allowed dbs from the "mysql.db" table // 1. get allowed dbs from the "mysql.db" table
// lem9: User can be blank (anonymous user) // User can be blank (anonymous user)
$local_query = " $local_query = "
SELECT DISTINCT `Db` FROM `mysql`.`db` SELECT DISTINCT `Db` FROM `mysql`.`db`
WHERE `Select_priv` = 'Y' WHERE `Select_priv` = 'Y'
@@ -488,7 +488,7 @@ require_once './libraries/List.class.php';
// now populated with actual database names instead of // now populated with actual database names instead of
// with regular expressions. // with regular expressions.
$tmp_alldbs = PMA_DBI_query('SHOW DATABASES;', $GLOBALS['controllink']); $tmp_alldbs = PMA_DBI_query('SHOW DATABASES;', $GLOBALS['controllink']);
// loic1: all databases cases - part 2 // all databases cases - part 2
if (isset($tmp_mydbs['%'])) { if (isset($tmp_mydbs['%'])) {
while ($tmp_row = PMA_DBI_fetch_row($tmp_alldbs)) { while ($tmp_row = PMA_DBI_fetch_row($tmp_alldbs)) {
$dblist[] = $tmp_row[0]; $dblist[] = $tmp_row[0];
@@ -501,7 +501,7 @@ require_once './libraries/List.class.php';
$tmp_mydbs[$tmp_db] = 0; $tmp_mydbs[$tmp_db] = 0;
} elseif (!isset($dblist[$tmp_db])) { } elseif (!isset($dblist[$tmp_db])) {
foreach ($tmp_mydbs as $tmp_matchpattern => $tmp_value) { foreach ($tmp_mydbs as $tmp_matchpattern => $tmp_value) {
// loic1: fixed bad regexp // fixed bad regexp
// TODO: db names may contain characters // TODO: db names may contain characters
// that are regexp instructions // that are regexp instructions
$re = '(^|(\\\\\\\\)+|[^\])'; $re = '(^|(\\\\\\\\)+|[^\])';

1
libraries/Message.class.php
View File

@@ -3,7 +3,6 @@
/** /**
* Holds class PMA_Message * Holds class PMA_Message
* *
* @author Sebastian Mendel <info@sebastianmendel.de>
* @version $Id$ * @version $Id$
* @package phpMyAdmin * @package phpMyAdmin
*/ */

1
libraries/StorageEngine.class.php
View File

@@ -69,7 +69,6 @@ class PMA_StorageEngine
/** /**
* returns HTML code for storage engine select box * returns HTML code for storage engine select box
* *
* @author rabus
* @static * @static
* @uses PMA_StorageEngine::getStorageEngines() * @uses PMA_StorageEngine::getStorageEngines()
* @uses strtolower() * @uses strtolower()

4
libraries/Table.class.php
View File

@@ -501,7 +501,6 @@ class PMA_Table
* @global string relation variable * @global string relation variable
* *
* @author Garvin Hicking <me@supergarv.de>
*/ */
static public function duplicateInfo($work, $pma_table, $get_fields, $where_fields, static public function duplicateInfo($work, $pma_table, $get_fields, $where_fields,
$new_fields) $new_fields)
@@ -573,7 +572,6 @@ class PMA_Table
/** /**
* Copies or renames table * Copies or renames table
* *
* @author Michal Cihar <michal@cihar.com>
*/ */
static public function moveCopy($source_db, $source_table, $target_db, $target_table, $what, $move, $mode) static public function moveCopy($source_db, $source_table, $target_db, $target_table, $what, $move, $mode)
{ {
@@ -650,7 +648,7 @@ class PMA_Table
} }
unset($server_sql_mode); unset($server_sql_mode);
/* nijel: Find table name in query and replace it */ /* Find table name in query and replace it */
while ($parsed_sql[$i]['type'] != $table_delimiter) { while ($parsed_sql[$i]['type'] != $table_delimiter) {
$i++; $i++;
} }

2
libraries/Tracker.class.php
View File

@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* *
* @author Alexander Rutkowski
* @version $Id$ * @version $Id$
* @package phpMyAdmin * @package phpMyAdmin
*/ */
@@ -16,7 +15,6 @@ require_once './libraries/relation.lib.php';
* This class tracks changes on databases, tables and views. * This class tracks changes on databases, tables and views.
* For more information please see phpMyAdmin/Documentation.html * For more information please see phpMyAdmin/Documentation.html
* *
* @author Alexander Rutkowski <alexander.rutkowski@googlemail.com>
* @package phpMyAdmin * @package phpMyAdmin
* *
* @todo use stristr instead of strstr * @todo use stristr instead of strstr

2
libraries/auth/cookie.auth.lib.php
View File

@@ -52,7 +52,6 @@ if (function_exists('mcrypt_encrypt')) {
* *
* @access public * @access public
* *
* @author lem9
*/ */
function PMA_blowfish_encrypt($data, $secret) function PMA_blowfish_encrypt($data, $secret)
{ {
@@ -70,7 +69,6 @@ if (function_exists('mcrypt_encrypt')) {
* *
* @access public * @access public
* *
* @author lem9
*/ */
function PMA_blowfish_decrypt($encdata, $secret) function PMA_blowfish_decrypt($encdata, $secret)
{ {

1
libraries/blobstreaming.lib.php
View File

@@ -1,7 +1,6 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* @author Raj Kissu Rajandran and the team
* @package BLOBStreaming * @package BLOBStreaming
*/ */

5
libraries/blowfish.php
View File

@@ -11,13 +11,12 @@
* See the enclosed file COPYING for license information (LGPL). If you * See the enclosed file COPYING for license information (LGPL). If you
* did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
* *
* @author Mike Cochrane <mike@graftonhall.co.nz>
* @version $Id$ * @version $Id$
* @since Horde 2.2 * @since Horde 2.2
* @package horde.cipher * @package horde.cipher
*/ */
// Change for phpMyAdmin by lem9: // Change for phpMyAdmin
//class Horde_Cipher_blowfish extends Horde_Cipher { //class Horde_Cipher_blowfish extends Horde_Cipher {
/** /**
* Horde Blowfish cipher class. * Horde Blowfish cipher class.
@@ -480,7 +479,6 @@ class Horde_Cipher_blowfish
* *
* @access public * @access public
* *
* @author lem9
*/ */
function PMA_blowfish_encrypt($data, $secret) function PMA_blowfish_encrypt($data, $secret)
{ {
@@ -509,7 +507,6 @@ function PMA_blowfish_encrypt($data, $secret)
* *
* @access public * @access public
* *
* @author lem9
*/ */
function PMA_blowfish_decrypt($encdata, $secret) function PMA_blowfish_decrypt($encdata, $secret)
{ {

5
libraries/charset_conversion.lib.php
View File

@@ -130,13 +130,12 @@ if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) {
* *
* @access public * @access public
* *
* @author nijel
*/ */
function PMA_convert_charset($what) { function PMA_convert_charset($what) {
global $cfg, $charset, $convcharset; global $cfg, $charset, $convcharset;
if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] ) if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] )
|| $convcharset == $charset) { // rabus: if input and output charset are the same, we don't have to do anything... || $convcharset == $charset) { // if input and output charset are the same, we don't have to do anything...
return $what; return $what;
} else { } else {
switch ($GLOBALS['PMA_recoding_engine']) { switch ($GLOBALS['PMA_recoding_engine']) {
@@ -166,7 +165,6 @@ function PMA_convert_charset($what) {
* *
* @access public * @access public
* *
* @author nijel
*/ */
function PMA_convert_string($src_charset, $dest_charset, $what) { function PMA_convert_string($src_charset, $dest_charset, $what) {
if ($src_charset == $dest_charset) { if ($src_charset == $dest_charset) {
@@ -200,7 +198,6 @@ function PMA_convert_string($src_charset, $dest_charset, $what) {
* *
* @access public * @access public
* *
* @author nijel
*/ */
function PMA_convert_file($src_charset, $dest_charset, $file) { function PMA_convert_file($src_charset, $dest_charset, $file) {
switch ($GLOBALS['PMA_recoding_engine']) { switch ($GLOBALS['PMA_recoding_engine']) {

1
libraries/cleanup.lib.php
View File

@@ -13,7 +13,6 @@
* @param string list of variables to allow * @param string list of variables to allow
* @return nothing * @return nothing
* @access public * @access public
* @author Michal Cihar (michal@cihar.com)
*/ */
function PMA_remove_request_vars(&$whitelist) function PMA_remove_request_vars(&$whitelist)
{ {

15
libraries/common.lib.php
View File

@@ -294,7 +294,6 @@ function PMA_unQuote($quoted_string, $quote = null)
* *
* @access public * @access public
* *
* @author Robin Johnson <robbat2@users.sourceforge.net>
*/ */
function PMA_formatSql($parsed_sql, $unparsed_sql = '') function PMA_formatSql($parsed_sql, $unparsed_sql = '')
{ {
@@ -1293,7 +1292,6 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
* @access public * @access public
* @return boolean whether profiling is supported * @return boolean whether profiling is supported
* *
* @author Marc Delisle
*/ */
function PMA_profilingSupported() function PMA_profilingSupported()
{ {
@@ -1319,7 +1317,6 @@ function PMA_profilingSupported()
* @param string $sql_query * @param string $sql_query
* @access public * @access public
* *
* @author Marc Delisle
*/ */
function PMA_profilingCheckbox($sql_query) function PMA_profilingCheckbox($sql_query)
{ {
@@ -1340,7 +1337,6 @@ function PMA_profilingCheckbox($sql_query)
* @param array the results * @param array the results
* @access public * @access public
* *
* @author Marc Delisle
*/ */
function PMA_profilingResults($profiling_results) function PMA_profilingResults($profiling_results)
{ {
@@ -1371,7 +1367,6 @@ function PMA_profilingResults($profiling_results)
* *
* @access public * @access public
* *
* @author staybyte
* @version 1.2 - 18 July 2002 * @version 1.2 - 18 July 2002
*/ */
function PMA_formatByteDown($value, $limes = 6, $comma = 0) function PMA_formatByteDown($value, $limes = 6, $comma = 0)
@@ -1428,7 +1423,6 @@ function PMA_formatByteDown($value, $limes = 6, $comma = 0)
* *
* @access public * @access public
* *
* @author staybyte, sebastian mendel
* @version 1.1.0 - 2005-10-27 * @version 1.1.0 - 2005-10-27
*/ */
function PMA_formatNumber($value, $length = 3, $comma = 0, $only_down = false) function PMA_formatNumber($value, $length = 3, $comma = 0, $only_down = false)
@@ -1832,7 +1826,6 @@ function PMA_timespanFormat($seconds)
* @param string The Separator (defaults to "<br />\n") * @param string The Separator (defaults to "<br />\n")
* *
* @access public * @access public
* @author Garvin Hicking <me@supergarv.de>
* @return string The flipped string * @return string The flipped string
*/ */
function PMA_flipstring($string, $Separator = "<br />\n") function PMA_flipstring($string, $Separator = "<br />\n")
@@ -1892,7 +1885,6 @@ function PMA_flipstring($string, $Separator = "<br />\n")
* @global boolean flag whether any special variable was required * @global boolean flag whether any special variable was required
* *
* @access public * @access public
* @author Marc Delisle (lem9@users.sourceforge.net)
*/ */
function PMA_checkParameters($params, $die = true, $request = true) function PMA_checkParameters($params, $die = true, $request = true)
{ {
@@ -1949,7 +1941,6 @@ function PMA_checkParameters($params, $die = true, $request = true)
* @param boolean $force_unique generate condition only on pk or unique * @param boolean $force_unique generate condition only on pk or unique
* *
* @access public * @access public
* @author Michal Cihar (michal@cihar.com) and others...
* @return string the calculated condition and whether condition is unique * @return string the calculated condition and whether condition is unique
*/ */
function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force_unique=false) function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force_unique=false)
@@ -2075,7 +2066,6 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
* @param string image to display * @param string image to display
* *
* @access public * @access public
* @author Michal Cihar (michal@cihar.com)
*/ */
function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, function PMA_buttonOrImage($button_name, $button_class, $image_name, $text,
$image) $image)
@@ -2128,7 +2118,6 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text,
* @param string The prompt to display (sometimes empty) * @param string The prompt to display (sometimes empty)
* *
* @access public * @access public
* @author Garvin Hicking (pma@supergarv.de)
*/ */
function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1, function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1,
$showAll = 200, $sliceStart = 5, $sliceEnd = 5, $percent = 20, $showAll = 200, $sliceStart = 5, $sliceEnd = 5, $percent = 20,
@@ -2232,7 +2221,7 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
// Move to the beginning or to the previous page // Move to the beginning or to the previous page
if ($pos > 0) { if ($pos > 0) {
// loic1: patch #474210 from Gosha Sakovich - part 1 // patch #474210 - part 1
if ($GLOBALS['cfg']['NavigationBarIconic']) { if ($GLOBALS['cfg']['NavigationBarIconic']) {
$caption1 = '&lt;&lt;'; $caption1 = '&lt;&lt;';
$caption2 = ' &lt; '; $caption2 = ' &lt; ';
@@ -2614,8 +2603,6 @@ function PMA_convert_bit_default_value($bit_default_value) {
* @param string $fieldspec * @param string $fieldspec
* @return array associative array containing type, spec_in_brackets * @return array associative array containing type, spec_in_brackets
* and possibly enum_set_values (another array) * and possibly enum_set_values (another array)
* @author Marc Delisle
* @author Joshua Hogendorn
*/ */
function PMA_extractFieldSpec($fieldspec) { function PMA_extractFieldSpec($fieldspec) {
$first_bracket_pos = strpos($fieldspec, '('); $first_bracket_pos = strpos($fieldspec, '(');

2
libraries/config.default.php
View File

@@ -2302,7 +2302,7 @@ $cfg['InitialSlidersState'] = 'closed';
// custom-setup by mkkeck: 2004-05-04 // custom-setup by mkkeck: 2004-05-04
// some specials for new icons and scrolling // some specials for new icons and scrolling
/** /**
* @todo 2004-05-08 rabus: We need to rearrange these variables. * @todo We need to rearrange these variables.
*/ */

1
libraries/core.lib.php
View File

@@ -184,7 +184,6 @@ function PMA_isValid(&$var, $type = 'length', $compare = null)
* @return string The secured path * @return string The secured path
* *
* @access public * @access public
* @author Marc Delisle (lem9@users.sourceforge.net)
*/ */
function PMA_securePath($path) function PMA_securePath($path)
{ {

2
libraries/db_info.inc.php
View File

@@ -7,7 +7,7 @@
* fills tooltip arrays and provides $tables, $num_tables, $is_show_stats * fills tooltip arrays and provides $tables, $num_tables, $is_show_stats
* and $db_is_information_schema * and $db_is_information_schema
* *
* staybyte: speedup view on locked tables - 11 June 2001 * speedup view on locked tables
* *
* @uses $cfg['ShowStats'] * @uses $cfg['ShowStats']
* @uses $cfg['ShowTooltip'] * @uses $cfg['ShowTooltip']

4
libraries/db_links.inc.php
View File

@@ -37,8 +37,8 @@ $is_superuser = PMA_isSuperuser();
* Prepares links * Prepares links
*/ */
// Drop link if allowed // Drop link if allowed
// rabus: Don't even try to drop information_schema. You won't be able to. Believe me. You won't. // Don't even try to drop information_schema. You won't be able to. Believe me. You won't.
// nijel: Don't allow to easilly drop mysql database, RFE #1327514. // Don't allow to easilly drop mysql database, RFE #1327514.
if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) && ! $db_is_information_schema && ($db != 'mysql')) { if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) && ! $db_is_information_schema && ($db != 'mysql')) {
$tab_drop['link'] = 'sql.php'; $tab_drop['link'] = 'sql.php';
$tab_drop['args']['sql_query'] = 'DROP DATABASE ' . PMA_backquote($db); $tab_drop['args']['sql_query'] = 'DROP DATABASE ' . PMA_backquote($db);

2
libraries/display_change_password.lib.php
View File

@@ -11,7 +11,7 @@ if (! defined('PHPMYADMIN')) {
} }
/** /**
* loic1: autocomplete feature of IE kills the "onchange" event handler and it * autocomplete feature of IE kills the "onchange" event handler and it
* must be replaced by the "onpropertychange" one in this case * must be replaced by the "onpropertychange" one in this case
*/ */
$chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5) $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)

25
libraries/display_tbl.lib.php
View File

@@ -812,7 +812,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// 2.1.4 Do define the sorting URL // 2.1.4 Do define the sorting URL
if (! $is_in_sort) { if (! $is_in_sort) {
// loic1: patch #455484 ("Smart" order) // patch #455484 ("Smart" order)
$GLOBALS['cfg']['Order'] = strtoupper($GLOBALS['cfg']['Order']); $GLOBALS['cfg']['Order'] = strtoupper($GLOBALS['cfg']['Order']);
if ($GLOBALS['cfg']['Order'] === 'SMART') { if ($GLOBALS['cfg']['Order'] === 'SMART') {
$sort_order .= (preg_match('@time|date@i', $fields_meta[$i]->type)) ? 'DESC' : 'ASC'; $sort_order .= (preg_match('@time|date@i', $fields_meta[$i]->type)) ? 'DESC' : 'ASC';
@@ -1042,7 +1042,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$odd_row = true; $odd_row = true;
while ($row = PMA_DBI_fetch_row($dt_result)) { while ($row = PMA_DBI_fetch_row($dt_result)) {
// lem9: "vertical display" mode stuff // "vertical display" mode stuff
if ($row_no != 0 && $_SESSION['tmp_user_values']['repeat_cells'] != 0 && !($row_no % $_SESSION['tmp_user_values']['repeat_cells']) if ($row_no != 0 && $_SESSION['tmp_user_values']['repeat_cells'] != 0 && !($row_no % $_SESSION['tmp_user_values']['repeat_cells'])
&& ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
|| $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'))
@@ -1068,7 +1068,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$odd_row = ! $odd_row; $odd_row = ! $odd_row;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
|| $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
// loic1: pointer code part // pointer code part
echo ' <tr class="' . $class . '">' . "\n"; echo ' <tr class="' . $class . '">' . "\n";
$class = ''; $class = '';
} }
@@ -1252,7 +1252,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// n u m e r i c // n u m e r i c
if ($meta->numeric == 1) { if ($meta->numeric == 1) {
// lem9: if two fields have the same name (this is possible // if two fields have the same name (this is possible
// with self-join queries, for example), using $meta->name // with self-join queries, for example), using $meta->name
// will show both fields NULL even if only one is NULL, // will show both fields NULL even if only one is NULL,
// so use the $pointer // so use the $pointer
@@ -1272,7 +1272,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// b l o b // b l o b
} elseif (stristr($meta->type, 'BLOB')) { } elseif (stristr($meta->type, 'BLOB')) {
// loic1 : PMA_mysql_fetch_fields returns BLOB in place of // PMA_mysql_fetch_fields returns BLOB in place of
// TEXT fields type so we have to ensure it's really a BLOB // TEXT fields type so we have to ensure it's really a BLOB
$field_flags = PMA_DBI_field_flags($dt_result, $i); $field_flags = PMA_DBI_field_flags($dt_result, $i);
if (stristr($field_flags, 'BINARY')) { if (stristr($field_flags, 'BINARY')) {
@@ -1338,7 +1338,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P') { 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']) . '...'; $row[$i] = PMA_substr($row[$i], 0, $GLOBALS['cfg']['LimitChars']) . '...';
} }
// loic1: displays all space characters, 4 space // displays all space characters, 4 space
// characters for tabulations and <cr>/<lf> // characters for tabulations and <cr>/<lf>
$row[$i] = ($default_function != $transform_function ? $transform_function($row[$i], $transform_options, $meta) : $default_function($row[$i], array(), $meta)); $row[$i] = ($default_function != $transform_function ? $transform_function($row[$i], $transform_options, $meta) : $default_function($row[$i], array(), $meta));
@@ -1352,16 +1352,16 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
if (!isset($row[$i]) || is_null($row[$i])) { 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"; $vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n";
} elseif ($row[$i] != '') { } elseif ($row[$i] != '') {
// loic1: support blanks in the key // support blanks in the key
$relation_id = $row[$i]; $relation_id = $row[$i];
// nijel: Cut all fields to $GLOBALS['cfg']['LimitChars'] // Cut all fields to $GLOBALS['cfg']['LimitChars']
// lem9: (unless it's a link-type transformation) // (unless it's a link-type transformation)
if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P' && !strpos($transform_function, 'link') === true) { if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P' && !strpos($transform_function, 'link') === true) {
$row[$i] = PMA_substr($row[$i], 0, $GLOBALS['cfg']['LimitChars']) . '...'; $row[$i] = PMA_substr($row[$i], 0, $GLOBALS['cfg']['LimitChars']) . '...';
} }
// loic1: displays special characters from binaries // displays special characters from binaries
$field_flags = PMA_DBI_field_flags($dt_result, $i); $field_flags = PMA_DBI_field_flags($dt_result, $i);
if (isset($meta->_type) && $meta->_type === MYSQLI_TYPE_BIT) { if (isset($meta->_type) && $meta->_type === MYSQLI_TYPE_BIT) {
$row[$i] = PMA_printable_bit_value($row[$i], $meta->length); $row[$i] = PMA_printable_bit_value($row[$i], $meta->length);
@@ -1388,7 +1388,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$function_nowrap = $transform_function . '_nowrap'; $function_nowrap = $transform_function . '_nowrap';
$bool_nowrap = (($default_function != $transform_function && function_exists($function_nowrap)) ? $function_nowrap($transform_options) : false); $bool_nowrap = (($default_function != $transform_function && function_exists($function_nowrap)) ? $function_nowrap($transform_options) : false);
// loic1: do not wrap if date field type // do not wrap if date field type
$nowrap = ((preg_match('@DATE|TIME@i', $meta->type) || $bool_nowrap) ? ' nowrap' : ''); $nowrap = ((preg_match('@DATE|TIME@i', $meta->type) || $bool_nowrap) ? ' nowrap' : '');
$where_comparison = ' = \'' . PMA_sqlAddslashes($row[$i]) . '\''; $where_comparison = ' = \'' . PMA_sqlAddslashes($row[$i]) . '\'';
$vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options); $vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options);
@@ -1398,7 +1398,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
} }
} }
// lem9: output stored cell // output stored cell
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
|| $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
echo $vertical_display['data'][$row_no][$i]; echo $vertical_display['data'][$row_no][$i];
@@ -1987,7 +1987,6 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
// 2b ----- Get field references from Database ----- // 2b ----- Get field references from Database -----
// (see the 'relation' configuration variable) // (see the 'relation' configuration variable)
// loic1, 2002-03-02: extended to php3
// initialize map // initialize map
$map = array(); $map = array();

2
libraries/engines/innodb.lib.php
View File

@@ -175,7 +175,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
*/ */
function getPageBufferpool() function getPageBufferpool()
{ {
// rabus: The following query is only possible because we know // The following query is only possible because we know
// that we are on MySQL 5 here (checked above)! // that we are on MySQL 5 here (checked above)!
// side note: I love MySQL 5 for this. :-) // side note: I love MySQL 5 for this. :-)
$sql = ' $sql = '

2
libraries/export/csv.php
View File

@@ -178,7 +178,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
if (!isset($row[$j]) || is_null($row[$j])) { if (!isset($row[$j]) || is_null($row[$j])) {
$schema_insert .= $GLOBALS[$what . '_null']; $schema_insert .= $GLOBALS[$what . '_null'];
} elseif ($row[$j] == '0' || $row[$j] != '') { } elseif ($row[$j] == '0' || $row[$j] != '') {
// loic1 : always enclose fields // always enclose fields
if ($what == 'excel') { if ($what == 'excel') {
$row[$j] = preg_replace("/\015(\012)?/", "\012", $row[$j]); $row[$j] = preg_replace("/\015(\012)?/", "\012", $row[$j]);
} }

4
libraries/export/htmlword.php
View File

@@ -266,8 +266,8 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$schema_insert = '<tr class="print-category">'; $schema_insert = '<tr class="print-category">';
$type = $row['Type']; $type = $row['Type'];
// reformat mysql query output - staybyte - 9. June 2001 // reformat mysql query output
// loic1: set or enum types: slashes single quotes inside options // set or enum types: slashes single quotes inside options
if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) { if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
$tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1); $tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
$type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';

4
libraries/export/latex.php
View File

@@ -393,8 +393,8 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
while ($row = PMA_DBI_fetch_assoc($result)) { while ($row = PMA_DBI_fetch_assoc($result)) {
$type = $row['Type']; $type = $row['Type'];
// reformat mysql query output - staybyte - 9. June 2001 // reformat mysql query output
// loic1: set or enum types: slashes single quotes inside options // set or enum types: slashes single quotes inside options
if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) { if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
$tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1); $tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
$type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';

4
libraries/export/odt.php
View File

@@ -327,8 +327,8 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">' $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars($row['Field']) . '</text:p>' . '<text:p>' . htmlspecialchars($row['Field']) . '</text:p>'
. '</table:table-cell>'; . '</table:table-cell>';
// reformat mysql query output - staybyte - 9. June 2001 // reformat mysql query output
// loic1: set or enum types: slashes single quotes inside options // set or enum types: slashes single quotes inside options
$field_name = $row['Field']; $field_name = $row['Field'];
$type = $row['Type']; $type = $row['Type'];
if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) { if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {

2
libraries/export/php_array.php
View File

@@ -2,7 +2,6 @@
/** /**
* Set of functions used to build dumps of tables as PHP Arrays * Set of functions used to build dumps of tables as PHP Arrays
* *
* @author Geoffray Warnants <http://www.geoffray.be>
* @version 0.2b (20090704) * @version 0.2b (20090704)
*/ */
if (! defined('PHPMYADMIN')) { if (! defined('PHPMYADMIN')) {
@@ -69,7 +68,6 @@ function PMA_exportHeader()
'<?php' . $GLOBALS['crlf'] '<?php' . $GLOBALS['crlf']
. '/**' . $GLOBALS['crlf'] . '/**' . $GLOBALS['crlf']
. ' * Export to PHP Array plugin for PHPMyAdmin' . $GLOBALS['crlf'] . ' * Export to PHP Array plugin for PHPMyAdmin' . $GLOBALS['crlf']
. ' * @author Geoffray Warnants' . $GLOBALS['crlf']
. ' * @version 0.2b' . $GLOBALS['crlf'] . ' * @version 0.2b' . $GLOBALS['crlf']
. ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf'] . ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf']
); );

1
libraries/export/sql.php
View File

@@ -848,7 +848,6 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE,
* *
* @see PMA_getTableContentFast(), PMA_getTableContentOld() * @see PMA_getTableContentFast(), PMA_getTableContentOld()
* *
* @author staybyte
*/ */
function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
{ {

4
libraries/export/texytext.php
View File

@@ -255,8 +255,8 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$text_output = ''; $text_output = '';
$type = $row['Type']; $type = $row['Type'];
// reformat mysql query output - staybyte - 9. June 2001 // reformat mysql query output
// loic1: set or enum types: slashes single quotes inside options // set or enum types: slashes single quotes inside options
if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) { if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
$tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1); $tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
$type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';

1
libraries/iconv_wrapper.lib.php
View File

@@ -49,7 +49,6 @@ $gnu_iconv_to_aix_iconv_codepage_map = array (
* *
* @access public * @access public
* *
* @author bwiberg Björn Wiberg <Bjorn.Wiberg@its.uu.se>
*/ */
function PMA_aix_iconv_wrapper($in_charset, $out_charset, $str) { function PMA_aix_iconv_wrapper($in_charset, $out_charset, $str) {

10
libraries/import.lib.php
View File

@@ -303,8 +303,6 @@ function PMA_importGetNextChunk($size = 32768)
* Returns the "Excel" column name (i.e. 1 = "A", 26 = "Z", 27 = "AA", etc.) * Returns the "Excel" column name (i.e. 1 = "A", 26 = "Z", 27 = "AA", etc.)
* This algorithm only works up to ZZ. it fails on AAA (up to 701 columns) * This algorithm only works up to ZZ. it fails on AAA (up to 701 columns)
* *
* @author Derek Schaefer (derek.schaefer@gmail.com)
*
* @access public * @access public
* *
* @uses chr() * @uses chr()
@@ -344,7 +342,6 @@ function PMA_getColumnAlphaName($num)
* Returns the column number based on the Excel name. * Returns the column number based on the Excel name.
* So "A" = 1, "AZ" = 27, etc. * So "A" = 1, "AZ" = 27, etc.
* *
* @author Derek Schaefer (derek.schaefer@gmail.com)
* *
* @access public * @access public
* *
@@ -396,7 +393,6 @@ define("SIZES", 1);
/** /**
* Obtains the precision (total # of digits) from a size of type decimal * Obtains the precision (total # of digits) from a size of type decimal
* *
* @author Derek Schaefer (derek.schaefer@gmail.com)
* *
* @access public * @access public
* *
@@ -412,7 +408,6 @@ function PMA_getM($last_cumulative_size) {
/** /**
* Obtains the scale (# of digits to the right of the decimal point) from a size of type decimal * Obtains the scale (# of digits to the right of the decimal point) from a size of type decimal
* *
* @author Derek Schaefer (derek.schaefer@gmail.com)
* *
* @access public * @access public
* *
@@ -429,7 +424,6 @@ function PMA_getD($last_cumulative_size) {
/** /**
* Obtains the decimal size of a given cell * Obtains the decimal size of a given cell
* *
* @author Derek Schaefer (derek.schaefer@gmail.com)
* *
* @access public * @access public
* *
@@ -452,7 +446,6 @@ function PMA_getDecimalSize(&$cell) {
/** /**
* Obtains the size of the given cell * Obtains the size of the given cell
* *
* @author Derek Schaefer (derek.schaefer@gmail.com)
* *
* @todo Handle the error cases more elegantly * @todo Handle the error cases more elegantly
* *
@@ -679,7 +672,6 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type
/** /**
* Determines what MySQL type a cell is * Determines what MySQL type a cell is
* *
* @author Derek Schaefer (derek.schaefer@gmail.com)
* *
* @access public * @access public
* *
@@ -721,7 +713,6 @@ function PMA_detectType($last_cumulative_type, &$cell) {
/** /**
* Determines if the column types are int, decimal, or string * Determines if the column types are int, decimal, or string
* *
* @author Derek Schaefer (derek.schaefer@gmail.com)
* *
* @link http://wiki.phpmyadmin.net/pma/Devel:Import * @link http://wiki.phpmyadmin.net/pma/Devel:Import
* *
@@ -825,7 +816,6 @@ $import_notice = NULL;
* Builds and executes SQL statements to create the database and tables * Builds and executes SQL statements to create the database and tables
* as necessary, as well as insert all the data. * as necessary, as well as insert all the data.
* *
* @author Derek Schaefer (derek.schaefer@gmail.com)
* *
* @link http://wiki.phpmyadmin.net/pma/Devel:Import * @link http://wiki.phpmyadmin.net/pma/Devel:Import
* *

1
libraries/js_escape.lib.php
View File

@@ -3,7 +3,6 @@
/** /**
* Javascript escaping functions. * Javascript escaping functions.
* *
* @author Michal Čihař <michal@cihar.com>
* @package phpMyAdmin * @package phpMyAdmin
* *
* @version $Id$ * @version $Id$

2
libraries/parse_analyze.lib.php
View File

@@ -16,7 +16,7 @@ $GLOBALS['unparsed_sql'] = $sql_query;
$parsed_sql = PMA_SQP_parse($sql_query); $parsed_sql = PMA_SQP_parse($sql_query);
$analyzed_sql = PMA_SQP_analyze($parsed_sql); $analyzed_sql = PMA_SQP_analyze($parsed_sql);
// lem9: for bug 780516: now that we use case insensitive preg_match // for bug 780516: now that we use case insensitive preg_match
// or flags from the analyser, do not put back the reformatted query // or flags from the analyser, do not put back the reformatted query
// into $sql_query, to make this kind of query work without // into $sql_query, to make this kind of query work without
// capitalizing keywords: // capitalizing keywords:

11
libraries/relation.lib.php
View File

@@ -25,7 +25,6 @@ require_once './libraries/Table.class.php';
* *
* @access public * @access public
* *
* @author Mike Beck <mikebeck@users.sourceforge.net>
*/ */
function PMA_query_as_controluser($sql, $show_error = true, $options = 0) function PMA_query_as_controluser($sql, $show_error = true, $options = 0)
{ {
@@ -217,7 +216,6 @@ function PMA_printDiagMessageForParameter($parameter, $relation_parameter_set, $
* @uses PMA_DBI_fetch_row() * @uses PMA_DBI_fetch_row()
* @uses PMA_DBI_free_result() * @uses PMA_DBI_free_result()
* @access protected * @access protected
* @author Mike Beck <mikebeck@users.sourceforge.net>
* @return array the relation parameters for the current user * @return array the relation parameters for the current user
*/ */
function PMA__getRelationsParam() function PMA__getRelationsParam()
@@ -361,8 +359,6 @@ function PMA__getRelationsParam()
* Gets all Relations to foreign tables for a given table or * Gets all Relations to foreign tables for a given table or
* optionally a given column in a table * optionally a given column in a table
* *
* @author Mike Beck <mikebeck@users.sourceforge.net>
* @author Marc Delisle
* @access public * @access public
* @uses $GLOBALS['controllink'] * @uses $GLOBALS['controllink']
* @uses $GLOBALS['information_schema_relations'] * @uses $GLOBALS['information_schema_relations']
@@ -471,7 +467,6 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both')
* Gets the display field of a table * Gets the display field of a table
* *
* @access public * @access public
* @author Mike Beck <mikebeck@users.sourceforge.net>
* @uses $GLOBALS['controllink'] * @uses $GLOBALS['controllink']
* @uses PMA_getRelationsParam() * @uses PMA_getRelationsParam()
* @uses PMA_backquote() * @uses PMA_backquote()
@@ -522,8 +517,6 @@ function PMA_getDisplayField($db, $table)
/** /**
* Gets the comments for all rows of a table or the db itself * Gets the comments for all rows of a table or the db itself
* *
* @author Mike Beck <mikebeck@users.sourceforge.net>
* @author lem9
* @access public * @access public
* @uses PMA_DBI_get_fields() * @uses PMA_DBI_get_fields()
* @uses PMA_getDbComment() * @uses PMA_getDbComment()
@@ -555,8 +548,6 @@ function PMA_getComments($db, $table = '')
/** /**
* Gets the comment for a db * Gets the comment for a db
* *
* @author Mike Beck <mikebeck@users.sourceforge.net>
* @author lem9
* @access public * @access public
* @uses PMA_DBI_QUERY_STORE * @uses PMA_DBI_QUERY_STORE
* @uses PMA_DBI_num_rows() * @uses PMA_DBI_num_rows()
@@ -598,8 +589,6 @@ function PMA_getDbComment($db)
/** /**
* Gets the comment for a db * Gets the comment for a db
* *
* @author Mike Beck <mikebeck@users.sourceforge.net>
* @author lem9
* @access public * @access public
* @uses PMA_DBI_QUERY_STORE * @uses PMA_DBI_QUERY_STORE
* @uses PMA_DBI_num_rows() * @uses PMA_DBI_num_rows()

2
libraries/select_server.lib.php
View File

@@ -1,7 +1,7 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* Code for displaying server selection written by nijel * Code for displaying server selection
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin * @package phpMyAdmin

11
libraries/sqlparser.lib.php
View File

@@ -1,9 +1,6 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** SQL Parser Functions for phpMyAdmin /** SQL Parser Functions for phpMyAdmin
*
* Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net>
* http://www.orbis-terrarum.net/?l=people.robbat2
* *
* These functions define an SQL parser system, capable of understanding and * These functions define an SQL parser system, capable of understanding and
* extracting data from a MySQL type SQL query. * extracting data from a MySQL type SQL query.
@@ -18,8 +15,8 @@
* If you want to extract data from it then, you just need to run * If you want to extract data from it then, you just need to run
* $sql_info = PMA_SQP_analyze($parsed_sql); * $sql_info = PMA_SQP_analyze($parsed_sql);
* *
* lem9: See comments in PMA_SQP_analyze for the returned info * See comments in PMA_SQP_analyze for the returned info
* from the analyzer. * from the analyzer.
* *
* If you want a pretty-printed version of the query, do: * If you want a pretty-printed version of the query, do:
* $string = PMA_SQP_formatHtml($parsed_sql); * $string = PMA_SQP_formatHtml($parsed_sql);
@@ -217,7 +214,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
global $mysql_charsets, $mysql_collations_flat, $mysql_charsets_count, $mysql_collations_count; global $mysql_charsets, $mysql_collations_flat, $mysql_charsets_count, $mysql_collations_count;
global $PMA_SQPdata_forbidden_word, $PMA_SQPdata_forbidden_word_cnt; global $PMA_SQPdata_forbidden_word, $PMA_SQPdata_forbidden_word_cnt;
// rabus: Convert all line feeds to Unix style // Convert all line feeds to Unix style
$sql = str_replace("\r\n", "\n", $sql); $sql = str_replace("\r\n", "\n", $sql);
$sql = str_replace("\r", "\n", $sql); $sql = str_replace("\r", "\n", $sql);
@@ -848,7 +845,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// for GROUP_CONCAT(...) // for GROUP_CONCAT(...)
$in_group_concat = FALSE; $in_group_concat = FALSE;
/* Description of analyzer results by lem9 /* Description of analyzer results
* *
* db, table, column, alias * db, table, column, alias
* ------------------------ * ------------------------

1
libraries/sqlvalidator.class.php
View File

@@ -23,7 +23,6 @@
* *
* @access public * @access public
* *
* @author Robin Johnson <robbat2@users.sourceforge.net>
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin * @package phpMyAdmin

2
libraries/string_mb.lib.php
View File

@@ -23,7 +23,6 @@
* @param string string to count * @param string string to count
* @return int string length * @return int string length
* @access public * @access public
* @author nijel
* @todo rename to PM_STR_len() * @todo rename to PM_STR_len()
*/ */
function PMA_strlen($string) function PMA_strlen($string)
@@ -40,7 +39,6 @@ function PMA_strlen($string)
* @param int length of substring * @param int length of substring
* @return int substring * @return int substring
* @access public * @access public
* @author nijel
* @todo rename to PM_STR_sub() * @todo rename to PM_STR_sub()
*/ */
function PMA_substr($string, $start, $length = 2147483647) function PMA_substr($string, $start, $length = 2147483647)

2
libraries/string_native.lib.php
View File

@@ -23,7 +23,6 @@
* @param string string to count * @param string string to count
* @return int string length * @return int string length
* @access public * @access public
* @author nijel
* @todo rename to PM_STR_len() * @todo rename to PM_STR_len()
*/ */
function PMA_strlen($string) function PMA_strlen($string)
@@ -40,7 +39,6 @@ function PMA_strlen($string)
* @param int length of substring * @param int length of substring
* @return int substring * @return int substring
* @access public * @access public
* @author nijel
* @todo rename to PM_STR_sub() * @todo rename to PM_STR_sub()
*/ */
function PMA_substr($string, $start, $length = 2147483647) function PMA_substr($string, $start, $length = 2147483647)

4
libraries/tbl_properties.inc.php
View File

@@ -108,7 +108,7 @@ $header_cells[] = $strCollation;
$header_cells[] = $strAttr; $header_cells[] = $strAttr;
$header_cells[] = $strNull; $header_cells[] = $strNull;
// lem9: We could remove this 'if' and let the key information be shown and // We could remove this 'if' and let the key information be shown and
// editable. However, for this to work, tbl_alter must be modified to use the // editable. However, for this to work, tbl_alter must be modified to use the
// key fields, as tbl_addfield does. // key fields, as tbl_addfield does.
@@ -504,7 +504,7 @@ for ($i = 0; $i < $num_fields; $i++) {
$ci++; $ci++;
// column indexes // column indexes
// lem9: See my other comment about removing this 'if'. // See my other comment about removing this 'if'.
if (!$is_backup) { if (!$is_backup) {
$content_cells[$i][$ci] = '<select name="field_key[' . $i . ']"' $content_cells[$i][$ci] = '<select name="field_key[' . $i . ']"'
. ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">'; . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">';

3
libraries/transformations.lib.php
View File

@@ -71,7 +71,6 @@ function PMA_transformation_getOptions($option_string)
* Gets all available MIME-types * Gets all available MIME-types
* *
* @access public * @access public
* @author Garvin Hicking <me@supergarv.de>
* @uses opendir() * @uses opendir()
* @uses readdir() * @uses readdir()
* @uses closedir() * @uses closedir()
@@ -139,8 +138,6 @@ function PMA_getAvailableMIMEtypes()
* @uses PMA_backquote() * @uses PMA_backquote()
* @uses PMA_sqlAddslashes() * @uses PMA_sqlAddslashes()
* @uses PMA_DBI_fetch_result() * @uses PMA_DBI_fetch_result()
* @author Mike Beck <mikebeck@users.sourceforge.net>
* @author Garvin Hicking <me@supergarv.de>
* @access public * @access public
* @param string $db the name of the db to check for * @param string $db the name of the db to check for
* @param string $table the name of the table to check for * @param string $table the name of the table to check for

3
libraries/url_generating.lib.php
View File

@@ -30,7 +30,6 @@
* *
* @access public * @access public
* *
* @author nijel
*/ */
function PMA_generate_common_hidden_inputs($db = '', $table = '', $indent = 0, $skip = array()) function PMA_generate_common_hidden_inputs($db = '', $table = '', $indent = 0, $skip = array())
{ {
@@ -197,7 +196,6 @@ function PMA_getHiddenFields($values, $pre = '')
* instead of '&amp;' for dividing URL parameters * instead of '&amp;' for dividing URL parameters
* @return string string with URL parameters * @return string string with URL parameters
* @access public * @access public
* @author nijel
*/ */
function PMA_generate_common_url() function PMA_generate_common_url()
{ {
@@ -289,7 +287,6 @@ function PMA_generate_common_url()
* @param string whether to encode separator or not, currently 'none' or 'html' * @param string whether to encode separator or not, currently 'none' or 'html'
* @return string character used for separating url parts usally ; or & * @return string character used for separating url parts usally ; or &
* @access public * @access public
* @author nijel
*/ */
function PMA_get_arg_separator($encode = 'none') function PMA_get_arg_separator($encode = 'none')
{ {

2
libraries/zip.lib.php
View File

@@ -128,7 +128,7 @@ class zipfile
// "data descriptor" segment (optional but necessary if archive is not // "data descriptor" segment (optional but necessary if archive is not
// served as file) // served as file)
// nijel(2004-10-19): this seems not to be needed at all and causes // this seems not to be needed at all and causes
// problems in some cases (bug #1037737) // problems in some cases (bug #1037737)
//$fr .= pack('V', $crc); // crc32 //$fr .= pack('V', $crc); // crc32
//$fr .= pack('V', $c_len); // compressed filesize //$fr .= pack('V', $c_len); // compressed filesize

2
libraries/zip_extension.lib.php
View File

@@ -13,7 +13,6 @@
* @param string $file * @param string $file
* @return array ($error_message, $file_data); $error_message * @return array ($error_message, $file_data); $error_message
* is empty if no error * is empty if no error
* @author lem9
*/ */
function PMA_getZipContents($file) function PMA_getZipContents($file)
@@ -75,7 +74,6 @@ function PMA_getZipContents($file)
* *
* @param integer error code * @param integer error code
* @return string error message * @return string error message
* @author lem9
*/ */
function PMA_getZipError($code) function PMA_getZipError($code)
{ {

10
pdf_schema.php
View File

@@ -1,7 +1,6 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* Contributed by Maxime Delorme and merged by lem9
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin * @package phpMyAdmin
@@ -581,8 +580,6 @@ class PMA_RT_Table {
$pdf->SetFillColor(255); $pdf->SetFillColor(255);
foreach ($this->fields AS $field) { foreach ($this->fields AS $field) {
// loic1 : PHP3 fix
// if (in_array($field, $this->primary)) {
if ($setcolor) { if ($setcolor) {
if (in_array($field, $this->primary)) { if (in_array($field, $this->primary)) {
$pdf->SetFillColor(215, 121, 123); $pdf->SetFillColor(215, 121, 123);
@@ -1060,7 +1057,6 @@ class PMA_RT {
// . ' AND foreign_table IN (' . $intable . ')'; // . ' AND foreign_table IN (' . $intable . ')';
// $result = PMA_query_as_controluser($sql); // $result = PMA_query_as_controluser($sql);
// lem9:
// previous logic was checking master tables and foreign tables // previous logic was checking master tables and foreign tables
// but I think that looping on every table of the pdf page as a master // but I think that looping on every table of the pdf page as a master
// and finding its foreigns is OK (then we can support innodb) // and finding its foreigns is OK (then we can support innodb)
@@ -1080,7 +1076,7 @@ class PMA_RT {
} // end while } // end while
} // end if } // end if
} // end while } // end while
// loic1: also show tables without relations // also show tables without relations
// $norelations = TRUE; // $norelations = TRUE;
// if ($result && PMA_DBI_num_rows($result) > 0) { // if ($result && PMA_DBI_num_rows($result) > 0) {
// $norelations = FALSE; // $norelations = FALSE;
@@ -1286,8 +1282,8 @@ function PMA_RT_DOC($alltables)
while ($row = PMA_DBI_fetch_assoc($result)) { while ($row = PMA_DBI_fetch_assoc($result)) {
$type = $row['Type']; $type = $row['Type'];
// reformat mysql query output - staybyte - 9. June 2001 // reformat mysql query output
// loic1: set or enum types: slashes single quotes inside options // set or enum types: slashes single quotes inside options
if (preg_match('@^(set|enum)\((.+)\)$@i', $type, $tmp)) { if (preg_match('@^(set|enum)\((.+)\)$@i', $type, $tmp)) {
$tmp[2] = substr(preg_replace("@([^,])''@", "\\1\\'", ',' . $tmp[2]), 1); $tmp[2] = substr(preg_replace("@([^,])''@", "\\1\\'", ',' . $tmp[2]), 1);
$type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';

1
pmd/scripts/move.js
View File

@@ -1,7 +1,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* @version $Id$ * @version $Id$
* @author Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
* @package phpMyAdmin-Designer * @package phpMyAdmin-Designer
*/ */

1
pmd_common.php
View File

@@ -1,7 +1,6 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* @author Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
* @version $Id$ * @version $Id$
* @package phpMyAdmin-Designer * @package phpMyAdmin-Designer
*/ */

1
pmd_display_field.php
View File

@@ -1,7 +1,6 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* @author Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
* @version $Id$ * @version $Id$
* @package phpMyAdmin-Designer * @package phpMyAdmin-Designer
*/ */

1
pmd_general.php
View File

@@ -1,7 +1,6 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* @author Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
* @version $Id$ * @version $Id$
* @package phpMyAdmin-Designer * @package phpMyAdmin-Designer
*/ */

2
server_privileges.php
View File

@@ -1389,7 +1389,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
PMA_DBI_free_result($res); PMA_DBI_free_result($res);
unset($res); unset($res);
} else { } else {
// rabus: This message is hardcoded because I will replace it by // This message is hardcoded because I will replace it by
// a automatic repair feature soon. // a automatic repair feature soon.
$raw = 'Your privilege table structure seems to be older than' $raw = 'Your privilege table structure seems to be older than'
. ' this MySQL version!<br />' . ' this MySQL version!<br />'

1
setup/config.php
View File

@@ -3,7 +3,6 @@
* Front controller for config view / download and clear * Front controller for config view / download and clear
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */

1
setup/frames/config.inc.php
View File

@@ -3,7 +3,6 @@
* Config file view and save screen * Config file view and save screen
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */

1
setup/frames/form.inc.php
View File

@@ -3,7 +3,6 @@
* Form edit view * Form edit view
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */

1
setup/frames/index.inc.php
View File

@@ -3,7 +3,6 @@
* Overview (main page) * Overview (main page)
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */

1
setup/frames/menu.inc.php
View File

@@ -3,7 +3,6 @@
* Menu items * Menu items
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */

1
setup/frames/servers.inc.php
View File

@@ -3,7 +3,6 @@
* Server create and edit view * Server create and edit view
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */

1
setup/index.php
View File

@@ -3,7 +3,6 @@
* Front controller for setup script * Front controller for setup script
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @copyright Copyright (c) 2008, Piotr Przybylski <piotrprz@gmail.com> * @copyright Copyright (c) 2008, Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$

1
setup/lib/ConfigFile.class.php
View File

@@ -2,7 +2,6 @@
/** /**
* Config file management and generation * Config file management and generation
* *
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
* @package phpMyAdmin-setup * @package phpMyAdmin-setup

1
setup/lib/Form.class.php
View File

@@ -3,7 +3,6 @@
* Form handling code. * Form handling code.
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */

1
setup/lib/FormDisplay.class.php
View File

@@ -9,7 +9,6 @@
* slashes changed to hyphens, eg. Servers-4-verbose * slashes changed to hyphens, eg. Servers-4-verbose
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */

3
setup/lib/FormDisplay.tpl.php
View File

@@ -3,7 +3,6 @@
* Form templates * Form templates
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */
@@ -291,4 +290,4 @@ function display_errors($name, $error_list) {
} }
echo '</dl>'; echo '</dl>';
} }
?> ?>

1
setup/lib/common.inc.php
View File

@@ -3,7 +3,6 @@
* Loads libraries/common.inc.php and preforms some additional actions * Loads libraries/common.inc.php and preforms some additional actions
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */

1
setup/lib/config_info.inc.php
View File

@@ -7,7 +7,6 @@
* only allowed values for select fields and type overrides. * only allowed values for select fields and type overrides.
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */

3
setup/lib/form_processing.lib.php
View File

@@ -3,7 +3,6 @@
* Formset processing library * Formset processing library
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */
@@ -58,4 +57,4 @@ function process_formset(FormDisplay $form_display) {
} }
} }
} }
?> ?>

1
setup/lib/forms.inc.php
View File

@@ -13,7 +13,6 @@
* 'pmadb' => 'phpmyadmin'))); * 'pmadb' => 'phpmyadmin')));
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */

1
setup/lib/index.lib.php
View File

@@ -7,7 +7,6 @@
* Version check taken from the old setup script by Michal Čihař <michal@cihar.com> * Version check taken from the old setup script by Michal Čihař <michal@cihar.com>
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */

3
setup/lib/validate.lib.php
View File

@@ -12,7 +12,6 @@
* Valdiation functions are assigned in $cfg_db['_validators'] (config_info.inc.php). * Valdiation functions are assigned in $cfg_db['_validators'] (config_info.inc.php).
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$
*/ */
@@ -359,4 +358,4 @@ function validate_non_negative_number($path, $values)
{ {
return array($path => test_number($path, $values, false, true, PHP_INT_MAX, 'error_nan_nneg')); return array($path => test_number($path, $values, false, true, PHP_INT_MAX, 'error_nan_nneg'));
} }
?> ?>

1
setup/validate.php
View File

@@ -3,7 +3,6 @@
* Validation callback. * Validation callback.
* *
* @package phpMyAdmin-setup * @package phpMyAdmin-setup
* @author Piotr Przybylski <piotrprz@gmail.com>
* @copyright Copyright (c) 2008, Piotr Przybylski <piotrprz@gmail.com> * @copyright Copyright (c) 2008, Piotr Przybylski <piotrprz@gmail.com>
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
* @version $Id$ * @version $Id$

23
tbl_change.php
View File

@@ -201,7 +201,7 @@ $foreigners = PMA_getForeigners($db, $table);
/** /**
* Displays the form * Displays the form
*/ */
// loic1: autocomplete feature of IE kills the "onchange" event handler and it // autocomplete feature of IE kills the "onchange" event handler and it
// must be replaced by the "onpropertychange" one in this case // must be replaced by the "onpropertychange" one in this case
$chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5 && PMA_USR_BROWSER_VER < 7) $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5 && PMA_USR_BROWSER_VER < 7)
? 'onpropertychange' ? 'onpropertychange'
@@ -327,11 +327,10 @@ foreach ($rows as $row_id => $vrow) {
// d a t e t i m e // d a t e t i m e
// //
// loic1: current date should not be set as default if the field is NULL // Current date should not be set as default if the field is NULL
// for the current row // for the current row, but do not put here the current datetime
// lem9: but do not put here the current datetime if there is a default // if there is a default value (the real default value will be set
// value (the real default value will be set in the // in the Default value logic below)
// Default value logic below)
// Note: (tested in MySQL 4.0.16): when lang is some UTF-8, // Note: (tested in MySQL 4.0.16): when lang is some UTF-8,
// $field['Default'] is not set if it contains NULL: // $field['Default'] is not set if it contains NULL:
@@ -437,7 +436,7 @@ foreach ($rows as $row_id => $vrow) {
} elseif ($field['True_Type'] == 'bit') { } elseif ($field['True_Type'] == 'bit') {
$special_chars = PMA_printable_bit_value($vrow[$field['Field']], $extracted_fieldspec['spec_in_brackets']); $special_chars = PMA_printable_bit_value($vrow[$field['Field']], $extracted_fieldspec['spec_in_brackets']);
} else { } else {
// loic1: special binary "characters" // special binary "characters"
if ($field['is_binary'] || $field['is_blob']) { if ($field['is_binary'] || $field['is_blob']) {
if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && !$cfg['ProtectBinary']) { if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && !$cfg['ProtectBinary']) {
$vrow[$field['Field']] = bin2hex($vrow[$field['Field']]); $vrow[$field['Field']] = bin2hex($vrow[$field['Field']]);
@@ -453,15 +452,15 @@ foreach ($rows as $row_id => $vrow) {
$data = $vrow[$field['Field']]; $data = $vrow[$field['Field']];
} // end if... else... } // end if... else...
// loic1: if a timestamp field value is not included in an update // If a timestamp field value is not included in an update
// statement MySQL auto-update it to the current timestamp // statement MySQL auto-update it to the current timestamp;
// lem9: however, things have changed since MySQL 4.1, so // however, things have changed since MySQL 4.1, so
// it's better to set a fields_prev in this situation // it's better to set a fields_prev in this situation
$backup_field = '<input type="hidden" name="fields_prev' $backup_field = '<input type="hidden" name="fields_prev'
. $field_name_appendix . '" value="' . $field_name_appendix . '" value="'
. htmlspecialchars($vrow[$field['Field']]) . '" />'; . htmlspecialchars($vrow[$field['Field']]) . '" />';
} else { } else {
// loic1: display default values // display default values
if (!isset($field['Default'])) { if (!isset($field['Default'])) {
$field['Default'] = ''; $field['Default'] = '';
$real_null_value = TRUE; $real_null_value = TRUE;

2
tbl_operations.php
View File

@@ -308,7 +308,7 @@ if (strstr($show_comment, '; InnoDB free') === false) {
// DELAY_KEY_WRITE, CHECKSUM, : MyISAM only // DELAY_KEY_WRITE, CHECKSUM, : MyISAM only
// AUTO_INCREMENT: MyISAM and InnoDB since 5.0.3, PBXT // AUTO_INCREMENT: MyISAM and InnoDB since 5.0.3, PBXT
// nijel: Here should be version check for InnoDB, however it is supported // Here should be version check for InnoDB, however it is supported
// in >5.0.4, >4.1.12 and >4.0.11, so I decided not to // in >5.0.4, >4.1.12 and >4.0.11, so I decided not to
// check for version // check for version
?> ?>

5
tbl_printview.php
View File

@@ -160,8 +160,8 @@ foreach ($the_tables as $key => $table) {
<?php <?php
while ($row = PMA_DBI_fetch_assoc($result)) { while ($row = PMA_DBI_fetch_assoc($result)) {
$type = $row['Type']; $type = $row['Type'];
// reformat mysql query output - staybyte - 9. June 2001 // reformat mysql query output
// loic1: set or enum types: slashes single quotes inside options // set or enum types: slashes single quotes inside options
if (preg_match('@^(set|enum)\((.+)\)$@i', $type, $tmp)) { if (preg_match('@^(set|enum)\((.+)\)$@i', $type, $tmp)) {
$tmp[2] = substr(preg_replace('@([^,])\'\'@', '\\1\\\'', $tmp[2] = substr(preg_replace('@([^,])\'\'@', '\\1\\\'',
',' . $tmp[2]), 1); ',' . $tmp[2]), 1);
@@ -270,7 +270,6 @@ foreach ($the_tables as $key => $table) {
/** /**
* Displays Space usage and row statistics * Displays Space usage and row statistics
* *
* staybyte - 9 June 2001
*/ */
if ($cfg['ShowStats']) { if ($cfg['ShowStats']) {
$nonisam = false; $nonisam = false;

2
tbl_select.php
View File

@@ -67,7 +67,7 @@ if (!isset($param) || $param[0] == '') {
while ($row = PMA_DBI_fetch_assoc($result)) { while ($row = PMA_DBI_fetch_assoc($result)) {
$fields_list[] = $row['Field']; $fields_list[] = $row['Field'];
$type = $row['Type']; $type = $row['Type'];
// reformat mysql query output - staybyte - 9. June 2001 // reformat mysql query output
if (strncasecmp($type, 'set', 3) == 0 if (strncasecmp($type, 'set', 3) == 0
|| strncasecmp($type, 'enum', 4) == 0) { || strncasecmp($type, 'enum', 4) == 0) {
$type = str_replace(',', ', ', $type); $type = str_replace(',', ', ', $type);

6
tbl_structure.php
View File

@@ -611,10 +611,8 @@ PMA_generate_slider_effect('tablestatistics', $strDetails);
/** /**
* Displays Space usage and row statistics * Displays Space usage and row statistics
*/ */
// BEGIN - Calc Table Space - staybyte - 9 June 2001 // BEGIN - Calc Table Space
// loic1, 22 feb. 2002: updated with patch from // Get valid statistics whatever is the table type
// Joshua Nye <josh at boxcarmedia.com> to get valid
// statistics whatever is the table type
if ($cfg['ShowStats']) { if ($cfg['ShowStats']) {
if (empty($showtable)) { if (empty($showtable)) {
$showtable = PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], null, true); $showtable = PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], null, true);

1
tbl_tracking.php
View File

@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* *
* @author Alexander Rutkowski
* @version $Id$ * @version $Id$
* @package phpMyAdmin * @package phpMyAdmin
*/ */

1
test/PMA_Message_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test for PMA_Message class * Test for PMA_Message class
* *
* @author Michal Biniek <michal@bystrzyca.pl>
* @version $Id$ * @version $Id$
*/ */

1
test/PMA_cache_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test for caching data in session * Test for caching data in session
* *
* @author Michal Biniek <michal@bystrzyca.pl>
* @package phpMyAdmin-test * @package phpMyAdmin-test
* @version $Id: PMA_cache_test.php * @version $Id: PMA_cache_test.php
*/ */

1
test/PMA_escapeJsString_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test for javascript escaping. * Test for javascript escaping.
* *
* @author Michal Čihař <michal@cihar.com>
* @package phpMyAdmin-test * @package phpMyAdmin-test
* @version $Id$ * @version $Id$
*/ */

1
test/PMA_escapeMySqlWildcards_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test for MySQL Wildcards escaping/unescaping * Test for MySQL Wildcards escaping/unescaping
* *
* @author Michal Biniek <michal@bystrzyca.pl>
* @package phpMyAdmin-test * @package phpMyAdmin-test
* @version $Id$ * @version $Id$
*/ */

1
test/PMA_foreignKeySupported_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test for supporting foreign key * Test for supporting foreign key
* *
* @author Michal Biniek <michal@bystrzyca.pl>
* @package phpMyAdmin-test * @package phpMyAdmin-test
* @version $Id$ * @version $Id$
*/ */

1
test/PMA_formatNumberByteDown_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test for format number and byte * Test for format number and byte
* *
* @author Michal Biniek <michal@bystrzyca.pl>
* @package phpMyAdmin-test * @package phpMyAdmin-test
* @version $Id: PMA_formatNumberByteDown_test.php * @version $Id: PMA_formatNumberByteDown_test.php
*/ */

1
test/PMA_headerLocation_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test for PMA_sendHeaderLocation * Test for PMA_sendHeaderLocation
* *
* @author Michal Biniek <michal@bystrzyca.pl>
* @version $Id$ * @version $Id$
*/ */

1
test/PMA_localisedDateTimespan_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test for generating localised date or timespan expression * Test for generating localised date or timespan expression
* *
* @author Michal Biniek <michal@bystrzyca.pl>
* @package phpMyAdmin-test * @package phpMyAdmin-test
* @version $Id: PMA_localisedDateTimespan_test.php * @version $Id: PMA_localisedDateTimespan_test.php
*/ */

1
test/PMA_printableBitValue_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test printableBitValue function * Test printableBitValue function
* *
* @author Michal Biniek <michal@bystrzyca.pl>
* @package phpMyAdmin-test * @package phpMyAdmin-test
* @version $Id: PMA_printableBitValue_test.php * @version $Id: PMA_printableBitValue_test.php
*/ */

1
test/PMA_quoting_slashing_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test for quoting, slashing/backslashing * Test for quoting, slashing/backslashing
* *
* @author Michal Biniek <michal@bystrzyca.pl>
* @package phpMyAdmin-test * @package phpMyAdmin-test
* @version $Id: PMA_quoting_slashing_test.php * @version $Id: PMA_quoting_slashing_test.php
*/ */

1
test/PMA_showHint_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test for showHint function * Test for showHint function
* *
* @author Michal Biniek <michal@bystrzyca.pl>
* @package phpMyAdmin-test * @package phpMyAdmin-test
* @version $Id: PMA_showHint_test.php * @version $Id: PMA_showHint_test.php
*/ */

1
test/PMA_stringOperations_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test for several string operations * Test for several string operations
* *
* @author Michal Biniek <michal@bystrzyca.pl>
* @version $Id: PMA_stringOperations_test.php * @version $Id: PMA_stringOperations_test.php
*/ */

1
test/PMA_whichCrlf_test.php
View File

@@ -3,7 +3,6 @@
/** /**
* Test whichCrlf function * Test whichCrlf function
* *
* @author Michal Biniek <michal@bystrzyca.pl>
* @package phpMyAdmin-test * @package phpMyAdmin-test
* @version $Id: PMA_whichCrlf_test.php * @version $Id: PMA_whichCrlf_test.php
*/ */