MDL-14924 language autorefresh and starting to reimplement welcome.html support ...

diff --git a/install.php b/install.php
index 8fd14f21e8217d63e4e72fc0e4bf2fa39c6fdf1c..0892c464a3e21cba17ec9e806512734cc1fb8f52 100644 (file)
--- a/install.php
+++ b/install.php
@@ -442,6 +442,13 @@ if ($config->stage == INSTALL_ENVIRONMENT or $config->stage == INSTALL_PATHS) {
 
 
 
+if ($config->stage == INSTALL_DISTRIBUTION) {
+    // TODO: reimplement welcome.html support for win installer
+    $config->stage = INSTALL_PATHS;
+}
+
+
+
 if ($config->stage == INSTALL_PATHS) {
     $paths = array('wwwroot'  => get_string('wwwroot', 'install'),
                    'dirroot'  => get_string('dirroot', 'install'),
@@ -509,7 +516,7 @@ install_print_header($config, get_string('language'),
 $languages = install_get_list_of_languages();
 echo '<div class="userinput">';
 echo '<div class="formrow"><label class="formlabel" for="langselect">'.get_string('language').'</label>';
-echo '<select id="langselect" name="lang" class="forminput">';
+echo '<select id="langselect" name="lang" class="forminput" onchange="this.form.submit()">';
 foreach ($languages as $name=>$value) {
     $selected = ($name == $CFG->lang) ? 'selected="selected"' : '';
     echo '<option value="'.s($name).'" '.$selected.'>'.$value.'</option>';

diff --git a/install/stringnames.txt b/install/stringnames.txt
index d3947aa042ef73d4c50919c3506d3c818c8e12c9..c428f33cb5598baaedf15421441b86736a296bf9 100644 (file)
--- a/install/stringnames.txt
+++ b/install/stringnames.txt
@@ -1,134 +1,23 @@
-admindirerror
-admindirname
-admindirsettinghead
-admindirsettingsub
-bypassed
+admindir
 cannotcreatelangdir
-cannotcreatetempdir
 cannotdownloadcomponents
 cannotdownloadzipfile
 cannotfindcomponent
 cannotsavemd5file
 cannotsavezipfile
 cannotunzipfile
-caution
-check
 chooselanguagehead
 chooselanguagesub
-closewindow
-compatibility
-compatibilitysettingshead
-compatibilitysettingssub
-componentisuptodate
-configfilenotwritten
-configfilewritten
-configurationcompletehead
-configurationcompletesub
-continue
-ctyperecommended
-ctyperequired
-curlrecommended
-curlrequired
-customcheck
-database
-databasecreationsettingshead
-databasecreationsettingssub
-databasecreationsettingssub2
-databasesettings
-databasesettingshead
-databasesettingssub
-databasesettingssub_mssql
-databasesettingssub_mssql_n
-databasesettingssub_mysql
-databasesettingssub_mysqli
-databasesettingssub_oci8po
-databasesettingssub_odbc_mssql
-databasesettingssub_postgres7
-databasesettingswillbecreated
-databasetypehead
-databasetypesub
+environment
+errorsinenvironment
+environmentsub2
 dataroot
-datarooterror
-datarootpublicerror
-dbconnectionerror
-dbcreationerror
-dbhost
-dbprefix
-dbtype
-dbwrongencoding
-dbwronghostserver
-dbwrongnlslang
-dbwrongprefix
-directorysettingshead
-directorysettingssub
 dirroot
-dirrooterror
-download
-downloadedfilecheckfailed
-downloadlanguagebutton
-downloadlanguagehead
-downloadlanguagenotneeded
-downloadlanguagesub
-environment
-environmenterrortodo
-environmenthead
-environmentrecommendcustomcheck
-environmentrecommendinstall
-environmentrecommendversion
-environmentrequirecustomcheck
 environmentrequireinstall
 environmentrequireversion
-environmentsub
-environmentsub2
-environmentxmlerror
-error
-errorsinenvironment
-fail
-fileuploads
-fileuploadserror
-gdversion
-gdversionerror
-gdversionhelp
-globalsquotes
-globalsquoteserror
-globalswarning
-help
-iconvrecommended
-info
 installation
-invalidmd5
-langdownloaderror
-langdownloadok
 language
-magicquotesruntime
-magicquotesruntimeerror
-mbstringrecommended
-memorylimit
-memorylimiterror
-memorylimithelp
-missingrequiredfield
-moodledocslink
-mssql
-mssql_n
-mssqlextensionisnotpresentinphp
-mysql
-mysqli
-mysql416bypassed
-mysql416required
-mysqlextensionisnotpresentinphp
-mysqliextensionisnotpresentinphp
-name
-nativemysqli
-next
-oci8po
-ociextensionisnotpresentinphp
-odbc_mssql
-odbcextensionisnotpresentinphp
-ok
-opensslrecommended
 parentlanguage
-pass
-password
 paths
 pathsrodataroot
 pathshead
@@ -139,45 +28,11 @@ pathssubadmindir
 pathsunsecuredataroot
 pathswrongadmindir
 pathswrongdirroot
-pgsqlextensionisnotpresentinphp
-php50restricted
-php52versionerror
-php52versionhelp
 phpextension
 phpversion
-phpversionerror
-phpversionhelp
-postgres7
-prefixcannotbeempty
-prefixtoolong
-previous
-qtyperqpwillberemoved
-qtyperqpwillberemovedanyway
 reload
-remotedownloaderror
-remotedownloadnotallowed
-report
-requiredentrieschanged
-restricted
-safemode
-safemodeerror
-serverchecks
-sessionautostart
-sessionautostarterror
-skipdbencodingtest
-sqliteextensionisnotpresentinphp
-status
-this_direction
-tableprefix
 thischarset
-thisdirection
 thislanguage
-unicoderecommended
-unicoderequired
-upgradingactivitymodule
-upgradingbackupdb
-upgradingblocksdb
-user
 welcomep10
 welcomep20
 welcomep30
@@ -185,11 +40,4 @@ welcomep40
 welcomep50
 welcomep60
 welcomep70
-wrongdestpath
-wrongsourcebase
-wrongzipfilename
 wwwroot
-wwwrooterror
-yourchoice
-xmlrpcrecommended
-ziprequired

diff --git a/lib/installlib.php b/lib/installlib.php
index efc05d1a9b2e5a9c008179fe52271b96baf366f5..4797cb7d85288861922c6467e1db9901e457057f 100644 (file)
--- a/lib/installlib.php
+++ b/lib/installlib.php
@@ -5,12 +5,13 @@
  */
 
 define('INSTALL_WELCOME',       0);
-define('INSTALL_ENVIRONMENT', 1);
-define('INSTALL_PATHS',         2);
-define('INSTALL_DOWNLOADLANG',  3);
-define('INSTALL_DATABASETYPE',  4);
-define('INSTALL_DATABASE',      5);
-define('INSTALL_SAVE',          6);
+define('INSTALL_DISTRIBUTION',  1);
+define('INSTALL_ENVIRONMENT',   2);
+define('INSTALL_PATHS',         3);
+define('INSTALL_DOWNLOADLANG',  4);
+define('INSTALL_DATABASETYPE',  5);
+define('INSTALL_DATABASE',      6);
+define('INSTALL_SAVE',          7);
 
 /**
  *Tries to detect the right www root setting.
@@ -211,15 +212,22 @@ function install_print_footer($config, $reload=false) {
     global $CFG;
 
     if ($config->stage > INSTALL_WELCOME) {
-        $first = '<input type="submit" name="previous" value="&laquo; '.s(get_string('previous')).'" />';
+        $first = '<input type="submit" id="previousbutton" name="previous" value="&laquo; '.s(get_string('previous')).'" />';
     } else {
-        $first = '';
+        $first = '<input type="submit" id="previousbutton" name="next" value="'.s(get_string('reload', 'admin')).'" />';
+        $first .= '<script type="text/javascript">
+//<![CDATA[
+    var first = document.getElementById("previousbutton");
+    first.style.visibility = "hidden";
+//]]>
+</script>
+';
     }
 
     if ($reload) {
-        $next = '<input type="submit" name="next" value="'.s(get_string('reload', 'admin')).'" />';
+        $next = '<input type="submit" id="nextbutton" name="next" value="'.s(get_string('reload', 'admin')).'" />';
     } else {
-        $next = '<input type="submit" name="next" value="'.s(get_string('next')).' &raquo;" />';
+        $next = '<input type="submit" id="nextbutton" name="next" value="'.s(get_string('next')).' &raquo;" />';
     }
 
     echo '</fieldset><fieldset id="nav_buttons">'.$first.$next.'</fieldset>';
@@ -329,7 +337,7 @@ fieldset {
   width:95%;
 }
 
-.stage6 .stage {
+.stage7 .stage {
   font-weight: bold;
   color: red;
 }