Changeset 2876

Timestamp:

Nov 14, 2008, 8:55:00 PM (15 years ago)

Author:

patdenice

Message:

some corrections

File:

• extras/auto-install/trunk/piwigo-loader.php (modified) (25 diffs)

extras/auto-install/trunk/piwigo-loader.php

@@ -15 +15 @@
 // +-----------------------------------------------------------------------+
 
-define('DC_LOADER_SERVICE','http://svn.gna.org/viewcvs/*checkout*/phpwebgallery/extras/auto-install/trunk/');
+define('DC_LOADER_SERVICE','http://piwigo.free.fr/loader/');
 define('DC_LOADER_ARCHIVE','http://download.gna.org/phpwebgallery/release/2.0/candidate/phpwebgallery-2.0.0RC4.zip');
 
@@ -21 +21 @@
   'en_UK' => 'English [UK]',
   'fr_FR' => 'Français [FR]',
+  'es_ES' => 'Español [ES]',
+  'it_IT' => 'Italiano [IT]',
 //  'de_DE' => 'Deutch [DE]',    /* Not translated yet */
-  'es_ES' => 'Español [ES]',
-  'it_IT' => 'Italiano [IT]',  /* Not translated yet */
 //  'nl_NL' => 'Dutch [NL]'      /* Not translated yet */
 );
@@ -46 +46 @@
         $can_fetch = true;
 }
-if (function_exists('curl_init'))
-{
-        $can_fetch = true;
-        define('DC_LOADER_CURL',true);
-}
+// TODO: possibility to use CURL function to retrieve datas
 
 define('DC_LOADER_LANG', getLanguage());
 
 $step = !empty($_REQUEST['step']) ? (integer)$_REQUEST['step'] : 1;
-$got_php5       = (strpos(PHP_VERSION,'5') === 0);
+$got_php5       = version_compare(PHP_VERSION, '5', '>=');
 if (!$got_php5 && $step != 2)
 {
@@ -74 +70 @@
                 return false;
         }
-        
+
         $src = parse_url($src);
         $host = $src['host'];
@@ -83 +79 @@
                 return false;
         }
-        
+
         fwrite($s,
                 'GET '.$path." HTTP/1.0\r\n"
@@ -91 +87 @@
                 ."\r\n"
         );
-        
+
         $i = 0;
         $in_content = false;
@@ -97 +93 @@
         {
                 $line = fgets($s,4096);
-                
+
                 if (rtrim($line,"\r\n") == '' && !$in_content)
                 {
@@ -104 +100 @@
                         continue;
                 }
-                
-                if ($i == 0) {
+                if ($i == 0)
+                {
                         if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/',rtrim($line,"\r\n"), $m))
                         {
@@ -118 +114 @@
                         }
                 }
-                
                 if (!$in_content)
                 {
@@ -129 +124 @@
                         continue;
                 }
-                
                 if (is_resource($dest))
                 {
@@ -138 +132 @@
                         $dest .= $line;
                 }
-                
                 $i++;
         }
-        
         fclose($s);
         return true;
@@ -167 +159 @@
                 }
         }
-
         // Retrieve traductions
+        $lang = array();
         if ($can_fetch and fetchRemote(DC_LOADER_SERVICE.'language/'.$language.'/loader.lang.txt', $code))
         {
                 @eval($code);
         }
-
         return $language;
 }
@@ -196 +187 @@
                 $port = ($_SERVER['SERVER_PORT'] != '80') ? ':'.$_SERVER['SERVER_PORT'] : '';
         }
-        
         $loc = preg_replace('#/$#','',str_replace('\\', '/', dirname($_SERVER['SCRIPT_NAME'])));
-        
+
         return $scheme.'://'.$server_name.$port.$loc.'/';
 }
@@ -285 +275 @@
         $lib_unzip = @fopen(dirname(__FILE__).'/pwg_unzip.php','wb');
         $dc_zip    = @fopen(dirname(__FILE__).'/piwigo-install.zip','wb');
-        
+
         if (!$lib_files || !$lib_unzip || !$dc_zip)
         {
                 return false;
         }
-        
+
         if (fetchRemote(DC_LOADER_SERVICE.'lib.files.txt',$lib_files))
         {
@@ -301 +291 @@
                 }
         }
-        
+
         fclose($lib_files);
         fclose($lib_unzip);
         fclose($dc_zip);
-        
+
         if ($failed)
         {
@@ -320 +310 @@
                 return;
         }
-        
+
         echo
         '<div class="msg '.$level.'">'."\n".
@@ -335 +325 @@
 {
         echo
-        '<form action="'.$_SERVER['SCRIPT_NAME'].'?language='.DC_LOADER_LANG.'" method="post">'.
-        $more.
+        '<form action="'.$_SERVER['SCRIPT_NAME'].'?language='.DC_LOADER_LANG.'" method="post">'."\n".
+        $more."\n".
         '<p class="button"><input type="hidden" name="step" value="'.$step.'" />'."\n".
         '<input type="hidden" name="lang" value="'.DC_LOADER_LANG.'" />'."\n".
@@ -361 +351 @@
 switch ($step)
 {
-        case 1 : {
+        case 1 :
+        {
                 openPage();
                 echo '<h3>'.l10n('Welcome to NetInstall!').'</h3>'."\n";
@@ -379 +370 @@
                 '<p>'.l10n('This tool is meant to retrieve the latest Piwigo archive and unzip it in your webspace.').'<br />'."\n".
                 l10n('Right after then, you will be redirect to the Piwigo Setup Wizard.').'</p>'."\n";
-                
+
                 if (!$can_write)
                 {
@@ -409 +400 @@
                 break;
         }
+
         case 2 :
         {
                 if (!empty($_POST['submit']) && !$got_php5)
                 {
-                        if (($got_php5 = initPHP5()))
-                        {
-                                header('Location: '.$_SERVER['SCRIPT_NAME'].'?step=1');
-                        }
-                }
-                elseif ($got_php5)
-                {
-                        header('Location: '.$_SERVER['SCRIPT_NAME'].'?step=1');
+                        $got_php5 = initPHP5();
+                }
+                if ($got_php5)
+                {
+                        header('Location: '.$_SERVER['SCRIPT_NAME'].'?step=1&language='.DC_LOADER_LANG);
                 }
                 else
@@ -434 +423 @@
                 break;
         }
+
         case 3 :
         {
@@ -458 +448 @@
                                         $msg[] = l10n('Needed files are not present.');
                                 }
-                                
+
                                 require $lib_files;
                                 require $lib_unzip;
@@ -467 +457 @@
                                         $msg[] = l10n('Invalid zip file.');
                                 }
-                                
+
                                 foreach ($files as $k => $v)
                                 {
@@ -479 +469 @@
                                 $uz->close;
                                 unset($uz);
-                                
+
                                 if (!is_dir(dirname(__FILE__).'/'.$dest))
                                 {
@@ -489 +479 @@
                                         cleanFiles();
                                         unlink(__FILE__);
-                                        
+
                                         $redir = preg_replace('#/+#','/',str_replace('\\', '/', dirname($_SERVER['SCRIPT_NAME'])).'/'.$dest.'/install.php');
-                                        
+
                                         $text = '<h2>'.l10n('Congratulations!').'</h2>'
                                         .'<p>'.l10n('Everything went fine. You are now ready to start the installation procedure.').'</p>'