remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @author Raj Kissu Rajandran
|
||||
* @version 1.0
|
||||
* @package BLOBStreaming
|
||||
*/
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @author Raj Kissu Rajandran
|
||||
* @version 1.0
|
||||
* @package BLOBStreaming
|
||||
*/
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @author Raj Kissu Rajandran
|
||||
* @version 1.0
|
||||
* @package BLOBStreaming
|
||||
*/
|
||||
|
@@ -195,8 +195,8 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
|
||||
$row['Null'] = 'NO';
|
||||
}
|
||||
$type = $row['Type'];
|
||||
// reformat mysql query output - staybyte - 9. June 2001
|
||||
// loic1: set or enum types: slashes single quotes inside options
|
||||
// reformat mysql query output
|
||||
// set or enum types: slashes single quotes inside options
|
||||
if (preg_match('@^(set|enum)\((.+)\)$@i', $type, $tmp)) {
|
||||
$tmp[2] = substr(preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1);
|
||||
$type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
|
||||
|
@@ -36,7 +36,7 @@ $cfgRelation = PMA_getRelationsParam();
|
||||
*
|
||||
* @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)
|
||||
if ($cfg['SkipLockedTables'] == true) {
|
||||
$result = PMA_DBI_query('SHOW OPEN TABLES FROM ' . PMA_backquote($db) . ';');
|
||||
@@ -95,7 +95,7 @@ echo '<br />';
|
||||
if ($num_tables == 0) {
|
||||
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 {
|
||||
?>
|
||||
<table>
|
||||
|
@@ -47,7 +47,6 @@
|
||||
* @uses sprintf()
|
||||
* @uses in_array()
|
||||
* @version $Id$
|
||||
* @author Thomas Chaumeny <chaume92 at aol.com>
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -62,7 +62,7 @@ if ($num_tables == 0) {
|
||||
}
|
||||
|
||||
// else
|
||||
// 2. Shows table informations - staybyte - 11 June 2001
|
||||
// 2. Shows table informations
|
||||
|
||||
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
|
||||
// statistics whatever is the table type
|
||||
// Get valid statistics whatever is the table type
|
||||
|
||||
$table_is_view = false;
|
||||
$table_encoded = urlencode($each_table['TABLE_NAME']);
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @author Alexander Rutkowski
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -334,7 +334,7 @@ if (!$save_on_server) {
|
||||
|
||||
header('Content-Type: ' . $mime_type);
|
||||
header('Expires: ' . gmdate('D, d M Y H:i:s') . ' GMT');
|
||||
// lem9: Tested behavior of
|
||||
// Tested behavior of
|
||||
// IE 5.50.4807.2300
|
||||
// IE 6.0.2800.1106 (small glitch, asks twice when I click Open)
|
||||
// IE 6.0.2900.2180
|
||||
|
@@ -1123,7 +1123,6 @@ function setPointer(theRow, theRowNum, theAction, theDefaultColor, thePointerCol
|
||||
*
|
||||
* @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) {
|
||||
// 1. Pointer and mark feature are disabled or the browser can't get the
|
||||
|
@@ -419,7 +419,6 @@ class PMA_Index
|
||||
* @param boolean $print_mode
|
||||
* @access public
|
||||
* @return array Index collection array
|
||||
* @author Garvin Hicking (pma@supergarv.de)
|
||||
*/
|
||||
static public function getView($table, $schema, $print_mode = false)
|
||||
{
|
||||
|
@@ -468,7 +468,7 @@ require_once './libraries/List.class.php';
|
||||
protected function _checkAgainstPrivTables()
|
||||
{
|
||||
// 1. get allowed dbs from the "mysql.db" table
|
||||
// lem9: User can be blank (anonymous user)
|
||||
// User can be blank (anonymous user)
|
||||
$local_query = "
|
||||
SELECT DISTINCT `Db` FROM `mysql`.`db`
|
||||
WHERE `Select_priv` = 'Y'
|
||||
@@ -488,7 +488,7 @@ require_once './libraries/List.class.php';
|
||||
// now populated with actual database names instead of
|
||||
// with regular expressions.
|
||||
$tmp_alldbs = PMA_DBI_query('SHOW DATABASES;', $GLOBALS['controllink']);
|
||||
// loic1: all databases cases - part 2
|
||||
// all databases cases - part 2
|
||||
if (isset($tmp_mydbs['%'])) {
|
||||
while ($tmp_row = PMA_DBI_fetch_row($tmp_alldbs)) {
|
||||
$dblist[] = $tmp_row[0];
|
||||
@@ -501,7 +501,7 @@ require_once './libraries/List.class.php';
|
||||
$tmp_mydbs[$tmp_db] = 0;
|
||||
} elseif (!isset($dblist[$tmp_db])) {
|
||||
foreach ($tmp_mydbs as $tmp_matchpattern => $tmp_value) {
|
||||
// loic1: fixed bad regexp
|
||||
// fixed bad regexp
|
||||
// TODO: db names may contain characters
|
||||
// that are regexp instructions
|
||||
$re = '(^|(\\\\\\\\)+|[^\])';
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Holds class PMA_Message
|
||||
*
|
||||
* @author Sebastian Mendel <info@sebastianmendel.de>
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
@@ -69,7 +69,6 @@ class PMA_StorageEngine
|
||||
/**
|
||||
* returns HTML code for storage engine select box
|
||||
*
|
||||
* @author rabus
|
||||
* @static
|
||||
* @uses PMA_StorageEngine::getStorageEngines()
|
||||
* @uses strtolower()
|
||||
|
@@ -501,7 +501,6 @@ class PMA_Table
|
||||
|
||||
* @global string relation variable
|
||||
*
|
||||
* @author Garvin Hicking <me@supergarv.de>
|
||||
*/
|
||||
static public function duplicateInfo($work, $pma_table, $get_fields, $where_fields,
|
||||
$new_fields)
|
||||
@@ -573,7 +572,6 @@ class PMA_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)
|
||||
{
|
||||
@@ -650,7 +648,7 @@ class PMA_Table
|
||||
}
|
||||
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) {
|
||||
$i++;
|
||||
}
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @author Alexander Rutkowski
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
@@ -16,7 +15,6 @@ require_once './libraries/relation.lib.php';
|
||||
* This class tracks changes on databases, tables and views.
|
||||
* For more information please see phpMyAdmin/Documentation.html
|
||||
*
|
||||
* @author Alexander Rutkowski <alexander.rutkowski@googlemail.com>
|
||||
* @package phpMyAdmin
|
||||
*
|
||||
* @todo use stristr instead of strstr
|
||||
|
@@ -52,7 +52,6 @@ if (function_exists('mcrypt_encrypt')) {
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author lem9
|
||||
*/
|
||||
function PMA_blowfish_encrypt($data, $secret)
|
||||
{
|
||||
@@ -70,7 +69,6 @@ if (function_exists('mcrypt_encrypt')) {
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author lem9
|
||||
*/
|
||||
function PMA_blowfish_decrypt($encdata, $secret)
|
||||
{
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @author Raj Kissu Rajandran and the team
|
||||
* @package BLOBStreaming
|
||||
*/
|
||||
|
||||
|
@@ -11,13 +11,12 @@
|
||||
* See the enclosed file COPYING for license information (LGPL). If you
|
||||
* did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
|
||||
*
|
||||
* @author Mike Cochrane <mike@graftonhall.co.nz>
|
||||
* @version $Id$
|
||||
* @since Horde 2.2
|
||||
* @package horde.cipher
|
||||
*/
|
||||
|
||||
// Change for phpMyAdmin by lem9:
|
||||
// Change for phpMyAdmin
|
||||
//class Horde_Cipher_blowfish extends Horde_Cipher {
|
||||
/**
|
||||
* Horde Blowfish cipher class.
|
||||
@@ -480,7 +479,6 @@ class Horde_Cipher_blowfish
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author lem9
|
||||
*/
|
||||
function PMA_blowfish_encrypt($data, $secret)
|
||||
{
|
||||
@@ -509,7 +507,6 @@ function PMA_blowfish_encrypt($data, $secret)
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author lem9
|
||||
*/
|
||||
function PMA_blowfish_decrypt($encdata, $secret)
|
||||
{
|
||||
|
@@ -130,13 +130,12 @@ if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) {
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author nijel
|
||||
*/
|
||||
function PMA_convert_charset($what) {
|
||||
global $cfg, $charset, $convcharset;
|
||||
|
||||
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;
|
||||
} else {
|
||||
switch ($GLOBALS['PMA_recoding_engine']) {
|
||||
@@ -166,7 +165,6 @@ function PMA_convert_charset($what) {
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author nijel
|
||||
*/
|
||||
function PMA_convert_string($src_charset, $dest_charset, $what) {
|
||||
if ($src_charset == $dest_charset) {
|
||||
@@ -200,7 +198,6 @@ function PMA_convert_string($src_charset, $dest_charset, $what) {
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author nijel
|
||||
*/
|
||||
function PMA_convert_file($src_charset, $dest_charset, $file) {
|
||||
switch ($GLOBALS['PMA_recoding_engine']) {
|
||||
|
@@ -13,7 +13,6 @@
|
||||
* @param string list of variables to allow
|
||||
* @return nothing
|
||||
* @access public
|
||||
* @author Michal Cihar (michal@cihar.com)
|
||||
*/
|
||||
function PMA_remove_request_vars(&$whitelist)
|
||||
{
|
||||
|
@@ -294,7 +294,6 @@ function PMA_unQuote($quoted_string, $quote = null)
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author Robin Johnson <robbat2@users.sourceforge.net>
|
||||
*/
|
||||
function PMA_formatSql($parsed_sql, $unparsed_sql = '')
|
||||
{
|
||||
@@ -1293,7 +1292,6 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
|
||||
* @access public
|
||||
* @return boolean whether profiling is supported
|
||||
*
|
||||
* @author Marc Delisle
|
||||
*/
|
||||
function PMA_profilingSupported()
|
||||
{
|
||||
@@ -1319,7 +1317,6 @@ function PMA_profilingSupported()
|
||||
* @param string $sql_query
|
||||
* @access public
|
||||
*
|
||||
* @author Marc Delisle
|
||||
*/
|
||||
function PMA_profilingCheckbox($sql_query)
|
||||
{
|
||||
@@ -1340,7 +1337,6 @@ function PMA_profilingCheckbox($sql_query)
|
||||
* @param array the results
|
||||
* @access public
|
||||
*
|
||||
* @author Marc Delisle
|
||||
*/
|
||||
function PMA_profilingResults($profiling_results)
|
||||
{
|
||||
@@ -1371,7 +1367,6 @@ function PMA_profilingResults($profiling_results)
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author staybyte
|
||||
* @version 1.2 - 18 July 2002
|
||||
*/
|
||||
function PMA_formatByteDown($value, $limes = 6, $comma = 0)
|
||||
@@ -1428,7 +1423,6 @@ function PMA_formatByteDown($value, $limes = 6, $comma = 0)
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author staybyte, sebastian mendel
|
||||
* @version 1.1.0 - 2005-10-27
|
||||
*/
|
||||
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")
|
||||
*
|
||||
* @access public
|
||||
* @author Garvin Hicking <me@supergarv.de>
|
||||
* @return string The flipped string
|
||||
*/
|
||||
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
|
||||
*
|
||||
* @access public
|
||||
* @author Marc Delisle (lem9@users.sourceforge.net)
|
||||
*/
|
||||
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
|
||||
*
|
||||
* @access public
|
||||
* @author Michal Cihar (michal@cihar.com) and others...
|
||||
* @return string the calculated condition and whether condition is unique
|
||||
*/
|
||||
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
|
||||
*
|
||||
* @access public
|
||||
* @author Michal Cihar (michal@cihar.com)
|
||||
*/
|
||||
function PMA_buttonOrImage($button_name, $button_class, $image_name, $text,
|
||||
$image)
|
||||
@@ -2128,7 +2118,6 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text,
|
||||
* @param string The prompt to display (sometimes empty)
|
||||
*
|
||||
* @access public
|
||||
* @author Garvin Hicking (pma@supergarv.de)
|
||||
*/
|
||||
function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1,
|
||||
$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
|
||||
if ($pos > 0) {
|
||||
// loic1: patch #474210 from Gosha Sakovich - part 1
|
||||
// patch #474210 - part 1
|
||||
if ($GLOBALS['cfg']['NavigationBarIconic']) {
|
||||
$caption1 = '<<';
|
||||
$caption2 = ' < ';
|
||||
@@ -2614,8 +2603,6 @@ function PMA_convert_bit_default_value($bit_default_value) {
|
||||
* @param string $fieldspec
|
||||
* @return array associative array containing type, spec_in_brackets
|
||||
* and possibly enum_set_values (another array)
|
||||
* @author Marc Delisle
|
||||
* @author Joshua Hogendorn
|
||||
*/
|
||||
function PMA_extractFieldSpec($fieldspec) {
|
||||
$first_bracket_pos = strpos($fieldspec, '(');
|
||||
|
@@ -2302,7 +2302,7 @@ $cfg['InitialSlidersState'] = 'closed';
|
||||
// custom-setup by mkkeck: 2004-05-04
|
||||
// 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.
|
||||
*/
|
||||
|
||||
|
||||
|
@@ -184,7 +184,6 @@ function PMA_isValid(&$var, $type = 'length', $compare = null)
|
||||
* @return string The secured path
|
||||
*
|
||||
* @access public
|
||||
* @author Marc Delisle (lem9@users.sourceforge.net)
|
||||
*/
|
||||
function PMA_securePath($path)
|
||||
{
|
||||
|
@@ -7,7 +7,7 @@
|
||||
* fills tooltip arrays and provides $tables, $num_tables, $is_show_stats
|
||||
* and $db_is_information_schema
|
||||
*
|
||||
* staybyte: speedup view on locked tables - 11 June 2001
|
||||
* speedup view on locked tables
|
||||
*
|
||||
* @uses $cfg['ShowStats']
|
||||
* @uses $cfg['ShowTooltip']
|
||||
|
@@ -37,8 +37,8 @@ $is_superuser = PMA_isSuperuser();
|
||||
* Prepares links
|
||||
*/
|
||||
// Drop link if allowed
|
||||
// rabus: 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 even try to drop information_schema. You won't be able to. Believe me. You won't.
|
||||
// Don't allow to easilly drop mysql database, RFE #1327514.
|
||||
if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) && ! $db_is_information_schema && ($db != 'mysql')) {
|
||||
$tab_drop['link'] = 'sql.php';
|
||||
$tab_drop['args']['sql_query'] = 'DROP DATABASE ' . PMA_backquote($db);
|
||||
|
@@ -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
|
||||
*/
|
||||
$chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
|
||||
|
@@ -812,7 +812,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
|
||||
|
||||
// 2.1.4 Do define the sorting URL
|
||||
if (! $is_in_sort) {
|
||||
// loic1: patch #455484 ("Smart" order)
|
||||
// patch #455484 ("Smart" order)
|
||||
$GLOBALS['cfg']['Order'] = strtoupper($GLOBALS['cfg']['Order']);
|
||||
if ($GLOBALS['cfg']['Order'] === 'SMART') {
|
||||
$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;
|
||||
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'])
|
||||
&& ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
|
||||
|| $_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;
|
||||
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
|
||||
|| $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
|
||||
// loic1: pointer code part
|
||||
// pointer code part
|
||||
echo ' <tr class="' . $class . '">' . "\n";
|
||||
$class = '';
|
||||
}
|
||||
@@ -1252,7 +1252,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
|
||||
// n u m e r i c
|
||||
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
|
||||
// will show both fields NULL even if only one is NULL,
|
||||
// so use the $pointer
|
||||
@@ -1272,7 +1272,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
|
||||
// b l o b
|
||||
|
||||
} 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
|
||||
$field_flags = PMA_DBI_field_flags($dt_result, $i);
|
||||
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') {
|
||||
$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>
|
||||
$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])) {
|
||||
$vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n";
|
||||
} elseif ($row[$i] != '') {
|
||||
// loic1: support blanks in the key
|
||||
// support blanks in the key
|
||||
$relation_id = $row[$i];
|
||||
|
||||
// nijel: Cut all fields to $GLOBALS['cfg']['LimitChars']
|
||||
// lem9: (unless it's a link-type transformation)
|
||||
// Cut all fields to $GLOBALS['cfg']['LimitChars']
|
||||
// (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) {
|
||||
$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);
|
||||
if (isset($meta->_type) && $meta->_type === MYSQLI_TYPE_BIT) {
|
||||
$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';
|
||||
$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' : '');
|
||||
$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);
|
||||
@@ -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'
|
||||
|| $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
|
||||
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 -----
|
||||
// (see the 'relation' configuration variable)
|
||||
// loic1, 2002-03-02: extended to php3
|
||||
|
||||
// initialize map
|
||||
$map = array();
|
||||
|
@@ -175,7 +175,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
|
||||
*/
|
||||
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)!
|
||||
// side note: I love MySQL 5 for this. :-)
|
||||
$sql = '
|
||||
|
@@ -178,7 +178,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
|
||||
if (!isset($row[$j]) || is_null($row[$j])) {
|
||||
$schema_insert .= $GLOBALS[$what . '_null'];
|
||||
} elseif ($row[$j] == '0' || $row[$j] != '') {
|
||||
// loic1 : always enclose fields
|
||||
// always enclose fields
|
||||
if ($what == 'excel') {
|
||||
$row[$j] = preg_replace("/\015(\012)?/", "\012", $row[$j]);
|
||||
}
|
||||
|
@@ -266,8 +266,8 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
|
||||
|
||||
$schema_insert = '<tr class="print-category">';
|
||||
$type = $row['Type'];
|
||||
// reformat mysql query output - staybyte - 9. June 2001
|
||||
// loic1: set or enum types: slashes single quotes inside options
|
||||
// reformat mysql query output
|
||||
// set or enum types: slashes single quotes inside options
|
||||
if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
|
||||
$tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
|
||||
$type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
|
||||
|
@@ -393,8 +393,8 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
|
||||
while ($row = PMA_DBI_fetch_assoc($result)) {
|
||||
|
||||
$type = $row['Type'];
|
||||
// reformat mysql query output - staybyte - 9. June 2001
|
||||
// loic1: set or enum types: slashes single quotes inside options
|
||||
// reformat mysql query output
|
||||
// set or enum types: slashes single quotes inside options
|
||||
if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
|
||||
$tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
|
||||
$type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
|
||||
|
@@ -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">'
|
||||
. '<text:p>' . htmlspecialchars($row['Field']) . '</text:p>'
|
||||
. '</table:table-cell>';
|
||||
// reformat mysql query output - staybyte - 9. June 2001
|
||||
// loic1: set or enum types: slashes single quotes inside options
|
||||
// reformat mysql query output
|
||||
// set or enum types: slashes single quotes inside options
|
||||
$field_name = $row['Field'];
|
||||
$type = $row['Type'];
|
||||
if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/**
|
||||
* Set of functions used to build dumps of tables as PHP Arrays
|
||||
*
|
||||
* @author Geoffray Warnants <http://www.geoffray.be>
|
||||
* @version 0.2b (20090704)
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
@@ -69,7 +68,6 @@ function PMA_exportHeader()
|
||||
'<?php' . $GLOBALS['crlf']
|
||||
. '/**' . $GLOBALS['crlf']
|
||||
. ' * Export to PHP Array plugin for PHPMyAdmin' . $GLOBALS['crlf']
|
||||
. ' * @author Geoffray Warnants' . $GLOBALS['crlf']
|
||||
. ' * @version 0.2b' . $GLOBALS['crlf']
|
||||
. ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf']
|
||||
);
|
||||
|
@@ -848,7 +848,6 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE,
|
||||
*
|
||||
* @see PMA_getTableContentFast(), PMA_getTableContentOld()
|
||||
*
|
||||
* @author staybyte
|
||||
*/
|
||||
function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
|
||||
{
|
||||
|
@@ -255,8 +255,8 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
|
||||
|
||||
$text_output = '';
|
||||
$type = $row['Type'];
|
||||
// reformat mysql query output - staybyte - 9. June 2001
|
||||
// loic1: set or enum types: slashes single quotes inside options
|
||||
// reformat mysql query output
|
||||
// set or enum types: slashes single quotes inside options
|
||||
if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
|
||||
$tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
|
||||
$type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
|
||||
|
@@ -49,7 +49,6 @@ $gnu_iconv_to_aix_iconv_codepage_map = array (
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author bwiberg Björn Wiberg <Bjorn.Wiberg@its.uu.se>
|
||||
*/
|
||||
function PMA_aix_iconv_wrapper($in_charset, $out_charset, $str) {
|
||||
|
||||
|
@@ -303,8 +303,6 @@ function PMA_importGetNextChunk($size = 32768)
|
||||
* 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)
|
||||
*
|
||||
* @author Derek Schaefer (derek.schaefer@gmail.com)
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @uses chr()
|
||||
@@ -344,7 +342,6 @@ function PMA_getColumnAlphaName($num)
|
||||
* Returns the column number based on the Excel name.
|
||||
* So "A" = 1, "AZ" = 27, etc.
|
||||
*
|
||||
* @author Derek Schaefer (derek.schaefer@gmail.com)
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
@@ -396,7 +393,6 @@ define("SIZES", 1);
|
||||
/**
|
||||
* Obtains the precision (total # of digits) from a size of type decimal
|
||||
*
|
||||
* @author Derek Schaefer (derek.schaefer@gmail.com)
|
||||
*
|
||||
* @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
|
||||
*
|
||||
* @author Derek Schaefer (derek.schaefer@gmail.com)
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
@@ -429,7 +424,6 @@ function PMA_getD($last_cumulative_size) {
|
||||
/**
|
||||
* Obtains the decimal size of a given cell
|
||||
*
|
||||
* @author Derek Schaefer (derek.schaefer@gmail.com)
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
@@ -452,7 +446,6 @@ function PMA_getDecimalSize(&$cell) {
|
||||
/**
|
||||
* Obtains the size of the given cell
|
||||
*
|
||||
* @author Derek Schaefer (derek.schaefer@gmail.com)
|
||||
*
|
||||
* @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
|
||||
*
|
||||
* @author Derek Schaefer (derek.schaefer@gmail.com)
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
@@ -721,7 +713,6 @@ function PMA_detectType($last_cumulative_type, &$cell) {
|
||||
/**
|
||||
* 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
|
||||
*
|
||||
@@ -825,7 +816,6 @@ $import_notice = NULL;
|
||||
* Builds and executes SQL statements to create the database and tables
|
||||
* as necessary, as well as insert all the data.
|
||||
*
|
||||
* @author Derek Schaefer (derek.schaefer@gmail.com)
|
||||
*
|
||||
* @link http://wiki.phpmyadmin.net/pma/Devel:Import
|
||||
*
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Javascript escaping functions.
|
||||
*
|
||||
* @author Michal Čihař <michal@cihar.com>
|
||||
* @package phpMyAdmin
|
||||
*
|
||||
* @version $Id$
|
||||
|
@@ -16,7 +16,7 @@ $GLOBALS['unparsed_sql'] = $sql_query;
|
||||
$parsed_sql = PMA_SQP_parse($sql_query);
|
||||
$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
|
||||
// into $sql_query, to make this kind of query work without
|
||||
// capitalizing keywords:
|
||||
|
@@ -25,7 +25,6 @@ require_once './libraries/Table.class.php';
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author Mike Beck <mikebeck@users.sourceforge.net>
|
||||
*/
|
||||
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_free_result()
|
||||
* @access protected
|
||||
* @author Mike Beck <mikebeck@users.sourceforge.net>
|
||||
* @return array the relation parameters for the current user
|
||||
*/
|
||||
function PMA__getRelationsParam()
|
||||
@@ -361,8 +359,6 @@ function PMA__getRelationsParam()
|
||||
* Gets all Relations to foreign tables for a given table or
|
||||
* optionally a given column in a table
|
||||
*
|
||||
* @author Mike Beck <mikebeck@users.sourceforge.net>
|
||||
* @author Marc Delisle
|
||||
* @access public
|
||||
* @uses $GLOBALS['controllink']
|
||||
* @uses $GLOBALS['information_schema_relations']
|
||||
@@ -471,7 +467,6 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both')
|
||||
* Gets the display field of a table
|
||||
*
|
||||
* @access public
|
||||
* @author Mike Beck <mikebeck@users.sourceforge.net>
|
||||
* @uses $GLOBALS['controllink']
|
||||
* @uses PMA_getRelationsParam()
|
||||
* @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
|
||||
*
|
||||
* @author Mike Beck <mikebeck@users.sourceforge.net>
|
||||
* @author lem9
|
||||
* @access public
|
||||
* @uses PMA_DBI_get_fields()
|
||||
* @uses PMA_getDbComment()
|
||||
@@ -555,8 +548,6 @@ function PMA_getComments($db, $table = '')
|
||||
/**
|
||||
* Gets the comment for a db
|
||||
*
|
||||
* @author Mike Beck <mikebeck@users.sourceforge.net>
|
||||
* @author lem9
|
||||
* @access public
|
||||
* @uses PMA_DBI_QUERY_STORE
|
||||
* @uses PMA_DBI_num_rows()
|
||||
@@ -598,8 +589,6 @@ function PMA_getDbComment($db)
|
||||
/**
|
||||
* Gets the comment for a db
|
||||
*
|
||||
* @author Mike Beck <mikebeck@users.sourceforge.net>
|
||||
* @author lem9
|
||||
* @access public
|
||||
* @uses PMA_DBI_QUERY_STORE
|
||||
* @uses PMA_DBI_num_rows()
|
||||
|
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Code for displaying server selection written by nijel
|
||||
* Code for displaying server selection
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
|
@@ -1,9 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/** 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
|
||||
* extracting data from a MySQL type SQL query.
|
||||
@@ -18,7 +15,7 @@
|
||||
* If you want to extract data from it then, you just need to run
|
||||
* $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.
|
||||
*
|
||||
* If you want a pretty-printed version of the query, do:
|
||||
@@ -217,7 +214,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
|
||||
global $mysql_charsets, $mysql_collations_flat, $mysql_charsets_count, $mysql_collations_count;
|
||||
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", $sql);
|
||||
|
||||
@@ -848,7 +845,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
|
||||
// for GROUP_CONCAT(...)
|
||||
$in_group_concat = FALSE;
|
||||
|
||||
/* Description of analyzer results by lem9
|
||||
/* Description of analyzer results
|
||||
*
|
||||
* db, table, column, alias
|
||||
* ------------------------
|
||||
|
@@ -23,7 +23,6 @@
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author Robin Johnson <robbat2@users.sourceforge.net>
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
|
@@ -23,7 +23,6 @@
|
||||
* @param string string to count
|
||||
* @return int string length
|
||||
* @access public
|
||||
* @author nijel
|
||||
* @todo rename to PM_STR_len()
|
||||
*/
|
||||
function PMA_strlen($string)
|
||||
@@ -40,7 +39,6 @@ function PMA_strlen($string)
|
||||
* @param int length of substring
|
||||
* @return int substring
|
||||
* @access public
|
||||
* @author nijel
|
||||
* @todo rename to PM_STR_sub()
|
||||
*/
|
||||
function PMA_substr($string, $start, $length = 2147483647)
|
||||
|
@@ -23,7 +23,6 @@
|
||||
* @param string string to count
|
||||
* @return int string length
|
||||
* @access public
|
||||
* @author nijel
|
||||
* @todo rename to PM_STR_len()
|
||||
*/
|
||||
function PMA_strlen($string)
|
||||
@@ -40,7 +39,6 @@ function PMA_strlen($string)
|
||||
* @param int length of substring
|
||||
* @return int substring
|
||||
* @access public
|
||||
* @author nijel
|
||||
* @todo rename to PM_STR_sub()
|
||||
*/
|
||||
function PMA_substr($string, $start, $length = 2147483647)
|
||||
|
@@ -108,7 +108,7 @@ $header_cells[] = $strCollation;
|
||||
$header_cells[] = $strAttr;
|
||||
$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
|
||||
// key fields, as tbl_addfield does.
|
||||
|
||||
@@ -504,7 +504,7 @@ for ($i = 0; $i < $num_fields; $i++) {
|
||||
$ci++;
|
||||
|
||||
// column indexes
|
||||
// lem9: See my other comment about removing this 'if'.
|
||||
// See my other comment about removing this 'if'.
|
||||
if (!$is_backup) {
|
||||
$content_cells[$i][$ci] = '<select name="field_key[' . $i . ']"'
|
||||
. ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
|
||||
|
@@ -71,7 +71,6 @@ function PMA_transformation_getOptions($option_string)
|
||||
* Gets all available MIME-types
|
||||
*
|
||||
* @access public
|
||||
* @author Garvin Hicking <me@supergarv.de>
|
||||
* @uses opendir()
|
||||
* @uses readdir()
|
||||
* @uses closedir()
|
||||
@@ -139,8 +138,6 @@ function PMA_getAvailableMIMEtypes()
|
||||
* @uses PMA_backquote()
|
||||
* @uses PMA_sqlAddslashes()
|
||||
* @uses PMA_DBI_fetch_result()
|
||||
* @author Mike Beck <mikebeck@users.sourceforge.net>
|
||||
* @author Garvin Hicking <me@supergarv.de>
|
||||
* @access public
|
||||
* @param string $db the name of the db to check for
|
||||
* @param string $table the name of the table to check for
|
||||
|
@@ -30,7 +30,6 @@
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
* @author nijel
|
||||
*/
|
||||
function PMA_generate_common_hidden_inputs($db = '', $table = '', $indent = 0, $skip = array())
|
||||
{
|
||||
@@ -197,7 +196,6 @@ function PMA_getHiddenFields($values, $pre = '')
|
||||
* instead of '&' for dividing URL parameters
|
||||
* @return string string with URL parameters
|
||||
* @access public
|
||||
* @author nijel
|
||||
*/
|
||||
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'
|
||||
* @return string character used for separating url parts usally ; or &
|
||||
* @access public
|
||||
* @author nijel
|
||||
*/
|
||||
function PMA_get_arg_separator($encode = 'none')
|
||||
{
|
||||
|
@@ -128,7 +128,7 @@ class zipfile
|
||||
|
||||
// "data descriptor" segment (optional but necessary if archive is not
|
||||
// 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)
|
||||
//$fr .= pack('V', $crc); // crc32
|
||||
//$fr .= pack('V', $c_len); // compressed filesize
|
||||
|
@@ -13,7 +13,6 @@
|
||||
* @param string $file
|
||||
* @return array ($error_message, $file_data); $error_message
|
||||
* is empty if no error
|
||||
* @author lem9
|
||||
*/
|
||||
|
||||
function PMA_getZipContents($file)
|
||||
@@ -75,7 +74,6 @@ function PMA_getZipContents($file)
|
||||
*
|
||||
* @param integer error code
|
||||
* @return string error message
|
||||
* @author lem9
|
||||
*/
|
||||
function PMA_getZipError($code)
|
||||
{
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Contributed by Maxime Delorme and merged by lem9
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
@@ -581,8 +580,6 @@ class PMA_RT_Table {
|
||||
$pdf->SetFillColor(255);
|
||||
|
||||
foreach ($this->fields AS $field) {
|
||||
// loic1 : PHP3 fix
|
||||
// if (in_array($field, $this->primary)) {
|
||||
if ($setcolor) {
|
||||
if (in_array($field, $this->primary)) {
|
||||
$pdf->SetFillColor(215, 121, 123);
|
||||
@@ -1060,7 +1057,6 @@ class PMA_RT {
|
||||
// . ' AND foreign_table IN (' . $intable . ')';
|
||||
// $result = PMA_query_as_controluser($sql);
|
||||
|
||||
// lem9:
|
||||
// previous logic was checking master tables and foreign tables
|
||||
// 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)
|
||||
@@ -1080,7 +1076,7 @@ class PMA_RT {
|
||||
} // end while
|
||||
} // end if
|
||||
} // end while
|
||||
// loic1: also show tables without relations
|
||||
// also show tables without relations
|
||||
// $norelations = TRUE;
|
||||
// if ($result && PMA_DBI_num_rows($result) > 0) {
|
||||
// $norelations = FALSE;
|
||||
@@ -1286,8 +1282,8 @@ function PMA_RT_DOC($alltables)
|
||||
|
||||
while ($row = PMA_DBI_fetch_assoc($result)) {
|
||||
$type = $row['Type'];
|
||||
// reformat mysql query output - staybyte - 9. June 2001
|
||||
// loic1: set or enum types: slashes single quotes inside options
|
||||
// reformat mysql query output
|
||||
// set or enum types: slashes single quotes inside options
|
||||
if (preg_match('@^(set|enum)\((.+)\)$@i', $type, $tmp)) {
|
||||
$tmp[2] = substr(preg_replace("@([^,])''@", "\\1\\'", ',' . $tmp[2]), 1);
|
||||
$type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
|
||||
|
@@ -1,7 +1,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @author Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
|
||||
* @package phpMyAdmin-Designer
|
||||
*/
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @author Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Designer
|
||||
*/
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @author Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Designer
|
||||
*/
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @author Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Designer
|
||||
*/
|
||||
|
@@ -1389,7 +1389,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
|
||||
PMA_DBI_free_result($res);
|
||||
unset($res);
|
||||
} 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.
|
||||
$raw = 'Your privilege table structure seems to be older than'
|
||||
. ' this MySQL version!<br />'
|
||||
|
@@ -3,7 +3,6 @@
|
||||
* Front controller for config view / download and clear
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
* Config file view and save screen
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
* Form edit view
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
* Overview (main page)
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
* Menu items
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
* Server create and edit view
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
* Front controller for setup script
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author 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
|
||||
* @version $Id$
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/**
|
||||
* Config file management and generation
|
||||
*
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
|
@@ -3,7 +3,6 @@
|
||||
* Form handling code.
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -9,7 +9,6 @@
|
||||
* slashes changed to hyphens, eg. Servers-4-verbose
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
* Form templates
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
* Loads libraries/common.inc.php and preforms some additional actions
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -7,7 +7,6 @@
|
||||
* only allowed values for select fields and type overrides.
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
* Formset processing library
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -13,7 +13,6 @@
|
||||
* 'pmadb' => 'phpmyadmin')));
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -7,7 +7,6 @@
|
||||
* Version check taken from the old setup script by Michal Čihař <michal@cihar.com>
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -12,7 +12,6 @@
|
||||
* Valdiation functions are assigned in $cfg_db['_validators'] (config_info.inc.php).
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
* Validation callback.
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @author 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
|
||||
* @version $Id$
|
||||
|
@@ -201,7 +201,7 @@ $foreigners = PMA_getForeigners($db, $table);
|
||||
/**
|
||||
* 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
|
||||
$chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5 && PMA_USR_BROWSER_VER < 7)
|
||||
? 'onpropertychange'
|
||||
@@ -327,11 +327,10 @@ foreach ($rows as $row_id => $vrow) {
|
||||
|
||||
// d a t e t i m e
|
||||
//
|
||||
// loic1: current date should not be set as default if the field is NULL
|
||||
// for the current row
|
||||
// lem9: but do not put here the current datetime if there is a default
|
||||
// value (the real default value will be set in the
|
||||
// Default value logic below)
|
||||
// Current date should not be set as default if the field is NULL
|
||||
// for the current row, but do not put here the current datetime
|
||||
// if there is a default value (the real default value will be set
|
||||
// in the Default value logic below)
|
||||
|
||||
// Note: (tested in MySQL 4.0.16): when lang is some UTF-8,
|
||||
// $field['Default'] is not set if it contains NULL:
|
||||
@@ -437,7 +436,7 @@ foreach ($rows as $row_id => $vrow) {
|
||||
} elseif ($field['True_Type'] == 'bit') {
|
||||
$special_chars = PMA_printable_bit_value($vrow[$field['Field']], $extracted_fieldspec['spec_in_brackets']);
|
||||
} else {
|
||||
// loic1: special binary "characters"
|
||||
// special binary "characters"
|
||||
if ($field['is_binary'] || $field['is_blob']) {
|
||||
if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && !$cfg['ProtectBinary']) {
|
||||
$vrow[$field['Field']] = bin2hex($vrow[$field['Field']]);
|
||||
@@ -453,15 +452,15 @@ foreach ($rows as $row_id => $vrow) {
|
||||
|
||||
$data = $vrow[$field['Field']];
|
||||
} // end if... else...
|
||||
// loic1: if a timestamp field value is not included in an update
|
||||
// statement MySQL auto-update it to the current timestamp
|
||||
// lem9: however, things have changed since MySQL 4.1, so
|
||||
// If a timestamp field value is not included in an update
|
||||
// statement MySQL auto-update it to the current timestamp;
|
||||
// however, things have changed since MySQL 4.1, so
|
||||
// it's better to set a fields_prev in this situation
|
||||
$backup_field = '<input type="hidden" name="fields_prev'
|
||||
. $field_name_appendix . '" value="'
|
||||
. htmlspecialchars($vrow[$field['Field']]) . '" />';
|
||||
} else {
|
||||
// loic1: display default values
|
||||
// display default values
|
||||
if (!isset($field['Default'])) {
|
||||
$field['Default'] = '';
|
||||
$real_null_value = TRUE;
|
||||
|
@@ -308,7 +308,7 @@ if (strstr($show_comment, '; InnoDB free') === false) {
|
||||
// DELAY_KEY_WRITE, CHECKSUM, : MyISAM only
|
||||
// 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
|
||||
// check for version
|
||||
?>
|
||||
|
@@ -160,8 +160,8 @@ foreach ($the_tables as $key => $table) {
|
||||
<?php
|
||||
while ($row = PMA_DBI_fetch_assoc($result)) {
|
||||
$type = $row['Type'];
|
||||
// reformat mysql query output - staybyte - 9. June 2001
|
||||
// loic1: set or enum types: slashes single quotes inside options
|
||||
// reformat mysql query output
|
||||
// set or enum types: slashes single quotes inside options
|
||||
if (preg_match('@^(set|enum)\((.+)\)$@i', $type, $tmp)) {
|
||||
$tmp[2] = substr(preg_replace('@([^,])\'\'@', '\\1\\\'',
|
||||
',' . $tmp[2]), 1);
|
||||
@@ -270,7 +270,6 @@ foreach ($the_tables as $key => $table) {
|
||||
/**
|
||||
* Displays Space usage and row statistics
|
||||
*
|
||||
* staybyte - 9 June 2001
|
||||
*/
|
||||
if ($cfg['ShowStats']) {
|
||||
$nonisam = false;
|
||||
|
@@ -67,7 +67,7 @@ if (!isset($param) || $param[0] == '') {
|
||||
while ($row = PMA_DBI_fetch_assoc($result)) {
|
||||
$fields_list[] = $row['Field'];
|
||||
$type = $row['Type'];
|
||||
// reformat mysql query output - staybyte - 9. June 2001
|
||||
// reformat mysql query output
|
||||
if (strncasecmp($type, 'set', 3) == 0
|
||||
|| strncasecmp($type, 'enum', 4) == 0) {
|
||||
$type = str_replace(',', ', ', $type);
|
||||
|
@@ -611,10 +611,8 @@ PMA_generate_slider_effect('tablestatistics', $strDetails);
|
||||
/**
|
||||
* Displays Space usage and row statistics
|
||||
*/
|
||||
// BEGIN - Calc Table Space - staybyte - 9 June 2001
|
||||
// loic1, 22 feb. 2002: updated with patch from
|
||||
// Joshua Nye <josh at boxcarmedia.com> to get valid
|
||||
// statistics whatever is the table type
|
||||
// BEGIN - Calc Table Space
|
||||
// Get valid statistics whatever is the table type
|
||||
if ($cfg['ShowStats']) {
|
||||
if (empty($showtable)) {
|
||||
$showtable = PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], null, true);
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @author Alexander Rutkowski
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test for PMA_Message class
|
||||
*
|
||||
* @author Michal Biniek <michal@bystrzyca.pl>
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test for caching data in session
|
||||
*
|
||||
* @author Michal Biniek <michal@bystrzyca.pl>
|
||||
* @package phpMyAdmin-test
|
||||
* @version $Id: PMA_cache_test.php
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test for javascript escaping.
|
||||
*
|
||||
* @author Michal Čihař <michal@cihar.com>
|
||||
* @package phpMyAdmin-test
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test for MySQL Wildcards escaping/unescaping
|
||||
*
|
||||
* @author Michal Biniek <michal@bystrzyca.pl>
|
||||
* @package phpMyAdmin-test
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test for supporting foreign key
|
||||
*
|
||||
* @author Michal Biniek <michal@bystrzyca.pl>
|
||||
* @package phpMyAdmin-test
|
||||
* @version $Id$
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test for format number and byte
|
||||
*
|
||||
* @author Michal Biniek <michal@bystrzyca.pl>
|
||||
* @package phpMyAdmin-test
|
||||
* @version $Id: PMA_formatNumberByteDown_test.php
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test for PMA_sendHeaderLocation
|
||||
*
|
||||
* @author Michal Biniek <michal@bystrzyca.pl>
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test for generating localised date or timespan expression
|
||||
*
|
||||
* @author Michal Biniek <michal@bystrzyca.pl>
|
||||
* @package phpMyAdmin-test
|
||||
* @version $Id: PMA_localisedDateTimespan_test.php
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test printableBitValue function
|
||||
*
|
||||
* @author Michal Biniek <michal@bystrzyca.pl>
|
||||
* @package phpMyAdmin-test
|
||||
* @version $Id: PMA_printableBitValue_test.php
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test for quoting, slashing/backslashing
|
||||
*
|
||||
* @author Michal Biniek <michal@bystrzyca.pl>
|
||||
* @package phpMyAdmin-test
|
||||
* @version $Id: PMA_quoting_slashing_test.php
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test for showHint function
|
||||
*
|
||||
* @author Michal Biniek <michal@bystrzyca.pl>
|
||||
* @package phpMyAdmin-test
|
||||
* @version $Id: PMA_showHint_test.php
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test for several string operations
|
||||
*
|
||||
* @author Michal Biniek <michal@bystrzyca.pl>
|
||||
* @version $Id: PMA_stringOperations_test.php
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Test whichCrlf function
|
||||
*
|
||||
* @author Michal Biniek <michal@bystrzyca.pl>
|
||||
* @package phpMyAdmin-test
|
||||
* @version $Id: PMA_whichCrlf_test.php
|
||||
*/
|
||||
|
Reference in New Issue
Block a user