Changeset 2869

Timestamp:

Nov 13, 2008, 11:03:28 PM (15 years ago)

Author:

patdenice

Message:

• add multi-language support to auto-install script.
• Add roma theme to piwigo-loader.

Location:

extras/auto-install/trunk

Files:

• class.unzip.txt (moved) (moved from extras/auto-install/trunk/class.unzip.php.txt)
• get_language.php (added)
• images (added)
• images/bottom-left-bg.png (added)
• images/fillet.png (added)
• images/piwigo_logo_sombre_214x100.png (added)
• images/top-left-bg.png (added)
• language (added)
• language/de_DE (added)
• language/de_DE/iso.txt (added)
• language/de_DE/loader.lang.txt (added)
• language/en_UK (added)
• language/en_UK/iso.txt (added)
• language/en_UK/loader.lang.txt (added)
• language/es_ES (added)
• language/es_ES/iso.txt (added)
• language/es_ES/loader.lang.txt (added)
• language/fr_FR (added)
• language/fr_FR/iso.txt (added)
• language/fr_FR/loader.lang.txt (added)
• language/it_IT (added)
• language/it_IT/iso.txt (added)
• language/it_IT/loader.lang.txt (added)
• language/nl_NL (added)
• language/nl_NL/iso.txt (added)
• language/nl_NL/loader.lang.txt (added)
• lib.files.txt (moved) (moved from extras/auto-install/trunk/lib.files.php.txt)
• loader.css (modified) (1 diff)
• piwigo-loader.php (modified) (24 diffs)

extras/auto-install/trunk/loader.css

@@ -1 @@
-/*
-        loader.css
-        Simple CSS rules for NetInstall
-        
-        (c) 2008 - Piwigo - All rights reserved.
-        Please see http://phpwebgallery.net/ for more details.
-*/
-body {
-        font: 0.8em "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;
-        color: #000;
-        background-color: #fff;
+html, body {
+  min-height: 100%;
 }
 
-#page {
-        width:500px;
-        margin:1em auto;
+*, :focus, :active, input:active, a:active, input:focus, a:focus {
+  outline-color: -moz-use-text-color;
+  outline-style: none;
+  outline-width: 0;
 }
-#main {
-        padding:1em 2em;
-        border:1px #ccc solid;
-        -moz-border-radius:8px;
-        -webkit-border-radius:8px;
+
+a {
+  border-width: 0;
+  text-decoration: none;
+  color: #FF7700;
+}
+
+body {
+  background: #111111 url(images/bottom-left-bg.png) no-repeat fixed left bottom;
+  color: #666666;
+  margin: 0;
+  padding: 0;
+  min-width: 60em;
+  font-family: Univers,Helvetica,Optima,"Bitstream Vera Sans",sans-serif;
+  font-size: 0.8em;
+  text-align: center;
+}
+
+#headbranch {
+  background: transparent url(images/top-left-bg.png) no-repeat scroll left top;
+  height: 240px;
+  left: 0;
+  margin: 0;
+  padding: 0;
+  position: absolute;
+  top: 0;
+  width: 233px;
+  z-index: 0;
+}
+
+#theHeader {
+  background: transparent url(images/piwigo_logo_sombre_214x100.png) no-repeat scroll 245px top;
+  margin: 0;
+  min-height: 105px;
+  padding: 0;
+}
+
+#content {
+  background: #222222 url(images/fillet.png) repeat-x scroll left top;
+  margin: auto;
+  margin-top: 9px;
+  text-align: left;
+  width: 800px;
+  padding: 25px;
+  z-index: 99;
+  color: #666666;
 }
 
 #footer {
-        text-align:right;
-        width:500px;
-        margin:1em auto;
+  width: 800px;
+  margin: auto;
+  text-align: right;
+  margin-top: 15px;
 }
 
+h2 {
+  color: #666666;
+  font-weight: bold;
+  letter-spacing: 2px;
+  text-align: right;
+  text-transform: none;
+  width: 54%;
+  display: block;
+  font-size: 28px;
+  height: 104px;
+  margin: 0 20px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  right: 0;
+  top: 0;
+}
 
-h1,h2 {
-        font-family: Arial,Helvetica,sans-serif;
+h3 {
+  font-size: 15px;
+  font-weight: bold;
 }
-h1 {
-        background: url(img/w-logo.png) no-repeat top center;
-        font-size:1.8em;
-        font-weight:normal;
-        text-align:center;
-        color: #666;
-        padding-top: 70px;
-        margin: 0 0 0.75em 0;
+
+select, input {
+  border: 1px solid #666666;
+  background-color: #444444;
+  color: #999999;
+  font-size: 1em;
+  margin: 0;
 }
-h2 {
-        color: #f90;
+
+input[type="submit"] {
+  text-align: center;
+  background-color: #222222;
+  border-color: #FF3363;
+  color: #FF3363;
 }
-h3 {
-        margin-top:0;
+
+input[type="submit"]:hover {
+  cursor: pointer;
+  color: #999;
+  border-color: #666;
 }
+
 label {
-        font-weight: bold;
-        color: #555;
+  color: #ff3363
+}
+
+.destination {
+  text-align: center;
+  margin-top: 2em;
+  font-weight: bold;
+}
+
+.language {
+  margin-left: 1.5em;
+  margin-bottom: 2em;
+}
+
+.button {
+  text-align: center;
+  margin-top: 2em;
 }
 
 .msg {
-        padding:10px 10px 10px 42px;
-        -moz-border-radius:8px;
-        -webkit-border-radius:8px;
+  padding: 3px 35px;
 }
+
+.notice {
+  color: #f70;
+}
+
 .warning {
-        background: #ffc url(img/important.png) no-repeat 10px 10px;
+  color: #f30;
 }
-.notice {
-        background: #eef url(img/note.png) no-repeat 10px 10px;
-}

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

@@ -11 +11 @@
 # -- END LICENSE BLOCK ------------------------------------
 
+// +-----------------------------------------------------------------------+
+// |                                                                                                                     Configuration                                                                                                   |
+// +-----------------------------------------------------------------------+
+
+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');
+
+// +-----------------------------------------------------------------------+
+
 error_reporting(E_ALL & ~E_NOTICE);
 
-if (function_exists('date_default_timezone_set')) {
+if (function_exists('date_default_timezone_set'))
+{
         date_default_timezone_set('UTC');
-} elseif (!ini_get('safe_mode') && function_exists('putenv')) {
+}
+elseif (!ini_get('safe_mode') && function_exists('putenv'))
+{
         putenv('TZ=UTC');
 }
-
-define('DC_LOADER_VERSION','0.8');
-define('DC_LOADER_SERVICE','http://piwigo.duretz.net/');
-define('DC_LOADER_ARCHIVE','http://piwigo.duretz.net/latest.zip');
-define('DC_LOADER_DIRECTORY','phpwebgallery-1.7.3');
-define('DC_LOADER_LANG', getLanguage());
 
 $can_write = is_writable(dirname(__FILE__));
 $can_fetch = false;
-if ((boolean)ini_get('allow_url_fopen')) {
+if ((boolean)ini_get('allow_url_fopen'))
+{
         $can_fetch = true;
 }
-if (function_exists('curl_init')) {
+if (function_exists('curl_init'))
+{
         $can_fetch = true;
         define('DC_LOADER_CURL',true);
 }
 
+define('DC_LOADER_LANG', getLanguage());
+
 $step = !empty($_REQUEST['step']) ? (integer)$_REQUEST['step'] : 1;
-$got_php5  = (strpos(PHP_VERSION,'5') === 0);
-if (!$got_php5 && $step != 2) {
+$got_php5       = (strpos(PHP_VERSION,'5') === 0);
+if (!$got_php5 && $step != 2)
+{
         $step = 1;
 }
 
-function __($str)
-{
-        return $str;
+function l10n($str)
+{
+        global $lang;
+
+        return isset($lang[$str]) ? $lang[$str] : $str;
 }
 
 function fetchRemote($src,&$dest,$step=0) # Rudimentary HTTP client
 {
-        if ($step > 3) {
+        if ($step > 3)
+        {
                 return false;
         }
@@ -56 +70 @@
         $path = $src['path'];
         
-        if (($s = @fsockopen($host,80,$errno,$errstr,5)) === false) {
+        if (($s = @fsockopen($host,80,$errno,$errstr,5)) === false)
+        {
                 return false;
         }
@@ -74 +89 @@
                 $line = fgets($s,4096);
                 
-                if (rtrim($line,"\r\n") == '' && !$in_content) {
+                if (rtrim($line,"\r\n") == '' && !$in_content)
+                {
                         $in_content = true;
                         $i++;
@@ -81 +97 @@
                 
                 if ($i == 0) {
-                        if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/',rtrim($line,"\r\n"), $m)) {
+                        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) {
+                        if ($status < 200 || $status >= 400)
+                        {
                                 fclose($s);
                                 return false;
@@ -94 +112 @@
                 if (!$in_content)
                 {
-                        if (preg_match('/Location:\s+?(.+)$/',rtrim($line,"\r\n"),$m)) {
+                        if (preg_match('/Location:\s+?(.+)$/',rtrim($line,"\r\n"),$m))
+                        {
                                 fclose($s);
                                 return fetchRemote(trim($m[1]),$dest,$step+1);
@@ -102 +121 @@
                 }
                 
-                if (is_resource($dest)) {
+                if (is_resource($dest))
+                {
                         fwrite($dest,$line);
-                } else {
+                }
+                else
+                {
                         $dest .= $line;
                 }
@@ -115 +137 @@
 }
 
-function getLanguage($default = 'en')
-{
-        $supported = array('fr','en');
-        if (!empty($_REQUEST['lang']) && in_array($_REQUEST['lang'],$supported)) {
-                return $_REQUEST['lang'];
-        }
-        if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-                $languages = explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
-                $l = explode(';',$languages[0]);
-                $dlang = substr(trim($l[0]),0,2);
-                if (in_array($dlang, $supported)) {
-                        return $dlang;
-                }
-        }
-        return $default;
+function getLanguage()
+{
+        global $can_fetch, $lang, $available_languages;
+
+        $language = 'en_UK';
+        $available_languages = array();
+
+        // Rertrieve available languages
+        if ($can_fetch and fetchRemote(DC_LOADER_SERVICE.'get_language.php', $str))
+        {
+                $available_languages = @unserialize($str);
+        }
+
+        if (isset($_GET['language']))
+        {
+                $language = strip_tags($_GET['language']);
+        }
+        else
+        {
+                // Try to get browser language
+                foreach ($available_languages as $language_code => $language_name)
+                {
+                        if (substr($language_code,0,2) == @substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2))
+                        {
+                                $language = $language_code;
+                                break;
+                        }
+                }
+        }
+
+        // Retrieve traductions
+        if ($can_fetch and fetchRemote(DC_LOADER_SERVICE.'language/'.$language.'/loader.lang.txt', $code))
+        {
+                @eval($code);
+        }
+
+        return $language;
 }
 
@@ -163 +207 @@
         '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" '.
         ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'."\n".
-        '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.DC_LOADER_LANG.'" lang="'.DC_LOADER_LANG.'">'."\n".
+        '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.substr(DC_LOADER_LANG,0,2).'" lang="'.substr(DC_LOADER_LANG,0,2).'">'."\n".
         "<head>\n".
-        '  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />'."\n".
-        '  <title>'.__('Piwigo NetInstall').'</title>'."\n".
-        '  <meta name="ROBOTS" content="NOARCHIVE,NOINDEX,NOFOLLOW" />'."\n".
-        '  <link rel="stylesheet" type="text/css" media="screen" href="'.DC_LOADER_SERVICE.'loader.css" />'."\n".
+        ' <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />'."\n".
+        ' <title>'.l10n('Piwigo NetInstall').'</title>'."\n".
+        ' <meta name="ROBOTS" content="NOARCHIVE,NOINDEX,NOFOLLOW" />'."\n".
+        ' <link rel="stylesheet" type="text/css" media="screen" href="'.DC_LOADER_SERVICE.'loader.css" />'."\n".
         '</head>'."\n".
         '<body>'."\n".
-        '<div id="page">'."\n".
-        '<h1>'.__('Piwigo NetInstall').'</h1>'."\n".
-        '<div id="main">'."\n";
+        '<div id="headbranch"></div>'."\n".
+        '<div id="theHeader"></div>'."\n".
+        '<div id="content">'."\n".
+        '<h2>'.l10n('Piwigo NetInstall').'</h2>'."\n";
 }
 
@@ -180 +225 @@
         echo
         '</div>'."\n".
-        '</div>'."\n".
         '<div id="footer">'."\n".
-    '<p>This loader was initialy coded for <a href="http://www.dotclear.net" title="Dotclear">Dotclear</a>. Thanks !</p>'.
+        l10n('This loader was initialy coded for <a href="http://www.dotclear.net" title="Dotclear">Dotclear</a>. Thanks!')."\n".
         '</div>'."\n".
         '</body>'."\n".
@@ -192 +236 @@
         $htaccess = dirname(__FILE__).'/.htaccess';
         if (file_exists($htaccess)) {
-                if (!is_readable($htaccess) || !is_writable($htaccess)) {
+                if (!is_readable($htaccess) || !is_writable($htaccess))
+                {
                         return false;
                 }
         }
         $rawdatas = '';
-        if (!fetchRemote(DC_LOADER_SERVICE.'hosting.txt',$rawdatas)) {
+        if (!fetchRemote(DC_LOADER_SERVICE.'hosting.txt',$rawdatas))
+        {
                 return false;
         }
         $rawdatas = explode("\n",$rawdatas);
-        if (!($my_hostname = @gethostbyaddr($_SERVER['SERVER_ADDR']))) {
+        if (!($my_hostname = @gethostbyaddr($_SERVER['SERVER_ADDR'])))
+        {
                 return false;
         }
@@ -207 +254 @@
         foreach ($rawdatas as $line) {
                 list($name,$hostname,$rule) = explode('|',trim($line));
-                if (preg_match('!'.preg_quote($hostname).'$!',$my_hostname)) {
+                if (preg_match('!'.preg_quote($hostname).'$!',$my_hostname))
+                {
                         $found = $rule;
                         break;
@@ -213 +261 @@
         }
         if ($found) {
-                if (false !== ($fh = @fopen($htaccess,"ab"))) {
+                if (false !== ($fh = @fopen($htaccess,"ab")))
+                {
                         fwrite($fh,"\n".$found);
                         fclose($fh);
@@ -224 +273 @@
 function cleanFiles()
 {
-        unlink(dirname(__FILE__).'/pwg_files.php');
-        unlink(dirname(__FILE__).'/pwg_unzip.php');
-        unlink(dirname(__FILE__).'/piwigo-install.zip');
+        @unlink(dirname(__FILE__).'/pwg_files.php');
+        @unlink(dirname(__FILE__).'/pwg_unzip.php');
+        @unlink(dirname(__FILE__).'/piwigo-install.zip');
 }
 
@@ -236 +285 @@
         $dc_zip    = @fopen(dirname(__FILE__).'/piwigo-install.zip','wb');
         
-        if (!$lib_files || !$lib_unzip || !$dc_zip) {
+        if (!$lib_files || !$lib_unzip || !$dc_zip)
+        {
                 return false;
         }
         
-        if (fetchRemote(DC_LOADER_SERVICE.'lib.files.php.txt',$lib_files)) {
-                if (fetchRemote(DC_LOADER_SERVICE.'class.unzip.php.txt',$lib_unzip)) {
-                        if (fetchRemote(DC_LOADER_ARCHIVE.'',$dc_zip)) {
+        if (fetchRemote(DC_LOADER_SERVICE.'lib.files.txt',$lib_files))
+        {
+                if (fetchRemote(DC_LOADER_SERVICE.'class.unzip.txt',$lib_unzip))
+                {
+                        if (fetchRemote(DC_LOADER_ARCHIVE.'',$dc_zip))
+                        {
                                 $failed = false;
                         }
@@ -252 +305 @@
         fclose($dc_zip);
         
-        if ($failed) {
+        if ($failed)
+        {
                 cleanFiles();
                 return false;
@@ -261 +315 @@
 function writeMessage($level,$title,$lines)
 {
-        if (empty($lines)) {
+        if (empty($lines))
+        {
                 return;
         }
         
         echo
-        '<div class="msg '.$level.'">'.
-        '<h3>'.$title.'</h3>';
-        foreach ($lines as $line) {
-                echo '<p>'.$line.'</p>';
-        }
-        echo '</div>';
+        '<div class="msg '.$level.'">'."\n".
+        '<h3>'.$title.'</h3>'."\n".
+        '<p>'."\n";
+        foreach ($lines as $line)
+        {
+                echo $line.'<br />'."\n";
+        }
+        echo '</p></div>'."\n";
 }
 
@@ -277 +334 @@
 {
         echo
-        '<form action="'.$_SERVER['SCRIPT_NAME'].'" method="post">'.
+        '<form action="'.$_SERVER['SCRIPT_NAME'].'?language='.DC_LOADER_LANG.'" method="post">'.
         $more.
-        '<p><input type="hidden" name="step" value="'.$step.'" />'.
-        '<input type="hidden" name="lang" value="'.DC_LOADER_LANG.'" />'.
-        '<input type="submit" name="submit" value="'.$label.'" />'.
-        '</p></form>';
-}
-
-if (!$can_fetch) {
+        '<p class="button"><input type="hidden" name="step" value="'.$step.'" />'."\n".
+        '<input type="hidden" name="lang" value="'.DC_LOADER_LANG.'" />'."\n".
+        '<input type="submit" name="submit" value="'.$label.'"/>'."\n".
+        '</p></form>'."\n";
+}
+
+
+if (!$can_fetch)
+{
+        // No traduction for this part because can't fetch!
         openPage();
         echo
-        '<h2>'.__('NetInstall').'</h2>'."\n";
-        writeMessage('warning',__('Damnit !'), array(
-                __('Due to restrictions in your PHP configuration, NetInstall cannot get its job done.'),
-                __('Please see Piwigo documentation to perform a normal installation.'),
-                __('Really sorry for the inconvenience.')
+        '<h2>Piwigo NetInstall</h2>'."\n";
+        writeMessage('warning','Damnit!', array(
+                'Due to restrictions in your PHP configuration, NetInstall cannot get its job done.',
+                'Please see Piwigo documentation to perform a normal installation.',
+                'Really sorry for the inconvenience.'
         ));
         closePage();
@@ -298 +358 @@
 }
 
-switch ($step) {
+switch ($step)
+{
         case 1 : {
                 openPage();
+                echo '<h3>'.l10n('Welcome to NetInstall!').'</h3>'."\n";
+
+                // Show available languages
+                if (!empty($available_languages))
+                {
+                        echo
+                        '<p class="language">'.l10n('Language').' &nbsp;'."\n".
+                        '<select name="language" onchange="document.location = \''.basename(__FILE__).'?language=\'+this.options[this.selectedIndex].value;">'."\n";
+
+                        foreach ($available_languages as $language_code => $language_name)
+                        {
+                                echo '<option label="'.$language_name.'" value="'.$language_code.'" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>'.$language_name.'</option>'."\n";
+                        }
+                        echo '</select>'."\n".
+                        '</p>'."\n";
+                }
+
                 echo
-                '<h2>'.__('Welcome to NetInstall').'</h2>'."\n".
-                '<p>'.__('This tool is meant to retrieve the latest Piwigo archive and unzip it in your webspace.').'</p>'.
-                '<p>'.__('Right after then, you will be redirect to the Piwigo Setup Wizard.').'</p>';
+                '<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) {
-                        writeMessage('warning',__('Write access is needed'), array(
-                                __('It looks like NetInstall wont be able to write in the current directory, and this is required to follow on.'),
-                                __('Please try to change the permissions to allow write access, then reload this page by hitting the Refresh button.')
+                if (!$can_write)
+                {
+                        writeMessage('warning',l10n('Write access is needed'), array(
+                                l10n('It looks like NetInstall wont be able to write in the current directory, and this is required to follow on.'),
+                                l10n('Please try to change the permissions to allow write access, then reload this page by hitting the Refresh button.')
                         ));
-                        nextAction(__('Refresh'),1);
-                }
-                elseif (!$got_php5) {
-                        writeMessage('notice',__('PHP 5 is required'), array(
-                                sprintf(__('It appears your webhost is currently running PHP %s.'), PHP_VERSION),
-                                __('NetInstall may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'),
-                                __('Note you can change your configuration by yourself and restart NetInstall after that.')
+                        nextAction(l10n('Refresh'),1);
+                }
+                elseif (!$got_php5)
+                {
+                        writeMessage('notice',l10n('PHP 5 is required'), array(
+                                sprintf(l10n('It appears your webhost is currently running PHP %s.'), PHP_VERSION),
+                                l10n('NetInstall may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'),
+                                l10n('Note you can change your configuration by yourself and restart NetInstall after that.')
                         ));
-                        nextAction(__('Try to configure PHP 5'),2);
-                }
-                else {
-                        nextAction(__('Retrieve and unzip Piwigo'),3,
-                                '<p><label for="destination">'.__('Destination:').'</label> '.
+                        nextAction(l10n('Try to configure PHP 5'),2);
+                }
+                else
+                {
+                        nextAction(l10n('Retrieve and unzip Piwigo'),3,
+                                '<p class="destination"><label for="destination">'.l10n('Destination:').'</label> '.
                                 getLocation().
-                                '<input type="text" id="destination" name="destination" '.
+                                ' <input type="text" id="destination" name="destination" '.
                                 'value="piwigo" size="15" maxlength="100" /></p>'
                         );
@@ -332 +412 @@
                 break;
         }
-        case 2 : {
-                if (!empty($_POST['submit']) && !$got_php5) {
-                        if (($got_php5 = initPHP5())) {
+        case 2 :
+        {
+                if (!empty($_POST['submit']) && !$got_php5)
+                {
+                        if (($got_php5 = initPHP5()))
+                        {
                                 header('Location: '.$_SERVER['SCRIPT_NAME'].'?step=1');
                         }
                 }
-                elseif ($got_php5) {
+                elseif ($got_php5)
+                {
                         header('Location: '.$_SERVER['SCRIPT_NAME'].'?step=1');
                 }
-                else {
+                else
+                {
                         openPage();
-                        writeMessage('warning',__('OMG !'),array(
-                                __('NetInstall was not able to configure PHP 5.'),
-                                __("You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."),
-                                __('Hope to see you back soon.')
+                        writeMessage('warning',l10n('Sorry!'),array(
+                                l10n('NetInstall was not able to configure PHP 5.'),
+                                l10n("You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."),
+                                l10n('Hope to see you back soon.')
                         ));
                         closePage();
@@ -352 +437 @@
                 break;
         }
-        case 3 : {
-                $msg = array(__('WTF are you doing here that way ?!'));
+        case 3 :
+        {
+                $msg = array(l10n('What are you doing here that way ?!'));
                 $text = '';
                 if (!empty($_POST['submit']) && isset($_POST['destination']))
@@ -361 +447 @@
                         $dest = preg_replace('#/+#','/',$dest);
                         
-                        if (file_exists(dirname(__FILE__).'/./'.$dest.'/include/mysql.inc.php') || file_exists(dirname(__FILE__).'/./'.$dest.'/iclude/default_config.inc.php'))
-                        {
-                                $msg[] = __('It seems like a previous Piwigo installation is still sitting in that space.');
-                                $msg[] = __('You need to rename or remove it before we can go further...');
+                        if (file_exists(dirname(__FILE__).'/./'.$dest.'/include/mysql.inc.php') || file_exists(dirname(__FILE__).'/./'.$dest.'/include/default_config.inc.php'))
+                        {
+                                $msg[] = l10n('It seems like a previous Piwigo installation is still sitting in that space.');
+                                $msg[] = l10n('You need to rename or remove it before we can go further...');
                         }
                         elseif (grabFiles())
@@ -370 +456 @@
                                 $lib_files = dirname(__FILE__).'/pwg_files.php';
                                 $lib_unzip = dirname(__FILE__).'/pwg_unzip.php';
-                                $dc_zip    = dirname(__FILE__).'/piwigo-install.zip';
-                                if (!file_exists($lib_files) || !file_exists($lib_unzip) || !file_exists($dc_zip)) {
-                                        $msg[] = __('Needed files are not present.');
+                                $dc_zip         = dirname(__FILE__).'/piwigo-install.zip';
+                                if (!file_exists($lib_files) || !file_exists($lib_unzip) || !file_exists($dc_zip))
+                                {
+                                        $msg[] = l10n('Needed files are not present.');
                                 }
                                 
@@ -379 +466 @@
                                 $uz = new fileUnzip($dc_zip);
                                 $files = $uz->getList();
-                                if (count($files) == 0) {
-                                        $msg[] = __('Invalid zip file.');
+                                if (count($files) == 0)
+                                {
+                                        $msg[] = l10n('Invalid zip file.');
                                 }
                                 
                                 foreach ($files as $k => $v)
                                 {
-                                        if ($v['is_dir']) {
+                                        if ($v['is_dir'])
+                                        {
                                                 continue;
                                         }
-                                        $t = preg_replace('#^'.DC_LOADER_DIRECTORY.'/#','./'.$dest.'/',$k);
+                                        $t = preg_replace('#^[^/]*/#','./'.$dest.'/',$k);
                                         $uz->unzip($k,$t);
                                 }
-                $uz->close;
-                unset($uz);
+                                $uz->close;
+                                unset($uz);
                                 
-                                if (!is_dir(dirname(__FILE__).'/./'.$dest))
+                                if (!is_dir(dirname(__FILE__).'/'.$dest))
                                 {
-                                        $msg[] = __('It seems that the zip file was not extracted.');
+                                        $msg[] = l10n('It seems that the zip file was not extracted.');
                                 }
                                 else
                                 {
-                                        # Remove files, create public directory, and self-destruction
-                                        files::makeDir('./'.$dest.'/public');
+                                        # Remove files and self-destruction
                                         cleanFiles();
                                         unlink(__FILE__);
@@ -407 +495 @@
                                         $redir = preg_replace('#/+#','/',str_replace('\\', '/', dirname($_SERVER['SCRIPT_NAME'])).'/'.$dest.'/install.php');
                                         
-                                        $text = '<h2>'.__('Congratulations!').'</h2>'
-                                        .'<p>'.__('Everything went fine. You are now ready to start the installation procedure.').'</p>'
-                                        .'<form action="'.$redir.'" method="get">'
-                                        .'<p><input type="submit" value="'.__('Install now').'" /></p>'
-                                        .'</form>';
+                                        $text = '<h2>'.l10n('Congratulations!').'</h2>'
+                                        .'<p>'.l10n('Everything went fine. You are now ready to start the installation procedure.').'</p>'
+                                        .'<form action="'.$redir.'" method="get"><p class="button">'
+                                        . '<input type="hidden" name="language" value="'.DC_LOADER_LANG.'">'
+                                        . '<input type="submit" value="'.l10n('Install Piwigo now').'" />'
+                                        . '</p></form>';
                                 }
                         }
                         else
                         {
-                                $msg[] = __('An error occurred while grabbing the necessary files to go on.');
+                                $msg[] = l10n('An error occurred while grabbing the necessary files to go on.');
                         }
                 }
                 openPage();
-                writeMessage('warning',__('Something went wrong ...'),$msg);
+                writeMessage('warning',l10n('Something went wrong...'),$msg);
                 echo $text;
                 closePage();