diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 74934cbf0..60f26a45a 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -4,7 +4,7 @@ // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ @@ -230,24 +230,6 @@ function create_navigation_bar( return $navbar; } -// -// Pick a language, any language ... -// -function language_select($default, $select_name = "language") -{ - $available_lang = get_languages(); - - $lang_select = ''; - - return $lang_select; -} - /** * returns the list of categories as a HTML string * diff --git a/install.php b/install.php index 6e2566996..831ed98c2 100644 --- a/install.php +++ b/install.php @@ -4,8 +4,7 @@ // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) -// | file : $RCSfile$ +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ @@ -34,6 +33,24 @@ function guess_lang() return 'en_UK.iso-8859-1'; } +// +// Pick a language, any language ... +// +function language_select($default, $select_name = "language") +{ + $available_lang = get_languages(); + + $lang_select = ''; + + return $lang_select; +} + /** * loads an sql file and executes all queries * @@ -101,6 +118,26 @@ if( !get_magic_quotes_gpc() ) @reset($_POST); } + if( is_array($_GET) ) + { + while( list($k, $v) = each($_GET) ) + { + if( is_array($_GET[$k]) ) + { + while( list($k2, $v2) = each($_GET[$k]) ) + { + $_GET[$k][$k2] = addslashes($v2); + } + @reset($_GET[$k]); + } + else + { + $_GET[$k] = addslashes($v); + } + } + @reset($_GET); + } + if( is_array($_COOKIE) ) { while( list($k, $v) = each($_COOKIE) ) @@ -173,6 +210,10 @@ if ( isset( $_POST['language'] )) { $language = strip_tags($_POST['language']); } +elseif ( isset( $_GET['language'] )) +{ + $language = strip_tags($_GET['language']); +} else { $language = guess_lang(); diff --git a/template/yoga/install.tpl b/template/yoga/install.tpl index 2332910e2..76ab17782 100644 --- a/template/yoga/install.tpl +++ b/template/yoga/install.tpl @@ -7,145 +7,188 @@ PhpWebGallery {RELEASE} - - -
-
PhpWebGallery {RELEASE}
- - - - - - - - - - - - -
-
-
    - -
  • {errors.error.ERROR}
    • - -
-
-
-
-
    - -
  • {infos.info.INFO}
    • - -
-
-
+ + +
+
PhpWebGallery {RELEASE}
+ + + + + + + + + + + + +
+
+
    + +
  • {errors.error.ERROR}
    • + +
+
+
+
+
    + +
  • {infos.info.INFO}
    • + +
+
+
{L_ERR_COPY} :
-----------------------------------------------------
-
{error_copy.FILE_CONTENT}
+
{error_copy.FILE_CONTENT}
-----------------------------------------------------
- - +
+ - - - + + + - + - + - + - + - + @@ -153,50 +196,54 @@ text-align:center; - - - - + - + - + - + + + +
{L_BASE_TITLE}
{L_LANG_TITLE} - {F_LANG_SELECT} + {F_LANG_SELECT}
{L_DB_TITLE}
 
{L_DB_TITLE}
{L_DB_HOST} {L_DB_HOST_INFO}{L_DB_HOST_INFO}
{L_DB_USER} {L_DB_USER_INFO}{L_DB_USER_INFO}
{L_DB_PASS} {L_DB_PASS_INFO}{L_DB_PASS_INFO}
{L_DB_NAME} {L_DB_NAME_INFO}{L_DB_NAME_INFO}
{L_DB_PREFIX} {L_DB_PREFIX_INFO}{L_DB_PREFIX_INFO}
 
{L_ADMIN_TITLE}
 
{L_ADMIN} {L_ADMIN_INFO}{L_ADMIN_INFO}
{L_ADMIN_PASSWORD} {L_ADMIN_PASSWORD_INFO}{L_ADMIN_PASSWORD_INFO}
{L_ADMIN_CONFIRM_PASSWORD} {L_ADMIN_CONFIRM_PASSWORD_INFO}{L_ADMIN_CONFIRM_PASSWORD_INFO}
{L_ADMIN_EMAIL} {L_ADMIN_EMAIL_INFO}{L_ADMIN_EMAIL_INFO}
 
- +
 
-
{L_END_TITLE}
-
{L_END_MESSAGE}
+
+{L_END_TITLE} +
+
+{L_END_MESSAGE} +
-
{L_INSTALL_HELP}
+
{L_INSTALL_HELP}