Bumped to 1.6.8

Backporting MDL-15896 (tabs and recent activity) from HEAD
Protect message settings with sesskey. MDL-16688 ; backported from 17_STABLE
2008-10-15 23:36:15 +00:00 · 2008-09-26 09:48:24 +00:00 · 2008-09-25 22:39:23 +00:00 · 2008-09-20 20:40:19 +00:00 · 2008-09-20 20:19:55 +00:00 · 2008-08-15 03:13:49 +00:00
532 changed files with 26076 additions and 66388 deletions
@@ -3,6 +3,8 @@

    require_once('../config.php');

+    $installing = optional_param('installing', 0, PARAM_BOOL);
+
    $focus = '';

    if ($site = get_site()) {   // If false then this is a new installation
@@ -46,7 +48,10 @@
                        $value = implode(',',$value);
                    }
                }
-                unset($conf);
+                if ($name == "locale") {
+                    $value = trim($value);
+                }
+                $conf = new object();
                $conf->name  = $name;
                $conf->value = $value;
                if ($current = get_record('config', 'name', $name)) {
@@ -60,8 +65,16 @@
                    }
                }
            }
-            redirect('index.php', get_string('changessaved'), 1);
-            exit;
+            if ($installing) {
+                print_header();
+                notify(get_string('changessaved'), 'notifysuccess');
+                print_continue('index.php');
+                exit;
+            } else {
+                // the following redirect was randomly breaking upgrades because it did double redirects,
+                // we must not use it during install/upgrade
+                redirect('index.php', get_string('changessaved'), 1);
+            }

        } else {
            foreach ($err as $key => $value) {
@@ -74,9 +87,6 @@

    if (empty($config)) {
        $config = $CFG;
-        if (!$config->locale = get_field('config', 'value', 'name', 'locale')) {
-            $config->locale = $CFG->lang;
-        }
    }

    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
@@ -143,6 +153,7 @@

    }
    echo '<center>';
+    echo '<input type="hidden" name="installing" value="'.$installing.'" />';
    echo '<input type="hidden" name="sesskey" value="'.$sesskey.'" />';
    echo '<input type="submit" value="'.get_string('savechanges').'" />';
    echo '</center>';
@@ -69,7 +69,7 @@ class configvar {

 /// debug
    unset($options);
-    $options[7]  = $strno;
+    $options[5]  = $strno;
    $options[15] = $stryes;

    $misc['debug'] = new configvar (get_string('configdebug', 'admin'),
@@ -312,10 +312,10 @@ class configvarrss extends configvar {
 /// language menu
    $interface['langcache'] = new configvar ( get_string('configlangcache', 'admin'),
        choose_from_menu($noyesoptions, 'langcache', $config->langcache, '', '', '', true) );
-        
+
 /// locale
    $interface['locale'] = new configvar ( get_string('configlocale', 'admin'),
-        '<input name="locale" type="text" size="10" value="'.s($config->locale).'" alt="locale" />' );
+        '<input name="locale" type="text" size="15" value="'.s($config->locale).'" alt="locale" />' );

 /// docroot
    $interface['docroot'] = new configvar ( get_string('configdocroot', 'admin'),
@@ -450,6 +450,9 @@ class configvarrss extends configvar {
    $security['notifyloginthreshold'] = new configvar (get_string('confignotifyloginthreshold', 'admin'),
        choose_from_menu($options, 'notifyloginthreshold', $config->notifyloginthreshold, '', '', '', true) );

+    $security['protectusernames'] = new configvar (get_string('configprotectusernames', 'admin'),
+        choose_from_menu($noyesoptions, 'protectusernames', $config->protectusernames, '', '', '', true) );
+
 /// secureforms
    $security['secureforms'] = new configvar (get_string('configsecureforms', 'admin'),
        choose_from_menu ($noyesoptions, 'secureforms', $config->secureforms, '', '', '', true) );
@@ -591,6 +594,7 @@ class configvarrss extends configvar {
    }
    
 /// enable stats
+if (empty($CFG->disablestatsprocessing)) {
    $stats['enablestats'] = new configvar (get_string('configenablestats','admin'),
        choose_from_menu($noyesoptions, 'enablestats', $config->enablestats, '', '', '', true) );

@@ -636,7 +640,7 @@ class configvarrss extends configvar {

    $stats['statsuserthreshold'] = new configvar (get_string('configstatsuserthreshold','admin'),
      '<input type="text" name="statsuserthreshold" size="4" value="'.$config->statsuserthreshold.'" />');
-                                              
+}                                        

 ////////////////////////////////////////////////////////////////////

@@ -649,6 +653,8 @@ class configvarrss extends configvar {
    $configvars['permissions']     = $permissions;
    $configvars['requestedcourse'] = $reqcourse;
    $configvars['misc']            = $misc;
+if (empty($CFG->disablestatsprocessing)) {
    $configvars['stats']           = $stats;
+}

 ?>
@@ -141,11 +141,13 @@
    
        /// Delete users who haven't confirmed within required period

-        $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
-        if ($users = get_users_unconfirmed($oneweek)) {
-            foreach ($users as $user) {
-                if (delete_records('user', 'id', $user->id)) {
-                    mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+        if (!empty($CFG->deleteunconfirmed)) {
+            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+            if ($users = get_users_unconfirmed($oneweek)) {
+                foreach ($users as $user) {
+                    if (delete_records('user', 'id', $user->id)) {
+                        mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+                    }
                }
            }
        }
@@ -155,11 +157,13 @@

        /// Delete users who haven't completed profile within required period

-        $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
-        if ($users = get_users_not_fully_set_up($oneweek)) {
-            foreach ($users as $user) {
-                if (delete_records('user', 'id', $user->id)) {
-                    mtrace("Deleted not fully setup user $user->username ($user->id)");
+        if (!empty($CFG->deleteunconfirmed)) {
+            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+            if ($users = get_users_not_fully_set_up($oneweek)) {
+                foreach ($users as $user) {
+                    if (delete_records('user', 'id', $user->id)) {
+                        mtrace("Deleted not fully setup user $user->username ($user->id)");
+                    }
                }
            }
        }
@@ -274,10 +278,10 @@
        unset($enrol);
    }

-    if (!empty($CFG->enablestats)) {
+    if (!empty($CFG->enablestats) and empty($CFG->disablestatsprocessing)) {

        // check we're not before our runtime
-        $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");
+        $timetocheck = strtotime("today $CFG->statsruntimestarthour:$CFG->statsruntimestartminute");

        if (time() > $timetocheck) {
            $time = 60*60*20; // set it to 20 here for first run... (overridden by $CFG)
@@ -43,7 +43,7 @@ function delete_subdirectories($rootdir) {

    $dir = opendir($rootdir);

-    while ($file = readdir($dir)) {
+    while (false !== ($file = readdir($dir))) {
        if ($file != '.' and $file != '..') {
            $fullfile = $rootdir .'/'. $file;
            if (filetype($fullfile) == 'dir') {
@@ -43,10 +43,12 @@
        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
      </VENDOR>
      <VENDOR name="postgres" version="7.4" />
-      <VENDOR name="mssql" version="8.0" />
+      <VENDOR name="mssql" version="9.0" />
      <VENDOR name="oracle" version="9.0" />
    </DATABASE>
-    <PHP version="4.3.0" level="required" />
+    <PHP version="4.3.0" level="required">
+       <RESTRICT function="restrict_php50_version" message="php50restricted" />
+    </PHP>
    <PHP_EXTENSIONS>
      <PHP_EXTENSION name="iconv" level="optional">
        <FEEDBACK>
@@ -222,7 +222,7 @@
 /// If any new configurations were found then send to the config page to check

    if (!empty($configchange)) {
-        redirect("config.php");
+        redirect("config.php?installing=1");
    }

 /// Find and check all main modules and load them up or upgrade them if necessary
@@ -258,7 +258,7 @@

 /// Define the unique site ID code if it isn't already
    if (empty($CFG->siteidentifier)) {    // Unique site identification code
-        set_config('siteidentifier', random_string(32));
+        set_config('siteidentifier', random_string(32).$_SERVER['HTTP_HOST']);
    }

 /// Check if the guest user exists.  If not, create one.
@@ -319,10 +319,13 @@
        print_spacer(10,10);
    }

-    if (ini_get_bool('register_globals') && !ini_get_bool('magic_quotes_gpc')) {
-        print_simple_box(get_string('globalsquoteswarning', 'admin'), 'center', '60%');
+    if (ini_get_bool('register_globals')) {
+        print_simple_box(get_string('globalswarning', 'admin'), 'center', '60%');
    }

+    if (is_dataroot_insecure()) {
+        print_simple_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'center', '60%');
+    }

 /// If no recently cron run
    $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
@@ -475,14 +478,6 @@ epository').'</a></strong>',

    print_simple_box_end();

-    
-    if (optional_param('dbmigrate')) {               // ??? Is this actually used?
-        print_simple_box_start('center','60%');
-        require_once($CFG->dirroot.'/admin/utfdbmigrate.php');
-        db_migrate2utf8();
-        print_simple_box_end();
-    }
-

    print_footer($site);

@@ -177,7 +177,7 @@
            $settings = "";
        }

-        $count = count_records("$module->name");
+        $count = count_records_select("$module->name",'course<>0');

        if ($module->visible) {
            $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=$USER->sesskey\" title=\"$strhide\">".
@@ -26,7 +26,7 @@
    }

    if (empty($CFG->siteidentifier)) {    // Unique site identification code
-        set_config('siteidentifier', random_string(32));
+        set_config('siteidentifier', random_string(32).$_SERVER['HTTP_HOST']);
    }


@@ -78,7 +78,11 @@
            error(get_string('statsnodata'),$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/index.php');
        }

-        echo '<center><img src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></center>';
+        if (empty($CFG->gdversion)) {
+            echo "<center>(".get_string("gdneed").")</center>";
+        } else {
+            echo '<center><img src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></center>';
+        }
        
        $table = new object();
        $table->align = array('left','center','center','center');
@@ -2,6 +2,7 @@

    require_once('../config.php');
    require_once($CFG->dirroot.'/mod/forum/lib.php');
+    require_once($CFG->libdir.'/adminlib.php');

    $confirm = optional_param('confirm', 0, PARAM_BOOL);

@@ -264,7 +264,6 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                            //This can be used to obtain a list of userids for existing users
                            notify("$user->id ".get_string('usernotaddedregistered', 'error', $username));
                            $userserrors++;
-                            continue;
                        }

                    } else { // new user
@@ -158,7 +158,7 @@
                $updateuser = new object();
                $updateuser->id = $user->id;
                $updateuser->deleted = "1";
-                $updateuser->username = "$user->email.".time();  // Remember it just in case
+                $updateuser->username = addslashes("$user->email.".time());  // Remember it just in case
                $updateuser->email = "";               // Clear this field to free it up
                $updateuser->idnumber = "";               // Clear this field to free it up
                $updateuser->timemodified = time();
@@ -13,7 +13,7 @@
 	
 	$customlang = array();
 	
-	$enc = array('af' => 'iso-8859-1', 'ar' => 'windows-1256', 'be' => 'windows-1251', 'bg' => 'windows-1251', 'bs' => 'windows-1250', 'ca' => 'iso-8859-1', 'cs' => 'iso-8859-2', 'da' => 'iso-8859-1', 'de' => 'iso-8859-1', 'de_du' => 'iso-8859-1', 'de_utf8' => 'utf-8', 'el' => 'windows-1253', 'en' => 'iso-8859-1', 'en_ja' => 'euc-jp', 'en_us' => 'iso-8859-1', 'en_utf8' => 'utf-8', 'es' => 'iso-8859-1', 'es_ar' => 'iso-8859-1', 'es_es' => 'iso-8859-1', 'es_mx' => 'iso-8859-1', 'et' => 'iso-8859-1', 'eu' => 'iso-8859-1', 'fa' => 'windows-1256', 'fa_utf8' => 'utf-8', 'fi' => 'iso-8859-1', 'fil' => 'iso-8859-15', 'fr' => 'iso-8859-1', 'fr_ca' => 'iso-8859-15', 'ga' => 'iso-8859-1', 'gl' => 'iso-8859-1', 'he' => 'ISO-8859-8-I', 'he_utf8' => 'utf-8', 'hi' => 'iso-8859-1', 'hr' => 'windows-1250', 'hr_utf8' => 'utf-8', 'hu' => 'iso-8859-2', 'id' => 'iso-8859-1', 'it' => 'iso-8859-1', 'ja' => 'EUC-JP', 'ja_utf8' => 'UTF-8', 'ka_utf8' => 'UTF-8', 'km_utf8' => 'UTF-8', 'kn_utf8' => 'utf-8', 'ko' => 'EUC-KR', 'ko_utf8' => 'UTF-8', 'lt' => 'windows-1257', 'lv' => 'ISO-8859-4', 'mi_nt' => 'iso-8859-1', 'mi_tn_utf8' => 'utf-8', 'ms' => 'iso-8859-1', 'nl' => 'iso-8859-1', 'nn' => 'iso-8859-1', 'no' => 'iso-8859-1', 'no_gr' => 'iso-8859-1', 'pl' => 'iso-8859-2', 'pt' => 'iso-8859-1', 'pt_br' => 'iso-8859-1', 'ro' => 'iso-8859-2', 'ru' => 'windows-1251', 'sk' => 'iso-8859-2', 'sl' => 'iso-8859-2', 'sl_utf8' => 'utf-8', 'so' => 'iso-8859-1', 'sq' => 'iso-8859-1', 'sr_utf8' => 'utf-8', 'sv' => 'iso-8859-1', 'th' => 'TIS-620', 'th_utf8' => 'UTF-8', 'tl' => 'iso-8859-15', 'tl_utf8' => 'UTF-8', 'tr' => 'iso-8859-9', 'uk' => 'windows-1251', 'vi_utf8' => 'UTF-8', 'zh_cn' => 'GB18030', 'zh_cn_utf8' => 'UTF-8', 'zh_tw' => 'Big5', 'zh_tw_utf8' => 'UTF-8');
+	$enc = array('af' => 'iso-8859-1', 'ar' => 'windows-1256', 'be' => 'windows-1251', 'bg' => 'windows-1251', 'bs' => 'windows-1250', 'ca' => 'iso-8859-1', 'cs' => 'iso-8859-2', 'da' => 'iso-8859-1', 'de' => 'iso-8859-1', 'de_du' => 'iso-8859-1', 'de_utf8' => 'utf-8', 'el' => 'windows-1253', 'en' => 'iso-8859-1', 'en_ja' => 'euc-jp', 'en_us' => 'iso-8859-1', 'en_utf8' => 'utf-8', 'es' => 'iso-8859-1', 'es_ar' => 'iso-8859-1', 'es_es' => 'iso-8859-1', 'es_mx' => 'iso-8859-1', 'et' => 'iso-8859-1', 'eu' => 'iso-8859-1', 'fa' => 'windows-1256', 'fa_utf8' => 'utf-8', 'fi' => 'iso-8859-1', 'fil' => 'iso-8859-15', 'fr' => 'iso-8859-1', 'fr_ca' => 'iso-8859-15', 'ga' => 'iso-8859-1', 'gl' => 'iso-8859-1', 'he' => 'ISO-8859-8-I', 'he_utf8' => 'utf-8', 'hi' => 'iso-8859-1', 'hr' => 'windows-1250', 'hr_utf8' => 'utf-8', 'hu' => 'iso-8859-2', 'id' => 'iso-8859-1', 'is' => 'iso-8859-1', 'it' => 'iso-8859-1', 'ja' => 'EUC-JP', 'ja_utf8' => 'UTF-8', 'ka_utf8' => 'UTF-8', 'km_utf8' => 'UTF-8', 'kn_utf8' => 'utf-8', 'ko' => 'EUC-KR', 'ko_utf8' => 'UTF-8', 'lt' => 'windows-1257', 'lv' => 'ISO-8859-4', 'mi_nt' => 'iso-8859-1', 'mi_tn_utf8' => 'utf-8', 'ms' => 'iso-8859-1', 'nl' => 'iso-8859-1', 'nn' => 'iso-8859-1', 'no' => 'iso-8859-1', 'no_gr' => 'iso-8859-1', 'pl' => 'iso-8859-2', 'pt' => 'iso-8859-1', 'pt_br' => 'iso-8859-1', 'ro' => 'iso-8859-2', 'ru' => 'windows-1251', 'sk' => 'iso-8859-2', 'sl' => 'iso-8859-2', 'sl_utf8' => 'utf-8', 'so' => 'iso-8859-1', 'sq' => 'iso-8859-1', 'sr_utf8' => 'utf-8', 'sv' => 'iso-8859-1', 'th' => 'TIS-620', 'th_utf8' => 'UTF-8', 'tl' => 'iso-8859-15', 'tl_utf8' => 'UTF-8', 'tr' => 'iso-8859-9', 'uk' => 'windows-1251', 'vi_utf8' => 'UTF-8', 'zh_cn' => 'GB18030', 'zh_cn_utf8' => 'UTF-8', 'zh_tw' => 'Big5', 'zh_tw_utf8' => 'UTF-8');
 	
 	/**************************************
 	 * Custom lang pack handling 		  *
@@ -87,7 +87,10 @@
        print_simple_box_end();
        db_migrate2utf8();
        print_heading('db unicode migration has been completed!');
-        unlink($filename);    //no longer in maintenance mode
+        if (!get_config('', 'migrate_maintmode')) { // already in maint mode
+            unlink($filename);    //no longer in maintenance mode
+        }
+        delete_records('config', 'name', 'migrate_maintmode');
        @require_logout();
        print_continue($CFG->wwwroot.'/'.$CFG->admin.'/langimport.php');
    }
@@ -115,12 +118,16 @@
            //put the site in maintenance mode
            check_dir_exists($CFG->dataroot.'/'.SITEID, true);

-            if (touch($filename)) {
-                $file = fopen($filename, 'w');
-                fwrite($file, get_string('maintinprogress','admin'));
-                fclose($file);
+            if (file_exists($filename)) {
+                set_config('migrate_maintmode', 1); // already in maintenance mode
            } else {
-                notify (get_string('maintfileopenerror','admin'));
+                if (touch($filename)) {
+                    $file = fopen($filename, 'w');
+                    fwrite($file, get_string('maintinprogress','admin'));
+                    fclose($file);
+                } else {
+                    notify (get_string('maintfileopenerror','admin'));
+                }
            }
            //print second confirmation box
            echo '<form name="migratefrom" action="utfdbmigrate.php" method="POST">';
@@ -211,7 +211,7 @@ function auth_sync_users ($do_updates=0) {
        $updatekeys = array();
        foreach ($all_keys as $key) {
            if (preg_match('/^field_updatelocal_(.+)$/',$key, $match)) {
-                if ($pcfg->{$match[0]}) { // if it has a true value
+                if ($pcfg->{$key} === 'onlogin') {
                    array_push($updatekeys, $match[1]); // the actual key name
                }
            }
@@ -111,7 +111,8 @@ class fcFPP
 		$this->_user = $userid;
 		$this->_pwd  = $passwd; 
 		return TRUE;		
-	    } elseif (preg_match ("/^\Sorry/",$line)){	//Denied access but a valid user and password
+        } elseif (strpos($line, 'You are not allowed')){ // Denied access but a valid user and password
+                                                         // "Sorry. You are not allowed to login with the FPP interface"
 	    	return TRUE;
 	    } else {					//Invalid user or password
 		return FALSE;
@@ -215,4 +216,4 @@ class fcFPP
 }
   

-?>
+?>
@@ -711,7 +711,7 @@ function auth_ldap_bulk_insert($users){
    // bulk insert -- superfast with $bulk_insert_records
    $sql = 'INSERT INTO '.$CFG->prefix.'extuser (idnumber) VALUES ';
    // make those values safe
-    array_map('addslashes', $users);
+    $users = array_map('addslashes', $users);
    // join and quote the whole lot
    $sql = $sql . '(\'' . join('\'),(\'', $users) . '\')';
    print "+ " . count($users) . " users\n";
@@ -1,6 +1,7 @@
 <?PHP  // $Id$
 //CHANGELOG:
 //28.10.2004 SHIBBOLETH Authentication functions v.0.1
+//2005-2006 Various extensions and fixes by Lukas Haemmerle
 //Distributed under GPL (c)Markus Hagman 2004-

 function auth_user_login($username, $password) {
@@ -41,9 +42,9 @@ function auth_get_userinfo($username) {
  
    foreach ($attrmap as $key=>$value) {
        if (!empty($CFG->unicodedb)) {
-            $result[$key]=$_SERVER[$value];
+            $result[$key]=get_first_string($_SERVER[$value]);
        } else {
-            $result[$key]=utf8_decode($_SERVER[$value]);
+            $result[$key]=utf8_decode(get_first_string($_SERVER[$value]));
        }
    }

@@ -84,4 +85,15 @@ function auth_shib_attributes(){

    return $moodleattributes;
 }
+
+
+function get_first_string($string){
+// Cleans and returns first of potential many values (multi-valued attributes)
+
+    $list = split( ';', $string);
+    $clean_string = rtrim($list[0]);
+
+    return $clean_string;
+}
+
 ?>
@@ -17,13 +17,7 @@

    if (!empty($id)) {
        if (!isteacheredit($id)) {
-            if (empty($to)) {
-                error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
-            } else {
-                if (!isteacheredit($to)) {
-                    error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
-                }
-            }
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
        }
    } else {
        if (!isadmin()) {
@@ -31,6 +25,12 @@
        }
    }

+    if (!empty($to)) {
+        if (!isteacheredit($to)) {
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    }
+
    //Check site
    if (!$site = get_site()) {
        error("Site not found!");
@@ -128,7 +128,7 @@
    }
    print_simple_box_end();

-    //Print footer  
+    //Print footer
    print_footer();

 ?>
@@ -408,8 +408,8 @@ function schedule_backup_course_configure($course,$starttime = 0) {
                    if (empty($preferences->mods[$mod->modname]->instances)) {
                        $preferences->mods[$mod->modname]->instances = array(); // avoid warnings
                    }
-                    $preferences->mods[$mod->modname]->instances[$mod->instance]->backup = $preferences->mods[$modname]->backup;
-                    $preferences->mods[$mod->modname]->instances[$mod->instance]->userinfo = $preferences->mods[$modname]->userinfo;
+                    $preferences->mods[$mod->modname]->instances[$mod->instance]->backup = $preferences->mods[$mod->modname]->backup;
+                    $preferences->mods[$mod->modname]->instances[$mod->instance]->userinfo = $preferences->mods[$mod->modname]->userinfo;
                    // there isn't really a nice way to do this...
                    $preferences->mods[$mod->modname]->instances[$mod->instance]->name = get_field($mod->modname,'name','id',$mod->instance);
                }
@@ -772,7 +772,9 @@ function schedule_backup_course_delete_old_files($preferences,$starttime=0) {
        $dirtocheck = $CFG->dataroot."/".$preferences->backup_course."/backupdata";
    }
    schedule_backup_log($starttime,$preferences->backup_course,"    checking $dirtocheck");
-    mtrace("            Keeping backup files in $dirtocheck");
+    if ($CFG->debug > 7) {
+        mtrace("            Keeping backup files in $dirtocheck");
+    }

    //Get all the files in $dirtocheck
    $files = get_directory_list($dirtocheck,"",false);
@@ -521,7 +521,8 @@
            fwrite ($bf,full_tag("INCLUDED",4,false,$included));
            fwrite ($bf,full_tag("USERINFO",4,false,$userinfo));

-            if (is_array($preferences->mods[$element->name]->instances)
+            if (isset($preferences->mods[$element->name]->instances)
+                && is_array($preferences->mods[$element->name]->instances)
                && count($preferences->mods[$element->name]->instances)) {
                fwrite ($bf, start_tag("INSTANCES",4,true));
                foreach ($preferences->mods[$element->name]->instances as $id => $object) {
@@ -1239,7 +1240,8 @@
                    //See if it is a valid module to backup
                    if ($log->module == "course" or 
                        $log->module == "user" or
-                        $preferences->mods[$log->module]->backup == 1) {
+                        (array_key_exists($log->module, $preferences->mods) and $preferences->mods[$log->module]->backup == 1)) {
+                        // logs with 'upload' in module field are ignored, there is no restore code anyway 
                        //Begin log tag
                         fwrite ($bf,start_tag("LOG",3,true));
    
@@ -1661,7 +1663,8 @@

        require_once($CFG->dirroot.'/mod/'.$module.'/backuplib.php');

-        if (is_array($preferences->mods[$module]->instances)) {
+        if (isset($preferences->mods[$module]->instances)
+            && is_array($preferences->mods[$module]->instances)) {
            $onemodbackup = $module.'_backup_one_mod';
            if (function_exists($onemodbackup)) {
                foreach ($preferences->mods[$module]->instances as $instance => $object) {
@@ -9,7 +9,7 @@ require_once($CFG->dirroot.'/backup/bb/xsl_emulate_xslt.inc');
  
 function get_subdirs($directory){
    $opendirectory = opendir( $directory );
-    while($filename = readdir($opendirectory)) {
+    while(false !== ($filename = readdir($opendirectory))) {
        if (is_dir($directory.$filename) and $filename != ".." and $filename != "."){
            $subdirs[] = $filename;
        }
@@ -51,24 +51,14 @@ function backup_upgrade($oldversion=0) {
    }

    if ($oldversion < 2006042801) {
-        modify_database('', 'ALTER TABLE prefix_backup_log
-            ALTER COLUMN "time" TYPE integer,
-            ALTER COLUMN "time" SET DEFAULT 0,
-            ALTER COLUMN laststarttime TYPE integer,
-            ALTER COLUMN laststarttime SET DEFAULT 0,
-            ALTER COLUMN courseid TYPE integer,
-            ALTER COLUMN courseid SET DEFAULT 0');
-
-        modify_database('', 'ALTER TABLE mdl_backup_courses
-            ALTER COLUMN lastendtime TYPE integer,
-            ALTER COLUMN lastendtime SET DEFAULT 0,
-            ALTER COLUMN laststarttime TYPE integer,
-            ALTER COLUMN laststarttime SET DEFAULT 0,
-            ALTER COLUMN courseid TYPE integer,
-            ALTER COLUMN courseid SET DEFAULT 0,
-            ALTER COLUMN nextstarttime TYPE integer,
-            ALTER COLUMN nextstarttime SET DEFAULT 0');
+        table_column('backup_log', 'time', 'time', 'integer', '', '', '0');
+        table_column('backup_log', 'laststarttime', 'laststarttime', 'integer', '', '', '0');
+        table_column('backup_log', 'courseid', 'courseid', 'integer', '', '', '0');

+        table_column('backup_courses', 'lastendtime', 'lastendtime', 'integer', '', '', '0');
+        table_column('backup_courses', 'laststarttime', 'laststarttime', 'integer', '', '', '0');
+        table_column('backup_courses', 'courseid', 'courseid', 'integer', '', '', '0');
+        table_column('backup_courses', 'nextstarttime', 'nextstarttime', 'integer', '', '', '0');
    }

    //Finally, return result
@@ -118,7 +118,7 @@
        }

        // Loop through all directory entries, and construct two temporary arrays containing files and sub directories
-        while($entry = readdir($handle)) {
+        while(false !== ($entry = readdir($handle))) {
            if (is_dir($dir. $slash .$entry) && $entry != ".." && $entry != "." && $entry != $excludeddir) {
                $dir_subdirs[] = $dir. $slash .$entry;
            }
@@ -195,7 +195,7 @@
        $results = null;
  
        $dir = opendir($rootdir);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
            if ($file=="." || $file=="..") {
                continue;
            }
@@ -214,7 +214,7 @@
        $results = "";
 
        $dir = opendir($rootdir);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
            if ($file=="." || $file=="..") {
                continue;
            }
@@ -293,13 +293,15 @@

        global $CFG;

+        $status = true; // Initialize this, next code will change its value if needed
+
        if (!is_dir($to_file)) {
            //echo "<br />Creating ".$to_file;                                //Debug
            umask(0000);
            $status = mkdir($to_file,$CFG->directorypermissions);
        }
        $dir = opendir($from_file);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
            if ($file=="." || $file=="..") {
                continue;
            }
@@ -53,6 +53,15 @@
        print_simple_box(get_string("restorefinished"),"center");
    } else {
        print_simple_box(get_string("importdatafinished"),"center");
+        $file = $CFG->dataroot . '/'
+            . $SESSION->import_preferences->backup_course
+            . '/backupdata/' . $SESSION->import_preferences->backup_name;
+        if (is_readable($file)) {
+            unlink($file);
+        }
+        else {
+            error_log("import course data: couldn't unlink $file");
+        }
        unset($SESSION->restore);
    }
    print_continue("$CFG->wwwroot/course/view.php?id=".$restore->course_id);
@@ -1077,7 +1077,7 @@
                    if (!$preferencescount) {
                        $continue = false;
                        if (!defined('RESTORE_SILENTLY')) {
-                            echo '<li>'.get_string('backupwithoutgradebook','grade').'</li>';
+                            echo '<li>'.get_string('backupwithoutgradebook','grades').'</li>';
                        }
                    }

@@ -1088,7 +1088,7 @@
                            if ($pref_rec->value == 0) {
                                $continue = false;
                                if (!defined('RESTORE_SILENTLY')) {
-                                    echo '<li>'.get_string('respectingcurrentdata','grade').'</li>';
+                                    echo '<li>'.get_string('respectingcurrentdata','grades').'</li>';
                                }
                            }
                        }
@@ -1382,6 +1382,19 @@
                    $user->lang = 'mi_nt';
                }

+                //Country list updates - MDL-13060 
+                //Any user whose country code has been deleted or modified needs to be assigned a valid one.
+                $country_update_map = array(
+                    'ZR' => 'CD', 
+                    'TP' => 'TL',
+                    'FX' => 'FR', 
+                    'KO' => 'RS', 
+                    'CS' => 'RS',
+                    'WA' => 'GB');
+                if (array_key_exists($user->country, $country_update_map)) {
+                    $user->country = $country_update_map[$user->country];
+                }
+
                //Check if it's admin and coursecreator
                $is_admin =         !empty($user->roles['admin']);
                $is_coursecreator = !empty($user->roles['coursecreator']);
@@ -1858,14 +1871,7 @@
                foreach ($info as $category) {
                    //Skip empty categories (some backups can contain them)
                    if (!empty($category->id)) {
-                        $catrestore = "restore_question_categories";
-                        if (function_exists($catrestore)) {
-                            //print_object ($category);                                                //Debug
-                            $status = $catrestore($category,$restore);
-                        } else {
-                            //Something was wrong. Function should exist.
-                            $status = false;
-                        }
+                        $status = restore_question_categories($category,$restore);
                    }
                }

@@ -2203,19 +2209,6 @@
                                //Assign it to admin
                                $eve->userid = $adminid;
                            }
-
-                            //We must recode the repeatid if the event has it
-                            if (!empty($eve->repeatid)) {
-                                $repeat_rec = backup_getid($restore->backup_unique_code,"event_repeatid",$eve->repeatid);
-                                if ($repeat_rec) {    //Exists, so use it...
-                                    $eve->repeatid = $repeat_rec->new_id;
-                                } else {              //Doesn't exists, calculate the next and save it
-                                    $oldrepeatid = $eve->repeatid;
-                                    $max_rec = get_record_sql('SELECT 1, MAX(repeatid) AS repeatid FROM '.$CFG->prefix.'event');
-                                    $eve->repeatid = empty($max_rec) ? 1 : $max_rec->repeatid + 1;
-                                    backup_putid($restore->backup_unique_code,"event_repeatid", $oldrepeatid, $eve->repeatid);
-                                }
-                            }
 
                            //We have to recode the groupid field
                            $group = backup_getid($restore->backup_unique_code,"groups",$eve->groupid);
@@ -2228,6 +2221,22 @@

                            //The structure is equal to the db, so insert the event
                            $newid = insert_record ("event",$eve);
+
+                            //We must recode the repeatid if the event has it
+                            //The repeatid now refers to the id of the original event. (see Bug#5956)
+                            if ($newid && !empty($eve->repeatid)) {
+                                $repeat_rec = backup_getid($restore->backup_unique_code,"event_repeatid",$eve->repeatid);
+                                if ($repeat_rec) {    //Exists, so use it...
+                                    $eve->repeatid = $repeat_rec->new_id;
+                                } else {              //Doesn't exists, calculate the next and save it
+                                    $oldrepeatid = $eve->repeatid;
+                                    $eve->repeatid = $newid;
+                                    backup_putid($restore->backup_unique_code,"event_repeatid", $oldrepeatid, $eve->repeatid);
+                                }
+                                $eve->id = $newid;
+                                // update the record to contain the correct repeatid
+                                update_record('event',$eve);
+                            }
                        } else {
                            //get current event id
                            $newid = $eve_db->id;
@@ -4843,7 +4852,7 @@
    }

    function restore_execute(&$restore,$info,$course_header,&$errorstr) {
-        global $CFG;
+        global $CFG, $USER;
        $status = true;
        //Checks for the required files/functions to restore every module
        //and include them
@@ -5306,9 +5315,9 @@
            }
            if (!$status = restore_decode_content_links($restore)) {
                if (!defined('RESTORE_SILENTLY')) {
-                    notify("Could not refresh events for activities!");
+                    notify("Could not decode content links!");
                } else {
-                    $errorstr = "Could not refresh events for activities!";
+                    $errorstr = "Could not decode content links!";
                    return false;
                }
            }
@@ -5,6 +5,8 @@
 // database (backup_version) to determine whether upgrades should
 // be performed (see db/backup_*.php)

-$backup_version = 2006053000;   // The current version is a date (YYYYMMDDXX)
+$backup_version = 2006082300;   // The current version is a date (YYYYMMDDXX)

-$backup_release = "1.6";  // User-friendly version number
+$backup_release = "1.6.2";  // User-friendly version number
+
+?>
@@ -71,13 +71,13 @@ class block_blog_tags extends block_base {

        $timewithin = $this->config->timewithin * 24 * 60 * 60; /// convert to seconds
        
-        $sql  = 'SELECT t.*, COUNT(DISTINCT bt.id) as ct ';
+        $sql  = 'SELECT t.id, t.type, t.text, COUNT(DISTINCT bt.id) as ct ';
        $sql .= "FROM {$CFG->prefix}tags as t, {$CFG->prefix}blog_tag_instance as bt, {$CFG->prefix}post as p ";
        $sql .= 'WHERE t.id = bt.tagid ';
        $sql .= 'AND p.id = bt.entryid ';
-        $sql .= 'AND (p.publishstate = "site" or p.publishstate="public") ';
+        $sql .= 'AND (p.publishstate = \'site\' or p.publishstate=\'public\') ';
        $sql .= "AND bt.timemodified > {$timewithin} ";
-        $sql .= 'GROUP BY bt.tagid ';
+        $sql .= 'GROUP BY  t.id, t.type, t.text ';
        $sql .= 'ORDER BY ct DESC, t.text ASC ';
        $sql .= "LIMIT {$this->config->numberoftags} ";

@@ -2,7 +2,7 @@
 <table cellpadding="9" cellspacing="0">
 <tr valign="top">
    <td align="right"><?php print_string('configtitle', 'block_html'); ?>:</td>
-    <td><input type="text" name="title" size="30" value="<?php echo isset($this->config->title)?$this->config->title:''; ?>" /> (<?php print_string('leaveblanktohide', 'block_html'); ?>)</td>
+    <td><input type="text" name="title" size="30" value="<?php echo isset($this->config->title)?p($this->config->title):''; ?>" /> (<?php print_string('leaveblanktohide', 'block_html'); ?>)</td>
 </tr>
 <tr valign="top">
    <td align="right"><?php print_string('configcontent', 'block_html'); ?>:</td>
@@ -52,7 +52,7 @@ class block_login extends block_base {
            $this->content->text .= '<table align="center" cellpadding="2" cellspacing="0" class="logintable">';

            $this->content->text .= '<tr><td class="c0 r0" align="right">'.get_string('username').':</td>';
-            $this->content->text .= '<td class="c1 r0"><input type="text" name="username" size="10" value="'.$username.'" /></td></tr>';
+            $this->content->text .= '<td class="c1 r0"><input type="text" name="username" size="10" value="'.s($username).'" /></td></tr>';

            $this->content->text .= '<tr><td class="c0 r1" align="right">'.get_string('password').':</td>';
            $this->content->text .= '<td class="c1 r1"><input type="password" name="password" size="10" value="" /></td></tr>';
@@ -118,7 +118,7 @@ class block_online_users extends block_base {
                $this->content->text .= '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$COURSE->id.'" title="'.$timeago.'">'.$user->fullname.'</a>';
                if (!empty($USER->id) and ($USER->id != $user->id) and !empty($CFG->messaging) and !isguest()) {  // Only when logged in
                    $this->content->text .= "\n".' <a title="'.get_string('messageselectadd').'" target="message_'.$user->id.'" href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);">'
-                        .'<img class="icon message" src="'.$CFG->pixpath.'/t/message.gif" alt="'. get_string('messageselectadd') .'" /></a>';
+                        .'<img class="messageicon" src="'.$CFG->pixpath.'/t/message.gif" alt="'. get_string('messageselectadd') .'" /></a>';
                }
                $this->content->text .= "</li>\n";
            }
@@ -7,7 +7,7 @@ class block_participants extends block_list {
    }

    function get_content() {
-        global $USER, $CFG;
+        global $USER, $CFG, $COURSE;

        if ($this->content !== NULL) {
            return $this->content;
@@ -27,13 +27,14 @@ class block_participants extends block_list {
            $this->instance->pageid = SITEID;
        }

-        if ($this->instance->pageid != SITEID || 
+        /// MDL-13252 Always get the course page id or else the id may be incorrect in the user/index.php
+        if ($COURSE->id != SITEID || 
            $CFG->showsiteparticipantslist > 1 || 
            ($CFG->showsiteparticipantslist == 1 && isteacherinanycourse()) || 
            isteacher(SITEID)) {

            $this->content->items[] = '<a title="'.get_string('listofallpeople').'" href="'.
-                                      $CFG->wwwroot.'/user/index.php?id='.$this->instance->pageid.'">'.get_string('participants').'</a>';
+                                      $CFG->wwwroot.'/user/index.php?id='.$COURSE->id.'">'.get_string('participants').'</a>';
            $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/users.gif" height="16" width="16" alt="" />';
        }

@@ -123,7 +123,7 @@
            $numids = count($rssidarray);
            $count = 0;
            foreach ($rssidarray as $rssid) {
-                $output .=  $this->get_rss_by_id($rssid, $display_description, $shownumentries, ($numids > 1) ? true : false);
+                $output .=  clean_text($this->get_rss_by_id($rssid, $display_description, $shownumentries, ($numids > 1) ? true : false), FORMAT_HTML);
                if ($numids > 1 && $count != $numids -1 && !empty($rssfeedstring)) {
                    $output .= '<hr width="80%" />';
                }
@@ -1,5 +1,9 @@
 <?php  // $Id$

+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+}
+
 /**
 * Definition of blog page type.
 */
@@ -115,8 +115,8 @@ if ($editid) {  // User is editing a post
    $blogEntry = get_record('post','id',$editid);

    //using an unformatted entry body here so that extra formatting information is not stored in the db
-    $post->body = stripslashes_safe($blogEntry->summary);
-    $post->etitle = stripslashes_safe($blogEntry->subject);
+    $post->body = $blogEntry->summary;
+    $post->etitle = $blogEntry->subject;
    $post->postid = $editid;
    $post->userid = $blogEntry->userid;
    $post->format = $blogEntry->format;
@@ -194,8 +194,8 @@ function do_save($post) {

        /// Write a blog entry into database
        $blogEntry = new object;
-        $blogEntry->subject = addslashes($post->etitle);
-        $blogEntry->summary = addslashes($post->body);
+        $blogEntry->subject = $post->etitle;
+        $blogEntry->summary = $post->body;
        $blogEntry->module = 'blog';
        $blogEntry->userid = $USER->id;
        $blogEntry->format = $post->format;
@@ -267,8 +267,8 @@ function do_update($post) {
 //  echo "id id ".$post->postid;
 //  print_object($blogentry);  //debug

-    $blogEntry->subject = addslashes($post->etitle);
-    $blogEntry->summary = addslashes($post->body);
+    $blogEntry->subject = $post->etitle;
+    $blogEntry->summary = $post->body;
    if ($blogEntry->summary == '<br />') {
        $blogEntry->summary = '';
    }
@@ -110,10 +110,10 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') {  /// We are in edit mode, print the

        case 'course':
            if ($tagid || !empty($tag)) {
-                print_header_simple("$course->shortname: $blogstring", $course->fullname,
+                print_header("$course->shortname: $blogstring", $course->fullname,
                            '<a href="index.php?filtertype=course&amp;filterselect='.$filterselect.'">'. "$blogstring</a> -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string());
            } else {
-                print_header_simple("$course->shortname: $blogstring", $course->fullname,
+                print_header("$course->shortname: $blogstring", $course->fullname,
                            $blogstring,'','',true,$PAGE->get_extra_header_string());
            }
        break;
@@ -123,11 +123,11 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') {  /// We are in edit mode, print the
            $thisgroup = get_record('groups', 'id', $filterselect);

            if ($tagid || !empty($tag)) {
-                print_header_simple("$course->shortname: $blogstring", $course->fullname,
+                print_header("$course->shortname: $blogstring", $course->fullname,
                            '<a href="'.$CFG->wwwroot.'/user/index.php?id='.$course->id.'&amp;group='.$filterselect.'">'.$thisgroup->name.'</a> ->
                            <a href="index.php?filtertype=group&amp;filterselect='.$filterselect.'">'. "$blogstring</a> -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string());
            } else {
-                print_header_simple("$course->shortname: $blogstring", $course->fullname,
+                print_header("$course->shortname: $blogstring", $course->fullname,
                            '<a href="'.$CFG->wwwroot.'/user/index.php?id='.$course->id.'&amp;group='.$filterselect.'">'.$thisgroup->name."</a> ->
                            $blogstring",'','',true,$PAGE->get_extra_header_string());

@@ -20,7 +20,7 @@ $limit = optional_param('limit', 0, PARAM_INT);
 $start = optional_param('formstart', 0, PARAM_INT);
 $userid = optional_param('userid',0,PARAM_INT);
 $courseid = optional_param('courseid',SITEID,PARAM_INT);
-$tag = s(urldecode(optional_param('tag', '', PARAM_NOTAGS)));
+$tag = optional_param('tag', '', PARAM_NOTAGS);
 $tagid = optional_param('tagid', 0, PARAM_INT);
 $postid = optional_param('postid',0,PARAM_INT);
 $filtertype = optional_param('filtertype', '', PARAM_ALPHA);
@@ -119,6 +119,9 @@
                blog_print_entry($blogEntry, 'list', $filtertype, $filterselect); //print this entry.
                $count++;
            }
+
+            print_paging_bar(get_viewable_entry_count($userid, $postid, $limit, $start,$filtertype, $filterselect, $tagid, $tag, $sort='lastmodified DESC'), $blogpage, $bloglimit, get_baseurl($filtertype, $filterselect), 'blogpage');
+
            if (!$count) {
                print '<br /><center>'. get_string('noentriesyet', 'blog') .'</center><br />';

@@ -151,10 +154,10 @@

        global $USER, $CFG, $course, $ME;

-        $template['body'] = get_formatted_entry_body(stripslashes_safe($blogEntry->summary), $blogEntry->format);
-        $template['title'] = '<a name="'. $blogEntry->subject .'"></a>';
+        $template['body'] = get_formatted_entry_body($blogEntry->summary, $blogEntry->format);
+        $template['title'] = '<a name="'. s($blogEntry->subject, true) .'"></a>';
        //enclose the title in nolink tags so that moodle formatting doesn't autolink the text
-        $template['title'] .= '<span class="nolink">'. stripslashes_safe($blogEntry->subject);
+        $template['title'] .= '<span class="nolink">'. strip_tags(format_string($blogEntry->subject, true));
        $template['title'] .= '</span>';
        $template['userid'] = $blogEntry->userid;
        $template['author'] = fullname(get_record('user','id',$blogEntry->userid));
@@ -339,7 +342,7 @@
        if ($format) {
            return format_text($body, $format);
        }
-        return stripslashes_safe($body);
+        return $body;
    }

 /// Main filter function
@@ -9,14 +9,14 @@
 // Copyright (C) 2003-2004  Greek School Network            www.sch.gr     //
 //                                                                         //
 // Designed by:                                                            //
-//     Avgoustos Tsinakos (tsinakos@uom.gr)                                //
-//     Jon Papaioannou (pj@uom.gr)                                         //
+//     Avgoustos Tsinakos (tsinakos@teikav.edu.gr)                         //
+//     Jon Papaioannou (pj@moodle.org)                                     //
 //                                                                         //
 // Programming and development:                                            //
-//     Jon Papaioannou (pj@uom.gr)                                         //
+//     Jon Papaioannou (pj@moodle.org)                                     //
 //                                                                         //
 // For bugs, suggestions, etc contact:                                     //
-//     Jon Papaioannou (pj@uom.gr)                                         //
+//     Jon Papaioannou (pj@moodle.org)                                     //
 //                                                                         //
 // The current module was developed at the University of Macedonia         //
 // (www.uom.gr) under the funding of the Greek School Network (www.sch.gr) //
@@ -205,13 +205,14 @@
                if (count($err) == 0) {
                    $form->timemodified = time();

-                    if ($form->repeat) {
-                        $fetch = get_record_sql('SELECT 1, MAX(repeatid) AS repeatid FROM '.$CFG->prefix.'event');
-                        $form->repeatid = empty($fetch) ? 1 : $fetch->repeatid + 1;
-                    }
-
                    /// Get the event id for the log record.
                    $eventid = insert_record('event', $form, true);
+                    
+                    /// Use the event id as the repeatid to link repeat entries together
+                    if ($form->repeat) {
+                        $form->repeatid = $form->id = $eventid;
+                        update_record('event', $form);         // update the row, to set its repeatid        	
+                    }

                    /// Log the event entry.
                    add_to_log($form->courseid, 'calendar', 'add', 'event.php?action=edit&amp;id='.$eventid, stripslashes($form->name));
@@ -262,7 +263,7 @@
    }

    print_header($site->shortname.': '.$strcalendar.': '.$title, $strcalendar, $nav.' -> '.$title,
-                 $focus, '', true, '', user_login_string($site));
+                 'eventform.name', '', true, 'new.name', user_login_string($site));

    echo calendar_overlib_html();

@@ -378,7 +379,7 @@
                    $form->timestart = make_timestamp($cal_y, $cal_m, 1, 0, 0, 0);
                }
            }
-            if($form->timestart < 0) {
+            if(!isset($form->timestart) or $form->timestart < 0) {
                $form->timestart = time();
            }

@@ -1,4 +1,4 @@
-<form method="post" action="event.php" name="edit">
+<form method="post" action="event.php" name="eventform">
 <table cellpadding="5" cellspacing="0">
  <tr>
    <td style="vertical-align: top; text-align: right;">
@@ -2,7 +2,7 @@
    // The following is a hack to fix bug 1488
    $course = get_record('course', 'id', ($form->courseid) ? $form->courseid : $site->id);
 ?>
-<form method="post" action="event.php" name="new">
+<form method="post" action="event.php" name="eventform">
 <table cellpadding="5">
  <tr>
    <td style="vertical-align: top; text-align: right;">
@@ -9,14 +9,14 @@
 // Copyright (C) 2003-2004  Greek School Network            www.sch.gr     //
 //                                                                         //
 // Designed by:                                                            //
-//     Avgoustos Tsinakos (tsinakos@uom.gr)                                //
-//     Jon Papaioannou (pj@uom.gr)                                         //
+//     Avgoustos Tsinakos (tsinakos@teikav.edu.gr)                         //
+//     Jon Papaioannou (pj@moodle.org)                                     //
 //                                                                         //
 // Programming and development:                                            //
-//     Jon Papaioannou (pj@uom.gr)                                         //
+//     Jon Papaioannou (pj@moodle.org)                                     //
 //                                                                         //
 // For bugs, suggestions, etc contact:                                     //
-//     Jon Papaioannou (pj@uom.gr)                                         //
+//     Jon Papaioannou (pj@moodle.org)                                     //
 //                                                                         //
 // The current module was developed at the University of Macedonia         //
 // (www.uom.gr) under the funding of the Greek School Network (www.sch.gr) //
@@ -242,7 +242,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
                    $popupicon = $CFG->pixpath.'/c/user.gif';
                    $popupalt  = '';
                }
-                $popupcontent .= '<div><img height="16" width="16" src="'.$popupicon.'" style="vertical-align: middle; margin-right: 4px;" alt="'.$popupalt.'" /><a href="'.$dayhref.'">'.format_string($event->name,true).'</a></div>';
+                $popupcontent .= '<div><img height="16" width="16" src="'.$popupicon.'" style="vertical-align: middle; margin-right: 4px;" alt="'.$popupalt.'" /><a href="'.$dayhref.'#event_'.$event->id.'">'.format_string($event->name,true).'</a></div>';
            }
            
            //Accessibility: functionality moved to calendar_get_popup.
@@ -338,6 +338,7 @@ function calendar_get_popup($is_today, $event_timestart, $popupcontent='') {
        $popupcaption .= get_string('eventsfor', 'calendar', userdate($event_timestart, get_string('strftimedayshort')));
    }
    $popupcontent = str_replace("'", "\'", htmlspecialchars($popupcontent));
+    $popupcaption = str_replace("'", "\'", htmlspecialchars($popupcaption)); 
    $popup = 'onmouseover="return overlib(\''.$popupcontent.'\', CAPTION, \''.$popupcaption.'\');" onmouseout="return nd();"';
    return $popup;
 }
@@ -455,7 +456,7 @@ function calendar_print_event($event) {
    static $strftimetime;

    $event = calendar_add_event_metadata($event);
-    echo '<table class="event" cellspacing="0">';
+    echo '<a name="event_'.$event->id.'"></a><table class="event" cellspacing="0">';
    echo '<tr><td class="picture">';
    if (!empty($event->icon)) {
        echo $event->icon;
@@ -868,7 +869,7 @@ function calendar_get_sideblock_upcoming($events, $linkhref = NULL) {
            if(!empty($linkhref)) {
                $ed = usergetdate($events[$i]->timestart);
                $href = calendar_get_link_href(CALENDAR_URL.$linkhref, $ed['mday'], $ed['mon'], $ed['year']);
-                $content .= '<a href="'.$href.'">'.$events[$i]->name.'</a>';
+                $content .= '<a href="'.$href.'#event_'.$events[$i]->id.'">'.$events[$i]->name.'</a>';
            }
            else {
                $content .= $events[$i]->name;
@@ -1093,6 +1094,10 @@ function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NU
    else {
        $courses = false;
    }
+   //BUG 6130 clean $courses array as SESSION has bad entries. 
+   foreach ($courses as $index => $value) {
+       if (empty($value)) unset($courses[$index]);
+   }

    if($SESSION->cal_show_user || $ignorefilters) {
        // This doesn't work for arrays yet (maybe someday it will)
@@ -9,14 +9,14 @@
 // Copyright (C) 2003-2004  Greek School Network            www.sch.gr     //
 //                                                                         //
 // Designed by:                                                            //
-//     Avgoustos Tsinakos (tsinakos@uom.gr)                                //
-//     Jon Papaioannou (pj@uom.gr)                                         //
+//     Avgoustos Tsinakos (tsinakos@teikav.edu.gr)                         //
+//     Jon Papaioannou (pj@moodle.org)                                     //
 //                                                                         //
 // Programming and development:                                            //
-//     Jon Papaioannou (pj@uom.gr)                                         //
+//     Jon Papaioannou (pj@moodle.org)                                     //
 //                                                                         //
 // For bugs, suggestions, etc contact:                                     //
-//     Jon Papaioannou (pj@uom.gr)                                         //
+//     Jon Papaioannou (pj@moodle.org)                                     //
 //                                                                         //
 // The current module was developed at the University of Macedonia         //
 // (www.uom.gr) under the funding of the Greek School Network (www.sch.gr) //
@@ -9,14 +9,14 @@
 // Copyright (C) 2003-2004  Greek School Network            www.sch.gr     //
 //                                                                         //
 // Designed by:                                                            //
-//     Avgoustos Tsinakos (tsinakos@uom.gr)                                //
-//     Jon Papaioannou (pj@uom.gr)                                         //
+//     Avgoustos Tsinakos (tsinakos@teikav.edu.gr)                         //
+//     Jon Papaioannou (pj@moodle.org)                                     //
 //                                                                         //
 // Programming and development:                                            //
-//     Jon Papaioannou (pj@uom.gr)                                         //
+//     Jon Papaioannou (pj@moodle.org)                                     //
 //                                                                         //
 // For bugs, suggestions, etc contact:                                     //
-//     Jon Papaioannou (pj@uom.gr)                                         //
+//     Jon Papaioannou (pj@moodle.org)                                     //
 //                                                                         //
 // The current module was developed at the University of Macedonia         //
 // (www.uom.gr) under the funding of the Greek School Network (www.sch.gr) //
@@ -44,8 +44,8 @@
    require_once($CFG->dirroot.'/course/lib.php');
    require_once($CFG->dirroot.'/calendar/lib.php');

-    $course = optional_param('course', 0);
-    $view = optional_param('view', 'upcoming');
+    $courseid = optional_param('course', 0, PARAM_INT);
+    $view = optional_param('view', 'upcoming', PARAM_ALPHA);
    $day  = optional_param('cal_d', 0, PARAM_INT);
    $mon  = optional_param('cal_m', 0, PARAM_INT);
    $yr   = optional_param('cal_y', 0, PARAM_INT);
@@ -54,7 +54,9 @@
        redirect($CFG->wwwroot.'/'.$CFG->admin.'/index.php');
    }

-    if ($CFG->forcelogin) {
+    if ($courseid) {
+        require_login($courseid);
+    } else if ($CFG->forcelogin) {
        require_login();
    }

@@ -87,8 +89,8 @@
    }

    // If a course has been supplied in the URL, change the filters to show that one
-    if (!empty($course)) {
-        if ($course = get_record('course', 'id', $course)) {
+    if (!empty($courseid)) {
+        if ($course = get_record('course', 'id', $courseid)) {
            if ($course->id == SITEID) {
                // If coming from the home page, show all courses
                $SESSION->cal_courses_shown = calendar_get_default_courses(true);
@@ -100,6 +102,8 @@
                calendar_set_referring_course($SESSION->cal_courses_shown);
            }
        }
+    } else {
+        $course = null;
    }

    if (empty($USER->id) or isguest()) {
@@ -302,9 +306,15 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) {
    list($d, $m, $y) = array($date['mday'], $date['mon'], $date['year']); // This is what we want to display
    $display->maxdays = calendar_days_in_month($m, $y);

-    // We 'll keep these values as GMT here, and offset them when the time comes to query the db
-    $display->tstart = gmmktime(0, 0, 0, $m, 1, $y); // This is GMT
-    $display->tend = gmmktime(23, 59, 59, $m, $display->maxdays, $y); // GMT
+    if (get_user_timezone_offset() < 99) {
+        // We 'll keep these values as GMT here, and offset them when the time comes to query the db
+	    $display->tstart = gmmktime(0, 0, 0, $m, 1, $y); // This is GMT
+	    $display->tend = gmmktime(23, 59, 59, $m, $display->maxdays, $y); // GMT
+    } else {
+        // no timezone info specified
+	    $display->tstart = mktime(0, 0, 0, $m, 1, $y);
+	    $display->tend = mktime(23, 59, 59, $m, $display->maxdays, $y);
+    }

    $startwday = gmdate('w', $display->tstart); // $display->tstart is already GMT, so don't use date(): messes with server's TZ

@@ -440,7 +450,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) {
        if(isset($eventsbyday[$day])) {
            echo '<ul class="events-new">';
            foreach($eventsbyday[$day] as $eventindex) {
-                echo '<li><a href="'.$dayhref.'">'.format_string($events[$eventindex]->name,true).'</a></li>';
+                echo '<li><a href="'.$dayhref.'#event_'.$events[$eventindex]->id.'">'.format_string($events[$eventindex]->name, true).'</a></li>';
            }
            echo '</ul>';
        }
@@ -139,6 +139,9 @@ $CFG->admin = 'admin';
 // Useful for webhost operators who have alternate methods of backups
 //      $CFG->disablescheduledbackups = true;
 //
+// Prevent stats processing and hide the GUI
+//      $CFG->disablestatsprocessing = true;
+//
 // Restrict certain usernames from doing things that may mess up a site
 // This is especially useful for demonstration teacher accounts
 //      $CFG->restrictusers = 'teacher,fred,jim';
@@ -8,7 +8,7 @@

    $id       = required_param('id', PARAM_INT);          // Category id
    $page     = optional_param('page', 0, PARAM_INT);     // which page to show
-    $perpage  = optional_param('perpage', 20, PARAM_INT); // how many per page
+    $perpage  = optional_param('perpage', $CFG->coursesperpage, PARAM_INT); // how many per page
    $edit     = optional_param('edit', -1, PARAM_BOOL);
    $hide     = optional_param('hide', 0, PARAM_INT);
    $show     = optional_param('show', 0, PARAM_INT);
@@ -60,7 +60,7 @@
        $strsummaryof = get_string('summaryof', '', " $sectionname $form->section");
    }

-    print_header_simple($stredit, '', $stredit);
+    print_header_simple($stredit, '', $stredit, 'theform.summary' );

    print_heading($strsummaryof);
    print_simple_box_start('center');
@@ -60,13 +60,13 @@
 /// moved here to fix bug 5734
    if ($course->metacourse) {
        print_header_simple();
-        notice(get_string('coursenotaccessible'), $CFG->wwwroot);
+        notice(get_string('coursenotaccessible'), "$CFG->wwwroot/index.php");
    }
    
 /// Users can't enroll to site course
    if (!$course->category) {
        print_header_simple();
-        notice(get_string('enrollfirst'), $CFG->wwwroot);
+        notice(get_string('enrollfirst'), "$CFG->wwwroot/index.php");
    }

 /// Double check just in case they are enrolled to start in the future 
@@ -75,22 +75,23 @@
        if ($course->enrolperiod and $student->timestart and ($student->timestart >= time())) {
            $message = get_string('enrolmentnotyet', '', userdate($student->timestart));
            print_header();
-            notice($message, $CFG->wwwroot);
+            notice($message, "$CFG->wwwroot/index.php");
        }
    }

 /// Check if the course is enrollable
    if (!method_exists($enrol, 'print_entry')) {
        print_header_simple();
-        notice(get_string('enrolmentnointernal'), $CFG->wwwroot);
+        notice(get_string('enrolmentnointernal'), "$CFG->wwwroot/index.php");
    }

-    if (!$course->enrollable ||
+    if (!$loginasguest and ($USER->username != 'guest') and(
+            !$course->enrollable ||
            ($course->enrollable == 2 && $course->enrolstartdate > 0 && $course->enrolstartdate > time()) ||
            ($course->enrollable == 2 && $course->enrolenddate > 0 && $course->enrolenddate <= time())
-            ) {
-        print_header_simple();
-        notice(get_string('notenrollable'), $CFG->wwwroot);
+            )) {
+        print_header($course->shortname, $course->fullname, $course->shortname );
+        notice(get_string('notenrollable'), "$CFG->wwwroot/index.php");
    }

 /// Check the submitted enrollment key if there is one
@@ -56,6 +56,9 @@
        }

        echo "<center>";
+        if (isloggedin() and !isguest() and !isadmin() and !iscreator()) {  // Print link to request a new course
+            print_single_button("request.php", NULL, get_string("courserequest"), "get");
+        }
        if (iscreator()) {       // Print link to create a new course
            print_single_button("edit.php", NULL, get_string("addnewcourse"), "get");
        }
@@ -10,6 +10,10 @@

    $jump = optional_param('jump', '', PARAM_RAW);

+    if (!confirm_sesskey()) {
+        print_error('confirmsesskeybad');
+    }
+
    if (strpos($jump, $CFG->wwwroot) === 0) {            // Anything on this site
        redirect(urldecode($jump));
    } else if (preg_match('/^[a-z]+\.php\?/', $jump)) { 
@@ -408,7 +408,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per

        $log->url  = strip_tags(urldecode($log->url));   // Some XSS protection
        $log->info = strip_tags(urldecode($log->info));  // Some XSS protection
-        $log->url  = str_replace('&', '&amp;', $log->url); /// XHTML compatibility
+        $log->url  = s($log->url); /// XSS protection and XHTML compatibility - should be in link_to_popup_window() instead!!

        echo '<tr class="r'.$row.'">';
        if ($course->id == SITEID) {
@@ -1202,14 +1202,14 @@ function print_courses($category, $width="100%", $hidesitecourse = false) {
        $categories = get_categories(0);  // Parent = 0   ie top-level categories only
        if (count($categories) == 1) {
            $category   = array_shift($categories);
-            $courses    = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol');
+            $courses    = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol,c.guest');
        } else {
-            $courses    = get_courses('all', 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol');
+            $courses    = get_courses('all', 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol,c.guest');
        }
        unset($categories);
    } else {
        $categories = get_categories($category->id);  // sub categories
-        $courses    = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol');
+        $courses    = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol,c.guest');
    }

    if ($courses) {
@@ -1847,7 +1847,7 @@ function move_courses ($courseids, $categoryid) {
                    // figure out a sortorder that we can use in the destination category
                    $sortorder = get_field_sql('SELECT MIN(sortorder)-1 AS min
                                                    FROM ' . $CFG->prefix . 'course WHERE category=' . $categoryid);
-                    if ($sortorder === false) {
+                    if (is_null($sortorder) || $sortorder === false) {
                        // the category is empty
                        // rather than let the db default to 0
                        // set it to > 100 and avoid extra work in fix_coursesortorder()                        
@@ -503,7 +503,7 @@
        $form->sesskey      = !empty($USER->id) ? $USER->sesskey : '';

        $sectionname    = get_string("name$course->format");
-        $fullmodulename = strtolower(get_string("modulename", $module->name));
+        $fullmodulename = get_string("modulename", $module->name);

        if ($form->section && $course->format != 'site') {
            $heading->what = $fullmodulename;
@@ -563,7 +563,7 @@
        $form->sesskey      = !empty($USER->id) ? $USER->sesskey : '';

        $sectionname    = get_string("name$course->format");
-        $fullmodulename = strtolower(get_string("modulename", $module->name));
+        $fullmodulename = get_string("modulename", $module->name);

        if ($form->section) {
            $heading->what = $fullmodulename;
@@ -638,7 +638,7 @@
    $strmodulenameplural = get_string("modulenameplural", $module->name);

    if ($module->name == "label") {
-        $focuscursor = "";
+        $focuscursor = "form.content";
    } else {
        $focuscursor = "form.name";
    }
@@ -25,6 +25,7 @@
    add_to_log($course->id, "course", "recent", "recent.php?id=$course->id", "$course->id");

    $strrecentactivity = get_string("recentactivity");
+    $meta = '<meta name="robots" content="none" />'; // prevent duplicate content in search engines MDL-7299

    $loggedinas = user_login_string($course, $USER);

@@ -42,13 +43,13 @@
        if ($date)
            $dateinfo = userdate($date, get_string("strftimedaydate"));

-        if ($course->category) {
+        if ($course->id != SITEID) {
            print_header("$course->shortname: $strrecentactivity", "$course->fullname",
                         "<a href=\"view.php?id=$course->id\">$course->shortname</a> ->
-                          <a href=\"recent.php?id=$course->id\">$strrecentactivity</a> -> $userinfo, $dateinfo", "");
+                          <a href=\"recent.php?id=$course->id\">$strrecentactivity</a> -> $userinfo, $dateinfo", "", $meta);
        } else {
            print_header("$course->shortname: $strrecentactivity", "$course->fullname",
-                         "<a href=\"recent.php?id=$course->id\">$strrecentactivity</a> -> $userinfo, $dateinfo", "");
+                         "<a href=\"recent.php?id=$course->id\">$strrecentactivity</a> -> $userinfo, $dateinfo", "", $meta);
        }

        print_heading("$course->fullname: $userinfo, $dateinfo (".usertimezone().")", '', 3);
@@ -67,12 +68,12 @@
            }
        }

-        if ($course->category) {
+        if ($course->id != SITEID) {
            print_header("$course->shortname: $strrecentactivity", "$course->fullname",
-                     "<a href=\"view.php?id=$course->id\">$course->shortname</a> -> $strrecentactivity", "");
+                     "<a href=\"view.php?id=$course->id\">$course->shortname</a> -> $strrecentactivity", "", $meta);
        } else {
            print_header("$course->shortname: $strrecentactivity", "$course->fullname",
-                     "$strrecentactivity", "");
+                     "$strrecentactivity", "", $meta);
        }

        print_heading(get_string("activitysince", "", userdate($date)));
@@ -155,7 +155,7 @@
    $postfun = $module->name.'_get_post_actions';

    if (!function_exists($viewfun) || !function_exists($postfun)) {
-        error(get_string('modulemisssingcode','error',$module->name),$baseurl);
+        error(get_string('modulemissingcode','error',$module->name),$baseurl);
    }

    $viewnames = $viewfun();
@@ -1,5 +1,9 @@
 <?php

+    if (!defined('MOODLE_INTERNAL')) {
+        die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+    }
+
    $courses = get_courses('all','c.shortname','c.id,c.shortname,c.fullname');
    $courseoptions = array();

@@ -139,4 +143,4 @@
        print_table($table);
    }

-?>
+?>
@@ -219,7 +219,7 @@

        if ($perpage != 99999 && $totalcount > $perpage) {
            echo "<center><p>";
-            echo "<a href=\"search.php?search=$encoededsearch&perpage=99999\">".get_string("showall", "", $totalcount)."</a>";
+            echo "<a href=\"search.php?search=$encodedsearch&perpage=99999\">".get_string("showall", "", $totalcount)."</a>";
            echo "</p></center>";
        }

@@ -11,7 +11,7 @@
    }

    if (!empty($sub)) {
-        $sub = "#$sub";
+        $sub = '#'.s($sub);
    } else {
        $sub = "";
    }
@@ -114,7 +114,7 @@
     by creating a file in the data directory called .htaccess, containing this line:
  <blockquote>
     
-    <pre>deny from all</pre>
+    <pre>deny from all<br />AllowOverride None</pre>
  </blockquote>
  <p>To make sure that Moodle can save uploaded files in this directory, check that 
     the web server software (eg Apache) has permission to write 
@@ -10,13 +10,14 @@ define('AN_ERROR',    '3');
 define('AN_DELIM',    '|');
 define('AN_ENCAP',    '"');

-require_once('const.php');
+require_once($CFG->dirroot.'/enrol/authorize/const.php');
+require_once($CFG->dirroot.'/enrol/authorize/enrol.php');

 /**
 * Gets settlement date and time
 *
- * @param int $time Processed time, usually now.
- * @return int Settlement date
+ * @param int $time Time processed, usually now.
+ * @return int Settlement date and time
 */
 function authorize_getsettletime($time)
 {
@@ -54,10 +55,6 @@ function authorize_expired(&$order)
 {
    static $timediff30;

-    if (empty($timediff30)) {
-        $timediff30 = authorize_getsettletime(time()) - (30 * 24 * 3600);
-    }
-
    if ($order->status == AN_STATUS_EXPIRE) {
        return true;
    }
@@ -65,28 +62,32 @@ function authorize_expired(&$order)
        return false;
    }

-    $exp = (authorize_getsettletime($order->timecreated) < $timediff30);
+    if (empty($timediff30)) {
+        $timediff30 = authorize_getsettletime(time()) - (30 * 24 * 3600);
+    }

-    if ($exp) {
+    $isexpired = (authorize_getsettletime($order->timecreated) < $timediff30);
+    if ($isexpired) {
        $order->status = AN_STATUS_EXPIRE;
        update_record('enrol_authorize', $order);
    }
-
-    return $exp;
+    return $isexpired;
 }

 /**
- * Performs an action on authorize.net
+ * Performs an action on authorize.net and updates/inserts records. If record update fails,
+ * sends email to admin.
 *
 * @param object &$order Which transaction data will be sent. See enrol_authorize table.
- * @param string &$message Information about error messages.
- * @param object &$extra Extra transaction data.
+ * @param string &$message Information about error message if this function returns false.
+ * @param object &$extra Extra data that used for refunding and credit card information.
 * @param int $action Which action will be performed. See AN_ACTION_*
- * @return bool true, transaction was successful, false otherwise.
+ * @param string $cctype Used internally to configure credit types automatically.
+ * @return bool true Transaction was successful, false otherwise. Use $message for reason.
 * @author Ethem Evlice <ethem a.t evlice d.o.t com>
 * @uses $CFG
 */
-function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE)
+function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE, $cctype=NULL)
 {
    global $CFG;
    static $conststring;
@@ -94,37 +95,34 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE)
    $test = !empty($CFG->an_test);

    if (!isset($conststring)) {
-        $consdata = array(
+        $mconfig = get_config('enrol/authorize');
+        $constdata = array(
             'x_version'         => '3.1',
             'x_delim_data'      => 'True',
             'x_delim_char'      => AN_DELIM,
             'x_encap_char'      => AN_ENCAP,
             'x_relay_response'  => 'FALSE',
             'x_method'          => 'CC',
-             'x_login'           => $CFG->an_login,
+             'x_login'           => rc4decrypt($mconfig->an_login),
             'x_test_request'    => $test ? 'TRUE' : 'FALSE'
        );
        $str = '';
-        foreach($consdata as $ky => $vl) {
+        foreach($constdata as $ky => $vl) {
            $str .= $ky . '=' . urlencode($vl) . '&';
        }
-        $str .= (!empty($CFG->an_tran_key)) ?
-                'x_tran_key=' . urlencode($CFG->an_tran_key):
-                'x_password=' . urlencode($CFG->an_password);
+        $str .= (!empty($mconfig->an_tran_key)) ?
+                'x_tran_key=' . urlencode(rc4decrypt($mconfig->an_tran_key)):
+                'x_password=' . urlencode(rc4decrypt($mconfig->an_password));

        $conststring = $str;
    }

    $action = intval($action);

-    if (empty($order) || empty($order->id)) {
+    if (empty($order) or empty($order->id)) {
        $message = "Check order->id!";
        return false;
    }
-    elseif ($action <= AN_ACTION_NONE || $action > AN_ACTION_VOID) {
-        $message = "No action taken!";
-        return false;
-    }

    $poststring = $conststring;

@@ -180,11 +178,10 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE)
                return false;
            }
            if (empty($extra)) {
-                $message = "need extra fields for CREDIT!";
+                $message = "Need extra fields to REFUND!";
                return false;
            }
            $total = floatval($extra->sum) + floatval($extra->amount);
-            unset($extra->sum); // this is not used in refunds table.
            if (($extra->amount == 0) || ($total > $order->amount)) {
                $message = "Can be credited up to original amount.";
                return false;
@@ -198,20 +195,8 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE)

        case AN_ACTION_VOID:
        {
-            if ($order->status == AN_STATUS_AUTH) {
-                if (authorize_expired($order)) {
-                    $message = "Authorized transaction must be voided within 30 days. EXPIRED!";
-                    return false;
-                }
-            }
-            elseif ($order->status == AN_STATUS_AUTHCAPTURE or $order->status == AN_STATUS_CREDIT) {
-                if (authorize_settled($order)) {
-                    $message = "Settled transaction cannot be voided. Check Cut-Off time!";
-                    return false;
-                }
-            }
-            else {
-                $message = "Order status must be authorized, auth/captured or refunded!";
+            if (authorize_expired($order) || authorize_settled($order)) {
+                $message = "The transaction cannot be voided due to the fact that it is expired or settled.";
                return false;
            }
            $poststring .= '&x_type=VOID&x_trans_id=' . urlencode($order->transid);
@@ -219,7 +204,7 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE)
        }

        default: {
-            $message = "Missing action? $action";
+            $message = "Invalid action: $action";
            return false;
        }
    }
@@ -229,6 +214,7 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE)
        $referer = "Referer: $CFG->an_referer\r\n";
    }

+    $errno = 0; $errstr = '';
    $host = $test ? 'certification.authorize.net' : 'secure.authorize.net';
    $fp = fsockopen("ssl://$host", 443, $errno, $errstr, 60);
    if (!$fp) {
@@ -236,6 +222,12 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE)
        return false;
    }

+    // critical section
+    @ignore_user_abort(true);
+    if (intval(ini_get('max_execution_time')) > 0) {
+        @set_time_limit(300);
+    }
+
    fwrite($fp, "POST /gateway/transact.dll HTTP/1.0\r\n" .
                "Host: $host\r\n" . $referer .
                "Content-type: application/x-www-form-urlencoded\r\n" .
@@ -284,11 +276,15 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE)
                $order->transid = $transid;
                if ($action == AN_ACTION_AUTH_ONLY) {
                    $order->status = AN_STATUS_AUTH;
-                    // dont't update settletime
+                    // don't update order->settletime
                } else {
                    $order->status = AN_STATUS_AUTHCAPTURE;
                    $order->settletime = authorize_getsettletime(time());
                }
+                if (! update_record('enrol_authorize', $order)) {
+                    enrolment_plugin_authorize::email_to_admin("Error while trying to update data " .
+                    "in table enrol_authorize. Please edit manually this record: ID=$order->id.", $order);
+                }
                break;
            }
            case AN_ACTION_CREDIT:
@@ -298,30 +294,47 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE)
                $extra->status = AN_STATUS_CREDIT;
                $extra->transid = $transid;
                $extra->settletime = authorize_getsettletime(time());
+                unset($extra->sum); // this is not used in refunds table.
+                if (! $extra->id = insert_record('enrol_authorize_refunds', $extra)) {
+                    enrolment_plugin_authorize::email_to_admin("Error while trying to insert data " .
+                    "into table enrol_authorize_refunds. Please add manually this record:", $extra);
+                }
                break;
            }
            case AN_ACTION_VOID:
            {
+                $tableupdate = ($order->status == AN_STATUS_CREDIT) ? 'enrol_authorize_refunds' : 'enrol_authorize';
                $order->status = AN_STATUS_VOID;
-                // dont't update settletime
+                // don't update order->settletime
+                if (! update_record($tableupdate, $order)) {
+                    enrolment_plugin_authorize::email_to_admin("Error while trying to update data " .
+                    "in table $tableupdate. Please edit manually this record: ID=$order->id.", $order);
+                }
                break;
            }
-            default: return false;
        }
        return true;
    }
    else
    {
-        $reason = "reason" . $response[2];
-        $message = get_string($reason, "enrol_authorize");
-        if ($message == '[[' . $reason . ']]') {
+        $reasonno = $response[2];
+        $reasonstr = "reason" . $reasonno;
+        $message = get_string($reasonstr, "enrol_authorize");
+        if ($message == '[[' . $reasonstr . ']]') {
            $message = isset($response[3]) ? $response[3] : 'unknown error';
        }
-        if (!empty($CFG->an_avs)) {
+        if (! (empty($CFG->an_avs) or $response[5] == "P")) { // P = AVS not applicable
            $avs = "avs" . strtolower($response[5]);
            $stravs = get_string($avs, "enrol_authorize");
            $message .= "<br />" . get_string("avsresult", "enrol_authorize", $stravs);
        }
+        if (!$test && !empty($cctype) && ($reasonno == 17 or $reasonno == 28)) {
+            $ccaccepts = enrolment_plugin_authorize::get_list_of_creditcards();
+            unset($ccaccepts[$cctype]);
+            set_config('an_acceptccs', implode(',', array_keys($ccaccepts)));
+            enrolment_plugin_authorize::email_to_admin("$message: ($cctype)" .
+            "This is new config(an_acceptccs):", $ccaccepts);
+        }
        return false;
    }
 }
@@ -9,6 +9,7 @@ if (!isset($frm->enrol_mailadmins)) $frm->enrol_mailadmins = '';
 if (!isset($frm->an_login)) $frm->an_login = '';
 if (!isset($frm->an_tran_key)) $frm->an_tran_key = '';
 if (!isset($frm->an_password)) $frm->an_password = '';
+if (!isset($frm->delete_current)) $frm->delete_current = '';
 if (!isset($frm->an_referer)) $frm->an_referer = 'http://';
 if (!isset($frm->an_avs)) $frm->an_avs = '';
 if (!isset($frm->an_test)) $frm->an_test = '';
@@ -31,7 +32,7 @@ if (!isset($frm->an_cutoff_hour)) {
 }

 if (!isset($frm->acceptccs)) {
-    $frm->acceptccs = array_keys(get_list_of_creditcards());
+    $frm->acceptccs = array_keys(enrolment_plugin_authorize::get_list_of_creditcards());
    $CFG->an_acceptccs = implode(',', $frm->acceptccs);
 }

@@ -48,7 +49,7 @@ if (!isset($frm->acceptccs)) {
 <tr valign="top">
    <td align="right">enrol_cost:</td>
    <td><input type="text" size="5" name="enrol_cost" value="<?php p($frm->enrol_cost) ?>" /></td>
-    <td><?php print_string("costdefault") ?></td>
+    <td><?php print_string("costdefault") ?>. <?php print_string("costdefaultdesc", "enrol_authorize") ?></td>
 </tr>

 <tr valign="top">
@@ -78,32 +79,35 @@ if (!isset($frm->acceptccs)) {
 <tr valign="top"><td colspan="3"><h4><?php print_string("adminauthorizesettings", "enrol_authorize") ?></h4></td></tr>

 <tr valign="top">
-    <td align="right">an_login:</td>
-    <td><input type="text" name="an_login" value="<?php p($frm->an_login) ?>" /></td>
-    <td><?php print_string("anlogin", "enrol_authorize") ?></td>
+    <td align="right">&nbsp;&nbsp;</td>
+    <td><?php print_string("logininfo", "enrol_authorize") ?></td>
 </tr>

 <tr valign="top">
-    <td align="right">#&nbsp;</td>
-    <td colspan="2"><?php print_string("chooseone", "enrol_authorize") ?></td>
+    <td align="right">an_login:<br /><?php echo (isset($mconfig->an_login)) ? '<font color=green>'.get_string('ok').'</font>' : ''; ?></td>
+    <td><?php print_string("anlogin", "enrol_authorize") ?><br /><input type="text" name="an_login" size="26" value="" /><sup>*</sup></td>
 </tr>

 <tr valign="top">
-    <td align="right">an_tran_key:</td>
-    <td><input type="text" name="an_tran_key" value="<?php p($frm->an_tran_key) ?>" /></td>
-    <td><?php print_string("antrankey", "enrol_authorize") ?></td>
+    <td align="right">an_tran_key:<br /><?php echo (isset($mconfig->an_tran_key)) ? '<font color=green>'.get_string('ok').'</font>' : ''; ?></td>
+    <td><?php print_string("antrankey", "enrol_authorize") ?><br /><input type="text" name="an_tran_key" size="26" value="" /><sup>#1</sup></td>
 </tr>

 <tr valign="top">
-    <td align="right">an_password:</td>
-    <td><input type="text" name="an_password" value="<?php p($frm->an_password) ?>" /></td>
-    <td><?php print_string("anpassword", "enrol_authorize") ?></td>
+    <td align="right">an_password:<br /><?php echo (isset($mconfig->an_password)) ? '<font color=green>'.get_string('ok').'</font>' : ''; ?></td>
+    <td><?php print_string("anpassword", "enrol_authorize") ?><br /><input type="text" name="an_password" size="26" value="" /><sup>#2</sup></td>
+</tr>
+
+<tr valign="top">
+    <td align="right">delete_current:</td>
+    <td><?php print_checkbox('delete_current', '1', !empty($frm->delete_current)) ?> <br />
+        <?php print_string("deletecheck", "moodle", get_string('oldpassword')) ?><br /><hr size="1" width="100%" noshade /></td>
 </tr>

 <tr valign="top">
    <td align="right">an_referer:</td>
-    <td><input type="text" name="an_referer" value="<?php p($frm->an_referer) ?>" /></td>
-    <td><?php print_string("anreferer", "enrol_authorize") ?></td>
+    <td><input type="text" name="an_referer" size="35" value="<?php p($frm->an_referer) ?>" /><br />
+        <?php print_string("anreferer", "enrol_authorize") ?></td>
 </tr>

 <tr valign="top">
@@ -127,7 +131,7 @@ if (!isset($frm->acceptccs)) {
 <tr valign="top">
    <td align="right">an_acceptccs:</td>
    <td><?php
-    $allccs = get_list_of_creditcards(true);
+    $allccs = enrolment_plugin_authorize::get_list_of_creditcards(true);
    foreach ($allccs as $key => $val) {
        print_checkbox('acceptccs[]', $key, stristr($CFG->an_acceptccs, $key) !== false, $val); echo "<br />\n";
    }
@@ -108,6 +108,27 @@ function enrol_authorize_upgrade($oldversion=0) {
        delete_records('config_plugins', 'name', 'an_nextmail');
    }

+    if ($oldversion < 2006021531) { // Don't show authorize.net login info at config page
+        if (isset($CFG->an_login)) {
+            if (!empty($CFG->an_login)) {
+                set_config('an_login', rc4encrypt($CFG->an_login), 'enrol/authorize');
+            }
+            delete_records('config', 'name', 'an_login');
+        }
+        if (isset($CFG->an_tran_key)) {
+            if (!empty($CFG->an_tran_key)) {
+                set_config('an_tran_key', rc4encrypt($CFG->an_tran_key), 'enrol/authorize');
+            }
+            delete_records('config', 'name', 'an_tran_key');
+        }
+        if (isset($CFG->an_password)) {
+            if (!empty($CFG->an_password)) {
+                set_config('an_password', rc4encrypt($CFG->an_password), 'enrol/authorize');
+            }
+            delete_records('config', 'name', 'an_password');
+        }
+    }
+
    return $result;
 }

@@ -119,6 +119,27 @@ function enrol_authorize_upgrade($oldversion=0) {
        delete_records('config_plugins', 'name', 'an_nextmail');
    }

+    if ($oldversion < 2006021531) { // Don't show authorize.net login info at config page
+        if (isset($CFG->an_login)) {
+            if (!empty($CFG->an_login)) {
+                set_config('an_login', rc4encrypt($CFG->an_login), 'enrol/authorize');
+            }
+            delete_records('config', 'name', 'an_login');
+        }
+        if (isset($CFG->an_tran_key)) {
+            if (!empty($CFG->an_tran_key)) {
+                set_config('an_tran_key', rc4encrypt($CFG->an_tran_key), 'enrol/authorize');
+            }
+            delete_records('config', 'name', 'an_tran_key');
+        }
+        if (isset($CFG->an_password)) {
+            if (!empty($CFG->an_password)) {
+                set_config('an_password', rc4encrypt($CFG->an_password), 'enrol/authorize');
+            }
+            delete_records('config', 'name', 'an_password');
+        }
+    }
+
    return $result;
 }

@@ -1,8 +1,8 @@
 <?php // $Id$

-$this->prevent_double_paid($course);
+enrolment_plugin_authorize::prevent_double_paid($course);
 $formvars = array('password', 'ccaddress', 'cccity', 'ccstate', 'cccountry', 'cczip',
-                  'ccfirstname', 'cclastname', 'cc', 'ccexpiremm', 'ccexpireyyyy', 'cctype', 'cvv');
+                  'firstname', 'lastname', 'cc', 'ccexpiremm', 'ccexpireyyyy', 'cctype', 'cvv');

 foreach ($formvars as $var) {
    if (!isset($form->$var)) {
@@ -10,9 +10,9 @@ foreach ($formvars as $var) {
    }
 }

-$curcost = $this->get_course_cost($course);
-$userfirstname = empty($form->ccfirstname) ? $USER->firstname : $form->ccfirstname;
-$userlastname = empty($form->cclastname) ? $USER->lastname : $form->cclastname;
+$curcost = enrolment_plugin_authorize::get_course_cost($course);
+$userfirstname = empty($form->firstname) ? $USER->firstname : $form->firstname;
+$userlastname = empty($form->lastname) ? $USER->lastname : $form->lastname;
 $useraddress = empty($form->ccaddress) ? $USER->address : $form->ccaddress;
 $usercity = empty($form->cccity) ? $USER->city : $form->cccity;
 $usercountry = empty($form->cccountry) ? $USER->country : $form->cccountry;
@@ -37,8 +37,8 @@ $usercountry = empty($form->cccountry) ? $USER->country : $form->cccountry;
 </tr>
 <tr>
  <td align="right"><?php print_string("nameoncard", "enrol_authorize") ?>: </td>
-  <td align="left"><input type="text" name="ccfirstname" size="8" value="<?php p($userfirstname) ?>" />
-  <input type="text" name="cclastname" size="8" value="<?php p($userlastname) ?>" />
+  <td align="left"><input type="text" name="firstname" size="8" value="<?php p($userfirstname) ?>" />
+  <input type="text" name="lastname" size="8" value="<?php p($userlastname) ?>" />
  <?php if (!empty($this->ccerrors['ccfirstlast'])) { formerr($this->ccerrors['ccfirstlast']); } ?></td>
 </tr>
 <tr>
@@ -60,7 +60,7 @@ $usercountry = empty($form->cccountry) ? $USER->country : $form->cccountry;
 <tr>
  <td align="right"><?php print_string("cctype", "enrol_authorize") ?>: </td>
  <td align="left"><?php
-  choose_from_menu(get_list_of_creditcards(), 'cctype', $form->cctype);
+  choose_from_menu(enrolment_plugin_authorize::get_list_of_creditcards(), 'cctype', $form->cctype);
  if (!empty($this->ccerrors['cctype'])) { formerr($this->ccerrors['cctype']); }
  ?>
 </td>
@@ -1,44 +1,8 @@
-<?php  // $Id$
+<?php // $Id$

 require_once($CFG->dirroot.'/enrol/enrol.class.php');
 require_once($CFG->dirroot.'/enrol/authorize/const.php');

-/**
- * get_list_of_creditcards
- *
- * @param bool $getall
- * @return array
- */
-function get_list_of_creditcards($getall = false)
-{
-    global $CFG;
-
-    $alltypes = array(
-        'mcd' => 'Master Card',
-        'vis' => 'Visa',
-        'amx' => 'American Express',
-        'dsc' => 'Discover',
-        'dnc' => 'Diners Club',
-        'jcb' => 'JCB',
-        'swi' => 'Switch',
-        'dlt' => 'Delta',
-        'enr' => 'EnRoute'
-    );
-
-    if ($getall || empty($CFG->an_acceptccs)) {
-        return $alltypes;
-    }
-
-    $ret = array();
-    $ccs = explode(',', $CFG->an_acceptccs);
-
-    foreach ($ccs as $key) {
-        $ret[$key] = $alltypes[$key];
-    }
-
-    return $ret;
-}
-
 /**
 * enrolment_plugin_authorize
 *
@@ -100,7 +64,7 @@ class enrolment_plugin_authorize
    function print_entry($course) {
        global $CFG, $USER, $form;

-        $zerocost = $this->zero_cost($course);
+        $zerocost = enrolment_plugin_authorize::zero_cost($course);
        if ($zerocost) {
            $manual = enrolment_factory::factory('manual');
            if (!empty($this->errormsg)) {
@@ -110,9 +74,7 @@ class enrolment_plugin_authorize
            return;
        }

-        httpsrequired();
-
-        if (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') {
+        if (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 443) { // MDL-9836
            if (empty($CFG->loginhttps)) {
                error(get_string('httpsrequired', 'enrol_authorize'));
            } else {
@@ -122,6 +84,8 @@ class enrolment_plugin_authorize
            }
        }

+        httpsrequired();
+
        $strcourses = get_string('courses');
        $strloginto = get_string('loginto', '', $course->shortname);

@@ -132,17 +96,18 @@ class enrolment_plugin_authorize
            print_heading(get_string('choosemethod', 'enrol_authorize'), 'center');
        }

+        print_simple_box_start('center');
        if (isguest()) {
-            $curcost = $this->get_course_cost($course);
-            echo '<div align="center"><p>'.get_string('paymentrequired').'</p>';
+            $curcost = enrolment_plugin_authorize::get_course_cost($course);
+            echo '<div align="center">';
+            echo '<p>'.get_string('paymentrequired').'</p>';
            echo '<p><b>'.get_string('cost').": $curcost[currency] $curcost[cost]".'</b></p>';
            echo '<p><a href="'.$CFG->httpswwwroot.'/login/">'.get_string('loginsite').'</a></p>';
            echo '</div>';
        } else {
-            print_simple_box_start('center');
            include($CFG->dirroot.'/enrol/authorize/enrol.html');
-            print_simple_box_end();
        }
+        print_simple_box_end();

        if ($course->password) {
            $password = '';
@@ -162,7 +127,8 @@ class enrolment_plugin_authorize
     * @access public
     */
    function check_entry($form, $course) {
-        if ($this->zero_cost($course) or (!empty($course->password) and !empty($form->password))) {
+        if (enrolment_plugin_authorize::zero_cost($course) or
+           (!empty($course->password) and !empty($form->password))) {
            $manual = enrolment_factory::factory('manual');
            $manual->check_entry($form, $course);
            if (!empty($manual->errormsg)) {
@@ -187,17 +153,17 @@ class enrolment_plugin_authorize
        global $CFG, $USER, $SESSION;
        require_once('authorizenetlib.php');

-        $this->prevent_double_paid($course);
+        enrolment_plugin_authorize::prevent_double_paid($course);

        $useripno = getremoteaddr();
-        $curcost = $this->get_course_cost($course);
+        $curcost = enrolment_plugin_authorize::get_course_cost($course);
        $exp_date = sprintf("%02d", $form->ccexpiremm) . $form->ccexpireyyyy;

        // NEW ORDER
        $timenow = time();
        $order = new stdClass();
        $order->cclastfour = substr($form->cc, -4);
-        $order->ccname = $form->ccfirstname . " " . $form->cclastname;
+        $order->ccname = $form->firstname . " " . $form->lastname;
        $order->courseid = $course->id;
        $order->userid = $USER->id;
        $order->status = AN_STATUS_NONE; // it will be changed...
@@ -208,7 +174,7 @@ class enrolment_plugin_authorize
        $order->currency = $curcost['currency'];
        $order->id = insert_record("enrol_authorize", $order);
        if (!$order->id) {
-            $this->email_to_admin("Error while trying to insert new data", $order);
+            enrolment_plugin_authorize::email_to_admin("Error while trying to insert new data", $order);
            $this->ccerrors['header'] = "Insert record error. Admin has been notified!";
            return;
        }
@@ -219,8 +185,8 @@ class enrolment_plugin_authorize
        $extra->x_exp_date = $exp_date;
        $extra->x_currency_code = $curcost['currency'];
        $extra->x_amount = $curcost['cost'];
-        $extra->x_first_name = $form->ccfirstname;
-        $extra->x_last_name = $form->cclastname;
+        $extra->x_first_name = $form->firstname;
+        $extra->x_last_name = $form->lastname;
        $extra->x_country = $form->cccountry;
        $extra->x_address = $form->ccaddress;
        $extra->x_state = $form->ccstate;
@@ -240,9 +206,9 @@ class enrolment_plugin_authorize
        $message = '';
        $an_review = !empty($CFG->an_review);
        $action = $an_review ? AN_ACTION_AUTH_ONLY : AN_ACTION_AUTH_CAPTURE;
-        $success = authorize_action($order, $message, $extra, $action);
+        $success = authorize_action($order, $message, $extra, $action, $form->cctype);
        if (!$success) {
-            $this->email_to_admin($message, $order);
+            enrolment_plugin_authorize::email_to_admin($message, $order);
            $this->ccerrors['header'] = $message;
            return;
        }
@@ -261,43 +227,31 @@ class enrolment_plugin_authorize
            return;
        }

-        if ($an_review) { // review enabled, inform admin and redirect to main page.
-            if (update_record("enrol_authorize", $order)) {
-                $a = new stdClass;
-                $a->url = "$CFG->wwwroot/enrol/authorize/index.php?order=$order->id";
-                $a->orderid = $order->id;
-                $a->transid = $order->transid;
-                $a->amount = "$order->currency $order->amount";
-                $a->expireon = userdate(authorize_getsettletime($timenow + (30 * 3600 * 24)));
-                $a->captureon = userdate(authorize_getsettletime($timenow + (intval($CFG->an_capture_day) * 3600 * 24)));
-                $a->course = $course->fullname;
-                $a->user = fullname($USER);
-                $a->acstatus = ($CFG->an_capture_day > 0) ? get_string('yes') : get_string('no');
-                $emailmessage = get_string('adminneworder', 'enrol_authorize', $a);
-                $a = new stdClass;
-                $a->course = $course->shortname;
-                $a->orderid = $order->id;
-                $emailsubject = get_string('adminnewordersubject', 'enrol_authorize', $a);
-                $admins = get_admins();
-                foreach ($admins as $admin) {
-                    email_to_user($admin, $USER, $emailsubject, $emailmessage);
-                }
-            }
-            else {
-                $this->email_to_admin("Error while trying to update data. Please edit manually this record: " .
-                                      "ID=$order->id in enrol_authorize table.", $order);
+        if ($an_review) { // review enabled, inform admin and redirect user to main page.
+            $a = new stdClass;
+            $a->url = "$CFG->wwwroot/enrol/authorize/index.php?order=$order->id";
+            $a->orderid = $order->id;
+            $a->transid = $order->transid;
+            $a->amount = "$order->currency $order->amount";
+            $a->expireon = userdate(authorize_getsettletime($timenow + (30 * 3600 * 24)));
+            $a->captureon = userdate(authorize_getsettletime($timenow + (intval($CFG->an_capture_day) * 3600 * 24)));
+            $a->course = $course->fullname;
+            $a->user = fullname($USER);
+            $a->acstatus = ($CFG->an_capture_day > 0) ? get_string('yes') : get_string('no');
+            $emailmessage = get_string('adminneworder', 'enrol_authorize', $a);
+            $a = new stdClass;
+            $a->course = $course->shortname;
+            $a->orderid = $order->id;
+            $emailsubject = get_string('adminnewordersubject', 'enrol_authorize', $a);
+            $admins = get_admins();
+            foreach ($admins as $admin) {
+                email_to_user($admin, $USER, $emailsubject, $emailmessage);
            }
            redirect($CFG->wwwroot, get_string("reviewnotify", "enrol_authorize"), '30');
            return;
        }

-        // credit card captured, ENROL student...
-        if (!update_record("enrol_authorize", $order)) {
-            $this->email_to_admin("Error while trying to update data. Please edit manually this record: " .
-                                   "ID=$order->id in enrol_authorize table.", $order);
-                                   // no error occured??? enrol student??? return??? Database busy???
-        }
-
+        // Credit card captured, ENROL student now...
        if ($course->enrolperiod) {
            $timestart = $timenow;
            $timeend = $timestart + $course->enrolperiod;
@@ -338,7 +292,8 @@ class enrolment_plugin_authorize
                }
            }
        } else {
-            $this->email_to_admin("Error while trying to enrol ".fullname($USER)." in '$course->fullname'", $order);
+            enrolment_plugin_authorize::email_to_admin("Error while trying to enrol " .
+            fullname($USER) . " in '$course->fullname'", $order);
        }

        if ($SESSION->wantsurl) {
@@ -379,7 +334,7 @@ class enrolment_plugin_authorize
            }
        }

-        if (empty($form->ccfirstname) || empty($form->cclastname)) {
+        if (empty($form->firstname) || empty($form->lastname)) {
            $this->ccerrors['ccfirstlast'] = get_string('missingfullname');
        }

@@ -387,7 +342,8 @@ class enrolment_plugin_authorize
            $this->ccerrors['cvv'] = get_string('missingcvv', 'enrol_authorize');
        }

-        if (empty($form->cctype) || !in_array($form->cctype, array_keys(get_list_of_creditcards()))) {
+        if (empty($form->cctype) or
+            !in_array($form->cctype, array_keys(enrolment_plugin_authorize::get_list_of_creditcards()))) {
            $this->ccerrors['cctype'] = get_string('missingcctype', 'enrol_authorize');
        }

@@ -414,45 +370,6 @@ class enrolment_plugin_authorize
        return true;
    }

-    /**
-     * zero_cost
-     *
-     * @param unknown_type $course
-     * @return number
-     * @access private
-     */
-    function zero_cost($course) {
-        $curcost = $this->get_course_cost($course);
-        return (abs($curcost['cost']) < 0.01);
-    }
-
-
-    /**
-     * get_course_cost
-     *
-     * @param object $course
-     * @return array
-     * @access private
-     */
-    function get_course_cost($course)
-    {
-        global $CFG;
-
-        $cost = (float)0;
-        $currency = (!empty($course->currency))
-                     ? $course->currency :( empty($CFG->enrol_currency)
-                                            ? 'USD' : $CFG->enrol_currency );
-
-        if (!empty($course->cost)) {
-            $cost = (float)(((float)$course->cost) < 0) ? $CFG->enrol_cost : $course->cost;
-        }
-
-        $cost = format_float($cost, 2);
-        $ret = array('cost' => $cost, 'currency' => $currency);
-
-        return $ret;
-    }
-

    /**
     * Gets access icons.
@@ -465,7 +382,7 @@ class enrolment_plugin_authorize

        $manual = enrolment_factory::factory('manual');
        $str = $manual->get_access_icons($course);
-        $curcost = $this->get_course_cost($course);
+        $curcost = enrolment_plugin_authorize::get_course_cost($course);

        if (abs($curcost['cost']) > 0.00) {
            $strrequirespayment = get_string("requirespayment");
@@ -497,21 +414,31 @@ class enrolment_plugin_authorize
    function config_form($frm)
    {
        global $CFG;
+        $mconfig = get_config('enrol/authorize');

-        if (!$this->check_openssl_loaded()) {
+        if (! enrolment_plugin_authorize::check_openssl_loaded()) {
            notify('PHP must be compiled with SSL support (--with-openssl)');
        }

        if (empty($CFG->loginhttps) and substr($CFG->wwwroot, 0, 5) !== 'https') {
-            notify('loginhttps must be ON');
+            $a = new stdClass;
+            $a->url = "$CFG->wwwroot/$CFG->admin/config.php#configsectionsecurity";
+            notice(get_string('adminconfighttps', 'enrol_authorize', $a));
+        }
+        elseif (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 443) { // MDL-9836
+            $wwwsroot = qualified_me();
+            $wwwsroot = str_replace('http:', 'https:', $wwwsroot);
+            $a = new stdClass;
+            $a->url = $wwwsroot;
+            notice(get_string('adminconfighttpsgo', 'enrol_authorize', $a));
        }

        if (!empty($frm->an_review)) {
            $captureday = intval($frm->an_capture_day);
            $emailexpired = intval($frm->an_emailexpired);
            if ($captureday > 0 || $emailexpired > 0) {
-                $mconfig = get_config('enrol/authorize');
-                if ((time() - intval($mconfig->an_lastcron) > 3600 * 24)) {
+                $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
+                if ((time() - intval($lastcron) > 3600 * 24)) {
                    notify(get_string('admincronsetup', 'enrol_authorize'));
                }
            }
@@ -525,10 +452,10 @@ class enrolment_plugin_authorize
        }

        if (data_submitted()) {
-            if (empty($frm->an_login)) {
+            if (empty($mconfig->an_login)) {
                notify("an_login required");
            }
-            if (empty($frm->an_tran_key) && empty($frm->an_password)) {
+            if (empty($mconfig->an_tran_key) && empty($mconfig->an_password)) {
                notify("an_tran_key or an_password required");
            }
        }
@@ -547,9 +474,12 @@ class enrolment_plugin_authorize
    function process_config($config)
    {
        global $CFG;
+        $mconfig = get_config('enrol/authorize');

        // site settings
-        set_config('enrol_cost', optional_param('enrol_cost', 5, PARAM_INT));
+        if (($cost = optional_param('enrol_cost', 5, PARAM_INT)) > 0) {
+            set_config('enrol_cost', $cost);
+        }
        set_config('enrol_currency', optional_param('enrol_currency', 'USD', PARAM_ALPHA));
        set_config('enrol_mailstudents', optional_param('enrol_mailstudents', 0, PARAM_BOOL));
        set_config('enrol_mailteachers', optional_param('enrol_mailteachers', 0, PARAM_BOOL));
@@ -561,7 +491,9 @@ class enrolment_plugin_authorize
        set_config('an_teachermanagepay', optional_param('an_teachermanagepay', 0, PARAM_BOOL));
        set_config('an_referer', optional_param('an_referer', 'http://', PARAM_URL));

-        $acceptccs = optional_param('acceptccs', array_keys(get_list_of_creditcards()), PARAM_ALPHA);
+        $acceptccs = optional_param('acceptccs',
+                                    array_keys(enrolment_plugin_authorize::get_list_of_creditcards()),
+                                    PARAM_ALPHA);
        set_config('an_acceptccs', implode(',', $acceptccs));

        $cutoff_hour = optional_param('an_cutoff_hour', 0, PARAM_INT);
@@ -577,12 +509,12 @@ class enrolment_plugin_authorize

        $captureday = ($captureday > 29) ? 29 : (($captureday < 0) ? 0 : $captureday);
        $emailexpired = ($emailexpired > 5) ? 5 : (($emailexpired < 0) ? 0 : $emailexpired);
-        $mconfig = get_config('enrol/authorize');

-        if ((!empty($reviewval)) &&
-            ($captureday > 0 || $emailexpired > 0) &&
-            (time() - intval($mconfig->an_lastcron) > 3600 * 24)) {
-            return false;
+        if (!empty($reviewval) && ($captureday > 0 || $emailexpired > 0)) {
+            $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
+            if (time() - intval($lastcron) > 3600 * 24) {
+                return false;
+            }
        }

        set_config('an_review', $reviewval);
@@ -591,32 +523,89 @@ class enrolment_plugin_authorize
        set_config('an_emailexpiredteacher', $emailexpiredteacher);
        set_config('an_sorttype', $sorttype);

-        // required fields
-        $loginval = optional_param('an_login', '');
-        $tranval = optional_param('an_tran_key', '');
-        $passwordval = optional_param('an_password', '');
-
-        if ((empty($CFG->loginhttps) and substr($CFG->wwwroot, 0, 5) !== 'https') ||
-            !$this->check_openssl_loaded() ||
-            empty($loginval) ||
-            (empty($tranval) and empty($passwordval))) {
+        // https and openssl library is required
+        if ((substr($CFG->wwwroot, 0, 5) !== 'https' and empty($CFG->loginhttps)) or
+            !enrolment_plugin_authorize::check_openssl_loaded()) {
            return false;
        }

-        set_config('an_login', $loginval);
-        set_config('an_password', $passwordval);
-        set_config('an_tran_key', $tranval);
+        // REQUIRED fields;
+        // an_login
+        $loginval = optional_param('an_login', '');
+        if (empty($loginval) && empty($mconfig->an_login)) {
+            return false;
+        }
+        $loginval = !empty($loginval) ? rc4encrypt($loginval) : strval($mconfig->an_login);
+        set_config('an_login', $loginval, 'enrol/authorize');
+
+        // an_tran_key, an_password
+        $tranval = optional_param('an_tran_key', '');
+        $tranval = !empty($tranval) ? rc4encrypt($tranval) : (isset($mconfig->an_tran_key)?$mconfig->an_tran_key:'');
+        $passwordval = optional_param('an_password', '');
+        $passwordval = !empty($passwordval) ? rc4encrypt($passwordval) :(isset($mconfig->an_password)?$mconfig->an_password:'');
+        $deletecurrent = optional_param('delete_current', '0', PARAM_BOOL);
+        if (!empty($deletecurrent) and !empty($tranval)) {
+            delete_records('config_plugins', 'name', 'an_password', 'plugin', 'enrol/authorize');
+            $passwordval = '';
+        }
+        elseif (!empty($passwordval)) {
+            set_config('an_password', $passwordval, 'enrol/authorize');
+        }
+        if (empty($tranval) and empty($passwordval)) {
+            return false;
+        }
+        if (!empty($tranval)) {
+            set_config('an_tran_key', $tranval, 'enrol/authorize');
+        }

        return true;
    }

+    /**
+     * zero_cost (static method)
+     *
+     * @param unknown_type $course
+     * @return number
+     * @static
+     */
+    function zero_cost($course) {
+        $curcost = enrolment_plugin_authorize::get_course_cost($course);
+        return (abs($curcost['cost']) < 0.01);
+    }
+

    /**
-     * email_to_admin
+     * get_course_cost (static method)
+     *
+     * @param object $course
+     * @return array
+     * @static
+     */
+    function get_course_cost($course)
+    {
+        global $CFG;
+
+        $cost = (float)0;
+        $currency = (!empty($course->currency))
+                     ? $course->currency :( empty($CFG->enrol_currency)
+                                            ? 'USD' : $CFG->enrol_currency );
+
+        if (!empty($course->cost)) {
+            $cost = (float)(((float)$course->cost) < 0) ? $CFG->enrol_cost : $course->cost;
+        }
+
+        $cost = format_float($cost, 2);
+        $ret = array('cost' => $cost, 'currency' => $currency);
+
+        return $ret;
+    }
+
+    /**
+     * email_to_admin (static method)
     *
     * @param string $subject
     * @param mixed $data
-     * @access private
+     * @static
     */
    function email_to_admin($subject, $data)
    {
@@ -625,19 +614,16 @@ class enrolment_plugin_authorize
        $admin = get_admin();
        $data = (array)$data;

-        $message = "$SITE->fullname:  Transaction failed.\n\n$subject\n\n";
-        foreach ($data as $key => $value) {
-            $message .= "$key => $value\n";
-        }
-        email_to_user($admin, $admin, "Authorize.net ERROR: ".$subject, $message);
+        $message = "$SITE->fullname: Transaction failed.\n\n$subject\n\n";
+        $message .= print_r($data, true);
+        email_to_user($admin, $admin, "$SITE->fullname: Authorize.net ERROR", $message);
    }

-
    /**
-     * prevent_double_paid
+     * prevent_double_paid (static method)
     *
     * @param object $course
-     * @access private
+     * @static
     */
    function prevent_double_paid($course)
    {
@@ -654,22 +640,56 @@ class enrolment_plugin_authorize
        }
        if (isset($SESSION->ccpaid)) {
            unset($SESSION->ccpaid);
-            redirect($CFG->wwwroot . '/login/logout.php');
+            redirect($CFG->wwwroot . '/login/logout.php?sesskey='.sesskey());
            return;
        }
    }

-
    /**
-     * check_openssl_loaded
+     * check_openssl_loaded (static method)
     *
     * @return bool
-     * @access private
+     * @static
     */
    function check_openssl_loaded() {
        return extension_loaded('openssl');
    }

+    /**
+     * get_list_of_creditcards (static method)
+     *
+     * @param bool $getall
+     * @return array
+     * @static
+     */
+    function get_list_of_creditcards($getall = false)
+    {
+        global $CFG;
+
+        $alltypes = array(
+            'mcd' => 'Master Card',
+            'vis' => 'Visa',
+            'amx' => 'American Express',
+            'dsc' => 'Discover',
+            'dnc' => 'Diners Club',
+            'jcb' => 'JCB',
+            'swi' => 'Switch',
+            'dlt' => 'Delta',
+            'enr' => 'EnRoute'
+        );
+
+        if ($getall or empty($CFG->an_acceptccs)) {
+            return $alltypes;
+        }
+
+        $ret = array();
+        $ccs = explode(',', $CFG->an_acceptccs);
+        foreach ($ccs as $key) {
+            $ret[$key] = $alltypes[$key];
+        }
+        return $ret;
+    }
+

    /**
     * This function is run by admin/cron.php every time if admin has enabled this plugin.
@@ -692,23 +712,22 @@ class enrolment_plugin_authorize
        $timediff30 = $settlementtime - (30 * $oneday);

        $mconfig = get_config('enrol/authorize');
-        set_config('an_lastcron', $timenow, 'enrol/authorize');

        mtrace("Processing authorize cron...");

        if (intval($mconfig->an_dailysettlement) < $settlementtime) {
            set_config('an_dailysettlement', $settlementtime, 'enrol/authorize');
-            mtrace("    daily cron: some cleanups and sending email to admins the count of pending orders expiring", "...");
+            mtrace("    daily cron; some cleanups and sending email to admins the count of pending orders expiring", ": ");
            $this->cron_daily();
-            mtrace("done", "\n");
+            mtrace("done");
        }

        mtrace("    scheduled capture", ": ");
        if (empty($CFG->an_review) or
           (!empty($CFG->an_test)) or
           (intval($CFG->an_capture_day) < 1) or
-           (!$this->check_openssl_loaded())) {
-            mtrace("disabled", "\n");
+           (!enrolment_plugin_authorize::check_openssl_loaded())) {
+            mtrace("disabled");
            return; // order review disabled or test mode or manual capture or openssl wasn't loaded.
        }

@@ -716,11 +735,11 @@ class enrolment_plugin_authorize
        $sql = "SELECT E.*, C.fullname, C.enrolperiod " .
               "FROM {$CFG->prefix}enrol_authorize E " .
               "INNER JOIN {$CFG->prefix}course C ON C.id = E.courseid " .
-               "WHERE (status = '" .AN_STATUS_AUTH. "') " .
+               "WHERE (E.status = '" .AN_STATUS_AUTH. "') " .
               "  AND (E.timecreated < '$timediffcnf') AND (E.timecreated > '$timediff30')";

        if (!$orders = get_records_sql($sql)) {
-            mtrace("no pending orders", "\n");
+            mtrace("no pending orders");
            return;
        }

@@ -730,11 +749,12 @@ class enrolment_plugin_authorize

        $ordercount = count((array)$orders);
        if (($ordercount * $eachconn) + intval($mconfig->an_lastcron) > $timenow) {
-            mtrace("blocked", "\n");
+            mtrace("blocked");
            return;
        }
+        set_config('an_lastcron', $timenow, 'enrol/authorize');

-        mtrace($ordercount ." orders are processing", "\n");
+        mtrace("    $ordercount orders are being processed now", ": ");

        $faults = '';
        $sendem = array();
@@ -747,10 +767,6 @@ class enrolment_plugin_authorize
            $extra = NULL;
            $success = authorize_action($order, $message, $extra, AN_ACTION_PRIOR_AUTH_CAPTURE);
            if ($success) {
-                if (!update_record("enrol_authorize", $order)) {
-                    $this->email_to_admin("Error while trying to update data. Please edit manually this record: " .
-                    "ID=$order->id in enrol_authorize table.", $order);
-                }
                $timestart = $timeend = 0;
                if ($order->enrolperiod) {
                    $timestart = $timenow;
@@ -775,6 +791,8 @@ class enrolment_plugin_authorize
            }
        }

+        mtrace("processed");
+
        $timenow = time();
        $elapsed = $timenow - $elapsed;
        $eachconn = ceil($elapsed / $ordercount);
@@ -796,32 +814,30 @@ class enrolment_plugin_authorize
        }

        mtrace("    sending welcome messages to students", ": ");
-        $select = "SELECT E.id, E.courseid, E.userid, C.fullname " .
-                  "FROM {$CFG->prefix}enrol_authorize E " .
-                  "INNER JOIN {$CFG->prefix}course C ON C.id = E.courseid " .
-                  "WHERE E.id IN(" . implode(',', $sendem) . ") " .
-                  "ORDER BY E.userid";
+        $select = "SELECT e.id, e.courseid, e.userid, c.fullname
+                 FROM {$CFG->prefix}enrol_authorize e
+                 INNER JOIN {$CFG->prefix}course c ON c.id = e.courseid
+               WHERE e.id IN(" . implode(',', $sendem) . ")
+               ORDER BY e.userid";
+
        $emailinfo = get_records_sql($select);
-        $emailcount = count($emailinfo);
-        for($i = 0; $i < $emailcount; ) {
+        $ei = reset($emailinfo);
+        while ($ei !== false) {
            $usercourses = array();
-            $lastuserid = $emailinfo[$i]->userid;
-            for ($j=$i; $j < $emailcount and $emailinfo[$j]->userid == $lastuserid; $j++) {
-                $usercourses[] = $emailinfo[$j]->fullname;
+            $lastuserid = $ei->userid;
+            for ($current = $ei; $current !== false && $current->userid == $lastuserid; $current = next($emailinfo)) {
+                $usercourses[] = $current->fullname;
            }
+            $ei = $current;
            $a = new stdClass;
            $a->courses = implode("\n", $usercourses);
            $a->profileurl = "$CFG->wwwroot/user/view.php?id=$lastuserid";
            $a->paymenturl = "$CFG->wwwroot/enrol/authorize/index.php?user=$lastuserid";
            $emailmessage = get_string('welcometocoursesemail', 'enrol_authorize', $a);
            $user = get_record('user', 'id', $lastuserid);
-            email_to_user($user,
-                          $adminuser,
-                          get_string("enrolmentnew", '', $SITE->shortname),
-                          $emailmessage);
-            $i = $j;
+            @email_to_user($user, $adminuser, get_string("enrolmentnew", '', $SITE->shortname), $emailmessage);
        }
-        mtrace("sent", "\n");
+        mtrace("sent");
    }

    /**
@@ -887,11 +903,12 @@ class enrolment_plugin_authorize
        }

        $sorttype = empty($CFG->an_sorttype) ? 'ttl' : $CFG->an_sorttype;
+        $where = "(E.status='". AN_STATUS_AUTH ."') AND (E.timecreated<'$timediffem') AND (E.timecreated>'$timediff30')";
        $sql = "SELECT E.courseid, E.currency, C.fullname, C.shortname, " .
               "COUNT(E.courseid) AS cnt, SUM(E.amount) as ttl " .
               "FROM {$CFG->prefix}enrol_authorize E " .
               "INNER JOIN {$CFG->prefix}course C ON C.id = E.courseid " .
-               "WHERE $select GROUP BY E.courseid ORDER BY $sorttype DESC";
+               "WHERE $where GROUP BY E.courseid ORDER BY $sorttype DESC";

        $courseinfos = get_records_sql($sql);
        foreach($courseinfos as $courseinfo) {
@@ -9,6 +9,11 @@
    $courseid = optional_param('course', SITEID, PARAM_INT);
    $userid   = optional_param('user', 0, PARAM_INT);

+/// Get course
+    if (!$course = get_record('course', 'id', $courseid)) {
+        error('Could not find that course');
+    }
+
 /// Only site users can access to this page
    require_login(); // Don't use $courseid! User may want to see old orders.

@@ -17,7 +22,7 @@
    }

 /// Load strings. All strings should be defined here. locallib.php uses these strings.
-    $strs = get_strings(array('status','action','time','course','confirm','yes','no','all','none','error'));
+    $strs = get_strings(array('status','action','time','course','confirm','no','all','none','error'));
    $authstrs = get_strings(array('orderid','nameoncard','void','capture','refund','delete',
                'authcaptured','authorizedpendingcapture','capturedpendingsettle','capturedsettled',
                'settled','refunded','cancelled','expired','tested','new',
@@ -25,11 +30,7 @@

 /// Print header
    $strpaymentmanagement = get_string('paymentmanagement', 'enrol_authorize');
-    if (!$course = get_record('course', 'id', $courseid)) {
-        error('Could not find that course');
-    }
-    print_header_simple("$strpaymentmanagement", "", "<a href=\"index.php\">$strpaymentmanagement</a>");
-
+    print_header_simple($strpaymentmanagement, "", "<a href=\"index.php\">$strpaymentmanagement</a>");

 /// If orderid is empty, user wants to see all orders
    if (empty($orderid)) {
@@ -1,54 +0,0 @@
-<?PHP // $Id$
-
-/**
- * backup_authorize_info
- *
- * @param resource $bf
- * @param object $prefs
- * @return bool
- */
-function backup_authorize_info($bf, $prefs)
-{
-    global $CFG;
-
-    $status = true;
-
-    if ($orders = get_records("enrol_authorize", "courseid", $prefs->backup_course))
-    {
-        fwrite($bf, start_tag("AUTHORIZEORDERS", 2 ,true));
-        foreach ($orders as $order) {
-            fwrite($bf, start_tag("ORDER", 3, true));
-            fwrite($bf, full_tag("ID", 4, false, $order->id));
-            fwrite($bf, full_tag("CCLASTFOUR", 4, false, $order->cclastfour));
-            fwrite($bf, full_tag("CCNAME", 4, false, $order->ccname));
-            fwrite($bf, full_tag("COURSEID", 4, false, $order->courseid));
-            fwrite($bf, full_tag("USERID", 4, false, $order->userid));
-            fwrite($bf, full_tag("TRANSID", 4, false, $order->transid));
-            fwrite($bf, full_tag("STATUS", 4, false, $order->status));
-            fwrite($bf, full_tag("TIMECREATED", 4, false, $order->timecreated));
-            fwrite($bf, full_tag("SETTLETIME", 4, false, $order->settletime));
-            fwrite($bf, full_tag("AMOUNT", 4, false, $order->amount));
-            fwrite($bf, full_tag("CURRENCY", 4, false, $order->currency));
-            if ($refunds = get_records("enrol_authorize_refunds", "orderid", $order->id)) {
-                fwrite($bf, start_tag("REFUNDS",4, true));
-                foreach ($refunds as $refund) {
-                    fwrite($bf, start_tag("REFUND", 5, true));
-                    fwrite($bf, full_tag("ID", 6, false, $refund->id));
-                    fwrite($bf, full_tag("ORDERID", 6, false, $refund->orderid));
-                    fwrite($bf, full_tag("STATUS", 6, false, $refund->status));
-                    fwrite($bf, full_tag("AMOUNT", 6, false, $refund->amount));
-                    fwrite($bf, full_tag("TRANSID", 6, false, $refund->transid));
-                    fwrite($bf, full_tag("SETTLETIME", 6, false, $refund->settletime));
-                    fwrite($bf, end_tag("REFUND", 5, true));
-                }
-                $status = fwrite($bf, end_tag("REFUNDS", 4, true));
-            }
-            fwrite ($bf, end_tag("ORDER", 3, true));
-        }
-        $status = fwrite($bf, end_tag("AUTHORIZEORDERS", 2, true));
-    }
-    return $status;
-}
-
-
-?>
@@ -18,7 +18,7 @@ define('ORDER_VOID',    'void');
 */
 function authorize_print_orders()
 {
-    global $CFG, $USER;
+    global $CFG, $USER, $SITE;
    global $strs, $authstrs;
    global $courseid, $userid;
    require_once($CFG->libdir.'/tablelib.php');
@@ -40,21 +40,19 @@ function authorize_print_orders()
                        AN_STATUS_TEST => $authstrs->tested
    );

-    if ($courses = get_courses('all', 'c.sortorder ASC', 'c.id,c.fullname,c.enrol')) {
-        $popupcrs = array();
-        foreach ($courses as $crs) {
-            if ($crs->enrol == 'authorize' || (empty($crs->enrol) && $CFG->enrol == 'authorize')) {
-                $popupcrs[intval($crs->id)] = $crs->fullname;
-            }
-        }
-        if (!empty($popupcrs)) {
-            print_simple_box_start('center', '100%');
-            echo "$strs->status: ";
-            echo popup_form($baseurl.'&amp;course='.$courseid.'&amp;status=',$statusmenu,'statusmenu',$status,'','','',true);
-            echo " &nbsp; $strs->course: ";
-            echo popup_form($baseurl.'&amp;status='.$status.'&amp;course=',$popupcrs,'coursesmenu',$courseid,'','','',true);
-            print_simple_box_end();
-        }
+    $sql = "SELECT c.id, c.fullname FROM {$CFG->prefix}course c INNER JOIN {$CFG->prefix}enrol_authorize e ON c.id = e.courseid ";
+    if ($userid > 0) {
+    	$sql .= "WHERE (e.userid='$userid') ";
+    }
+    $sql .= "ORDER BY c.sortorder, c.fullname";
+    if ($popupcrs = get_records_sql_menu($sql)) {
+        $popupcrs = array($SITE->id => $SITE->fullname) + $popupcrs;
+        print_simple_box_start('center', '100%');
+        echo "$strs->status: ";
+        echo popup_form($baseurl.'&amp;course='.$courseid.'&amp;status=',$statusmenu,'statusmenu',$status,'','','',true);
+        echo " &nbsp; $strs->course: ";
+        echo popup_form($baseurl.'&amp;status='.$status.'&amp;course=',$popupcrs,'coursesmenu',$courseid,'','','',true);
+        print_simple_box_end();
    }

    $table = new flexible_table('enrol-authorize');
@@ -66,7 +64,7 @@ function authorize_print_orders()

    $table->define_columns(array('id', 'timecreated', 'userid', 'status', ''));
    $table->define_headers(array($authstrs->orderid, $strs->time, $authstrs->nameoncard, $strs->status, $strs->action));
-    $table->define_baseurl($baseurl."&amp;status=$status");
+    $table->define_baseurl($baseurl."&amp;status=$status&amp;course=$courseid");

    $table->sortable(true, 'id', SORT_DESC);
    $table->pageable(true);
@@ -101,10 +99,10 @@ function authorize_print_orders()
    }

    if ($userid > 0) {
-        $where .= "AND (userid = '" . $userid . "') ";
+        $where .= "AND (E.userid = '" . $userid . "') ";
    }
    if ($courseid != SITEID) {
-        $where .= "AND (courseid = '" . $courseid . "') ";
+        $where .= "AND (E.courseid = '" . $courseid . "') ";
    }

    if ($sort = $table->get_sql_sort()) {
@@ -217,14 +215,14 @@ function authorize_print_order_details($orderno)
        if (empty($confirm)) {
            $strcaptureyes = get_string('captureyes', 'enrol_authorize');
            $table->data[] = array("<b>$strs->confirm:</b>",
-            "$strcaptureyes<br /><a href='index.php?order=$orderno&amp;sesskey=$USER->sesskey&amp;".ORDER_CAPTURE."=y&amp;confirm=1'>$strs->yes</a>
-            &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
+            "$strcaptureyes <br />
+            <input type='hidden' name='confirm' value='1'><input type='submit' name='". ORDER_CAPTURE ."' value='$authstrs->capture' />
+            &nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
        }
        else {
            $message = '';
            $extra = NULL;
            $success = authorize_action($order, $message, $extra, AN_ACTION_PRIOR_AUTH_CAPTURE);
-            update_record("enrol_authorize", $order); // May be expired.
            if (!$success) {
                $table->data[] = array("<b><font color='red'>$strs->error:</font></b>", $message);
            }
@@ -301,17 +299,8 @@ function authorize_print_order_details($orderno)
                $success = authorize_action($order, $message, $extra, AN_ACTION_CREDIT);
                if ($success) {
                    if (empty($CFG->an_test)) {
-                        $extra->id = insert_record("enrol_authorize_refunds", $extra);
                        if (empty($extra->id)) {
-                            $emailsubject = "Authorize.net: insert record error";
-                            $emailmessage = "Error while trying to insert new data to enrol_authorize_refunds table:\n";
-                            $data = (array)$extra;
-                            foreach ($data as $key => $value) {
-                                $emailmessage .= "$key => $value\n";
-                            }
-                            $adminuser = get_admin();
-                            email_to_user($adminuser, $adminuser, $emailsubject, $emailmessage);
-                            $table->data[] = array("<b><font color=red>$strs->error:</font></b>", $emailmessage);
+                            $table->data[] = array("<b><font color=red>$strs->error:</font></b>", 'insert record error');
                        }
                        else {
                            if (!empty($unenrol)) {
@@ -333,27 +322,25 @@ function authorize_print_order_details($orderno)
        print_table($table);
    }
    elseif (!empty($cmdvoid) and confirm_sesskey()) { // VOID
-        if (!in_array(ORDER_VOID, $status->actions)) {
-            $a = new stdClass;
-            $a->action = $authstrs->void;
-            error(get_string('youcantdo', 'enrol_authorize', $a));
-        }
-
        $suborderno = optional_param('suborder', 0, PARAM_INT);
        if (empty($suborderno)) { // cancel original transaction.
+            if (!in_array(ORDER_VOID, $status->actions)) {
+                $a = new stdClass;
+                $a->action = $authstrs->void;
+                error(get_string('youcantdo', 'enrol_authorize', $a));
+            }
            if (empty($confirm)) {
                $strvoidyes = get_string('voidyes', 'enrol_authorize');
                $table->data[] = array("<b>$strs->confirm:</b>",
                    "$strvoidyes<br /><input type='hidden' name='".ORDER_VOID."' value='y'>
                     <input type='hidden' name='confirm' value='1'>
-                     <input type='submit' value='$strs->yes'>
+                     <input type='submit' value='$authstrs->void'>
                     &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
            }
            else {
                $extra = NULL;
                $message = '';
                $success = authorize_action($order, $message, $extra, AN_ACTION_VOID);
-                update_record("enrol_authorize", $order); // May be expired.
                if ($success) {
                    if (empty($CFG->an_test)) {
                        redirect("index.php?order=$orderno");
@@ -369,14 +356,22 @@ function authorize_print_order_details($orderno)
            }
        }
        else { // cancel refunded transaction
-            $suborder = get_record('enrol_authorize_refunds',
-                                   'id', $suborderno,
-                                   'orderid', $orderno,
-                                   'status', AN_STATUS_CREDIT);
+            $sql = "SELECT R.*, E.courseid FROM {$CFG->prefix}enrol_authorize_refunds R " .
+                   "INNER JOIN {$CFG->prefix}enrol_authorize E ON R.orderid = E.id " .
+                   "WHERE R.id = '$suborderno' AND R.orderid = '$orderno' AND R.status = '" .AN_STATUS_CREDIT. "'";
+
+            $suborder = get_record_sql($sql);
            if (!$suborder) { // not found
                error("Transaction can not be voided because of already been voided.");
            }
            else {
+                $refundedstatus = authorize_get_status_action($suborder);
+                if (!in_array(ORDER_VOID, $refundedstatus->actions)) {
+                    $a = new stdClass;
+                    $a->action = $authstrs->void;
+                    error(get_string('youcantdo', 'enrol_authorize', $a));
+                }
+                unset($suborder->courseid);
                if (empty($confirm)) {
                    $a = new stdClass;
                    $a->transid = $suborder->transid;
@@ -388,14 +383,13 @@ function authorize_print_order_details($orderno)
                        "$strsubvoidyes<br /><input type='hidden' name='".ORDER_VOID."' value='y'>
                         <input type='hidden' name='confirm' value='1'>
                         <input type='hidden' name='suborder' value='$suborderno'>
-                         <input type='submit' value='$strs->yes'>
+                         <input type='submit' value='$authstrs->void'>
                         &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
                }
                else {
                    $message = '';
                    $extra = NULL;
                    $success = authorize_action($suborder, $message, $extra, AN_ACTION_VOID);
-                    update_record("enrol_authorize_refunds", $suborder); // May be expired.
                    if ($success) {
                        if (empty($CFG->an_test)) {
                            if (!empty($unenrol)) {
@@ -428,7 +422,7 @@ function authorize_print_order_details($orderno)
            $table->data[] = array("<b>$strs->confirm:</b>",
                "<input type='hidden' name='".ORDER_DELETE."' value='y'>
                 <input type='hidden' name='confirm' value='1'>
-                 <input type='submit' value='$strs->yes'>
+                 <input type='submit' value='$authstrs->delete'>
                 &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
        }
        else {
@@ -454,15 +448,21 @@ function authorize_print_order_details($orderno)
        print_table($table);
        if ($settled) { // show refunds.
            $t2 = new stdClass;
-            $t2->size = array('15%', '15%', '20%', '35%', '15%');
+            $t2->size = array('45%', '15%', '20%', '10%', '10%');
            $t2->align = array('right', 'right', 'right', 'right', 'right');
-            $t2->head = array($authstrs->transid,
-                              $authstrs->amount,
+            $t2->head = array($authstrs->settlementdate,
+                              $authstrs->transid,
                              $strs->status,
-                              $authstrs->settlementdate,
-                              $strs->action);
-            $refunds = get_records('enrol_authorize_refunds', 'orderid', $orderno);
+                              $strs->action,
+                              $authstrs->amount);
+
+            $sql = "SELECT R.*, E.courseid FROM {$CFG->prefix}enrol_authorize_refunds R " .
+                   "INNER JOIN {$CFG->prefix}enrol_authorize E ON R.orderid = E.id " .
+                   "WHERE R.orderid = '$orderno'";
+
+            $refunds = get_records_sql($sql);
            if ($refunds) {
+                $sumrefund = floatval(0.0);
                foreach ($refunds as $rf) {
                    $substatus = authorize_get_status_action($rf);
                    $subactions = '&nbsp;';
@@ -475,12 +475,36 @@ function authorize_print_order_details($orderno)
                            "<a href='index.php?$vl=y&amp;sesskey=$USER->sesskey&amp;order=$orderno&amp;suborder=$rf->id'>{$authstrs->$vl}</a> ";
                        }
                    }
-                    $t2->data[] = array($rf->transid,
-                                        $rf->amount,
-                                        $authstrs->{$substatus->status},
-                                        userdate($rf->settletime),
-                                        $subactions);
+                    $sign = '';
+                    $color = '';
+                    switch ($substatus->status) {
+                        case 'cancelled':
+                            $color = 'black';
+                            break;
+
+                        case 'refunded':
+                            $sign = '-';
+                            $color = 'red';
+                            $sumrefund += floatval($rf->amount);
+                            break;
+
+                        case 'settled':
+                        default:
+                            $sign = '-';
+                            $color = 'green';
+                            $sumrefund += floatval($rf->amount);
+                            break;
+                    }
+
+                    $t2->data[] = array(
+                        userdate($rf->settletime),
+                        $rf->transid,
+                        $authstrs->{$substatus->status},
+                        $subactions,
+                        "<font color='$color'>" . format_float($sign . $rf->amount, 2) . "</font>"
+                    );
                }
+                $t2->data[] = array('','',get_string('total'),$order->currency,format_float('-'.$sumrefund, 2));
            }
            else {
                $t2->data[] = array('','',get_string('noreturns', 'enrol_authorize'),'','');
@@ -1,6 +1,6 @@
 <?PHP // $Id$

-$plugin->version  = 2006021501;
+$plugin->version  = 2006021531;
 $plugin->requires = 2005072200;

 ?>
@@ -41,7 +41,13 @@ function get_student_courses(&$user) {
                        if (isset($user->student[$course->id])) {   /// We have it already
                            unset($user->student[$course->id]);       /// Remove from old list
                        } else {
-                            enrol_student($user->id, $course->id, 0, 0, 'database');   /// Enrol the student
+                            if ($course->enrolperiod) {
+                                $timestart = time();
+                                $timeend = time() + $course->enrolperiod;
+                            } else {
+                                $timestart = $timeend = 0;
+                            }
+                            enrol_student($user->id, $course->id, $timestart, $timeend, 'database');
                        }
                    }
                }
@@ -204,14 +210,15 @@ function sync_enrolments($type='student') {
            $sql = "SELECT u.id AS userid, e.id AS enrolmentid" .
                " FROM {$CFG->prefix}user u " . 
                "      LEFT OUTER JOIN {$CFG->prefix}user_students e ON (u.id = e.userid AND e.course='{$course->id}')" .
-                " WHERE u.{$CFG->enrol_localuserfield} = '$member'";
+                " WHERE u.{$CFG->enrol_localuserfield} = '$member'" .
+                " AND (u.deleted IS NULL OR u.deleted=0)";

            $ers = $db->Execute($sql);
            if (!$ers) {
                trigger_error($db->ErrorMsg() .' STATEMENT: '. $sql);
                return false;
            }
-            if ( $ers->RecordCount() != 1 ) { // if this returns empty, it means we don't have the student record.
+            if ( $ers->RecordCount() == 0 ) { // if this returns empty, it means we don't have the student record.
                                              // should not happen -- but skip it anyway 
                trigger_error('weird! no user record entry?');
                continue;
@@ -81,6 +81,9 @@ function get_user_courses(&$user, $type) {
            }
        }
        
+        /// Add it to new list
+        $newenrolments[$course_obj->id] = 'ldap';
+
        // deal with enrolment in the moodle db
        if (!empty($course_obj)) { // does course exist now?     
            if(isset($user->{$type}[$course_obj->id]) && $user->{$type}[$course_obj->id] == 'ldap'){
@@ -105,18 +108,26 @@ function get_user_courses(&$user, $type) {
    // array, those are old enrolments that we want to remove (or are they?)
    if(!empty($user->{$type})){
        foreach ($user->{$type} as $courseid => $value){
-            if($value == 'ldap'){ // this was a legacy 
+            if($value === 'ldap'){ // this was a legacy 
                if ($type === 'student') { // enrol
                    unenrol_student($user->id, $courseid);
                } else if ($type === 'teacher') {
                    remove_teacher($user->id, $courseid);
                }
                unset($user->{$type}[$course_obj->id]);
+            } else {
+                // This one is from a non-database
+                // enrolment. Add it to the newenrolments
+                // array, so we don't loose it.
+                $newenrolments[$courseid] = $value;
            }

        }
    }

+    /// Overwrite the old array with the new one
+    $user->{$type} = $newenrolments;
+
    @ldap_close($ldap_connection);
    return true;
 }
@@ -574,8 +585,8 @@ function create_course ($course_ext,$skip_fix_course_sortorder=0){

    // override with required ext data
    $course->idnumber  = $course_ext[$CFG->enrol_ldap_course_idnumber][0];
-    $course->fullname  = $course_ext[$CFG->enrol_ldap_course_fullname][0];
-    $course->shortname = $course_ext[$CFG->enrol_ldap_course_shortname][0];
+    $course->fullname  = addslashes($course_ext[$CFG->enrol_ldap_course_fullname][0]);
+    $course->shortname = addslashes($course_ext[$CFG->enrol_ldap_course_shortname][0]);
    if (   empty($course->idnumber)
        || empty($course->fullname)
        || empty($course->shortname) ) { 
@@ -586,7 +597,7 @@ function create_course ($course_ext,$skip_fix_course_sortorder=0){
    }

    if(!empty($CFG->enrol_ldap_course_summary)){ // optional
-        $course->summary   = $course_ext[$CFG->enrol_ldap_course_summary][0];
+        $course->summary   = addslashes($course_ext[$CFG->enrol_ldap_course_summary][0]);
    }
    if(!empty($CFG->enrol_ldap_category)){ // optional ... but ensure it is set!
        $course->category   = $CFG->enrol_ldap_category;
@@ -54,11 +54,12 @@
    }

    // security: only editing teachers can access backups
-    if ((!isteacheredit($course->id))
-        and (count($args) >= 2)
-        and (strtolower($args[1]) == 'backupdata')) {
-
-        error('Access not allowed');
+    if ((count($args) >= 2) and (strtolower($args[1]) == 'backupdata')) {
+        if (!isteacheredit($course->id)) {
+            error('Access not allowed');
+        } else {
+            $lifetime = 0; //disable browser caching for backups 
+        }
    }

    if (is_dir($pathname)) {
@@ -93,6 +94,7 @@
        and (strtolower($args[1]) == 'moddata')
        and ((strtolower($args[2]) == 'forum')
            or (strtolower($args[2]) == 'assignment')
+            or (strtolower($args[2]) == 'data')
            or (strtolower($args[2]) == 'glossary')
            or (strtolower($args[2]) == 'wiki')
            or (strtolower($args[2]) == 'exercise')
@@ -16,7 +16,7 @@
    $action  = optional_param('action', '', PARAM_ACTION);
    $name    = optional_param('name', '', PARAM_FILE);
    $oldname = optional_param('oldname', '', PARAM_FILE);
-    $choose  = optional_param('choose', '', PARAM_CLEAN);
+    $choose  = optional_param('choose', '', PARAM_FILE); //in fact it is always 'formname.inputname'
    $userfile= optional_param('userfile','',PARAM_FILE);
    $save    = optional_param('save', 0, PARAM_BOOL);
    $text    = optional_param('text', '', PARAM_RAW);
@@ -167,7 +167,7 @@
                // um will take care of error reporting.
                displaydir($wdir);
            } else {
-                $upload_max_filesize = get_max_upload_file_size($CFG->maxbytes, $course->maxbytes);
+                $upload_max_filesize = get_max_upload_file_size($CFG->maxbytes);
                $filesize = display_size($upload_max_filesize);

                $struploadafile = get_string("uploadafile");
@@ -385,6 +385,7 @@
            html_header($course, $wdir);
            if (($text != '') and confirm_sesskey()) {
                $fileptr = fopen($basedir.'/'.$file,"w");
+                $text = preg_replace('/\x0D/', '', $text);  // http://moodle.org/mod/forum/discuss.php?d=38860
                fputs($fileptr, stripslashes($text));
                fclose($fileptr);
                displaydir($wdir);
@@ -8,12 +8,20 @@

        global $CFG;

+        // Trivial-cache - keyed on $cachedcourseid
        static $activitylist;
+        static $cachedcourseid;

        if (empty($courseid)) {
            $courseid = SITEID;
        }

+        // Initialise/invalidate our trivial cache if dealing with a different course
+        if (!isset($cachedcourseid) || $cachedcourseid !== (int)$courseid) {
+            $activitylist = array();
+        } 
+        $cachedcourseid = (int)$courseid;
+
        /// It may be cached

        if (empty($activitylist)) {
@@ -7,6 +7,14 @@

    require_once("../../config.php");

+    if (empty($CFG->textfilters)) {
+        error ('Filter not enabled!');
+    } else {
+        $filters = explode(',', $CFG->textfilters);
+        if (array_search('filter/algebra', $filters) === FALSE) {
+            error ('Filter not enabled!');
+        }
+    }

    $CFG->texfilterdir = "filter/tex";
    $CFG->algebrafilterdir = "filter/algebra";
@@ -76,7 +84,7 @@
    }

 function algebra2tex($algebra) {
-  Global $CFG;
+  global $CFG;
  $algebra = str_replace('&lt;','<',$algebra);
  $algebra = str_replace('&gt;','>',$algebra);
  $algebra = str_replace('<>','#',$algebra);
@@ -91,9 +99,9 @@ function algebra2tex($algebra) {
  $algebra = str_replace('epsilon','zepslon',$algebra);
  $algebra = str_replace('upsilon','zupslon',$algebra);
  $algebra = preg_replace('!\r\n?!',' ',$algebra);
+  $algebra = escapeshellarg($algebra);

  if ( (PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows") ) {
-    $algebra = "\"". str_replace('"','\"',$algebra) . "\"";
    $cmd  = "cd $CFG->dirroot\\$CFG->algebrafilterdirwin & algebra2tex.pl x/2";
    $test = `$cmd`;
    if ($test != '\frac{x}{2}') {
@@ -109,7 +117,6 @@ function algebra2tex($algebra) {
    }
    $cmd  = "cd $CFG->dirroot\\$CFG->algebrafilterdirwin & algebra2tex.pl $algebra";
  } else {      
-    $algebra = escapeshellarg($algebra);
    $cmd  = "cd $CFG->dirroot/$CFG->algebrafilterdir; ./algebra2tex.pl x/2";
    $test = `$cmd`;
    if ($test != '\frac{x}{2}') {
@@ -198,66 +205,66 @@ function outputText($texexp) {
 }

 function tex2image($texexp, $md5, $return=false) {
-  global $CFG;
-  $error_message1 = "Your system is not configured to run mimeTeX. ";
-  $error_message1 .= "You need to download the appropriate<br /> executable ";
-  $error_message1 .= "from <a href=\"http://moodle.org/download/mimetex/\">";
-  $error_message1 .= "http://moodle.org/download/mimetex/</a>, or obtain the ";
-  $error_message1 .= "C source<br /> from <a href=\"http://www.forkosh.com/mimetex.zip\">";
-  $error_message1 .= "http://www.forkosh.com/mimetex.zip</a>, compile it and ";
-  $error_message1 .= "put the executable into your<br /> moodle/filter/tex/ directory. ";
-  $error_message1 .= "You also need to edit your moodle/filter/algebra/pix.php file<br />";
-  $error_message1 .= ' by adding the line<br /><pre>       case "' . PHP_OS . "\":\n";
-  $error_message1 .= "           \$cmd = \"\\\\\"\$CFG->dirroot/\$CFG->texfilterdir/";
-  $error_message1 .= 'mimetex.' . strtolower(PHP_OS) . "\\\\\" -e \\\\\"\$pathname\\\\\" \". escapeshellarg(\$texexp);";
-  $error_message1 .= "</pre>You also need to add this to your algebradebug.php file.";
+    global $CFG;
+    $error_message1 = "Your system is not configured to run mimeTeX. ";
+    $error_message1 .= "You need to download the appropriate<br /> executable ";
+    $error_message1 .= "from <a href=\"http://moodle.org/download/mimetex/\">";
+    $error_message1 .= "http://moodle.org/download/mimetex/</a>, or obtain the ";
+    $error_message1 .= "C source<br /> from <a href=\"http://www.forkosh.com/mimetex.zip\">";
+    $error_message1 .= "http://www.forkosh.com/mimetex.zip</a>, compile it and ";
+    $error_message1 .= "put the executable into your<br /> moodle/filter/tex/ directory. ";
+    $error_message1 .= "You also need to edit your moodle/filter/algebra/pix.php file<br />";
+    $error_message1 .= ' by adding the line<br /><pre>       case "' . PHP_OS . "\":\n";
+    $error_message1 .= "           \$cmd = \"\\\\\"\$CFG->dirroot/\$CFG->texfilterdir/";
+    $error_message1 .= 'mimetex.' . strtolower(PHP_OS) . "\\\\\" -e \\\\\"\$pathname\\\\\" \". escapeshellarg(\$texexp);";
+    $error_message1 .= "</pre>You also need to add this to your algebradebug.php file.";

-  if ($texexp) {
-       $texexp = '\Large ' . $texexp;
-       $lifetime = 86400;
-       $image  = $md5 . ".gif";
-       $filetype = 'image/gif';
-       if (!file_exists("$CFG->dataroot/$CFG->algebraimagedir")) {
-          make_upload_directory($CFG->algebraimagedir);
-       }
-       $pathname = "$CFG->dataroot/$CFG->algebraimagedir/$image";
-       if (file_exists($pathname)) {
-         unlink($pathname);
-       } 
-       $commandpath = "";
-       $cmd = "";
-         switch (PHP_OS) {
-       case "Linux":
-         $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.linux";
-         $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" ". escapeshellarg($texexp);
-       break;
-       case "WINNT":
-       case "WIN32":
-       case "Windows":
-         $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
-         $texexp = str_replace('"','\"',$texexp);
-         $cmd = str_replace(' ','^ ',$commandpath);
-         $cmd .= " ++ -e  \"$pathname\" \"$texexp\"";
-       break;
-       case "Darwin":
-         $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin";
-         $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" ". escapeshellarg($texexp);
-       break;
-       }
-       if (!$cmd) {
-         if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary
-           $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex";
-           $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname ". escapeshellarg($texexp);
-         } else {
-           error($error_message1);
-         }
-       }
-       system($cmd, $status);
-  }
-  if ($return) {
-           return $image;
-  }
-  if ($texexp && file_exists($pathname)) {
+    if ($texexp) {
+        $texexp = '\Large ' . $texexp;
+        $lifetime = 86400;
+        $image  = $md5 . ".gif";
+        $filetype = 'image/gif';
+        if (!file_exists("$CFG->dataroot/$CFG->algebraimagedir")) {
+            make_upload_directory($CFG->algebraimagedir);
+        }
+        $pathname = "$CFG->dataroot/$CFG->algebraimagedir/$image";
+        if (file_exists($pathname)) {
+            unlink($pathname);
+        } 
+        $commandpath = "";
+        $cmd = "";
+        $texexp = escapeshellarg($texexp);
+        switch (PHP_OS) {
+            case "Linux":
+                $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.linux";
+                $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" $texexp";
+            break;
+            case "WINNT":
+            case "WIN32":
+            case "Windows":
+                $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
+                $cmd = str_replace(' ','^ ',$commandpath);
+                $cmd .= " ++ -e  \"$pathname\" $texexp";
+            break;
+            case "Darwin":
+                $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin";
+                $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" $texexp";
+            break;
+        }
+        if (!$cmd) {
+            if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary
+                $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex";
+                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname $texexp";
+            } else {
+                error($error_message1);
+            }
+        }
+        system($cmd, $status);
+    }
+    if ($return) {
+        return $image;
+    }
+    if ($texexp && file_exists($pathname)) {
           $lastmodified = filemtime($pathname);
           header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastmodified) . " GMT");
           header("Expires: " . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT");
@@ -267,7 +274,7 @@ function tex2image($texexp, $md5, $return=false) {
           header("Content-length: ".filesize($pathname));
           header("Content-type: $filetype");
           readfile("$pathname");
-   } else {
+    } else {
           $ecmd = "$cmd 2>&1";
           echo `$ecmd` . "<br />\n";
           echo "The shell command<br />$cmd<br />returned status = $status<br />\n";
@@ -293,7 +300,7 @@ function tex2image($texexp, $md5, $return=false) {
              echo "mimetex executable $commandpath not found!<br />";
           }
           echo "Image not found!";
-   }
+    }
 }

 function slasharguments($texexp, $md5) {
@@ -163,11 +163,10 @@ function algebra_filter ($courseid, $text) {
           $algebra = str_replace('epsilon','zepslon',$algebra);
           $algebra = str_replace('upsilon','zupslon',$algebra);
           $algebra = preg_replace('!\r\n?!',' ',$algebra);
+           $algebra = escapeshellarg($algebra);
           if ( (PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows") ) {
-              $algebra = "\"". str_replace('"','\"',$algebra) . "\"";
              $cmd  = "cd $CFG->dirroot\\$CFG->algebrafilterdirwin & algebra2tex.pl $algebra";
           } else {      
-              $algebra = escapeshellarg($algebra);
              $cmd  = "cd $CFG->dirroot/$CFG->algebrafilterdir; ./algebra2tex.pl $algebra";
           }
           $texexp = `$cmd`;
@@ -6,6 +6,16 @@
    $nomoodlecookie = true;     // Because it interferes with caching

    require_once('../../config.php');
+
+    if (empty($CFG->textfilters)) {
+        error ('Filter not enabled!');
+    } else {
+        $filters = explode(',', $CFG->textfilters);
+        if (array_search('filter/algebra', $filters) === FALSE) {
+            error ('Filter not enabled!');
+        }
+    }
+
    require_once($CFG->libdir.'/filelib.php');

    $CFG->texfilterdir     = 'filter/tex';
@@ -41,25 +51,25 @@
            $texexp = str_replace('&gt;','>',$texexp);
            $texexp = preg_replace('!\r\n?!',' ',$texexp);
            $texexp = '\Large ' . $texexp;
+            $texexp = escapeshellarg($texexp);

            if ((PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows")) {
-                $texexp = str_replace('"','\"',$texexp);
                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
                $cmd = str_replace(' ','^ ',$cmd);
-                $cmd .= " ++ -e  \"$pathname\" -- \"$texexp\"";
+                $cmd .= " ++ -e  \"$pathname\" -- $texexp";
            } else if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary

-                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname -- ". escapeshellarg($texexp);
+                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname -- $texexp";

            } else {                                                           /// Auto-detect the right TeX binary
                switch (PHP_OS) {

                    case "Linux":
-                        $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" -- ". escapeshellarg($texexp);
+                        $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" -- $texexp";
                    break;

                    case "Darwin":
-                        $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" -- ". escapeshellarg($texexp);
+                        $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" -- $texexp";
                    break;

                    default:      /// Nothing was found, so tell them how to fix it.
@@ -21,7 +21,7 @@
            set_config( 'filter_mediaplugin_ignore_swf','' );
        }
        else {
-            set_config( 'filter_mediaplugin_enable_swf', 1 );
+            set_config( 'filter_mediaplugin_enable_swf', 0 ); //disable swf embedding by default for now
        }
    }
    if (!isset($CFG->filter_mediaplugin_enable_mov) or $forcereset) {
@@ -194,7 +194,7 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= '<param name="controls" value="imagewindow" />';
        $replace .= '<param name="console" value="video" />';
        $replace .= '<param name="loop" value="true" />';
-        $replace .= '<embed src="\\2.rm" width=240" height="180" loop="true" type="audio/x-pn-realaudio-plugin" controls="imagewindow" console="video" autostart="true">';
+        $replace .= '<embed src="\\2.ram" width=240" height="180" loop="true" type="audio/x-pn-realaudio-plugin" controls="imagewindow" console="video" autostart="true">';
        $replace .= '</embed>';
        $replace .= '</object><br />';

@@ -203,7 +203,7 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= '<param name="autostart" value="true" />';
        $replace .= '<param name="controls" value="ControlPanel" />';
        $replace .= '<param name="console" value="video" />';
-        $replace .= '<embed src="\\2.rm" width="240" height="30" controls="ControlPanel" type="audio/x-pn-realaudio-plugin" console="video" autostart="true">';
+        $replace .= '<embed src="\\2.ram" width="240" height="30" controls="ControlPanel" type="audio/x-pn-realaudio-plugin" console="video" autostart="true">';
        $replace .= '</embed>';
        $replace .= '</object></p>';

@@ -219,7 +219,7 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= '<param name="controls" value="imagewindow" />';
        $replace .= '<param name="console" value="video" />';
        $replace .= '<param name="loop" value="true" />';
-        $replace .= '<embed src="\\2.rm" width=240" height="180" loop="true" type="audio/x-pn-realaudio-plugin" controls="imagewindow" console="video" autostart="true">';
+        $replace .= '<embed src="\\2.rpm" width=240" height="180" loop="true" type="audio/x-pn-realaudio-plugin" controls="imagewindow" console="video" autostart="true">';
        $replace .= '</embed>';
        $replace .= '</object><br />';

@@ -228,7 +228,7 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= '<param name="autostart" value="true" />';
        $replace .= '<param name="controls" value="ControlPanel" />';
        $replace .= '<param name="console" value="video" />';
-        $replace .= '<embed src="\\2.rm" width="240" height="30" controls="ControlPanel" type="audio/x-pn-realaudio-plugin" console="video" autostart="true">';
+        $replace .= '<embed src="\\2.rpm" width="240" height="30" controls="ControlPanel" type="audio/x-pn-realaudio-plugin" console="video" autostart="true">';
        $replace .= '</embed>';
        $replace .= '</object></p>';

@@ -6,6 +6,7 @@
    $txt = new Object;
    $txt->mediapluginmp3 = get_string( 'mediapluginmp3','admin' );
    $txt->mediapluginswf = get_string( 'mediapluginswf','admin' );
+    $txt->mediapluginswfnote = get_string( 'mediapluginswfnote','admin' );
    $txt->mediapluginmov = get_string( 'mediapluginmov','admin' );
    $txt->mediapluginwmv = get_string( 'mediapluginwmv','admin' );
    $txt->mediapluginmpg = get_string( 'mediapluginmpg','admin' );
@@ -25,41 +26,49 @@
        <td align="right"><?php echo $txt->mediapluginmp3 ?></td>
        <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_mp3',
             $CFG->filter_mediaplugin_enable_mp3 ); ?></td> 
+        <td />
    </tr>
    <tr valign="top">
        <td align="right"><?php echo $txt->mediapluginswf?></td>
        <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_swf',
             $CFG->filter_mediaplugin_enable_swf ); ?></td> 
+        <td><?php echo $txt->mediapluginswfnote ?></td>
    </tr>
    <tr valign="top">
        <td align="right"><?php echo $txt->mediapluginmov ?></td>
        <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_mov',
             $CFG->filter_mediaplugin_enable_mov ); ?></td> 
+        <td />
    </tr>
    <tr valign="top">
        <td align="right"><?php echo $txt->mediapluginwmv ?></td>
        <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_wmv',
             $CFG->filter_mediaplugin_enable_wmv ); ?></td> 
+        <td />
    </tr>
    <tr valign="top">
        <td align="right"><?php echo $txt->mediapluginmpg ?></td>
        <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_mpg',
             $CFG->filter_mediaplugin_enable_mpg ); ?></td> 
+        <td />
    </tr>
    <tr valign="top">
        <td align="right"><?php echo $txt->mediapluginavi ?></td>
        <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_avi',
             $CFG->filter_mediaplugin_enable_avi ); ?></td> 
+        <td />
    </tr>
    <tr valign="top">
        <td align="right"><?php echo $txt->mediapluginflv ?></td>
        <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_flv',
             $CFG->filter_mediaplugin_enable_flv ); ?></td> 
+        <td />
    </tr>
    <tr valign="top">
        <td align="right"><?php echo $txt->mediapluginram ?></td>
        <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_ram',
             $CFG->filter_mediaplugin_enable_ram ); ?></td> 
+        <td />
    </tr>
    <tr valign="top">
        <td align="right"><?php echo $txt->mediapluginrpm ?></td>
@@ -70,5 +79,6 @@
        <td align="right"><?php echo $txt->mediapluginrm ?></td>
        <td><?php choose_from_menu( $yesno,'filter_mediaplugin_enable_rm',
             $CFG->filter_mediaplugin_enable_rm ); ?></td> 
+        <td />
    </tr>
 </table>
@@ -6,6 +6,16 @@
    $nomoodlecookie = true;     // Because it interferes with caching

    require_once('../../config.php');
+
+    if (empty($CFG->textfilters)) {
+        error ('Filter not enabled!');
+    } else {
+        $filters = explode(',', $CFG->textfilters);
+        if (array_search('filter/tex', $filters) === FALSE) {
+            error ('Filter not enabled!');
+        }
+    }
+
    require_once($CFG->libdir.'/filelib.php');
    require_once('defaultsettings.php' );
    require_once('latex.php');
@@ -55,29 +65,29 @@
                $texexp = str_replace('&gt;','>',$texexp);
                $texexp = preg_replace('!\r\n?!',' ',$texexp);
                $texexp = '\Large ' . $texexp;
+                $texexp = escapeshellarg($texexp);

                if ((PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows")) {
-                    $texexp = str_replace('"','\"',$texexp);
                    $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
                    $cmd = str_replace(' ','^ ',$cmd);
-                    $cmd .= " ++ -e  \"$pathname\" -- \"$texexp\"";
+                    $cmd .= " ++ -e  \"$pathname\" -- $texexp";
                } else if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary

-                    $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname -- ". escapeshellarg($texexp);
+                    $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname -- $texexp";

                } else {                                                           /// Auto-detect the right TeX binary
                    switch (PHP_OS) {

                        case "Linux":
-                            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" -- ". escapeshellarg($texexp);
+                            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" -- $texexp";
                        break;

                        case "Darwin":
-                            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" -- ". escapeshellarg($texexp);
+                            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" -- $texexp";
                        break;

                        case "FreeBSD":
-                            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.freebsd\" -e \"$pathname\" ". escapeshellarg($texexp);
+                            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.freebsd\" -e \"$pathname\" $texexp";
                        break;

                        default:      /// Nothing was found, so tell them how to fix it.
@@ -7,6 +7,15 @@

    require_once("../../config.php");

+    if (empty($CFG->textfilters)) {
+        error ('Filter not enabled!');
+    } else {
+        $filters = explode(',', $CFG->textfilters);
+        if (array_search('filter/tex', $filters) === FALSE) {
+            error ('Filter not enabled!');
+        }
+    }
+
    $CFG->texfilterdir = "filter/tex";
    $CFG->teximagedir = "filter/tex";

@@ -102,31 +111,31 @@
            }
            $commandpath = "";
            $cmd = "";
+            $texexp = escapeshellarg($texexp);
            switch (PHP_OS) {
                case "Linux":
                    $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.linux";           
-                $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" ". escapeshellarg($texexp);
+                    $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" $texexp";
                break;
                case "WINNT":
-                    case "WIN32":
-                    case "Windows":
+                case "WIN32":
+                case "Windows":
                    $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
-                $texexp = str_replace('"','\"',$texexp);
-                $cmd = str_replace(' ','^ ',$commandpath);
-                $cmd .= " ++ -e  \"$pathname\" \"$texexp\"";
+                    $cmd = str_replace(' ','^ ',$commandpath);
+                    $cmd .= " ++ -e  \"$pathname\" $texexp";
                break;
                case "Darwin":
                    $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin";
-                $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" ". escapeshellarg($texexp);
+                    $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" $texexp";
                break;
            }
            if (!$cmd) {
-              if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary
-                $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex";
-                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname ". escapeshellarg($texexp);
-              } else {
-                error($error_message1);
-              }
+                if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary
+                    $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex";
+                    $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname $texexp";
+                } else {
+                    error($error_message1);
+                }
            }
            system($cmd, $status);
        }
@@ -7,6 +7,15 @@

    require_once("../../config.php");

+    if (empty($CFG->textfilters)) {
+        error ('Filter not enabled!');
+    } else {
+        $filters = explode(',', $CFG->textfilters);
+        if (array_search('filter/tex', $filters) === FALSE) {
+            error ('Filter not enabled!');
+        }
+    }
+
    $CFG->texfilterdir = "filter/tex";
    $CFG->teximagedir = "filter/tex";

@@ -23,18 +32,19 @@
            make_upload_directory($CFG->teximagedir);
        }
        $pathname = "$CFG->dataroot/$CFG->teximagedir/$image";
+        $texexp = escapeshellarg($texexp);
+
        switch (PHP_OS) {
            case "Linux":
-                system("$CFG->dirroot/$CFG->texfilterdir/mimetex.linux -e $pathname -- ". escapeshellarg($texexp) );
+                system("$CFG->dirroot/$CFG->texfilterdir/mimetex.linux -e $pathname -- $texexp" );
            break;
            case "WINNT":
-                case "WIN32":
-                case "Windows":
-                $texexp = str_replace('"','\"',$texexp);
-            system("$CFG->dirroot/$CFG->texfilterdir/mimetex.exe -e  $pathname -- \"$texexp\"");
+            case "WIN32":
+            case "Windows":
+                system("$CFG->dirroot/$CFG->texfilterdir/mimetex.exe -e  $pathname -- $texexp");
            break;
            case "Darwin":
-                system("$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin -e $pathname -- ". escapeshellarg($texexp) );
+                system("$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin -e $pathname -- $texexp" );
            break;
        }
        if (file_exists($pathname)) {
@@ -17,7 +17,7 @@
 * @param        string         text to be filtered
 */
 function tidy_filter($courseid, $text) {
-       
+    global $CFG;   
 /// Configuration for tidy. Feel free to tune for your needs, e.g. to allow
 /// proprietary markup.
    $tidyoptions = array(             
@@ -39,7 +39,11 @@ function tidy_filter($courseid, $text) {
    
 /// If enabled: run tidy over the entire string
    if (function_exists('tidy_repair_string')){
-        $text = tidy_repair_string($text, $tidyoptions);
+        if (empty($CFG->unicodedb)) {
+            $text = tidy_repair_string($text, $tidyoptions);
+        } else {
+            $text = tidy_repair_string($text, $tidyoptions, 'utf8');
+        }
    }

    return $text;
@@ -7,6 +7,7 @@
    $user     = optional_param('user', -1);
    $group    = optional_param('group', -1);
    $action   = optional_param('action', 'grades');
+    $cview    = optional_param('cview', -1);

    if (!$course = get_record('course', 'id', $id)) {
        error('No course ID');
@@ -157,7 +157,7 @@ function grade_get_formatted_grades() {
    global $CFG;
    global $course;
    global $preferences;
-    $i = 1;
+    $i = 2; // index to differentiate activities with the same name MDL-6876
    $grades = grade_get_grades();
    if (isset($grades)) {
        // iterate through all students
@@ -179,7 +179,7 @@ function grade_get_formatted_grades() {
                            if ($instance->name != '') {                
                                // duplicate grade item name, the user should know better than to name to things by the same name, but to make sure grades don't disappear lets modify the name slightly
                                if (isset($all_categories["$cur_category"]["$instance->name"])) {
-                                    $instance->name= $instance->name.' *'.$i.'*';
+                                    $instance->name= $instance->name.' #'.$i++;
                                }

                                if (isset($students_grade->grades) && $students_grade->grades != '') {
@@ -1594,6 +1594,7 @@ function grade_get_stats($category='all') {
 // returns a comma seperated list of the most common values in $items, $items is expected to be a comma sperated list of numbers
 function grade_mode($items) {
    $all_scores = explode(',',$items);
+    shuffle($all_scores); //MDL-7571 - shuffle scores
    foreach($all_scores as $value) {
        if (isset($frequency[$value])) {
            $frequency[$value]++;
@@ -1,153 +1,188 @@
 <?php
+/**
+ * help.php - Displays help page.
+ *
+ * Prints a very simple page and includes
+ * page content or a string from elsewhere.
+ * Usually this will appear in a popup
+ * See {@link helpbutton()} in {@link lib/moodlelib.php}
+ *
+ * @author Martin Dougiamas
+ * @version $Id$
+ * @package moodlecore
+ */
+require_once('config.php');

-    /**
-     * help.php - Displays help page.
-     *
-     * Prints a very simple page and includes
-     * page content or a string from elsewhere.
-     * Usually this will appear in a popup
-     * See {@link helpbutton()} in {@link lib/moodlelib.php}
-     *
-     * @author Martin Dougiamas
-     * @version $Id$
-     * @package moodlecore
-     */
+// Get URL parameters.
+$file   = optional_param('file', '', PARAM_PATH);
+$text   = optional_param('text', 'No text to display', PARAM_CLEAN);
+$module = optional_param('module', 'moodle', PARAM_ALPHAEXT);
+$forcelang = optional_param('forcelang', '', PARAM_SAFEDIR);

+// Start the output.
+print_header();
+print_simple_box_start('center', '96%');

-    require_once('config.php');
+// We look for the help to display in lots of different places, and
+// only display an error at the end if we can't find the help file
+// anywhere. This variable tracks that.
+$helpfound = false;

-    $file   = optional_param('file', '', PARAM_PATH);
-    $text   = optional_param('text', 'No text to display', PARAM_CLEAN);
-    $module = optional_param('module', 'moodle', PARAM_ALPHAEXT);
-    $forcelang = optional_param('forcelang', '', PARAM_ALPHAEXT);
+if (!empty($file)) {
+    // The help to display is from a help file.

-    print_header();
-
-    print_simple_box_start('center', '96%');
-
-    $helpfound = false;
+    // Get the list of parent languages.
    if (empty($forcelang)) {
        $langs = array(current_language(), get_string('parentlanguage'), 'en_utf8');  // Fallback
    } else {
        $langs = array($forcelang);
-    } 
-    if (!empty($file)) {
+    }
+
+    // Work through the possible languages, starting with the most specific.
+    foreach ($langs as $lang) {
+        if (empty($lang)) {
+            continue;
+        }
+
+        // Work out which directory the help files live in.
+        if ($lang == 'en_utf8') {
+            $helpdir = $CFG->dirroot;
+        } else {
+            $helpdir = $CFG->dataroot;
+        }
+        $helpdir .= "/lang/$lang/help";
+
+        // Then which file in there we should be serving.
+        if ($module == 'moodle') {
+            $filepath = "$helpdir/$file";
+        } else {
+            $filepath = "$helpdir/$module/$file";
+
+            // If that does not exist, try a fallback into the module code folder.
+            if (!file_exists($filepath)) {
+                $filepath = "$CFG->dirroot/mod/$module/lang/$lang/help/$module/$file";
+            }
+        }
+
+        // Now, try to include the help text from this file, if we can.
+        if (file_exists_and_readable($filepath)) {
+            $helpfound = true;
+            @include($filepath);   // The actual helpfile
+
+            // Now, we process some special cases.
+            if ($module == 'moodle' and ($file == 'index.html' or $file == 'mods.html')) {
+                include_help_for_each_module($file, $langs, $helpdir);
+            }
+
+            // The remaining horrible hardcoded special cases should be delegated to modules somehow.
+            if ($module == 'moodle' and ($file == 'resource/types.html')) {  // RESOURCES
+                include_help_for_each_resource($file, $langs, $helpdir);
+            }
+            if ($module == 'moodle' and ($file == 'assignment/types.html')) {  // ASSIGNMENTS
+                include_help_for_each_assignment_type();
+            }
+
+            // Having found some help, we break out of the loop over languages.
+            break;
+        }
+    }
+} else {
+    // The help to display was given as an argument to this function.
+    echo '<p>'.s($text).'</p>';   // This param was already cleaned
+    $helpfound = true;
+}
+
+print_simple_box_end();
+
+// Display an error if necessary.
+if (!$helpfound) {
+    notify('Help file "'. $file .'" could not be found!');
+}
+
+// End of page.
+close_window_button();
+echo '<p align="center"><a href="help.php?file=index.html">'. get_string('helpindex') .'</a></p>';
+
+$CFG->docroot = '';   // We don't want a doc link here
+print_footer('none');
+
+// Utility function =================================================================
+
+function file_exists_and_readable($filepath) {
+    return file_exists($filepath) and is_file($filepath) and is_readable($filepath);
+}
+
+// Some functions for handling special cases ========================================
+
+function include_help_for_each_module($file, $langs, $helpdir) {
+    global $CFG;
+
+    if (!$modules = get_records('modules', 'visible', 1)) {
+        error('No modules found!!');        // Should never happen
+    }
+
+    foreach ($modules as $mod) {
+        $strmodulename = get_string('modulename', $mod->name);
+        $modulebyname[$strmodulename] = $mod;
+    }
+    ksort($modulebyname);
+
+    foreach ($modulebyname as $mod) {
        foreach ($langs as $lang) {
            if (empty($lang)) {
                continue;
            }
-            if ($module == 'moodle') {
-                if ($lang == 'en_utf8') {
-                    $filepath = $CFG->dirroot .'/lang/'. $lang .'/help/'. $file;
-                } else {
-                    $filepath = $CFG->dataroot .'/lang/'. $lang .'/help/'. $file;
-                }
-            } else {
-                if ($lang == 'en_utf8') {
-                    $filepath = $CFG->dirroot .'/lang/'. $lang .'/help/'. $module .'/'. $file;
-                } else {
-                    $filepath = $CFG->dataroot .'/lang/'. $lang .'/help/'. $module .'/'. $file;
-                    if (!file_exists($filepath)) {
-                        $filepath = $CFG->dirroot .'/lang/en_utf8/help/'. $module .'/'. $file;
-                    }
-                }
-                if (!file_exists($filepath)) {
-                    $filepath = $CFG->dirroot.'/mod/'.$module.'/lang/'. $lang .'/help/'. $module .'/'. $file;
-                }
+
+            $filepath = "$helpdir/$mod->name/$file";
+
+            // If that does not exist, try a fallback into the module code folder.
+            if (!file_exists($filepath)) {
+                $filepath = "$CFG->dirroot/mod/$mod->name/lang/$lang/help/$mod->name/$file";
            }

-            if (file_exists($filepath)) {
-                $helpfound = true;
-                include($filepath);   // The actual helpfile
-
-                if ($module == 'moodle' and ($file == 'index.html' or $file == 'mods.html')) {
-                    // include file for each module
-
-                    if (!$modules = get_records('modules', 'visible', 1)) {
-                        error('No modules found!!');        // Should never happen
-                    }
-
-                    foreach ($modules as $mod) {
-                        $strmodulename = get_string('modulename', $mod->name);
-                        $modulebyname[$strmodulename] = $mod;
-                    }
-                    ksort($modulebyname);
-
-                    foreach ($modulebyname as $mod) {
-                        foreach ($langs as $lang) {
-                            if (empty($lang)) {
-                                continue;
-                            }
-                            if ($lang == 'en_utf8') {
-                                $filepath = $CFG->dirroot .'/lang/'. $lang .'/help/'. $mod->name .'/'. $file;
-                            } else {
-                                $filepath = $CFG->dataroot .'/lang/'. $lang .'/help/'. $mod->name .'/'. $file;
-                            }
-
-                            if (file_exists($filepath)) {
-                                echo '<hr size="1" />';
-                                include($filepath);   // The actual helpfile
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                // Some horrible hardcoded stuff follows, should be delegated to modules to handle
-
-                if ($module == 'moodle' and ($file == 'resource/types.html')) {  // RESOURCES
-                    require_once($CFG->dirroot .'/mod/resource/lib.php');
-                    $typelist = resource_get_resource_types();
-                    $typelist['label'] = get_string('resourcetypelabel', 'resource');
-
-                    foreach ($typelist as $type => $name) {
-                        foreach ($langs as $lang) {
-                            if (empty($lang)) {
-                                continue;
-                            }
-                            if ($lang == 'en_utf8') {
-                                $filepath = $CFG->dirroot .'/lang/'. $lang .'/help/resource/type/'. $type .'.html';
-                            } else {
-                                $filepath = $CFG->dataroot .'/lang/'. $lang .'/help/resource/type/'. $type .'.html';
-                            }
-                            if (file_exists($filepath)) {
-                                echo '<hr size="1" />';
-                                include($filepath);   // The actual helpfile
-                                break;
-                            }
-                        }
-                    }
-                }
-                if ($module == 'moodle' and ($file == 'assignment/types.html')) {  // ASSIGNMENTS
-                    require_once($CFG->dirroot .'/mod/assignment/lib.php');
-                    $typelist = assignment_types();
-
-                    foreach ($typelist as $type => $name) {
-                        echo '<p><b>'.$name.'</b></p>';
-                        echo get_string('help'.$type, 'assignment');
-                        echo '<hr size="1" />';
-                    }
-                }
-                break;
+            if (file_exists_and_readable($filepath)) {
+                echo '<hr size="1" />';
+                @include($filepath); // The actual helpfile
+                break; // Out of loop over languages.
            }
        }
-    } else {
-        echo '<p>'.s($text).'</p>';   // This param was already cleaned
-        $helpfound = true;
    }
+}

-    print_simple_box_end();
+function include_help_for_each_resource($file, $langs, $helpdir) {
+    global $CFG;

-    if (!$helpfound) {
-        //$file = clean_text($file);  // Keep it clean!
-        notify('Help file "'. $file .'" could not be found!');
+    require_once($CFG->dirroot .'/mod/resource/lib.php');
+    $typelist = resource_get_resource_types();
+    $typelist['label'] = get_string('resourcetypelabel', 'resource');
+
+    foreach ($typelist as $type => $name) {
+        foreach ($langs as $lang) {
+            if (empty($lang)) {
+                continue;
+            }
+
+            $filepath = "$helpdir/resource/type/$type.html";
+
+            if (file_exists_and_readable($filepath)) {
+                echo '<hr size="1" />';
+                @include($filepath); // The actual helpfile
+                break; // Out of loop over languages.
+            }
+        }
    }
+}

-    close_window_button();
+function include_help_for_each_assignment_type() {
+    global $CFG;

-    echo '<p align="center"><a href="help.php?file=index.html">'. get_string('helpindex') .'</a></p>';
+    require_once($CFG->dirroot .'/mod/assignment/lib.php');
+    $typelist = assignment_types();

-    $CFG->docroot = '';   // We don't want a doc link here
-
-    print_footer('none');
+    foreach ($typelist as $type => $name) {
+        echo '<p><b>'.$name.'</b></p>';
+        echo get_string('help'.$type, 'assignment');
+        echo '<hr size="1" />';
+    }
+}
 ?>
@@ -3,7 +3,7 @@

 /// If config.php exists already then we are not needed.

-if (file_exists('./config.php')) { 
+if (file_exists('./config.php')) {
    header('Location: index.php');
    die;
 } else {
@@ -97,18 +97,18 @@ if (isset($_POST['stage'])) {


    if ($nextstage < 0) $nextstage = WELCOME;
-    
+

    /// Store any posted data
    foreach ($_POST as $setting=>$value) {
        $INSTALL[$setting] = $value;
    }
-    
+
 } else {

    $goforward = true;
    $nextstage = WELCOME;
-    
+
 }

 //==========================================================================//
@@ -125,12 +125,12 @@ $CFG->running_installer = true;

 /// Include some moodle libraries

+require_once('./lib/adminlib.php');
 require_once('./lib/setuplib.php');
 require_once('./lib/moodlelib.php');
 require_once('./lib/weblib.php');
 require_once('./lib/adodb/adodb.inc.php');
 require_once('./lib/environmentlib.php');
-require_once('./lib/xmlize.php');
 require_once('./lib/componentlib.class.php');
 require_once('./version.php');

@@ -145,6 +145,20 @@ $db = &ADONewConnection($INSTALL['dbtype']);
 if ($INSTALL['wwwroot'] == '') {
    list($INSTALL['wwwroot'], $xtra) = explode('/install.php', qualified_me());
    $INSTALL['wwwrootform'] = $INSTALL['wwwroot'];
+
+    // now try to guess the correct dataroot not accessible via web
+    $CFG->wwwroot = $INSTALL['wwwroot'];
+    $i = 0; //safety check - dirname might return some unexpected results
+    while(is_dataroot_insecure()) {
+        $parrent = dirname($CFG->dataroot);
+        $i++;
+        if ($parrent == '/' or $parrent == '.' or preg_match('/^[a-z]:\\\?$/i', $parrent) or ($i > 100)) {
+            $CFG->dataroot = ''; //can not find secure location for dataroot
+            break;
+        }
+        $CFG->dataroot = dirname($parrent).'/moodledata';
+    }
+    $INSTALL['dataroot'] = $CFG->dataroot;
 }

 $headstagetext = array(WELCOME       => get_string('chooselanguagehead', 'install'),
@@ -184,7 +198,7 @@ if (isset($_GET['help'])) {
 /// Are we in config download mode?

 if (isset($_GET['download'])) {
-    header("Content-Type: application/download\n"); 
+    header("Content-Type: application/download\n");
    header("Content-Disposition: attachment; filename=\"config.php\"");
    echo $INSTALL['config'];
    exit;
@@ -201,21 +215,21 @@ if (isset($_GET['download'])) {
 if ($INSTALL['stage'] == DIRECTORY) {

    error_reporting(0);
-    
+
    /// check wwwroot
-    if (ini_get('allow_url_fopen')) {
+    if (ini_get('allow_url_fopen') && false) {  /// This was not reliable
        if (($fh = @fopen($INSTALL['wwwrootform'].'/install.php', 'r')) === false) {
            $errormsg .= get_string('wwwrooterror', 'install').'<br />';
            $INSTALL['wwwrootform'] = $INSTALL['wwwroot'];
        }
    }
    if ($fh) fclose($fh);
-            
+
    /// check dirroot
    if (($fh = @fopen($INSTALL['dirrootform'].'/install.php', 'r')) === false ) {
        $errormsg .= get_string('dirrooterror', 'install').'<br />';
        $INSTALL['dirrootform'] = $INSTALL['dirroot'];
-    } 
+    }
    if ($fh) fclose($fh);

    /// check dataroot
@@ -223,7 +237,7 @@ if ($INSTALL['stage'] == DIRECTORY) {
    if (make_upload_directory('sessions', false) === false ) {
        $errormsg .= get_string('datarooterror', 'install').'<br />';
    }
-    if ($fh) fclose($fh); 
+    if ($fh) fclose($fh);

    if (!empty($errormsg)) $nextstage = DIRECTORY;

@@ -245,7 +259,7 @@ if ($INSTALL['stage'] == DATABASE) {
     } else {
         $INSTALL['skipdbencodingtest'] = false;
     }
-    
+
    /// different format for postgres7 by socket
    if ($INSTALL['dbtype'] == 'postgres7' and ($INSTALL['dbhost'] == 'localhost' || $INSTALL['dbhost'] == '127.0.0.1')) {
        $INSTALL['dbhost'] = "user='{$INSTALL['dbuser']}' password='{$INSTALL['dbpass']}' dbname='{$INSTALL['dbname']}'";
@@ -267,11 +281,11 @@ if ($INSTALL['stage'] == DATABASE) {

    if (empty($errormsg)) {

-        error_reporting(0);  // Hide errors 
+        error_reporting(0);  // Hide errors

        if (! $dbconnected = $db->Connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'],$INSTALL['dbname'])) {
            /// The following doesn't seem to work but we're working on it
-            /// If you come up with a solution for creating a database in MySQL 
+            /// If you come up with a solution for creating a database in MySQL
            /// feel free to put it in and let us know
            if ($dbconnected = $db->Connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'])) {
                switch ($INSTALL['dbtype']) {   /// Try to create a database
@@ -316,7 +330,7 @@ if ($INSTALL['stage'] == DATABASE) {
                                        $nextstage = DATABASE;
                                        $INSTALL['showskipdbencodingtest'] = true;
                                        $INSTALL['dbencodingtestresults'] = false;
-                                    } 
+                                    }
                                } else {
                                    $INSTALL['showskipdbencodingtest'] = true;
                                    $INSTALL['dbencodingtestresults'] = false;
@@ -361,7 +375,7 @@ if ($INSTALL['stage'] == DATABASE) {
 /// If we can open a file then we know that the admin name is correct.

 if ($nextstage == ADMIN or $INSTALL['stage'] == ADMIN) {
-    if (!ini_get('allow_url_fopen')) {
+    if (!ini_get('allow_url_fopen') || true) { // MDL-4218 fopen URL is not reliable
        $nextstage = ($goforward) ? ENVIRONMENT : DATABASE;
    } else if (($fh = @fopen($INSTALL['wwwrootform'].'/'.$INSTALL['admindirname'].'/site.html', 'r')) !== false) {
        $nextstage = ($goforward) ? ENVIRONMENT : DATABASE;
@@ -449,7 +463,7 @@ if ($INSTALL['stage'] == DOWNLOADLANG && $INSTALL['downloadlangpack']) {
        $INSTALL['showdownloadlangpack']   = false;
        $INSTALL['downloadlangpackerror']  = $downloaderror;
    }
-}    
+}



@@ -503,7 +517,7 @@ if ($nextstage == SAVE) {
        fwrite($fh, $str);
        fclose($fh);
    }
-        
+

    $INSTALL['config'] = $str;
 }
@@ -554,7 +568,7 @@ if (isset($_GET['help'])) {

    <tr>
        <td class="td_main" colspan="2">
-    
+
 <?php

 if (!empty($errormsg)) echo "<p class=\"errormsg\" align=\"center\">$errormsg</p>\n";
@@ -571,7 +585,7 @@ if ($nextstage == SAVE) {
        echo "<tr>\n";
        echo "<td width=\"33.3%\">&nbsp;</td>\n";
        echo "<td width=\"33.3%\">&nbsp;</td>\n";
-        echo "<td width=\"33.3%\" align=\"right\">\n";        
+        echo "<td width=\"33.3%\" align=\"right\">\n";
        print_single_button("index.php", $options, get_string('continue')."  &raquo;");
        echo "</td>\n";
        echo "</tr>\n";
@@ -579,16 +593,16 @@ if ($nextstage == SAVE) {

    } else {
        echo "<p class=\"errormsg\">".get_string('configfilenotwritten', 'install')."</p>";
-        
+
        echo "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
        echo "<tr>\n";
        echo "<td width=\"33.3%\">&nbsp;</td>\n";
-        echo "<td width=\"33.3%\" align=\"center\">\n";        
+        echo "<td width=\"33.3%\" align=\"center\">\n";
        $installoptions = array();
-        $installoptions['download'] = 1; 
+        $installoptions['download'] = 1;
        print_single_button("install.php", $installoptions, get_string('download', 'install'));
        echo "</td>\n";
-        echo "<td width=\"33.3%\" align=\"right\">\n";        
+        echo "<td width=\"33.3%\" align=\"right\">\n";
        print_single_button("index.php", $options, get_string('continue')."  &raquo;");
        echo "</td>\n";
        echo "</tr>\n";
@@ -626,7 +640,7 @@ if ($nextstage == SAVE) {



-<?php 
+<?php

 //==========================================================================//

@@ -675,7 +689,7 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
            break;
        case COMPATIBILITY: /// Compatibilty check
            $compatsuccess = true;
-            
+
            /// Check that PHP is of a sufficient version
            print_compatibility_row(inst_check_php_version(), get_string('phpversion', 'install'), get_string('phpversionerror', 'install'), 'phpversionhelp');
            /// Check session auto start
@@ -684,7 +698,7 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
            print_compatibility_row(!ini_get_bool('magic_quotes_runtime'), get_string('magicquotesruntime', 'install'), get_string('magicquotesruntimeerror', 'install'), 'magicquotesruntimehelp');
            /// Check unsupported PHP configuration
            print_compatibility_row(ini_get_bool('magic_quotes_gpc') || (!ini_get_bool('register_globals')), get_string('globalsquotes', 'install'), get_string('globalsquoteserror', 'install'), 'globalsquoteshelp');
-            /// Check safe mode 
+            /// Check safe mode
            print_compatibility_row(!ini_get_bool('safe_mode'), get_string('safemode', 'install'), get_string('safemodeerror', 'install'), 'safemodehelp', true);
            /// Check file uploads
            print_compatibility_row(ini_get_bool('file_uploads'), get_string('fileuploads', 'install'), get_string('fileuploadserror', 'install'), 'fileuploadshelp', true);
@@ -823,7 +837,7 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
                        print_single_button('install.php', $options, get_string('downloadlanguagebutton','install', $languages[$INSTALL['language']]), 'POST');
                        print_simple_box_end();
                    } else {
-                /// Show result info 
+                /// Show result info
                    /// English lang packs aren't downloaded
                        if (substr($INSTALL['language'],0,2) == 'en') {
                            print_simple_box(get_string('downloadlanguagenotneeded', 'install', $languages[$INSTALL['language']]), 'center', '80%');
@@ -873,7 +887,7 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
        </td>

    </tr>
-    
+
    </table>
 <?php
    if (!$needtoopenform) {
@@ -922,7 +936,7 @@ function install_helpbutton($url, $title='') {
    echo "onClick=\"return window.open('$url', 'Help', 'menubar=0,location=0,scrollbars,resizable,width=500,height=400')\">";
    echo "</a>\n";
 }
-    
+


 //==========================================================================//
@@ -1021,7 +1035,7 @@ function css_styles() {
 <style type="text/css">

    body { background-color: #ffeece; }
-    p, li, td { 
+    p, li, td {
        font-family: helvetica, arial, sans-serif;
        font-size: 10pt;
    }
@@ -1098,6 +1112,18 @@ function css_styles() {
        font-size: 10pt;
        border-color: #ffc85f;
    }
+    table.environmenttable .error {
+        background-color : red;
+        color : inherit;
+    }
+
+    table.environmenttable .warn {
+        background-color : yellow;
+    }
+
+    table.environmenttable .ok {
+        background-color : lightgreen;
+    }
    .header {
        background-color: #fee6b9;
        font-size: 10pt;
@@ -62,6 +62,7 @@ $string['magicquotesruntimeerror'] = 'هذا يجب ان يكون معطل';
 $string['mbstringrecommended'] = 'يفضل وبشدة تثبيت مكتبة (MBSTRING) الاختيارية وذلك لتسحين اداء الموقع وبذات لوكان موقعك يدعم لغات غير لاتينية.';
 $string['memorylimit'] = 'حد الذاكرة';
 $string['memorylimiterror'] = 'ذاكرة الـ PHP صغيرة جداً... من المحتل ستواجه بعض المشاكل لاحقاً';
+$string['moodledocslink'] = 'وثائق مودل لهذه الصفحة';
 $string['mysql416bypassed'] = 'على الرغم من أن موقعك يستخدم iso-8859-1 للغات (اللأتينية)فقط، يمكنك الأستمرار في استخدام MySQL 4.1.12 أو أعلى المثبتة حاليا.';
 $string['mysql416required'] = 'MySQL 4.1.16 هي الأصدار الأقل المطلوب لاتثبيت أصدار مودل 1.6 وذلك لضمان إمكانية تحويل جميع البيانات إلى UTF-8 في المستقبل.';
 $string['name'] = 'الاسم';
@@ -77,6 +78,7 @@ $string['phpversionhelp'] = '<p> يتطلب مودل على الاقل الأص
 <p> يجب عليك ترقية PHP أو الانتقال إلى مستظيف أخر لديه أصدار اجد لـ PHP.</p>';
 $string['previous'] = 'السابق';
 $string['report'] = 'تقرير';
+$string['restricted'] = 'متحكم فيه';
 $string['safemode'] = 'وضع الامان';
 $string['safemodeerror'] = 'من الممكن ان مودل يواجه مشاكل عندما يكون وضع الامان نشط';
 $string['sessionautostart'] = 'البدء الآلي للجلسة';
@@ -0,0 +1,16 @@
+<?php
+/// Please, do not edit this file manually! It's auto generated from
+/// contents stored in your standard lang pack files:
+/// (langconfig.php, install.php, moodle.php, admin.php and error.php)
+///
+/// If you find some missing string in Moodle installation, please,
+/// keep us informed using http://moodle.org/bugs Thanks!
+///
+/// File generated by cvs://contrib/lang2installer/installer_builder
+/// using strings defined in stringnames.txt (same dir)
+
+$string['availablelangs'] = 'যে সমস্ত ভাষা ব্যাবহার করতে পারেন';
+$string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'বাংলা';
+?>
@@ -33,6 +33,13 @@ $string['fileuploads'] = 'Katalog za učitavanja datoteka';
 $string['fileuploadserror'] = 'Ovo bi trebalo biti uključeno';
 $string['gdversion'] = 'GD verzija';
 $string['gdversionerror'] = 'GD datoteka sa izvornim kodom trebala bi prezentirati proces i kreirati duplikate';
+$string['gdversionhelp'] = '<p>Vaš server neće izgledati isto imajući GD instalaciju.</p>
+
+<p>GD je datoteka sa izvornim kodom što je potrebno da PHP dozvoli Moodle da izradi duplikate (kao što je ikona korisničkog profila) i da kreira nove duplikate (kao što je operativni registar slika).  Moodle će još uvijek raditi bez GD a ova lica jednostavno neće biti dostupna vama.</p>
+
+<p>Da dodate GD u PHP na osnovu Unixa, kompajlirate PHP koristeći se gd parametrom.</p>
+
+<p>Na osnovu Windows obično možete podesiti php.ini i ne bilježiti liniju referencirajući php_gd2.dll.</p>';
 $string['help'] = 'Pomoć';
 $string['installation'] = 'Instalacija';
 $string['language'] = 'Jezik';
@@ -36,6 +36,7 @@ $string['configfilewritten'] = 'S\'ha creat amb èxit el fitxer config.php';
 $string['configurationcompletehead'] = 'S\'ha completat la configuració';
 $string['configurationcompletesub'] = 'Moodle ha intentat desar la configuració en un fitxer en l\'arrel de la vostra instal·lació de Moodle.';
 $string['continue'] = 'Continua';
+$string['curlrecommended'] = 'Es recomana instal·lar la biblioteca opcional Curl a fi d\'habilitar la funcionalitat de Moodle en Xarxa.';
 $string['database'] = 'Base de dades';
 $string['databasecreationsettingshead'] = 'Ara cal configurar els paràmetres de la base de dades on s\'emmagatzemaran la majoria de dades de Moodle. L\'instal·lador crearà automàticament aquesta base de dades amb els paràmetres que especifiqueu aquí.';
 $string['databasecreationsettingssub'] = '<b>Tipus:</b> fixat a \"mysql\" per l\'instal·lador<br />
@@ -51,6 +52,42 @@ $string['databasesettingssub'] = '<b>Tipus:</b> mysql o postgres7<br />
 <b>Usuari:</b> nom de l\'usuari de la base de dades<br />
 <b>Contrasenya:</b> contrasenya de l\'usuari de la base de dades<br />
 <b>Prefix de les taules:</b> prefix opcional per utilitzar en els noms de totes les taules';
+$string['databasesettingssub_mssql'] = '<b>Tipus:</b> SQL*Server (no UTF-8) <b><font color=\"red\">Experimental! (no per a utilitzar en producció)</font></b><br />
+<b>Servidor:</b> p. ex. localhost o db.isp.com<br />
+<b>Nom:</b> nom de la base de dades, p. ex. moodle<br />
+<b>Usuari:</b> el vostre nom d\'usuari de la base de dades<br />
+<b>Contrasenya:</b> la vostra contrasenya de la base de dades<br />
+<b>Prefix de les taules:</b> prefix que cal anteposar als noms de totes les taules (obligatori)';
+$string['databasesettingssub_mssql_n'] = '<b>Tipus:</b> SQL*Server (UTF-8 habilitat)<br />
+<b>Servidor:</b> p. ex. localhost o db.isp.com<br />
+<b>Nom:</b> nom de la base de dades, p. ex. moodle<br />
+<b>Usuari:</b> el vostre nom d\'usuari de la base de dades<br />
+<b>Contrasenya:</b> la vostra contrasenya de la base de dades<br />
+<b>Prefix de les taules:</b> prefix que cal anteposar als noms de totes les taules (obligatori)';
+$string['databasesettingssub_mysql'] = '<b>Tipus:</b> MySQL<br />
+<b>Servidor:</b> p. ex. localhost o db.isp.com<br />
+<b>Nom:</b> nom de la base de dades, p. ex. moodle<br />
+<b>Usuari:</b> el vostre nom d\'usuari de la base de dades<br />
+<b>Contrasenya:</b> la vostra contrasenya de la base de dades<br />
+<b>Prefix de les taules:</b> prefix que cal anteposar als noms de totes les taules (opcional)';
+$string['databasesettingssub_oci8po'] = '<b>Tipus:</b> Oracle<br />
+<b>Servidor:</b> no utilitzat, s\'ha de deixar en blanc<br />
+<b>Nom:</b> nom de la connexió tnsnames.ora<br />
+<b>Usuari:</b> el vostre nom d\'usuari de la base de dades<br />
+<b>Contrasenya:</b> la vostra contrasenya de la base de dades<br />
+<b>Prefix de les taules:</b> prefix que cal anteposar als noms de totes les taules (obligatori, màxim 2 caràcters)';
+$string['databasesettingssub_odbc_mssql'] = '<b>Tipus:</b> SQL*Server (sobre ODBC) <b><font color=\"red\">Experimental! (no per a utilitzar en producció)</font></b><br />
+<b>Servidor:</b> nom del DSN al tauler de control de l\'ODBC<br />
+<b>Nom:</b> nom de la base de dades, p. ex. moodle<br />
+<b>Usuari:</b> el vostre nom d\'usuari de la base de dades<br />
+<b>Contrasenya:</b> la vostra contrasenya de la base de dades<br />
+<b>Prefix de les taules:</b> prefix que cal anteposar als noms de totes les taules (obligatori)';
+$string['databasesettingssub_postgres7'] = '<b>Tipus:</b> PostgreSQL<br />
+<b>Servidor:</b> p. ex. localhost o db.isp.com<br />
+<b>Nom:</b> nom de la base de dades, p. ex. moodle<br />
+<b>Usuari:</b> el vostre nom d\'usuari de la base de dades<br />
+<b>Contrasenya:</b> la vostra contrasenya de la base de dades<br />
+<b>Prefix de les taules:</b> prefix que cal anteposar als noms de totes les taules (obligatori)';
 $string['dataroot'] = 'Directori de dades';
 $string['datarooterror'] = 'No s\'ha pogut trobar o crear el directori de dades que heu especificat. Corregiu el camí o creeu el directori a mà.';
 $string['dbconnectionerror'] = 'No es pot obrir la connexió amb la base de dades que heu especificat. Comproveu els paràmetres de la base de dades.';
@@ -59,6 +96,9 @@ $string['dbhost'] = 'Ordinador servidor';
 $string['dbprefix'] = 'Prefix de taules';
 $string['dbtype'] = 'Tipus';
 $string['dbwrongencoding'] = 'La base de dades que heu seleccionat està funcionant amb una codificació ($a) no recomanada. Seria millor utilitzar una base de dades amb codificació Unicode (UTF-8). De totes maneres, podeu deixar de banda aquesta prova si seleccioneu més avall \"Omet la prova de codificació de la base de dades\", però podríeu experimentar problemes en el futur.';
+$string['dbwronghostserver'] = 'Heu de seguir les regles referents al servidor, exposades més amunt.';
+$string['dbwrongnlslang'] = 'La variable d\'entorn NLS_LANG del vostre servidor web ha d\'utilitzar el joc de caràcters AL32UTF8. Consulteu la documentació de PHP sobre la configuració correcta d\'OCI8.';
+$string['dbwrongprefix'] = 'Heu de seguir les regles referents al prefix de les taules, exposades més amunt.';
 $string['directorysettingshead'] = 'Confirmeu les ubicacions d\'aquesta instal·lació de Moodle.';
 $string['directorysettingssub'] = '<b>Adreça web:</b>
 Especifiqueu l\'adreça web completa per a accedir a Moodle. Si el vostre lloc és accessible per mitjà de diversos URL, trieu el més natural per als estudiants. No inclogueu la barra final.</p>
@@ -72,7 +112,7 @@ $string['dirroot'] = 'Directori de Moodle';
 $string['dirrooterror'] = 'El paràmetre \'Directori de Moodle\' sembla incorrecte: no s\'hi ha pogut trobat cap instal·lació de Moodle. S\'ha reiniciat el valor del paràmetre.';
 $string['download'] = 'Baixa';
 $string['downloadedfilecheckfailed'] = 'Ha fallat la comprovació del fitxer baixat';
-$string['downloadlanguagebutton'] = 'Baixa el paquet d\'idioma &quot;$a&quot;';
+$string['downloadlanguagebutton'] = 'Baixa el paquet d\'idioma \"$a\"';
 $string['downloadlanguagehead'] = 'Baixa paquet d\'idioma';
 $string['downloadlanguagenotneeded'] = 'Podeu continuar el procés d\'instal·lació amb el paquet d\'idioma per defecte \"$a\".';
 $string['downloadlanguagesub'] = 'Ara teniu l\'opció de baixar un paquet d\'idioma i continuar el procés d\'instal·lació en aquest idioma.<br /><br />Si no podeu baixar el paquet, el procés d\'instal·lació prosseguirà en anglès. (Després que s\'hagi completat la instal·lació, tindreu l\'oportunitat de baixar i instal·lar paquets d\'idioma addicionals.)';
@@ -90,6 +130,13 @@ $string['fileuploads'] = 'Càrrega de fitxers';
 $string['fileuploadserror'] = 'Hauria d\'estar habilitada';
 $string['gdversion'] = 'Versió GD';
 $string['gdversionerror'] = 'La biblioteca GD hauria d\'estar present per processar i crear imatges';
+$string['gdversionhelp'] = '<p>Sembla que el vostre servidor no té instal·lat el GD.</p>
+
+<p>GD és una biblioteca requerida pel PHP per tal que Moodle pugui processar imatges (p. ex. les icones dels perfils d\'usuari) i crear imatges noves (p. ex. els gràfics dels registres d\'activitat). Moodle pot funcionar sense GD, però aquestes característiques no estaran disponibles.</p>
+
+<p>Per afegir GD al PHP en Unix, compileu el PHP amb el paràmetre --with-gd.</p>
+
+<p>En Windows generalment es pot editar el fitxer php.ini i treure el comentari de la línia que porti la referència a php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Gestió insegura dels globals';
 $string['globalsquoteserror'] = 'Arregleu els paràmetres del vostre PHP: inhabiliteu register_globals i/o habiliteu magic_quotes_gpc';
 $string['help'] = 'Ajuda';
@@ -118,20 +165,32 @@ $string['memorylimithelp'] = '<p>El límit de memòria del PHP del vostre servid
 <p>Tanmateix, en alguns servidors això farà que no funcioni <b>cap</b> pàgina PHP (es visualitzaran errors) en el qual cas hauríeu de suprimir el fitxer .htaccess.</p></li>
 </ol>';
 $string['missingrequiredfield'] = 'Falta algun camp necessari';
+$string['moodledocslink'] = 'Documentació de Moodle per a aquesta pàgina';
+$string['mssql'] = 'SQL*Server (mssql)';
+$string['mssql_n'] = 'SQL*Server amb UTF-8 (mssql_n)';
+$string['mssqlextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió MSSQL de manera que pugui comunicar-se amb SQL*Server. Reviseu el fitxer php.ini o recompileu PHP.';
+$string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'Tanmateix, si el vostre lloc fa servir NOMÉS llengües romàniques (iso-8859-1), podeu seguir utilitzant el MySQL 4.1.12 (o superior) instal·lat.';
 $string['mysql416required'] = 'MySQL 4.1.16 és la versió mínima requerida per Moodle 1.6 a fi de garantir la conversió de totes les dades a UTF-8 en el futur.';
-$string['mysqlextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió MySQL per tal que es pugui comunicar amb MySQL. Comproveu el fitxer php.ini o recompileu el PHP.';
+$string['mysqlextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió MySQL de manera que pugui comunicar-se amb MySQL. Reviseu el fitxer php.ini o recompileu el PHP.';
 $string['name'] = 'Nom';
 $string['next'] = 'Següent';
+$string['oci8po'] = 'Oracle (oci8po)';
+$string['ociextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió OCI8 de manera que pugui comunicar-se amb Oracle. Reviseu el fitxer php.ini o recompileu el PHP.';
+$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
+$string['odbcextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió ODBC de manera que pugui comunicar-se amb Oracle. Reviseu el fitxer php.ini o recompileu el PHP.';
 $string['ok'] = 'OK';
+$string['opensslrecommended'] = 'Es recomana instal·lar la biblioteca OpenSSL per habilitar la funcionalitat de Moodle en Xarxa.';
 $string['pass'] = 'Correcte';
 $string['password'] = 'Contrasenya';
+$string['pgsqlextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió PGSQL de manera que pugui comunicar-se amb PostgreSQL. Reviseu el fitxer php.ini o recompileu el PHP.';
 $string['php50restricted'] = 'PHP 5.0 té alguns problemes coneguts. Actualitzeu-vos si us plau a 5.1.x o torneu a 4.3.x o 4.4.x';
 $string['phpversion'] = 'Versió PHP';
 $string['phpversionerror'] = 'La versió del PHP ha de ser com a mínim la 4.1.0';
 $string['phpversionhelp'] = '<p>Moodle necessita la versió de PHP 4.1.0 o posterior.</p>
 <p>A hores d\'ara esteu utilitzant la versió $a.</p>
 <p>Us caldrà actualitzar el PHP o traslladar Moodle a un ordinador amb una versió de PHP més recent.</p>';
+$string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Anterior';
 $string['remotedownloadnotallowed'] = 'El vostre servidor no permet baixar components ((allow_url_fopen inhabilitat).<br /><br />Baixeu manualment el fitxer <a href=\"$a->url\">$a->url</a>, copieu en la ubicació \"$a->dest\" del vostre servidor i descomprimiu-lo allí.';
 $string['report'] = 'Informe';
@@ -144,6 +203,8 @@ $string['skipdbencodingtest'] = 'Omet la prova de codificació de la base de dad
 $string['status'] = 'Estat';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Català';
+$string['unicoderecommended'] = 'Es recomana emmagatzemar totes les dades en Unicode (UTF-8). Les noves instal·lacions s\'haurien de realitzar en bases de dades que tinguin definit com a Unicode el conjunt de caràcters per defecte. Si esteu fent una actualització, hauríeu de passar el procés de migració a UTF-8 (vg. la pàgina d\'Administració).';
+$string['unicoderequired'] = 'Es requereix emmagatzemar totes les dades en format Unicode (UTF-8). Les noves instal·lacions s\'han de realitzar en bases de dades que tinguin definit com a Unicode el conjunt de caràcters per defecte. Si esteu fent una actualització, hauríeu de passar el procés de migració a UTF-8 (vg. la pàgina d\'Administració).';
 $string['user'] = 'Usuari';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Esteu veient aquesta pàgina perquè heu instal·lat amb èxit i heu executat el paquet <strong>$a->packname $a->packversion</strong>. Felicitacions!';
@@ -36,6 +36,7 @@ $string['configfilewritten'] = 'Soubor config.php byl úspěšně vytvořen.';
 $string['configurationcompletehead'] = 'Konfigurace dokončena';
 $string['configurationcompletesub'] = 'Moodle se pokusil uložit soubor s konfigurací do kořenového adresáře instalace Moodlu.';
 $string['continue'] = 'Pokračovat';
+$string['curlrecommended'] = 'Pro běh síťových funkcionalit (\"Moodle Networking\") je potřeba nainstalovat volitelnou knihovnu Curl.';
 $string['database'] = 'Databáze';
 $string['databasecreationsettingshead'] = 'Nyní musíte nastavit připojení k databázi, kam si bude Moodle ukládat většinu svých dat. Tato databáze může být vytvořena instalátorem automaticky podle následujícího nastavení.';
 $string['databasecreationsettingssub'] = '<b>Typ:</b> instalátor nastaví na \"mysql\"<br />
@@ -51,6 +52,12 @@ $string['databasesettingssub'] = '<b>Typ:</b> mysql nebo postgres7<br />
 <b>Uživatel:</b> uživatelské jméno účtu pro přístup k databázi<br />
 <b>Heslo:</b> heslo k tomuto účtu<br />
 <b>Předpona tabulek:</b> volitelná předpona, která se vloží před názvy všech tabulek (umožňuje používat jednu databázi pro více instalací Moodlu)';
+$string['databasesettingssub_mssql'] = '<b>Typ:</b> SQL*Server (bez UTF-8) <b><font color=\"red\">Jen pro experimentování! (není určeno pro produkční servery)</font></b><br />
+<b>Hostitel (Host):</b> např. localhost nebo db.naseskola.cz<br />
+<b>Název (Name):</b> název databáze, např. moodle<br />
+<b>Uživatel (User):</b> uživatel oprávněný pro práci s databází<br />
+<b>Heslo (Password):</b> heslo pro uživatele<br />
+<b>Předpona (Tables Prefix):</b> jednotná předpona názvů všech tabulek, např. mdl_ (mandatory)';
 $string['dataroot'] = 'Datový adresář';
 $string['datarooterror'] = 'Zadaný datový adresář se nepodařilo nalézt nebo vytvořit. Buď opravte zadanou cestu, nebo vytvořte adresář ručně.';
 $string['dbconnectionerror'] = 'Nepodařilo se připojit k databázi, kterou jste zadali. Zkontrolujte prosím nastavení databáze.';
@@ -92,6 +99,13 @@ $string['fileuploads'] = 'Nahrávání souborů (FIle Uploads)';
 $string['fileuploadserror'] = 'Mělo by být zapnuto';
 $string['gdversion'] = 'Verze GD';
 $string['gdversionerror'] = 'Knihovna GD se používá pro zpracovávání a tvorbu obrázků (např. fotografií, grafů apod.).';
+$string['gdversionhelp'] = '<p>Na vašem serveru zřejmě není nainstalována knihovna GD.</p>
+
+<p>GD je knihovna, kterou vyžaduje PHP k tomu, aby mohl Moodle zpracovávat obrázky (např. ikony uživatelů) a vytvářet nové obrázky (např. grafy přístupů na vaše stránky). Moodle bude fungovat i bez GD, ale tyto funkce nebudou dostupné.</p>
+
+<p>V Unixu můžete přidat GD do PHP tak, že zkompilujte PHP s parametrem --with-gd.</p>
+
+<p>Ve Windows stačí většinou upravit php.ini a odkomentovat řádek odkazující na php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Nezabezpečené zacházení s globálními proměnnými';
 $string['globalsquoteserror'] = 'Upravte nastavení PHP: zakažte register_globals a/nebo povolte magic_quotes_gpc';
 $string['help'] = 'Nápověda';
@@ -122,12 +136,15 @@ na hodnotu blízkou 16M. Nemáte-li taková práva, požádejte správce vašeho
 <p>Bohužel, v některých případech tím vyřadíte z provozu <b>všechny</b> PHP stránky (při jejich prohlížení uvidíte chybová hlášení), takže budete muset soubor .htaccess zase odstranit.</li>
 </ol>';
 $string['missingrequiredfield'] = 'Chybí některé z povinných polí';
+$string['moodledocslink'] = 'Dokumentace k této stránce';
 $string['mysql416bypassed'] = 'Pokud ovšem ve vaší instalaci Moodlu používáte POUZE jazyky založené na latince (iso-8859-1), můžete nadále používat momentálně nainstalovanou verzi MySQL 4.1.12 (nebo vyšší).';
 $string['mysql416required'] = 'Minimální verzí požadovanou pro Moodle 1.6 -- a pro pozdější bezpečný převod všech dat do UTF-8 -- je MySQL 4.1.16.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP nebylo korektně nakonfigurováno pro komunikaci v MySQL. Zkontrolujte váš php.ini nebo překompilujte PHP.';
 $string['name'] = 'Název';
 $string['next'] = 'Další';
 $string['ok'] = 'OK';
+$string['opensslrecommended'] = 'Pro běh síťových funkcionalit (\"Moodle Networking\") je potřeba nainstalovat volitelnou knihovnu OpenSSL.';
+$string['parentlanguage'] = '<< Překladatelé: Pokud Váš jazyk má \"nadřazený\" jazyk\", který má Moodle používat v případech, kdy řetězce ve vašem jazykovém balíčku chybí, specifikujte jeho kód zde. Příklad: nl >>';
 $string['pass'] = 'V pořádku';
 $string['password'] = 'Heslo';
 $string['php50restricted'] = 'V PHP 5.0.x bylo nalezeno množství chyb; přejděte buď na vyšší verzi 5.1.x, nebo na nižší verzi 4.3.x či 4.4.x.';
@@ -139,7 +156,8 @@ $string['phpversionhelp'] = '<p>Moodle vyžaduje PHP alespoň verze 4.3.0 nebo 5
 (U PHP 5.0.x můžete také přejít na nižší verzi 4.4.x či 4.3.x.)</p>';
 $string['previous'] = 'Předchozí';
 $string['remotedownloadnotallowed'] = 'Stahování komponent na server není povoleno (direktiva allow_url_fopen je ve stavu \'vypnuto\').<br /><br />Musíte soubor stáhnout <a href=\"$a->url\">$a->url</a> ručně, zkopírovat jej na serveru do umístění \"$a->dest\" a tam jej dekomprimovat.';
-$string['report'] = 'Report';
+$string['report'] = 'Protokol';
+$string['restricted'] = 'Nedostupné';
 $string['safemode'] = 'Bezpečný režim (Safe Mode)';
 $string['safemodeerror'] = 'Se zapnutým bezpečným režimem (Safe Mode) může mít Moodle problémy.';
 $string['sessionautostart'] = 'Session Auto Start';
@@ -148,6 +166,8 @@ $string['skipdbencodingtest'] = 'Přeskočit test kódování DB';
 $string['status'] = 'Stav';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Čeština';
+$string['unicoderecommended'] = 'Doporučujeme ukládání dat v kódování Unicode (UTF-8). Nové instalace by měly být založeny nad databází s výchozím kódováním Unicode. Pokud přecházíte z nižších verzí, měli byste podstoupit proces migrace na UTF-8 (viz stránku Správa).';
+$string['unicoderequired'] = 'Je nezbytné ukládání dat v kódování Unicode (UTF-8). Nové instalace musí být založeny nad databází s výchozím kódováním Unicode. Pokud přecházíte z nižších verzí, měli byste podstoupit proces migrace na UTF-8 (viz stránku Správa).';
 $string['user'] = 'Uživatel';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Podařilo se vám úspěšně nainstalovat a spustit balíček <strong>$a->packname $a->packversion</strong>. Gratulujeme!';
@@ -0,0 +1,335 @@
+<?php
+/// Please, do not edit this file manually! It's auto generated from
+/// contents stored in your standard lang pack files:
+/// (langconfig.php, install.php, moodle.php, admin.php and error.php)
+///
+/// If you find some missing string in Moodle installation, please,
+/// keep us informed using http://moodle.org/bugs Thanks!
+///
+/// File generated by cvs://contrib/lang2installer/installer_builder
+/// using strings defined in stringnames.txt (same dir)
+
+$string['admindirerror'] = 'Mae cyfeiriadur y gweinyddwr a roddwyd yn anghywir';
+$string['admindirname'] = 'Cyfeiriadur y Gweinyddwr';
+$string['admindirsetting'] = 'Nifer fach iawn o westeiwyr gwe sy\'n defnyddio /admin fel URL arbennig i chi gael mynd i mewn i\'r  
+    panel rheoli neu beth bynnag. Yn anffodus, mae hyn yn gwrthdaro â 
+    lleoliad safonol tudalennau gweinyddol Moodle. Gallwch drwsio hyn drwy 
+    ailenwi cyfeiriadur y gweinyddwr wrth osod y rhaglen, a rhoi\'r  
+    enw newydd yma.  Er enghraifft: <br /> <br /><b>gweinyddmoodle</b><br /> <br />
+    Bydd hyn yn trwsio\'r dolenni gweinyddol yn Moodle.';
+$string['admindirsettinghead'] = 'Gosod cyfeiriadur y gweinyddwr...';
+$string['admindirsettingsub'] = 'Nifer fach iawn o westeiwyr gwe sy\'n defnyddio /admin fel URL arbennig i chi gael mynd i mewn i\'r 
+panel rheoli neu beth bynnag. Yn anffodus, mae hyn yn gwrthdaro â  
+lleoliad safonol tudalennau gweinyddol Moodle. Gallwch drwsio hyn drwy 
+ailenwi cyfeiriadur y gweinyddwr wrth osod y rhaglen, a rhoi\'r  
+enw newydd yma. Er enghraifft: <br /> <br /><b>gweinyddmoodle</b><br /> <br />
+Bydd hyn yn trwsio dolenni gweinyddol yn Moodle.';
+$string['availablelangs'] = 'Y pecynnau iaith sydd ar gael';
+$string['bypassed'] = 'Pasio Heibio';
+$string['cannotcreatelangdir'] = 'Does dim modd creu cyfeiriadur iaith.';
+$string['cannotcreatetempdir'] = 'Does dim modd creu cyfeiriadur dros dro.';
+$string['cannotdownloadcomponents'] = 'Does dim modd llwytho cydrannau i lawr.';
+$string['cannotdownloadzipfile'] = 'Does dim modd llwytho ffeil ZIP i lawr.';
+$string['cannotfindcomponent'] = 'Does dim modd canfod cydran.';
+$string['cannotsavemd5file'] = 'Does dim modd cadw ffeil md5.';
+$string['cannotsavezipfile'] = 'Does dim modd cadw ffeil ZIP.';
+$string['cannotunzipfile'] = 'Does dim modd dadzipio\'r ffeil.';
+$string['caution'] = 'Gofal';
+$string['check'] = 'Gwirio';
+$string['chooselanguage'] = 'Dewiswch iaith';
+$string['chooselanguagehead'] = 'Dewis iaith';
+$string['chooselanguagesub'] = 'Dewiswch iaith ar gyfer y broses osod YN UNIG. Gallwch ddewis yr iaith ar gyfer y safle ac ar gyfer defnyddwyr yn nes ymlaen ar sgrin arall.';
+$string['closewindow'] = 'Cau\'r ffenstr hon';
+$string['compatibilitysettings'] = 'Wrthi\'n profi eich gosodiadau PHP ...';
+$string['compatibilitysettingshead'] = 'Wrthi\'n profi eich gosodiadau PHP ...';
+$string['compatibilitysettingssub'] = 'Dylai\'ch gweinydd basio\'r holl brofion hyn fel bod Moodle yn rhedeg yn llwyddiannus';
+$string['componentisuptodate'] = 'Mae\'r gydran wedi\'i diweddaru.';
+$string['configfilenotwritten'] = 'Nid oedd y sgript gosod wedi llwyddo i greu ffeil config.php yn awtomatig a oedd yn cynnwys eich gosodiadau personol, fwy na thebyg oherwydd na ellir ysgrifennu dros y cyfeiriadur Moodle. Gallwch gopïo\'r cod canlynol eich hun i ffeil o\'r enw config.php yng nghyfeiriadur gwraidd Moodle.';
+$string['configfilewritten'] = 'Wedi llwyddo i greu\'r ffeil config.php yn llwyddiannus';
+$string['configurationcomplete'] = 'Wedi gorffen ffurfweddu';
+$string['configurationcompletehead'] = 'Wedi gorffen ffurfweddu';
+$string['configurationcompletesub'] = 'Ceisiodd Moodle gadw eich ffurfwedd mewn ffeil yng ngwraidd eich rhaglen Moodle.';
+$string['continue'] = 'Bwrw ymlaen';
+$string['curlrecommended'] = 'Argymhellir yn gryf eich bod yn gosod y llyfrgell Curl ddewisol fel bo Rhwydweithio Moodle yn gallu gweithio.';
+$string['customcheck'] = 'Archwiliadau Eraill';
+$string['database'] = 'Cronfa ddata';
+$string['databasecreationsettings'] = 'Nawr, bydd angen i chi ffurfweddu gosodiadau\'r gronfa ddata lle y caiff y rhan fwyaf o ddata Moodle ei storio. Caiff y gronfa ddata hon ei chreu\'n awtomatig gan y rhaglen osod
+â\'r gosodiadau a roddir isod.<br />
+<br /> <br />
+<b>Math:</b> wedi\'i osod i \"mysql\" gan y rhaglen osod<br />
+<b>Gwesteiwr:</b> wedi\'i osod i \"localhost\" gan y rhaglen osod<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> wedi\'i osod i\'r \"gwraidd\" gan y rhaglen osod<br />
+<b>Cyfrinair:</b> cyfrinair eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> dewis i roi llythrennau o flaen pob enw tabl';
+$string['databasecreationsettingshead'] = 'Nawr mae angen i chi ffurfweddu gosodiadau\'r gronfa ddata lle caiff y rhan fwyaf o ddata Moodle
+ei storio. Caiff y gronfa ddata hon ei chreu\'n awtomatig gan y rhaglen osod â\'r gosodiadau a bennir isod.';
+$string['databasecreationsettingssub'] = '<b>Math:</b> wedi\'i osod i \"mysql\" gan y rhaglen osod<br />
+       <b>Gwesteiwr:</b> wedi\'i osod i \"localhost\" gan y rhaglen osod<br />
+       <b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+       <b>Defnyddiwr:</b> wedi\'i osod i\'r \"gwraidd\" gan y rhaglen osod<br />
+       <b>Cyfrinair:</b> cyfrinair eich cronfa ddata<br />
+       <b>Llythrennau Blaen Tablau:</b> dewis i roi llythrennau o flaen pob enw tabl';
+$string['databasesettings'] = 'Nawr mae angen i chi ffurfweddu\'r gronfa ddata lle caiff y rhan fwyaf o ddata Moodle 
+ei storio. Mae\'n rhaid bod y gronfa ddata hon wedi cael ei chreu a bod enw defnyddiwr a chyfrinair wedi\'u gosod i fynd i mewn iddi.<br />
+<br /> <br />
+<b>Math:</b> mysql neu postgres7<br />
+<b>Gwesteiwr:</b> ee localhost neu db.isp.com<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> dewis i roi llythrennau o flaen pob enw tabl';
+$string['databasesettingshead'] = 'Nawr mae angen i chi ffurfweddu\'r gronfa ddata lle caiff y rhan fwyaf o ddata Moodle 
+ei storio. Mae\'n rhaid bod y gronfa ddata hon wedi cael ei chreu a bod enw defnyddiwr a chyfrinair wedi\'u gosod i fynd i mewn iddi.';
+$string['databasesettingssub'] = '<b>Math:</b> mysql neu postgres7<br />
+<b>Gwesteiwr:</b> ee localhost neu db.isp.com<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> dewis i roi llythrennau o flaen pob enw tabl';
+$string['databasesettingssub_mssql'] = '<b>Math:</b> SQL*Server (dim UTF-8) <b><font color=\"red\">Arbrawf! (nid ar gyfer ei ddefnyddio)</font></b><br />
+<b>Gwesteiwr:</b> ee localhost neu db.isp.com<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> llythrennau blaen i\'w defnyddio ar gyfer pob enw tabl (gorfodol)';
+$string['databasesettingssub_mssql_n'] = '<b>Math:</b> SQL*Server (wedi galluogi UTF-8)<br />
+<b>Gwesteiwr:</b> ee localhost neu db.isp.com<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> llythrennau blaen i\'w defnyddio ar gyfer pob enw tabl (gorfodol)';
+$string['databasesettingssub_mysql'] = '<b>Math:</b> MySQL<br />
+<b>Gwesteiwr:</b> ee localhost neu db.isp.com<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddat<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> llythrennau blaen i\'w defnyddio ar gyfer pob enw tabl (dewisol)';
+$string['databasesettingssub_oci8po'] = '<b>Math:</b> Oracle<br />
+<b>Gwesteiwr:</b> heb ei ddefnyddio, rhaid ei adael yn wag<br />
+<b>Enw:</b> yr enw a roddwyd i\'r cysylltiad tnsnames.ora<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> llythrennau blaen i\'w defnyddio ar gyfer pob enw tabl (gorfodol, dim mwy na 2cc.)';
+$string['databasesettingssub_odbc_mssql'] = '<b>Math:</b> SQL*Server (dros ODBC) <b><font color=\"red\">Arbrawf! (nid ar gyfer ei ddefnyddio)</font></b><br />
+<b>Gwesteiwr:</b> yr enw a roddwyd i\'r DSN yn y panel rheoli ODBC<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> llythrennau blaen i\'w defnyddio ar gyfer pob enw tabl (gorfodol)';
+$string['databasesettingssub_postgres7'] = '<b>Math:</b> PostgreSQL<br />
+<b>Gwesteiwr:</b> ee localhost neu db.isp.com<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> llythrennau blaen i\'w defnyddio ar gyfer pob enw tabl (gorfodol)';
+$string['dataroot'] = 'Cyfeiriadur Data';
+$string['datarooterror'] = 'Heb lwyddo i ddod o hyd i\'r \'Cyfeiriadur Data\' a nodoch neu ni lwyddwyd i\'w greu. Gallwch naill ai gywiro\'r llwybr neu greu\'r cyfeiriadur hwn eich hun.';
+$string['dbconnectionerror'] = 'Heb lwyddo i gysylltu â\'r gronfa ddata a nodoch. Tarwch olwg dros osodiadau eich cronfa ddata.';
+$string['dbcreationerror'] = 'Gwall wrth greu cronfa ddata. Heb lwyddo i greu\'r gronfa ddata a enwyd â\'r gosodiadau a roddwyd.';
+$string['dbhost'] = 'Gweinydd y Gwesteiwr';
+$string['dbpass'] = 'Cyfrinair';
+$string['dbprefix'] = 'Llythrennau Blaen Tablau';
+$string['dbtype'] = 'Math';
+$string['dbwrongencoding'] = 'Mae\'r gronfa ddata a ddewiswyd yn rhedeg dan un cod nad yw\'n cael ei argymell ($a).Byddai\'n well defnyddio un cronfa ddata wedi\'i hamgodio gydag Unicode (UTF-8) yn lle hynny. Gallwch hepgor y prawf hwn drwy ddewis \"Hepgor y Prawf Amgodio DB\" isod, ond mae\'n bosib y byddwch yn dod ar draws problemau yn y dyfodol.';
+$string['dbwronghostserver'] = 'Rhaid i chi ddilyn rheolau\'r \"Gwesteiwr\" fel a eglurwyd uchod.';
+$string['dbwrongnlslang'] = 'Rhaid i\'r newidyn amgylchedd NLS_LANG yn eich gweinydd gwe ddefnyddio\'r set nodau AL32UTF8. Darllenwch y dogfennau am PHP am sut i ffurfweddu OCI8 yn gywir.';
+$string['dbwrongprefix'] = 'Rhaid i chi ddilyn rheolau \"Llythrennau Blaen Tablau\" fel a eglurwyd uchod';
+$string['directorysettings'] = '<p>A wnewch chi gadarnhau lleoliadau\'r rhaglen Moodle hon.</p>
+
+<p><b>Cyfeiriad ar y We:</b>
+Rhowch y cyfeiriad ar y we llawn lle byddwch yn mynd i mewn i Moodle.  
+Os gellir defnyddio sawl URL i fynd i mewn i\'ch gwefan yna dewiswch 
+yr un fyddai\'ch myfyrwyr yn fwyaf tebygol o\'i ddefnyddio. Peidiwch â chynnwys 
+slaes ar y diwedd.</p>
+
+<p><b>Cyfeiriadur Moodle:</b>
+Rhowch y llwybr cyfeiriadur llawn i\'r rhaglen a osodwyd.
+Gwnewch yn siŵr eich bod yn defnyddio\'r llythrennau bach/mawr cywir.</p>
+
+<p><b>Cyfeiriadur Data:</b>
+Mae Moodle angen lle ar gyfer cadw ffeiliau sy\'n cael eu llwytho i fyny.  Dylai   
+defnyddiwr gweinydd y we (fel arfer \'neb\' neu \'apache\') allu darllen ac YSGRIFENNU ar y cyfeiriadur hwn,  ond ni ddylid gallu mynd i mewn iddo\'n 
+uniongyrchol drwy\'r we.</p>';
+$string['directorysettingshead'] = 'Cadarnhewch leoliadau\'r rhaglen Moodle hon';
+$string['directorysettingssub'] = '<b>Cyfeiriad ar y We:</b>
+Rhowch y cyfeiriad ar y we llawn lle byddwch yn mynd i mewn i Moodle.  
+Os gellir defnyddio sawl URL i fynd i mewn i\'ch gwefan yna dewiswch 
+yr un fyddai\'ch myfyrwyr yn fwyaf tebygol o\'i ddefnyddio. Peidiwch â chynnwys slaes ar y diwedd.
+<br />
+<br />
+<b>Cyfeiriadur Moodle:</b>
+Rhowch y llwybr cyfeiriadur llawn i\'r rhaglen a osodwyd
+Gwnewch yn siŵr eich bod yn defnyddio\'r llythrennau bach/mawr cywir.
+<br />
+<br />
+<b>Cyfeiriadur Data:</b>
+Mae Moodle angen lle ar gyfer cadw ffeiliau sy\'n cael eu llwytho i fyny. Dylai
+defnyddiwr gweinydd y we (fel arfer \'neb\' neu \'apache\') allu darllen ac YSGRIFENNU ar y cyfeiriadur hwn,  ond ni ddylid gallu mynd i mewn iddo\'n 
+uniongyrchol drwy\'r we.';
+$string['dirroot'] = 'Cyfeiriadur Moodle';
+$string['dirrooterror'] = 'Yn ôl pob tebyg, mae gosodiadau \'Cyfeiriadur Moodle\' yn anghywir - nid ydym wedi gallu dod o hyd i raglen Moodle yn y fan honno. Mae\'r gwerth isod wedi cael ei ailosod.';
+$string['download'] = 'Llwytho i lawr';
+$string['downloadedfilecheckfailed'] = 'Heb lwyddo i wirio\'r ffeil a lwythwyd i lawr.';
+$string['downloadlanguagebutton'] = 'Llwytho\'r pecyn iaith &quot;$a&quot;';
+$string['downloadlanguagehead'] = 'Llwytho\'r pecyn iaith i lawr';
+$string['downloadlanguagenotneeded'] = 'Gallwch barhau â\'r broses osod gan ddefnyddio\'r pecyn iaith diofyn, \"$a\".';
+$string['downloadlanguagesub'] = 'Nawr, gallwch ddewis llwytho pecyn iaith i lawr a bwrw ymlaen â\'r broses osod yn yr iaith honno.<br /><br />Os nad ydych chi\'n gallu llwytho\'r pecyn iaith i lawr, bydd y broses osod yn cario ymlaen yn Saesneg. (Ar ôl i\'r broses osod ddod i ben, bydd gennych gyfle i lwytho a gosod pecynnau iaith ychwanegol.)';
+$string['doyouagree'] = 'Ydych chi wedi darllen a deall yr amodau hyn?';
+$string['environmenterrortodo'] = 'Rhaid datrys yr holl broblemau amgylcheddol (gwallau) uchod cyn parhau i osod y fersiwn hwn o Moodle!';
+$string['environmenthead'] = 'Wrthi\'n profi eich amgylchedd ...';
+$string['environmentrecommendcustomcheck'] = 'os yw\'r prawf hwn yn methu, mae\'n dangos problem bosibl';
+$string['environmentrecommendinstall'] = 'wedi\'i argymell i\'w osod/ei alluogi';
+$string['environmentrecommendversion'] = 'argymhellir fersiwn $a->needed ac rydych yn defnyddio $a->current';
+$string['environmentrequirecustomcheck'] = 'rhaid i\'r prawf hwn basio';
+$string['environmentrequireinstall'] = 'angen ei osod/ei alluogi.';
+$string['environmentrequireversion'] = 'Mae angen fersiwn $a->needed ac rydych yn defnyddio $a->current';
+$string['environmentsub'] = 'Rydym yn gwneud yn siŵr fod gwahanol gydrannu eich system yn bodloni gofynion y system';
+$string['environmentxmlerror'] = 'Gwall wrth ddarllen data amgylchedd ($a->error_code)';
+$string['error'] = 'Gwall';
+$string['fail'] = 'Methu';
+$string['fileuploads'] = 'Llwytho ffeiliau i fyny';
+$string['fileuploadserror'] = 'Dylai hwn fod ymlaen';
+$string['fileuploadshelp'] = '<p>Yn ôl pob golwg, nid yw eich gweinydd wedi galluogi llwytho ffeiliau i fyny.</p>
+
+<p>Byddwch dal yn gallu gosod Moodle, ond os nad ydych yn gallu gwneud hyn, ni fyddwch yn gallu 
+   llwytho ffeiliau cyrsiau na delweddau proffil defnyddwyr i fyny.</p>
+
+<p>I alluogi llwytho ffeiliau i fyny, bydd angen i chi (neu weinyddwr eich system) 
+   olygu\'r brif ffeil php.ini ar eich system a newid y gosodiad ar gyfer 
+   <b>file_uploads</b> to \'1\'.</p>';
+$string['gdversion'] = 'Fersiwn GD';
+$string['gdversionerror'] = 'Dylai\'r llyfrgell GD fod ar gael i brosesu a chreu delweddau';
+$string['gdversionhelp'] = '<p>Yn ôl pob golwg, nid oes GD wedi\'i osod ar eich gweinydd.</p>
+
+<p>Llyfrgell yw GD sydd ei hangen ar PHP i adael Moodle i brosesu delweddau 
+   (megis yr eiconau proffil defnyddwyr) ac i greu delweddau newydd (megis 
+   y graffiau log).  Bydd Moodle dal yn gweithio heb GD - ond ni fydd y nodweddion hyn ar gael i chi.</p>
+
+<p>I ychwanegu GD at PHP dan Unix, crynhowch PHP gan ddefnyddio\'r paramedr --with-gd.</p>
+
+<p>fel arfer, gallwch olygu php.ini yn Windows drwy dynnu\'r ddwy slaes o flaen y llinell php_gd2.dll.</p>';
+$string['globalsquotes'] = 'Gafael Anniogel o Ddyfynodau\'r Safle Cyfan';
+$string['globalsquoteserror'] = 'Trwsio eich gosodiadau PHP: analluogi register_globals a/neu galluogi magic_quotes_gpc';
+$string['globalsquoteshelp'] = '<p>Nid ydym yn argymell analluogi Dyfynodau Hud GPC a galluogi Cofrestru Dyfynodau Safle Cyfan ar yr un pryd.</p>
+
+<p>Dyma\'r gosodiad sy\'n cael ei argymell <b>magic_quotes_gpc = Ymlaen</b> a <b>register_globals = Diffodd</b> yn eich ffeil php.ini</p>
+
+<p>Os nad ydych yn gallu mynd i mewn i\'ch php.ini, efallai gallwch roi\'r llinell ganlynol mewn ffeil .htaccess yn eich cyfeiriadur Moodle:
+   <blockquote>php_value magic_quotes_gpc On</blockquote>
+   <blockquote>php_value register_globals Off</blockquote>
+</p>';
+$string['help'] = 'Help';
+$string['iconvrecommended'] = 'Argymhellir yn gryf eich bod yn gosod y llyfrgell ICONV ddewisol er mwyn gwella perfformiad y safle, yn enwedig os gall eich safle ddelio ag ieithoedd heblaw rhai Lladin.';
+$string['info'] = 'Gwybodaeth';
+$string['installation'] = 'Gosod';
+$string['invalidemail'] = 'Cyfeiriad e-bost annilys';
+$string['invalidmd5'] = 'md5 annilys';
+$string['langdownloaderror'] = 'Yn anffodus, ni osodwyd yr iaith ganlynol: \"$a\". Bydd y broses osod yn cario ymlaen yn Saesneg.';
+$string['langdownloadok'] = 'Wedi gosod \"$a\" yn llwyddiannus. Bydd y broses osod yn cario ymlaen yn yr iaith hon.';
+$string['language'] = 'Iaith';
+$string['magicquotesruntime'] = 'Amser Rhedeg Dyfynodau Hud';
+$string['magicquotesruntimeerror'] = 'Dylai hwn fod wedi\'i ddiffodd';
+$string['magicquotesruntimehelp'] = '<p>Dylid diffodd Amser Rhedeg Dyfynodau Hud fel bo Moodle yn gweithio\'n iawn.</p>
+
+<p>Fel arfer, mae wedi\'i ddiffodd yn ddiofyn ... tarwch olwg ar y gosodiad <b>magic_quotes_runtime</b> yn eich ffeil php.ini.</p>
+
+<p><p>Os nad ydych yn gallu mynd i mewn i\'ch php.ini, efallai gallwch roi\'r llinell ganlynol mewn ffeil .htaccess yn eich cyfeiriadur Moodle:
+   <blockquote>php_value magic_quotes_runtime Off</blockquote>
+</p>';
+$string['mbstringrecommended'] = 'Argymhellir yn gryf eich bod yn gosod y llyfrgell MBSTRING ddewisol er mwyn gwella perfformiad y safle, yn enwedig os gall eich safle ddelio ag ieithoedd heblaw rhai Lladin.';
+$string['memorylimit'] = 'Maint y Cof';
+$string['memorylimiterror'] = 'Mae maint y cof PHP wedi\'i osod yn eitaf isel ...efallai y cewch broblemau yn nes ymlaen.';
+$string['memorylimithelp'] = '<p>Mae maint y cof PHP yn eich gweinydd ar hyn o bryd yn $a.</p>
+
+<p>Gall hyn arwain at broblemau â\'r cof yn nes ymlaen, yn enwedig 
+   os ydych wedi galluogi llawer o fodiwlau a/neu lawer o ddefnyddwyr.</p>
+
+<p>Rydym yn argymell eich bod yn ffurfweddu PHP gyda mwy o gof os yn bosib, megis 40M.  
+   Mae sawl ffordd o wneud hyn:</p>
+<ol>
+<li>Os ydych yn gallu, ceisiwch ail-grynhoi PHP gyda <i>--enable-memory-limit</i>.  
+    Bydd hyn yn gadael i Moodle osod maint y cof ei hun.</li>
+<li>Os ydych yn gallu mynd i mewn i\'ch ffeil php.ini, gallwch newid y gosodiad <b>memory_limit</b> 
+    yn y fan honno i tua 40M. Os nad ydych chi\'n gallu gwneud hyn eich hun, efallai  
+    y gallech ofyn i\'ch gweinyddwr wneud hyn i chi.</li>
+<li>Ar rai gweinyddion PHP, gallwch greu ffeil .htaccess yng nghyfeiriadur Moodle  
+    sy\'n cynnwys y llinell hon:
+    <p><blockquote>php_value memory_limit 40M</blockquote></p>
+    <p>Fodd bynnag, ar rai gweinyddion bydd hyn yn atal <b>pob</b> tudalen PHP rhag gweithio 
+    (bydd gwallau\'n ymddangos pan fyddwch yn edrych ar dudalennau) felly bydd rhaid i chi dynnu\'r ffeil .htaccess file.</p></li>
+</ol>';
+$string['missingrequiredfield'] = 'Mae maes gofynnol ar goll';
+$string['moodledocslink'] = 'Dogfennau Moodle ar gyfer y dudalen hon';
+$string['mssql'] = 'SQL*Server (mssql)';
+$string['mssql_n'] = 'SQL*Server gyda chefnogaeth UTF-8t (mssql_n)';
+$string['mssqlextensionisnotpresentinphp'] = 'Nid yw\'r PHP wedi cael ei ffurfweddu\'n iawn gyda\'r estyniad MSSQL er mwyn iddo allu cyfathrebu â SQL*Server.  Tarwch olwg dros eich ffeil php.ini neu ail-grynhoi PHP.';
+$string['mysql'] = 'MySQL (mysql)';
+$string['mysql416bypassed'] = 'Fodd bynnag, os yw eich safle\'n defnyddio ieithoedd iso-8859-1 (Lladin) YN UNIG, gallwch barhau i ddefnyddio\'r MySQL 4.1.12 (neu uwch) sydd wedi\'i osod gennych ar hyn o bryd.';
+$string['mysql416required'] = 'MySQL 4.1.16 yw\'r fersiwn sylfaenol sy\'n ofynnol ar gyfer Moodle 1.6 er mwyn sicrhau y gellir trosi\'r holl ddata i UTF-8 yn y dyfodol.';
+$string['mysqlextensionisnotpresentinphp'] = 'Nid yw\'r PHP wedi cael ei ffurfweddu\'n iawn gyda\'r estyniad MSSQL er mwyn iddo allu cyfathrebu â MySQL.  Tarwch olwg dros eich ffeil php.ini neu ail-grynhoi PHP.';
+$string['name'] = 'Enw';
+$string['next'] = 'Nesaf';
+$string['oci8po'] = 'Oracle (oci8po)';
+$string['ociextensionisnotpresentinphp'] = 'Nid yw\'r PHP wedi cael ei ffurfweddu\'n iawn gyda\'r estyniad OCI8 er mwyn iddo allu cyfathrebu ag Oracle. Tarwch olwg dros eich ffeil php.ini neu ail-grynhoi PHP.';
+$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
+$string['odbcextensionisnotpresentinphp'] = 'Nid yw\'r PHP wedi cael ei ffurfweddu\'n iawn gyda\'r estyniad ODBC er mwyn iddo allu cyfathrebu â SQL*Server. Tarwch olwg dros eich ffeil php.ini neu ail-grynhoi PHP.';
+$string['ok'] = 'IAWN';
+$string['opensslrecommended'] = 'Argymhellir yn gryf eich bod yn gosod y llyfrgell OpenSSL ddewisol -- mae\'n galluogi Rhwydweithio Moodle.';
+$string['pass'] = 'Pasio';
+$string['password'] = 'Cyfrinair';
+$string['pgsqlextensionisnotpresentinphp'] = 'Nid yw\'r PHP wedi cael ei ffurfweddu\'n iawn gyda\'r estyniad PGSQL er mwyn iddo allu cyfathrebu â PostgreSQL. Tarwch olwg dros eich ffeil php.ini neu ail-grynhoi PHP.';
+$string['php50restricted'] = 'Mae PHP 5.0.x yn frith o broblemau hysbys; uwchraddiwch i 5.1.x neu israddiwch i 4.3.x neu 4.4.x';
+$string['phpversion'] = 'Fersiwn PHP';
+$string['phpversionerror'] = 'Mae\'n rhaid i\'r fersiwn PHP fod yn o leiaf 4.3.0 neu 5.1.0 (mae llawer o broblemau gyda 5.0.x).';
+$string['phpversionhelp'] = '<p>Mae angen o leiaf fersiwn PHP 4.3.0 neu 5.1.0 ar Moodle (mae llawer o broblemau gyda 5.0.x).</p>
+<p>Ar hyn o bryd, rydych yn rhedeg fersiwn $a</p>
+<p>Rhaid i chi uwchraddio PHP neu newid i westeiwr â fersiwn diweddarach o PHP!<br/>
+(Os oes gennych 5.0.x gallwch hefyd is-raddio i fersiwn 4.4.x)</p>';
+$string['postgres7'] = 'PostgreSQL (postgres7)';
+$string['previous'] = 'Blaenorol';
+$string['releasenoteslink'] = 'I gael gwybodaeth am y fersiwn hwn o Moodle, gweler y <a target=\"_new\" href=\"$a\">Nodiadau Rhyddhau</a> ar-lein';
+$string['remotedownloadnotallowed'] = 'Ni chaniateir llwytho cydrannau i lawr i\'ch gweinydd (mae allow_url_fopen wedi\'i analluogi).<br /><br />Rhaid i chi lwytho\'r ffeil <a href=\"$a->url\">$a->url</a> i lawr eich hun, ei chopïo i \"$a->dest\" yn eich gweinydd, a\'i dadzipio yno.';
+$string['report'] = 'Adroddiad';
+$string['restricted'] = 'Wedi\'i wahardd';
+$string['safemode'] = 'Modd Diogel';
+$string['safemodeerror'] = 'Mae\'n bosibl y bydd Moodle yn profi problemau os yw\'r modd diogel ymlaen';
+$string['safemodehelp'] = '<p>Mae\'n bosibl y bydd Moodle yn profi llawer o broblemau os yw\'r modd diogel ymlaen. Un broblem y gallech ddod ar ei thraws yw 
+   na fyddwch o bosib yn gallu creu ffeiliau newydd.</p>
+   
+<p>Fel arfer, dim ond gwesteiwyr gwe cyhoeddus paranoid sy\'n troi\'r modd diogel ymlaen, felly efallai y  
+   bydd rhaid i chi gael cwmni gwesteiwr gwe newydd ar gyfer eich safle Moodle.</p>
+   
+<p>Gallwch roi cynnig ar fwrw ymlaen i osod, ond mae\'n siŵr y byddwch yn dod ar draws rhai problemau yn nes ymlaen.</p>';
+$string['serverchecks'] = 'Archwiliadau Gweinydd';
+$string['sessionautostart'] = 'Awto Gychwyn y Sesiwn';
+$string['sessionautostarterror'] = 'Dylai hwn fod wedi\'i ddiffodd';
+$string['sessionautostarthelp'] = '<p>Mae angen cefnogaeth sesiwn ar Moodle ac ni fydd yn gweithio hebddo.</p>
+
+<p>Gallwch alluogi sesiynau yn y ffeil php.ini file ... chwiliwch am y paramedr session.auto_start.</p>';
+$string['skipdbencodingtest'] = 'Hepgor Prawf Amgodio DB';
+$string['status'] = 'Statws';
+$string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'Cymraeg';
+$string['unicoderecommended'] = 'Argymhellir storio eich holl ddata yn Unicode (UTF-8). Dylid gosod fersiynau newydd mewn cronfeydd data sydd ag Unicode fel set nodau ddiofyn. Os ydych chi\'n uwchraddio, dylech gyflawni\'r broses mudo UTF-8 (gweler y dudalen Gweinyddwyr).';
+$string['unicoderequired'] = 'Mae\'n ofynnol eich bod yn storio eich holl ddata ar fformat Unicode (UTF-8). Rhaid gosod fersiynau newydd mewn cronfeydd data sydd ag Unicode fel set nodau ddiofyn. Os ydych chi\'n uwchraddio, dylech gyflawni\'r broses mudo UTF-8 (gweler y dudalen Gweinyddwyr).';
+$string['user'] = 'Defnyddiwr';
+$string['welcomep10'] = '$a->installername ($a->installerversion)';
+$string['welcomep20'] = 'Rydych chi\'n gweld y dudalen hon gan eich bod wedi gosod a  
+    lansio\'r pecyn <strong>$a->packname $a->packversion</strong> yn llwyddiannus ar eich cyfrifiadur. Llongyfarchiadau!';
+$string['welcomep30'] = 'Mae\'r fersiwn <strong>$a->installername</strong> yn cynnwys rhaglenni 
+    i greu amgylchedd y gall  <strong>Moodle</strong> weithio ynddo, sef:';
+$string['welcomep40'] = 'Mae\'r pecyn hefyd yn cynnwys <strong>Moodle $a->moodlerelease ($a->moodleversion)</strong>.';
+$string['welcomep50'] = 'Y trwyddedau perthnasol sy\'n llywodraethu dros yr holl raglenni yn y pecyn hwn. Y pecyn cyflawn yw <strong>$a->installername</strong> 
+    <a href=\"http://www.opensource.org/docs/definition_plain.html\">open source</a> a chaiff ei ddosbarthu dan y drwydded <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>.';
+$string['welcomep60'] = 'Bydd y tudalennau canlynol yn eich arwain drwy\'r camau syml i  
+    ffurfweddu a gosod <strong>Moodle</strong> ar eich cyfrifiadur. Gallwch ddewis derbyn y gosodiadau 
+    diofyn, neu gallwch eu newid eich hun ar gyfer eich dibenion chi.';
+$string['welcomep70'] = 'Cliciwch y botwm \"Nesaf\" i fwrw ymlaen i osod <strong>Moodle</strong>.';
+$string['wrongdestpath'] = 'Llwybr cyrchfan anghywir.';
+$string['wrongsourcebase'] = 'Bôn URL ffynhonnell anghywir.';
+$string['wrongzipfilename'] = 'Enw ffeil ZIP anghywir.';
+$string['wwwroot'] = 'Cyfeiriad ar y we';
+$string['wwwrooterror'] = 'Nid yw\'r \'Cyfeiriad ar y We\' yn ddilys - yn ôl pob tebyg, nid yw\'r rhaglen Moodle yn y cyfeiriad hwn. Mae\'r gwerth isod wedi cael ei ailosod.';
+?>
@@ -9,72 +9,220 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in installer_strings (same dir)

-$string['admindirerror'] = 'Det angivende admin biblioteket er forkert';
+$string['admindirerror'] = 'Det angivne adminbibliotek er forkert';
 $string['admindirname'] = 'Adminbibliotek';
+$string['admindirsettinghead'] = 'Sætter admin-biblioteket...';
+$string['admindirsettingsub'] = 'Nogle får webhoteller bruger /admin adresse til kontrolpanelet el.lign. Desværre konflikter dette med standardplaceringen af Moodles administrationssider. Du kan i så tilfælde omdøbe admin-biblioteket i din installation og skrive navnet her. Eksempel:<br /> <br /><b>moodleadmin</b><br /> <br />
+Dette vil sikre admin-links i Moodle.';
+$string['bypassed'] = 'Forbigået';
+$string['cannotcreatelangdir'] = 'Kan ikke oprette sprogmappe';
+$string['cannotcreatetempdir'] = 'Kan ikke oprette temp-mappe';
+$string['cannotdownloadcomponents'] = 'Kan ikke downloade komponenter';
+$string['cannotdownloadzipfile'] = 'Kan ikke downloade zip-fil';
+$string['cannotfindcomponent'] = 'Kan ikke finde komponent';
+$string['cannotsavemd5file'] = 'Kan ikke gemme md5-fil';
+$string['cannotsavezipfile'] = 'Kan ikke gemme zip-fil';
+$string['cannotunzipfile'] = 'Kan ikke unzippe filen';
 $string['caution'] = 'Pas på';
+$string['check'] = 'Kontroller';
+$string['chooselanguagehead'] = 'Vælg et sprog';
+$string['chooselanguagesub'] = 'Vælg et sprog til brug under installationen. Senere vil du kunne vælge hvilke sprog Moodle skal kunne bruge.';
 $string['closewindow'] = 'Luk dette vindue';
-$string['configfilenotwritten'] = 'Installationsscriptet var ikke i stand til at oprette config.php filen der indeholder de valgte indstillinger, sandsynligvis fordi den bruger hvis apache(PHP) kører med (apache, nobody ell) ikke har rettigheder til at skrive til moodlebiblioteket. Du kan manuelt kopiere den følgende kode ind i en fil med navnet \"config.php\" i roden af moodle-biblioteket.';
+$string['compatibilitysettingshead'] = 'Kontrollerer dine PHP-indstillinger...';
+$string['compatibilitysettingssub'] = 'For at Moodle kan køre uden problemer skal din server \"bestå\" alle disse test.';
+$string['componentisuptodate'] = 'Komponenten er up to date';
+$string['configfilenotwritten'] = 'Installationsscriptet var ikke i stand til at oprette config.php-filen, der indeholder de valgte indstillinger, sandsynligvis fordi  Moodlebiblioteket er skrivebeskyttet. Du kan manuelt kopiere den følgende kode ind i en fil med navnet \"config.php\" i roden af Moodle-biblioteket.';
 $string['configfilewritten'] = 'config.php er blevet oprettet';
+$string['configurationcompletehead'] = 'Konfigurationen er færdig.';
+$string['configurationcompletesub'] = 'Moodle har forsøgt at gemme din konfiguration i en fil i roden af Moodle-installationen';
 $string['continue'] = 'Fortsæt';
 $string['database'] = 'Database';
-$string['dataroot'] = 'DataBibliotek';
-$string['datarooterror'] = 'DataBiblioteket du specificerede kan ikke findes eller oprettes. Ret stien til biblioteket eller opret det manuelt.';
+$string['databasecreationsettingshead'] = 'Nu skal du konfigurere databaseindstillingerne for hvor de fleste Moodle-data skal gemmes. Denne database vil automatisk blive oprettet af installationsprogrammet med indstillingerne herunder.';
+$string['databasecreationsettingssub'] = '<b>Type:</b> fikseret til \"mysql\" af installationsprogrammet<br />
+<b>Host:</b> fikseret til \"localhost\" af installationsprogrammet<br />
+<b>Name:</b> database-navn, f.eks. Moodle<br />
+<b>User:</b> fikseret til \"root\" af installationsprogrammet<br />
+<b>Password:</b> adgangskoden til din database<br />
+<b>Tables Prefix:</b> valgfrit fornavn (prefix) til alle tabelnavne';
+$string['databasesettingshead'] = 'Du skal nu konfigurere databasen hvor det meste af Moodle\'s data vil blive gemt. Databaseserveren skal allerede være oprettet og du skal bruge brugernavn og adgangskode til en brugerkonto der har adgang til den.';
+$string['databasesettingssub'] = '<b>Type:</b> mysql eller postgres7<br />
+<b>Vært:</b> f.eks. localhost eller db.isp.com<br />
+<b>Database:</b> database-navn, f.eks. Moodle<br />
+<b>Bruger:</b> Brugernavnet til databasen<br />
+<b>Password:</b> Password til databasebrugeren<br />
+<b>Tabel Præfix:</b> Valgfrit fornavn (prefix) der bliver sat foran alle tabelnavne (kan anbefales hvis der er flere systemer der skal bruge samme database).';
+$string['databasesettingssub_mssql'] = '<b>Type:</b> SQL*Server (non UTF-8) <b><font color=\"red\">Experimentiel! (ikke til brug i et produktionsmiljø)</font></b><br />
+<b>Vært:</b> f.eks. localhost eller db.isp.com<br />
+<b>Navn:</b> databasenavn, f.eks. Moodle<br />
+<b>Bruger:</b> brugernavnet til din database<br />
+<b>Password:</b> din databases adgangskode<br />
+<b>Tabelprefix:</b> prefix for alle tabelnavne (mandatory)';
+$string['databasesettingssub_mssql_n'] = '<b>Type:</b> SQL*Server (non UTF-8 aktiveret) <b><font color=\"red\">Experimentiel! (ikke til brug i et produktionsmiljø)</font></b><br />
+<b>Vært:</b> f.eks. localhost eller db.isp.com<br />
+<b>Navn:</b> databasenavn, f.eks. Moodle<br />
+<b>Bruger:</b> brugernavnet til din database<br />
+<b>Password:</b> din databases adgangskode<br />
+<b>Tabelprefix:</b> prefix for alle tabelnavne (mandatory)';
+$string['databasesettingssub_mysql'] = '<b>Type:</b> MySQL<br />
+<b>Vært:</b> f.eks. localhost eller db.isp.com<br />
+<b>Navn:</b> databasenavn, f.eks. Moodle<br />
+<b>Bruger:</b> brugernavnet til din database<br />
+<b>Password:</b> din databases adgangskode<br />
+<b>Tabelprefix:</b> prefix for alle tabelnavne (mandatory)';
+$string['databasesettingssub_oci8po'] = '<b>Type:</b> Oracle<br />
+<b>Vært:</b> ikke brugt, skal være blank<br />
+<b>Navn:</b> navnet på forbindelsen fra tnsnames.ora <br />
+<b>Bruger:</b> dit database brugernavn<br />
+<b>Password:</b> brugerens password<br />
+<b>Tabel Præfix:</b> præfix til alle tabellerne (nødvendigt,højst 2 karaktere)';
+$string['databasesettingssub_odbc_mssql'] = '<b>Type:</b> SQL*Server (over ODBC) <b><font color=\"red\">Eksperimentielt! (ikke beregnet til brug i produktionsmiljø)</font></b><br />
+<b>Vært:</b> navnet på DSN forbindelsen i ODBC kontrolpanelet<br />
+<b>Navn:</b> databasenavnet , f.eks. moodle<br />
+<b>Bruger:</b> dit databasebrugernavn<br />
+<b>Password:</b> dit database password<br />
+<b>Tabel Præfix:</b> præfix der bruges til alle tabelnavnene (nødvendigt)';
+$string['databasesettingssub_postgres7'] = '<b>Type:</b> PostgreSQL<br />
+<b>Vært:</b> f.eks. localhost eller db.isp.com<br />
+<b>Navn:</b> databasenavn, f.eks. moodle<br />
+<b>Bruger:</b> dit databasebrugernavn<br />
+<b>Password:</b> dit database password<br />
+<b>Tables Præfix:</b> præfix der bruges foran alle tabelnavnene (nødvendigt)';
+$string['dataroot'] = 'Databibliotek';
+$string['datarooterror'] = 'Data-biblioteket du specificerede kan ikke findes eller oprettes. Ret stien til biblioteket eller opret det manuelt.';
 $string['dbconnectionerror'] = 'Den angive database kunne ikke kontaktes. Kontroller eller ret venligst databaseinformationerne.';
 $string['dbcreationerror'] = 'Fejl ved oprettelse af databasen. Kan ikke oprette den givne database med de angivne indstillinger.';
-$string['dbhost'] = 'Værts Server';
-$string['dbprefix'] = 'præfix for tabeller';
+$string['dbhost'] = 'Værtsserver';
+$string['dbprefix'] = 'Præfix for tabeller';
 $string['dbtype'] = 'Type';
-$string['dirroot'] = 'Moodle bibliotek';
-$string['dirrooterror'] = 'Det angivne moodle-bibliotek lader ikke til at være rigtigt - der kan ikke findes en Moodle-installation. Den nedenstående værdi er blevet fjernet.';
+$string['dbwrongencoding'] = 'Den valgte database kører under en ikke anbefalet encoding ($a). Det vil være bedre at benytte en Unicode (UTF-8) encoded database i stedet. 
+Du kan alligevel springe denne test over ved at vælge \"Skip DB Encoding Test\" tjek herunder, men det kan give problemer fremover.';
+$string['dbwronghostserver'] = 'Du skal følge \"Værtsreglerne\" som forklaret ovenfor.';
+$string['dbwrongnlslang'] = 'Environment variablen NLS_LANG  på din webserver skal bruge AL32UTF8 tegnsættet. Se PHP documentationen for hvordan man konfigurere OCI8 korrekt.';
+$string['dbwrongprefix'] = 'Du skal følge Tabel-prefix-reglerne som forklaret ovenfor.';
+$string['directorysettingshead'] = 'Bekræft hvor Moodle skal installeres';
+$string['directorysettingssub'] = '<b>Web-adresse:</b>
+Angiv den fulde adresse til Moodle. Hvis der skal være adgang til siden fra flere URL\'er så vælg den naturligste, den deltagerne vil bruge. Adressen må ikke slutte med en skråstreg (slash).
+<br />
+<br />
+<b>Moodle-bibliotek:</b>
+Angiv den fulde sti til installationen. Vær påpasselig med små og store bogstaver, adressen er casesensitiv.
+<br />
+<br />
+<b>Data-bibliotek:</b>
+Det sted, hvor Moodle placerer uploadede filer. Dette bibliotek skal være læse- OG SKRIVBART for web-server-brugeren (typisk \'nobody\' eller \'apache\'), men der må ikke være direkte adgang fra internettet.';
+$string['dirroot'] = 'Moodle-bibliotek';
+$string['dirrooterror'] = 'Det angivne Moodle-bibliotek lader ikke til at være rigtigt - der kan ikke findes en Moodle-installation. Den nedenstående værdi er blevet fjernet.';
 $string['download'] = 'Download';
+$string['downloadedfilecheckfailed'] = '\"Downloadet fil-tjek fejlede';
+$string['downloadlanguagebutton'] = 'Download \"$a\"-sprogpakken';
+$string['downloadlanguagehead'] = 'Download sprogpakke';
+$string['downloadlanguagenotneeded'] = 'Du kan fortsætte installationen med standard-sprogpakken,\"$a\".';
+$string['downloadlanguagesub'] = 'Du har nu mulighed for at downloade en sprogpakke og fortsætte installationsprocessen i dette sprog.<br /><br />
+Kan du ikke downloade sprogpakken vil installationen fortsætte på engelsk.
+(Når installationsprocessen er færdig kan du downloade og installere flere sprogpakker.)';
+$string['environmenterrortodo'] = 'Du bliver nødt til at løse de ovenstående problemer (fejl) der er ved serveropsætningen før du kan installere denne version af Moodle';
+$string['environmenthead'] = 'Kontrollere din serveropsætning...';
+$string['environmentrecommendinstall'] = 'det anbefales installeret/aktiveret';
+$string['environmentrecommendversion'] = 'version $a->needed er anbefalet og du kører $a->current';
+$string['environmentrequireinstall'] = 'det er nødvendigt at installere/aktivere';
+$string['environmentrequireversion'] = 'version $a->needed er nødvendigt og du kører $a->current';
+$string['environmentsub'] = 'Vi tjekker om de forskellige komponenter i dit system lever op til de Moodles krav.';
+$string['environmentxmlerror'] = 'Fejl ved læsning af serveropsætningens data ($a->error_code)';
 $string['error'] = 'Fejl';
 $string['fail'] = 'Mislykkedes';
 $string['fileuploads'] = 'Fil uploads';
 $string['fileuploadserror'] = 'Denne skulle være aktiveret';
 $string['gdversion'] = 'GD version';
-$string['gdversionerror'] = 'GD library skal være tilgængelig for PHP for at der kan billeder kan manipuleres og oprettes.';
+$string['gdversionerror'] = 'GD library skal være tilgængelig for PHP for at der billeder kan manipuleres og oprettes.';
+$string['gdversionhelp'] = '<p>Det lader til at din server ikke har GD installeret.</p>
+
+<p>GD er et bibliotek som PHP bruger til at behandle billeder (såsom brugerprofil-billeder) og til at oprette nye billeder såsom loggrafer. Moodle kan stadig fungere uden GD - men disse funktioner vil så ikke være til rådighed.</p>
+
+<p>For at tilføje GD på unix skal PHP kompileres med \'--with-gd\" parameteret.</p>
+
+<p>Under windows er det normalt nok at udkommentere den linje i php.ini der refererer til libgd.dll </p>';
+$string['globalsquotes'] = 'Usikker håndtering af Globale variabler';
+$string['globalsquoteserror'] = 'Fix dine PHP-indstillinger: aktiver register_globals and/or slå magic_quotes_gpc til';
 $string['help'] = 'Hjælp';
+$string['iconvrecommended'] = 'Det anbefales at installere/aktivere ICONV udvidelsen for at forbedre sitets hastighed, især hvis dit site understøtter sprog med ikke-latinske tegn.';
 $string['info'] = 'Information';
 $string['installation'] = 'Installation';
+$string['invalidmd5'] = 'Ugyldig md5';
+$string['langdownloaderror'] = 'Sproget \"$a\" blev desværre ikke installeret. Installationen vil fortsætte på engelsk.';
+$string['langdownloadok'] = 'Sproget \"$a\" blev installeret. Installationen vil fortsætte på dette sprog.';
 $string['language'] = 'Sprog';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Denne skulle være deaktiveret';
-$string['memorylimit'] = 'Hukommelses begrænsning';
+$string['mbstringrecommended'] = 'Det anbefales at installere/aktivere MBSTRING udvidelsen for at forbedre sitets ydeevne, især hvis sitet understøtter ikke-latinske sprog og tegn.';
+$string['memorylimit'] = 'Hukommelsesbegrænsning';
 $string['memorylimiterror'] = 'Den tilgængelige hukommelse til PHP er ret lav... Det kan være at der opstår problemer senere.';
 $string['memorylimithelp'] = '<p>Mængden af hukommelse som PHP kan bruge er sat til $a.</p>

 <p>Dette kan forårsage at der opstår problemer senere, især hvis du har mange moduler installeret eller mange brugere.</p>

-<p>Vi anbefaler at du konfigurere PHP til at kunne bruge mere hukommelse, f.eks. 16Mb. 
+<p>Vi anbefaler at du konfigurerer PHP til at kunne bruge mere hukommelse, f.eks. 16Mb. 
 Der er flere måder hvorpå du kan rette det.</p>
 <ol>
 <li>Hvis du har mulighed for det kan du rekompilere PHP med <i>--enable-memory-limit</i>. 
 Dette vil tillade at Moodle selv kan definere hvor meget hukommelse der er brug for.</li>
-<li>Hvis du har adgang til php.ini filen kan du ændre <b>memory_limit</b> 
+<li>Hvis du har adgang til php.ini filen kan du ændre <b>memory_limit</b>-
 indstillingen så der er minimum 16Mb til rådighed. Hvis du ikke har direkte adgang til den kan du spørge systemadministratoren om han han vil gøre det for dig.</li>
-<li>På nogle servere kan du oprette en \'.htaccess\' fil, gemme den i moodle biblioteket med linjen <p><blockquote>php_value memory_limit 16M</blockquote></p>
-<p>Det kan dog på nogle servere forårsage en fejl på <b>alle</b> PHPsiderne. i så fald kan du blive nødt til at fjerne \'.htaccess\' filen igen.</p></li>
+<li>På nogle servere kan du oprette en \'.htaccess\' fil, gemme den i Moodle-biblioteket med linjen <p><blockquote>php_value memory_limit 16M</blockquote></p>
+<p>Det kan dog på nogle servere forårsage en fejl på <b>alle</b> PHP-siderne. I så fald kan du blive nødt til at fjerne \'.htaccess\' filen igen.</p></li>
 </ol>';
+$string['missingrequiredfield'] = 'Der mangler nogle obligatoriske felter';
+$string['moodledocslink'] = 'Moodle Doks for denne side';
+$string['mssql'] = 'SQL*Server (mssql)';
+$string['mssql_n'] = 'SQL*Server med UTF-8 support (mssql_n)';
+$string['mssqlextensionisnotpresentinphp'] = 'PHP er ikke konfigureret ordentligt med MSSQL-extensionen så den kan kommunikere med SQL*Serveren. Vær venlig at tjekke din php.ini-fil eller genkompiler PHP.';
+$string['mysql'] = 'MySQL (mysql)';
+$string['mysql416bypassed'] = 'Hvis sitet kun benytter iso-8859-1 (latin-1) sprog/tegnsæt, kan du fortsætte med at benytte den nuværende version 4.1.12 af MySQL (eller nyere)';
+$string['mysql416required'] = 'Moodle 1.6 skal som minimum bruge MySql version 4.1.16 for at garantere at data kan konverteres til UTF-8 fremover.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP er ikke blevet ordentligt konfigureret med MySQL  udvidelsen så den kan kommunikere med MySQL. Det kan skyldes at MySQL extension/dll ikke er loadet. Kontroller venlist phpinfo() og php.ini filen eller rekompiler PHP.';
 $string['name'] = 'Navn';
 $string['next'] = 'Næste';
+$string['oci8po'] = 'Oracle (oci8po)';
+$string['ociextensionisnotpresentinphp'] = 'PHP er ikke konfigureret ordentligt med OCI8-extensionen så den kan kommunikere med Oracle. Vær venlig at tjekke din php.ini-fil eller genkompiler PHP.';
+$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
+$string['odbcextensionisnotpresentinphp'] = 'PHP er ikke blevet korrekt konfigureret med PHP\'s ODBC modul så den kan kommunikere med SQL*Serveren. Kontroller venligst php.ini filen eller rekompiler PHP.';
 $string['ok'] = 'OK';
 $string['pass'] = 'OK';
-$string['password'] = 'Password';
+$string['password'] = 'Adgangskode';
+$string['pgsqlextensionisnotpresentinphp'] = 'PHP er ikke blevet korrekt konfigureret med PHP\'s PGSQL modul så den kan kommunikere med PostgreSQL. Kontroller venligst php.ini filen eller rekompiler PHP.';
+$string['php50restricted'] = 'PHP 5.0.x har nogle kendte fejl og problemer. Opgrader venligst til 5.1.x eller nedgradér til 4.3.x eller 4.4.x';
 $string['phpversion'] = 'PHP version';
 $string['phpversionerror'] = 'PHP versionen skal være nyere end 4.1.0';
 $string['phpversionhelp'] = '<p>Moodle kræver en PHP version der er nyere end 4.1.0.</p>
 <p>Webserveren bruger i øjeblikket version $a</p>
 <p>Du bliver nødt til at opdatere PHP eller flytte systemet over på en anden webserver der har en nyere version af PHP!</p>';
+$string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Forrige';
+$string['remotedownloadnotallowed'] = 'Download af komponenter til din server er ikke tilladt (\"allow_url_fopen\" er deaktiveret).<br /><br />Du må downloade 
+<a href=\"$a->url\">$a->url</a>-filen manuelt, kopiere den til \"$a->dest\" til din server og unzippe den der.';
+$string['report'] = 'Rapport';
+$string['restricted'] = 'Afvist';
 $string['safemode'] = 'Safe mode';
 $string['safemodeerror'] = 'Moodle kan have problemer med \"Safe mode : on\"';
 $string['sessionautostart'] = 'Session autostart';
 $string['sessionautostarterror'] = 'Denne skulle være deaktiveret';
+$string['skipdbencodingtest'] = 'Spring DB tegnsæts testen over';
 $string['status'] = 'Status';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Dansk';
+$string['unicoderecommended'] = 'Alle data skal helst gemmes i Unicode (UTF-8). Nye installationer skal helst installeres i databaser der har UTF-8 som standard karaktersæt. Hvis du opgradere fra en tidligere installation bør du migrere eksisterende data til UTF-8 (se Admin siderne)';
+$string['unicoderequired'] = 'Alle data skal gemmes i Unicode (UTF-8). Nye installationer skal helst installeres i databaser der har UTF-8 som standard karaktersæt. Hvis du opgradere fra en tidligere installation bør du migrere eksisterende data til UTF-8 (se Admin siderne)';
 $string['user'] = 'Bruger';
-$string['wwwroot'] = 'Web adresse';
-$string['wwwrooterror'] = 'Webadressen lader ikke til at være korrekt - Moodleinstallationen kunne ikke findes der.';
+$string['welcomep10'] = '$a->installername ($a->installerversion)';
+$string['welcomep20'] = 'Du ser denne side fordi du med succes har installeret og åbnet pakken <strong>$a->packname $a->packversion</strong> på din computer.
+Tillykke med det!';
+$string['welcomep30'] = 'Denne udgave af <strong>$a->installername</strong> inkluderer programmerne til at oprette et miljø hvori <strong>Moodle</strong> vil operaere, nemlig:';
+$string['welcomep40'] = 'Pakken indeholder også <strong>Moodle $a->moodlerelease ($a->moodleversion)</strong>.';
+$string['welcomep50'] = 'Brugen af programmerne i denne pakke er styret af deres respektive licenser. Hele <strong>$a->installername</strong>-pakken er <a href=\"http://www.opensource.org/docs/definition_plain.html\">open source</a> og distribueret under <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>-licensen.';
+$string['welcomep60'] = 'De følgende sider vil hjælpe dig gennem nogle nemme trin til konfiguration og opsætning af <strong>Moodle</strong> på din computer. Du kan acceptere standardindstillingerne eller vælge at ændre dem så de bedre svarer til dine egne behov.';
+$string['welcomep70'] = 'Klik på \"Næste\" herunder for at forsætte opsætningen af <strong>Moodle</strong>.';
+$string['wrongdestpath'] = 'Forkert  destinations sti';
+$string['wrongsourcebase'] = 'Forkert kilde URL';
+$string['wrongzipfilename'] = 'Forkert zip-filnavn.';
+$string['wwwroot'] = 'Web-adresse';
+$string['wwwrooterror'] = 'Webadressen lader ikke til at være korrekt - Moodle-installationen kunne ikke findes der.';
 ?>
@@ -9,19 +9,117 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in installer_strings (same dir)

-$string['closewindow'] = 'Dieses Fenster schließen';
-$string['continue'] = 'Weiter';
-$string['error'] = 'Fehler';
-$string['help'] = 'Hilfe';
-$string['language'] = 'Sprache';
-$string['name'] = 'Name';
-$string['next'] = 'Nächste';
-$string['ok'] = 'OK';
+$string['admindirsettingsub'] = 'Einige wenige Webhosting-Anbieter benutzen /admin als spezielles Verzeichnis für den Zugang zum Administrationstool oder andere Dinge. Leider kommt es dadurch zu Konflikten mit dem Standard für das Administrationsverzeichnis von Moodle. Du kannst dies ändern, indem du das Verzeichnis /admin in der Moodle-Installation umbenennst. Den geänderten Namen dieses Verzeichnisses musst du hier eingeben.
+z.B.: <br /> <br /><b>moodleadmin</b><br /> 
+Dies ändert die Links für das Admin-Verzeichnis in Moodle.';
+$string['chooselanguagesub'] = 'Wähle eine Sprache, die du während der Installation verwenden möchtest. Nach der Installation kannst du die Sprache für die Oberfläche und die Nutzer/innen festlegen.';
+$string['configfilenotwritten'] = 'Das Installationsscript kann die Datei config.php, welche die gewählten Einstellungen enthält, nicht automatisch erstellen. Der webuser hat keine Schreibrechte für das Moodle-Verzeichnis. Du kannst den folgenden Code manuell in der Datei config.php speichern und diese dann ins Hauptverzeichnis Ihrer Moodle-Installation kopieren.';
+$string['configurationcompletesub'] = 'Moodle speichert deine Konfigurationseinstellungen nun im Hauptverzeichnis deiner Moodle-Installation.';
+$string['databasecreationsettingshead'] = 'Du musst Einstellungen für die Datenbank konfigurieren, in der die meisten Moodle-Daten abgelegt werden. Der Installationsprozess erstellt die Datenbanktabellen automatisch auf der Grundlage der Einstellungen.';
+$string['databasecreationsettingssub'] = '<b>Typ:</b> \"mysql\" vom Installer festgelegt<br />
+<b>Host:</b> \"localhost\" vom Installer festgelegt<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> \"root\" vom Installer festgelegt<br />
+<b>Password:</b> Dein Datenbankpasswort<br />
+<b>Tables Prefix:</b> optionaler Prefix für alle Tabellennamen';
+$string['databasesettingshead'] = 'Du musst nun die Einstellungen für die Datenbank konfigurieren, in der die meisten Moodle-Daten abgelegt werden. Diese Datenbank muss bereits vorher angelegt und mit Nutzernamen und Passwort versehen worden sein, um auf sie zugreifen zu können.';
+$string['databasesettingssub'] = '<b>Typ:</b> mysql oder postgres7<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>Nutzer:</b> Dein Anmeldename für die Datenbank<br />
+<b>Passwort:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellen';
+$string['databasesettingssub_mssql'] = '<b>Typ:</b> SQL*Server (ohne UTF-8)<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Dein Anmeldename für die Datenbank<br />
+<b>Password:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+$string['databasesettingssub_mssql_n'] = '<b>Typ:</b> SQL*Server (mit UTF-8)<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Dein Anmeldename für die Datenbank<br />
+<b>Password:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+$string['databasesettingssub_mysql'] = '<b>Typ:</b> MySQL<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Dein Anmeldename für die Datenbank<br />
+<b>Password:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (optional)';
+$string['databasesettingssub_oci8po'] = '<b>Typ:</b> Oracle<br />
+<b>Host:</b> unbenutzt - muss leer bleiben!<br />
+<b>Name:</b> vorgegebener Verbindungname zu tnsnames.ora<br />
+<b>User:</b> Dein Anmeldename für die Datenbank<br />
+<b>Password:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig, 2cc. max)';
+$string['databasesettingssub_odbc_mssql'] = '<b>Typ:</b> SQL*Server (over ODBC) <b><font color=\"red\">Experimentell! (nicht für den produktiven Einsatz)</font></b><br />
+<b>Host:</b> vorgegebener DSN-Name im ODBC-Kontrolldialog<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Dein Anmeldename für die Datenbank<br />
+<b>Password:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+$string['databasesettingssub_postgres7'] = '<b>Typ:</b> PostgreSQL<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Dein Anmeldename für die Datenbank<br />
+<b>Password:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+$string['datarooterror'] = 'Das angegebene Datenverzeichnis ist nicht vorhanden und kann nicht angelegt werden. Korrigiere die Pfad-Eingabe oder lege das Verzeichnis manuell an.';
+$string['dbconnectionerror'] = 'Eine Verbindung zur angegebenen Datenbank konnte nicht hergestellt werden. Bitte überprüfe deine Eingaben.';
+$string['dbwrongencoding'] = 'Die ausgewählte Datenbank läuft unter einem nicht empfohlenen Zeichensatz. Es wäre besser, wenn du eine Unicode (UTF-8) basierte Datenbank verwenden würdest. Du hast die Möglichkeit diesen Schritt zu überspringen. Vermutlich wird dies später bei der Nutzung aber zu Problemen führen.';
+$string['dbwronghostserver'] = 'Du musst den oben genannten \"Host\"-Regeln folgen.';
+$string['dbwrongnlslang'] = 'Die Umgebungsvariable NLS_LANG deines Webservers muss den Zeichensatz AL32UTF8 benutzen. Lies in der PHP-Dokumentation nach, wie du OCI8 richtig einstellst.';
+$string['dbwrongprefix'] = 'Du musst den oben genannten \"Tabellen-Prefix\"- Regeln folgen.';
+$string['directorysettingshead'] = 'Bestätige bitte die Verzeichniseinträge für deine Moodle-Installation';
+$string['directorysettingssub'] = '<p><b>URL-Adresse:</b>
+Gib hier die vollständige URL für deine Moodle-Installation an. Sollte deine Seite über mehrere Adressen erreichbar sein, gib die Adresse an, die am häufigsten genutzt wird. Bitte gib am Ende kein Slash ein.</p>
+
+<p><b>Moodle-Verzeichnis:</b>
+Gib den absoluten Pfad für deine Moodle-Installation an. Bitte prüfe, ob die Groß-/ Kleinschreibung korrekt ist.</p>
+
+<p><b>Datenverzeichnis:</b>
+Moodle benötigt ein Verzeichnis, indem hochgeladene Dateien abgelegt werden. Dieses Verzeichnis muss Lese- und Schreibrechte für den webuser des Servers haben. (üblicherweise \'nobody\' or \'apache\'), aber es sollte nicht direkt über das Internet erreichbar sein.</p>';
+$string['downloadedfilecheckfailed'] = 'Die Prüfung der heruntergeladenen Datei ist gescheitert';
+$string['downloadlanguagenotneeded'] = 'Du kannst die Installation mit dem Sprachpaket \"$a\" fortsetzen.';
+$string['downloadlanguagesub'] = 'Du hast nun die Möglichkeit, ein Sprachpaket herunterzuladen und den Installationsprozess mit dieser Sprache fortzusetzen. <br /><br /> Falls du keinen Download durchführen kannst, wird die Installation auf Englisch fortgeführt. (Wenn die Installation abgeschlossen ist, hast du die Option weitere Sprachpakete herunterzuladen.)';
+$string['environmenterrortodo'] = 'Du musst zunächst alle Probleme mit der Server-Konfiguration beheben, bevor du mit der Installation dieser Moodle-Version fortfahren kannst.';
+$string['environmentsub'] = 'Es wird geprüft, ob die verschiedenen Komponenten deines Systems die Installationsanforderungen erfüllen.';
+$string['gdversionhelp'] = '<p>Auf deinem Server ist vermutlich GD nicht installiert. </p>
+<p>GD ist eine Bibliothek, die von PHP benötigt wird, um damit Bilder von Moodle angezeigt werden können, z.B. Nutzer-Bilder oder grafische Darstellungen der Log-Daten. Moodle arbeitet auch ohne GD. Die o.g. Funktionen stehen dir dann jedoch nicht zur Verfügung.</p>
+<p> Wenn du GD unter UNIX zu PHP hinzufügen möchtest, kompilierst du PHP unter Verwendung des Parameters   with-gd </p>
+<p>Unter Windows kannst du die Datei php.ini bearbeiten und die Zeile libgd.dll auskommentieren.</p>';
+$string['globalsquoteserror'] = 'Prüfe die PHP-Einstellungen: deaktiviere register_globals und/oder aktiviere magic_quotes_gpc';
+$string['iconvrecommended'] = 'Die Installation der ICONV Bibliothek wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig, wenn du Sprachen mit anderen als lateinischen Zeichensätzen verwendst.';
+$string['mbstringrecommended'] = 'Die Installation der Bibliothek MBSTRING wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig, wenn du Sprachen mit anderen als lateinischen Zeichensätzen verwendest.';
+$string['memorylimithelp'] = '<p>Die PHP-Einstellung memory_limit für deinen Server ist zur Zeit auf $a eingestellt. </p>
+<p>Dies wird vermutlich zu Problemen führen, wenn du Moodle mit vielen Aktivitäten oder vielen Nutzer/innen verwendst. </p>
+<p>Wir empfehlen die Einstellung zu erhöhen. Empfohlen werden 16M oder mehr. Dies kannst du auf verschiedene Arten machen:</p>
+<ol>
+<li>Wenn du PHP neu kompilieren kannst, nimm die Einstellung <i>--enable-memory-limit</i>. Dann kann Moodle die Einstellung selber vornehmen.
+<li>Wenn du Zugriff auf die Datei php.ini hast, kannst du die Einstellung <b>memory_limit</b> selber auf z.B. 16M anpassen. Wenn du selber keinen Zugriff hast, fragst du den Server-Admin, dies für dich zu tun.
+<li>Auf einigen PHP-Servern kannst du eine .htaccess-Datei im Moodle-Verzeichnis einrichten. Trage darin die folgende Zeile ein: <p><blockquote>php_value memory_limit 16M</blockquote></p>
+<p>Achtung: auf einigen Servern hindert diese Einstellung <b>alle</b> PHP-Seiten und du erhältst Fehlermeldungen. Entferne dann den Eintrag in der .htaccess-Datei wieder.</p></li>
+</ol>';
+$string['mssqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die MSSQL-Erweiterung mit SQL*Server zu kommunizieren. Bitte prüfe die Datei php.ini oder kompiliere PHP neu.';
+$string['mysql416bypassed'] = 'Wenn du in deiner Website ausschließlich ISO-8859-1 (lateinische) Sprachen verwenden, kannst du eine MySQL-Version ab 4.1.12 (oder höher) verwenden.';
+$string['mysqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die MySQL-Erweiterung mit MySQL zu kommunizieren. Bitte prüfe die Datei php.ini oder kompiliere PHP neu.';
+$string['ociextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die OCI8-Erweiterung mit Oracle zu kommunizieren. Bitte prüfe die Datei php.ini oder kompiliere PHP neu.';
+$string['odbcextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die ODBC-Erweiterung mit SQL*Server zu kommunizieren. Bitte prüfe die Datei php.ini oder kompiliere PHP neu.';
 $string['parentlanguage'] = 'de_utf8';
-$string['password'] = 'Kennwort';
-$string['previous'] = 'Frühere';
-$string['status'] = 'Status';
+$string['pgsqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die PGSQL-Erweiterung mit PostgreSQL zu kommunizieren. Bitte prüfe die Datei php.ini oder kompiliere PHP neu.';
+$string['php50restricted'] = 'PHP 5.0.x hat eine Reihe bekannter Fehler! Du solltest stattdessen die Versionen 5.1.x bzw. 4.3.x/4.4.x benutzen.';
+$string['phpversionhelp'] = '<p>Moodle erwartet PHP mindestens in der Version 4.3.0/4.4.0 oder 5.1.0 (5.0.x weist eine Reihe bekannter Fehler auf).</p>
+<p>Du benutzt zur Zeit die Version $a.</p>
+<p>Du musst deine PHP-Verson aktualisieren oder auf einen Rechner wechseln, der eine neuere Version von PHP nutzt.<br />
+(Im Falle von 5.0.x könntest du auch zu einer Version 4.3.x/4.4.x downgraden)</p>';
+$string['remotedownloadnotallowed'] = 'Der Download von Komponenten auf deinen Server ist nicht erlaubt (allow_url_fopen ist deaktiviert). <br /><br /> Die Datei <a href=\"$a->url\">$a->url</a> muss manuell heruntergeladen werden. Kopiere die Datei nach \"$a->dest\" auf deinen Server und entpacke sie dort.';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Deutsch - Du';
-$string['user'] = 'Nutzer';
+$string['unicoderecommended'] = 'Es wird empfohlen, alle Daten im Format Unicode UTF8 zu speichern. Neuinstallationen sollten mit Datenbanken vorgenommen werden, die als Standardzeichensatz UTF8 benutzen. Wenn du ein Upgrade durchführst, solltest du die UTF8-Migration starten (Admin-Seite).';
+$string['unicoderequired'] = 'Es ist notwendig, alle Daten im Format Unicode UTF8 zu speichern. Neuinstallationen müssen mit Datenbanken vorgenommen werden, die als Standardzeichensatz UTF8 benutzen. Wenn du ein Upgrade durchführst, solltest du die UTF8-Migration starten (Admin-Seite).';
+$string['welcomep20'] = 'Du hast das Paket <strong>$a->packname $a->packversion</strong> erfolgreich auf deinem Computer installiert.';
+$string['welcomep30'] = 'Diese Version von <strong>$a->installername</strong> enthält folgende Anwendungen, mit denen du <strong>Moodle</strong> ausführen kannst:';
+$string['welcomep60'] = 'Die folgenden Seiten führen dich in einfachen Schritten durch die Konfiguration und Installation von <strong>Moodle</strong> auf deinem Computer. Du kannst die vorgeschlagenen Einstellungen übernehmen oder an deine Bedürfnisse anpassen.';
+$string['welcomep70'] = 'Klicke auf den \"Weiter\"-Button, um mit dem Setup von <string>Moodle</string> fortzufahren.';
 ?>
@@ -11,149 +11,211 @@

 $string['admindirerror'] = 'Das angegebene Admin-Verzeichnis ist falsch.';
 $string['admindirname'] = 'Name für das Admin-Verzeichnis';
-$string['admindirsettinghead'] = 'admin-Verzeichnis festlegen ...';
-$string['admindirsettingsub'] = 'Einige wenige Webhosting-Anbieter benutzen /admin als spezielles Verzeichnis für den Zugang zum Administrationstool oder andere Dinge. Leider kommt es dadurch zu Konflikten mit dem Standard für das Administrationsverzeichnis von moodle. Sie können dies ändern, indem Sie das admin-Verzeichnis in der moodle-Installation umbenennen. Den gewählten Namen dieses Verzeichnisses müssen Sie hier eingeben.
-Zum Beispiel: <br /> <br /><b>moodleadmin</b><br /> 
-Dies ändert die Links für das Admin-Verzeichnis in moodle.';
-$string['bypassed'] = 'Uberbrückt';
-$string['cannotcreatelangdir'] = 'lang-Verzeichnis kann nicht angelegt werden.';
-$string['cannotcreatetempdir'] = 'Temporäres Verzeichnis kann nicht angelegt werden.';
+$string['admindirsettinghead'] = 'Admin-Verzeichnis festlegen ...';
+$string['admindirsettingsub'] = 'Einige wenige Webhosting-Anbieter benutzen /admin als spezielles Verzeichnis für den Zugang zum Administrationstool oder andere Dinge. Leider kommt es dadurch zu Konflikten mit dem Standard für das Administrationsverzeichnis von Moodle. Sie können dies ändern, indem Sie das Verzeichnis /admin in der Moodle-Installation umbenennen. Den geänderten Namen dieses Verzeichnisses müssen Sie hier eingeben.
+z.B.: <br /> <br /><b>moodleadmin</b><br /> 
+Dies ändert die Links für das Admin-Verzeichnis in Moodle.';
+$string['bypassed'] = 'Unberücksichtigt';
+$string['cannotcreatelangdir'] = 'Das Verzeichnis \"lang\" kann nicht angelegt werden.';
+$string['cannotcreatetempdir'] = 'Das temporäre Verzeichnis kann nicht angelegt werden.';
 $string['cannotdownloadcomponents'] = 'Komponenten können nicht heruntergeladen werden.';
 $string['cannotdownloadzipfile'] = 'ZIP-Datei kann nicht heruntergeladen werden.';
 $string['cannotfindcomponent'] = 'Komponente wurde nicht gefunden.';
-$string['cannotsavemd5file'] = 'md5-Datei konnte nicht gespeichert werden.';
-$string['cannotsavezipfile'] = 'ZIP-Datei konnte nicht gespeichert werden';
-$string['cannotunzipfile'] = 'Datei konnte nicht entpackt werden.';
+$string['cannotsavemd5file'] = 'Die md5-Datei konnte nicht gespeichert werden.';
+$string['cannotsavezipfile'] = 'Die ZIP-Datei konnte nicht gespeichert werden';
+$string['cannotunzipfile'] = 'Die Datei konnte nicht entpackt werden.';
 $string['caution'] = 'Warnung';
 $string['check'] = 'Prüfen';
-$string['chooselanguagehead'] = 'Einige wenige Webhosting-Anbieter benutzen /admin als spezielles Verzeichnis für den Zugang zum Administrationstool oder andere Dinge. Leider kommt es dadurch zu Konflikten mit dem Standard für das Administrationsverzeichnis von moodle. Sie können dies ändern, indem Sie das admin-Verzeichnis in der moodle-Installation umbenennen. Den gewählten Namen dieses Verzeichnisses müssen Sie hier eingeben.';
-$string['chooselanguagesub'] = 'Wählen Sie eine Sprache die Sie während der Installation verwenden wollen. Nach der Installation können Sie die Sprache für die Oberfläche und die Nutzer/innen festlegen.';
+$string['chooselanguagehead'] = 'Eine Sprache wählen';
+$string['chooselanguagesub'] = 'Wählen Sie eine Sprache, die Sie während der Installation verwenden wollen. Nach der Installation können Sie die Sprache für die Oberfläche und die Nutzer/innen festlegen.';
 $string['closewindow'] = 'Dieses Fenster schließen';
-$string['compatibilitysettingshead'] = 'Prüfung Ihrer  PHP- Einstellungen ...';
-$string['compatibilitysettingssub'] = 'Alle Tests sollten vom Server bestätigt werden, damit moodle später reibungslos laufen kann.';
+$string['compatibilitysettingshead'] = 'Prüfung Ihrer PHP-Einstellungen ...';
+$string['compatibilitysettingssub'] = 'Alle Tests sollten vom Server bestätigt werden, damit Moodle später reibungslos laufen kann.';
 $string['componentisuptodate'] = 'Die Komponente ist nicht aktuell.';
-$string['configfilenotwritten'] = 'Ds Installationsscript kann die Datei config.php, welche die gewählten Einstellungen enthält, nicht automatisch erstellen, weil der web-user keine Schreibrechte für das moodle-Verzeichnis hat. Sie können den folgenden Code manuell in einer Datei config.php speichern und diese ins moodle- Hauptverzeichnis kopieren.';
+$string['configfilenotwritten'] = 'Das Installationsscript kann die Datei config.php, welche die gewählten Einstellungen enthält, nicht automatisch erstellen. Der web-user hat keine Schreibrechte für das Moodle-Verzeichnis. Sie können den folgenden Code manuell in der Datei config.php speichern und diese dann ins Hauptverzeichnis Ihrer Moodle-Installation kopieren.';
 $string['configfilewritten'] = 'Die Datei config.php wurde erfolgreich erstellt';
 $string['configurationcompletehead'] = 'Die Konfiguration ist abgeschlossen.';
-$string['configurationcompletesub'] = 'moodle speichert Ihre Konfigurationseinstellungen nun im root-Verzeichnis Ihrer moodle-Installation.';
+$string['configurationcompletesub'] = 'Moodle speichert Ihre Konfigurationseinstellungen nun im Hauptverzeichnis Ihrer Moodle-Installation.';
 $string['continue'] = 'Weiter';
+$string['curlrecommended'] = 'Die Installation der optionalen Bibliothek Curl wird empfohlen, um die Moodle-Netzwerk-Funktionalität einzuschalten.';
 $string['database'] = 'Datenbank';
-$string['databasecreationsettingshead'] = 'Sie müssen nun die Einstellungen für die Datenbank, in der die meisten moodle-Daten abgelegt werden, konfigurieren. Der Istallationsprozess erstellt die Datenbanktabellen automatisch auf der Grundlage der Einstellungen.';
+$string['databasecreationsettingshead'] = 'Sie müssen Einstellungen für die Datenbank konfigurieren, in der die meisten Moodle-Daten abgelegt werden. Der Installationsprozess erstellt die Datenbanktabellen automatisch auf der Grundlage der Einstellungen.';
 $string['databasecreationsettingssub'] = '<b>Typ:</b> \"mysql\" vom Installer festgelegt<br />
 <b>Host:</b> \"localhost\" vom Installer festgelegt<br />
 <b>Name:</b> Datenbankname, z.B. moodle<br />
 <b>User:</b> \"root\" vom Installer festgelegt<br />
 <b>Password:</b> Ihr Datenbankpasswort<br />
 <b>Tables Prefix:</b> optionaler Prefix für alle Tabellennamen';
-$string['databasesettingshead'] = 'Sie müssen nun die Einstellungen für die Datenbank, in der die meisten moodle-Daten abgelegt werden, konfigurieren. Die Datenbank muß bereits mit Nutzernamen und Passwort angelegt worden sein, um auf sie zugreifen zu können.';
+$string['databasesettingshead'] = 'Sie müssen nun die Einstellungen für die Datenbank konfigurieren, in der die meisten Moodle-Daten abgelegt werden. Diese Datenbank muss bereits vorher angelegt und mit Nutzernamen und Passwort versehen worden sein, um auf sie zugreifen zu können.';
 $string['databasesettingssub'] = '<b>Typ:</b> mysql oder postgres7<br />
 <b>Host:</b> z.B. localhost oder db.isp.com<br />
-<b>Name:</b> Datenbankname, Z.B. moodle<br />
-<b>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>Nutzer:</b> Ihr Anmeldename für die Datenbank<br />
 <b>Passwort:</b> Ihr Passwort für die Datenbank<br />
-<b>Tabellen Prefix:</b> optionaler Prefix, der für aller Tabellen genutzt wird ';
+<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellen';
+$string['databasesettingssub_mssql'] = '<b>Typ:</b> SQL*Server (ohne UTF-8)<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Ihr Anmeldename für die Datenbank<br />
+<b>Password:</b> Ihr Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+$string['databasesettingssub_mssql_n'] = '<b>Typ:</b> SQL*Server (mit UTF-8)<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Ihr Anmeldename für die Datenbank<br />
+<b>Password:</b> Ihr Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+$string['databasesettingssub_mysql'] = '<b>Typ:</b> MySQL<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Ihr Anmeldename für die Datenbank<br />
+<b>Password:</b> Ihr Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (optional)';
+$string['databasesettingssub_oci8po'] = '<b>Typ:</b> Oracle<br />
+<b>Host:</b> unbenutzt - muss leer bleiben!<br />
+<b>Name:</b> vorgegebener Verbindungname zu tnsnames.ora<br />
+<b>User:</b> Ihr Anmeldename für die Datenbank<br />
+<b>Password:</b> Ihr Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig, 2cc. max)';
+$string['databasesettingssub_odbc_mssql'] = '<b>Typ:</b> SQL*Server (over ODBC) <b><font color=\"red\">Experimentell! (nicht für den produktiven Einsatz)</font></b><br />
+<b>Host:</b> vorgegebener DSN-Name im ODBC-Kontrolldialog<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Ihr Anmeldename für die Datenbank<br />
+<b>Password:</b> Ihr Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+$string['databasesettingssub_postgres7'] = '<b>Typ:</b> PostgreSQL<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Ihr Anmeldename für die Datenbank<br />
+<b>Password:</b> Ihr Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
 $string['dataroot'] = 'Datenverzeichnis';
-$string['datarooterror'] = 'Das angegebene Datenverzeichnis ist nicht vorhanden und kann nicht angelegt werden. Korrigieren Sie diese Eingabe oder legen Sie das Verzeichnis manuell an.';
+$string['datarooterror'] = 'Das angegebene Datenverzeichnis ist nicht vorhanden und kann nicht angelegt werden. Korrigieren Sie die Pfad-Eingabe oder legen Sie das Verzeichnis manuell an.';
 $string['dbconnectionerror'] = 'Eine Verbindung zur angegebenen Datenbank konnte nicht hergestellt werden. Bitte überprüfen Sie Ihre Eingaben.';
 $string['dbcreationerror'] = 'Fehler beim Anlegen der Datenbank. Die Datenbank konnte mit diesen Einstellungen nicht erstellt werden.';
 $string['dbhost'] = 'Name des Datenbankservers';
 $string['dbprefix'] = 'Prefix für alle Tabellen';
 $string['dbtype'] = 'Datenbankart';
-$string['dbwrongencoding'] = 'Die ausgewählte Datenbank läuft unter einem nicht empfohlenen Zeichensatz. Es wäre besser wenn Sie eine Unicode (UTF-8) basierte Datenbank verwenden würden. Sie haben die Möglichkeit diesen Schritt zu überspringen. Vermutlch wirddies später bei der Nutzung aber zu Problemen führen.';
-$string['directorysettingshead'] = 'Bestätigen Sie bitte die Verzeichniseinträge für Ihre moodle-Installation';
-$string['directorysettingssub'] = '<b>URL Adresse:</b>
-Geben Sie hier die vollständige URL für Ihre Moodle Installation an. Sollte Ihre Seite über mehrere Adressen erreichbar sein, geben Sie die Adresse an, die am häufigsten genutzt wird. Bitte geben Sie am Ende kein Backslash ein.<br/><br/>
+$string['dbwrongencoding'] = 'Die ausgewählte Datenbank läuft unter einem nicht empfohlenen Zeichensatz. Es wäre besser, wenn Sie eine Unicode (UTF-8) basierte Datenbank verwenden würden. Sie haben die Möglichkeit diesen Schritt zu überspringen. Vermutlch wird dies später bei der Nutzung aber zu Problemen führen.
+Die ausgewählte Datenbank läuft unter einem nicht empfohlenen Zeichensatz. Es wäre besser, wenn Sie eine Unicode (UTF-8) basierte Datenbank verwenden würden. Sie haben die Möglichkeit diesen Schritt zu überspringen. Vermutlich wird dies später bei der Nutzung aber zu Problemen führen.';
+$string['dbwronghostserver'] = 'Sie müssen den oben genannten \"Host\"-Regeln folgen.';
+$string['dbwrongnlslang'] = 'Die Umgebungsvariable NLS_LANG Ihres Webservers muss den Zeichensatz AL32UTF8 benutzen. Lesen Sie in der PHP-Dokumentation nach, wie Sie OCI8 richtig einstellen.';
+$string['dbwrongprefix'] = 'Sie müssen den oben genannten \"Tabellen-Prefix\"- Regeln folgen.';
+$string['directorysettingshead'] = 'Bestätigen Sie bitte die Verzeichniseinträge für Ihre Moodle-Installation';
+$string['directorysettingssub'] = '<p><b>URL-Adresse:</b>
+Geben Sie hier die vollständige URL für Ihre Moodle-Installation an. Sollte Ihre Seite über mehrere Adressen erreichbar sein, geben Sie die Adresse an, die am häufigsten genutzt wird. Bitte geben Sie am Ende kein Slash ein.</p>

-<b>Moodle Verzeichnis:</b>
-Geben Sie den absoluten Pfad für Ihre Moodle Installation an. Bitte beachten Sie ob Gross- und Kleinschreibung korrekt ist.<br/><br/>
+<p><b>Moodle-Verzeichnis:</b>
+Geben Sie den absoluten Pfad für Ihre Moodle-Installation an. Bitte prüfen Sie, ob die Groß- und Kleinschreibung korrekt ist.</p>

-<b>Datenverzeichnis:</b>
+<p><b>Datenverzeichnis:</b>
 Moodle benötigt ein Verzeichnis, indem hochgeladene Dateien abgelegt werden. Dieses Verzeichnis muss Lese- und Schreibrechte für den 
-Webuser des Servers haben. (üblicherweise \'nobody\' or \'apache\'), aber es sollte nicht direkt über das Internet erreichbar sein.';
-$string['dirroot'] = 'Moodle Verzeichnis';
-$string['dirrooterror'] = 'Die Einstellungen für das Moodle-Verzeichnis sind nicht korrekt.  Es wurde keine Moodle Installation gefunden. Die anderen Werte wurden gelöscht.';
+web-user des Servers haben. (üblicherweise \'nobody\' or \'apache\'), aber es sollte nicht direkt über das Internet erreichbar sein.</p>';
+$string['dirroot'] = 'Moodle-Verzeichnis';
+$string['dirrooterror'] = 'Die Einstellungen für das Moodle-Verzeichnis sind nicht korrekt.  Es wurde keine Moodle-Installation gefunden. Die anderen Werte wurden gelöscht.';
 $string['download'] = 'Herunterladen';
-$string['downloadedfilecheckfailed'] = 'Prüfung der heruntergeladenen Datei ist gescheitert';
-$string['downloadlanguagebutton'] = 'Download des \"$a\" Sprachpakets';
+$string['downloadedfilecheckfailed'] = 'Die Prüfung der heruntergeladenen Datei ist gescheitert';
+$string['downloadlanguagebutton'] = 'Download des Sprachpakets: $a';
 $string['downloadlanguagehead'] = 'Download der Sprachpakete';
 $string['downloadlanguagenotneeded'] = 'Sie können die Installation mit dem Sprachpaket \"$a\" fortsetzen.';
-$string['downloadlanguagesub'] = 'Sie haben nun die Möglichkeit ein Sprachpaket herunterzuladen und den Installationsprozess mit dieser Sprache fortzusetzen. <br/><br/> Falls sie keinen Download durchführen können, wird die Installation auf Englisch fortgeführt. (Wenn die Installation abgeschlossen ist, haben Sie die Option weitere Sprachpakete herunterzuladen.)';
-$string['environmenterrortodo'] = 'Sie müssen zunächst alle Probleme mit Einstellungen des Servers beheben, bevor Sie mit der Installation von moodle fortfahren können.';
+$string['downloadlanguagesub'] = 'Sie haben nun die Möglichkeit, ein Sprachpaket herunterzuladen und den Installationsprozess mit dieser Sprache fortzusetzen. <br /><br /> Falls sie keinen Download durchführen können, wird die Installation auf Englisch fortgeführt. (Wenn die Installation abgeschlossen ist, haben Sie die Option weitere Sprachpakete herunterzuladen.)';
+$string['environmenterrortodo'] = 'Sie müssen zunächst alle Probleme mit der Server-Konfiguration beheben, bevor Sie mit der Installation dieser Moodle-Version fortfahren können.';
 $string['environmenthead'] = 'Prüfung der Installationsvoraussetzungen';
-$string['environmentrecommendinstall'] = 'sollte installiert bzw. aktiviert werden';
-$string['environmentrecommendversion'] = 'Version $a->needed wird empfohlen. Derzeit ist $a->current installiert.';
-$string['environmentrequireinstall'] = 'muß installiert /aktiviert werden.';
-$string['environmentrequireversion'] = 'Version $a->needed muß installiert werden. Derzeit ist $a->current installiert.';
-$string['environmentsub'] = 'Wir prüfen nun, ob die verschiedenen Komponenten Ihres Systems die Installationsanforderungen erfüllen.';
-$string['environmentxmlerror'] = 'Beim Auslesen der Einstellungen auf dem Server ist ein Fehler aufgetreten ($a->error_code)';
+$string['environmentrecommendinstall'] = 'sollte installiert und aktiviert sein.';
+$string['environmentrecommendversion'] = 'Version $a->needed wird empfohlen - aktuell ist $a->current installiert.';
+$string['environmentrequireinstall'] = 'muss installiert und aktiviert sein.';
+$string['environmentrequireversion'] = 'Version $a->needed ist erforderlich - aktuell ist $a->current installiert.';
+$string['environmentsub'] = 'Es wird geprüft, ob die verschiedenen Komponenten Ihres Systems die Installationsanforderungen erfüllen.';
+$string['environmentxmlerror'] = 'Beim Auslesen der Server-Konfiguration ist ein Fehler aufgetreten ($a->error_code)';
 $string['error'] = 'Fehler';
 $string['fail'] = 'Fehlgeschlagen';
 $string['fileuploads'] = 'Dateien hochladen';
 $string['fileuploadserror'] = 'Dies sollte auf \'on\' stehen';
-$string['gdversion'] = 'GD Version';
-$string['gdversionerror'] = 'Die GD Bibliothek sollte verfügbar sein, um Bilder zu erzeugen und anzuzeigen.';
-$string['globalsquotes'] = 'Unsichere Einstellung von Globals';
+$string['gdversion'] = 'GD-Version';
+$string['gdversionerror'] = 'Die GD-Bibliothek sollte verfügbar sein, um Bilder zu erzeugen und anzuzeigen.';
+$string['gdversionhelp'] = '<p>Auf Ihrem Server ist vermutlich GD nicht installiert. </p>
+<p>GD ist eine Bibliothek, die von PHP benötigt wird, um damit Bilder von Moodle angezeigt werden können, z.B. Nutzer-Bilder oder grafische Darstellungen der Log-Daten. Moodle arbeitet auch ohne GD. Die o.g. Funktionen stehen Ihnen dann jedoch nicht zur Verfügung.</p>
+<p> Wenn Sie GD unter UNIX zu PHP hinzufügen wollen, kompilieren Sie PHP unter Verwendung des Parameters   with-gd </p>
+<p>Unter Windows können Sie die Datei php.ini bearbeiten und die Zeile libgd.dll auskommentieren.</p>';
+$string['globalsquotes'] = 'Unsichere Einstellung von Globalparametern';
 $string['globalsquoteserror'] = 'Prüfen Sie die PHP-Einstellungen: deaktivieren Sie register_globals und/oder aktivieren Sie magic_quotes_gpc';
 $string['help'] = 'Hilfe';
-$string['iconvrecommended'] = 'Die Installation der ICONV Bibliothek wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig wenn Sie Sprachen mit anderen als lateinischen Zeichensätzen verwenden.';
-$string['info'] = 'Information';
+$string['iconvrecommended'] = 'Die Installation der ICONV Bibliothek wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig, wenn Sie Sprachen mit anderen als lateinischen Zeichensätzen verwenden.';
+$string['info'] = 'Informationen';
 $string['installation'] = 'Installation';
 $string['invalidmd5'] = 'md5 ungültig';
-$string['langdownloaderror'] = 'Leider konnte die Sprache \"$a\" nicht installiert werden. Die Installation wird auf Englisch fortgesetzt. ';
+$string['langdownloaderror'] = 'Leider konnte die Sprache \"$a\" nicht installiert werden. Die Installation wird auf Englisch fortgesetzt.';
 $string['langdownloadok'] = 'Die Installation der Sprache \"$a\" war erfolgreich. Der weitere Installationsprozess erfolgt nun in dieser Sprache.';
 $string['language'] = 'Sprache';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Dies sollte ausgeschaltet sein (\'off\')';
-$string['mbstringrecommended'] = 'Die Installation der MBSTRING Bibliothek wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig wenn Sie Sprachen mit anderen als lateinischen Zeichensätzen verwenden.';
+$string['mbstringrecommended'] = 'Die Installation der Bibliothek MBSTRING wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig, wenn Sie Sprachen mit anderen als lateinischen Zeichensätzen verwenden.';
 $string['memorylimit'] = 'Memory Limit';
-$string['memorylimiterror'] = 'Die Speichereinstellung PHP memory limit ist zu niedrig. Es wird bei der künftigen Nutzung vermutlich zu Problemen kommen.';
-$string['memorylimithelp'] = '<p>Die Einstellung der PHP  memory limit für Ihren Server ist zur Zeit auf $a eingestellt. </p>
-<p>Dies wird vermutlich zu Problemen führen wenn Sie moodle mit vielen Aktivitäten oder vielen Nutzer/innen verwenden. </p>
+$string['memorylimiterror'] = 'Die PHP-Speichereinstellung memory_limit ist zu niedrig. Dies könnte später zu Problemen führen.';
+$string['memorylimithelp'] = '<p>Die PHP-Einstellung memory_limit für Ihren Server ist zur Zeit auf $a eingestellt. </p>
+<p>Dies wird vermutlich zu Problemen führen, wenn Sie Moodle mit vielen Aktivitäten oder vielen Nutzer/innen verwenden. </p>
 <p>Wir empfehlen die Einstellung zu erhöhen. Empfohlen werden 16M oder mehr. Dies können Sie auf verschiedene Arten machen:</p>
 <ol>
-<li>Wenn Sie PHP neu kompilieren können, nehmen Sie die Einstellung <i>--enable-memory-limit</i>. Dann kann moodle die Einstellung selber vornehmen.
-<li>Wenn Sie Zugriff auf die Datei php.ini haben, können Sie die Einstellung <b>memory_limit</b> selber auf z.B. 16M anpassen. Wenn Sie selber keinen Zugriff haben, fragen Sie den/die Administrator/in, dies für Sie zu tun.
-<li>Auf einigen PHP-Servern können Sie eine .htaccess-Datei im moodle-Verzeichnis einrichten. Tragen Sie darin die folgende Zeile ein: <p><blockquote>php_value memory_limit 16M</blockquote></p>
+<li>Wenn Sie PHP neu kompilieren können, nehmen Sie die Einstellung <i>--enable-memory-limit</i>. Dann kann Moodle die Einstellung selber vornehmen.
+<li>Wenn Sie Zugriff auf die Datei php.ini haben, können Sie die Einstellung <b>memory_limit</b> selber auf z.B. 16M anpassen. Wenn Sie selber keinen Zugriff haben, fragen Sie den Server-Admin, dies für Sie zu tun.
+<li>Auf einigen PHP-Servern können Sie eine .htaccess-Datei im Moodle-Verzeichnis einrichten. Tragen Sie darin die folgende Zeile ein: <p><blockquote>php_value memory_limit 16M</blockquote></p>
 <p>Achtung: auf einigen Servern hindert diese Einstellung <b>alle</b> PHP-Seiten und Sie erhalten Fehlermeldungen. Entfernen Sie dann den Eintrag in der .htaccess-Datei wieder.</p></li>
 </ol>';
 $string['missingrequiredfield'] = 'Einige erforderliche Felder sind nicht ausgefüllt.';
-$string['mysql416bypassed'] = 'Wenn Sie auf Ihrer Site NUR iso-8859-1 (lateinische) Sprachen verwenden, können Sied ie derzeitige MySQL-Version 4.1.12 (oder höher) verwenden.';
-$string['mysql416required'] = 'MySQL 4.1.16 odereine höhere Version ist für moodle 1.6 unbedingt erforderlich, um sicher zu stellen, dass alle Daten künftig nach UTF-8 konvertiert werden können.';
-$string['mysqlextensionisnotpresentinphp'] = 'PHP wurde noch nicht richtig für diese MySQL Erweiterung konfiguriert. Daher kann es nicht mit MySQL kommunizieren. Prüfen Sie bitte die php.ini-Einstellungen oder kompilieren Sie PHP neu.';
+$string['moodledocslink'] = 'Moodle-Dokumentation für diese Seite';
+$string['mssql'] = 'SQL*Server (mssql)';
+$string['mssql_n'] = 'SQL*Server mit UTF-8-Unterstützung (mssql_n)';
+$string['mssqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die MSSQL-Erweiterung mit SQL*Server zu kommunizieren. Bitte prüfen Sie die Datei php.ini oder kompilieren Sie PHP neu.';
+$string['mysql'] = 'MySQL (mysql)';
+$string['mysql416bypassed'] = 'Wenn Sie in Ihrer Website ausschließlich ISO-8859-1 (lateinische) Sprachen verwenden, können Sie eine MySQL-Version ab 4.1.12 (oder höher) verwenden.';
+$string['mysql416required'] = 'MySQL 4.1.16 (oder höher) ist für Moodle 1.6 unbedingt erforderlich, um eine Datenkonvertierung nach UTF-8 sicherzustellen.';
+$string['mysqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die MySQL-Erweiterung mit MySQL zu kommunizieren. Bitte prüfen Sie die Datei php.ini oder kompilieren Sie PHP neu.';
 $string['name'] = 'Name';
 $string['next'] = 'Nächste';
+$string['oci8po'] = 'Oracle (oci8po)';
+$string['ociextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die OCI8-Erweiterung mit Oracle zu kommunizieren. Bitte prüfen Sie die Datei php.ini oder kompilieren Sie PHP neu.';
+$string['odbc_mssql'] = 'SQL*Server über ODBC (odbc_mssql)';
+$string['odbcextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die ODBC-Erweiterung mit SQL*Server zu kommunizieren. Bitte prüfen Sie die Datei php.ini oder kompilieren Sie PHP neu.';
 $string['ok'] = 'OK';
+$string['opensslrecommended'] = 'Die optionale Installation der OpenSSL Bibliothek wird strikt empfohlen. Dadurch wird die Moodle-Netzwerk-Funktionalität ermöglicht.';
 $string['parentlanguage'] = 'en_utf8';
 $string['pass'] = 'Durchgang';
 $string['password'] = 'Kennwort';
-$string['phpversion'] = 'PHP Version';
-$string['phpversionerror'] = 'PHP muss mindestens in der Version 4.1.0 installiert sein.';
-$string['phpversionhelp'] = '<p>moodle erwartet PHP mit der Version 4.1.0 oderhöher.</p>
+$string['pgsqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die PGSQL-Erweiterung mit PostgreSQL zu kommunizieren. Bitte prüfen Sie die Datei php.ini oder kompilieren Sie PHP neu.';
+$string['php50restricted'] = 'PHP 5.0.x hat eine Reihe bekannter Fehler! Sie sollten die Versionen 5.1.x bzw. 4.3.x/4.4.x benutzen.';
+$string['phpversion'] = 'PHP-Version';
+$string['phpversionerror'] = 'PHP muss mindestens in der Version 4.3.0 oder 5.1.0 installiert sein (5.0.x weist eine Reihe bekannter Fehler auf).';
+$string['phpversionhelp'] = '<p>Moodle erwartet PHP mindestens in der Version 4.3.0/4.4.0 oder 5.1.0 (5.0.x weist eine Reihe bekannter Fehler auf).</p>
 <p>Sie nutzen zur Zeit die Version $a.</p>
-<p>Sie müssen Ihre PHP-Verson aktualisieren oder auf einen Rechner wechseln, der eine neuere Version von PHP nutzt.</p>';
+<p>Sie müssen Ihre PHP-Verson aktualisieren oder auf einen Rechner wechseln, der eine neuere Version von PHP nutzt.<br />
+(Im Falle von 5.0.x könnten Sie auch zu einer Version 4.3.x/4.4.x downgraden)</p>';
+$string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Frühere';
-$string['remotedownloadnotallowed'] = 'Der Download von Komponenten auf Ihren Server ist nicht erlaubt (allow_url_fopen ist deaktiviert). <br/><br/> Die Datei <a href=\"$a->url\">$a->url</a> muß manuell heruntergeladen werden. Kopieren Sie die Datei nach \"$a->dest\" auf dem Server und entpacken Sie sie dort. ';
+$string['remotedownloadnotallowed'] = 'Der Download von Komponenten auf Ihren Server ist nicht erlaubt (allow_url_fopen ist deaktiviert). <br /><br /> Die Datei <a href=\"$a->url\">$a->url</a> muss manuell heruntergeladen werden. Kopieren Sie die Datei nach \"$a->dest\" auf Ihren Server und entpacken Sie sie dort.';
 $string['report'] = 'Bericht';
+$string['restricted'] = 'Eingeschränkt';
 $string['safemode'] = 'Safe Mode';
-$string['safemodeerror'] = 'Die Nutzung von moodle im safe mode kann zu Schwierigkeiten führen.';
+$string['safemodeerror'] = 'Die Nutzung von Moodle im Safe Mode kann zu Schwierigkeiten führen.';
 $string['sessionautostart'] = 'Session Auto Start';
-$string['sessionautostarterror'] = 'Dies Option sollte abgestellt sein.';
+$string['sessionautostarterror'] = 'Diese Option sollte abgeschaltet sein';
 $string['skipdbencodingtest'] = 'Prüfung der Datenbank-Verschlüsselung überspringen';
 $string['status'] = 'Status';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Deutsch';
-$string['user'] = 'Nutzer/in';
+$string['unicoderecommended'] = 'Es wird empfohlen, alle Daten im Format Unicode UTF-8 zu speichern. Neuinstallationen sollten mit Datenbanken vorgenommen werden, die als Standardzeichensatz UTF-8 benutzen. Wenn Sie ein Upgrade durchführen, sollten Sie die UTF-8-Migration starten (Admin-Seite).';
+$string['unicoderequired'] = 'Es ist notwendig, alle Daten im Format Unicode UTF-8 zu speichern. Neuinstallationen müssen mit Datenbanken vorgenommen werden, die als Standardzeichensatz UTF-8 benutzen. Wenn Sie ein Upgrade durchführen, sollten Sie die UTF-8-Migration starten (Admin-Seite).';
+$string['user'] = 'Nutzer';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Sie haben das Paket <strong>$a->packname $a->packversion</strong> erfolgreich auf Ihrem Computer installiert.';
-$string['welcomep30'] = 'Diese Version von <strong>$a->installername</strong> enthält folgende Anwendungen mit denen Sie <strong>moodle</strong> ausführen können:';
+$string['welcomep30'] = 'Diese Version von <strong>$a->installername</strong> enthält folgende Anwendungen, mit denen Sie <strong>Moodle</strong> ausführen können:';
 $string['welcomep40'] = 'Das Paket enthält: <strong>Moodle $a->moodlerelease ($a->moodleversion)</strong>.';
 $string['welcomep50'] = 'Die Nutzung dieser Anwendungen ist lizenzrechtlich geprüft. Alle Anwendungen von <strong>$a->installername</strong> sind
 <a href=\"http://www.opensource.org/docs/definition_plain.html\">Open Source</a> und unterliegen der <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a> Lizenz.';
-$string['welcomep60'] = 'Die folgenden Seiten führen Sie in einfachen Schritten durch die Konfiguration und Installation von <strong>moodle</strong> auf Ihrem Computer. Sie können die vorgeschlagenen Einstellungen übernehmen oder an Ihre Bedürfnisse anpassen. ';
-$string['welcomep70'] = 'Klicken Sie auf den \"Weiter\"-Button, um mit dem Setup von <string>moodle</string> fortzufahren.';
+$string['welcomep60'] = 'Die folgenden Seiten führen Sie in einfachen Schritten durch die Konfiguration und Installation von <strong>Moodle</strong> auf Ihrem Computer. Sie können die vorgeschlagenen Einstellungen übernehmen oder an Ihre Bedürfnisse anpassen.';
+$string['welcomep70'] = 'Klicken Sie auf den \"Weiter\"-Button, um mit dem Setup von <string>Moodle</string> fortzufahren.';
 $string['wrongdestpath'] = 'Falscher Pfad';
-$string['wrongsourcebase'] = 'URL-Quelle ist falsch.';
-$string['wrongzipfilename'] = 'Zip-Dateiname ist falsch';
-$string['wwwroot'] = 'URL Adresse';
-$string['wwwrooterror'] = 'Diese URL scheint nicht gültig zu sein. Moodle ist nicht unter dieser Adresse installiert.  ';
+$string['wrongsourcebase'] = 'Falsche URL-Quelle';
+$string['wrongzipfilename'] = 'Falscher ZIP-Dateiname';
+$string['wwwroot'] = 'Web-Adresse';
+$string['wwwrooterror'] = 'Diese Web-Adresse scheint nicht gültig zu sein. Moodle ist nicht unter dieser Adresse installiert.';
 ?>
@@ -9,15 +9,23 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in installer_strings (same dir)

+$string['check'] = 'Επιλογη';
 $string['closewindow'] = 'Κλείστε αυτό το παράθυρο';
 $string['continue'] = 'Συνέχεια';
+$string['download'] = 'Κατέβασμα';
 $string['error'] = 'Σφάλμα';
+$string['gdversion'] = 'Έκδοση GD';
 $string['help'] = 'Βοήθεια';
+$string['info'] = 'Πληροφορίες';
 $string['language'] = 'Γλώσσα';
+$string['moodledocslink'] = 'Αρχεία βοήθειας για αυτήν την σελίδα';
 $string['name'] = 'Όνομα';
-$string['next'] = 'Επόμενος';
+$string['next'] = 'Επόμενο';
 $string['ok'] = 'OK';
 $string['password'] = 'Κωδικός πρόσβασης';
+$string['previous'] = 'Προηγούμενο';
+$string['report'] = 'Αναφορά';
+$string['restricted'] = 'Περιορισμένο';
 $string['status'] = 'Κατάσταση';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Ελληνικά';
@@ -107,6 +107,16 @@ $string['fileuploads'] = 'File Uploads';
 $string['fileuploadserror'] = 'This should be on';
 $string['gdversion'] = 'GD version';
 $string['gdversionerror'] = 'The GD library should be present to process and create images';
+$string['gdversionhelp'] = '<p>Your server does not seem to have GD installed.</p>
+
+<p>GD is a library that is required by PHP to allow Moodle to process images 
+   (such as the user profile icons) and to create new images (such as 
+   the log graphs).  Moodle will still work without GD - these features 
+   will just not be available to you.</p>
+
+<p>To add GD to PHP under Unix, compile PHP using the --with-gd parameter.</p>
+
+<p>Under Windows you can usually edit php.ini and uncomment the line referencing libgd.dll.</p>';
 $string['globalsquotes'] = 'Insecure Handling of Globals';
 $string['globalsquoteserror'] = 'Fix your PHP settings: disable register_globals and/or enable magic_quotes_gpc';
 $string['help'] = 'Help';
@@ -142,6 +152,7 @@ $string['memorylimithelp'] = '<p>The PHP memory limit for your server is current
    (you will see errors when you look at pages) so you\'ll have to remove the .htaccess file.</p></li>
 </ol>';
 $string['missingrequiredfield'] = 'Some required field is missing';
+$string['moodledocslink'] = 'Moodle Docs for this page';
 $string['mysql416bypassed'] = 'However, if your site is using iso-8859-1 (latin) languages ONLY, you may continue using your currently installed MySQL 4.1.12 (or higher).';
 $string['mysql416required'] = 'MySQL 4.1.16 is the minimum version required for Moodle 1.6 in order to guarantee that all data can be converted to UTF-8 in the future.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP has not been properly configured with the MySQL extension so that it can communicate with MySQL.  Please check your php.ini file or recompile PHP.';
@@ -39,6 +39,7 @@ $string['configfilewritten'] = 'config.php se ha creado con éxito';
 $string['configurationcompletehead'] = 'Configuración completa';
 $string['configurationcompletesub'] = 'Moodle ha creado su fichero de configuración';
 $string['continue'] = 'Continuar';
+$string['curlrecommended'] = 'Se recomienda encarecidamente instalar la librería opcional Curl a fin de posibilitar la funcionalidad de la Red Moodle.';
 $string['database'] = 'Base de datos';
 $string['databasecreationsettingshead'] = 'Ahora necesita configurar los ajustes de la base de datos donde se almacenarán la mayoría de los datos de Moodle. El instalador creará la base de datos con los ajustes especificados más abajo.';
 $string['databasecreationsettingssub'] = '<b>Tipo:</b> el valor por defecto es \"mysql\"<br />
@@ -52,7 +53,43 @@ $string['databasesettingssub'] = '<b>Tipo:</b> mysql o postgres7<br />
 <b>Servidor:</b> p.ej.: localhost o db.tudominio.com<br />
 <b>Usuario:</b> el usuario propietario de tu base de datos<br />
 <b>Contraseña:</b> la contraseña del usuario de la base de datos<br />
-<b>Prefijo de tablas:</b>  prefijo opcional para utilizar en todas las tablas';
+<b>Prefijo de tablas:</b>  prefijo opcional a usar en los nombres de las tablas';
+$string['databasesettingssub_mssql'] = '<b>Tipo:</b> SQL*Server (no UTF-8) <b><font color=\"red\">Experimental! (no usar en modo de producción)</font></b><br />
+<b>Servidor:</b> eg localhost o db.isp.com<br />
+<b>Nombre:</b> nombre de la base de datos, eg moodle<br />
+<b>Usuario:</b> usuario de la base de datos<br />
+<b>Contraseña:</b> contraseña de la base de datos<br />
+<b>Prefijo de tablas:</b> prefijo a usar en los nombres de las tablas (obligatorio)';
+$string['databasesettingssub_mssql_n'] = '<b>Tipo:</b> SQL*Server (UTF-8 habilitado)<br />
+<b>Servidor:</b> eg localhost o db.isp.com<br />
+<b>Nombre:</b> nombre de la base de datos, eg moodle<br />
+<b>Usuario:</b> usuario de la base de datos<br />
+<b>Contraseña:</b> contraseña de la base de datos<br />
+<b>Prefijo de tablas:</b> prefijo a usar en los nombres de las tablas (obligatorio)';
+$string['databasesettingssub_mysql'] = '<b>Tipo:</b> MySQL<br />
+<b>Servidor:</b> eg localhost o db.isp.com<br />
+<b>Nombre:</b> nombre de la base de datos, eg moodle<br />
+<b>Usuario:</b> usuario de la base de datos<br />
+<b>Contraseña:</b> contraseña de la base de datos<br />
+<b>Prefijo de tablas:</b> prefijo a usar en los nombres de las tablas (opcional)';
+$string['databasesettingssub_oci8po'] = '<b>Tipo:</b> Oracle<br />
+<b>Servidor:</b> no usado, puede dejarse en blanco<br />
+<b>Nombre:</b> nombre de la conexión tnsnames.ora<br />
+<b>Usuario:</b> usuario de la base de datos<br />
+<b>Contraseña:</b> contraseña de la base de datos<br />
+<b>Prefijo de tablas:</b> prefijo para usar con todas las tablas (obligatorio, máx. 2cc.)';
+$string['databasesettingssub_odbc_mssql'] = '<b>Tipo:</b> SQL*Server (sobre ODBC) <b><font color=\"red\">Experimental! (no usar en modo de producción)</font></b><br />
+<b>Servidor:</b> nombre del DSN en el panel de control ODBC<br />
+<b>Nombre:</b> nombre de la base de datos, eg moodle<br />
+<b>Usuario:</b> usuario de la base de datos<br />
+<b>Contraseña:</b> contraseña de la base de datos<br />
+<b>Prefijo de tablas:</b> prefijo para usar con todas las tablas (obligatorio)';
+$string['databasesettingssub_postgres7'] = '<b>Tipo:</b> PostgreSQL<br />
+<b>Servidor:</b> eg localhost o db.isp.com<br />
+<b>Nombre:</b> nombre de la base de datos, eg moodle<br />
+<b>Usuario:</b> usuario de la base de datos<br />
+<b>Contraseña:</b> contraseña de la base de datos<br />
+<b>Prefijo de tablas:</b> prefijo para usar con todas las tablas (obligatorio)';
 $string['dataroot'] = 'Directorio de Datos';
 $string['datarooterror'] = 'El \'Directorio de Datos\' no pudo ser encontrado o creado. Corrija la ruta o cree el directorio manualmente.';
 $string['dbconnectionerror'] = 'Error de conexión con la base de datos. Por favor, compruebe los ajustes de la base de datos.';
@@ -61,7 +98,10 @@ $string['dbhost'] = 'Servidor';
 $string['dbprefix'] = 'Prefijo de tablas';
 $string['dbtype'] = 'Tipo';
 $string['dbwrongencoding'] = 'La base de datos seleccionada está ejecutándose bajo una codificación no recomendada ($a). Convendría usar en su lugar una base de datos con codificación Unicode (UTF-8). En cualquier caso, usted puede pasar por alto esta prueba seleccionando \"Pasar por alto la prueba de codificación BD\", si bien tal vez tenga problemas en el futuro.';
-$string['directorysettingshead'] = 'Por favor confirme las siguientes localizaciones de su instalación';
+$string['dbwronghostserver'] = 'Debe seguir las reglas \"Host\" tal como se explicó más arriba.';
+$string['dbwrongnlslang'] = 'La variable contextual NLS_LANG de su servidor web debe usar el conjunto de caracteres AL32UTF8. Revise la documentación PHP para ver cómo se configura adecuadamente OCI8.';
+$string['dbwrongprefix'] = 'Debe seguir las reglas \"Prefijo de Tablas\" como se explicó más arriba.';
+$string['directorysettingshead'] = 'Por favor, confirme las siguientes direcciones de la instalación de Moodle';
 $string['directorysettingssub'] = '<b>Dirección Web:</b>
 Especifique la dirección web completa en la que se accederá a Moodle.
 Si su sitio es accesible desde diferentes URLs entonces elija
@@ -97,6 +137,13 @@ $string['fileuploads'] = 'Subidas de archivos';
 $string['fileuploadserror'] = 'Debe estar activado';
 $string['gdversion'] = 'Versión GD';
 $string['gdversionerror'] = 'La librería GD debería estar presente para procesar y crear imágenes';
+$string['gdversionhelp'] = '<p>Su servidor parece no tener el GD instalado.</p>
+
+<p>GD es una librería que PHP necesita para que Moodle procese imágenes (tales como los iconos de los usuarios) y para crear imágenes nuevas (e.g., logos). Moodle puede trabajar sin GD, pero usted no dispondrá de las características mencionadas.</p>
+
+<p>Para agregar GD a PHP en entorno Unix, compile PHP usando el parámetro --with-gd.</p>
+
+<p>En un entorno Windows, puede editar php.ini y quitar los comentarios de la línea referida a php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Manejo Inseguro de Ajustes Globales';
 $string['globalsquoteserror'] = 'Fije sus ajustes PHP: deshabilite register_globals y/o habilite magic_quotes_gpc';
 $string['help'] = 'Ayuda';
@@ -129,22 +176,33 @@ a, digamos, 16M. Si no lo tiene, pida a su administrador que lo haga por usted.<
 (podrá ver los errores cuando mire las páginas) de modo que tendrá que eliminar el archivo .htaccess.</p></li>
 </ol>';
 $string['missingrequiredfield'] = 'Falta algún campo necesario';
+$string['moodledocslink'] = 'Moodle Docs para esta página';
+$string['mssql'] = 'SQL*Server (mssql)';
+$string['mssql_n'] = 'SQL*Server con UTF-8 (mssql_n)';
+$string['mssqlextensionisnotpresentinphp'] = 'PHP no se ha configurado adecuadamente con la extensión MSSQL de modo que pueda comunicarse con el SQL*Server. Por favor, compruebe el archivo php.ini o vuelva a compilar PHP.';
+$string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'En cualquier caso, si su sitio únicamente está utilizando idiomas ISO-8859-1 (latin), puede continuar con su versión de MySQL actual (4.1.12 o superior).';
 $string['mysql416required'] = 'MySQL 4.1.16 es la versión mínima requerida para trabajar con Moodle 1.6 y garantizar que toda la información podrá ser convertida a UTF-8 en el futuro.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP no ha sido adecuadamente configurado con la extensión MySQL de modo que pueda comunicarse con MySQL. Por favor, compruebe el archivo php.ini o recompile PHP.';
 $string['name'] = 'Nombre';
 $string['next'] = 'Siguiente';
+$string['oci8po'] = 'Oracle (oci8po)';
+$string['ociextensionisnotpresentinphp'] = 'PHP no ha sido adecuadamente configurado con la extensión OCI8 de modo que pueda comunicarse con Oracle. Por favor, compruebe el archivo php.ini o vuelva a compilar PHP.';
+$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
+$string['odbcextensionisnotpresentinphp'] = 'PHP no ha sido adecuadamente configurado con la extensión ODBC de modo que pueda comunicarse con SQL*Server. Por favor, compruebe el archivo php.ini o vuelva a compilar PHP.';
 $string['ok'] = 'OK';
 $string['pass'] = 'Correcto';
 $string['password'] = 'Contraseña';
+$string['pgsqlextensionisnotpresentinphp'] = 'PHP no ha sido adecuadamente configurado con la extensión PGSQL de modo que pueda comunicarse con PostgreSQL. Por favor, compruebe el archivo php.ini o vuelva a compilar PHP.';
 $string['php50restricted'] = 'PHP 5.0.x tiene varios problemas conocidos; por favor, actualícese a la versión 5.1.x o utilice las versiones 4.3.x o 4.4.x';
 $string['phpversion'] = 'Versión PHP';
 $string['phpversionerror'] = 'La versión PHP debe ser 4.1.0 o superior';
 $string['phpversionhelp'] = '<p>Moodle requiere una versión de PHP 4.1.0 o superior.</p>
 <p>Su versión es $a</p>
 <p>Debe actualizar PHP o acudir a otro servidor con una versión más reciente de PHP</p>';
+$string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Anterior';
-$string['remotedownloadnotallowed'] = 'No está permitido descargar los componentes a su servidor (allow_url_fopen está deshabilitado).<br /><br />Debe descargar el archivo <a href=\"$a->url\">$a->url</a> manualmente, y copiarlo a \"$a->dest\" ';
+$string['remotedownloadnotallowed'] = 'No está permitido descargar los componentes a su servidor (allow_url_fopen está deshabilitado).<br /><br />Debe descargar el archivo <a href=\"$a->url\">$a->url</a> manualmente, y copiarlo a \"$a->dest\"';
 $string['report'] = 'Informe';
 $string['restricted'] = 'Restringido';
 $string['safemode'] = 'Safe Mode';
@@ -155,6 +213,8 @@ $string['skipdbencodingtest'] = 'Pasar por alto el test de decodificación de la
 $string['status'] = 'Estado';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Español - Internacional';
+$string['unicoderecommended'] = 'Se recomienda almacenar todos los datos en Unicode (UTF-8). Las instalaciones nuevas deberían ejecutarse en bases de datos cuyo juego de caracteres por defecto fuera Unicode. Si está realizando una actualización, debería llevar a cabo el proceso de migración UTF-8 (vea al respecto la página de Administración).';
+$string['unicoderequired'] = 'Es necesario que almacene todos sus datos en formato Unicode (UTF-8). Las instalaciones nuevas deberían ejecutarse en bases de datos cuyo juego de caracteres por defecto fuera Unicode. Si está realizando una actualización, debería llevar a cabo el proceso de migración UTF-8 (vea al respecto la página de Administración).';
 $string['user'] = 'Usuario';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Si está viendo esta página es porque ha podido ejecutar el paquete
@@ -167,7 +227,7 @@ $string['welcomep50'] = 'El uso de todas las aplicaciones del paquete está gobe
    licencias. El programa <strong>$a->installername</strong> es 
    <a href=\"http://www.opensource.org/docs/definition_plain.html\">código abierto</a> y se distribuye 
    bajo licencia <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>.';
-$string['welcomep60'] = 'Las siguientes páginas le guiarán a traves de algunos sencillos pasos para configurar
+$string['welcomep60'] = 'Las siguientes páginas le guiarán a través de algunos sencillos pasos para configurar
    y ajustar <strong>Moodle</strong> en su ordenador. Puede utilizar los valores por defecto sugeridos o,
    de forma opcional, modificarlos para que se ajusten a sus necesidades.';
 $string['welcomep70'] = 'Pulse en el botón \"Siguiente\" para continuar con la configuración de <strong>Moodle</strong>.';
@@ -175,5 +235,5 @@ $string['wrongdestpath'] = 'Ruta de destino errónea.';
 $string['wrongsourcebase'] = 'Base de fuente de URL errónea.';
 $string['wrongzipfilename'] = 'Nombre de archivo ZIP erróneo.';
 $string['wwwroot'] = 'Dirección Web';
-$string['wwwrooterror'] = 'La \'Dirección Web\' parece incorrecto. No se pudo encontrar una instalación de Moodle. El valor ha sido cambiado por el original.';
+$string['wwwrooterror'] = 'La \'Dirección Web\' parece incorrecta. No se pudo encontrar una instalación de Moodle. El valor ha sido cambiado por el original.';
 ?>
--- a/Show More
+++ b/Show More