Changeset 2902 for trunk/admin

Timestamp:

Nov 23, 2008, 6:23:57 PM (15 years ago)

Author:

patdenice

Message:

• Add home and identification buttons after installation.
• Use fetchRemote function for remote site actions.
• Corrections in fetchRemote fnction.
• Move PLUGIN_PICTURE_BEFORE in picture.tpl.

Location:

trunk/admin

Files:

• include/functions.php (modified) (2 diffs)
• site_manager.php (modified) (2 diffs)
• site_reader_remote.php (modified) (2 diffs)
• template/goto/install.tpl (modified) (1 diff)

trunk/admin/include/functions.php

@@ -1949 +1949 @@
 function fetchRemote($src, &$dest, $user_agent='Piwigo', $step=0)
 {
+  // Try to retrieve data from local file?
+  if (!url_is_remote($src))
+  {
+    $content = @file_get_contents($src);
+    if ($content !== false)
+    {
+      is_resource($dest) ? @fwrite($dest, $content) : $dest = $content;
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  }
+
   // After 3 redirections, return false
   if ($step > 3) return false;
@@ -1965 +1980 @@
     $content = @curl_exec($ch);
     $header_length = @curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+    $status = @curl_getinfo($ch, CURLINFO_HTTP_CODE);
     @curl_close($ch);
-    if ($content !== false)
+    if ($content !== false and $status >= 200 and $status < 400)
     {
       if (preg_match('/Location:\s+?(.+)/', substr($content, 0, $header_length), $m))

trunk/admin/site_manager.php

@@ -45 +45 @@
   global $template, $page;
 
-  if($lines = @file($url))
-  {
+  if (fetchRemote($url, $result))
+  {
+    $lines = explode("\r\n", $result);
     // cleaning lines from HTML tags
     foreach ($lines as $line)
@@ -113 +114 @@
         $clf_url.= '?action=test';
         $clf_url.= '&version='.PHPWG_VERSION;
-        if ( ($lines = @file($clf_url)) !== false)
+        if (fetchRemote($clf_url, $result))
         {
+          $lines = explode("\r\n", $result);
           $first_line = strip_tags($lines[0]);
           if (!preg_match('/^PWG-INFO-2:/', $first_line))

trunk/admin/site_reader_remote.php

@@ -49 +49 @@
   if (!isset($listing_url))
   {
-    $this->listing_url = $this->site_url.'/listing.xml';
+    $this->listing_url = $this->site_url.'listing.xml';
   }
   else
@@ -66 +66 @@
   global $errors;
 
-  if (@fopen($this->listing_url, 'r'))
+  if ($xml_content = getXmlCode($this->listing_url))
   {
     $this->site_dirs = array();
     $this->site_files = array();
-    $xml_content = getXmlCode($this->listing_url);
     $info_xml_element = getChild($xml_content, 'informations');
     if (getAttribute($info_xml_element , 'phpwg_version') != PHPWG_VERSION)

trunk/admin/template/goto/install.tpl

@@ -146 +146 @@
   </table>
 </form>
+{else}
+<p>
+  <br />
+  <input type="button" name="index" value="{'home'|@translate}" onClick="document.location = 'index.php';"/>
+  <input type="button" name="identification" value="{'Identification'|@translate}" onClick="document.location = 'identification.php';"/>
+</p>
 {/if}
 </div> {* content *}