Changeset 3774 for trunk/gui


Ignore:
Timestamp:
02/13/11 09:51:41 (16 months ago)
Author:
ShadowJumper
Message:
  • [TOOLS] Updated phpMyAdmin to version 3.3.9.2
Location:
trunk/gui/tools/pma
Files:
1 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/gui/tools/pma/ChangeLog

    r3772 r3774  
    55$Id$ 
    66$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ 
     7 
     83.3.9.2 (2011-02-11) 
     9- [security] SQL injection, see PMASA-2011-2 
    710 
    8113.3.9.1 (2011-02-08) 

  • trunk/gui/tools/pma/Documentation.html

    r3772 r3774  
    1111    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> 
    1212    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    13     <title>phpMyAdmin 3.3.9.1 - Documentation</title> 
     13    <title>phpMyAdmin 3.3.9.2 - Documentation</title> 
    1414    <link rel="stylesheet" type="text/css" href="docs.css" /> 
    1515</head> 
    … …  
    1919    <h1> 
    2020        <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> 
    21         3.3.9.1  
     21        3.3.9.2  
    2222        Documentation 
    2323    </h1> 

  • trunk/gui/tools/pma/Documentation.txt

    r3772 r3774  
    1 phpMyAdmin 3.3.9.1 Documentation 
     1phpMyAdmin 3.3.9.2 Documentation 
    22 
    33  * Top 

  • trunk/gui/tools/pma/README

    r3772 r3774  
    66  A set of PHP-scripts to manage MySQL over the web. 
    77 
    8   Version 3.3.9.1 
     8  Version 3.3.9.2 
    99  --------------- 
    1010  http://www.phpmyadmin.net/ 

  • trunk/gui/tools/pma/import.php

    r3110 r3774  
    152152// Bookmark Support: get a query back from bookmark if required 
    153153if (!empty($id_bookmark)) { 
     154    $id_bookmark = (int)$id_bookmark; 
    154155    require_once './libraries/bookmark.lib.php'; 
    155156    switch ($action_bookmark) { 

  • trunk/gui/tools/pma/libraries/Config.class.php

    r3772 r3774  
    9393    function checkSystem() 
    9494    { 
    95         $this->set('PMA_VERSION', '3.3.9.1'); 
     95        $this->set('PMA_VERSION', '3.3.9.2'); 
    9696        /** 
    9797         * @deprecated 

  • trunk/gui/tools/pma/libraries/bookmark.lib.php

    r2840 r3774  
    9696 * @param   string    which field to look up the $id 
    9797 * @param   boolean  TRUE: get all bookmarks regardless of the owning user 
     98 * @param   boolean   whether to ignore bookmarks with no user 
    9899 * 
    99100 * @return  string    the sql query 
    … …  
    101102 * @access  public 
    102103 */ 
    103 function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = FALSE) 
     104function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = FALSE, $exact_user_match = FALSE) 
    104105{ 
    105106    global $controllink; 
    … …  
    112113 
    113114    $query = 'SELECT query FROM ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table']) 
    114         . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\'' 
    115         . ($action_bookmark_all? '' : ' AND (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\'' 
    116         . '      OR user = \'\')') 
    117         . ' AND ' . PMA_backquote($id_field) . ' = ' . $id; 
     115        . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''; 
     116 
     117    if (!$action_bookmark_all) { 
     118        $query .= ' AND (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\''; 
     119        if (!$exact_user_match) { 
     120            $query .= ' OR user = \'\''; 
     121        } 
     122        $query .= ')'; 
     123    } 
     124 
     125    $query .= ' AND ' . PMA_backquote($id_field) . ' = ' . $id; 
     126 
    118127    return PMA_DBI_fetch_value($query, 0, 0, $controllink); 
    119128} // end of the 'PMA_Bookmark_get()' function 

  • trunk/gui/tools/pma/sql.php

    r3252 r3774  
    5555    require_once './libraries/bookmark.lib.php'; 
    5656    $book_sql_query = PMA_Bookmark_get($db, '\'' . PMA_sqlAddslashes($table) . '\'', 
    57         'label'); 
     57        'label', FALSE, TRUE); 
    5858 
    5959    if (! empty($book_sql_query)) { 

  • trunk/gui/tools/pma/translators.html

    r3772 r3774  
    1212    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> 
    1313    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    14     <title>phpMyAdmin 3.3.9.1 - Official translators</title> 
     14    <title>phpMyAdmin 3.3.9.2 - Official translators</title> 
    1515    <link rel="stylesheet" type="text/css" href="docs.css" /> 
    1616</head> 
    … …  
    2020    <h1> 
    2121        <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> 
    22         3.3.9.1  
     22        3.3.9.2  
    2323        official translators list 
    2424    </h1> 
Note: See TracChangeset for help on using the changeset viewer.