aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorgweltas <gweltas@piwigo.org>2004-09-07 20:10:36 +0000
committergweltas <gweltas@piwigo.org>2004-09-07 20:10:36 +0000
commiteaad1d61d71e48359fe7b3abfdd91f27f5f33a1b (patch)
treef4fc3d36d0c0bf43b336730d3ccb758adb3b96aa /include
parent47a1e49c1e7b09403ce567f30c31a15856a8fdae (diff)
Minor bugs correction
git-svn-id: http://piwigo.org/svn/trunk@519 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/config.inc.php2
-rw-r--r--include/constants.php5
-rw-r--r--include/functions.inc.php12
-rw-r--r--include/functions_html.inc.php8
-rw-r--r--include/page_tail.php2
5 files changed, 12 insertions, 17 deletions
diff --git a/include/config.inc.php b/include/config.inc.php
index 5e11bb926..67b65cf80 100644
--- a/include/config.inc.php
+++ b/include/config.inc.php
@@ -45,7 +45,7 @@ $conf['nb_image_row'] = array(4,5,6,7,8);
$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['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/constants.php b/include/constants.php
index ccb2ecd34..be641fd10 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -25,8 +25,11 @@
// | USA. |
// +-----------------------------------------------------------------------+
-// Default Language
+// Default settings
define('DEFAULT_LANGUAGE', 'en_UK.iso-8859-1');
+define('PHPWG_VERSION', 'BSF');
+define('PHPWG_URL', 'http://www.phpwebgallery.net');
+define('PHPWG_FORUM_URL', 'http://forum.phpwebgallery.net');
// Debug Level
define('DEBUG', 1); // Debugging on
diff --git a/include/functions.inc.php b/include/functions.inc.php
index afd4f87b0..1e4cc44c7 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -277,7 +277,7 @@ function get_languages()
if (is_dir($path) and !is_link($path) and file_exists($path.'/iso.txt'))
{
list($language_name) = @file($path.'/iso.txt');
- $languages[$file] = $language_name;
+ $languages[$language_name] = $file;
}
}
closedir($dir);
@@ -354,16 +354,6 @@ function pwg_log( $file, $category, $picture = '' )
}
}
-function templatize_array( $array, $global_array_name, $handle )
-{
- global $vtp, $lang, $page, $user, $conf;
-
- foreach ( $array as $value ) {
- if (isset(${$global_array_name}[$value]))
- $vtp->setGlobalVar( $handle, $value, ${$global_array_name}[$value] );
- }
-}
-
// format_date returns a formatted date for display. The date given in
// argument can be a unixdate (number of seconds since the 01.01.1970) or an
// american format (2003-09-15). By option, you can show the time. The
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 4b456ca7b..4c68aa019 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -133,13 +133,15 @@ function style_select($default_style, $select_name = "style")
{
$templates = get_templates();
+ $style_selected = '<select name="' . $select_name . '" >';
foreach ($templates as $template)
{
$selected = ( $template == $default_style ) ? ' selected="selected"' : '';
- $style_select.= '<option value="'.$template.'"'.$selected.'>';
- $style_select.= $template.'</option>';
+ $style_selected.= '<option value="'.$template.'"'.$selected.'>';
+ $style_selected.= $template.'</option>';
}
- return $style_select;
+ $style_selected .= '</select>';
+ return $style_selected;
}
// The function get_cat_display_name returns a string containing the list
diff --git a/include/page_tail.php b/include/page_tail.php
index a31531fd1..bd8b726bf 100644
--- a/include/page_tail.php
+++ b/include/page_tail.php
@@ -33,7 +33,7 @@ $time = get_elapsed_time( $t2, get_moment() );
$template->assign_vars(
array(
'TIME' => $time,
- 'VERSION' => $conf['version'],
+ 'VERSION' => PHPWG_VERSION,
'MAIL'=>$conf['mail_webmaster'],
'L_GEN_TIME' => $lang['generation_time'],