Very little/small corrections:

  o bad parser word user on installation
  o standardization of the method to open link in new tab/windows  
  o removed not used constant
  o use/add link constants
  o use new function pwg_URL
  o add missing translation

git-svn-id: http://piwigo.org/svn/trunk@1726 68402e56-0260-453c-a942-63ccdbb3a9ee

12 files changed, 39 insertions, 36 deletions

diff --git a/admin/include/functions.php b/admin/include/functions.php
index 6fc649e0e..a28e42582 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1910,18 +1910,20 @@ function check_conf()
 
   if ($count != 0)
   {
+    $pwg_links = pwg_URL();
+    $link_fmt = '<a href="%s" onclick="window.open(this.href, \'\'); return false;">%s</a>';
     $header_notes[] =
       sprintf
       (
         l10n('note_check_more_info'),
-        sprintf('<a href="http://forum.phpwebgallery.net/" target="_blank"> %s</a>', l10n('note_check_more_info_forum')),
-        sprintf('<a href="http://phpwebgallery.net/doc/" target="_blank"> %s</a>', l10n('note_check_more_info_wiki'))
+        sprintf($link_fmt, $pwg_links['FORUM'], l10n('note_check_more_info_forum')),
+        sprintf($link_fmt, $pwg_links['WIKI'], l10n('note_check_more_info_wiki'))
       );
   }
 }
 
 /**
- * Refer main PhpWebGallery URLs (currently phpwebgallery.net domain)
+ * Refer main PhpWebGallery URLs (currently PHPWG_DOMAIN domain)
  *
  * @param void
  * @return array like $conf['links']
@@ -1930,19 +1932,18 @@ function pwg_URL()
 {
   global $lang_info;
   $urls = array(
-    'WIKI'       => 'http://phpwebgallery.net/doc/',
-    'HOME'       => 'http://phpwebgallery.net/',
-    'DEMO'       => 'http://demo.phpwebgallery.net/',
-    'FORUM'      => 'http://forum.phpwebgallery.net/',
-    'BUGS'       => 'http://bugs.phpwebgallery.net/',
-    'EXTENSIONS' => 'http://phpwebgallery.net/ext',
+    'WIKI'       => 'http://'.PHPWG_DOMAIN.'/doc/',
+    'HOME'       => 'http://'.PHPWG_DOMAIN.'/',
+    'DEMO'       => 'http://demo.'.PHPWG_DOMAIN.'/',
+    'FORUM'      => 'http://forum.'.PHPWG_DOMAIN.'/',
+    'BUGS'       => 'http://bugs.'.PHPWG_DOMAIN.'/',
+    'EXTENSIONS' => 'http://'.PHPWG_DOMAIN.'/ext',
     );
   if ( isset($lang_info['code']) and 
        in_array($lang_info['code'], array('fr','en')) )
   { /* current wiki languages are French or English */
-    $urls['WIKI'] =
-      'http://phpwebgallery.net/doc/doku.php?id='.$lang_info['code'].':start';
-    $urls['HOME'] = 'http://phpwebgallery.net/?lang='.$lang_info['code'];
+    $urls['WIKI'] .= 'doku.php?id='.$lang_info['code'].':start';
+    $urls['HOME'] .= '?lang='.$lang_info['code'];
   }
   return $urls;
 }
diff --git a/admin/intro.php b/admin/intro.php
index afb61576c..5e8e83f9a 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -54,7 +54,7 @@ if (isset($_GET['action']) and 'check_upgrade' == $_GET['action'])
   else
   {
     $versions = array('current' => PHPWG_VERSION);
-    $lines = @file('http://www.phpwebgallery.net/latest_version');
+    $lines = @file(PHPWG_URL.'/latest_version');
 
     // if the current version is a BSF (development branch) build, we check
     // the first line, for stable versions, we check the second line
diff --git a/include/constants.php b/include/constants.php
index 32cac3031..657a866be 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -27,8 +27,8 @@
 
 // Default settings
 define('PHPWG_VERSION', 'Alligator');
-define('PHPWG_URL', 'http://www.phpwebgallery.net');
-define('PHPWG_FORUM_URL', 'http://forum.phpwebgallery.net');
+define('PHPWG_DOMAIN', 'phpwebgallery.net');
+define('PHPWG_URL', 'http://www.'.PHPWG_DOMAIN);
 define('PHPWG_DEFAULT_LANGUAGE', 'en_UK.iso-8859-1');
 
 // Error codes
diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index 9850f9c6c..523bbd6fd 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // | Copyright (C) 2006 Ruben ARNAUD - team@phpwebgallery.net              |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
@@ -224,6 +224,7 @@ function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '', $for
             isset($page['gallery_title']) ?

                   $page['gallery_title'] : $conf['gallery_title'],

           'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',

+          'PHPWG_URL' => PHPWG_URL,

 

           'TITLE_MAIL' => urlencode(l10n('title_send_mail')),

           'MAIL' => get_webmaster_mail_address()
diff --git a/include/page_tail.php b/include/page_tail.php
index 0f78484ba..2a03cbd86 100644
--- a/include/page_tail.php
+++ b/include/page_tail.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -31,6 +31,7 @@ trigger_action('loc_begin_page_tail');
 $template->assign_vars(
   array(
     'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
+    'PHPWG_URL' => PHPWG_URL,
 
     'L_TITLE_MAIL' => urlencode($lang['title_send_mail']),
     ));
diff --git a/install.php b/install.php
index 0ab120a6c..6e2566996 100644
--- a/install.php
+++ b/install.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -363,7 +363,7 @@ $template->assign_vars(
     'L_ADMIN_EMAIL'=>$lang['conf_mail_webmaster'],
     'L_ADMIN_EMAIL_INFO'=>$lang['conf_mail_webmaster_info'],
     'L_SUBMIT'=>$lang['Start_Install'],
-    'L_HELP'=>$lang['install_help'],
+    'L_INSTALL_HELP'=>sprintf($lang['install_help'], 'http://forum.'.PHPWG_DOMAIN.'/'),
     'L_ERR_COPY'=>$lang['step1_err_copy'],
     'L_END_TITLE'=>$lang['install_end_title'],
     'L_END_MESSAGE'=>$lang['install_end_message'],
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 706e6de0f..6a7ad01c6 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -572,11 +572,11 @@ $lang['note_check_more_info'] = 'Go to %s or %s for more informations.';
 $lang['note_check_more_info_forum'] = 'the forum';
 $lang['note_check_more_info_wiki'] = 'the wiki';
 $lang['Duplicates'] = 'Files with same name in more than one physical category';
-$lang['WIKI'] = 'WIKI / DOC';
 $lang['DEMO'] = 'DEMO';
 $lang['HOME'] = 'HOME';
 $lang['FORUM'] = 'FORUM';
 $lang['BUGS'] = 'BUGS';
 $lang['EXTENSIONS'] = 'EXTENSIONS';
+$lang['WIKI / DOC'] = 'WIKI / DOC';
 
 ?>
diff --git a/language/en_UK.iso-8859-1/install.lang.php b/language/en_UK.iso-8859-1/install.lang.php
index c6742b0ad..880021612 100644
--- a/language/en_UK.iso-8859-1/install.lang.php
+++ b/language/en_UK.iso-8859-1/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -64,7 +64,7 @@ $lang['step2_pwd'] = 'Webmaster password';
 $lang['step2_pwd_info'] = 'Keep it confidential, it enables you to access administration panel';
 $lang['step2_pwd_conf'] = 'Password [confirm]';
 $lang['step2_pwd_conf_info'] = 'verification';
-$lang['install_help'] = 'Need help ? Ask your question on <a href="http://forum.phpwebgallery.net">PhpWebGallery message board</a>.';
+$lang['install_help'] = 'Need help ? Ask your question on <a href="%s">PhpWebGallery message board</a>.';
 $lang['install_end_message'] = 'The configuration of PhpWebGallery 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 :
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 10a712b58..209c39a7f 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -571,11 +571,11 @@ $lang['note_check_more_info_forum'] = 'le forum';
 $lang['note_check_more_info_wiki'] = 'le wiki';
 $lang['Duplicates'] = 'Fichiers portant le même nom dans plusieurs' .
     ' catégories physiques';
-$lang['WIKI'] = 'WIKI / DOC';
 $lang['DEMO'] = 'DÉMO';
 $lang['HOME'] = 'ACCUEIL PWG';
 $lang['FORUM'] = 'FORUM';
 $lang['BUGS'] = 'BOGUES';
-$lang['EXTENSIONS'] = 'EXTENSIONS';    
+$lang['EXTENSIONS'] = 'EXTENSIONS';
+$lang['WIKI / DOC'] = 'WIKI / DOC';
 
 ?>
diff --git a/language/fr_FR.iso-8859-1/install.lang.php b/language/fr_FR.iso-8859-1/install.lang.php
index c6339baf0..7e90538f3 100644
--- a/language/fr_FR.iso-8859-1/install.lang.php
+++ b/language/fr_FR.iso-8859-1/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -59,7 +59,7 @@ $lang['step2_pwd_info'] = 'Il doit rester confidentiel, il permet d\'accéder au
 $lang['step2_pwd_conf'] = 'Mot de passe [ Confirmer ]';
 $lang['step2_pwd_conf_info'] = 'Vérification';
 $lang['step1_err_copy'] = 'Copiez le texte en bleu 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é PhpWebGallery (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['install_help'] = 'Besoin d\'aide ? Posez votre question sur le <a href="http://forum.phpwebgallery.net">forum de PhpWebGallery</a>.';
+$lang['install_help'] = 'Besoin d\'aide ? Posez votre question sur le <a href="%s">forum de PhpWebGallery</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 :
diff --git a/template/yoga/footer.tpl b/template/yoga/footer.tpl
index 6f4ef5fe4..c2c51848d 100644
--- a/template/yoga/footer.tpl
+++ b/template/yoga/footer.tpl
@@ -5,10 +5,10 @@
  <!-- END debug -->
 
  <!-- Please, do not remove this copyright. If you really want to,
-	  contact us on http://phpwebgallery.net to find a solution on how
-	  to show the origin of the script...-->
+      contact us on http://phpwebgallery.net to find a solution on how
+      to show the origin of the script...-->
 
-  <a href="http://www.phpwebgallery.net" class="back" title="{lang:powered_by}">
+  <a href="{PHPWG_URL}" class="back" title="{lang:powered_by}" onclick="window.open(this.href, ''); return false;">
   <img src="{pwg_root}{themeconf:icon_dir}/pwg_footer.png" alt="{lang:powered_by}">
   </a>
   {VERSION}
diff --git a/template/yoga/mail/footer.tpl b/template/yoga/mail/footer.tpl
index 01c9e3c4a..7588b7d81 100644
--- a/template/yoga/mail/footer.tpl
+++ b/template/yoga/mail/footer.tpl
@@ -1,11 +1,11 @@
 <div id="copyright">

 

  <!-- Please, do not remove this copyright. If you really want to,

-	  contact us on http://phpwebgallery.net to find a solution on how

-	  to show the origin of the script...-->

+      contact us on http://phpwebgallery.net to find a solution on how

+      to show the origin of the script...-->

 

   <a href="{GALLERY_URL}" class="back">{GALLERY_TITLE}</a> - 

-  <a href="http://www.phpwebgallery.net" class="back" title="{lang:powered_by}">

+  <a href="{PHPWG_URL}" class="back" title="{lang:powered_by}" onclick="window.open(this.href, ''); return false;">

     <img src="{pwg_root}{themeconf:icon_dir}/pwg_footer.png" alt="{lang:powered_by}">

   </a>

   {VERSION}