Changeset 2901

Timestamp:

Nov 23, 2008, 12:34:58 AM (16 years ago)

Author:

patdenice

Message:

merge -c2900 from trunk to branch 2.0.

• Bug fixed: username or password with accented character are now accepted for upgrade.
• Simplify query in pwg_session_write function.
• Retrieve data with cURL method in fetchRemote function now work with forwarded URL.

Location:

branches/2.0

Files:

• admin/include/functions.php (modified) (3 diffs)
• admin/include/functions_upgrade.php (modified) (2 diffs)
• include/functions_session.inc.php (modified) (1 diff)

branches/2.0/admin/include/functions.php

@@ -1949 +1949 @@
 function fetchRemote($src, &$dest, $user_agent='Piwigo', $step=0)
 {
+  // After 3 redirections, return false
+  if ($step > 3) return false;
+
+  // Initialize $dest
   is_resource($dest) or $dest = '';
 
@@ -1956 +1960 @@
     $ch = @curl_init();
     @curl_setopt($ch, CURLOPT_URL, $src);
-    @curl_setopt($ch, CURLOPT_HEADER, 0);
+    @curl_setopt($ch, CURLOPT_HEADER, 1);
     @curl_setopt($ch, CURLOPT_USERAGENT, $user_agent);
-    is_resource($dest) ?
-      @curl_setopt($ch, CURLOPT_FILE, $dest):
-      @curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    @curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     $content = @curl_exec($ch);
+    $header_length = @curl_getinfo($ch, CURLINFO_HEADER_SIZE);
     @curl_close($ch);
     if ($content !== false)
     {
-      is_resource($dest) or $dest = $content;
+      if (preg_match('/Location:\s+?(.+)/', substr($content, 0, $header_length), $m))
+      {
+        return fetchRemote($m[1], $dest, $user_agent, $step+1);
+      }
+      $content = substr($content, $header_length);
+      is_resource($dest) ? @fwrite($dest, $content) : $dest = $content;
       return true;
     }
@@ -1982 +1990 @@
 
   // Try fsockopen to read remote file
-  if ($step > 3)
-  {
-    return false;
-  }
-
   $src = parse_url($src);
   $host = $src['host'];

branches/2.0/admin/include/functions_upgrade.php

@@ -142 +142 @@
   }
 
-  if (version_compare($current_release, '1.5.0', '<'))
+  if (version_compare($current_release, '2.0', '<'))
+  {
+    $username = utf8_decode($username);
+    $password = utf8_decode($password);
+  }
+
+  if (version_compare($current_release, '1.5', '<'))
   {
     $query = '
@@ -167 +173 @@
   }
 
-  if ($row['password'] != $conf['pass_convert']($_POST['password']))
+  if ($row['password'] != $conf['pass_convert']($password))
   {
     array_push($page['errors'], l10n('invalid_pwd'));

branches/2.0/include/functions_session.inc.php

@@ -132 +132 @@
 {
   $query = '
-UPDATE '.SESSIONS_TABLE.'
-  SET expiration = now(),
-  data = \''.$data.'\'
-  WHERE id = \''.get_remote_addr_session_hash().$session_id.'\'
-;';
-  pwg_query($query);
-  if ( mysql_affected_rows()>0 )
-  {
-    return true;
-  }
-  $query = '
-INSERT INTO '.SESSIONS_TABLE.'
+REPLACE INTO '.SESSIONS_TABLE.'
   (id,data,expiration)
   VALUES(\''.get_remote_addr_session_hash().$session_id.'\',\''.$data.'\',now())