Merge from trunk 2747:

- 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. git-svn-id: http://piwigo.org/svn/branches/2.0@2748 68402e56-0260-453c-a942-63ccdbb3a9ee
author: patdenice <patdenice@piwigo.org> 2008-10-15 17:55:18 +0000
committer: patdenice <patdenice@piwigo.org> 2008-10-15 17:55:18 +0000
commit: 5ce101c1939bcea8b3171d3d0cf494b35a9650f3 (patch)
tree: 1ee1b5fe12447f52f7d37a44193d460a1f6a99c2
parent: fd1badf24b962381f2600abbe9d2714f1f463005 (diff)
13 files changed, 243 insertions, 326 deletions
diff --git a/admin/template/goto/install.tpl b/admin/template/goto/install.tpl
new file mode 100644
index 000000000..0fdf9b709
--- /dev/null
+++ b/admin/template/goto/install.tpl
@@ -0,0 +1,152 @@
+{* $Id$ *}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset={$T_CONTENT_ENCODING}">
+<meta http-equiv="Content-script-type" content="text/javascript">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.css">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
+{literal}
+<style type="text/css">
+.content {
+ width: 800px;
+ margin: auto;
+ text-align: center;
+}
+
+.table2 {
+  width: 100%;
+  margin-bottom: 1em !important;
+}
+
+TD {
+  text-align: left;
+  padding: 0.1em 0.5em;
+  height: 2.5em;
+}
+
+.sql_content {
+  color: #ff3363;
+}
+</style>
+{/literal}
+<title>Piwigo {$RELEASE} - {'Installation'|@translate}</title>
+</head>
+
+<body>
+<div id="headbranch"></div> {* Dummy block for double background management *}
+<div id="theHeader"></div>
+<div id="content" class="content">
+
+<h2>Piwigo {$RELEASE} - {'Installation'|@translate}</h2>
+
+{if isset($errors)}
+<div class="errors">
+  <ul>
+    {foreach from=$errors item=error}
+    <li>{$error}</li>
+    {/foreach}
+  </ul>
+</div>
+{/if}
+
+{if isset($infos)}
+<div class="infos">
+  <ul>
+    {foreach from=$infos item=info}
+    <li>{$info}</li>
+    {/foreach}
+  </ul>
+</div>
+{/if}
+
+{if isset($install)}
+<form method="POST" action="{$F_ACTION}" name="install_form">
+
+  <table class="table2">
+    <tr class="throw">
+      <th colspan="2">{'Initial_config'|@translate}</th>
+    </tr>
+    <tr>
+      <td style="width: 30%">{'Default_lang'|@translate}</td>
+      <td>
+    <select name="language" onchange="document.location = 'install.php?language='+this.options[this.selectedIndex].value;">
+    {html_options options=$language_options selected=$language_selection}
+    </select>
+      </td>
+    </tr>
+  </table>
+  <table class="table2">
+    <tr class="throw">
+      <th colspan="3">{'step1_title'|@translate}</th>
+    </tr>
+    <tr>
+      <td style="width: 30%;">{'step1_host'|@translate}</td>
+      <td align=center><input type="text" name="dbhost" value="{$F_DB_HOST}" /></td>
+      <td>{'step1_host_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'step1_user'|@translate}</td>
+      <td align=center><input type="text" name="dbuser" value="{$F_DB_USER}" /></td>
+      <td>{'step1_user_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'step1_pass'|@translate}</td>
+      <td align=center><input type="password" name="dbpasswd" value="" /></td>
+      <td>{'step1_pass_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'step1_database'|@translate}</td>
+      <td align=center><input type="text" name="dbname" value="{$F_DB_NAME}" /></td>
+      <td>{'step1_database_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'step1_prefix'|@translate}</td>
+      <td align=center><input type="text" name="prefix" value="{$F_DB_PREFIX}" /></td>
+      <td>{'step1_prefix_info'|@translate}</td>
+    </tr>
+  </table>
+
+  <table class="table2">
+    <tr class="throw">
+      <th colspan="3">{'step2_title'|@translate}</th>
+    </tr>
+    <tr>
+      <td style="width: 30%;">{'install_webmaster'|@translate}</td>
+      <td align="center"><input type="text" name="admin_name" value="{$F_ADMIN}" /></td>
+      <td>{'install_webmaster_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'step2_pwd'|@translate}</td>
+      <td align="center"><input type="password" name="admin_pass1" value="" /></td>
+      <td>{'step2_pwd_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'step2_pwd_conf'|@translate}</td>
+      <td align="center"><input type="password" name="admin_pass2" value="" /></td>
+      <td>{'step2_pwd_conf_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'conf_mail_webmaster'|@translate}</td>
+      <td align="center"><input type="text" name="admin_mail" value="{$F_ADMIN_EMAIL}" /></td>
+      <td>{'conf_mail_webmaster_info'|@translate}</td>
+    </tr>
+  </table>
+
+  <table>
+    <tr>
+      <td style="text-align: center;">
+        <input class="submit" type="submit" name="install" value="{'Start_Install'|@translate}" />
+      </td>
+    </tr>
+  </table>
+</form>
+{/if}
+</div> {* content *}
+<div style="text-align: center">{$L_INSTALL_HELP}</div>
+</body>
+</html>
diff --git a/admin/template/goto/theme/roma/theme.css b/admin/template/goto/theme/roma/theme.css
index 135b46f54..2cbd6f649 100644
--- a/admin/template/goto/theme/roma/theme.css
+++ b/admin/template/goto/theme/roma/theme.css
@@ -10,10 +10,10 @@ INPUT[type="submit"], INPUT[type="reset"]  { color:#999; border: 1px solid #666;
 input.rateButton, legend, h3 { color: #666; }
 #theAdminPage h2 { color: #333; }
 .content .infos { color: #f70; border:0; background-color: transparent;
-padding:5px 0px 0pt 10pt; min-height: 48px; text-align:left; }
+padding:5px 60px 0pt 10pt; min-height: 48px; text-align:left; }
 .content .infos li, .content .errors li { list-style-type:none; }
 .content .errors { color: #f30; border:0; background-color: transparent;
-padding:5px 0px 0pt 10pt; min-height: 48px; text-align:left; font-weight:bold; }
+padding:5px 60px 0pt 10pt; min-height: 48px; text-align:left; font-weight:bold; }
 #copyright { color:#666; margin:60px auto 0px 240px; text-align:center; 
 padding-bottom: 15px; }
 .header_notes { background: transparent url(../../icon/note.png) no-repeat right top;
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 2b3994aa8..0a09ab31a 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -671,7 +671,8 @@ function fatal_error($msg)
     $msg .= "\n";
   }
 
-  $display = "<h1>Piwigo encountered a non recoverable error</h1>
+  $display = "<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
+<h1>Piwigo encountered a non recoverable error</h1>
 <pre style='font-size:larger;background:white;color:red;padding:1em;margin:0;clear:both;display:block;width:auto;height:auto;overflow:auto'>
 <b>$msg</b>
 $btrace_msg
diff --git a/install.php b/install.php
index f629fb06e..ac8577943 100644
--- a/install.php
+++ b/install.php
@@ -21,6 +21,12 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
+//------------------------------------------------- check php version
+if (version_compare(PHP_VERSION, '5', '<'))
+{
+  die('Piwigo requires PHP 5 or above.');
+}
+
 //----------------------------------------------------------- include
 define('PHPWG_ROOT_PATH','./');
 
@@ -210,7 +216,7 @@ load_language( 'admin.lang', '', array('language'=>$language, 'target_charset'=>
 load_language( 'install.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') );
 
 //----------------------------------------------------- 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;
 //---------------------------------------------------------------- form analyze
@@ -290,7 +296,10 @@ define(\'DB_COLLATE\', \'\');
     {
       $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));
     @fclose($fp);
@@ -388,6 +397,19 @@ $template->assign(
     ));
 
 //------------------------------------------------------ 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)
 {
   $template->assign('errors', $errors);
@@ -398,11 +420,6 @@ if (count($infos) != 0 )
   $template->assign('infos', $infos);
 }
 
-if ($step == 1)
-{
-  $template->assign('install', true);
-}
-
 //----------------------------------------------------------- html code display
 $template->pparse('install');
 ?>
diff --git a/language/de_DE/install.lang.php b/language/de_DE/install.lang.php
index e04012b01..bd8d14e19 100644
--- a/language/de_DE/install.lang.php
+++ b/language/de_DE/install.lang.php
@@ -21,7 +21,7 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-$lang['install_message'] = 'Anzeige';
+$lang['Installation'] = 'Installation';
 $lang['Initial_config'] = 'Base-Konfiguration';
 $lang['Default_lang'] = 'Standardsprache der Galerie';
 $lang['step1_title'] = 'Konfiguration der Datenbank';
@@ -54,15 +54,13 @@ $lang['step2_pwd'] = 'Passwort';
 $lang['step2_pwd_info'] = 'Sie bleiben vertraulich, es ermöglicht den Zugang zum Administration.';
 $lang['step2_pwd_conf'] = 'Passwort [Bestätigung]';
 $lang['step2_pwd_conf_info'] = 'Prüfung';
-$lang['step1_err_copy'] = 'Kopieren Sie den Text in roter zwischen Bindestriche und fügen Sie ihn in die Datei "include / mysql.inc.php" (Warnung: mysql.inc.php müssen nur enthalten, was in blau, keine Zeile zurück oder Leerzeichen)';
+$lang['step1_err_copy'] = 'Kopieren Sie den Text in rosaen zwischen Bindestriche und fügen Sie ihn in die Datei "include / mysql.inc.php" (Warnung: mysql.inc.php müssen nur enthalten, was in rosa, keine Zeile zurück oder Leerzeichen)';
 $lang['install_help'] = 'Brauchen Sie Hilfe? Stellen Sie Ihre Frage auf der <a href="%s"> Forum Piwigo </ a>.';
 $lang['install_end_message'] = 'Die Konfiguration der Piwigo abgeschlossen ist, hier ist der nächste Schritt<br /><br />
 Aus Sicherheitsgründen, bitte löschen Datei "install.php"<br />
-Sobald diese Datei gelöscht, folgen Sie dieser Anleitung:
-<ul>
-<li>Gehen Sie auf die Identifizierung Seite: [ <a href="./identification.php">Identifizierung</a> ] und verwenden Sie die Login / Passwort für Webmaster</li>
-<li>diesem Login ermöglicht Ihnen den Zugang zu den Verwaltungs-Panel und den Anweisungen, um Platz Bilder in Ihre Verzeichnisse.</li>
-</ul>';
+Sobald diese Datei gelöscht, folgen Sie dieser Anleitung:<br />
+* Gehen Sie auf die Identifizierung Seite: [ <a href="./identification.php">Identifizierung</a> ] und verwenden Sie die Login / Passwort für Webmaster<br />
+* diesem Login ermöglicht Ihnen den Zugang zu den Verwaltungs-Panel und den Anweisungen, um Platz Bilder in Ihre Verzeichnisse.';
 $lang['conf_mail_webmaster'] = 'Webmaster Mail-Adresse';
 $lang['conf_mail_webmaster_info'] = 'Besucher können sich nicht Kontakt Site Administrator mit diesem E-Mail';
 ?>
 \ No newline at end of file
diff --git a/language/en_UK/install.lang.php b/language/en_UK/install.lang.php
index 5e67d9a33..92cbe08d6 100644
--- a/language/en_UK/install.lang.php
+++ b/language/en_UK/install.lang.php
@@ -21,7 +21,7 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-$lang['install_message'] = 'Message';
+$lang['Installation'] = 'Installation';
 $lang['Initial_config'] = 'Basic configuration';
 $lang['Default_lang'] = 'Default gallery language';
 $lang['step1_title'] = 'Database configuration';
@@ -37,7 +37,7 @@ $lang['step1_err_db'] = 'Connection to server succeed, but it was impossible to
 $lang['step1_err_server'] = 'Can\'t connect to server';
 $lang['step1_err_copy_2'] = 'The next step of the installation is now possible';
 $lang['step1_err_copy_next'] = 'next step';
-$lang['step1_err_copy'] = 'Copy the text in red between hyphens and paste it into the file "include/mysql.inc.php"(Warning : mysql.inc.php must only contain what is in blue, no line return or space character)';
+$lang['step1_err_copy'] = 'Copy the text in pink between hyphens and paste it into the file "include/mysql.inc.php"(Warning : mysql.inc.php must only contain what is in pink, no line return or space character)';
 
 $lang['step1_host'] = 'MySQL host';
 $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
@@ -60,11 +60,9 @@ $lang['step2_pwd_conf_info'] = 'verification';
 $lang['install_help'] = 'Need help ? Ask your question on <a href="%s">Piwigo message board</a>.';
 $lang['install_end_message'] = 'The configuration of Piwigo is finished, here is the next step<br /><br />
 For security reason, please delete file "install.php"<br />
-Once this file deleted , follow this instructions :
-<ul>
-<li>go to the identification page : [ <a href="identification.php">identification</a> ] and use the login/password given for webmaster</li>
-<li>this login will enable you to access to the administration panel and to the instructions in order to place pictures in your directories</li>
-</ul>';
+Once this file deleted , follow this instructions :<br />
+* go to the identification page : [ <a href="identification.php">identification</a> ] and use the login/password given for webmaster<br />
+* this login will enable you to access to the administration panel and to the instructions in order to place pictures in your directories';
 $lang['conf_mail_webmaster'] = 'Webmaster mail address';
 $lang['conf_mail_webmaster_info'] = 'Visitors will be able to contact site administrator with this mail';
 ?>
 \ No newline at end of file
diff --git a/language/es_ES/install.lang.php b/language/es_ES/install.lang.php
index 9eca984e2..e39d8e375 100644
--- a/language/es_ES/install.lang.php
+++ b/language/es_ES/install.lang.php
@@ -21,7 +21,7 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-$lang['install_message'] = 'Mensaje';
+$lang['Installation'] = 'Instalación';
 $lang['Initial_config'] = 'Configuración de Base';
 $lang['Default_lang'] = 'Lengua por defecto de la galería';
 $lang['step1_title'] = 'Configuración de la Base de datos';
@@ -54,15 +54,13 @@ $lang['step2_pwd'] = 'Palabra de paso';
 $lang['step2_pwd_info'] = 'Debe quedar confidencial, permite acceder al tabla de administración.';
 $lang['step2_pwd_conf'] = 'Palabra de paso [Confirmar]';
 $lang['step2_pwd_conf_info'] = 'Comprobación';
-$lang['step1_err_copy'] = 'Copie el texto en rojo entre las rayas y pegúelo en el fichero mysql.inc.php que se encuentra en el repertorio " include " a la base del lugar donde usted instaló a Piwigo (el fichero mysql.inc.php debe contener SÓLO lo que está en azul entre las rayas, ninguna vuelta a la línea o espacio es autorizado)';
+$lang['step1_err_copy'] = 'Copie el texto en rosa entre las rayas y pegúelo en el fichero mysql.inc.php que se encuentra en el repertorio " include " a la base del lugar donde usted instaló a Piwigo (el fichero mysql.inc.php debe contener SÓLO lo que está en rosa entre las rayas, ninguna vuelta a la línea o espacio es autorizado)';
 $lang['install_help'] = '¿ Necesidad de ayudante? Plantee su cuestión sobre él <a href="%s">foro de Piwigo</a>.';
 $lang['install_end_message'] = 'La configuración de la aplicación correctamente se celebró, coloca en la etapa próxima<br /><br />
 Por medida de seguridad, gracias por suprimir el fichero "install.php"<br />
-La vez suprimido este fichero, por favor seguir estas indicaciones:
-<ul>
-<li>Vaya sobre la página de identificación : [ <a href="./identification.php">identificación</a> ] Y conéctese con pseudo dado para el webmaster</li>
-<li>Éste le permite acceder a la parte administración y a las instrucciones para colocar las imágenes en los repertorios.</li>
-</ul>';
+La vez suprimido este fichero, por favor seguir estas indicaciones:<br />
+* Vaya sobre la página de identificación : [ <a href="./identification.php">identificación</a> ] Y conéctese con pseudo dado para el webmaster<br />
+* Éste le permite acceder a la parte administración y a las instrucciones para colocar las imágenes en los repertorios.';
 $lang['conf_mail_webmaster'] = 'Dirige e-mail del Administrador';
 $lang['conf_mail_webmaster_info'] = 'Los visitadores podrán ponerse en contacto con usted por este mail';
 ?>
 \ No newline at end of file
diff --git a/language/fr_FR/install.lang.php b/language/fr_FR/install.lang.php
index a08fa9cc4..012499550 100644
--- a/language/fr_FR/install.lang.php
+++ b/language/fr_FR/install.lang.php
@@ -21,7 +21,7 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-$lang['install_message'] = 'Message';
+$lang['Installation'] = 'Installation';
 $lang['Initial_config'] = 'Configuration de Base';
 $lang['Default_lang'] = 'Langue par défaut de la galerie';
 $lang['step1_title'] = 'Configuration de la Base de données';
@@ -54,15 +54,13 @@ $lang['step2_pwd'] = 'Mot de passe';
 $lang['step2_pwd_info'] = 'Il doit rester confidentiel, il permet d\'accéder au panneau d\'administration.';
 $lang['step2_pwd_conf'] = 'Mot de passe [ Confirmer ]';
 $lang['step2_pwd_conf_info'] = 'Vérification';
-$lang['step1_err_copy'] = 'Copiez le texte en rouge entre les tirets et collez-le dans le fichier mysql.inc.php qui se trouve dans le répertoire "include" à la base de l\'endroit où vous avez installé Piwigo (le fichier mysql.inc.php ne doit comporter QUE ce qui est en bleu entre les tirets, aucun retour à la ligne ou espace n\'est autorisé)';
+$lang['step1_err_copy'] = 'Copiez le texte en rose entre les tirets et collez-le dans le fichier mysql.inc.php qui se trouve dans le répertoire "include" à la base de l\'endroit où vous avez installé Piwigo (le fichier mysql.inc.php ne doit comporter QUE ce qui est en rose entre les tirets, aucun retour à la ligne ou espace n\'est autorisé)';
 $lang['install_help'] = 'Besoin d\'aide ? Posez votre question sur le <a href="%s">forum de Piwigo</a>.';
 $lang['install_end_message'] = 'La configuration de l\'application s\'est correctement déroulée, place à la prochaine étape<br /><br />
 Par mesure de sécurité, merci de supprimer le fichier "install.php"<br />
-Un fois ce fichier supprimé, veuillez suivre ces indications :
-<ul>
-<li>allez sur la page d\'identification : [ <a href="./identification.php">identification</a> ] et connectez-vous avec le pseudo donné pour le webmaster</li>
-<li>celui-ci vous permet d\'accéder à la partie administration et aux instructions pour placer les images dans les répertoires.</li>
-</ul>';
+Un fois ce fichier supprimé, veuillez suivre ces indications :<br />
+* allez sur la page d\'identification : [ <a href="./identification.php">identification</a> ] et connectez-vous avec le pseudo donné pour le webmasterbr<br />
+* celui-ci vous permet d\'accéder à la partie administration et aux instructions pour placer les images dans les répertoires.';
 $lang['conf_mail_webmaster'] = 'Adresse e-mail de l\'Administrateur';
 $lang['conf_mail_webmaster_info'] = 'Les visiteurs pourront vous contacter par ce mail';
 ?>
 \ No newline at end of file
diff --git a/language/it_IT/install.lang.php b/language/it_IT/install.lang.php
index 94e281083..cac665502 100644
--- a/language/it_IT/install.lang.php
+++ b/language/it_IT/install.lang.php
@@ -1,27 +1,27 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['install_message'] = 'Messaggio';
+$lang['Installation'] = 'Installazione';
 $lang['Initial_config'] = 'Configurazione di base';
 $lang['Default_lang'] = 'Linguaggio di default della galleria';
 $lang['step1_title'] = 'Configurazione della base dati';
@@ -54,15 +54,13 @@ $lang['step2_pwd'] = 'Password';
 $lang['step2_pwd_info'] = 'da conservare con cura. Permette l\'accesso al pannello di amministrazione';
 $lang['step2_pwd_conf'] = 'Password [confermare]';
 $lang['step2_pwd_conf_info'] = 'verifica';
-$lang['step1_err_copy'] = 'Copiate il testo in blu tra i trattini e mettetelo nel file mysql.inc.php che si trova nella directory "include" alla base del vostro sito dove aveto installato PhpWebGallery (il file mysql.inc.php non deve contenere altro che ciò che è in blu tra i trattini, nessun ritorno a capo o spazio è autorizzato)';
+$lang['step1_err_copy'] = 'Copiate il testo in rosa tra i trattini e mettetelo nel file mysql.inc.php che si trova nella directory "include" alla base del vostro sito dove aveto installato PhpWebGallery (il file mysql.inc.php non deve contenere altro che ciò che è in rosa tra i trattini, nessun ritorno a capo o spazio è autorizzato)';
 $lang['install_help'] = 'Bisogno di aiuto? Visitate il <a href="%s">forum di PhpWebGallery</a>.';
 $lang['install_end_message'] = 'La configurazione di PhpWebGallery è conclusa. Procedete al prossimo step<br /><br />
 Per ragioni di sicurezza vi consigliamo di cancellare il file "install.php"<br />
-Una volta che il file è stato cancellato seguire le istruzioni:
-<ul>
-<li>collegatevi alla pagina di accesso: [ <a href="identification.php">Accedi ora</a> ] e usate il vostro nome utente e password del Webmaster</li>
-<li>a questo punto sarete abilitati all\'accesso al pannello di amministrazione in cui troverete le istruzioni per l\'inserimento delle immagini nelle vostre directory</li>
-</ul>';
+Una volta che il file è stato cancellato seguire le istruzioni:<br />
+* collegatevi alla pagina di accesso: [ <a href="identification.php">Accedi ora</a> ] e usate il vostro nome utente e password del Webmaster<br />
+* a questo punto sarete abilitati all\'accesso al pannello di amministrazione in cui troverete le istruzioni per l\'inserimento delle immagini nelle vostre directory';
 $lang['conf_mail_webmaster'] = 'Indirizzo email del Amministratore';
 $lang['conf_mail_webmaster_info'] = 'i visitatori potranno contattarvi utilizzando questo indirizzo email';
 ?>
 \ No newline at end of file
diff --git a/language/nl_NL/install.lang.php b/language/nl_NL/install.lang.php
index 6eb29d16d..8925e2320 100644
--- a/language/nl_NL/install.lang.php
+++ b/language/nl_NL/install.lang.php
@@ -21,7 +21,7 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-$lang['install_message'] = 'Bericht';
+$lang['Installation'] = 'Installatie';
 $lang['Initial_config'] = 'Basis configuratie';
 $lang['Default_lang'] = 'Standaard gallery taal';
 $lang['step1_title'] = 'Database configuratie';
@@ -37,7 +37,7 @@ $lang['step1_err_db'] = 'De verbinding met de server is geslaagd, maar het is ni
 $lang['step1_err_server'] = 'Geen verbinding met de server';
 $lang['step1_err_copy_2'] = 'Het is nu mogelijk om verder te gaan met de volgende stap van de installatie';
 $lang['step1_err_copy_next'] = 'volgende stap';
-$lang['step1_err_copy'] = 'Kopieer de tekst tussen de lijnen en plak deze in het bestand "include/mysql.inc.php"(Waarschuwing: mysql.inc.php mag alleen het blauwe gedeelte bevatten, geen return of extra spatie). Dit moet alleen wanneer dit bestand geen schrijfrechten';
+$lang['step1_err_copy'] = 'Kopieer de tekst tussen de lijnen en plak deze in het bestand "include/mysql.inc.php"(Waarschuwing: mysql.inc.php mag alleen het roze gedeelte bevatten, geen return of extra spatie). Dit moet alleen wanneer dit bestand geen schrijfrechten';
 
 $lang['step1_host'] = 'MySQL host';
 $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
@@ -59,9 +59,9 @@ $lang['step2_pwd_conf'] = 'Wachtwoord [bevestigen]';
 $lang['step2_pwd_conf_info'] = 'verificatie';
 $lang['install_help'] = 'Hulp nodig ? stel een vraag op het <a href="%s" target="_blank">Piwigo forum</a>.';
 $lang['install_end_message'] = 'Het installeren van Piwigo is klaar, de volgende stap is<br /><br />het verwijderen van "install.php" dit is om de veiligheid te waarborgen<br />
-Vervolg de instructies nadat "install.php" is verwijderd:<ul><li>Ga naar de Indentificatie pagina: [ <a href="identification.php">Indentificatie</a> ] gebruik hiervoor het eerder opgegeven gebruikersnaam met wachtwoord</li>
-<li>Deze gebruikersnaam geeft u toegang tot de beheermenu zodat u afbeeldingen op uw website kan plaatsen</li></ul>';
-
+Vervolg de instructies nadat "install.php" is verwijderd:<br />
+* Ga naar de Indentificatie pagina: [ <a href="identification.php">Indentificatie</a> ] gebruik hiervoor het eerder opgegeven gebruikersnaam met wachtwoord<br />
+* Deze gebruikersnaam geeft u toegang tot de beheermenu zodat u afbeeldingen op uw website kan plaatsen';
 $lang['conf_mail_webmaster'] = 'Webmaster email adres';
 $lang['conf_mail_webmaster_info'] = 'Het is mogelijk dat bezoekers contact opnemen met de beheerder middels e-mail';
 ?>
 \ No newline at end of file
diff --git a/template/yoga/install.tpl b/template/yoga/install.tpl
deleted file mode 100644
index bebe728e7..000000000
--- a/template/yoga/install.tpl
+++ /dev/null
@@ -1,255 +0,0 @@
-{* $Id$ *}
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<html lang="fr">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset={$T_CONTENT_ENCODING}">
-<meta http-equiv="Content-script-type" content="text/javascript">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<title>Piwigo {$RELEASE}</title>
-{literal}
-<style type="text/css">
-
-body, input, select {
-  background-color:#cde;
-}
-
-body {
-  margin: 5px;
-  padding: 0;
-  font-size: 0.8em;
-  font-family: Arial,Helvetica,sans-serif;
-}
-
-body, table, input, form, select {
-  color:#369;
-  text-align:left;
-}
-
-a {
-  text-decoration: none;
-  color: #c60;
-}
-
-a:hover {
-  color: #f92;
-}
-
-table {
-  border-collapse:separate;
-}
-
-.title {
-  letter-spacing: 0.2em;
-  text-align : center;
-  font-size: 150%;
-  font-weight: bold;
-  padding: 0;
-  margin: 0.5em 0 1em 0;
-}
-
-.contenucellule {
-  border-color: #69c;
-  background-color:#eee;
-  margin:12px 20px;
-  border-width: 3px;
-  border-style: solid ;
-}
-
-.error_copy {
-  color: #900;
-}
-
-th, .submit {
-  text-align: center;
-  font-weight: bold;
-  background-color: #369;
-}
-
-th {
-  font-size: 120%;
-  margin-bottom:10px;
-  color:#fff;
-}
-
-td.row {
-  font-size: 90%;
-}
-
-.submit {
-  color: #cde
-}
-
-.header {
-  font-weight: normal;
-  text-align: center;
-  margin: 20px;
-}
-
-.infos {
-  padding: 15px;
-  font-weight: normal;
-  text-align: left;
-}
-
-.infos_title {
-  font-size: 150%;
-  padding: 15px;
-  font-weight: bold;
-  text-align: left;
-}
-
-.errors {
-  text-align: left;
-  margin: 25px;
-  color: #900;
-  background-color: #ffe1e1;
-  border:1px solid red;
-}
-</style>
-{/literal}
-</head>
-<body>
-  <table style="width:100%;height:100%">
-    <tr align="center" valign="middle">
-    <td>
-    <div class="title">Piwigo {$RELEASE}</div>
-      <table class="table1">
-      {if isset($errors)}
-      <tr>
-      <td class="contenucellule" colspan="3">
-        <div class="errors">
-        <ul>
-          {foreach from=$errors item=error}
-          <li>{$error}</li>
-          {/foreach}
-        </ul>
-        </div>
-      </td>
-      </tr>
-      {/if}
-      {if isset($infos)}
-      <tr>
-      <td class="contenucellule" colspan="3">
-        <div class="infos">
-        <ul>
-          {foreach from=$infos item=info}
-          <li>{$info}</li>
-          {/foreach}
-        </ul>
-        </div>
-      </td>
-      </tr>
-      {/if}
-    <tr>
-    <td class="contenucellule">
-
-{if isset($error_copy)}
-{'step1_err_copy'|@translate} :
-<br />-----------------------------------------------------<br />
-<div class="error_copy">{$error_copy}</div>
------------------------------------------------------<br />
-{/if}
-
-{if isset($install)}
-<form method="POST" action="{$F_ACTION}" name="install_form">
-  <table>
-    <tr>
-      <th colspan="3">{'Initial_config'|@translate}</th>
-    </tr>
-    <tr>
-      <td style="width:30%;">{'Default_lang'|@translate}</td>
-      <td colspan="2" align="left">
-    <select name="language" onchange="document.location = 'install.php?language='+this.options[this.selectedIndex].value;">
-    {html_options options=$language_options selected=$language_selection}
-    </select>
-      </td>
-    </tr>
-    <tr>
-      <td colspan="3">&nbsp;</td>
-    </tr>
-    <tr>
-      <th colspan="3">{'step1_title'|@translate}</th>
-    </tr>
-    <tr>
-      <td>{'step1_host'|@translate}</td>
-      <td align=center><input type="text" name="dbhost" value="{$F_DB_HOST}" /></td>
-      <td class="row">{'step1_host_info'|@translate}</td>
-    </tr>
-    <tr>
-      <td>{'step1_user'|@translate}</td>
-      <td align=center><input type="text" name="dbuser" value="{$F_DB_USER}" /></td>
-      <td class="row">{'step1_user_info'|@translate}</td>
-    </tr>
-    <tr>
-      <td>{'step1_pass'|@translate}</td>
-      <td align=center><input type="password" name="dbpasswd" value="" /></td>
-      <td class="row">{'step1_pass_info'|@translate}</td>
-    </tr>
-    <tr>
-      <td>{'step1_database'|@translate}</td>
-      <td align=center><input type="text" name="dbname" value="{$F_DB_NAME}" /></td>
-      <td class="row">{'step1_database_info'|@translate}</td>
-    </tr>
-    <tr>
-      <td>{'step1_prefix'|@translate}</td>
-      <td align=center><input type="text" name="prefix" value="{$F_DB_PREFIX}" /></td>
-      <td class="row">{'step1_prefix_info'|@translate}</td>
-    </tr>
-    <tr>
-     <td colspan="3">&nbsp;</td>
-    </tr>
-    <tr>
-      <th colspan="3">{'step2_title'|@translate}</th>
-    </tr>
-    <tr>
-      <td>{'install_webmaster'|@translate}</td>
-      <td align="center"><input type="text" name="admin_name" value="{$F_ADMIN}" /></td>
-      <td class="row">{'install_webmaster_info'|@translate}</td>
-    </tr>
-    <tr>
-      <td>{'step2_pwd'|@translate}</td>
-      <td align="center"><input type="password" name="admin_pass1" value="" /></td>
-      <td class="row">{'step2_pwd_info'|@translate}</td>
-    </tr>
-    <tr>
-      <td>{'step2_pwd_conf'|@translate}</td>
-      <td align="center"><input type="password" name="admin_pass2" value="" /></td>
-      <td class="row">{'step2_pwd_conf_info'|@translate}</td>
-    </tr>
-    <tr>
-      <td>{'conf_mail_webmaster'|@translate}</td>
-      <td align="center"><input type="text" name="admin_mail" value="{$F_ADMIN_EMAIL}" /></td>
-      <td class="row">{'conf_mail_webmaster_info'|@translate}</td>
-    </tr>
-    <tr>
-      <td colspan="3">&nbsp;</td>
-    </tr>
-    <tr>
-      <td colspan="3" align="center">
-        <input class="submit" type="submit" name="install" value="{'Start_Install'|@translate}" />
-      </td>
-    </tr>
-    <tr>
-      <td colspan="3">&nbsp;</td>
-    </tr>
-  </table>
-</form>
-{else}
-<div class="infos_title">
-{'install_end_title'|@translate}
-</div>
-<div class="infos">
-{'install_end_message'|@translate}
-</div>
-{/if}
-
-              </td>
-            </tr>
-          </table>
-          <div class="header">{$L_INSTALL_HELP}</div>
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/upgrade.php b/upgrade.php
index bf726cc6e..0c324d10a 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -21,6 +21,12 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
+//check php version
+if (version_compare(PHP_VERSION, '5', '<'))
+{
+  die('Piwigo requires PHP 5 or above.');
+}
+
 define('PHPWG_ROOT_PATH', './');
 
 include_once(PHPWG_ROOT_PATH.'include/functions.inc.php');
diff --git a/upgrade_feed.php b/upgrade_feed.php
index 1d04ba650..872fca870 100644
--- a/upgrade_feed.php
+++ b/upgrade_feed.php
@@ -21,6 +21,12 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
+//check php version
+if (version_compare(PHP_VERSION, '5', '<'))
+{
+  die('Piwigo requires PHP 5 or above.');
+}
+
 define('PHPWG_ROOT_PATH', './');
 
 include_once(PHPWG_ROOT_PATH.'include/functions.inc.php');
author	patdenice <patdenice@piwigo.org>	2008-10-15 17:55:18 +0000
committer	patdenice <patdenice@piwigo.org>	2008-10-15 17:55:18 +0000
commit	5ce101c1939bcea8b3171d3d0cf494b35a9650f3 (patch)
tree	1ee1b5fe12447f52f7d37a44193d460a1f6a99c2
parent	fd1badf24b962381f2600abbe9d2714f1f463005 (diff)