diff options
| author | rub <rub@piwigo.org> | 2007-01-16 22:23:05 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2007-01-16 22:23:05 +0000 |
| commit | 62149d74a9724bba01c5ae5b8b99fa00e0a60fe7 (patch) | |
| tree | f89ad592735b220d28896dc1b5facca2c88fcb66 /admin | |
| parent | e5db05ea3af280d20e004d655ad0cddb2740ae9d (diff) | |
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
Diffstat (limited to '')
| -rw-r--r-- | admin/include/functions.php | 25 | ||||
| -rw-r--r-- | admin/intro.php | 4 |
2 files changed, 15 insertions, 14 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 |