From 42ac66ad749fdeee60cf402bc3ae3dda920dbcd6 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 10 Feb 2007 15:58:46 +0000 Subject: [PATCH] get rid of propicon --- ChangeLog | 104 +- Documentation.html | 14 +- README | 2 +- browse_foreigners.php | 2 +- js/querywindow.js | 49 +- lang/afrikaans-iso-8859-1.inc.php | 10 + lang/afrikaans-utf-8.inc.php | 10 + lang/albanian-iso-8859-1.inc.php | 10 + lang/albanian-utf-8.inc.php | 10 + lang/arabic-utf-8.inc.php | 10 + lang/arabic-windows-1256.inc.php | 10 + lang/azerbaijani-iso-8859-9.inc.php | 10 + lang/azerbaijani-utf-8.inc.php | 10 + lang/basque-iso-8859-1.inc.php | 10 + lang/basque-utf-8.inc.php | 10 + lang/belarusian_cyrillic-utf-8.inc.php | 10 + lang/belarusian_cyrillic-windows-1251.inc.php | 10 + lang/belarusian_latin-utf-8.inc.php | 10 + lang/bosnian-utf-8.inc.php | 10 + lang/bosnian-windows-1250.inc.php | 10 + lang/brazilian_portuguese-iso-8859-1.inc.php | 10 + lang/brazilian_portuguese-utf-8.inc.php | 10 + lang/bulgarian-koi8-r.inc.php | 10 + lang/bulgarian-utf-8.inc.php | 10 + lang/bulgarian-windows-1251.inc.php | 10 + lang/catalan-iso-8859-1.inc.php | 111 +- lang/catalan-utf-8.inc.php | 111 +- lang/chinese_simplified-gb2312.inc.php | 10 + lang/chinese_simplified-utf-8.inc.php | 10 + lang/chinese_traditional-big5.inc.php | 10 + lang/chinese_traditional-utf-8.inc.php | 10 + lang/croatian-iso-8859-2.inc.php | 10 + lang/croatian-utf-8.inc.php | 10 + lang/croatian-windows-1250.inc.php | 10 + lang/czech-iso-8859-2.inc.php | 10 + lang/czech-utf-8.inc.php | 10 + lang/czech-windows-1250.inc.php | 10 + lang/danish-iso-8859-1.inc.php | 10 + lang/danish-utf-8.inc.php | 10 + lang/dutch-iso-8859-1.inc.php | 10 + lang/dutch-iso-8859-15.inc.php | 10 + lang/dutch-utf-8.inc.php | 10 + lang/english-iso-8859-1.inc.php | 10 + lang/english-iso-8859-15.inc.php | 10 + lang/english-utf-8.inc.php | 10 + lang/estonian-iso-8859-1.inc.php | 10 + lang/estonian-utf-8.inc.php | 10 + lang/finnish-iso-8859-1.inc.php | 10 + lang/finnish-iso-8859-15.inc.php | 10 + lang/finnish-utf-8.inc.php | 10 + lang/french-iso-8859-1.inc.php | 10 + lang/french-iso-8859-15.inc.php | 10 + lang/french-utf-8.inc.php | 10 + lang/galician-iso-8859-1.inc.php | 10 + lang/galician-utf-8.inc.php | 10 + lang/georgian-utf-8.inc.php | 10 + lang/german-iso-8859-1.inc.php | 86 +- lang/german-iso-8859-15.inc.php | 86 +- lang/german-utf-8.inc.php | 86 +- lang/greek-iso-8859-7.inc.php | 10 + lang/greek-utf-8.inc.php | 10 + lang/hebrew-iso-8859-8-i.inc.php | 10 + lang/hebrew-utf-8.inc.php | 10 + lang/hindi-utf-8.inc.php | 10 + lang/hungarian-iso-8859-2.inc.php | 10 + lang/hungarian-utf-8.inc.php | 10 + lang/indonesian-iso-8859-1.inc.php | 10 + lang/indonesian-utf-8.inc.php | 10 + lang/italian-iso-8859-1.inc.php | 10 + lang/italian-iso-8859-15.inc.php | 10 + lang/italian-utf-8.inc.php | 10 + lang/japanese-euc.inc.php | 1344 ++++----- lang/japanese-sjis.inc.php | 1378 ++++----- lang/japanese-utf-8.inc.php | 1314 ++++----- lang/korean-euc-kr.inc.php | 10 + lang/korean-utf-8.inc.php | 10 + lang/latvian-utf-8.inc.php | 10 + lang/latvian-windows-1257.inc.php | 10 + lang/lithuanian-utf-8.inc.php | 10 + lang/lithuanian-windows-1257.inc.php | 10 + lang/malay-iso-8859-1.inc.php | 10 + lang/malay-utf-8.inc.php | 10 + lang/mongolian-utf-8.inc.php | 10 + lang/norwegian-iso-8859-1.inc.php | 10 + lang/norwegian-utf-8.inc.php | 10 + lang/persian-utf-8.inc.php | 10 + lang/persian-windows-1256.inc.php | 10 + lang/polish-iso-8859-2.inc.php | 10 + lang/polish-utf-8.inc.php | 10 + lang/polish-windows-1250.inc.php | 10 + lang/portuguese-iso-8859-1.inc.php | 10 + lang/portuguese-iso-8859-15.inc.php | 10 + lang/portuguese-utf-8.inc.php | 10 + lang/romanian-iso-8859-1.inc.php | 10 + lang/romanian-utf-8.inc.php | 10 + lang/russian-cp-866.inc.php | 10 + lang/russian-koi8-r.inc.php | 10 + lang/russian-utf-8.inc.php | 10 + lang/russian-windows-1251.inc.php | 10 + lang/serbian_cyrillic-utf-8.inc.php | 10 + lang/serbian_cyrillic-windows-1251.inc.php | 10 + lang/serbian_latin-utf-8.inc.php | 10 + lang/serbian_latin-windows-1250.inc.php | 10 + lang/slovak-iso-8859-2.inc.php | 10 + lang/slovak-utf-8.inc.php | 10 + lang/slovak-windows-1250.inc.php | 10 + lang/slovenian-iso-8859-2.inc.php | 10 + lang/slovenian-utf-8.inc.php | 10 + lang/slovenian-windows-1250.inc.php | 10 + lang/spanish-iso-8859-1.inc.php | 120 +- lang/spanish-iso-8859-15.inc.php | 120 +- lang/spanish-utf-8.inc.php | 120 +- lang/swedish-iso-8859-1.inc.php | 10 + lang/swedish-utf-8.inc.php | 10 + lang/tatarish-iso-8859-9.inc.php | 10 + lang/tatarish-utf-8.inc.php | 10 + lang/thai-tis-620.inc.php | 10 + lang/thai-utf-8.inc.php | 10 + lang/turkish-iso-8859-9.inc.php | 10 + lang/turkish-utf-8.inc.php | 10 + lang/ukrainian-utf-8.inc.php | 10 + lang/ukrainian-windows-1251.inc.php | 10 + libraries/Config.class.php | 2 +- libraries/PMA_Sql.class.php | 2493 ++++++++++++++++ libraries/Theme.class.php | 132 +- libraries/auth/http.auth.lib.php | 5 +- libraries/auth/signon.auth.lib.php | 11 +- libraries/common.lib.php | 401 ++- libraries/config.default.php | 2581 +++++++++++++---- libraries/database_interface.lib.php | 17 +- libraries/display_tbl.lib.php | 43 +- libraries/header_meta_style.inc.php | 4 +- libraries/header_printview.inc.php | 2 +- libraries/import.lib.php | 3 - libraries/js_escape.lib.php | 64 + libraries/navigation_header.inc.php | 11 +- libraries/select_lang.lib.php | 111 +- libraries/session.inc.php | 42 +- libraries/sqlparser.lib.php | 2 +- libraries/tbl_replace_fields.inc.php | 41 +- main.php | 4 +- navigation.php | 2 +- css/phpmyadmin.css.php => phpmyadmin.css.php | 57 +- pmd/scripts/move.js | 1 + pmd_general.php | 102 +- pmd_pdf.php | 16 +- pmd_save_pos.php | 14 +- css/print.css => print.css | 0 tbl_change.php | 203 +- tbl_indexes.php | 10 +- tbl_replace.php | 22 +- test/core.lib.php | 67 + test/escape_js_string.php | 39 + test/theme.php | 5 +- .../darkblue_orange/css/theme_right.css.php | 64 +- themes/darkblue_orange/img/logo_left.png | Bin 4432 -> 6854 bytes themes/darkblue_orange/layout.inc.php | 4 +- themes/original/css/theme_left.css.php | 2 +- themes/original/css/theme_right.css.php | 64 +- themes/original/img/logo_left.png | Bin 4424 -> 6854 bytes themes/original/layout.inc.php | 2 +- translators.html | 16 +- view_create.php | 141 + 163 files changed, 9459 insertions(+), 3448 deletions(-) create mode 100644 libraries/PMA_Sql.class.php create mode 100644 libraries/js_escape.lib.php rename css/phpmyadmin.css.php => phpmyadmin.css.php (83%) rename css/print.css => print.css (100%) create mode 100644 test/core.lib.php create mode 100644 test/escape_js_string.php create mode 100644 view_create.php diff --git a/ChangeLog b/ChangeLog index 579977844..2ed1a944f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,102 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL$ +2007-02-10 Marc Delisle + * lang/spanish update, thanks to Daniel Hinostroza + * tbl_change.php, tbl_indexes.php, libraries/common.lib.php: + get rid of $propicon + +2007-02-09 Marc Delisle + * main.php: some links should open a new page + * Documentation.html, libraries/navigation_header.inc.php, + libraries/config.default.php: $cfg['LeftLogoLinkWindow'] to decide + in which window the logo-linked page will appear + +2007-02-09 Michal Čihař + * lang/czech: Fix syntax error (sorry for that). + +2007-02-08 Marc Delisle + * themes/darkblue_orange/img/logo_left.png, + themes/original/img/logo_left.png: smaller PMA logo for navi + * libraries/navigation_header.inc.php, libraries/config.default.php: + navi logo now links to main page by default, with still the possibility + of having an external URL + +2007-02-08 Sebastian Mendel + * themes/*/css/theme_right.css.php: bug #1653769 browsing highlight disabling + doesn't work + +2007-02-06 Sebastian Mendel + * pmd_general.php, pmd_pdf.php, pmd_save_pos.php: fixed short open tags + patch #1652886 thanks to Martin Thielecke - mthie + * tbl_change.php: fixed escaping of field names in HTML and JavaScript + * libraries/common.lib.php: PMA_backquote() did not quote 0 + * tbl_change.php: bug #1652810 - slashes are not escaped properly + +2007-02-05 Michal Čihař + * lang/czech: Updated. + +2007-02-05 Marc Delisle + * lang/japanese: Update, thanks to Ishigaki Kenichi - tcool. + +2007-02-05 Sebastian Mendel + * lang/german: updated + +2007-02-04 Marc Delisle + * js/querywindow.js: query window icon did not work, + thanks to Jürgen Wind + +2007-02-03 Marc Delisle + * view_create.php, libraries/display_tbl.lib.php, lang/*: + support for CREATE VIEW from query results + * pmd/scripts/move.js: display problems in Opera, thanks to Maxim Bulygin + +2007-02-02 Marc Delisle + * tbl_replace.php: Calendar icon does not work on "Insert another new row" + +2007-02-01 Marc Delisle + * libraries/import.lib.php: bug #1626064, too much quoting on import + +2007-02-01 Sebastian Mendel + * libraries/display_tbl.lib.php: bug #1644740 - $cfg['Order'] = 'SMART' + overwritten + * libraries/Theme.class.php: removed __wakeup() due to some requirements are + not fulfilled at this point - also thanks to Jürgen Wind - windkiel + +2007-01-31 Sebastian Mendel + * libraries/session.inc.php: + bug #1630871 - Detecting a missing write permission on sessions directory + * libraries/select_lang.lib.php: globalized variables to be usable inside + function, documentation + * libraries/auth/http.auth.lib.php, libraries/auth/signon.auth.lib.php + libraries/common.lib.php, libraries/database_interface.lib.php + libraries/select_lang.lib.php, libraries/session.inc.php: + added PMA_fatalError() and made use of it + +2007-01-30 Marc Delisle + * libraries/tbl_replace_fields.inc.php: undefined variable + +2007-01-30 Sebastian Mendel + * libraries/sqlparser.lib.php PMA_SQP_analyze(): + bug #1647785 - do not pass variables by reference + +2007-01-29 Marc Delisle + * lang/catalan update, thanks to Xavier Navarro (xavin) + * pmd_general.php: possibility of quotes in Designer messages, + thanks to Ivan Kirillov + +2007-01-29 Sebastian Mendel + * tbl_replace.php, libraries/tbl_replace_fields.inc.php: print out error + messages if upload failed (bug #1615530) + * js/querywindow.js: fixed bug #1541147 - # in database names + +2007-01-26 Michal Čihař + * libraries/common.lib.php, libraries/js_escape.lib.php, + test/escape_js_string.php, test/core.lib.php: Move java script escaping + to separate library, make it safer on escaping and add + testcase for it. + * test/theme.php: Move to test package. + 2007-01-22 Marc Delisle * pmd/*: button for direct/angular links, thanks to Ivan Kirillov @@ -65,7 +161,7 @@ $HeadURL$ session.save_handler to 'files' * pmd_general.php: patch #1627831, English language improvements, thanks to Isaac Bennetch - * pmd_general.php, pmd_relation_new.php, lang/*: abstract messages + * pmd_general.php, pmd_relation_new.php, lang/*: abstract messages 2007-01-04 Marc Delisle * pmd/scripts/move.js: avoid text selection when moving a table object @@ -93,7 +189,7 @@ $HeadURL$ so by default, row count is not done for views 2006-12-30 Marc Delisle - * libraries/Config.class.php: bug #1590083, + * libraries/Config.class.php: bug #1590083, $cfg['DefaultConnectionCollation'] ignored in config.inc.php 2006-12-30 Michal Čihař @@ -118,11 +214,11 @@ $HeadURL$ * libraries/export/sql.php: bug #1619647, export of query results should not contain procedure definitions * navigation.php, test/theme.php, browse_foreigners.php, - libraries/header_printview.inc.php: patch #1611684 part 2, client + libraries/header_printview.inc.php: patch #1611684 part 2, client caching of phpmyadmin.css.php, thanks to Christian Schmidt 2006-12-19 Sebastian Mendel - * tbl_change.php, tbl_replace.php, include/tbl_replace_fields.inc.php: + * tbl_change.php, tbl_replace.php, libarsies/tbl_replace_fields.inc.php: refactored: made register_globals independent; added documentation; removed unused code; fixed bug #1597686 last insert id message wrong; much more i don't remember ... diff --git a/Documentation.html b/Documentation.html index f86a60661..793859a4d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -11,7 +11,7 @@ - phpMyAdmin 2.10.0-dev - Documentation + phpMyAdmin 2.11.0-dev - Documentation @@ -33,7 +33,7 @@
  • Glossary
    • -

    phpMyAdmin 2.10.0-dev Documentation

    +

    phpMyAdmin 2.11.0-dev Documentation

    • phpMyAdmin homepage
      • @@ -1213,8 +1213,14 @@ ALTER TABLE `pma_column_comments`
      Defines whether or not to display the phpMyAdmin logo at the top of the left frame. Defaults to TRUE.
      -
      Enter URL where logo in left frame will point to. For use especially - with self made theme which changes this.
      +
      Enter URL where logo in the navigation frame will point to. + For use especially with self made theme which changes this. + The default value for this is main.php.
      + +
      $cfg['LeftLogoLinkWindow'] string
      +
      Whether to open the linked page in the main window (main) + or in a new one (new).
      +
      $cfg['LeftDisplayServers'] boolean
      Defines whether or not to display a server choice at the top of the left frame. Defaults to FALSE.
      diff --git a/README b/README index 4946e458b..c3bf3b8b2 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 2.10.0-dev + Version 2.11.0-dev ------------------ http://www.phpmyadmin.net/ diff --git a/browse_foreigners.php b/browse_foreigners.php index aae0a740e..22c3ab057 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -93,7 +93,7 @@ if (isset($disp_row) && is_array($disp_row)) { phpMyAdmin + href="phpmyadmin.css.php?&js_frame=right&nocache=getMtime(); ?>" /> "; +strLang["strModifications"] = "' . $strModifications . '"; +strLang["strRelationDeleted"] = "' . $strRelationDeleted . '"; +strLang["strInnoDBRelationAdded"] = "' . $strInnoDBRelationAdded . '"; +strLang["strGeneralRelationFeat:strDisabled"] = "' . $strGeneralRelationFeat . ' : ' . $strDisabled . '"; +strLang["strInternalRelationAdded"] = "' . $strInternalRelationAdded . '"; +strLang["strErrorRelationAdded"] = "' . $strErrorRelationAdded . '"; +strLang["strErrorRelationExists"] = "' . $strErrorRelationExists . '"; +strLang["strErrorSaveTable"] = "' . $strErrorSaveTable . '"; +'; ?> @@ -61,27 +61,27 @@ echo $script_tabs . $script_contr . $script_display_field;
        -
        v vvkeykey >
      - +
      - +
      @@ -91,9 +91,9 @@ echo $script_tabs . $script_contr . $script_display_field;
      - vv + vv
      @@ -102,7 +102,7 @@ echo $script_tabs . $script_contr . $script_display_field;
      @@ -110,12 +110,12 @@ echo $script_tabs . $script_contr . $script_display_field; -
      ')" title="" id="check_vis_" style="margin:0px;" type="checkbox" value="" > ');">
      - + @@ -126,7 +126,7 @@ echo $script_tabs . $script_contr . $script_display_field; ]" type="hidden" id="t_v[]"> -; +
      ; top: ; visibility: ; "> @@ -149,16 +149,16 @@ for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ ) onMouseOver="this.className = 'tab_zag_2'" onMouseOut="this.className = 'tab_zag'" >".strtolower($GLOBALS['PMD_OUT']["OWNER"][$i]).".".$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; ?> - ;"> " - - onMouseOver="old_class = this.className; this.className = 'tab_field_2';" onMouseOut="this.className = old_class;" + + onMouseOver="old_class = this.className; this.className = 'tab_field_2';" onMouseOut="this.className = old_class;" onMouseDown="Click_field(')"> @@ -202,7 +202,7 @@ for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ ) ?>
      -
      ; background-color:#CCFF99; padding:3px; border:#009933 solid 1px; white-space:nowrap; font-weight:bold">Load...
      " >
      - */images/FieldKey_small.png" alt="*">/images/Field_small.png" alt="*"> + ?>.png" alt="*">
      @@ -244,7 +244,7 @@ for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ ) diff --git a/pmd_pdf.php b/pmd_pdf.php index 793066765..841a7c442 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -13,7 +13,7 @@ if (isset($scale)) { if (empty($pdf_page_number)) { die(""); } - + $pmd_table = PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']); $pma_table = PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']); @@ -23,14 +23,14 @@ if (isset($scale)) { PMA_query_as_cu($sql,TRUE,PMA_DBI_QUERY_STORE); } - + if (isset($imp)) { PMA_query_as_cu( - 'UPDATE ' . $pma_table . ',' . $pmd_table . + 'UPDATE ' . $pma_table . ',' . $pmd_table . ' SET ' . $pmd_table . '.`x`= ' . $pma_table . '.`x` * '. $scale . ', ' . $pmd_table . '.`y`= ' . $pma_table . '.`y` * '.$scale.' WHERE - ' . $pmd_table . '.`db_name`=' . $pma_table . '.`db_name` + ' . $pmd_table . '.`db_name`=' . $pma_table . '.`db_name` AND ' . $pmd_table . '.`table_name` = ' . $pma_table . '.`table_name` AND @@ -53,7 +53,7 @@ if (isset($scale)) {
      -
      +

      : - - - "> + diff --git a/pmd_save_pos.php b/pmd_save_pos.php index 4f41a4397..b6f7ec81d 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -4,29 +4,29 @@ include_once 'pmd_common.php'; require_once './libraries/relation.lib.php'; - -$alltab_rs = PMA_query_as_cu('SHOW TABLES FROM '.PMA_backquote($cfg['Server']['pmadb']),FALSE,PMA_DBI_QUERY_STORE) or PMD_err_sav(); + +$alltab_rs = PMA_query_as_cu('SHOW TABLES FROM '.PMA_backquote($cfg['Server']['pmadb']),FALSE,PMA_DBI_QUERY_STORE) or PMD_err_sav(); $seen_pmd_table = false; while ($tab_name = @PMA_DBI_fetch_row($alltab_rs)) { if (stristr($tab_name[0],$GLOBALS['cfgRelation']['designer_coords'])) { $seen_pmd_table = true; - break; + break; } } if ( ! $seen_pmd_table) { - PMD_err_sav(); + PMD_err_sav(); } foreach ($t_x as $key => $value) { $KEY = empty($IS_AJAX) ? urldecode($key) : $key; // table name decode (post PDF exp/imp) list($DB,$TAB) = explode(".", $KEY); - PMA_query_as_cu('DELETE FROM '.$GLOBALS['cfgRelation']['designer_coords'].' + PMA_query_as_cu('DELETE FROM '.$GLOBALS['cfgRelation']['designer_coords'].' WHERE `db_name` = \'' . PMA_sqlAddslashes($DB) . '\' AND `table_name` = \'' . PMA_sqlAddslashes($TAB) . '\'', 1, PMA_DBI_QUERY_STORE); - PMA_query_as_cu('INSERT INTO '.$GLOBALS['cfgRelation']['designer_coords'].' + PMA_query_as_cu('INSERT INTO '.$GLOBALS['cfgRelation']['designer_coords'].' (db_name, table_name, x, y, v, h) VALUES (' . '\'' . PMA_sqlAddslashes($DB) . '\', ' @@ -53,6 +53,6 @@ if(! empty($die_save_pos)) { header("Cache-Control: no-cache"); ?> '> - diff --git a/css/print.css b/print.css similarity index 100% rename from css/print.css rename to print.css diff --git a/tbl_change.php b/tbl_change.php index 9550b6423..a9bef7386 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -138,7 +138,7 @@ if (isset($primary_key)) { $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . ' WHERE ' . $primary_key . ';'; $result[$rowcount] = PMA_DBI_query($local_query, null, PMA_DBI_QUERY_STORE); $row[$rowcount] = PMA_DBI_fetch_assoc($result[$rowcount]); - $primary_keys[$rowcount] = $primary_key; + $primary_keys[$rowcount] = str_replace('\\', '\\\\', $primary_key); // No row returned if (!$row[$rowcount]) { @@ -203,11 +203,8 @@ if (isset($primary_key_array)) { } echo "\n"; -if ($cfg['PropertiesIconic'] == true) { - // We need to copy the value or else the == 'both' check will always return true - $propicon = (string)$cfg['PropertiesIconic']; - - if ($propicon == 'both') { +if ($cfg['PropertiesIconic'] === true || $cfg['PropertiesIconic'] === 'both') { + if ($cfg['PropertiesIconic'] === 'both') { $iconic_spacer = '

      '; } else { $iconic_spacer = ''; @@ -215,7 +212,7 @@ if ($cfg['PropertiesIconic'] == true) { $titles['Browse'] = $iconic_spacer . '' . $strBrowseForeignValues . ''; - if ($propicon == 'both') { + if ($cfg['PropertiesIconic'] === 'both') { $titles['Browse'] .= ' ' . $strBrowseForeignValues . '
      '; } } else { @@ -330,11 +327,17 @@ foreach ($loop_array as $vrowcount => $vrow) { $row_table_def['True_Type'] = preg_replace('@\(.*@s', '', $row_table_def['Type']); $field = $row_table_def['Field']; - $field_html = $field; + $field_html = htmlspecialchars($field); + $field_md5 = md5($field); + + $unnillify_trigger = $chg_evt_handler . "=\"return unNullify('" . PMA_escapeJsString($field_html) . "', '" . PMA_escapeJsString($jsvkey) . "')\""; + $field_name_appendix = $vkey . '[' . $field_html . ']'; + $field_name_appendix_md5 = $field_md5 . $vkey . '[]'; + // removed previous PHP3-workaround that caused a problem with // field names like '000' - $rowfield = $field; + //$rowfield = $field; // d a t e t i m e // @@ -365,14 +368,14 @@ foreach ($loop_array as $vrowcount => $vrow) { // INSERT case if ($insert_mode) { if (isset($vrow)) { - $vrow[$rowfield] = date('Y-m-d H:i:s', time()); + $vrow[$field] = date('Y-m-d H:i:s', time()); } else { - $vrow = array($rowfield => date('Y-m-d H:i:s', time())); + $vrow = array($field => date('Y-m-d H:i:s', time())); } } // UPDATE case with an empty and not NULL value under PHP4 - elseif (empty($vrow[$rowfield]) && is_null($vrow[$rowfield])) { - $vrow[$rowfield] = date('Y-m-d H:i:s', time()); + elseif (empty($vrow[$field]) && is_null($vrow[$field])) { + $vrow[$field] = date('Y-m-d H:i:s', time()); } // end if... elseif... } $len = (preg_match('@float|double@', $row_table_def['Type'])) @@ -382,7 +385,8 @@ foreach ($loop_array as $vrowcount => $vrow) { $field_name = $field_html; if (isset($comments_map[$field])) { - $field_name = '' . $field_name . ''; + $field_name = '' . $field_name . ''; } ?> @@ -427,23 +431,23 @@ foreach ($loop_array as $vrowcount => $vrow) { // Prepares the field value $real_null_value = FALSE; if (isset($vrow)) { - if (!isset($vrow[$rowfield]) - || (function_exists('is_null') && is_null($vrow[$rowfield]))) { + if (!isset($vrow[$field]) + || (function_exists('is_null') && is_null($vrow[$field]))) { $real_null_value = TRUE; - $vrow[$rowfield] = ''; + $vrow[$field] = ''; $special_chars = ''; - $data = $vrow[$rowfield]; + $data = $vrow[$field]; } else { // loic1: special binary "characters" if ($is_binary || $is_blob) { - $vrow[$rowfield] = str_replace("\x00", '\0', $vrow[$rowfield]); - $vrow[$rowfield] = str_replace("\x08", '\b', $vrow[$rowfield]); - $vrow[$rowfield] = str_replace("\x0a", '\n', $vrow[$rowfield]); - $vrow[$rowfield] = str_replace("\x0d", '\r', $vrow[$rowfield]); - $vrow[$rowfield] = str_replace("\x1a", '\Z', $vrow[$rowfield]); + $vrow[$field] = str_replace("\x00", '\0', $vrow[$field]); + $vrow[$field] = str_replace("\x08", '\b', $vrow[$field]); + $vrow[$field] = str_replace("\x0a", '\n', $vrow[$field]); + $vrow[$field] = str_replace("\x0d", '\r', $vrow[$field]); + $vrow[$field] = str_replace("\x1a", '\Z', $vrow[$field]); } // end if - $special_chars = htmlspecialchars($vrow[$rowfield]); - $data = $vrow[$rowfield]; + $special_chars = htmlspecialchars($vrow[$field]); + $data = $vrow[$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 @@ -451,7 +455,7 @@ foreach ($loop_array as $vrowcount => $vrow) { // it's better to set a fields_prev in this situation $backup_field = (PMA_MYSQL_INT_VERSION < 40100 && $row_table_def['True_Type'] == 'timestamp') ? '' - : ''; + : ''; } else { // loic1: display default values if (!isset($row_table_def['Default'])) { @@ -484,7 +488,7 @@ foreach ($loop_array as $vrowcount => $vrow) { } else { ?>
      @@ -646,16 +666,28 @@ foreach ($loop_array as $vrowcount => $vrow) { $vrow) { $enum_cnt = count($enum); ?> @@ -206,7 +206,7 @@ @@ -234,7 +234,7 @@ @@ -269,7 +269,7 @@ @@ -290,7 +290,7 @@ @@ -311,7 +311,7 @@ diff --git a/view_create.php b/view_create.php new file mode 100644 index 000000000..cb890ce9e --- /dev/null +++ b/view_create.php @@ -0,0 +1,141 @@ + + +
      + + + +
      + CREATE VIEW + +
      - +
      - tabindex="" id="field__1"> $vrow) { // garvin: Find the current type in the RestrictColumnTypes. Will result in 'FUNC_CHAR' // or something similar. Then directly look up the entry in the RestrictFunctions array, // which will then reveal the available dropdown options - if (isset($cfg['RestrictFunctions']) && isset($cfg['RestrictColumnTypes']) && isset($cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])]) && isset($cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])]])) { + if (isset($cfg['RestrictFunctions']) + && isset($cfg['RestrictColumnTypes']) + && isset($cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])]) + && isset($cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])]])) { $current_func_type = $cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])]; $dropdown = $cfg['RestrictFunctions'][$current_func_type]; $default_function = $cfg['DefaultFunctions'][$current_func_type]; @@ -517,8 +524,10 @@ foreach ($loop_array as $vrowcount => $vrow) { // ON UPDATE DEFAULT TIMESTAMP attribute. if (PMA_MYSQL_INT_VERSION < 40102 - || (PMA_MYSQL_INT_VERSION >= 40102 - && !($row_table_def['True_Type'] == 'timestamp' && !empty($row_table_def['Default']) && !isset($analyzed_sql[0]['create_table_fields'][$field]['on_update_current_timestamp'])))) { + || (PMA_MYSQL_INT_VERSION >= 40102 + && !($row_table_def['True_Type'] == 'timestamp' + && !empty($row_table_def['Default']) + && !isset($analyzed_sql[0]['create_table_fields'][$field]['on_update_current_timestamp'])))) { $selected = ($first_timestamp && $dropdown[$j] == $cfg['DefaultFunctions']['first_timestamp']) || (!$first_timestamp && $dropdown[$j] == $default_function) ? ' selected="selected"' @@ -564,7 +573,7 @@ foreach ($loop_array as $vrowcount => $vrow) { // --------------- echo ' ' . "\n"; if ($row_table_def['Null'] == 'YES') { - echo ' $vrow) { if (!(($cfg['ProtectBinary'] && $is_blob) || ($cfg['ProtectBinary'] == 'all' && $is_binary)) ) { echo ' $vrow) { } else { $onclick .= '5, '; } - $onclick .= '\'' . $field_html . '\', \'' . md5($field) . '\', \'' . $vkey . '\'); this.checked = true}; return true" />' . "\n"; + $onclick .= '\'' . PMA_escapeJsString($field_html) . '\', \'' . $field_md5 . '\', \'' . PMA_escapeJsString($vkey) . '\'); this.checked = true}; return true" />' . "\n"; echo $onclick; } else { - echo ' $vrow) { ?> - - - ="return unNullify('', '')" tabindex="" id="field__3" value="" /> + + + + tabindex="" + id="field__3" + value="" /> @@ -631,9 +646,14 @@ foreach ($loop_array as $vrowcount => $vrow) { ?> - - - + +
      - + - + - - + + $vrow) { if (strlen($row_table_def['Type']) > 20) { echo "\n"; ?> - + tabindex="" + id="field__3"> $vrow) { // Removes automatic MySQL escape format $enum_atom = str_replace('\'\'', '\'', str_replace('\\\\', '\\', $enum[$j])); echo ' '; - echo ''; - echo '' . "\n"; + echo '' . "\n"; } // end for } // end else @@ -734,9 +777,13 @@ foreach ($loop_array as $vrowcount => $vrow) { ?> - - - + + - + + - + $vrow) { ?> - ="return unNullify('', '')" tabindex="" id="field__3" /> + + tabindex="" + id="field__3" /> $vrow) { if ($is_upload && $is_blob) { echo '
      '; - echo ' '; + echo ' '; // find maximum upload size, based on field type /** @@ -867,28 +925,43 @@ foreach ($loop_array as $vrowcount => $vrow) { if ($is_char && ($cfg['CharEditing'] == 'textarea' || strpos($data, "\n") !== FALSE)) { echo "\n"; ?> - + - ="return unNullify('', '')" tabindex="" id="field__3" /> + + tabindex="" + id="field__3" /> - + - + '; @@ -428,11 +424,11 @@ elseif (!defined('PMA_IDX_INCLUDED') . 'b_drop.png" width="16" height="16" title="' . $strDrop . '" alt="' . $strDrop . '" />'; } - if ($cfg['PropertiesIconic'] === false || $propicon == 'both') { + if ($cfg['PropertiesIconic'] === false || $cfg['PropertiesIconic'] === 'both') { $edit_link_text .= $strEdit; $drop_link_text .= $strDrop; } - if ($propicon == 'both') { + if ($cfg['PropertiesIconic'] === 'both') { $edit_link_text = '' . $edit_link_text . ''; $drop_link_text = '' . $drop_link_text . ''; } diff --git a/tbl_replace.php b/tbl_replace.php index 4e2554f16..318f76c58 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -1,11 +1,10 @@ 0) { unset($query_fields, $value_sets); - $message = $GLOBALS['strInsertedRows'] . ' '; + $message .= $GLOBALS['strInsertedRows'] . ' '; } elseif (! empty($query)) { - $message = $GLOBALS['strAffectedRows'] . ' '; + $message .= $GLOBALS['strAffectedRows'] . ' '; } else { // No change -> move back to the calling script - $message = $GLOBALS['strNoModification']; + $message .= $GLOBALS['strNoModification']; $js_to_run = 'functions.js'; $active_page = $goto_include; require_once './libraries/header.inc.php'; @@ -352,7 +351,18 @@ if (isset($return_to_sql_query)) { $GLOBALS['sql_query'] = $return_to_sql_query; } -$js_to_run = 'functions.js'; +// if user asked to "Insert another new row", we need tbl_change.js +// otherwise the calendar icon does not work +if ($goto_include == 'tbl_change.php') { + /** + * @todo if we really need to run many different js at header time, + * $js_to_run would become an array and header.inc.php would iterate + * thru it, instead of the bunch of if/elseif it does now + */ + $js_to_run = 'tbl_change.js'; +} else { + $js_to_run = 'functions.js'; +} $active_page = $goto_include; require_once './libraries/header.inc.php'; require './' . PMA_securePath($goto_include); diff --git a/test/core.lib.php b/test/core.lib.php new file mode 100644 index 000000000..6ebfe164c --- /dev/null +++ b/test/core.lib.php @@ -0,0 +1,67 @@ + + * @package phpMyAdmin-test + */ + +/** + * Go to root directory. + */ +chdir('..'); + + +/** + * Report failed test. + * + * @param string function to test + * @param string test description + * @param string failure description + */ +function PMA_test_fail($function, $test, $message) { + $function = htmlspecialchars($function); + $test = htmlspecialchars($test); + $message = htmlspecialchars($message); + echo <<$function ($test) +
      Failed: $message
      +EOT; +} + +/** + * Report ok test. + * + * @param string function to test + * @param string test description + */ +function PMA_test_okay($function, $test) { + $function = htmlspecialchars($function); + $test = htmlspecialchars($test); + echo <<$function ($test) +
      OK
      +EOT; +} + +/** + * Function for testing strings. + * + * @uses PMA_test_okay() + * @uses PMA_test_fail() + * @param string function to test + * @param string test description + * @param string actual result + * @param string expected result + */ +function PMA_test_string($function, $test, $received, $expected) { + if ($received != $expected) { + PMA_test_fail($function, $test, "Strings >$received< and >$expected< do not match"); + } else { + PMA_test_okay($function, $test); + } +} +?> diff --git a/test/escape_js_string.php b/test/escape_js_string.php new file mode 100644 index 000000000..6632bf943 --- /dev/null +++ b/test/escape_js_string.php @@ -0,0 +1,39 @@ + + * @package phpMyAdmin-test + */ + +/** + * Tests core. + */ +include('./core.lib.php'); +/** + * Include to test. + */ +include('./libraries/js_escape.lib.php'); + +/** + * Test java script escaping. + * + * @uses PMA_escapeJsString() + * @uses PMA_test_string() + * @param string string to escape + * @param string expected result + */ +function PMA_test_escape($test, $expected) { + PMA_test_string('PMA_escapeJsString', $test, PMA_escapeJsString($test), $expected); +} + +PMA_test_escape('\';', '\\\';'); +PMA_test_escape("\r\n'", '\r\n\\\'[HTML]', '[HTML]'); +PMA_test_escape('"\'\\\'"', '"\\\'\\\\\\\'"'); +PMA_test_escape("\\''''''''''''\\", "\\\\\'\'\'\'\'\'\'\'\'\'\'\'\\\\"); +?> diff --git a/test/theme.php b/test/theme.php index 4cc85a3dc..37346c380 100644 --- a/test/theme.php +++ b/test/theme.php @@ -5,6 +5,7 @@ * theme test * * @uses libraries/common.lib.php global fnctions + * @package phpMyAdmin-test */ chdir( '..' ); @@ -31,9 +32,9 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']); + href="../phpmyadmin.css.php?&js_frame=right&nocache=getMtime(); ?>" /> + href="../print.css" /> diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index 2c1ed58af..ce9abb4a4 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -194,13 +194,16 @@ table tr.even { text-align: ; } + /* marked table rows */ table tr.marked th, table tr.marked { background: ; color: ; } + + /* hovered items */ .odd:hover, .even:hover, @@ -216,6 +219,7 @@ table tr.hover th { background: ; color: ; } + /** * marks table rows/cells if the db field is in a where condition @@ -365,7 +369,7 @@ div.notice { border: 0.1em solid #FFD700; width: 90%; - background-image: url(../getImgPath(); ?>s_notice.png); + background-image: url(getImgPath(); ?>s_notice.png); background-repeat: no-repeat; background-position: 10px 50%; @@ -396,7 +400,7 @@ div.warning { border: 0.1em solid #CC0000; width: 90%; - background-image: url(../getImgPath(); ?>s_warn.png); + background-image: url(getImgPath(); ?>s_warn.png); background-repeat: no-repeat; background-position: 10px 50%; @@ -427,7 +431,7 @@ div.error { border: 0.1em solid #ff0000; width: 90%; - background-image: url(../getImgPath(); ?>s_error.png); + background-image: url(getImgPath(); ?>s_error.png); background-repeat: no-repeat; background-position: 10px 50%; @@ -458,7 +462,7 @@ fieldset.confirmation legend { border-right: 0.1em solid #FF0000; font-weight: bold; - background-image: url(../getImgPath(); ?>s_really.png); + background-image: url(getImgPath(); ?>s_really.png); background-repeat: no-repeat; background-position: 5px 50%; @@ -649,7 +653,7 @@ a.tab:hover, span.tab, a.warning, span.tabcaution { - cursor: url(../getImgPath(); ?>error.ico), default; + cursor: url(getImgPath(); ?>error.ico), default; } /* end topmenu */ @@ -943,7 +947,7 @@ div#queryboxcontainer div#bookmarkoptions { /* main page */ #maincontainer { - background-image: url(../getImgPath(); ?>logo_right.png); + background-image: url(getImgPath(); ?>logo_right.png); background-position: bottom; background-repeat: no-repeat; border-bottom: 1px solid silver; @@ -956,7 +960,7 @@ div#queryboxcontainer div#bookmarkoptions { } #maincontainer ul { - list-style-image: url(../getImgPath(); ?>item_.png); + list-style-image: url(getImgPath(); ?>item_.png); vertical-align: middle; } @@ -969,96 +973,96 @@ div#queryboxcontainer div#bookmarkoptions { /* iconic view for ul items */ li#li_create_database { - list-style-image: url(../getImgPath(); ?>b_newdb.png); + list-style-image: url(getImgPath(); ?>b_newdb.png); } li#li_select_lang { - list-style-image: url(../getImgPath(); ?>s_lang.png); + list-style-image: url(getImgPath(); ?>s_lang.png); } li#li_select_mysql_collation, li#li_select_mysql_charset { - list-style-image: url(../getImgPath(); ?>s_asci.png); + list-style-image: url(getImgPath(); ?>s_asci.png); } li#li_select_theme{ - list-style-image: url(../getImgPath(); ?>s_theme.png); + list-style-image: url(getImgPath(); ?>s_theme.png); } li#li_server_info{ - list-style-image: url(../getImgPath(); ?>s_host.png); + list-style-image: url(getImgPath(); ?>s_host.png); } li#li_user_info{ - /* list-style-image: url(../getImgPath(); ?>s_rights.png); */ + /* list-style-image: url(getImgPath(); ?>s_rights.png); */ } li#li_mysql_status{ - list-style-image: url(../getImgPath(); ?>s_status.png); + list-style-image: url(getImgPath(); ?>s_status.png); } li#li_mysql_variables{ - list-style-image: url(../getImgPath(); ?>s_vars.png); + list-style-image: url(getImgPath(); ?>s_vars.png); } li#li_mysql_processes{ - list-style-image: url(../getImgPath(); ?>s_process.png); + list-style-image: url(getImgPath(); ?>s_process.png); } li#li_mysql_collations{ - list-style-image: url(../getImgPath(); ?>s_asci.png); + list-style-image: url(getImgPath(); ?>s_asci.png); } li#li_mysql_engines{ - list-style-image: url(../getImgPath(); ?>b_engine.png); + list-style-image: url(getImgPath(); ?>b_engine.png); } li#li_mysql_binlogs { - list-style-image: url(../getImgPath(); ?>s_tbl.png); + list-style-image: url(getImgPath(); ?>s_tbl.png); } li#li_mysql_databases { - list-style-image: url(../getImgPath(); ?>s_db.png); + list-style-image: url(getImgPath(); ?>s_db.png); } li#li_export { - list-style-image: url(../getImgPath(); ?>b_export.png); + list-style-image: url(getImgPath(); ?>b_export.png); } li#li_import { - list-style-image: url(../getImgPath(); ?>b_import.png); + list-style-image: url(getImgPath(); ?>b_import.png); } li#li_change_password { - list-style-image: url(../getImgPath(); ?>s_passwd.png); + list-style-image: url(getImgPath(); ?>s_passwd.png); } li#li_log_out { - list-style-image: url(../getImgPath(); ?>s_loggoff.png); + list-style-image: url(getImgPath(); ?>s_loggoff.png); } li#li_pma_docs { - list-style-image: url(../getImgPath(); ?>b_docs.png); + list-style-image: url(getImgPath(); ?>b_docs.png); } li#li_phpinfo { - list-style-image: url(../getImgPath(); ?>php_sym.png); + list-style-image: url(getImgPath(); ?>php_sym.png); } li#li_pma_homepage { - list-style-image: url(../getImgPath(); ?>b_home.png); + list-style-image: url(getImgPath(); ?>b_home.png); } li#li_mysql_privilegs{ - list-style-image: url(../getImgPath(); ?>s_rights.png); + list-style-image: url(getImgPath(); ?>s_rights.png); } li#li_switch_dbstats { - list-style-image: url(../getImgPath(); ?>b_dbstatistics.png); + list-style-image: url(getImgPath(); ?>b_dbstatistics.png); } li#li_flush_privileges { - list-style-image: url(../getImgPath(); ?>s_reload.png); + list-style-image: url(getImgPath(); ?>s_reload.png); } /* END iconic view for ul items */ diff --git a/themes/darkblue_orange/img/logo_left.png b/themes/darkblue_orange/img/logo_left.png index d75bdee0cb05edb71880e3d808cf31e1f5046da1..26acf2e3bf4c32465e5ea2d28b41637085a91a7e 100644 GIT binary patch literal 6854 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 diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php index 10cfe0d66..21a7f4135 100644 --- a/themes/darkblue_orange/layout.inc.php +++ b/themes/darkblue_orange/layout.inc.php @@ -30,7 +30,7 @@ $GLOBALS['cfg']['MainColor'] = '#000000'; // background for the main frame $GLOBALS['cfg']['MainBackground'] = '#ffffff'; -//$GLOBALS['cfg']['MainBackground'] = '#ffffff url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y'; +//$GLOBALS['cfg']['MainBackground'] = '#ffffff url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y'; // foreground (text) color of the pointer in browse mode $GLOBALS['cfg']['BrowsePointerColor'] = '#000000'; @@ -64,7 +64,7 @@ $GLOBALS['cfg']['FontFamilyFixed'] = 'monospace'; // border $GLOBALS['cfg']['Border'] = 0; // table header and footer color -$GLOBALS['cfg']['ThBackground'] = '#ff9900 url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'tbl_th.png) repeat-x top'; +$GLOBALS['cfg']['ThBackground'] = '#ff9900 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'tbl_th.png) repeat-x top'; // table header and footer background $GLOBALS['cfg']['ThColor'] = '#000000'; // table data row background diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index f45d86ebb..599d1254b 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -102,7 +102,7 @@ div#leftframelinks a:hover { /* serverlist */ #body_leftFrame #list_server { - list-style-image: url(..//original/img/s_host.png); + list-style-image: url(/original/img/s_host.png); list-style-position: inside; list-style-type: none; margin: 0; diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index f32cf4ad0..d40b30a50 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -169,13 +169,16 @@ table tr.even { text-align: ; } + /* marked table rows */ table tr.marked th, table tr.marked { background: ; color: ; } + + /* hovered items */ .odd:hover, .even:hover, @@ -191,6 +194,7 @@ table tr.hover th { background: ; color: ; } + /** * marks table rows/cells if the db field is in a where condition @@ -340,7 +344,7 @@ div.notice { margin: 0.5em 0 0.5em 0; border: 0.1em solid #FFD700; - background-image: url(../getImgPath(); ?>s_notice.png); + background-image: url(getImgPath(); ?>s_notice.png); background-repeat: no-repeat; background-position: 10px 50%; @@ -370,7 +374,7 @@ div.warning { margin: 0.5em 0 0.5em 0; border: 0.1em solid #CC0000; - background-image: url(../getImgPath(); ?>s_warn.png); + background-image: url(getImgPath(); ?>s_warn.png); background-repeat: no-repeat; background-position: 10px 50%; @@ -400,7 +404,7 @@ div.error { margin: 0.5em 0 0.5em 0; border: 0.1em solid #ff0000; - background-image: url(../getImgPath(); ?>s_error.png); + background-image: url(getImgPath(); ?>s_error.png); background-repeat: no-repeat; background-position: 10px 50%; @@ -431,7 +435,7 @@ fieldset.confirmation legend { border-right: 0.1em solid #FF0000; font-weight: bold; - background-image: url(../getImgPath(); ?>s_really.png); + background-image: url(getImgPath(); ?>s_really.png); background-repeat: no-repeat; background-position: 5px 50%; @@ -621,7 +625,7 @@ a.tab:hover, span.tab, a.warning, span.tabcaution { - cursor: url(../getImgPath(); ?>error.ico), default; + cursor: url(getImgPath(); ?>error.ico), default; } /* end topmenu */ @@ -889,7 +893,7 @@ div#queryboxcontainer div#bookmarkoptions { /* main page */ #maincontainer { - background-image: url(../getImgPath(); ?>logo_right.png); + background-image: url(getImgPath(); ?>logo_right.png); background-position: bottom; background-repeat: no-repeat; border-bottom: 1px solid silver; @@ -902,7 +906,7 @@ div#queryboxcontainer div#bookmarkoptions { } #maincontainer ul { - list-style-image: url(../getImgPath(); ?>item_.png); + list-style-image: url(getImgPath(); ?>item_.png); vertical-align: middle; } @@ -915,96 +919,96 @@ div#queryboxcontainer div#bookmarkoptions { /* iconic view for ul items */ li#li_create_database { - list-style-image: url(../getImgPath(); ?>b_newdb.png); + list-style-image: url(getImgPath(); ?>b_newdb.png); } li#li_select_lang { - list-style-image: url(../getImgPath(); ?>s_lang.png); + list-style-image: url(getImgPath(); ?>s_lang.png); } li#li_select_mysql_collation, li#li_select_mysql_charset { - list-style-image: url(../getImgPath(); ?>s_asci.png); + list-style-image: url(getImgPath(); ?>s_asci.png); } li#li_select_theme{ - list-style-image: url(../getImgPath(); ?>s_theme.png); + list-style-image: url(getImgPath(); ?>s_theme.png); } li#li_server_info{ - list-style-image: url(../getImgPath(); ?>s_host.png); + list-style-image: url(getImgPath(); ?>s_host.png); } li#li_user_info{ - /* list-style-image: url(../getImgPath(); ?>s_rights.png); */ + /* list-style-image: url(getImgPath(); ?>s_rights.png); */ } li#li_mysql_status{ - list-style-image: url(../getImgPath(); ?>s_status.png); + list-style-image: url(getImgPath(); ?>s_status.png); } li#li_mysql_variables{ - list-style-image: url(../getImgPath(); ?>s_vars.png); + list-style-image: url(getImgPath(); ?>s_vars.png); } li#li_mysql_processes{ - list-style-image: url(../getImgPath(); ?>s_process.png); + list-style-image: url(getImgPath(); ?>s_process.png); } li#li_mysql_collations{ - list-style-image: url(../getImgPath(); ?>s_asci.png); + list-style-image: url(getImgPath(); ?>s_asci.png); } li#li_mysql_engines{ - list-style-image: url(../getImgPath(); ?>b_engine.png); + list-style-image: url(getImgPath(); ?>b_engine.png); } li#li_mysql_binlogs { - list-style-image: url(../getImgPath(); ?>s_tbl.png); + list-style-image: url(getImgPath(); ?>s_tbl.png); } li#li_mysql_databases { - list-style-image: url(../getImgPath(); ?>s_db.png); + list-style-image: url(getImgPath(); ?>s_db.png); } li#li_export { - list-style-image: url(../getImgPath(); ?>b_export.png); + list-style-image: url(getImgPath(); ?>b_export.png); } li#li_import { - list-style-image: url(../getImgPath(); ?>b_import.png); + list-style-image: url(getImgPath(); ?>b_import.png); } li#li_change_password { - list-style-image: url(../getImgPath(); ?>s_passwd.png); + list-style-image: url(getImgPath(); ?>s_passwd.png); } li#li_log_out { - list-style-image: url(../getImgPath(); ?>s_loggoff.png); + list-style-image: url(getImgPath(); ?>s_loggoff.png); } li#li_pma_docs { - list-style-image: url(../getImgPath(); ?>b_docs.png); + list-style-image: url(getImgPath(); ?>b_docs.png); } li#li_phpinfo { - list-style-image: url(../getImgPath(); ?>php_sym.png); + list-style-image: url(getImgPath(); ?>php_sym.png); } li#li_pma_homepage { - list-style-image: url(../getImgPath(); ?>b_home.png); + list-style-image: url(getImgPath(); ?>b_home.png); } li#li_mysql_privilegs{ - list-style-image: url(../getImgPath(); ?>s_rights.png); + list-style-image: url(getImgPath(); ?>s_rights.png); } li#li_switch_dbstats { - list-style-image: url(../getImgPath(); ?>b_dbstatistics.png); + list-style-image: url(getImgPath(); ?>b_dbstatistics.png); } li#li_flush_privileges { - list-style-image: url(../getImgPath(); ?>s_reload.png); + list-style-image: url(getImgPath(); ?>s_reload.png); } /* END iconic view for ul items */ diff --git a/themes/original/img/logo_left.png b/themes/original/img/logo_left.png index e3c47e465769313857a45c72c3fa5469be314d94..26acf2e3bf4c32465e5ea2d28b41637085a91a7e 100644 GIT binary patch literal 6854 zcmeAS@N?(olHy`uVBq!ia0y~yU}$4tU=ZhEV_;x7=WJfiz`($k|H*Y zfq{Xuz$3Dlfk8$Agc;BB&z{G?z`$PO>FdgVoryzCUH7-vnJfkdsbEhR$B>F!Z)bU~ zS$e(j{_1mIddn-m@7oxEKF93l6pf%9Q%_UPiBnu6C$7<8Qc>lY!_e5cW)sJz6IRm7 zk*TuPPY?JBu$0NLZ+jCVXlQh7M)XOUR`lFf7fU8IXgFH1SJLc<$8SR+q&nl z{PJ^u@2)D|SI<}@B7fBVW8j}!=K8t%^}jCnCrnB?vD4wXP0NGFo6p<%?(ci{^78V+ z#pmU1Yju8pZ)Td8pd-S-aIxBa=2iWDn~v6{?|=6Hd;9tQZ|uLnkc@fVea#v-yE*rT{eGjg{~sTz)c(A)vv~ifUH^_=KUWsM`;T|?q`$X=j`|z& zT#7cnJ^Q8oUb}_=YjU;XfB!39e`LS+^K5^+GwiC?doQK#ug_puz9;i-#k%?R)$IQ+ zTR;A?`}w)K#rx0Qt9{$ef9mVJ9r;^N|Btm_zMiANHFW#*@@3Dyuk$-9|L6VkdpG|5 z&gzUW738|DS3Y6hpD!1`CA(W+c4=ajXNtL3`sn5M z%BtijjyBCXwJ(C-|K;SESN*We(Sz{5fj% zukPa=ZvA`PuH^|meYnrM;#tSe$NzfG(i0Ef+mW_eJ}WeCabLxYGs`Dzj=!eJ@Z)3q zmbz2}fr;sn&vW+g|Hgan^3eo(X8~mG@o=awz3#?#T!0<$% z!Xs6$i;?k}zg?MId5}&!>)d-9x7pis*6YuTZOJ%b)v&iPDbMG(wXm*uxva-2mqkfW zE?Pb}pZ~|j`1*sEQ#Xp-pL8`VeL7?P_?lgL{#SMXz0VjK>OOzw-?&vS-fjm=zf63V ze2ieV>gw+ei&zsGtrxwR>LlaR@aS-Y&CeUoITr+#f>)?8b2{Al8KAIp_w`F|zkZ7K zxT(d+m!?g2^YL4=ddcLZPL7@z`RkwXG%5w|DSn)oo?|do?R&caUJsGES8lEMQ$Ks^ ztHsmaYbABjXZ8Cp&viXm14 zf81`(r*!DDfBp03kfp90zjVgsf9`h4TAO*u_sGd?h81#^Pd5K}v)O(}?}76*&p1=w zOfRf`HuL@6Z##XQc3xVz)n|v$NyQ@!3@kE?!GfEeel>SoiGKa@q*v!__qLK}1>0>S zHnASgXzVyp*>GyXJjspmPa>axm{6a&v*oam((E&L-(55Lvt{F-B=w_LlUM(_e0YwT z-!eW{kXGu0vFR!hPIjd-cS3} zm2~FX)mBx#yJK1P<#PIlc#fU-rh9AKmbtHd;j%Ep^OHtr#k5TyZWKKWDd5X$Ubrb| z(lV`kJI~3>i&eO5dHlU=+kb++XzQ|%Yxv&xtg3j}J%4AukW%p4$A9lyX*#_~xU2T> zR#WdXv)T7{PP|u~a^n4~B_Rrbn0OSrj!n+y@m0LNU-@5p3`h+_U4chmAeL9@8w3(gn>*I9(^4sh|GsMH) z`<_`Xbgu2!-g&t0*<{COe0;{c_uOB#y5Ig+Ld45YUoHg5+3z}Izxigr|2LuPe8m{| zjSW1?-aECeat?0&ykWy7{W)vQrXTqqp$q<=E48PThHDGJD@T?yYl}e4dMxX|3o;{qsbt=HZoHe}82qPM2U& z_*E&dDBO`HD{ij#t~C8&J;QrPt5WCu?)k1yn15BCbnNe_zW4ic zk8WJ&#Mm$U-f>TqVMx$qaGaDPs~EOlLDjzP#P&Vq>xF&)->UweH|dFc_oDy4OE)FU zYfNTo;1%4Hy|%KImAlr z@Wdrve)sC_y92|yzfC&5>QtIyD97s9dpBd6*!y&Do?o}@^VY1u%dgF!CM6Y5SKB2c z78O z;m~QOQzt*38uvm@@9W3izq`LOY2UlWV5Y#qHo==olOc&E zVq`@VnQmMuR`U8c4^nApKE(bZ*5&&BZ0E0?de*)tXF zobpm=(SshwX-|u$fBx6(^nqQV@S@4r(BwPw74`lZcy|5%{kQl2sZC1{-*fLVWMB|V zK66y!`>eE&UEjZ?yXn_m@H`WB?C&N9{a)po@vE<&$W5?4<6_+Z14V0No- z7oVnFoOzD-%^A_0Z^~b0Hr_JKvbmk!lPhjC=giJHuSYUvx6S-s7j3+dlf-=fx8>St zi#%KBKU!q8!T7w`k>ET*eO1?*=fT0)%x+LJx7ynvFuQvU^jv5 z^zN1M@0Y)O5%j9NS1$Q@+lL=3LqA`&-u-xY;QN!=zmMggFSu7>vNP%DUg>qa!z$94 zkDS`n%9#{$;)efBxm6a)pLZ=ft-Q=#H-DGrDeE@7c+EKm(;m#VeYstG=L?M{;nVxd z7f9cjlyFz%^lyu0%Z*&8PY=5O@&hZod3)yBJ9T$uONACV-FPbV?9$fY9d>HFO@+7e zuJ~=4q8?srd8R31+JwY2a{JzX&`fO#S{A!>7klfAuUq)8nD};FWK|TJr}EUHV~cj` ziPjZvidXs!cZw-DT@#fIt~{o(EVEtR)AGrj?~FoB2j(k$3ijNzrRhdsu66G*lRm>X z&!ChbvG%1YwwkjwTz8#NS@T?}gtcm&?SZc|oANv!-cV>rnU=1^*VS^jx`wq+?&ZtF zFP>GD_H4N;wqcjZg~{!wK1D>@xu%q=WvV{i*ZpAO#uw4&zttS6)!gtReapPU=}fLO zGTF91jn>;xXns6Tzjwan4b%R0DxXzjw{8hOotCmY+B3|D=g48XS2K!Edy7u9^0c_; zdnh5|*t>)C>i>9HT2I>%TbUUCTYTNJ_c8O;?X#M1NS8fvZV$h`S=->`mgNzWc3)M} zS{E_ze%`hK6n`*l7ypWgfJ9^={Fm(31nn{VE`{ad&EnvwvOnLjU8 z<;S%=I9M4pal;F>4R=l_xi3mS=N=*PQp~UK`tO#VUzi!=bWDzL|IT`Ub?&3qQ=h!0 zYrk!LTKBoYe)TWKiZ6njZXXbEGCG$U-?8Mq?SUFQ!^a=5YTq+|zbte4?bot9jL)+( zyKLn=V1KeQNn&!d08`jikMqyX&oj5&%`5*~v0lCZXophE2Fc_*3<>Ijlb5WEzH$G4 zl*!q9-g8zj)0ysHvir5Wpewt>-GdVUE0h#YFFkL`mS%InPdB+)(jsf-6R~2~y;Ux9|RfBsU1O%mzm%RNUXULZ-6wdWBl!Gzrbj;%)H{8tP-)=gm z@cnL2v|v)h%4ZiU3VpfEUZ++htrgx^wc@hO+YOR#VhKy{d)iMGJ3iUO^lzWEf!<7o zhB%>5c|v^YMtLe{ySxx;xY)yE7gU|X9%AY z^ox2Z7WPIa;?YYl&UmY>ujFDpmuZ&kmIxi{UqADc%IrJ6J;6UL!@p^SfS$eoaPgz|lBBN)kaCF0;B=hO+zgW{<7S&jpQuvF zM44>afZU%qCeIM*;#;D$XZ!L8The#iZ8}{%{aje}jI=IorG`^R9|YIkXJZpoopai` zW0Sm-%5xv##e0v;u)hCN#C6)z#^MHnoPu>{Pi>lRysYKBRa=6)%R}9zPx^wirUz}> zwN8DWwSP&nXNK0#Yg2mFUOWhbIxX;JG&;Di0$pK zNL*z3X<0`9&`s?=b9(^Im;!s~nX{CxfC1rCPSV=Wf7J`7Dgs^PtH`pF%$ ziq32KCor#9`cSJjMP}NL$Q9A)Gfy#|;hk?5ch91z!M-5Nw(hG-{WV47=0fQcY)d#y znYM8;G)Ay2WJ+mT5F+?{W&G)s9ny>KCoS-luy9~_Fh{@P^w9;AISyu~t`)AHxgldV zNAcP>XHI0Qr(f`lu@~>VInBY^%((IX8}XPg#`nYTtQJu6G5Oy8-9bx4RyM`)=!1nD z&s^<$FX(mGH^WwV9|Ko_q#O5P^`MSbK98b~)%qDa-)u13Qb& zj=cDmRFbUud7VHOE5poU-6Im~3eOcUJ+)MVvvZOA64&+HO?0}>9pAiW&-CKRDC^J1 zLO!p%P&I*lX2E%7*EO=-dXJvo?W&eN65BE3yKsB#oP=DCb-o+++UV-3r$&7js-5BJ z@Yv9#&sR#{O*->T(ZiynG9G*vPVTrNvBdpS-M1fZ^70xfF^LZ4;X{ z=j7FAV-LN3ymex^`1h+ht9~{y{QWKGv`k@l_EFw<632WB4?Vr}d?}B6@|Vmn(1j=NlunK7(Zz$#SPR#g|xp z%84v{=R4`sJc*}OvHi}Md-9dqq`gEf1r6S>rc}i|b6nH*A@-{j`kiHL=V^p}P%FyxW_8*M6Ih`p=R}ZS&uD?iJtOCEqLc z)ri5Q;Pp(VWnHrVLVu4sdw;ezdUr(O^U0vB>*cqe{Mx~FHp(e=C5QjoU(TuF|BahJ zbvmrExOSbLRWi-yNbAF?s{3wxu9*D6LgY+y*^}t=$NGNknSVG)t;WAWe5&#c>A0H* zwz(YorM*<%D{UsP%hadaHYKf6@wV!e*Lc?You&8awz8z{vyEqd*q~+LA>NU7deya$ zdyjD!8?;XiYEy0Oi}W`z-(%W%myhjvl0wTZ2az7bCY{&(tuN+@HZ>bg3B4+zK6!R@ zu632-`Kwb5OD{=uU)y%8dbjlA?;T0J4bP8dl&o9pWU$#JHZIZU**#{Bsog4;1u>c% zJzFwEw`N(%ZvFi8+|L)w?C-vLwM9T}VM66n&SkpAz0Zr~AI#m$C4JXb$R$F$p_v5gzxY((-~A1|DObkzK;A{7qZEJWBXZ#lv;)mprU+54;p=rGM$8?1Ai{IT3BV z%?TSf*=$h^l((0Wv$++y=5|`sb@e6seUr@f&vyOadOyXUtwC%81A}7dqc4Bc%8C+i zFOIQPjC}I<$k+Af4t3|h|5P6I;AxcPC#M&0T*^z>H~!L4Jj~O(VcXH2ZnH81f1eO< z{lspRSDbFEWAf|PCQp@nB~$Fx4wURI&so>F%L^NTB>}8Cp%03JO468&zY~C3-%a25pUDYI{v*h>VjF7PV zCb+(agJ-9ji&c+d(q)|$x#}Dbj2B6)*~-0EJbdds+qZWfwKJSvzU*?X+@T|3S2Lc} z7K=8lxt3dRbvON5)oqi>a|Oy}1PC{3L9HR!b2F2PM_nm!Av^(yh# ztUU7a)YjR?t6pd5^sn&Nb?XrMf zXZL2#p1b{^pSEYXT2_7Dk!@zns*97X?yy;}Y}soS{CK6J1oPDvn^+5?c08P$$3xB=3{Tpeco(SS-!Abb=ShAgU^gUIRBktzd|Zh zO;G&Uq2AUtVr_fBoZGhY{zsnZ=wBPf-oG>X86O&Uw?>|ep`rNsxr@)w-P>PWs4{Qn z)k@8PlDY0PBrRuWe0+6d!*wyXc)!YDnvD-z9&J25;fMaYB8J}NuYPlFvSsG&H|yKG z>{)$Y?83BJ@B6n_E#s~D`O0G5IqiS8OBMx7elUOiB~$iC@3mtOUz@*Jxjo5jPIia# z+&!k|k9-fUh~M4l|Ci@-T<#@9H0_t{``PwtO>G+27z()rw2w{b zSy|6>A+E!4l|(YLKp8`m;j&-rw!ZZ?WRpwI_`GLF^vXS7?2M9MC7k&)>DuG}PA=h{ zCj^e()Q!EQ$W~XYHZQ$Jyw+!v0He>7sk}9(1usW`e)4^}Zi%zXGtMUNnmZLcWhFh{ zUXeEtk`?EOP1wa-R9@_Qud>Mb&$o@Kh4$_o2_oa9GuJeDI(!O#3ws||ceQqBpXZ}!?%{E!~$b2`i zrQ8D1`sFz(yNi9_w*GxG>$A~T#>Krg%bM@-GKA~*OfuK>ddlP`ePa)2P5Sz_(^Ea~ zr5xGW|KjZ0+S}a>&z?EiY!6Qruk{d;H{2HYW_w&u9b1uKoyC@fO z^+aX;g8epYv<2Y-rwOOao>2x4uP7rkImjmz4~px^WL464$6C4^I+)lN#JeTQK=o@;GpyG zMQivY;q>>?p=NV`{g}7W&7(1*Wa6r0ORGz~**PZssa_v0R^D)>+D+z|fTZp3$Y})$u(C=UTd-DJN?$)=9|L@$l)b`_vzc&xJ-^#zc_s*a8uY0Us?cM+M z=Eb!^c{Uf9r2abQ6uZOf^uMC*Xa8;Z^lI($dDVyOO|E=j=qS5(^?l=IKQ9Z&2pr{{ zc>h=E!ix3c$J^!Wo>cp8{=QjYQP)N5MFp}Av+7?gabl>i?Ru`h^_TLJbB@pL4SqN= zOmw(?;@;K9|64vj3VnO@Td@5s~p|Ef}gy8`|animzURUZ?g=GjC%9n#N~UBZaschUa{oy47HD6zpdK5 z^~K34-IJ%4S2umTG}F_`EIZt6+Pp=n8I^mEopN;c`ts`f+Nn94I^5oU`ttJq$E%&< zZ=YU%w$S3XX_mn=W@-G(nySdU-4 znws8rb%Mt44R$AbjlawmTQR5g&5g}RPv7(lNDGfBd%QWlwWn`JeaO<)>pmSSzwzkl z%!P|rlxbxL>wbFwtSHJPEi3!t$?co>9>~p`d+PFycdsA6`tb4aywsxd%AW^wz8tCe zwj=7_eEu`nZ%>)jHN7z=x2Pl~Wl~mNeo}hYp2HV@9Ivi#Zn3bkF0ZL=>sUW;;oi)w zDSsBr9X)yaVW04q?>}1F)@|E;{%jNf`W?I1Z8^AR>yCrRuQj)}HMDomU$Oey49ibj z!`^KQ{xOsD*ZJ5GeZAKrfQ z{O03l*B(5%bob%KI}ffseDd(+>#GkQ-+%t<%KgWWUcPzu=H2y&PoKVdcj?~4yU$); zxbxt_i`S1{y}A4J#jPjLuRnb9?Ctx4CbM)x1T+OYZ5mqqG()=xQn zVEdV=4!f4rZ(P5uv%TTO(%gd5vipmi&#o?h`sB{XWybqYoW6MVVSK3b`9mvy&F0xx zBXN6k;o;*a7A#r1VA+bitfbz$q~#knKY978Z{nJR8>Z|ycy!nP1NSB?_D|euV`sl% z`_cU?n!bE|aqsbyhx^+fJ%8EJxqio<3-1q<{`mEKc9v{?!>Z4ZkEf;04DxgB=w5v9 z!OaUhr@WrTdthbD?0NHN&X}9?Xq3x~G)ZI(e8s@jq1P9= zADJ;v~!PD1H+>3 zv@Tg}ZQRbvlRY;#PuID*r|7duh0fX;-}7(TC>e=3Fa%yVe9ct(@8g-sgUgJ*-p`5K zkt}w8{`dFy&&+Ju%FH6bd+E%Uquqf&g2UIa9J_dgv!$6$p&?^p!}7Jx5B>fbGfzoS z(^Xj^sL=3Y!t9WLYvwU6skkQWbC`kAMfkW+G>hNa3ogcw`?)Ok>O?wu$U86uUNy8? zuqgM|GRxv;XKq;(n@))0I`drk`Tv;=WjycaSF(IzW)U!zHLea)(Ac{!#>#j??$JA{ zjnZlxbANo#zc=4r_*%o#|7R2u7#tV^FB?vt-n5smYi{T2gC|P`Elz%Mc1n}IJ>TIE z8v~1gsO;v1YnL=T9_0(_Byaxvaz2Y@a@ya-!||?+AW7rekB4qXG`&7Q|7*bUoS)7L zix`+Xy80f@-6+s~JpAuZ<8sL(hQ`1De|fCi&IppZxu-%iO**UW|9tz;m5P2dEWV$Y z-=hlh(|JRi`VcjrqXMx%o}ZsT^+Lw1Z9*pwPH$sm>Zs~__;<6w=3g^Uux+V7rf8Pn#oK6(g_&{@f1|6azoy_6`3I5W#2lhKCp@6XK=%Ox2YU38E8uuRQ8z2WIn z`vWbq9GOh|tk!8q*<#ulSOm7pY+m;N{2k9dFBVOxh_p(4^y;a?I~4=*aw#?rg)B?9 zh+XIA+eq4OKhGL%mw0G@YVm@lh7u26X+gA#glx-o6pmrrT7AfV-aiMG<7e)6+!bhG zSTreF?9Bhq?YWn1bXw2MxBt86K#MK&l}%B6rDx`=-cSbl^NGZS`Pcm%vcvsewp*lq zVhJd^+3;kB{ppRfm;@X`iq2$BC|AtY=!u9jtQ5YGxIm`2;Ec|iWeh9=r83NV8P6Al z-ntO+%eeftO2Ok|$w|roJ|r2lDKxBjJcCo=^Yaxt2Rf_-X4uaZzcXcqeW}$U!{Uvm zn;DoowE7ssj~|%exN?iQZsV=f+e(d=e3@&&`cPtxAgh2wNTJUI`Hp0@q!4cfgJyGq zNe$2ZUbtH~@%;o)Thh-WV7PTddIe7gI6*iFNVB%I^+bC)^J6v%m+ve2_0uEOS&V*&$ za#&YXaqY0~Tm#0CU-=A{%jyrs)PNjxrQnRtie$CL>17#Lw{VKENFVGhKRL<1;*x;_ zL*PNf&EXDb;##k?%-+d#((plJxZDPh|7lBjS}%4paVTh6qzUU>dA=}=pW}GLsrf4> zRLtHgVVQBEDv*KEWoPn(*4t||UxcchFP`7o$-m#I5U@L^{lk>?uBQT_-c5*?&k_P zDzn3+=o=e{LYFM_dj99^en&NG6fbV)F_k^b-uj@(Oea%9p+REB)Rcc~=9r7_!p1& zS+*yA{Ic=})3ft`mNveaxLwRD%eL^-q`D_2JOU0pAzB|BQsu4~c3+e=W;A-!A(PM% zmGf+kX#Inm(jd#HOmEO_)eH{2ZCG$z$Nl832P+)2bp3f-ta%k0G)j1aews4cXm`ap zJL$H4NeGbn%)V6FhIJY!s~a8naoLn8RN=;HJE>u9+fr!*S!4FC&8)tl(r{*Sn)1}& zr-^`E3=N?``IFP7wU!DxA*dH*0If zxk*1Dhfr-@1bQNz;;eKXISxu*s_aC>3!Z&Byw=O6WAj$XUJzwTtq z%L^|}eX22a?vkb%)&`H#yf@{hjj+1kVI3LuPdd-%Zm4=1GiBO2uPtfn z4h)6?s``wFli%9pG$(hf`8}CwS9$2w*3Z8UAFZ!f{MBIPz+jlrr@m%Zlh&4+yqq^N z0n;A*UA+3hF>Arh7d^gl4snSepFGV@`|LB@w)SUC>(<5xS?RZ2wg8-7N-~Y_s=QcxQq35gSrEQql~e4xEx1GW9hB=i%WRcmcn(67mih{asO+``S*Ia*T3_Zo_>BRnzr_*`E@3hOE2uRuf{Nzm3<4> ztN$r^>PDi2L)^cON2iBW8Z7rw5KCv|VP{}uDLga(_j`v03bWqo%n(eqb7WN8^26Wg zgjeU;2Ms@S&j0=X{<7z;ll8MD(>OE!mA?M<`dew9&hCZJ;x`;-InZ_Rz|*x3ukY^{ zOcfB^EwMx)_~1Nc1}2V2GwSx03%GCC+hA}n^?xI$E}QkE^{Offzizqw{}+0nL1ePE zGJndcdH;T2k6q{^@`{0X=6;S1u?L>zpH7|Okz(*&)nZH^3%b`lbh_$ryZ`TB>4Xp84=vqa|5r@vkM7y|tRmj5syVx55-R3S zV0Sw{@62q6a#@x~*{dDBrv3R_z2g7-`0MEog1QsBztkN#_3GvhF1-c@ChN4qqr1zM zqBls)|Y+{$v%&%4Vf7A$EwclnwQNj`zX4RUTUH`vjGBXD`i%QHqJ?Wp-5p9OW7q7^L^*+{dWdsG(*4Fp;3^m?7 ztqwo($SB--#qCM#@T_46$}YAHv*d|#gwAbi2_;4z1=KP(ET4?KMzZ@h4S zef)FV2djeF)MhQO|F71}Vp-XEDyxBWl{KrxL`VI`zWIzIKQHEg2;cbp{+5}-*Yu8V z?_yJEaOj)4Ly2onp;1J&-Ja^>Rm?MDRMHQ&^8NX{dVc=5@9Pi$zUvV7?n|1-ofBLC zlnP`={64atfY+Hud?62(9np9kIxSZ6-^P^xt1&A#5SqhZ65W}6VxW35YepO z@Q8J?+L?J4rLRKdWVodmLEd_K;E0xP$1VA!V**XvmPZ`O+o{3!>BX*<4@3-jQ@*)e zcyZ>+(>;^b)*qazljc98$$l0nFeKDo7hEfG7fIA{68LbpMVp^vNp7&2&rG}gq6bA2 zu6B!^nYYQb;L)s?leeFFHq(gn?5WJl4!Nsu20znP-f~D-q2WYsjBmWejs&F>(=>(E zbZ46=7BCv{E%T3QDV>vhXp`q;v)o9B3R5WuhKa9d^nNh0$Yoq%d3JM-<~qqonZe>d zvF=kq<^E5DTW3tO)BI*0-<>A-w0Q>uBO5~o-`y2kzb{H-U|?YIboFyt=akR{0BjW< AL;wH) diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index 549f3392b..ab855df20 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -29,7 +29,7 @@ $GLOBALS['cfg']['MainColor'] = '#000000'; // background for the main frame $GLOBALS['cfg']['MainBackground'] = '#F5F5F5'; -//$GLOBALS['cfg']['MainBackground'] = '#F5F5F5 url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y'; +//$GLOBALS['cfg']['MainBackground'] = '#F5F5F5 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y'; // foreground (text) color of the pointer in browse mode $GLOBALS['cfg']['BrowsePointerColor'] = '#000000'; diff --git a/translators.html b/translators.html index b1a288d7a..4e3c42cdb 100644 --- a/translators.html +++ b/translators.html @@ -8,7 +8,7 @@ - phpMyAdmin 2.10.0-dev - Official translators + phpMyAdmin 2.11.0-dev - Official translators @@ -31,7 +31,7 @@
    • Glossary
      • -

      phpMyAdmin 2.10.0-dev official translators list

      +

      phpMyAdmin 2.11.0-dev official translators list

      Here is the list of the "official translators" of phpMyAdmin.

      @@ -57,7 +57,7 @@
      Afrikaans - Andreas Pauley (pauley@buitegroep.org.za) + volunteer needed
      Georgian - --volunteer needed-- + volunteer needed
      Hindi - Girish Nair (girish_nair@users.sourceforge.net) + volunteer needed
      Korean - WooSuhan (kjh@unews.co.kr) + volunteer needed
      Malay - Mohammad Shafiq bin Mohd Mustapa (sicksand@users.sourceforge.net) + volunteer needed
      Persian - Parham Ghaffarian (parham@bornisgroup.com) + volunteer needed
      + + + + + + + + + + + + + + + + + + + + + +
      +
      +
      +
      +
      +
      WITH + + + + + + +
      + +
      + +
      + + +