aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorz0rglub <z0rglub@piwigo.org>2004-09-05 15:49:54 +0000
committerz0rglub <z0rglub@piwigo.org>2004-09-05 15:49:54 +0000
commitb220e5db421a78e8cc4c76fba42d4f5049892488 (patch)
treee6901f787cc1cb931c3bbf3a3f38e751499caa2a
parent1f8b6b0790d76d98f74e55d6551fce9be7d7e08e (diff)
deletion of $conf['site_url'] and $conf['forum_url'] and all their usage
(thus avoiding the usage of $conf in *.lang.php) git-svn-id: http://piwigo.org/svn/trunk@516 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/configuration.php3
-rw-r--r--include/config.inc.php2
-rw-r--r--include/page_tail.php1
-rw-r--r--language/en_UK.iso-8859-1/admin.lang.php3
-rw-r--r--language/en_UK.iso-8859-1/common.lang.php5
-rw-r--r--template/default/footer.tpl2
6 files changed, 6 insertions, 10 deletions
diff --git a/admin/configuration.php b/admin/configuration.php
index 6db69fa1c..2a11a1ea0 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -99,7 +99,8 @@ $result = mysql_query('SELECT param,value FROM '.CONFIG_TABLE);
while ($row = mysql_fetch_array($result))
{
$conf[$row['param']] = $row['value'];
-
+ // if the parameter is present in $_POST array (if a form is submited), we
+ // override it with the submited value
if (isset($_POST[$row['param']]))
{
$conf[$row['param']] = $_POST[$row['param']];
diff --git a/include/config.inc.php b/include/config.inc.php
index ec0930608..5e11bb926 100644
--- a/include/config.inc.php
+++ b/include/config.inc.php
@@ -46,8 +46,6 @@ $conf['nb_row_page'] = array(2,3,4,5,6,7,10,20,1000);
$conf['slideshow_period'] = array(2,5,10);
$conf['last_days'] = array(1,2,3,10,30,365);
$conf['version'] = 'BSF';
-$conf['site_url'] = 'http://www.phpwebgallery.net';
-$conf['forum_url'] = 'http://forum.phpwebgallery.net';
// $conf['file_ext'] lists all extensions (case insensitive) allowed for
// your PhpWebGallery installation
$conf['file_ext'] = array('jpg','JPG','png','PNG','gif','GIF'
diff --git a/include/page_tail.php b/include/page_tail.php
index f8388f766..a31531fd1 100644
--- a/include/page_tail.php
+++ b/include/page_tail.php
@@ -41,7 +41,6 @@ $template->assign_vars(
'L_TITLE_MAIL' => $lang['title_send_mail'],
'L_WEBMASTER'=>$lang['webmaster'],
- 'U_SITE' => $conf['site_url']
));
if (DEBUG)
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index b8304ddf5..a16be9511 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -257,8 +257,7 @@ $lang['help_access_title'] = 'Access authorization';
$lang['help_access'][0] = 'PhpWebGallery is able to forbid access to categories. Categories can be "public" or "private". In order to forbid access to a category :';
$lang['help_access'][1] = '1. Modify category informations (from the "categories" section in tha admin panel) and make it "private".';
$lang['help_access'][2] = '2. On the page of permissions (for a group or a user) the private category will be shown and you\'ll be able to authorize access or not.';
-if (isset($conf))
- $lang['help_infos'][2] = 'If you have any question, do not hesitate to take a look at the forum or ask a question there. The <a href="'.$conf['forum_url'].'" style="text-decoration:underline">forum</a> (message board) is available on the presentation site of PhpWebGallery.';
+$lang['help_infos'][2] = 'If you have any question, do not hesitate to take a look at the forum or ask a question there. The <a href="http://forum.phpwebgallery.net" style="text-decoration:underline">forum</a> (message board) is available on the presentation site of PhpWebGallery.';
// Image informations
$lang['infoimage_general'] = 'General options for the category';
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index e167ed8ca..6d0832b84 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -156,12 +156,11 @@ $lang['favorites'] = 'Favorites';
$lang['search_result'] = 'Search results';
$lang['about_page_title'] = 'About PhpWebGallery';
$lang['about_title'] = 'About...';
-if (isset($conf))
$lang['about_message'] = '<div style="text-align:center;font-weigh:bold;">Information about PhpWebGallery</div>
<ul>
- <li>This website uses <a href="'.$conf['site_url'].'" style="text-decoration:underline">PhpWebGallery</a> release '.$conf['version'].'. PhpWebGallery is a web application giving you the possibility to create an online images gallery easily.</li>
+ <li>This website uses <a href="http://www.phpwebgallery.net" style="text-decoration:underline">PhpWebGallery</a>. PhpWebGallery is a web application giving you the possibility to create an online images gallery easily.</li>
<li>Technicaly, PhpWebGallery is fully developped with PHP (the elePHPant) with a MySQL database (the SQuirreL).</li>
- <li>If you have any suggestions or comments, please visit <a href="'.$conf['site_url'].'" style="text-decoration:underline">PhpWebGallery</a> official site, and its dedicated <a href="'.$conf['forum_url'].'" style="text-decoration:underline">forum</a>.</li>
+ <li>If you have any suggestions or comments, please visit <a href="http://www.phpwebgallery.net" style="text-decoration:underline">PhpWebGallery</a> official site, and its dedicated <a href="http://forum.phpwebgallery.net" style="text-decoration:underline">forum</a>.</li>
</ul>';
$lang['about_return'] = 'Back';
$lang['ident_page_title'] = 'Identification';
diff --git a/template/default/footer.tpl b/template/default/footer.tpl
index f1ee02372..bceb9e234 100644
--- a/template/default/footer.tpl
+++ b/template/default/footer.tpl
@@ -7,7 +7,7 @@
contact me pierrick@phpwebgallery.net to find a solution on how
to show the origin of the script...-->
- Powered by <a href="{U_SITE}" class="back">PhpWebGallery</a>
+ Powered by <a href="http://www.phpwebgallery.net" class="back">PhpWebGallery</a>
{VERSION} ::
{L_SEND_MAIL}