MDL-17848 oops, yet more cron compatibility fixes for console_write() ;-) I have...

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index 4fb750a845340baeadeb208ee2bf7e50ee0dda7a..b75950d2fe43301e6386a8f5de2f4524b3801d82 100644 (file)
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -154,7 +154,7 @@ $args = Console_Getopt::readPHPArgv();
 
 //checking errors for argument fetching
 if (PEAR::isError($args)) {
-    console_write(STDOUT,'pearargerror','install');
+    console_write('pearargerror','install');
     die();
 }
 
@@ -173,8 +173,8 @@ if ( realpath($_SERVER['argv'][0]) == __FILE__ && count($args)>1) {
 
 //detect erros in the options
 if (PEAR::isError($console_opt)) {
-    console_write(STDOUT,'invalidargumenthelp');
-    console_write(STDOUT, "\n", '', false);
+    console_write('invalidargumenthelp');
+    console_write( "\n", '', false);
     die();
 }
 
@@ -184,8 +184,8 @@ $options=get_options($console_opt);
 // if user want help print the help without validating option values
 if (is_array($options)) {
     if(array_key_exists('help',$options)){
-        console_write(STDOUT,'usagehelp');
-        console_write(STDOUT, "\n", '', false);
+        console_write('usagehelp');
+        console_write( "\n", '', false);
         die ;
     }
 }
@@ -230,11 +230,11 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
     //welcome message
     if ($verbose > CLI_NO) {
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT,'welcometext','install');
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT, "\n", '', false);
+        console_write( "\n", '', false);
+        console_write( "\n", '', false);
+        console_write('welcometext','install');
+        console_write( "\n", '', false);
+        console_write( "\n", '', false);
     }
     //============================================================================//
     //Language selection for the installation
@@ -242,20 +242,20 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['lang'])) ) ) {
         $langs=get_installer_list_of_languages();
 
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT,'selectlanguage','install');
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT,'availablelangs','install');
-        console_write(STDOUT, "\n", '', false);
+        console_write( "\n", '', false);
+        console_write( "\n", '', false);
+        console_write('selectlanguage','install');
+        console_write( "\n", '', false);
+        console_write('availablelangs','install');
+        console_write( "\n", '', false);
         //output available languages
         foreach ( $langs as $language ) {
-            console_write(STDOUT,"\t",'',false);
-            console_write(STDOUT,$language,'',false);
-            console_write(STDOUT,"\n",'',false);
+            console_write("\t",'',false);
+            console_write($language,'',false);
+            console_write("\n",'',false);
         }
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT,'yourchoice','install');
+        console_write( "\n", '', false);
+        console_write('yourchoice','install');
         $short_code_langs = get_short_codes($langs);
 
         $INSTALL['lang']=read_element($short_code_langs);
@@ -269,9 +269,9 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
     if ($verbose == CLI_NO) {
         $silent=true;
     }else{
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT,'checkingphpsettings','install');
-        console_write(STDOUT, "\n", '', false);
+        console_write( "\n", '', false);
+        console_write('checkingphpsettings','install');
+        console_write( "\n", '', false);
     }
     /// Check that PHP is of a sufficient version
     check_compatibility(inst_check_php_version(), get_string('phpversion', 'install'), get_string('php52versionerror', 'install'),false,$silent);
@@ -298,28 +298,28 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
 
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['dirroot']) || !isset($INSTALL['wwwroot']) || !isset($INSTALL['dataroot']) ) ) ) {
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT,'locationanddirectories','install');
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT, "\n", '', false);
+        console_write( "\n", '', false);
+        console_write( "\n", '', false);
+        console_write('locationanddirectories','install');
+        console_write( "\n", '', false);
+        console_write( "\n", '', false);
     }
 
     //input the web directory
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['dirroot'])) ) ) {
-        console_write(STDOUT,'inputwebdirectory','install');
+        console_write('inputwebdirectory','install');
         //if directories validation lib is found change this to read_dir() and
         //edit read_dir() in lib/installlib.php to point to validation code
         $INSTALL['dirroot']=read();
     }
     //input the web adress
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['wwwroot'])) ) ) {
-        console_write(STDOUT,'inputwebadress','install');
+        console_write('inputwebadress','install');
         $INSTALL['wwwroot']=read_url();
     }
     //input data directory
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['dataroot'])) ) ) {
-        console_write(STDOUT,'inputdatadirectory','install');
+        console_write('inputdatadirectory','install');
         //if directories validation lib is found change this to read_dir() and
         //edit read_dir() in lib/installlib.php to point to validation code
         $INSTALL['dataroot']=read();
@@ -329,21 +329,21 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
     /// check wwwroot
     if (ini_get('allow_url_fopen') && false) {  /// This was not reliable
         if (($fh = @fopen($INSTALL['wwwroot']."/$CFG->admin/cliupgrade.php", 'r')) === false) {
-            console_write(STDERR,get_string('wwwrooterror'),'install',false);
+            console_write_error(get_string('wwwrooterror'),'install',false);
         }
     }
     if (isset($fh)) fclose($fh);
 
     /// check dirroot
     if (($fh = @fopen($INSTALL['dirroot']."/$CFG->admin/cliupgrade.php", 'r')) === false ) {
-        console_write(STDERR,get_string('dirrooterror'),'install',false);
+        console_write_error(get_string('dirrooterror'),'install',false);
     }
     if (isset($fh)) fclose($fh);
 
     /// check dataroot
     $CFG->dataroot = $INSTALL['dataroot'];
     if (make_upload_directory('sessions', false) === false ) {
-        console_write(STDERR,get_string('datarooterror'),'install',false);
+        console_write_error(get_string('datarooterror'),'install',false);
     }
 
     //================================================================================//
@@ -352,49 +352,49 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
     // Database section heading
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['dbhost']) || !isset($INSTALL['dbname']) || !isset($INSTALL['dbtype']) || !isset($INSTALL['dbuser']) ||  !isset($INSTALL['dbpass']) || !isset($INSTALL['prefix']) ) ) ) {
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT,'databasesettingsformoodle','install');
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT, "\n", '', false);
+        console_write( "\n", '', false);
+        console_write( "\n", '', false);
+        console_write('databasesettingsformoodle','install');
+        console_write( "\n", '', false);
+        console_write( "\n", '', false);
     }
 
     //Input dialogs
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['dbhost']) ))) {
-        console_write(STDOUT,'databasehost','install');
+        console_write('databasehost','install');
         $INSTALL['dbhost']=read(); // localhost
     }
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['dbname']) ))) {
-        console_write(STDOUT,'databasename','install');
+        console_write('databasename','install');
         $INSTALL['dbname']=read(); //'moodletest3';
     }
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['dbtype']) ))) {
         $dbtypes=array('mysql','oci8po','postgres7','mssql','mssql_n','odbc_mssql');
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT,'availabledbtypes','install');
-        console_write(STDOUT, "\n", '', false);
+        console_write( "\n", '', false);
+        console_write('availabledbtypes','install');
+        console_write( "\n", '', false);
         foreach ($dbtypes as $dbtype) {
-            console_write(STDOUT,"\t",'',false);
-            console_write(STDOUT,$dbtype,'install');
-            console_write(STDOUT,"\n",'',false);
+            console_write("\t",'',false);
+            console_write($dbtype,'install');
+            console_write("\n",'',false);
         }
 
-        console_write(STDOUT,'yourchoice','install');
+        console_write('yourchoice','install');
         $INSTALL['dbtype']=read_element($dbtypes);//'mysql';//
     }
 
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['dbuser']) ))) {
-        console_write(STDOUT,'databaseuser','install');
+        console_write('databaseuser','install');
         $INSTALL['dbuser']=read();//'root';
     }
 
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['dbpass']) ))) {
-        console_write(STDOUT,'databasepass','install');
+        console_write('databasepass','install');
         $INSTALL['dbpass']=read();//'';
     }
 
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['prefix']) ))) {
-        console_write(STDOUT,'tableprefix','install');
+        console_write('tableprefix','install');
         $INSTALL['prefix']=read();//'mdl_';//
     }
 
@@ -478,7 +478,7 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
     // check for errors in db section
     if (isset($errormsg)) {
-        console_write(STDERR,$errormsg,'',false);
+        console_write_error($errormsg,'',false);
     }
 
 
@@ -499,7 +499,7 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
     // check for errors in environment
     if (isset($errormsg)) {
-        console_write(STDERR,$errormsg,'',false);
+        console_write_error($errormsg,'',false);
     }
 
     // Print Environment Status
@@ -514,9 +514,9 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
     if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['downloadlangaugepack']) ))) {
         $site_langs=get_list_of_languages();
         if (!key_exists($INSTALL['lang'],$site_langs)) {
-            console_write(STDOUT, "\n", '', false);
-            console_write(STDOUT, "\n", '', false);
-            console_write(STDOUT,'downloadlanguagepack','install');
+            console_write( "\n", '', false);
+            console_write( "\n", '', false);
+            console_write('downloadlanguagepack','install');
             $download_lang_pack=read_yes_no();
             if($download_lang_pack == 'yes'){
 
@@ -524,7 +524,7 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
                 /// Create necessary lang dir
                 if (!make_upload_directory('lang', false)) {
-                    console_write(STDERR,get_string('cannotcreatelangdir','error'),false);
+                    console_write_error(get_string('cannotcreatelangdir','error'),false);
                 }
 
                 /// Download and install component
@@ -537,10 +537,10 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
                             $a = new stdClass();
                             $a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
                             $a->dest= $CFG->dataroot.'/lang';
-                            console_write(STDOUT,get_string($cd->get_error(), 'error', $a),false);
+                            console_write(get_string($cd->get_error(), 'error', $a),false);
                         } else {
                             $downloaderror = get_string($cd->get_error(), 'error');
-                            console_write(STDOUT,get_string($cd->get_error(), 'error'),false);
+                            console_write(get_string($cd->get_error(), 'error'),false);
                         }
                         break;
                         case UPTODATE:
@@ -561,7 +561,7 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
     if ( $verbose > CLI_NO && !empty($downloadsuccess)) {
         //print success message if language pack download is successful
-        console_write(STDOUT,'downloadsuccess');
+        console_write('downloadsuccess');
         print_newline();
     }
 
@@ -587,8 +587,8 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
 
     if ($verbose > CLI_NO) {
-        console_write(STDOUT,'creatingconfigfile','install');
-        console_write(STDOUT, "\n", '', false);
+        console_write('creatingconfigfile','install');
+        console_write( "\n", '', false);
     }
 
     $str  = '<?php  /// Moodle Configuration File '."\r\n";
@@ -628,40 +628,40 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
         fwrite($fh, $str);
         fclose($fh);
         if ($verbose > CLI_NO) {
-            console_write(STDOUT,'configfilecreated','install');
-            console_write(STDOUT, "\n", '', false);
+            console_write('configfilecreated','install');
+            console_write( "\n", '', false);
         }
     } else {
-        console_write(STDOUT,'configfilenotwritten','install');
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDOUT, "\n", '', false);
-        console_write(STDERR, $str, '', false);
+        console_write('configfilenotwritten','install');
+        console_write( "\n", '', false);
+        console_write( "\n", '', false);
+        console_write_error( $str, '', false);
     }
     if ( $verbose ) {
-        console_write(STDOUT,'installationiscomplete','install');
-        console_write(STDOUT, "\n", '', false);
+        console_write('installationiscomplete','install');
+        console_write( "\n", '', false);
     }
 }
 
 
 if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
     // This is what happens if there is no upgrade....
-    //console_write(STDERR,'configurationfileexist','install');
-    //console_write(STDOUT, "\n", '', false);
+    //console_write_error('configurationfileexist','install');
+    //console_write( "\n", '', false);
     //die;
 
 
 
     // If the configuration file does not exists exit, this should never occur !!
     if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
-        console_write(STDERR,'configfiledoesnotexist','install');
+        console_write_error('configfiledoesnotexist','install');
     }
 
     /// Check that PHP is of a sufficient version
     /// Moved here because older versions do not allow while(@ob_end_clean());
     if (version_compare(phpversion(), "5.2.4") < 0) {
         $phpversion = phpversion();
-        console_write(STDERR,"Sorry, Moodle requires PHP 5.2.4 or later (currently using version $phpversion)",'',false);
+        console_write_error("Sorry, Moodle requires PHP 5.2.4 or later (currently using version $phpversion)",'',false);
     }
     /// Turn off time limits and try to flush everything all the time, sometimes upgrades can be slow.
 
@@ -684,22 +684,22 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
     ///check PHP Settings
     if (ini_get_bool('session.auto_start')) {
-        console_write(STDERR,"The PHP server variable 'session.auto_start' should be Off ",'',false);
+        console_write_error("The PHP server variable 'session.auto_start' should be Off ",'',false);
     }
 
     if (ini_get_bool('magic_quotes_runtime')) {
-        console_write(STDERR,"The PHP server variable 'magic_quotes_runtime' should be Off ",'',false);
+        console_write_error("The PHP server variable 'magic_quotes_runtime' should be Off ",'',false);
     }
 
     if (!ini_get_bool('file_uploads')) {
 
-        console_write(STDERR,"The PHP server variable 'file_uploads' is not turned On" ,'',false);
+        console_write_error("The PHP server variable 'file_uploads' is not turned On" ,'',false);
     }
 
     /// Check that config.php has been edited
 
     if ($CFG->wwwroot == "http://example.com/moodle") {
-        console_write(STDERR,"Moodle has not been configured yet.  You need to edit config.php first.",'',false);
+        console_write_error("Moodle has not been configured yet.  You need to edit config.php first.",'',false);
     }
 
 
@@ -707,7 +707,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
     $dirroot = dirname(realpath("../index.php"));
     if (!empty($dirroot) and $dirroot != $CFG->dirroot) {
-        console_write(STDERR,"Please fix your settings in config.php:
+        console_write_error("Please fix your settings in config.php:
               \nYou have:
               \n\$CFG->dirroot = \"".addslashes($CFG->dirroot)."\";
               \nbut it should be:
@@ -729,7 +729,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
     }
 
     if (!$version or !$release) {
-        console_write(STDERR,'Main version.php was not readable or specified','',false);# without version, stop
+        console_write_error('Main version.php was not readable or specified','',false);# without version, stop
     }
 
 
@@ -765,11 +765,11 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
         if ( $interactive == CLI_FULL || ($interactive == CLI_SEMI && (!isset($INSTALL['agreelicense']) || empty($INSTALL['agreelicense']))) ) {
             //Print copyright notice and ask to continue
-            console_write(STDOUT,get_string('copyrightnotice'),'',false);
+            console_write(get_string('copyrightnotice'),'',false);
             print_newline();
-            console_write(STDOUT,get_string('gpl'),'',false);
+            console_write(get_string('gpl'),'',false);
             print_newline();
-            console_write(STDOUT,'doyouagree','install',true);
+            console_write('doyouagree','install',true);
             $agreelicense = read_boolean();
         }
 
@@ -778,15 +778,15 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
         }
 
         if (!$agreelicense) {
-            console_write(STDERR,'disagreelicense');
+            console_write_error('disagreelicense');
         }
 
         if ( $interactive == CLI_FULL || ( $interactive == CLI_SEMI && (!isset($INSTALL['confirmrelease']) || empty($INSTALL['confirmrelease'])))) {
-            console_write(STDOUT,get_string("currentrelease"),'',false);
+            console_write(get_string("currentrelease"),'',false);
             print_newline();
-            console_write(STDOUT,"Moodle $release",'',false);
+            console_write("Moodle $release",'',false);
             print_newline();
-            console_write(STDOUT,'askcontinue');
+            console_write('askcontinue');
             $confirmrelease = read_boolean();
         }
 
@@ -794,7 +794,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
             $confirmrelease = $DEFAULT['confirmrelease'];
         }
         if (!$confirmrelease) {
-            console_write(STDERR,'versionerror');
+            console_write_error('versionerror');
         }
         $autopilot = 1 ;
 
@@ -813,7 +813,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
         if (!$DB->setup_is_unicodedb()) {
             if (!$DB->change_db_encoding()) {
                 // If could not convert successfully, throw error, and prevent installation
-                console_write(STDERR,'unicoderequired', 'admin');
+                console_write_error('unicoderequired', 'admin');
             }
         }
 
@@ -883,9 +883,9 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
                 if ( $interactive == CLI_FULL || ($interactive == CLI_SEMI && !isset($INSTALL['confirmupgrade']))) {
                     print_newline();
-                    console_write(STDOUT,$strdatabasechecking,'',false);
+                    console_write($strdatabasechecking,'',false);
                     print_newline();
-                    console_write(STDOUT,'askcontinue');
+                    console_write('askcontinue');
                     $confirmupgrade = read_boolean();
                 }
             }
@@ -893,34 +893,34 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
                 if ( $interactive == CLI_FULL || ($interactive == CLI_SEMI && !isset($INSTALL['confirmrelease']))) {
                     $strcurrentrelease = get_string("currentrelease");
-                    console_write(STDOUT,$strcurrentrelease,'',false);
+                    console_write($strcurrentrelease,'',false);
                     print_newline();
-                    console_write(STDOUT,"Moodle $release",'',false);
+                    console_write("Moodle $release",'',false);
                     print_newline();
-                    console_write(STDOUT,get_string('releasenoteslink', 'install', 'http://docs.moodle.org/en/Release_Notes'),'',false);
+                    console_write(get_string('releasenoteslink', 'install', 'http://docs.moodle.org/en/Release_Notes'),'',false);
                     print_newline();
-                    console_write(STDOUT,'askcontinue');
+                    console_write('askcontinue');
                     $confirmrelease = read_boolean();
                 }
                 require_once($CFG->libdir.'/environmentlib.php');
 
-                console_write(STDOUT,'environment', 'admin');
+                console_write('environment', 'admin');
                 if (!check_moodle_environment($release, $environment_results, false)) {
                     // Print Environment Status
                     if ($verbose > CLI_NO) {
                         print_newline();
                         print_environment_status_detailed($environment_results);
                         print_newline();
-                        console_write(STDOUT,'environmenterrorupgrade', 'admin');
+                        console_write('environmenterrorupgrade', 'admin');
                     }
                     if(!read_boolean()){
-                        console_write(STDERR,'','',false);
+                        console_write_error('','',false);
                     }
                 } else {
 
                     if ( $interactive == CLI_FULL || ($interactive == CLI_SEMI && !isset($INSTALL['autopilot']))) {
-                        console_write(STDOUT,'environmentok', 'admin');
-                        console_write(STDOUT,'unattendedoperation','admin');
+                        console_write('environmentok', 'admin');
+                        console_write('unattendedoperation','admin');
                         $autopilot = read_boolean();
                     }
                 }
@@ -939,7 +939,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
             upgrade_language_pack();
 
             if ( $verbose > CLI_NO ) {
-                console_write(STDOUT,$strdatabasechecking,'',false);
+                console_write($strdatabasechecking,'',false);
             }
 
             /// Launch the old main upgrade (if exists)
@@ -955,18 +955,18 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
             /// If successful, continue upgrading roles and setting everything properly
             if ($status) {
                 if (!update_capabilities()) {
-                    console_write(STDERR,'Had trouble upgrading the core capabilities for the Roles System','',false);
+                    console_write_error('Had trouble upgrading the core capabilities for the Roles System','',false);
                 }
                 if (set_config("version", $version)) {
                     remove_dir($CFG->dataroot . '/cache', true); // flush cache
                     notify($strdatabasesuccess, "green");
                     /// print_continue("upgradesettings.php");
                 } else {
-                    console_write(STDERR,'Upgrade failed!  (Could not update version in config table)','',false);
+                    console_write_error('Upgrade failed!  (Could not update version in config table)','',false);
                 }
                 /// Main upgrade not success
             } else {
-                console_write(STDERR,'Main Upgrade failed!  See lib/db/upgrade.php','',false);
+                console_write_error('Main Upgrade failed!  See lib/db/upgrade.php','',false);
 
             }
             upgrade_log_finish();
@@ -978,7 +978,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
         }
     } else {
         if (!set_config("version", $version)) {
-            console_write(STDERR,"A problem occurred inserting current version into databases",'',false);
+            console_write_error("A problem occurred inserting current version into databases",'',false);
         }
     }
 
@@ -1073,31 +1073,31 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
         require_once($CFG->libdir.'/blocklib.php');
 
         if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( (!isset($INSTALL['sitefullname'])) || (!isset($INSTALL['siteshortname'])) || (!isset($INSTALL['sitesummary'])) || (!isset($INSTALL['sitenewsitems'])) )) ) {
-            console_write(STDOUT,'siteinfo');
+            console_write('siteinfo');
             print_newline();
         }
 
         if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['sitefullname'])) ) ) {
-            console_write(STDOUT,'sitefullname');
+            console_write('sitefullname');
             $sitefullname = read();
         } else if (isset($INSTALL['sitefullname'])) {
             $sitefullname = $INSTALL['sitefullname'];
         }
 
         if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['siteshortname'])) ) ) {
-            console_write(STDOUT,'siteshortname');
+            console_write('siteshortname');
             $siteshortname = read();
         } else if (isset($INSTALL['siteshortname'])) {
             $siteshortname = $INSTALL['siteshortname'];
         }
         if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['sitesummary'])) ) ) {
-            console_write(STDOUT,'sitesummary');
+            console_write('sitesummary');
             $sitesummary =read();
         } else if (isset($INSTALL['sitesummary'])) {
             $sitesummary = $INSTALL['sitesummary'];
         }
         if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['sitenewsitems'])) ) ) {
-            console_write(STDOUT,'sitenewsitems');
+            console_write('sitenewsitems');
             $sitenewsitems = read_int();
         } else if (isset($INSTALL['sitenewsitems'])) {
             $sitenewsitems = $INSTALL['sitenewsitems'];
@@ -1157,12 +1157,12 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
         // If full interactive or semi interactive with at least one option is not set print the admininfo message
         if ( ($interactive == CLI_FULL) || ($interactive == CLI_SEMI && (!isset($INSTALL['adminfirstname']) || !isset($INSTALL['adminlastname']) || !isset($INSTALL['adminusername']) || !isset($INSTALL['adminpassword']) || !isset($INSTALL['adminemail']) ))) {
-            console_write(STDOUT,'admininfo');
+            console_write('admininfo');
             print_newline();
         }
         // Assign the first name
         if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['adminfirstname'])) ) ) {
-            console_write(STDOUT,'adminfirstname');
+            console_write('adminfirstname');
             $adminfirstname = read();
         } else if (isset($INSTALL['adminfirstname'])) {
             $adminfirstname = $INSTALL['adminfirstname'];
@@ -1170,7 +1170,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
         // Assign the last name
         if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['adminlastname'])) ) ) {
-            console_write(STDOUT,'adminlastname');
+            console_write('adminlastname');
             $adminlastname = read();
         } else if (isset($INSTALL['adminlastname'])) {
             $adminlastname = $INSTALL['adminlastname'];
@@ -1178,7 +1178,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
         // Assign user name
         if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['adminusername'])) ) ) {
-            console_write(STDOUT,'adminusername');
+            console_write('adminusername');
             $adminusername = read();
         } else if (isset($INSTALL['adminusername'])) {
             $adminusername = $INSTALL['adminusername'];
@@ -1186,7 +1186,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
         // Assign password
         if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['adminpassword'])) ) ) {
-            console_write(STDOUT,'adminpassword');
+            console_write('adminpassword');
             $adminpassword = read();
         } else if (isset($INSTALL['adminpassword'])) {
             $adminpassword = $INSTALL['adminpassword'];
@@ -1194,7 +1194,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
         // Assign email
         if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( !isset($INSTALL['adminemail'])) ) ) {
-            console_write(STDOUT,'adminemail');
+            console_write('adminemail');
             $adminemail = read();
         } else if (isset($INSTALL['adminemail'])) {
             $adminemail = $INSTALL['adminemail'];
@@ -1234,8 +1234,8 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
     }
     if ( $verbose > CLI_NO ) {
         print_newline();
-        console_write(STDOUT,'upgradingcompleted');
-        console_write(STDOUT, "\n", '', false);
+        console_write('upgradingcompleted');
+        console_write( "\n", '', false);
     }
 }
 

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 7c770ca137ed653114ae7f0fd5e8e852dc6584f4..165e3af497bf81c93cf0dc455740802335ad9a1e 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -985,11 +985,11 @@ function upgrade_plugins($type, $dir, $return) {
             print_footer('none');
             die;
         } else if (CLI_UPGRADE && ($interactive > CLI_SEMI )) {
-            console_write(STDOUT,'askcontinue');
+            console_write('askcontinue');
             if (read_boolean()){
                 return ;
             } else {
-                console_write(STDERR,'','',false);
+                console_write_error('','',false);
             }
         }
     }
@@ -1235,11 +1235,11 @@ function upgrade_activity_modules($return) {
             print_footer('none');
             die;
         } else if ( CLI_UPGRADE && ($interactive > CLI_SEMI) ) {
-            console_write(STDOUT,'askcontinue');
+            console_write('askcontinue');
             if (read_boolean()){
                 return ;
             }else {
-                console_write(STDERR,'','',false);
+                console_write_error('','',false);
             }
         }
     }

diff --git a/lib/blocklib.php b/lib/blocklib.php
index 0c090d6fd6605f709298712fb423a76b438aed25..ad32e7a6bff5e974a6155bac285a02234169176d 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -1105,11 +1105,11 @@ function upgrade_blocks_db($continueto) {
                 print_footer('none');
                 exit;
                 } else if (CLI_UPGRADE && ($interactive > CLI_SEMI) ) {
-                    console_write(STDOUT,'askcontinue');
+                    console_write('askcontinue');
                     if (read_boolean()){
                         return ;
                     }else {
-                        console_write(STDERR,'','',false);
+                        console_write_error('','',false);
                     }
                 }
             } else {
@@ -1457,11 +1457,11 @@ function upgrade_blocks_plugins($continueto) {
         print_footer('none');
         die;
         } else if ( CLI_UPGRADE && ($interactive > CLI_SEMI) ) {
-            console_write(STDOUT,'askcontinue');
+            console_write('askcontinue');
             if (read_boolean()){
                 return ;
             }else {
-                console_write(STDERR,'','',false);
+                console_write_error('','',false);
             }
         }
     }

diff --git a/lib/clilib.php b/lib/clilib.php
index 3467d0c4cae3790eee32d162b4f24c1126218b6b..78f05518ec0efefdb19e5b5c9ac0e75793d49a85 100644 (file)
--- a/lib/clilib.php
+++ b/lib/clilib.php
@@ -206,8 +206,8 @@ function validate_option_values($options){
     }
     if (isset($values['lang'])) {
         if (!valid_language($values['lang'])) {
-            console_write(STDERR,'invalidvalueforlanguage');
-        console_write(STDOUT, "\n", '', false);
+            console_write_error('invalidvalueforlanguage');
+        console_write( "\n", '', false);
         }
     }
     if (isset($values['webdir'])) {
@@ -233,7 +233,7 @@ function validate_option_values($options){
     if (isset($values['dbtype'])) {
         $dbtypes=array('mysql','oci8po','postgres7','mssql','mssql_n','odbc_mssql');
         if (!in_array($values['dbtype'],$dbtypes)) {
-            console_write(STDERR,'invaliddbtype');
+            console_write_error('invaliddbtype');
         }
     }
     if (isset($values['dbhost'])) {
@@ -308,12 +308,12 @@ function validate_option_values($options){
     }
     if (isset($values['verbose'])) {
         if(!valid_int_range($values['verbose'],CLI_NO,CLI_FULL)){
-            console_write(STDERR,'invalidverbosevalue');
+            console_write_error('invalidverbosevalue');
         }
     }
     if (isset($values['interactivelevel'])) {
         if(!valid_int_range($values['verbose'],CLI_NO,CLI_FULL)){
-            console_write(STDERR,'invalidinteractivevalue');
+            console_write_error('invalidinteractivevalue');
         }
     }
 
@@ -324,25 +324,6 @@ function validate_option_values($options){
     }
 }
 //=========================================================================//
-/**
- * Write to standard out and error with exit in error
- *
- * @param standard out/err $stream
- * @param string  $identifier
- * @param name of module $module
- */
-function console_write($stream,$identifier,$module='install',$use_string_lib=true) {
-    if ($use_string_lib) {
-        fwrite($stream,get_string($identifier,$module));
-    } else {
-        fwrite($stream,$identifier);
-    }
-    if ($stream == STDERR) {
-        fwrite($stream, "\n\n" . get_string('aborting',$module) . "\n\n");
-        die;
-    }
-}
-//=========================================================================//
 /**
  * Read a mixed type
  *
@@ -364,8 +345,8 @@ function read_int() {
     if (valid_param($input,PARAM_INT)) {
         return $input;
     } else {
-        console_write(STDERR,'invalidint');
-        console_write(STDOUT, "\n", '', false);
+        console_write_error('invalidint');
+        console_write( "\n", '', false);
     }
 }
 //=========================================================================//
@@ -381,8 +362,8 @@ function read_int_range($start,$end) {
     if (valid_int_range($input,$start,$end)) {
         return $input;
     } else {
-        console_write(STDERR,'invalidintrange');
-        console_write(STDOUT, "\n", '', false);
+        console_write_error('invalidintrange');
+        console_write( "\n", '', false);
     }
 
 }
@@ -401,8 +382,8 @@ function read_yes_no() {
             return 'no';
         }
     } else {
-        console_write(STDERR,'invalidyesno');
-        console_write(STDOUT, "\n", '', false);
+        console_write_error('invalidyesno');
+        console_write( "\n", '', false);
     }
 }
 
@@ -429,8 +410,8 @@ function read_element($set=array()) {
     if (valid_element($input,$set)) {
         return $input;
     } else {
-        console_write(STDERR,'invalidsetelement');
-        console_write(STDOUT, "\n", '', false);
+        console_write_error('invalidsetelement');
+        console_write( "\n", '', false);
     }
 }
 //=========================================================================//
@@ -448,7 +429,7 @@ function read_url() {
             return  $input;
         }
     } else {
-        console_write(STDERR,'invalidurl');
+        console_write_error('invalidurl');
     }
 
 }
@@ -476,22 +457,22 @@ function read_dir() {
 function check_compatibility($success, $testtext,$errormessage,$caution=false,$silent=false) {
     if ($success) {
         if (!$silent) {
-            console_write(STDOUT,get_string('pass', 'install'),'',false);
+            console_write(get_string('pass', 'install'),'',false);
         }
     } else {
         if ($caution) {
             if (!$silent) {
-                console_write(STDOUT,get_string('caution', 'install'),'',false);
+                console_write(get_string('caution', 'install'),'',false);
             }
         } else {
-            console_write(STDOUT,get_string('fail', 'install'),'',false);
-            console_write(STDERR,$errormessage,'',false);
+            console_write(get_string('fail', 'install'),'',false);
+            console_write_error($errormessage,'',false);
         }
     }
     if (!$silent) {
-        console_write(STDOUT,"\t\t",'',false);
-        console_write(STDOUT,$testtext,'',false);
-        console_write(STDOUT,"\n",'',false);
+        console_write("\t\t",'',false);
+        console_write($testtext,'',false);
+        console_write("\n",'',false);
     }
     return $success;
 }
@@ -503,23 +484,23 @@ function check_compatibility($success, $testtext,$errormessage,$caution=false,$s
  * @param array $env, of type object
  */
 function print_environment_status($env = array()) {
-    console_write(STDOUT, get_string('name') . "\t\t\t" . get_string('info') . "\t" . get_string('status') . "\n\r", '', false);
-    //console_write(STDOUT,"Status\t\tInfo\t\tPart\n\r",'',false);
+    console_write( get_string('name') . "\t\t\t" . get_string('info') . "\t" . get_string('status') . "\n\r", '', false);
+    //console_write("Status\t\tInfo\t\tPart\n\r",'',false);
     foreach ( $env as  $object) {
-        console_write(STDOUT,$object->part,'',false);
-        console_write(STDOUT,"\t\t",'',false);
+        console_write($object->part,'',false);
+        console_write("\t\t",'',false);
         if (!empty($object->info)) {
-            console_write(STDOUT, $object->info, '', false);
+            console_write( $object->info, '', false);
         } else {
-            console_write(STDOUT, "\t", '', false);
+            console_write( "\t", '', false);
         }
-        console_write(STDOUT, "\t\t", '', false);
+        console_write( "\t\t", '', false);
         if ($object->status == 1 ) {
-            console_write(STDOUT,'ok','',false);
+            console_write('ok','',false);
         } else {
-            console_write(STDOUT,'fail','',false);
+            console_write('fail','',false);
         }
-        console_write(STDOUT,"\n\r",'',false);
+        console_write("\n\r",'',false);
     }
 }
 
@@ -529,27 +510,27 @@ function print_environment_status($env = array()) {
  * @param array $env, of type object
  */
 function print_environment_status_detailed($env = array()) {
-    console_write(STDOUT,"Status\t\tLevel\t\tCurrent ver\tRequired ver\t\tPart\t\tInfo\n\r",'',false);
+    console_write("Status\t\tLevel\t\tCurrent ver\tRequired ver\t\tPart\t\tInfo\n\r",'',false);
     foreach ( $env as  $object) {
 
         if ($object->status == 1 ) {
-            console_write(STDOUT,'ok ','',false);
+            console_write('ok ','',false);
         } else if ($object->errorcode != 0) {
-            console_write(STDOUT,'fail ','',false);
+            console_write('fail ','',false);
         } else {
-            console_write(STDOUT,'----','',false);
+            console_write('----','',false);
         }
-        console_write(STDOUT,"\t\t",'',false);
-        console_write(STDOUT,$object->level,'',false);
-        console_write(STDOUT,"\t\t",'',false);
-        console_write(STDOUT,$object->current_version,'',false);
-        console_write(STDOUT,"\t",'',false);
-        console_write(STDOUT,$object->needed_version,'',false);
-        console_write(STDOUT,"\t\t",'',false);
-        console_write(STDOUT,$object->part,'',false);
-        console_write(STDOUT,"\t\t",'',false);
-        console_write(STDOUT,$object->info,'',false);
-        console_write(STDOUT,"\n\r",'',false);
+        console_write("\t\t",'',false);
+        console_write($object->level,'',false);
+        console_write("\t\t",'',false);
+        console_write($object->current_version,'',false);
+        console_write("\t",'',false);
+        console_write($object->needed_version,'',false);
+        console_write("\t\t",'',false);
+        console_write($object->part,'',false);
+        console_write("\t\t",'',false);
+        console_write($object->info,'',false);
+        console_write("\n\r",'',false);
     }
 }
 /**
@@ -558,6 +539,6 @@ function print_environment_status_detailed($env = array()) {
  */
 
 function print_newline() {
-    console_write(STDOUT, "\n", '', false);
+    console_write( "\n", '', false);
 }
 ?>

diff --git a/lib/locallib.php b/lib/locallib.php
index 03ce475ceff105c827ae7422d7865a1b2fb116b7..34ca6cea3874e7ad4a05ab5ae0c0acd1fde62477 100644 (file)
--- a/lib/locallib.php
+++ b/lib/locallib.php
@@ -154,11 +154,11 @@ function upgrade_local_db($continueto) {
                 print_footer('none');
                 exit;
                 } else if (CLI_UPGRADE && ($interactive > CLI_SEMI) ) {
-                    console_write(STDOUT,'askcontinue');
+                    console_write('askcontinue');
                     if (read_boolean()){
                         return ;
                     }else {
-                        console_write(STDERR,'','',false);
+                        console_write_error('','',false);
                     }
                 }
             } else {

diff --git a/lib/weblib.php b/lib/weblib.php
index bedfb5d50438464ebdfbe89861ec8b176d877895..45664d88470ba2b6db3bf7ae7fca34eba62905c9 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2248,7 +2248,7 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
         if ($return) {
             return $output;
         } else {
-            console_write(STDOUT,$output . "\n",'',false);
+            console_write($output . "\n",'',false);
             return;
         }
     }
@@ -3845,8 +3845,7 @@ function print_heading($text, $align='', $size=2, $class='main', $return=false,
         if (!CLI_SCRIPT) {
             echo $output;
         } else {
-            console_write(STDOUT,$output,'',false);
-            print_newline();
+            console_write($output."\n", '', false);
         }
     }
 }
@@ -6210,8 +6209,7 @@ function notify($message, $style='notifyproblem', $align='center', $return=false
     if (!CLI_SCRIPT) {
         echo $output;
     } else {
-        console_write(STDOUT,$output,'',false);
-        print_newline();
+        console_write($output."\n", '', false);
     }
 }
 
@@ -7091,6 +7089,64 @@ function is_in_popup() {
 
     return ($inpopup);
 }
+
+//=========================================================================//
+/**
+ * Write to standard out and error with exit in error.
+ *
+ * @param standard out/err $stream
+ * @param string  $identifier
+ * @param name of module $module
+ */
+function console_write($identifier, $module='install', $use_string_lib=true) {
+    if (!isset($_SERVER['REMOTE_ADDR'])) {
+        // real CLI script
+        if ($use_string_lib) {
+            fwrite(STDOUT, get_string($identifier, $module));
+        } else {
+            fwrite(STDOUT, $identifier);
+        }
+    } else {
+        // emulated cli script - something like cron
+        if ($use_string_lib) {
+            echo get_string($identifier, $module);
+        } else {
+            echo $identifier;
+        }
+    }
+}
+
+//=========================================================================//
+/**
+ * Write to standard out and error with exit in error.
+ *
+ * @param standard out/err $stream
+ * @param string  $identifier
+ * @param name of module $module
+ */
+function console_write_error($identifier, $module='install', $use_string_lib=true) {
+    if (!isset($_SERVER['REMOTE_ADDR'])) {
+        // real CLI script
+        if ($use_string_lib) {
+            fwrite(STDERR, get_string($identifier, $module));
+        } else {
+            fwrite(STDERR, $identifier);
+        }
+        fwrite(STDERR, "\n\n".get_string('aborting', $module)."\n\n");
+    } else {
+        // emulated cli script - something like cron
+        if ($use_string_lib) {
+            echo get_string($identifier, $module);
+        } else {
+            echo $identifier;
+        }
+        echo "\n\n".get_string('aborting', $module)."\n\n";
+    }
+
+    die; die; die;
+}
+
+
 class progress_bar {
     private $html_id;
     private $percent;