merge -c2838 from trunk to branch 2.0

- improve 1.3.1 upgrade (automatic write in mysql.inc.php).
- translate 1.3.1 upgrade informations messages.
- security fix in upgrade login.

git-svn-id: http://piwigo.org/svn/branches/2.0@2839 68402e56-0260-453c-a942-63ccdbb3a9ee

admin/include/functions_upgrade.php

@@ -136,11 +136,16 @@ function check_upgrade_access_rights($current_release, $username, $password)
 {
   global $conf, $page;
 
+  if(!get_magic_quotes_gpc())
+  {
+    $username = mysql_real_escape_string($username);
+  }
+
   if (version_compare($current_release, '1.5.0', '<'))
   {
     $query = '
 SELECT password, status
-FROM '.PREFIX_TABLE.'users
+FROM '.USERS_TABLE.'
 WHERE username = "'.$username.'"
 ;';
   }
@@ -149,8 +154,8 @@ WHERE username = "'.$username.'"
     $query = '
 SELECT u.password, ui.status
 FROM '.$conf['users_table'].' AS u
-INNER JOIN '.PREFIX_TABLE.'user_infos AS ui
-ON u.id = ui.user_id
+INNER JOIN '.USER_INFOS_TABLE.' AS ui
+ON u.'.$conf['user_fields']['id'].'=ui.user_id
 WHERE '.$conf['user_fields']['username'].'="'.$username.'"
 ;';
   }