diff options
| -rw-r--r-- | include/constants.php | 3 | ||||
| -rw-r--r-- | include/functions_user.inc.php | 4 | ||||
| -rw-r--r-- | include/user.inc.php | 3 | ||||
| -rw-r--r-- | install.php | 7 | ||||
| -rw-r--r-- | install/config.sql | 2 |
5 files changed, 11 insertions, 8 deletions
diff --git a/include/constants.php b/include/constants.php index fb647d8b3..3ac5816f4 100644 --- a/include/constants.php +++ b/include/constants.php @@ -25,6 +25,9 @@ // | USA. | // +-----------------------------------------------------------------------+ +// Default Language +define('DEFAULT_LANGUAGE', 'en_UK.iso-8859-1'); + // Debug Level define('DEBUG', 1); // Debugging on //define('DEBUG', 0); // Debugging off diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index 0e1f8a628..5af68ad4e 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -218,7 +218,7 @@ function init_userprefs($userdata) if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php')) ) { - $language = 'en_EN'; + $language = DEFAULT_LANGUAGE; } include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php'); @@ -227,7 +227,7 @@ function init_userprefs($userdata) { if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language. '/admin.lang.php')) ) { - $language = 'en_EN'; + $language = DEFAULT_LANGUAGE; } include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/admin.lang.php'); } diff --git a/include/user.inc.php b/include/user.inc.php index 65222f3f6..05b91d738 100644 --- a/include/user.inc.php +++ b/include/user.inc.php @@ -35,8 +35,7 @@ $infos = array( 'id', 'username', 'mail_address', 'nb_image_line', 'maxheight', 'expand', 'show_nb_comments', 'recent_period', 'template', 'forbidden_categories' ); -$query_user = 'SELECT '.implode( ',', $infos ); -$query_user.= ' FROM '.USERS_TABLE; +$query_user = 'SELECT * FROM '.USERS_TABLE; $query_done = false; $user['is_the_guest'] = false; diff --git a/install.php b/install.php index 924ce8ffa..4fc7b4d02 100644 --- a/install.php +++ b/install.php @@ -31,6 +31,7 @@ define('PHPWG_ROOT_PATH','./'); // Guess an initial language ... function guess_lang() { + return 'en_UK.iso-8859-1'; global $_SERVER; $languages = array(); $i = 0; @@ -255,11 +256,11 @@ if ( isset( $_POST['install'] )) @fclose($fp); // tables creation, based on phpwebgallery_structure.sql - execute_sqlfile( './install/phpwebgallery_structure.sql' + execute_sqlfile( PHPWG_ROOT_PATH.'install/phpwebgallery_structure.sql' , 'phpwebgallery_' , $table_prefix ); // We fill the tables with basic informations - execute_sqlfile( './install/config.sql' + execute_sqlfile( PHPWG_ROOT_PATH.'install/config.sql' , 'phpwebgallery_' , $table_prefix ); @@ -282,7 +283,7 @@ if ( isset( $_POST['install'] )) mysql_query( $query ); $query = 'INSERT INTO '.SITES_TABLE; - $query.= " (id,galleries_url) VALUES (1, './galleries/');"; + $query.= " (id,galleries_url) VALUES (1, ".PHPWG_ROOT_PATH."'galleries/');"; mysql_query( $query ); // webmaster admin user diff --git a/install/config.sql b/install/config.sql index 9cf500ab4..f23f29ff6 100644 --- a/install/config.sql +++ b/install/config.sql @@ -3,7 +3,7 @@ INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('prefix_thumbnail','TN-','thumbnails filename prefix'); INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('webmaster','','webmaster login'); INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('mail_webmaster','','webmaster mail'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_lang','en_EN','Default gallery language'); +INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_lang','en_UK.iso-8859-1','Default gallery language'); INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_style','default','Default gallery style'); INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('access','free','access type to your gallery (free|restricted)'); INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('session_id_size','4','length of session identifiers'); |