Changeset 2881 for branches/2.0/admin

Timestamp:

Nov 15, 2008, 10:11:58 PM (15 years ago)

Author:

patdenice

Message:

merge -c2880 from trunk to branch 2.0

• Add fetchRemote function which allow to retrieve datas over HTTP protocol using cURL method, file_get_contents function or fsockopen method. This allow to retrieve datas or files even if allow_url_fopen is deactivated.
• Use fetchRemote function in plugins manager and in latest version checking.
• Add german translations for upgrade.lang.php.
• Remove empty line at the end of pclzip.lib.php.
• Change display of deactivated plugins after upgrade.

Location:

branches/2.0/admin

Files:

• include/functions.php (modified) (1 diff)
• include/functions_upgrade.php (modified) (1 diff)
• include/plugins.class.php (modified) (4 diffs)
• intro.php (modified) (1 diff)
• plugins_new.php (modified) (1 diff)
• plugins_update.php (modified) (1 diff)

branches/2.0/admin/include/functions.php

@@ -1923 +1923 @@
 }
 
+/**
+ * Retrieve data from external URL
+ *
+ * @param string $src: URL
+ * @param global $dest: can be a file ressource or string
+ * @return bool
+ */
+function fetchRemote($src, &$dest, $user_agent='Piwigo', $step=0)
+{
+  is_resource($dest) or $dest = '';
+
+  // Try curl to read remote file
+  if (function_exists('curl_init'))
+  {
+    $ch = @curl_init();
+    @curl_setopt($ch, CURLOPT_URL, $src);
+    @curl_setopt($ch, CURLOPT_HEADER, 0);
+    @curl_setopt($ch, CURLOPT_USERAGENT, $user_agent);
+    is_resource($dest) ?
+      @curl_setopt($ch, CURLOPT_FILE, $dest):
+      @curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    $content = @curl_exec($ch);
+    @curl_close($ch);
+    if ($content !== false)
+    {
+      is_resource($dest) or $dest = $content;
+      return true;
+    }
+  }
+
+  // Try file_get_contents to read remote file
+  if (ini_get('allow_url_fopen'))
+  {
+    $content = @file_get_contents($src);
+    if ($content !== false)
+    {
+      is_resource($dest) ? @fwrite($dest, $content) : $dest = $content;
+      return true;
+    }
+  }
+
+  // Try fsockopen to read remote file
+  if ($step > 3)
+  {
+    return false;
+  }
+
+  $src = parse_url($src);
+  $host = $src['host'];
+  $path = isset($src['path']) ? $src['path'] : '/';
+  $path .= isset($src['query']) ? '?'.$src['query'] : '';
+  
+  if (($s = @fsockopen($host,80,$errno,$errstr,5)) === false)
+  {
+    return false;
+  }
+
+  fwrite($s,
+    "GET ".$path." HTTP/1.0\r\n"
+    ."Host: ".$host."\r\n"
+    ."User-Agent: ".$user_agent."\r\n"
+    ."Accept: */*\r\n"
+    ."\r\n"
+  );
+
+  $i = 0;
+  $in_content = false;
+  while (!feof($s))
+  {
+    $line = fgets($s);
+
+    if (rtrim($line,"\r\n") == '' && !$in_content)
+    {
+      $in_content = true;
+      $i++;
+      continue;
+    }
+    if ($i == 0)
+    {
+      if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/',rtrim($line,"\r\n"), $m))
+      {
+        fclose($s);
+        return false;
+      }
+      $status = (integer) $m[2];
+      if ($status < 200 || $status >= 400)
+      {
+        fclose($s);
+        return false;
+      }
+    }
+    if (!$in_content)
+    {
+      if (preg_match('/Location:\s+?(.+)$/',rtrim($line,"\r\n"),$m))
+      {
+        fclose($s);
+        return fetchRemote(trim($m[1]),$dest,$user_agent,$step+1);
+      }
+      $i++;
+      continue;
+    }
+    is_resource($dest) ? @fwrite($dest, $line) : $dest .= $line;
+    $i++;
+  }
+  fclose($s);
+  return true;
+}
+
 ?>

branches/2.0/admin/include/functions_upgrade.php

@@ -128 +128 @@
 
     array_push($page['infos'],
-      l10n('deactivated plugins') . '<pre>' . implode(', ', $plugins) . '</pre>');
+      l10n('deactivated plugins').'<br /><br /><i>'.implode(', ', $plugins).'</i><br />');
   }
 }

branches/2.0/admin/include/plugins.class.php

@@ -269 +269 @@
     $versions_to_check = array();
     $url = PEM_URL . '/api/get_version_list.php?category_id=12&format=php';
-    if ($source = @file_get_contents($url)
-      and $pem_versions = @unserialize($source))
+    if (fetchRemote($url, $result) and $pem_versions = @unserialize($result))
     {
       if (!preg_match('/^\d+\.\d+\.\d+/', $version))
@@ -309 +308 @@
       $url .= implode(',', $plugins_to_check);
     }
-    if ($source = @file_get_contents($url))
-    {
-      $pem_plugins = @unserialize($source);
+    if (fetchRemote($url, $result))
+    {
+      $pem_plugins = @unserialize($result);
       if (!is_array($pem_plugins))
       {
@@ -322 +321 @@
       return true;
     }
+    return false;
   }
   
@@ -358 +358 @@
       $url = PEM_URL . '/download.php?rid=' . $revision;
       $url .= '&origin=piwigo_' . $action;
-      if (@copy($url, $archive))
-      {
+
+      if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle))
+      {
+        fclose($handle);
         include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
         $zip = new PclZip($archive);

branches/2.0/admin/intro.php

@@ -43 +43 @@
 if (isset($_GET['action']) and 'check_upgrade' == $_GET['action'])
 {
-  if (!ini_get('allow_url_fopen'))
+  if (!fetchRemote(PHPWG_URL.'/latest_version', $result))
   {
-    array_push(
-      $page['errors'],
-      l10n('Unable to check for upgrade since allow_url_fopen is disabled.')
-      );
+    array_push($page['errors'], l10n('Unable to check for upgrade.'));
   }
   else
   {
     $versions = array('current' => PHPWG_VERSION);
-    $lines = @file(PHPWG_URL.'/latest_version');
+    $lines = @explode("\r\n", $result);
 
     // if the current version is a BSF (development branch) build, we check

branches/2.0/admin/plugins_new.php

@@ -90 +90 @@
 // |                     start template output                             |
 // +-----------------------------------------------------------------------+
-if (!ini_get('allow_url_fopen'))
-{
-  array_push($page['errors'], l10n('Unable to retrieve server informations since allow_url_fopen is disabled.'));
-}
-elseif ($plugins->get_server_plugins(true))
+if ($plugins->get_server_plugins(true))
 {
   $plugins->sort_server_plugins($order);

branches/2.0/admin/plugins_update.php

@@ -98 +98 @@
 // |                     start template output                             |
 // +-----------------------------------------------------------------------+
-if (!ini_get('allow_url_fopen'))
-{
-  array_push($page['errors'], l10n('Unable to connect to PEM server since allow_url_fopen is disabled.'));
-}
-elseif ($plugins->get_server_plugins())
+if ($plugins->get_server_plugins())
 {
   foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)