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 5799778441..2ed1a944f3 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 f86a60661a..793859a4d2 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 4946e458b5..c3bf3b8b20 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 aae0a740ea..22c3ab057b 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 7930667651..841a7c4427 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 4f41a43971..b6f7ec81dc 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 9550b64239..a9bef7386e 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 0000000000..cb890ce9ea --- /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 4e2554f16a..318f76c580 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 0000000000..6ebfe164c1 --- /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 0000000000..6632bf9438 --- /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 4cc85a3dc5..37346c380a 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 2c1ed58af6..ce9abb4a4b 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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 AH2?qr literal 4432 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 . '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 f45d86ebb0..599d1254b6 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 f32cf4ad03..d40b30a507 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 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 AH2?qr literal 4424 zcmd^Ci9b|t)Stl!QT9~SC??g&3=vX>5=tUMr7XkPvt&&*L&%oK+6-lot*m7mQMNRe zv1KXy7>qHN$&$61dB^X4|BLs2KKDM){hafh^L)SO`<(l^F=nQQB0@)m004l9vC-Ar z+%cYen+x!ApBKJ;V{r#Q7rmQ$06=j83^3^w+1 zaB;rv?BEpQ+wQCb0PwKPOe_uhevftyj(+d{iOV1^ebh6&ZZWg4w6VQ2-(Or4rDb*Z z-Xf)~e}XzPO$!RnoyI{{{%(A%sG_&0#3iQ%g@$kZ#2f2tcvx$sW#%}$hSdM)(7SSd zo$;$A)$?=owdK|IdFIMs%%P>(eplX4)@ZPlzwOTgR+CI`KQ|YSQK<| zWi`&npfW&uyHsam_`}*)*ZP(p*f;6kjyDJM?&cOWua6Unm4%kp&YAficIs`D@Nc&& zZxoc4ucv@WeS^*}QG-~e-SW$AuhiBvqzm6hF8;1)?Ho2WLs{DdPFJ`@#wXy=mU%^` ztIa{bsk8X(_l1FHJS>z~nKZw9=TYt+eeE?BUmLw1z3b@zy}U5Z__NZI>FgI2vfbpl z{ylhuc#lmuNd7gNk`((U%+|}#-^nS-{gJn$i+g=b?-nT({USnB`(n`3XHn5*nb}|6 z+*AI&Ki1mbIh7!>zPS|XI#j3E>j4dJv_tE`qk zTWsM4cY5MlI=T`9&1ne&efh}Ux55#gh7TN((FuuNG2po+=GZK~Z+vQWW^Q4p#pPd9v$KoKKPRTfY4g2f6bgNT%2*tqrH{48b==q!Db&iGBG4O3}Nc|d$V+9}QTC>)lhcgyijMW1Q}tyjEsZtgRK%BD^ry1?n3tHgJTISsz{#8|T}6*) zXU10Y)f(D5`v#}%?p*0fOtWMmTXIBY{Z8JqfMiWv0qW6nhULHhC^4j#be z1ZR`xz&$M-|J$Y(od4Gs0QE2SE&w3>!}zM6W$=jOmf=CzvlHeW0G{ZuV~_5hcL16* zxbt%fcgx+i|8F|=psn*tyfy}q6Nj`~Sv5IvO%4GtABM-}ubP1REJCnJi{ab#9G;jM zC9Y2?Qo7_}ZAg3kaK#(waJ}E!`Cw=XZqs{2=Y*;xcik`e0#68gg?zUuU-j>#=R+b= zx`(jIoFwBTs(ATCMShYiTjR{PEUb(9e)N48jCjEh#<(V83QDd_nX=V*Q|uwi3WZ`| z3>}+c$u7?1$qgQoFlhk*uS$?i?(>;;^{C>oJWy zqWM@IdrycwCo#trMxZd05W=_4O{y-Z7J3`3^tIGhTMg^gI;I$Q6!OVyYtwszper$i z$>Wg0_5g0Iet7bm@UI7A-^CO)wFii4wy$5&N6C#65dZiAe4A@Zg;&CQ+TniXD6#ee2It3Fd2ksD(AgkPoz4{Ou; zmzt}*w!ykWAui#el zOajoF)QHvlPY^1X~Ks9&$9Sk%jQ!EDJru8+U9FImq94&8vVJ|L-CSho%bVJSj z<2O|HwoH|giq5-H;9v~r7A8};WA(mXc2ktD>wj_azyRTDN#4o;aix^6J`4w z_*-PTY(ycY5!YFFBw%s^Jo`_Tgh^>sUqx9W+>9zBiyV2n~A z*~CVP{7$$i9o1v#OU}KiWW4ZN$gEYCc;0V=tG8G=-m-&p`%GJvp33*t2&>C=?Te)N zX+Yg%z!;grR3~=v+Y3^)2Mje)JSyoDO??_-`C=dZxlpgmweYG;&LQN~e3d^UX{NY% z8tyOl;h4XXVuIz~xz0<#^VK-6tbh2;L+kmM7e-I4k=Ay<meCE8cC_>os%nHW& z*Z@4PPfiV}x)?2MAAQf0RxE|43?JP~p7I8x9C_Npd=&0Of*Q7uPzv?jm2ZheTomEr z@)y3ntq#;V8*6(-UpZ>s-b{9FU*1U_P}<&6S0$NT{p=tfd`<9D5~d_7?!}Vt&D6<^!HTULNVxEu zrdI`bCk0RjFjE}N<8OSG=VN&< zs<8$3OEwo-A`6O`t{=sc|=Gez0$W7*!v?CvY(CdWG~cR zXZQS^U7M9cm26-5#iQ_(uIn*q3k(e0us(<0KHTx!0fBhP{?z)$G6Ys&0+x0G3hx5| z`FzQQT_z$6oW2Cbi8)`^141gdZmG6ikLjXdwmo}To6LUWFYV}z!ze*lcEG~U!bZR& zXk9kVuDpe>F}A63wgj;-*&yaDDpn_x3$|#=JPF_tpyHl?3lcRf|B8W4ICH`TmH97H z%M=ytcSf#q*mouYlF1iO9(3x+WbgiZkZmH#0Epll1j-*Y(!4vJaYinJIZO?aIwUvH zB2I+GoCuk9UJBkU9r`z3SHFIrIblqW6m$*+Sdb?hWD&cYyvdF0mS{g6oXOq8Bf{lRI9V>P8H_r=0icFhy@L^IjJ$EycxHR+LOqu zd?T_{QCnfpECn6(55KnwKml+$^0&~0LFyrZMbS)45VP3b z>Raesr7*;)b$zqU(M+Nj-t+@u^^XtS**MFzQ_F5Z+s$2~e6-+)q!*w$kQaPfAz>Zv z7{QMhK{APYDq#r(pyYO+_aEy|bCZ>LiJ^0?HL=`}F(Ls^JR$VfSJfu;a(yW22`|o8 z!KEqkz&}6T)=*6)%mPxaJ0>d|h~~sH#Se9w+|5#5GO8m6KmFz=AmA$ZcYnXCxyQjycORy7 zk0n$3wY9~;e)0H}@c>g99qC$>kO0N!5CRY;TOlYTSzP>0WR$Jte#6KpPv-uO+=1qZ z+siil_dkkD`QwF+<@=ll(QnRL)%#iwE=+fHtz&pF=}Jnrc6Q#k??^d`*OmymwpAY) zjWR;t$3l|ZBu|HyQ$fiPa;9bg!}6Hy{v%u+%;4r5zn@W#9y#v#Lo~d)z^3t0trGt# z{mTc6BuvC<<7zLRJTP0I3@K|$g`#fZ!gbU4$dG|7_zd|QN;*LGMgNRPoINOz>t&%~ zg1_wTNAbfB#z~ViKdbvt)8~_G$TYmFU{{A*Kf>2M9Zmf6F!^;H_8lXX9iIue*p~^&<#C;sWl~pYxhtz(TFA3eVG}hpBEB zhfE$ArtJ0oZP*A|-2-KcC)J_EW?v8iKz@Mhf$_qs%^Vc>=MG?OV0yJw-#+|*0BjW< AL;wH) diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index 549f3392b0..ab855df207 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 b1a288d7a3..4e3c42cdb1 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 + + + + + + +
      + +
      + +
      + + +