Changeset 2747 for trunk/install.php

Timestamp:

Oct 15, 2008, 7:50:12 PM (16 years ago)

Author:

patdenice

Message:

• Install process now looks like goto/roma.
• Move install.tpl to goto template.
• add charset utf8 to fatal error function.
• Check php version on install and upgrade, and die if < 5.

File:

• trunk/install.php (modified) (5 diffs)

trunk/install.php

@@ -22 +22 @@
 // +-----------------------------------------------------------------------+
 
+//------------------------------------------------- check php version
+if (version_compare(PHP_VERSION, '5', '<'))
+{
+  die('Piwigo requires PHP 5 or above.');
+}
+
 //----------------------------------------------------------- include
 define('PHPWG_ROOT_PATH','./');
@@ -211 +217 @@
 
 //----------------------------------------------------- template initialization
-$template=new Template(PHPWG_ROOT_PATH.'template/yoga', 'clear');
+$template=new Template(PHPWG_ROOT_PATH.'admin/template/goto', 'roma');
 $template->set_filenames( array('install'=>'install.tpl') );
 $step = 1;
@@ -291 +297 @@
       $html_content = htmlentities( $file_content, ENT_QUOTES );
       $html_content = nl2br( $html_content );
-      $template->assign('error_copy', $html_content);
+      $error_copy = l10n('step1_err_copy');
+      $error_copy .= '<br />--------------------------------------------------------------------<br />';
+      $error_copy .= '<span class="sql_content">' . $html_content . '</span>';
+      $error_copy .= '<br />--------------------------------------------------------------------<br />';
     }
     @fputs($fp, $file_content, strlen($file_content));
@@ -389 +398 @@
 
 //------------------------------------------------------ errors & infos display
+if ($step == 1)
+{
+  $template->assign('install', true);
+}
+else
+{
+  array_push($infos, l10n('install_end_message'));
+
+  if (isset($error_copy))
+  {
+    array_push($errors, $error_copy);
+  }
+}
 if (count($errors) != 0)
 {
@@ -397 +419 @@
 {
   $template->assign('infos', $infos);
-}
-
-if ($step == 1)
-{
-  $template->assign('install', true);
 }