Changeset 3204


Ignore:
Timestamp:
03/16/09 18:04:13 (10 years ago)
Author:
patdenice
Message:

merge r3203 from trunk to branch 2.0.
Move template class inclusion to common.inc.php.
Add forum link in upgrade page.
Install and upgrade try to configure PHP5.

Location:
branches/2.0
Files:
12 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/2.0/admin/template/goto/upgrade.tpl

    r2999 r3204  
    113113 
    114114</div> {* content *} 
     115<div>{$L_UPGRADE_HELP}</div> 
    115116</div> {* the_page *} 
    116117</body> 
  • branches/2.0/include/common.inc.php

    r3196 r3204  
    102102include(PHPWG_ROOT_PATH . 'include/constants.php'); 
    103103include(PHPWG_ROOT_PATH . 'include/functions.inc.php'); 
     104include( PHPWG_ROOT_PATH .'include/template.class.php'); 
    104105 
    105106// Database connection 
  • branches/2.0/include/functions.inc.php

    r3147 r3204  
    3131include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' ); 
    3232include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' ); 
    33 include_once( PHPWG_ROOT_PATH .'include/template.class.php'); 
    3433 
    3534//----------------------------------------------------------- generic functions 
  • branches/2.0/install.php

    r3196 r3204  
    2222// +-----------------------------------------------------------------------+ 
    2323 
    24 //------------------------------------------------- check php version 
    25 if (version_compare(PHP_VERSION, '5', '<')) 
    26 { 
    27   die('Piwigo requires PHP 5 or above.'); 
    28 } 
    29  
    3024//----------------------------------------------------------- include 
    3125define('PHPWG_ROOT_PATH','./'); 
     
    224218load_language( 'install.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') ); 
    225219 
     220//------------------------------------------------- check php version 
     221if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<')) 
     222{ 
     223  include(PHPWG_ROOT_PATH.'install/php5_apache_configuration.php'); 
     224} 
     225 
    226226//----------------------------------------------------- template initialization 
     227include( PHPWG_ROOT_PATH .'include/template.class.php'); 
    227228$template=new Template(PHPWG_ROOT_PATH.'admin/template/goto', 'roma'); 
    228229$template->set_filenames( array('install'=>'install.tpl') ); 
  • branches/2.0/language/de_DE/install.lang.php

    r3063 r3204  
    6262$lang['conf_mail_webmaster'] = 'Webmaster Mail-Adresse'; 
    6363$lang['conf_mail_webmaster_info'] = 'Kontakt E-Mailadresse (nur für angemeldete Benutzer sichtbar)'; 
     64 
     65$lang['PHP 5 is required'] = 'PHP 5 ist erforderlich'; 
     66$lang['It appears your webhost is currently running PHP %s.'] = 'Es scheint Ihr Webhost ist derzeit laufenden PHP %s.'; 
     67$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo wird versuchen um Ihre Konfiguration zu PHP 5 Schalten durch die Schaffung oder Änderung einer .Htaccess-Datei.'; 
     68$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Hinweis: Sie können Ihre Konfiguration indem manuel Schalten und starten Sie wieder dass Piwigo.'; 
     69$lang['Try to configure PHP 5'] = 'Versuch zu konfigurieren PHP 5'; 
     70$lang['Sorry!'] = 'Bekümmert!'; 
     71$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo kan nicht PHP 5 zu konfigurieren.'; 
     72$lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Sie können sich beziehen auf Ihrem Hosting-Anbieter die Unterstützung und sehen wie Sie könnte Umstellung auf PHP 5 von Ihnen."; 
     73$lang['Hope to see you back soon.'] = 'Hoffen, Sie bald wieder zurück.'; 
    6474?> 
  • branches/2.0/language/en_UK/install.lang.php

    r3046 r3204  
    6464$lang['conf_mail_webmaster'] = 'Webmaster mail address'; 
    6565$lang['conf_mail_webmaster_info'] = 'Visitors will be able to contact site administrator with this mail'; 
     66 
     67$lang['PHP 5 is required'] = 'PHP 5 is required'; 
     68$lang['It appears your webhost is currently running PHP %s.'] = 'It appears your webhost is currently running PHP %s.'; 
     69$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'; 
     70$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Note you can change your configuration by yourself and restart Piwigo after that.'; 
     71$lang['Try to configure PHP 5'] = 'Try to configure PHP 5'; 
     72$lang['Sorry!'] = 'Sorry!'; 
     73$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo was not able to configure PHP 5.'; 
     74$lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."; 
     75$lang['Hope to see you back soon.'] = 'Hope to see you back soon.'; 
    6676?> 
  • branches/2.0/language/es_ES/install.lang.php

    r3046 r3204  
    6262$lang['conf_mail_webmaster'] = 'Dirige e-mail del Administrador'; 
    6363$lang['conf_mail_webmaster_info'] = 'Los visitadores podrán ponerse en contacto con usted por este mail'; 
     64 
     65$lang['PHP 5 is required'] = 'PHP 5 es requerido'; 
     66$lang['It appears your webhost is currently running PHP %s.'] = 'Aparentemente, la versión PHP de su hébergeur es PHP %s.'; 
     67$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va a tratar de pasar en PHP 5 creando o modificando el fichero .htaccess.'; 
     68$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Anote que usted mismo puede cambiar la configuración PHP y volver a lanzar a Piwigo después.'; 
     69$lang['Try to configure PHP 5'] = 'Tratar de configurar PHP 5'; 
     70$lang['Sorry!'] = 'Desolado!'; 
     71$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo no pudo configurar PHP 5.'; 
     72$lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = 'Usted debe ponerse en contacto con su hébergeur con el fin de saber cómo configurar PHP 5'; 
     73$lang['Hope to see you back soon.'] = 'Esperando verle de revisarle muy pronto...'; 
    6474?> 
  • branches/2.0/language/fr_FR/install.lang.php

    r3046 r3204  
    6262$lang['conf_mail_webmaster'] = 'Adresse e-mail de l\'Administrateur'; 
    6363$lang['conf_mail_webmaster_info'] = 'Les visiteurs pourront vous contacter par ce mail'; 
     64 
     65$lang['PHP 5 is required'] = 'PHP 5 est requis'; 
     66$lang['It appears your webhost is currently running PHP %s.'] = 'Apparemment, la version PHP de votre hébergeur est PHP %s.'; 
     67$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va essayer de passer en PHP 5 en créant ou en modifiant le fichier .htaccess.'; 
     68$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Notez que vous pouvez changer vous-même la configuration PHP et re-lancer Piwigo après.'; 
     69$lang['Try to configure PHP 5'] = 'Essayer de configurer PHP 5'; 
     70$lang['Sorry!'] = 'Désolé!'; 
     71$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo n\'a pas pu configurer PHP 5.'; 
     72$lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = 'Vous devez contacter votre hébergeur afin de savoir comment configurer PHP 5.'; 
     73$lang['Hope to see you back soon.'] = 'En espérant vous revoir très prochainement...'; 
    6474?> 
  • branches/2.0/language/it_IT/install.lang.php

    r3058 r3204  
    6262$lang['conf_mail_webmaster'] = 'Indirizzo email del Amministratore'; 
    6363$lang['conf_mail_webmaster_info'] = 'i visitatori potranno contattarvi utilizzando questo indirizzo email'; 
     64 
     65$lang['PHP 5 is required'] = 'È necessario PHP 5'; 
     66$lang['It appears your webhost is currently running PHP %s.'] = 'Sembrerebbe che la versione del vostro server è PHP %s.'; 
     67$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo cerchrà di passare in PHP 5 creando o modificando il file .htaccess.'; 
     68$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Notate che potete cambiare manualmente la configurazione e rilanciare Piwigo.'; 
     69$lang['Try to configure PHP 5'] = 'Provate a configuratre PHP 5'; 
     70$lang['Sorry!'] = 'Spiacente!'; 
     71$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo non a potuto configurare PHP 5.'; 
     72$lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = 'Dovete contattare il votro provider per chiedere come configurare PHP 5.'; 
     73$lang['Hope to see you back soon.'] = 'Sperando di rivedervi prossimamente ...'; 
    6474?> 
  • branches/2.0/language/nl_NL/install.lang.php

    r3046 r3204  
    6464$lang['conf_mail_webmaster'] = 'Webmaster email adres'; 
    6565$lang['conf_mail_webmaster_info'] = 'Het is mogelijk dat bezoekers contact opnemen met de beheerder middels e-mail'; 
     66 
     67/* TODO */$lang['PHP 5 is required'] = 'PHP 5 is required'; 
     68/* TODO */$lang['It appears your webhost is currently running PHP %s.'] = 'It appears your webhost is currently running PHP %s.'; 
     69/* TODO */$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'; 
     70/* TODO */$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Note you can change your configuration by yourself and restart Piwigo after that.'; 
     71/* TODO */$lang['Try to configure PHP 5'] = 'Try to configure PHP 5'; 
     72/* TODO */$lang['Sorry!'] = 'Sorry!'; 
     73/* TODO */$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo was not able to configure PHP 5.'; 
     74/* TODO */$lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."; 
     75/* TODO */$lang['Hope to see you back soon.'] = 'Hope to see you back soon.'; 
    6676?> 
  • branches/2.0/language/pl_PL/install.lang.php

    r3083 r3204  
    6464$lang['conf_mail_webmaster'] = 'Adres email Webmaster\'a'; 
    6565$lang['conf_mail_webmaster_info'] = 'Z jego pomocą odwiedzający będą mogli się skontaktować z administratorem strony'; 
     66 
     67$lang['PHP 5 is required'] = 'PHP 5 jest wymagane'; 
     68$lang['It appears your webhost is currently running PHP %s.'] = 'Twój serwer aktualnie używa PHP w wersji %s.'; 
     69$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo może spróbować przełączyć Twoją konfigurację do PHP 5 poprzez modyfikację pliku .htaccess.'; 
     70$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Możesz również zmienić tę konfigurację sam, a następnie uruchomić ponownie Piwigo.'; 
     71$lang['Try to configure PHP 5'] = 'Spróbuj skonfigurować PHP 5'; 
     72$lang['Sorry!'] = 'Niestety!'; 
     73$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nie mógł skonfigurować Twojego PHP 5.'; 
     74$lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Możesz skontaktować się z działem wsparcia Twojego providera aby dowiedzieć się jak włączyć PHP 5."; 
     75$lang['Hope to see you back soon.'] = 'Do zobaczenia wkrótce.'; 
    6676?> 
  • branches/2.0/upgrade.php

    r3076 r3204  
    2222// +-----------------------------------------------------------------------+ 
    2323 
    24 //check php version 
    25 if (version_compare(PHP_VERSION, '5', '<')) 
    26 { 
    27   die('Piwigo requires PHP 5 or above.'); 
    28 } 
    29  
    3024define('PHPWG_ROOT_PATH', './'); 
    3125 
     
    168162} 
    169163 
     164if ('fr_FR' == $language) { 
     165  define('PHPWG_DOMAIN', 'fr.piwigo.org'); 
     166} 
     167else { 
     168  define('PHPWG_DOMAIN', 'piwigo.org'); 
     169} 
     170define('PHPWG_URL', 'http://'.PHPWG_DOMAIN); 
     171 
    170172load_language( 'common.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) ); 
    171173load_language( 'admin.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) ); 
     174load_language( 'install.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) ); 
    172175load_language( 'upgrade.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) ); 
    173176 
     177// check php version 
     178if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<')) 
     179{ 
     180  include(PHPWG_ROOT_PATH.'install/php5_apache_configuration.php'); 
     181} 
     182 
    174183// +-----------------------------------------------------------------------+ 
    175184// |                        template initialization                        | 
    176185// +-----------------------------------------------------------------------+ 
    177186 
     187include( PHPWG_ROOT_PATH .'include/template.class.php'); 
    178188$template = new Template(PHPWG_ROOT_PATH.'admin/template/goto', 'roma'); 
    179189$template->set_filenames(array('upgrade'=>'upgrade.tpl')); 
    180 $template->assign('RELEASE', PHPWG_VERSION); 
     190$template->assign(array( 
     191  'RELEASE' => PHPWG_VERSION, 
     192  'L_UPGRADE_HELP' => sprintf(l10n('install_help'), PHPWG_URL.'/forum'), 
     193  ) 
     194); 
    181195 
    182196// +-----------------------------------------------------------------------+ 
Note: See TracChangeset for help on using the changeset viewer.