diff --git a/config.inc.php3 b/config.inc.php3 index 04aa811ce..a14519da9 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -8,6 +8,7 @@ * All directives are explained in Documentation.html */ + /** * Sets the php error reporting - Please do not change this line! */ @@ -23,17 +24,24 @@ $old_error_rep = error_reporting(E_ALL); * It must contain characters that are valid for a URL, and the path is * case sensitive on some Web servers, for example Unix-based servers. * - * In most cases you can leave this variable alone, as the correct value - * will be detected automatically. However, we recommened that you do + * In most cases you can leave this variable alone, as the correct value + * will be detected automatically. However, we recommened that you do * test to see that the auto-detection code works in your system. * - * If the auto-detection code does work properly, you can set the - * $cfg['PmaAbsoluteUri_DisableWarning'] variable at the bottom of - * this file. + * If the auto-detection code does work properly, you can set the + * $cfg['PmaAbsoluteUri_DisableWarning'] variable below. */ $cfg['PmaAbsoluteUri'] = ''; +/** + * Disable the default warning about $cfg['PmaAbsoluteUri'] not being set + * You should use this if and ONLY if the PmaAbsoluteUri auto-detection + * works perfectly. + */ +$cfg['PmaAbsoluteUri_DisableWarning'] = FALSE; + + /** * Server(s) configuration */ @@ -91,12 +99,12 @@ $cfg['Servers'][$i]['user'] = 'root'; $cfg['Servers'][$i]['password'] = ''; $cfg['Servers'][$i]['only_db'] = ''; $cfg['Servers'][$i]['verbose'] = ''; -$cfg['Servers'][$i]['pmadb'] = ''; +$cfg['Servers'][$i]['pmadb'] = ''; $cfg['Servers'][$i]['bookmarktable'] = ''; $cfg['Servers'][$i]['relation'] = ''; $cfg['Servers'][$i]['table_info'] = ''; $cfg['Servers'][$i]['table_coords'] = ''; -$cfg['Servers'][$i]['column_comments'] =''; +$cfg['Servers'][$i]['column_comments'] = ''; $cfg['Servers'][$i]['pdf_pages'] = ''; $cfg['Servers'][$i]['AllowDeny']['order'] = ''; @@ -115,12 +123,12 @@ $cfg['Servers'][$i]['user'] = 'root'; $cfg['Servers'][$i]['password'] = ''; $cfg['Servers'][$i]['only_db'] = ''; $cfg['Servers'][$i]['verbose'] = ''; -$cfg['Servers'][$i]['pmadb'] = ''; +$cfg['Servers'][$i]['pmadb'] = ''; $cfg['Servers'][$i]['bookmarktable'] = ''; $cfg['Servers'][$i]['relation'] = ''; $cfg['Servers'][$i]['table_info'] = ''; $cfg['Servers'][$i]['table_coords'] = ''; -$cfg['Servers'][$i]['column_comments'] =''; +$cfg['Servers'][$i]['column_comments'] = ''; $cfg['Servers'][$i]['pdf_pages'] = ''; $cfg['Servers'][$i]['AllowDeny']['order'] = ''; @@ -191,22 +199,20 @@ $cfg['ZipDump'] = TRUE; // Allow the use of zip/gzip/bzip $cfg['GZipDump'] = TRUE; // compression for $cfg['BZipDump'] = TRUE; // dump files - // Default Tabs display settings - $cfg['DefaultTabDatabase'] = 'db_details_structure.php3'; // Possible values: // 'db_details_structure.php3' = tables list // 'db_details.php3' = sql form - // 'db_search.php3' = search query - + // 'db_search.php3' = search query $cfg['DefaultTabTable'] = 'tbl_properties_structure.php3'; // Possible values: - // 'tbl_properties_structure.php3' = fields list + // 'tbl_properties_structure.php3' = fields list // 'tbl_properties.php3' = sql form // 'tbl_select.php3 = select page // 'tbl_change.php3 = insert row page + /** * Link to the official MySQL documentation * Be sure to include no trailing slash on the path @@ -215,14 +221,11 @@ $cfg['ManualBaseShort'] = 'http://www.mysql.com/doc'; /** - * Language settings + * Language and charset conversion settings */ // Default language to use, if not browser-defined or user-defined $cfg['DefaultLang'] = 'en'; -/** - * Charset conversion settings - */ // Default charset to use for recoding of MySQL queries, does not take // any effect when charsets recoding is switched off by // $cfg['AllowAnywhereRecoding'] or in language file @@ -271,8 +274,7 @@ $cfg['ModifyDeleteAtRight'] = FALSE; // show edit/delete links on right s $cfg['DefaultDisplay'] = 'horizontal'; // default display direction (horizontal|vertical) $cfg['RepeatCells'] = 100; // repeat header names every X cells? (0 = deactivate) - // Note: this feature will be - // implemented after 2.3.0 +// Syntax coloring (Note: this feature will be implemented after 2.3.0) $cfg['UseSyntaxColoring'] = TRUE; // use syntaxcoloring on output of SQL, might be a little slower $cfg['colorFunctions'] = '#FF0000'; // Colors used for Syntaxcoloring of SQL Statements $cfg['colorKeywords'] = '#990099'; @@ -280,6 +282,7 @@ $cfg['colorStrings'] = '#008000'; $cfg['colorColType'] = '#FF9900'; $cfg['colorAdd'] = '#0000FF'; + /** * Available charsets for MySQL conversion. currently contains all which could * be found in lang/* files and few more. @@ -287,7 +290,6 @@ $cfg['colorAdd'] = '#0000FF'; * Charsets will be shown in same order as here listed, so if you frequently * use some of these move them to the top. */ - $cfg['AvailableCharsets'] = array( 'iso-8859-1', 'iso-8859-2', @@ -320,6 +322,7 @@ $cfg['AvailableCharsets'] = array( 'SHIFT_JIS' ); + /** * MySQL settings */ @@ -392,8 +395,9 @@ if ($cfg['ShowFunctionFields']) { ); } // end if -if($cfg['UseSyntaxColoring']) { - $cfg['keywords']=array( +// Keywords for syntax coloring +if ($cfg['UseSyntaxColoring']) { + $cfg['keywords'] = array( 'SELECT', 'INSERT', 'LEFT', @@ -416,8 +420,10 @@ if($cfg['UseSyntaxColoring']) { 'VALUES' ); } // end if -if($cfg['UseSyntaxColoring']) { - $cfg['additional']=array( + +// Other reserved words for syntax coloring +if ($cfg['UseSyntaxColoring']) { + $cfg['additional'] = array( 'TABLE', 'DEFAULT', 'NULL', @@ -445,24 +451,20 @@ if($cfg['UseSyntaxColoring']) { ); } -/** - * Disable the default warning about $cfg['PmaAbsoluteUri'] not being set - * You should use this if and ONLY if the PmaAbsoluteUri auto-detection - * works perfectly. - */ -$cfg['PmaAbsoluteUri_DisableWarning'] = FALSE; /** * Unset magic_quotes_runtime - do not change! */ set_magic_quotes_runtime(0); + /** * Restore old error_reporting mode - do not change either! */ error_reporting($old_error_rep); unset($old_error_rep); + /** * File Revision - do not change either! */ diff --git a/db_details.php3 b/db_details.php3 index 3246bd013..f3169b5b5 100755 --- a/db_details.php3 +++ b/db_details.php3 @@ -47,39 +47,36 @@ $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get')) : (PMA_PHP_INT_VERSION < 30016 || intval(@get_cfg_var('upload_max_filesize'))); ?> - + - + + = 32303) { // Special speedup for newer MySQL Versions (in 4.0 format changed) if ($cfg['SkipLockedTables'] == TRUE && PMA_MYSQL_INT_VERSION >= 32330) { - $local_query = 'SHOW OPEN TABLES FROM ' . PMA_backquote($db); - $db_info_result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url_0); + $local_query = 'SHOW OPEN TABLES FROM ' . PMA_backquote($db); + $db_info_result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url_0); // Blending out tables in use if ($db_info_result != FALSE && mysql_num_rows($db_info_result) > 0) { while ($tmp = PMA_mysql_fetch_row($db_info_result)) { @@ -23,8 +23,8 @@ if (PMA_MYSQL_INT_VERSION >= 32303) { mysql_free_result($db_info_result); if (isset($sot_cache)) { - $local_query = 'SHOW TABLES FROM ' . PMA_backquote($db); - $db_info_result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url_0); + $local_query = 'SHOW TABLES FROM ' . PMA_backquote($db); + $db_info_result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url_0); if ($db_info_result != FALSE && mysql_num_rows($db_info_result) > 0) { while ($tmp = PMA_mysql_fetch_row($db_info_result)) { if (!isset($sot_cache[$tmp[0]])) { @@ -43,8 +43,8 @@ if (PMA_MYSQL_INT_VERSION >= 32303) { } } if (!isset($sot_ready)) { - $local_query = 'SHOW TABLE STATUS FROM ' . PMA_backquote($db); - $db_info_result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url_0); + $local_query = 'SHOW TABLE STATUS FROM ' . PMA_backquote($db); + $db_info_result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url_0); if ($db_info_result != FALSE && mysql_num_rows($db_info_result) > 0) { while ($sts_tmp = PMA_mysql_fetch_array($db_info_result)) { $tables[] = $sts_tmp; @@ -55,8 +55,8 @@ if (PMA_MYSQL_INT_VERSION >= 32303) { $num_tables = (isset($tables) ? count($tables) : 0); } // end if (PMA_MYSQL_INT_VERSION >= 32303) else { - $db_info_result = PMA_mysql_list_tables($db); - $num_tables = ($db_info_result) ? @mysql_numrows($db_info_result) : 0; + $db_info_result = PMA_mysql_list_tables($db); + $num_tables = ($db_info_result) ? @mysql_numrows($db_info_result) : 0; for ($i = 0; $i < $num_tables; $i++) { $tables[] = PMA_mysql_tablename($db_info_result, $i); } diff --git a/db_details_links.php3 b/db_details_links.php3 index e8d757fb7..14d6312a6 100644 --- a/db_details_links.php3 +++ b/db_details_links.php3 @@ -1,9 +1,13 @@ - - - +
 
+ + 0) { - echo printTab($strQBE,"db_details_qbe.php3",$url_query); + echo PMA_printTab($strQBE, 'db_details_qbe.php3', $url_query); } // end if -/** - * Displays drop link - */ +// Displays drop link if ($lnk5) { - echo printTab($strDrop,$lnk5,$arg5,$att5); + echo PMA_printTab($strDrop, $lnk5, $arg5, $att5); } // end if echo "\n"; ?> - +
 

diff --git a/db_details_structure.php3 b/db_details_structure.php3 index 00c278a1e..9c9d7f644 100644 --- a/db_details_structure.php3 +++ b/db_details_structure.php3 @@ -10,7 +10,7 @@ if (empty($is_info)) { include('./db_details_common.php3'); $url_query .= '&goto=db_details_structure.php3'; - //Drop/delete multiple tables if required + // Drops/deletes multiple tables if required if ((!empty($submit_mult) && isset($selected_tbl)) || isset($mult_btn)) { $action = 'db_details_structure.php3'; @@ -22,8 +22,10 @@ if (empty($is_info)) { include('./db_details_db_info.php3'); echo "\n"; } + + /** - * Settings for Relationstuff + * Settings for relations stuff */ require('./libraries/relation.lib.php3'); $cfgRelation = PMA_getRelationsParam(); @@ -448,47 +450,48 @@ echo ' ' . ' ' . "\n"; 0) { + $takeaway = $url_query . '&table=' . urlencode($table); ?>
  • - - +
    • - - + 0){ + if ($test_rs && mysql_num_rows($test_rs) > 0) { + echo "\n"; ?> -
  • -
    - - - - -  :
    -   -
    - -
    - -
    - - -    -
    -
    • +
  • +
    + + + + +  :
    +   +
    + +
    + +
    + + +    +
    +
    • 0) { // Get the valid databases list $num_dbs = count($dblist); $dbs = @mysql_list_dbs() or PMA_mysqlDie('', 'mysql_list_dbs()', '', 'main.php3?lang' . $lang . '&server=' . $server); - while ($a_db = PMA_mysql_fetch_object($dbs)) { - if (!$num_dbs) { - $dblist[] = $a_db->Database; - } else { - $true_dblist[$a_db->Database] = ''; - } - } // end while - @mysql_free_result($dbs); + if ($dbs) { + while ($a_db = PMA_mysql_fetch_object($dbs)) { + if (!$num_dbs) { + $dblist[] = $a_db->Database; + } else { + $true_dblist[$a_db->Database] = ''; + } + } // end while + mysql_free_result($dbs); + } // end if if ($num_dbs && empty($true_dblist)) { $dblist = array(); } else if ($num_dbs) { @@ -141,7 +144,7 @@ if ($server > 0) { */ if ($num_dbs > 0) { // Defines the urls used to sort the table - $common_url = 'db_stats.php3?lang=' . $lang . '&server=' . $server . '&convcharset=' . $convcharset; + $common_url = 'db_stats.php3?lang=' . $lang . '&convcharset=' . $convcharset . '&server=' . $server; if (empty($sort_by)) { $sort_by = 'db_name'; $sort_order = 'asc'; @@ -230,8 +233,12 @@ if ($num_dbs > 0) { $tables = @PMA_mysql_list_tables($db); // Number of tables - $dbs_array[$db][0] = ($tables) ? @mysql_numrows($tables) : 0; - @mysql_free_result($tables); + if ($tables) { + $dbs_array[$db][0] = mysql_numrows($tables); + mysql_free_result($tables); + } else { + $dbs_array[$db][0] = 0; + } $total_array[0] += $dbs_array[$db][0]; // Size of data and indexes @@ -252,8 +259,8 @@ if ($num_dbs > 0) { $total_array[1] += $dbs_array[$db][1]; $total_array[2] += $dbs_array[$db][2]; $total_array[3] += $dbs_array[$db][3]; + mysql_free_result($result); } // end if - @mysql_free_result($result); } // end if MySQL 3.23.03+ } // end for @@ -287,7 +294,7 @@ if ($num_dbs > 0) { echo ' ' . "\n"; echo '   ' . "\n"; echo ' ' . "\n"; - echo '  ' . $db_name . ' ' . "\n"; + echo '  ' . $db_name . ' ' . "\n"; echo '  ' . $dbs_array[$db_name][0] . ' ' . "\n"; echo '  ' . $data_size . ' ' . $data_unit . ' ' . "\n"; echo '  ' . $idx_size . ' ' . $idx_unit . ' ' . "\n"; diff --git a/header.inc.php3 b/header.inc.php3 index ef2417175..206e1fb9f 100755 --- a/header.inc.php3 +++ b/header.inc.php3 @@ -193,10 +193,14 @@ echo "\n"; - + +> ">
    - +
    @@ -191,7 +191,7 @@ if ($num_dbs > 1) { echo ' ' . "\n"; echo ' ' . "\n"; echo ' + Language (*): - - - - - - + + + + + + - - + + + -
    - - - - - - - - - -
    +
    + + + + + + + + + +
    0){ + // Now if we allready have choosen a page number then we should show the + // tables involved + if (isset($chpage) && $chpage > 0) { + echo "\n"; ?> -

    -
    - - - - - - - - - +
    + +

    + + + + + + + + +
    XY
    + + + + + + '; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; + echo '>' . $value . ''; + } // end while + echo "\n" . ' ' + . "\n" . ' '; + echo "\n" . ' '; + echo "\n" . ' '; + echo "\n" . ' '; + echo "\n" . ' '; $i++; - } - // do one more empty row - echo ''; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo '
    XY
    ' + . "\n" . ' '.$strDelete.'
    ' + . "\n" . ' ' . $strDelete; + echo "\n" . ' ' + . "\n" . ' '; + echo "\n" . ' ' + . "\n" . ' '; + echo "\n" . '
    ' + . "\n" . ' '.$strDelete.'
    '."\n"; - } -} + echo "\n" . ' ' + . "\n" . ' '; + echo "\n" . ' ' + . "\n" . ' ' . $strDelete; + echo "\n" . ' '; + echo "\n" . ' ' + . "\n" . ' '; + echo "\n" . ' '; + echo "\n" . ' ' + . "\n" . ' '; + echo "\n" . ' '; + echo "\n" . ' '; + echo "\n" . ' ' . "\n"; + + echo "\n" . ' '; + echo "\n" . '' . "\n\n"; + } // end if +} // end if ($cfgRelation['pdfwork']) /** diff --git a/pdf_schema.php3 b/pdf_schema.php3 index 4d2c665d4..6977b6a4d 100644 --- a/pdf_schema.php3 +++ b/pdf_schema.php3 @@ -11,26 +11,47 @@ */ require('./libraries/grab_globals.lib.php3'); require('./libraries/common.lib.php3'); -require('./libraries/relation.lib.php3'); + +/** + * Settings for relation stuff + */ +require('./libraries/relation.lib.php3'); $cfgRelation = PMA_getRelationsParam(); -if(!$cfgRelation['relwork']) { - echo sprintf($strNotSet,'relation','config.inc.php3') . '
    ' . $strDocu . ''; - die(); + + +/** + * Now in ./libraries/relation.lib.php3 we check for all tables + * that we need, but if we don't find them we are quiet about it + * so people can work without. + * This page is absolutely useless if you didn't set up your tables + * correctly, so it is a good place to see which tables we can and + * complain ;-) + */ +if (!$cfgRelation['relwork']) { + echo sprintf($strNotSet, 'relation', 'config.inc.php3') . '
    ' . "\n" + . '' . $strDocu . '' . "\n"; + exit(); } -if(!$cfgRelation['displaywork']) { - echo sprintf($strNotSet,'table_info','config.inc.php3') . '
    ' . $strDocu . ''; - die(); + +if (!$cfgRelation['displaywork']) { + echo sprintf($strNotSet, 'table_info', 'config.inc.php3') . '
    ' . "\n" + . '' . $strDocu . '' . "\n"; + exit(); } -if(!isset($cfgRelation['table_coords'])){ - echo sprintf($strNotSet,'table_coords','config.inc.php3') . '
    ' . $strDocu . ''; - die(); + +if (!isset($cfgRelation['table_coords'])){ + echo sprintf($strNotSet, 'table_coords', 'config.inc.php3') . '
    ' . "\n" + . '' . $strDocu . '' . "\n"; + exit(); } -if(!isset($cfgRelation['pdf_pages'])) { - echo sprintf($strNotSet,'pdf_page','config.inc.php3') . '
    ' . $strDocu . ''; - die(); +if (!isset($cfgRelation['pdf_pages'])) { + echo sprintf($strNotSet, 'pdf_page', 'config.inc.php3') . '
    ' . "\n" + . '' . $strDocu . '' . "\n"; + exit(); } + /** * Gets the "fpdf" libraries and defines the pdf font path */ @@ -388,15 +409,19 @@ class PMA_RT_Table $pdf->SetFont($ff, ''); $pdf->SetTextColor(0); $pdf->SetFillColor(255); - + reset($this->fields); while (list(, $field) = each($this->fields)) { - if(in_array($field,$this->primary)){$pdf->SetFillColor(215,121,123);} - if($field == $this->displayfield){$pdf->SetFillColor(142,159,224);} + if (in_array($field, $this->primary)) { + $pdf->SetFillColor(215, 121, 123); + } + if ($field == $this->displayfield) { + $pdf->SetFillColor(142, 159, 224); + } $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, ' ' . $field, 1, 1, 'L', 1); $pdf->PMA_PDF_setXScale($this->x); $pdf->SetFillColor(255); - } + } // end while if ($pdf->PageNo() > 1) { $pdf->PMA_PDF_die($GLOBALS['strScaleFactorSmall']); @@ -413,6 +438,8 @@ class PMA_RT_Table * @global object The current PDF document * @global integer The current page number (from the * $cfg['Servers'][$i]['table_coords'] table) + * @global array The relations settings + * @global string The current db name * * @access private * @@ -421,7 +448,7 @@ class PMA_RT_Table */ function PMA_RT_Table($table_name, $ff) { - global $pdf, $pdf_page_number,$cfgRelation,$db; + global $pdf, $pdf_page_number, $cfgRelation, $db; $this->table_name = $table_name; $sql = 'DESCRIBE ' . PMA_backquote($table_name); @@ -441,9 +468,9 @@ class PMA_RT_Table //x and y $sql = 'SELECT x, y FROM ' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table_name) . '\'' - . ' AND pdf_page_number = ' . $pdf_page_number; + . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddslashes($table_name) . '\'' + . ' AND pdf_page_number = ' . $pdf_page_number; $result = PMA_query_as_cu($sql); if (!$result || !mysql_num_rows($result)) { @@ -453,20 +480,19 @@ class PMA_RT_Table $this->x = (double) $this->x; $this->y = (double) $this->y; - //displayfield - $this->displayfield = getDisplayField($db,$table_name); + // displayfield + $this->displayfield = getDisplayField($db, $table_name); // index - $sql = 'SHOW index from '.PMA_backquote($table_name); + $sql = 'SHOW index FROM ' . PMA_backquote($table_name); $result = PMA_mysql_query($sql); - - if(mysql_num_rows($result)>0){ + if ($result && mysql_num_rows($result) > 0) { while ($row = PMA_mysql_fetch_array($result)) { - if($row['Key_name'] == 'PRIMARY'){ + if ($row['Key_name'] == 'PRIMARY') { $this->primary[] = $row['Column_name']; } } - } + } // end if } // end of the "PMA_RT_Table()" method } // end class "PMA_RT_Table" @@ -794,6 +820,8 @@ class PMA_RT * @param boolean Whether to draw grids or not * * @global object The current PDF document + * @global string The current db name + * @global array The relations settings * * @access private * @@ -818,23 +846,22 @@ class PMA_RT $pdf->SetFont($this->ff, '', 14); $pdf->SetAutoPageBreak('auto'); - // get tables on this page + // Gets tables on this page $tab_sql = 'SELECT table_name FROM ' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . $db . '\'' - . ' AND pdf_page_number=' .$which_rel; + . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' + . ' AND pdf_page_number = ' . $which_rel; $tab_rs = PMA_query_as_cu($tab_sql); while ($curr_table = @PMA_mysql_fetch_array($tab_rs)) { - $alltables[] = $curr_table['table_name']; - $intable = "'" . implode("','",$alltables) . "'"; + $alltables[] = PMA_sqlAddslashes($curr_table['table_name']); + $intable = '\'' . implode('\', \'', $alltables) . '\''; } - $sql = 'SELECT *' - . ' FROM ' . PMA_backquote($cfgRelation['relation']) - . ' WHERE master_db = \'' . $db . '\' ' - . ' AND foreign_db = \'' . $db . '\' ' - . ' AND master_table IN (' . $intable .')' - . ' AND foreign_table IN (' . $intable .')'; + $sql = 'SELECT * FROM ' . PMA_backquote($cfgRelation['relation']) + . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\' ' + . ' AND foreign_db = \'' . PMA_sqlAddslashes($db) . '\' ' + . ' AND master_table IN (' . $intable . ')' + . ' AND foreign_table IN (' . $intable . ')'; $result = PMA_query_as_cu($sql); if (!$result || !mysql_num_rows($result)) { @@ -843,7 +870,7 @@ class PMA_RT while ($row = PMA_mysql_fetch_array($result)) { $this->PMA_RT_addRelation($row['master_table'] , $row['master_field'], $row['foreign_table'], $row['foreign_field']); } - + // Defines the scale factor if ($scale == 'auto') { $this->scale = ceil(max(($this->x_max - $this->x_min) / (297 - $this->r_marg - $this->l_marg), ($this->y_max - $this->y_min) / (210 - $this->t_marg - $this->b_marg)) * 100) / 100; diff --git a/read_dump.php3 b/read_dump.php3 index 25cb73150..2faecc2fe 100644 --- a/read_dump.php3 +++ b/read_dump.php3 @@ -321,7 +321,9 @@ if ($sql_query != '') { $pieces = array(); PMA_splitSqlFile($pieces, $sql_query, PMA_MYSQL_INT_VERSION); $pieces_count = count($pieces); - if($pieces_count>1){$is_multiple = TRUE;} + if ($pieces_count > 1) { + $is_multiple = TRUE; + } // Copy of the cleaned sql statement for display purpose only (see near the // beginning of "db_details.php3" & "tbl_properties.php3") diff --git a/tbl_properties_links.php3 b/tbl_properties_links.php3 index cb984f8ba..2bdb29317 100755 --- a/tbl_properties_links.php3 +++ b/tbl_properties_links.php3 @@ -46,20 +46,21 @@ $att7 = 'class="drop" onclick="return confirmLink(this, \'DROP TABLE ' . PMA_jsF * Displays links */ ?> - +