Changeset 1726


Ignore:
Timestamp:
Jan 16, 2007, 11:23:05 PM (17 years ago)
Author:
rub
Message:

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

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/include/functions.php

    r1724 r1726  
    19111911  if ($count != 0)
    19121912  {
     1913    $pwg_links = pwg_URL();
     1914    $link_fmt = '<a href="%s" onclick="window.open(this.href, \'\'); return false;">%s</a>';
    19131915    $header_notes[] =
    19141916      sprintf
    19151917      (
    19161918        l10n('note_check_more_info'),
    1917         sprintf('<a href="http://forum.phpwebgallery.net/" target="_blank"> %s</a>', l10n('note_check_more_info_forum')),
    1918         sprintf('<a href="http://phpwebgallery.net/doc/" target="_blank"> %s</a>', l10n('note_check_more_info_wiki'))
     1919        sprintf($link_fmt, $pwg_links['FORUM'], l10n('note_check_more_info_forum')),
     1920        sprintf($link_fmt, $pwg_links['WIKI'], l10n('note_check_more_info_wiki'))
    19191921      );
    19201922  }
    … …  
    19221924
    19231925/**
    1924  * Refer main PhpWebGallery URLs (currently phpwebgallery.net domain)
     1926 * Refer main PhpWebGallery URLs (currently PHPWG_DOMAIN domain)
    19251927 *
    19261928 * @param void
    … …  
    19311933  global $lang_info;
    19321934  $urls = array(
    1933     'WIKI'       => 'http://phpwebgallery.net/doc/',
    1934     'HOME'       => 'http://phpwebgallery.net/',
    1935     'DEMO'       => 'http://demo.phpwebgallery.net/',
    1936     'FORUM'      => 'http://forum.phpwebgallery.net/',
    1937     'BUGS'       => 'http://bugs.phpwebgallery.net/',
    1938     'EXTENSIONS' => 'http://phpwebgallery.net/ext',
     1935    'WIKI'       => 'http://'.PHPWG_DOMAIN.'/doc/',
     1936    'HOME'       => 'http://'.PHPWG_DOMAIN.'/',
     1937    'DEMO'       => 'http://demo.'.PHPWG_DOMAIN.'/',
     1938    'FORUM'      => 'http://forum.'.PHPWG_DOMAIN.'/',
     1939    'BUGS'       => 'http://bugs.'.PHPWG_DOMAIN.'/',
     1940    'EXTENSIONS' => 'http://'.PHPWG_DOMAIN.'/ext',
    19391941    );
    19401942  if ( isset($lang_info['code']) and
    19411943       in_array($lang_info['code'], array('fr','en')) )
    19421944  { /* current wiki languages are French or English */
    1943     $urls['WIKI'] =
    1944       'http://phpwebgallery.net/doc/doku.php?id='.$lang_info['code'].':start';
    1945     $urls['HOME'] = 'http://phpwebgallery.net/?lang='.$lang_info['code'];
     1945    $urls['WIKI'] .= 'doku.php?id='.$lang_info['code'].':start';
     1946    $urls['HOME'] .= '?lang='.$lang_info['code'];
    19461947  }
    19471948  return $urls;

  • trunk/admin/intro.php

    r1724 r1726  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    5555  {
    5656    $versions = array('current' => PHPWG_VERSION);
    57     $lines = @file('http://www.phpwebgallery.net/latest_version');
     57    $lines = @file(PHPWG_URL.'/latest_version');
    5858
    5959    // if the current version is a BSF (development branch) build, we check

  • trunk/include/constants.php

    r1664 r1726  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    2828// Default settings
    2929define('PHPWG_VERSION', 'Alligator');
    30 define('PHPWG_URL', 'http://www.phpwebgallery.net');
    31 define('PHPWG_FORUM_URL', 'http://forum.phpwebgallery.net');
     30define('PHPWG_DOMAIN', 'phpwebgallery.net');
     31define('PHPWG_URL', 'http://www.'.PHPWG_DOMAIN);
    3232define('PHPWG_DEFAULT_LANGUAGE', 'en_UK.iso-8859-1');
    3333

  • trunk/include/functions_mail.inc.php

    r1676 r1726  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// | Copyright (C) 2006 Ruben ARNAUD - team@phpwebgallery.net              |
    77// +-----------------------------------------------------------------------+
    … …  
    225225                  $page['gallery_title'] : $conf['gallery_title'],
    226226          'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
     227          'PHPWG_URL' => PHPWG_URL,
    227228
    228229          'TITLE_MAIL' => urlencode(l10n('title_send_mail')),

  • trunk/include/page_tail.php

    r1595 r1726  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    3232  array(
    3333    'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
     34    'PHPWG_URL' => PHPWG_URL,
    3435
    3536    'L_TITLE_MAIL' => urlencode($lang['title_send_mail']),

  • trunk/install.php

    r1679 r1726  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    364364    'L_ADMIN_EMAIL_INFO'=>$lang['conf_mail_webmaster_info'],
    365365    'L_SUBMIT'=>$lang['Start_Install'],
    366     'L_HELP'=>$lang['install_help'],
     366    'L_INSTALL_HELP'=>sprintf($lang['install_help'], 'http://forum.'.PHPWG_DOMAIN.'/'),
    367367    'L_ERR_COPY'=>$lang['step1_err_copy'],
    368368    'L_END_TITLE'=>$lang['install_end_title'],

  • trunk/language/en_UK.iso-8859-1/admin.lang.php

    r1725 r1726  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    573573$lang['note_check_more_info_wiki'] = 'the wiki';
    574574$lang['Duplicates'] = 'Files with same name in more than one physical category';
    575 $lang['WIKI'] = 'WIKI / DOC';
    576575$lang['DEMO'] = 'DEMO';
    577576$lang['HOME'] = 'HOME';
    … …  
    579578$lang['BUGS'] = 'BUGS';
    580579$lang['EXTENSIONS'] = 'EXTENSIONS';
     580$lang['WIKI / DOC'] = 'WIKI / DOC';
    581581
    582582?>

  • trunk/language/en_UK.iso-8859-1/install.lang.php

    r871 r1726  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    6565$lang['step2_pwd_conf'] = 'Password [confirm]';
    6666$lang['step2_pwd_conf_info'] = 'verification';
    67 $lang['install_help'] = 'Need help ? Ask your question on <a href="http://forum.phpwebgallery.net">PhpWebGallery message board</a>.';
     67$lang['install_help'] = 'Need help ? Ask your question on <a href="%s">PhpWebGallery message board</a>.';
    6868$lang['install_end_message'] = 'The configuration of PhpWebGallery is finished, here is the next step<br /><br />
    6969For security reason, please delete file "install.php"<br />

  • trunk/language/fr_FR.iso-8859-1/admin.lang.php

    r1725 r1726  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    572572$lang['Duplicates'] = 'Fichiers portant le même nom dans plusieurs' .
    573573    ' catégories physiques';
    574 $lang['WIKI'] = 'WIKI / DOC';
    575574$lang['DEMO'] = 'DÉMO';
    576575$lang['HOME'] = 'ACCUEIL PWG';
    577576$lang['FORUM'] = 'FORUM';
    578577$lang['BUGS'] = 'BOGUES';
    579 $lang['EXTENSIONS'] = 'EXTENSIONS';   
     578$lang['EXTENSIONS'] = 'EXTENSIONS';
     579$lang['WIKI / DOC'] = 'WIKI / DOC';
    580580
    581581?>

  • trunk/language/fr_FR.iso-8859-1/install.lang.php

    r871 r1726  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    6060$lang['step2_pwd_conf_info'] = 'Vérification';
    6161$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é)';
    62 $lang['install_help'] = 'Besoin d\'aide ? Posez votre question sur le <a href="http://forum.phpwebgallery.net">forum de PhpWebGallery</a>.';
     62$lang['install_help'] = 'Besoin d\'aide ? Posez votre question sur le <a href="%s">forum de PhpWebGallery</a>.';
    6363$lang['install_end_message'] = 'La configuration de l\'application s\'est correctement déroulée, place à la prochaine étape<br /><br />
    6464Par mesure de sécurité, merci de supprimer le fichier "install.php"<br />

  • trunk/template/yoga/footer.tpl

    r1708 r1726  
    66
    77 <!-- Please, do not remove this copyright. If you really want to,
    8           contact us on http://phpwebgallery.net to find a solution on how
    9           to show the origin of the script...-->
     8      contact us on http://phpwebgallery.net to find a solution on how
     9      to show the origin of the script...-->
    1010
    11   <a href="http://www.phpwebgallery.net" class="back" title="{lang:powered_by}">
     11  <a href="{PHPWG_URL}" class="back" title="{lang:powered_by}" onclick="window.open(this.href, ''); return false;">
    1212  <img src="{pwg_root}{themeconf:icon_dir}/pwg_footer.png" alt="{lang:powered_by}">
    1313  </a>

  • trunk/template/yoga/mail/footer.tpl

    r1676 r1726  
    22
    33 <!-- Please, do not remove this copyright. If you really want to,
    4           contact us on http://phpwebgallery.net to find a solution on how
    5           to show the origin of the script...-->
     4      contact us on http://phpwebgallery.net to find a solution on how
     5      to show the origin of the script...-->
    66
    77  <a href="{GALLERY_URL}" class="back">{GALLERY_TITLE}</a> -
    8   <a href="http://www.phpwebgallery.net" class="back" title="{lang:powered_by}">
     8  <a href="{PHPWG_URL}" class="back" title="{lang:powered_by}" onclick="window.open(this.href, ''); return false;">
    99    <img src="{pwg_root}{themeconf:icon_dir}/pwg_footer.png" alt="{lang:powered_by}">
    1010  </a>
Note: See TracChangeset for help on using the changeset viewer.