Bumping version for 1.8.9 release. Thinking we might have to go to x.x.10 for the first time with this branch!

Thanks to Mauno Korpelainen and Steve Mayer. Backported from 19_STABLE

COPYING.txt

@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

admin/cron.php

@@ -198,7 +198,7 @@
                 foreach ($assigns as $assign) {
                     if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
                         if (role_unassign(0, $assign->id, 0, $context->id)) {
-                            mtrace("Deleted assignment for user $assign->id from course $assign->courseid");
+                            mtrace("removing user $assign->id from course $assign->courseid as they have not accessed the course for over $CFG->longtimenosee days");
                         }
                     }
                 }

admin/environment.xml

@@ -200,7 +200,7 @@
           <ON_OK message="questioncwqpfsok" />
         </FEEDBACK>
       </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_register_globals" level="optional">
+      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_register_globals" level="required">
         <FEEDBACK>
           <ON_CHECK message="globalswarning" />
         </FEEDBACK>
@@ -214,20 +214,20 @@
       </FEEDBACK>
     </UNICODE>
     <DATABASE level="required">
-      <VENDOR name="mysql" version="4.1.16">
+      <VENDOR name="mysql" version="5.0.25">
         <FEEDBACK>
           <ON_ERROR message="mysql416required" />
         </FEEDBACK>
         <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
       </VENDOR>
-      <VENDOR name="postgres" version="8.0" />
+      <VENDOR name="postgres" version="8.3" />
       <VENDOR name="mssql" version="9.0" />
       <VENDOR name="odbc_mssql" version="9.0" />
       <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="9.0" />
+      <VENDOR name="oracle" version="10.0" />
       <VENDOR name="sqlite" version="2.0" />
     </DATABASE>
-    <PHP version="5.2.4" level="required">
+    <PHP version="5.2.8" level="required">
     </PHP>
     <PHP_EXTENSIONS>
       <PHP_EXTENSION name="iconv" level="optional">
@@ -270,13 +270,30 @@
           <ON_ERROR message="ziprequired" />
         </FEEDBACK>
       </PHP_EXTENSION>
-    </PHP_EXTENSIONS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_register_globals" level="optional">
+      <PHP_EXTENSION name="gd" level="optional">
         <FEEDBACK>
-          <ON_CHECK message="globalswarning" />
+          <ON_CHECK message="gdrecommended" />
         </FEEDBACK>
-      </CUSTOM_CHECK>
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="40M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="safe_mode" value="0" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingsafemode" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
     </CUSTOM_CHECKS>
   </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/fixuserpix.php

@@ -0,0 +1,275 @@
+<?php
+
+require_once('../config.php');
+/**
+ * SCRIPT CONFIGURATION
+ */
+$starttimer = time()+microtime();
+
+$settings = array();
+$settings['verbose'] = false;
+$settings['username'] = null;
+$settings['password'] = null;
+$settings['eolchar'] = '<br />'; // Character used to break lines
+
+// Argument arrays: 0=>short name, 1=>long name
+$arguments = array(
+ array('short'=>'u', 'long'=>'username', 'help' => 'Your moodle username', 'type'=>'STRING', 'default' => ''),
+ array('short'=>'pw', 'long'=>'password', 'help' => 'Your moodle password', 'type'=>'STRING', 'default' => ''),
+ array('short'=>'v', 'long' => 'verbose', 'help' => 'Display extra information about the process')
+);
+
+// Building the USAGE output of the command line version
+if (isset($argv) && isset($argc)) {
+    $help = "Moodle User Pix Fix. Restores user profile images that were not properly moved during 1.8.2 upgrade to newer versions.\n\n"
+          . "Usage: {$argv[0]}; [OPTION] ...\n"
+          . "Options:\n"
+          . "  -h,    -?, -help, --help               This output\n";
+
+    foreach ($arguments as $arg_array) {
+        $equal = '';
+        if (!empty($arg_array['type'])) {
+            $equal = "={$arg_array['type']}";
+        }
+
+        $padding1 = 5 - strlen($arg_array['short']);
+        $padding2 = 30 - (strlen($arg_array['long']) + strlen($equal));
+        $paddingstr1 = '';
+        for ($i = 0; $i < $padding1; $i++) {
+            $paddingstr1 .= ' ';
+        }
+        $paddingstr2 = '';
+        for ($i = 0; $i < $padding2; $i++) {
+            $paddingstr2 .= ' ';
+        }
+
+        $help .= "  -{$arg_array['short']},$paddingstr1--{$arg_array['long']}$equal$paddingstr2{$arg_array['help']}\n";
+    }
+
+    $help .= "\nEmail nicolasconnault@gmail.com for any suggestions or bug reports.\n";
+
+    if ($argc == 1 || in_array($argv[1], array('--help', '-help', '-h', '-?'))) {
+        echo $help;
+        die();
+
+    } else {
+
+        $settings['eolchar'] = "\n";
+        $argv = arguments($argv);
+        $argscount = 0;
+
+        foreach ($arguments as $arg_array) {
+            $value = null;
+            if (in_array($arg_array['short'], array_keys($argv))) {
+                $value = $argv[$arg_array['short']];
+                unset($argv[$arg_array['short']]);
+            } elseif (in_array($arg_array['long'], array_keys($argv))) {
+                $value = $argv[$arg_array['long']];
+                unset($argv[$arg_array['long']]);
+            }
+            if (!is_null($value)) {
+                $settings[$arg_array['long']] = $value;
+                $argscount++;
+            }
+        }
+
+        // If some params are left in argv, it means they are not supported
+        if ($argscount == 0 || count($argv) > 0) {
+            echo $help;
+            die();
+        }
+    }
+}
+
+/**
+ * SCRIPT SETUP
+ */
+require_once($CFG->libdir . '/formslib.php');
+require_once($CFG->dirroot .'/course/lib.php');
+verbose("Loading libraries...");
+$systemcontext = get_context_instance(CONTEXT_SYSTEM);
+
+/**
+ * WEB INTERFACE FORM
+ */
+
+class pixfix_form extends moodleform {
+    function definition() {
+        global $arguments;
+        $mform =& $this->_form;
+
+        foreach ($arguments as $arg_array) {
+            $type = 'advcheckbox';
+
+            $label = ucfirst(str_replace('-', ' ', $arg_array['long']));
+            if (!empty($arg_array['type'])) {
+                $type = 'text';
+            }
+
+            if ($arg_array['long'] == 'password' || $arg_array['long'] == 'username') {
+                continue;
+            }
+
+            $mform->addElement($type, $arg_array['long'], $label);
+
+            if (isset($arg_array['default'])) {
+                $mform->setDefault($arg_array['long'], $arg_array['default']);
+            }
+        }
+        $this->add_action_buttons(false, 'Restore Images');
+    }
+
+    function definition_after_data() {
+
+    }
+}
+
+$run_script = true;
+$web_interface = false;
+
+// If eolchar is still <br />, load the web interface
+if ($settings['eolchar'] == '<br />') {
+    print_header("User Pix-Fix");
+    print_heading("User Pix-Fix");
+    $mform = new pixfix_form();
+
+    if ($data = $mform->get_data(false)) {
+        foreach ($arguments as $arg_array) {
+            if (!empty($data->{$arg_array['long']})) {
+                $settings[$arg_array['long']] = $data->{$arg_array['long']};
+            }
+        }
+    } else {
+        $run_script = false;
+    }
+
+    if (!has_capability('moodle/site:doanything', $systemcontext)) {
+        // If not logged in, give link to login page for current site
+        notify("You must be logged in as administrator before using this script.");
+        require_login();
+    } else {
+        $mform->display();
+    }
+
+    $web_interface = true;
+}
+
+if ($run_script) {
+
+    // User authentication
+    if (!$web_interface) {
+        if (empty($settings['username'])) {
+            echo "You must enter a valid username for a moodle administrator account on this site.{$settings['eolchar']}";
+            die();
+        } elseif (empty($settings['password'])) {
+            echo "You must enter a valid password for a moodle administrator account on this site.{$settings['eolchar']}";
+            die();
+        } else {
+            if (!$user = authenticate_user_login($settings['username'], $settings['password'])) {
+                echo "Invalid username or password!{$settings['eolchar']}";
+                die();
+            }
+            $USER = complete_user_login($user);
+            if (!has_capability('moodle/site:doanything', $systemcontext)) {
+                echo "You do not have administration privileges on this Moodle site. These are required for running the restore script.{$settings['eolchar']}";
+                die();
+            }
+        }
+    }
+
+    // Script code here
+
+    // Look for old moodledata/users directory
+    $oldusersdir = $CFG->dataroot . '/users';
+
+    if (!file_exists($oldusersdir)) {
+        notify('The old directory for user profile images ('.$oldusersdir.') does not exist. Pictures cannot be restored!');
+    } else {
+        // Find user profile images that are not yet in the new directory
+        $folders = get_directory_list($oldusersdir, '', false, true, false);
+
+        $restored_count = 0;
+
+        foreach ($folders as $userid) {
+            $olddir = $oldusersdir . '/' . $userid;
+            $files = get_directory_list($olddir);
+
+            if (empty($files)) {
+                continue;
+            }
+
+            // Create new user directory
+            if (!$newdir = make_user_directory($userid)) {
+                // some weird directory - do not stop the upgrade, just ignore it
+                continue;
+            }
+
+            // Move contents of old directory to new one
+            if (file_exists($olddir) && file_exists($newdir)) {
+                $restored = false;
+
+                foreach ($files as $file) {
+                    if (!file_exists($newdir . '/' . $file)) {
+                        copy($olddir . '/' . $file, $newdir . '/' . $file);
+                        verbose("Moved $olddir/$file into $newdir/$file");
+                        $restored = true;
+                    }
+                }
+
+                if ($restored) {
+                    $restored_count++;
+                }
+            } else {
+                notify("Could not move the contents of $olddir into $newdir!");
+                $result = false;
+                break;
+            }
+        }
+
+        if ($settings['eolchar'] == '<br />') {
+            print_box_start('generalbox centerpara');
+        }
+        if ($restored_count > 0) {
+            echo "Successfully restored profile images for $restored_count users!" . $settings['eolchar'];
+        } else {
+            echo "Did not find any user profile images in need of restoring." . $settings['eolchar'];
+        }
+        if ($settings['eolchar'] == '<br />') {
+            print_box_end();
+        }
+    }
+}
+
+if ($settings['eolchar'] == '<br />') {
+    print_footer();
+}
+
+/**
+ * Converts the standard $argv into an associative array taking var=val arguments into account
+ * @param array $argv
+ * @return array $_ARG
+ */
+function arguments($argv) {
+    $_ARG = array();
+    foreach ($argv as $arg) {
+        if (ereg('--?([^=]+)=(.*)',$arg,$reg)) {
+            $_ARG[$reg[1]] = $reg[2];
+        } elseif(ereg('-([a-zA-Z0-9]+)',$arg,$reg)) {
+           $_ARG[$reg[1]] = 'true';
+        }
+    }
+    return $_ARG;
+}
+
+/**
+ * If verbose is switched on, prints a string terminated by the global eolchar string.
+ * @param string $string The string to STDOUT
+ */
+function verbose($string) {
+    global $settings;
+    if ($settings['verbose'] && !$settings['quiet']) {
+        echo $string . $settings['eolchar'];
+    }
+}
+
+?>

admin/index.php

@@ -281,6 +281,7 @@
 
                 require_once($CFG->libdir.'/environmentlib.php');
                 print_heading(get_string('environment', 'admin'));
+                remove_dir($CFG->dataroot . '/environment'); /// Always delete downloaded env. info to force use of the released one. MDL-9796
                 if (!check_moodle_environment($release, $environment_results, true)) {
                     print_box_start('generalbox', 'notice'); // MDL-8330
                     print_string('langpackwillbeupdated', 'admin');
@@ -426,7 +427,7 @@
     upgrade_local_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Check for changes to RPC functions
-    require_once($CFG->dirroot.'/admin/mnet/adminlib.php');
+    require_once("$CFG->dirroot/$CFG->admin/mnet/adminlib.php");
     upgrade_RPC_functions("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 

admin/mnet/access_control.php

@@ -47,7 +47,7 @@ if (!empty($action) and confirm_sesskey()) {
     // fetch the record in question
     $id = required_param('id', PARAM_INT);
     if (!$idrec = get_record('mnet_sso_access_control', 'id', $id)) {
-        error(get_string('recordnoexists','mnet'), '/admin/mnet/access_control.php');
+        error(get_string('recordnoexists','mnet'), "/$CFG->admin/mnet/access_control.php");
     }
 
     switch ($action) {
@@ -62,7 +62,7 @@ if (!empty($action) and confirm_sesskey()) {
             // require the access parameter, and it must be 'allow' or 'deny'
             $accessctrl = trim(strtolower(required_param('accessctrl', PARAM_ALPHA)));
             if ($accessctrl != 'allow' and $accessctrl != 'deny') {
-                error(get_string('invalidaccessparam', 'mnet') , '/admin/mnet/access_control.php');
+                error(get_string('invalidaccessparam', 'mnet') , "/$CFG->admin/mnet/access_control.php");
             }
 
             if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $accessctrl)) {
@@ -75,7 +75,7 @@ if (!empty($action) and confirm_sesskey()) {
             break;
 
         default:
-            print_error('invalidactionparam', 'mnet', '/admin/mnet/access_control.php');
+            print_error('invalidactionparam', 'mnet', "/$CFG->admin/mnet/access_control.php");
     }
 }
 
@@ -86,7 +86,7 @@ if ($form = data_submitted() and confirm_sesskey()) {
 
     // check permissions and verify form input
     if (!has_capability('moodle/user:delete', $sitecontext)) {
-        error(get_string('nomodifyacl','mnet'), '/admin/mnet/access_control.php');
+        error(get_string('nomodifyacl','mnet'), "/$CFG->admin/mnet/access_control.php");
     }
     if (empty($form->username)) {
         $formerror['username'] = get_string('enterausername','mnet');

admin/mnet/adminlib.php

@@ -72,7 +72,7 @@ function mnet_get_functions($type, $parentname) {
     if (!file_exists($filename)) return false;
 
     if (extension_loaded('tokenizer')) {
-        include_once $CFG->dirroot.'/admin/mnet/MethodTable.php';
+        include_once "$CFG->dirroot/$CFG->admin/mnet/MethodTable.php";
         $functions = (array)MethodTable::create($filename,false);
     }
 

admin/mnet/delete.html

@@ -1,7 +1,7 @@
 <?php
 print_header("$site->shortname: $strmnetsettings", "$site->fullname",
-             '<a href="'.$CFG->wwwroot.'/admin/index.php">'.$stradministration.'</a> -> '.
-             '<a href="'.$CFG->wwwroot.'/admin/mnet/index.php">'.get_string('mnetsettings', 'mnet').'</a> -> Delete host');
+             '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/index.php">'.$stradministration.'</a> -> '.
+             '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/mnet/index.php">'.get_string('mnetsettings', 'mnet').'</a> -> Delete host');
 
 print_heading(get_string('mnetsettings', 'mnet'));
 ?>

admin/mnet/enr_courses.php

@@ -38,7 +38,7 @@
     " class=\"icon\" alt=\"".get_string("course")."\" />";
 
     foreach ($courses as $course) {
-        $link = $CFG->wwwroot . '/admin/mnet/enr_course_enrol.php?'
+        $link = "$CFG->wwwroot/$CFG->admin/mnet/enr_course_enrol.php?"
             . "host={$mnethost}&courseid={$course->id}&sesskey={$USER->sesskey}";
         echo '<tr>'
                . "<td>$icon</td>"

admin/mnet/enr_hosts.php

@@ -38,7 +38,7 @@
            . '</tr>';
     $hosts = $enrolment->list_remote_servers();
     foreach ($hosts as $host) {
-        $coursesurl = "{$CFG->wwwroot}/admin/mnet/enr_courses.php?host={$host->id}&amp;sesskey={$USER->sesskey}";
+        $coursesurl = "{$CFG->wwwroot}/$CFG->admin/mnet/enr_courses.php?host={$host->id}&amp;sesskey={$USER->sesskey}";
         $coursecount = get_field_sql("SELECT count(id) FROM {$CFG->prefix}mnet_enrol_course WHERE hostid={$host->id}");
         if (empty($coursecount)) {
             $coursecount = '?';

admin/report/security/index.php

@@ -0,0 +1,123 @@
+<?php  //$Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.org                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards Martin Dougiamas  http://dougiamas.com     //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+require_once('../../../config.php');
+require_once($CFG->dirroot.'/'.$CFG->admin.'/report/security/lib.php');
+require_once($CFG->libdir.'/adminlib.php');
+
+require_login();
+
+$issue = optional_param('issue', '', PARAM_FILE); // show detailed info about one issue only
+
+$issues = report_security_get_issue_list();
+
+// test if issue valid string
+if (array_search($issue, $issues, true) === false) {
+    $issue = '';
+}
+
+// we may need a bit more memory and this may take a long time to process
+@raise_memory_limit('128M');
+@set_time_limit(0);
+
+// Print the header.
+$adminroot = admin_get_root();
+admin_externalpage_setup('reportsecurity', $adminroot);
+admin_externalpage_print_header($adminroot);
+
+print_heading(get_string('reportsecurity', 'report_security'));
+
+while(@ob_end_flush());
+@flush();
+
+$strok       = '<span class="statusok">'.get_string('statusok', 'report_security').'</span>';
+$strinfo     = '<span class="statusinfo">'.get_string('statusinfo', 'report_security').'</span>';
+$strwarning  = '<span class="statuswarning">'.get_string('statuswarning', 'report_security').'</span>';
+$strserious  = '<span class="statusserious">'.get_string('statusserious', 'report_security').'</span>';
+$strcritical = '<span class="statuscritical">'.get_string('statuscritical', 'report_security').'</span>';
+
+$strissue    = get_string('issue', 'report_security');
+$strstatus   = get_string('status', 'report_security');
+$strdesc     = get_string('description', 'report_security');
+$strconfig   = get_string('configuration', 'report_security');
+
+$statusarr = array(REPORT_SECURITY_OK       => $strok,
+                   REPORT_SECURITY_INFO     => $strinfo,
+                   REPORT_SECURITY_WARNING  => $strwarning,
+                   REPORT_SECURITY_SERIOUS  => $strserious,
+                   REPORT_SECURITY_CRITICAL => $strcritical);
+
+$url = "$CFG->wwwroot/$CFG->admin/report/security/index.php";
+
+if ($issue and ($result = $issue(true))) {
+    $table = new object();
+    $table->head  = array($strissue, $strstatus, $strdesc, $strconfig);
+    $table->size  = array('30%', '10%', '50%', '10%' );
+    $table->align = array('left', 'left', 'left', 'left');
+    $table->width = '90%';
+    $table->data  = array();
+
+    // print detail of one issue only
+    $row = array();
+    $row[0] = report_security_doc_link($issue, $result->name);
+    $row[1] = $statusarr[$result->status];
+    $row[2] = $result->info;
+    $row[3] = is_null($result->link) ? '&nbsp;' : $result->link;
+
+    $CFG->pagepath = "report/security/$issue"; // help link in footer
+
+    $table->data[] = $row;
+
+    print_table($table);
+
+    print_box($result->details, 'generalbox boxwidthnormal boxaligncenter'); // TODO: add proper css
+
+    print_continue($url);
+
+} else {
+    $table = new object();
+    $table->head  = array($strissue, $strstatus, $strdesc);
+    $table->size  = array('30%', '10%', '60%' );
+    $table->align = array('left', 'left', 'left');
+    $table->width = '90%';
+    $table->data  = array();
+
+    foreach ($issues as $issue) {
+        $result = $issue(false);
+        if (!$result) {
+            // ignore this test
+            continue;
+        }
+        $row = array();
+        $row[0] = "<a href='$url?issue=$result->issue'>$result->name</a>";
+        $row[1] = $statusarr[$result->status];
+        $row[2] = $result->info;
+
+        $table->data[] = $row;
+    }
+    print_table($table);
+}
+
+admin_externalpage_print_footer($adminroot);

admin/report/security/lib.php

@@ -0,0 +1,742 @@
+<?php  //$Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.org                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards Martin Dougiamas  http://dougiamas.com     //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+require_once("$CFG->libdir/adminlib.php");
+
+
+define('REPORT_SECURITY_OK', 'ok');
+define('REPORT_SECURITY_INFO', 'info');
+define('REPORT_SECURITY_WARNING', 'warning');
+define('REPORT_SECURITY_SERIOUS', 'serious');
+define('REPORT_SECURITY_CRITICAL', 'critical');
+
+function report_security_get_issue_list() {
+    return array(
+        'report_security_check_globals',
+        'report_security_check_unsecuredataroot',
+        'report_security_check_displayerrors',
+        'report_security_check_noauth',
+        'report_security_check_embed',
+        'report_security_check_mediafilterswf',
+        'report_security_check_openprofiles',
+        'report_security_check_google',
+        'report_security_check_configrw',
+        'report_security_check_defaultuserrole',
+        'report_security_check_guestrole',
+        'report_security_check_defaultcourserole',
+        'report_security_check_courserole',
+
+    );
+}
+
+function report_security_doc_link($issue, $name) {
+    global $CFG;
+
+    if (empty($CFG->docroot)) {
+        return $name;
+    }
+
+    $lang = str_replace('_utf8', '', current_language());
+
+    $str = "<a onclick=\"this.target='docspopup'\" href=\"$CFG->docroot/$lang/report/security/$issue\">";
+    $str .= "<img class=\"iconhelp\" src=\"$CFG->httpswwwroot/pix/docs.gif\" alt=\"\" />$name</a>";
+
+    return $str;
+}
+
+///=============================================
+///               Issue checks
+///=============================================
+
+
+/**
+ * Verifies register globals PHP setting.
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_globals($detailed=false) {
+    $result = new object();
+    $result->issue   = 'report_security_check_globals';
+    $result->name    = get_string('check_globals_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = null;
+
+    if (ini_get_bool('register_globals')) {
+        $result->status = REPORT_SECURITY_CRITICAL;
+        $result->info   = get_string('check_globals_error', 'report_security');
+    } else {
+        $result->status = REPORT_SECURITY_OK;
+        $result->info   = get_string('check_globals_ok', 'report_security');
+    }
+
+    if ($detailed) {
+        $result->details = get_string('check_globals_details', 'report_security');
+    }
+
+    return $result;
+}
+
+/**
+ * Verifies unsupported noauth setting
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_noauth($detailed=false) {
+    global $CFG;
+
+    $result = new object();
+    $result->issue   = 'report_security_check_noauth';
+    $result->name    = get_string('check_noauth_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = null;
+    $result->link    = "<a href=\"$CFG->wwwroot/$CFG->admin/auth.php\">".get_string('authentication').'</a>';
+
+    if (is_enabled_auth('none')) {
+        $result->status = REPORT_SECURITY_CRITICAL;
+        $result->info   = get_string('check_noauth_error', 'report_security');
+    } else {
+        $result->status = REPORT_SECURITY_OK;
+        $result->info   = get_string('check_noauth_ok', 'report_security');
+    }
+
+    if ($detailed) {
+        $result->details = get_string('check_noauth_details', 'report_security');
+    }
+
+    return $result;
+}
+
+/**
+ * Verifies sloppy embedding - this should have been removed long ago!!
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_embed($detailed=false) {
+    global $CFG;
+
+    $result = new object();
+    $result->issue   = 'report_security_check_embed';
+    $result->name    = get_string('check_embed_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = "<a href=\"$CFG->wwwroot/$CFG->admin/settings.php?section=sitepolicies\">".get_string('sitepolicies', 'admin').'</a>';
+
+    if (!empty($CFG->allowobjectembed)) {
+        $result->status = REPORT_SECURITY_CRITICAL;
+        $result->info   = get_string('check_embed_error', 'report_security');
+    } else {
+        $result->status = REPORT_SECURITY_OK;
+        $result->info   = get_string('check_embed_ok', 'report_security');
+    }
+
+    if ($detailed) {
+        $result->details = get_string('check_embed_details', 'report_security');
+    }
+
+    return $result;
+}
+
+/**
+ * Verifies sloppy swf embedding - this should have been removed long ago!!
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_mediafilterswf($detailed=false) {
+    global $CFG;
+
+    $result = new object();
+    $result->issue   = 'report_security_check_mediafilterswf';
+    $result->name    = get_string('check_mediafilterswf_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = "<a href=\"$CFG->wwwroot/$CFG->admin/filters.php\">".get_string('filtersettings', 'admin').'</a>';
+
+    if (!empty($CFG->textfilters)) {
+        $activefilters = explode(',', $CFG->textfilters);
+    } else {
+        $activefilters = array();
+    }
+
+    if (array_search('filter/mediaplugin', $activefilters) !== false and !empty($CFG->filter_mediaplugin_enable_swf)) {
+        $result->status = REPORT_SECURITY_CRITICAL;
+        $result->info   = get_string('check_mediafilterswf_error', 'report_security');
+    } else {
+        $result->status = REPORT_SECURITY_OK;
+        $result->info   = get_string('check_mediafilterswf_ok', 'report_security');
+    }
+
+    if ($detailed) {
+        $result->details = get_string('check_mediafilterswf_details', 'report_security');
+    }
+
+    return $result;
+}
+
+/**
+ * Verifies fatal misconfiguration of dataroot
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_unsecuredataroot($detailed=false) {
+    global $CFG;
+
+    $result = new object();
+    $result->issue   = 'report_security_check_unsecuredataroot';
+    $result->name    = get_string('check_unsecuredataroot_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = null;
+
+    $insecuredataroot = is_dataroot_insecure();
+
+    if ($insecuredataroot) {
+        $result->status = REPORT_SECURITY_SERIOUS;
+        $result->info   = get_string('check_unsecuredataroot_warning', 'report_security', $CFG->dataroot);
+
+    } else {
+        $result->status = REPORT_SECURITY_OK;
+        $result->info   = get_string('check_unsecuredataroot_ok', 'report_security');
+    }
+
+    if ($detailed) {
+        $result->details = get_string('check_unsecuredataroot_details', 'report_security');
+    }
+
+    return $result;
+}
+
+/**
+ * Verifies disaplying of errors - problem for lib files and 3rd party code
+ * because we can not disable debugging in these scripts (they do not include config.php)
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_displayerrors($detailed=false) {
+    $result = new object();
+    $result->issue   = 'report_security_check_displayerrors';
+    $result->name    = get_string('check_displayerrors_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = null;
+
+    if (defined('WARN_DISPLAY_ERRORS_ENABLED')) {
+        $result->status = REPORT_SECURITY_WARNING;
+        $result->info   = get_string('check_displayerrors_error', 'report_security');
+    } else {
+        $result->status = REPORT_SECURITY_OK;
+        $result->info   = get_string('check_displayerrors_ok', 'report_security');
+    }
+
+    if ($detailed) {
+        $result->details = get_string('check_displayerrors_details', 'report_security');
+    }
+
+    return $result;
+}
+
+/**
+ * Verifies open profiles - originaly open by default, not anymore because spammer abused it a lot
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_openprofiles($detailed=false) {
+    global $CFG;
+
+    $result = new object();
+    $result->issue   = 'report_security_check_openprofiles';
+    $result->name    = get_string('check_openprofiles_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = "<a href=\"$CFG->wwwroot/$CFG->admin/settings.php?section=sitepolicies\">".get_string('sitepolicies', 'admin').'</a>';
+
+    if (empty($CFG->forcelogin) and empty($CFG->forceloginforprofiles)) {
+        $result->status = REPORT_SECURITY_WARNING;
+        $result->info   = get_string('check_openprofiles_error', 'report_security');
+    } else {
+        $result->status = REPORT_SECURITY_OK;
+        $result->info   = get_string('check_openprofiles_ok', 'report_security');
+    }
+
+    if ($detailed) {
+        $result->details = get_string('check_openprofiles_details', 'report_security');
+    }
+
+    return $result;
+}
+
+/**
+ * Verifies google access not combined with disabled guest access
+ * because attackers might gain guest access by modifying browser signature.
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_google($detailed=false) {
+    global $CFG;
+
+    $result = new object();
+    $result->issue   = 'report_security_check_google';
+    $result->name    = get_string('check_google_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = "<a href=\"$CFG->wwwroot/$CFG->admin/settings.php?section=sitepolicies\">".get_string('sitepolicies', 'admin').'</a>';
+
+    if (empty($CFG->opentogoogle)) {
+        $result->status = REPORT_SECURITY_OK;
+        $result->info   = get_string('check_google_ok', 'report_security');
+    } else if (!empty($CFG->guestloginbutton)) {
+        $result->status = REPORT_SECURITY_INFO;
+        $result->info   = get_string('check_google_info', 'report_security');
+    } else {
+        $result->status = REPORT_SECURITY_SERIOUS;
+        $result->info   = get_string('check_google_error', 'report_security');
+    }
+
+    if ($detailed) {
+        $result->details = get_string('check_google_details', 'report_security');
+    }
+
+    return $result;
+}
+
+/**
+ * Verifies config.php is not writable anymore after installation,
+ * config files were changed on several outdated server.
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_configrw($detailed=false) {
+    global $CFG;
+
+    $result = new object();
+    $result->issue   = 'report_security_check_configrw';
+    $result->name    = get_string('check_configrw_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = null;
+
+    if (is_writable($CFG->dirroot.'/config.php')) {
+        $result->status = REPORT_SECURITY_WARNING;
+        $result->info   = get_string('check_configrw_warning', 'report_security');
+    } else {
+        $result->status = REPORT_SECURITY_OK;
+        $result->info   = get_string('check_configrw_ok', 'report_security');
+    }
+
+    if ($detailed) {
+        $result->details = get_string('check_configrw_details', 'report_security');
+    }
+
+    return $result;
+}
+
+/**
+ * Verifies sanity of default user role.
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_defaultuserrole($detailed=false) {
+    global $CFG;
+
+    $result = new object();
+    $result->issue   = 'report_security_check_defaultuserrole';
+    $result->name    = get_string('check_defaultuserrole_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = "<a href=\"$CFG->wwwroot/$CFG->admin/settings.php?section=userpolicies\">".get_string('userpolicies', 'admin').'</a>';;
+
+    if (!$default_role = get_record('role', 'id', $CFG->defaultuserroleid)) {
+        $result->status  = REPORT_SECURITY_WARNING;
+        $result->info    = get_string('check_defaultuserrole_notset', 'report_security');
+        $result->details = $result->info;
+
+        return $result;
+    }
+
+    // first test if do anything enabled - that would be really crazy!
+    $sql = "SELECT COUNT(DISTINCT rc.contextid)
+              FROM {$CFG->prefix}role_capabilities rc
+             WHERE rc.capability = 'moodle/site:doanything'
+                   AND rc.permission = ".CAP_ALLOW."
+                   AND rc.roleid = $default_role->id";
+
+    $anythingcount = count_records_sql($sql);
+
+    // risky caps - usually very dangerous
+    $sql = "SELECT COUNT(DISTINCT rc.contextid)
+              FROM {$CFG->prefix}role_capabilities rc
+              JOIN {$CFG->prefix}capabilities cap ON cap.name = rc.capability
+             WHERE ".sql_bitand('cap.riskbitmask', (RISK_XSS | RISK_CONFIG))." <> 0
+                   AND rc.permission = ".CAP_ALLOW."
+                   AND rc.roleid = $default_role->id";
+
+    $riskycount = count_records_sql($sql);
+
+    // default role can not have view cap in all courses - this would break moodle badly
+    $viewcap = record_exists('role_capabilities', 'roleid', $default_role->id, 'permission', CAP_ALLOW, 'capability', 'moodle/course:view');
+
+    // it may have either no or 'user' legacy type - nothing else, or else it would break during upgrades badly
+    $legacyok = false;
+    $sql = "SELECT rc.capability, 1
+              FROM {$CFG->prefix}role_capabilities rc
+             WHERE rc.capability LIKE 'moodle/legacy:%'
+                   AND rc.permission = ".CAP_ALLOW."
+                   AND rc.roleid = $default_role->id";
+    $legacycaps = get_records_sql($sql);
+    if (!$legacycaps) {
+        $legacyok = true;
+    } else if (count($legacycaps) == 1 and isset($legacycaps['moodle/legacy:user'])) {
+        $legacyok = true;
+    }
+
+    if ($anythingcount or $riskycount or $viewcap or !$legacyok) {
+        $result->status  = REPORT_SECURITY_CRITICAL;
+        $result->info    = get_string('check_defaultuserrole_error', 'report_security', format_string($default_role->name));
+
+    } else {
+        $result->status  = REPORT_SECURITY_OK;
+        $result->info    = get_string('check_defaultuserrole_ok', 'report_security');
+    }
+
+    if ($detailed) {
+        $result->details = get_string('check_defaultuserrole_details', 'report_security');
+    }
+
+    return $result;
+}
+
+/**
+ * Verifies sanity of guest role
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_guestrole($detailed=false) {
+    global $CFG;
+
+    $result = new object();
+    $result->issue   = 'report_security_check_guestrole';
+    $result->name    = get_string('check_guestrole_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = "<a href=\"$CFG->wwwroot/$CFG->admin/settings.php?section=userpolicies\">".get_string('userpolicies', 'admin').'</a>';;
+
+    if (!$guest_role = get_record('role', 'id', $CFG->guestroleid)) {
+        $result->status  = REPORT_SECURITY_WARNING;
+        $result->info    = get_string('check_guestrole_notset', 'report_security');
+        $result->details = $result->info;
+
+        return $result;
+    }
+
+    // first test if do anything enabled - that would be really crazy!
+    $sql = "SELECT COUNT(DISTINCT rc.contextid)
+              FROM {$CFG->prefix}role_capabilities rc
+             WHERE rc.capability = 'moodle/site:doanything'
+                   AND rc.permission = ".CAP_ALLOW."
+                   AND rc.roleid = $guest_role->id";
+
+    $anythingcount = count_records_sql($sql);
+
+    // risky caps - usually very dangerous
+    $sql = "SELECT COUNT(DISTINCT rc.contextid)
+              FROM {$CFG->prefix}role_capabilities rc
+              JOIN {$CFG->prefix}capabilities cap ON cap.name = rc.capability
+             WHERE ".sql_bitand('cap.riskbitmask', (RISK_XSS | RISK_CONFIG))." <> 0
+                   AND rc.permission = ".CAP_ALLOW."
+                   AND rc.roleid = $guest_role->id";
+
+    $riskycount = count_records_sql($sql);
+
+    // it may have either no or 'guest' legacy type - nothing else, or else it would break during upgrades badly
+    $legacyok = false;
+    $sql = "SELECT rc.capability, 1
+              FROM {$CFG->prefix}role_capabilities rc
+             WHERE rc.capability LIKE 'moodle/legacy:%'
+                   AND rc.permission = ".CAP_ALLOW."
+                   AND rc.roleid = $guest_role->id";
+    $legacycaps = get_records_sql($sql);
+    if (!$legacycaps) {
+        $legacyok = true;
+    } else if (count($legacycaps) == 1 and isset($legacycaps['moodle/legacy:guest'])) {
+        $legacyok = true;
+    }
+
+    if ($anythingcount or $riskycount or !$legacyok) {
+        $result->status  = REPORT_SECURITY_CRITICAL;
+        $result->info    = get_string('check_guestrole_error', 'report_security', format_string($guest_role->name));
+
+    } else {
+        $result->status  = REPORT_SECURITY_OK;
+        $result->info    = get_string('check_guestrole_ok', 'report_security');
+    }
+
+    if ($detailed) {
+        $result->details = get_string('check_guestrole_details', 'report_security');
+    }
+
+    return $result;
+}
+
+
+/**
+ * Verifies sanity of site default course role.
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_defaultcourserole($detailed=false) {
+    global $CFG;
+
+    $problems = array();
+
+    $result = new object();
+    $result->issue   = 'report_security_check_defaultcourserole';
+    $result->name    = get_string('check_defaultcourserole_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = "<a href=\"$CFG->wwwroot/$CFG->admin/settings.php?section=userpolicies\">".get_string('userpolicies', 'admin').'</a>';;
+
+    if ($detailed) {
+        $result->details = get_string('check_defaultcourserole_details', 'report_security');
+    }
+
+    if (!$student_role = get_record('role', 'id', $CFG->defaultcourseroleid)) {
+        $result->status  = REPORT_SECURITY_WARNING;
+        $result->info    = get_string('check_defaultcourserole_notset', 'report_security');
+        $result->details = get_string('check_defaultcourserole_details', 'report_security');
+
+        return $result;
+    }
+
+    // first test if do anything enabled - that would be really crazy!
+    $sql = "SELECT DISTINCT rc.contextid
+              FROM {$CFG->prefix}role_capabilities rc
+             WHERE rc.capability = 'moodle/site:doanything'
+                   AND rc.permission = ".CAP_ALLOW."
+                   AND rc.roleid = $student_role->id";
+
+    if ($anything_contexts = get_records_sql($sql)) {
+        foreach($anything_contexts as $contextid) {
+            if ($contextid == SYSCONTEXTID) {
+                $a = "$CFG->wwwroot/$CFG->admin/roles/manage.php?action=view&amp;roleid=$CFG->defaultcourseroleid";
+            } else {
+                $a = "$CFG->wwwroot/$CFG->admin/roles/override.php?contextid=$contextid&amp;roleid=$CFG->defaultcourseroleid";
+            }
+            $problems[] = get_string('check_defaultcourserole_anything', 'report_security', $a);
+        }
+    }
+
+    // risky caps - usually very dangerous
+    $sql = "SELECT DISTINCT rc.contextid
+              FROM {$CFG->prefix}role_capabilities rc
+              JOIN {$CFG->prefix}capabilities cap ON cap.name = rc.capability
+             WHERE ".sql_bitand('cap.riskbitmask', (RISK_XSS | RISK_CONFIG))." <> 0
+                   AND rc.permission = ".CAP_ALLOW."
+                   AND rc.roleid = $student_role->id";
+
+    if ($riskycontexts = get_records_sql($sql)) {
+        foreach($riskycontexts as $contextid=>$unused) {
+            if ($contextid == SYSCONTEXTID) {
+                $a = "$CFG->wwwroot/$CFG->admin/roles/manage.php?action=view&amp;roleid=$CFG->defaultcourseroleid";
+            } else {
+                $a = "$CFG->wwwroot/$CFG->admin/roles/override.php?contextid=$contextid&amp;roleid=$CFG->defaultcourseroleid";
+            }
+            $problems[] = get_string('check_defaultcourserole_risky', 'report_security', $a);
+        }
+    }
+
+    // course creator or administrator does not make any sense here
+    $sql = "SELECT rc.capability, 1
+              FROM {$CFG->prefix}role_capabilities rc
+             WHERE rc.capability LIKE 'moodle/legacy:%'
+                   AND rc.permission = ".CAP_ALLOW."
+                   AND rc.roleid = $student_role->id";
+    $legacycaps = get_records_sql($sql);
+    if (isset($legacycaps['moodle/legacy:coursecreator']) or isset($legacycaps['moodle/legacy:admin'])) {
+        $problems[] = get_string('check_defaultcourserole_legacy', 'report_security');
+    }
+
+    if ($problems) {
+        $result->status  = REPORT_SECURITY_CRITICAL;
+        $result->info    = get_string('check_defaultcourserole_error', 'report_security', format_string($student_role->name));
+        if ($detailed) {
+            $result->details .= "<ul>";
+            foreach ($problems as $problem) {
+                $result->details .= "<li>$problem</li>";
+            }
+            $result->details .= "</ul>";
+        }
+
+    } else {
+        $result->status  = REPORT_SECURITY_OK;
+        $result->info    = get_string('check_defaultcourserole_ok', 'report_security');
+    }
+
+    return $result;
+}
+
+/**
+ * Verifies sanity of default roles in courses.
+ * @param bool $detailed
+ * @return object result
+ */
+function report_security_check_courserole($detailed=false) {
+    global $CFG, $SITE;
+
+    $problems = array();
+
+    $result = new object();
+    $result->issue   = 'report_security_check_courserole';
+    $result->name    = get_string('check_courserole_name', 'report_security');
+    $result->info    = null;
+    $result->details = null;
+    $result->status  = null;
+    $result->link    = null;
+
+    if ($detailed) {
+        $result->details = get_string('check_courserole_details', 'report_security');
+    }
+
+    // get list of all student roles selected in courses excluding the default course role
+    $sql = "SELECT r.*
+              FROM {$CFG->prefix}role r
+              JOIN {$CFG->prefix}course c ON c.defaultrole = r.id
+             WHERE c.id <> $SITE->id AND r.id <> $CFG->defaultcourseroleid";
+
+    if (!$student_roles = get_records_sql($sql)) {
+        $result->status  = REPORT_SECURITY_OK;
+        $result->info    = get_string('check_courserole_notyet', 'report_security');
+        $result->details = get_string('check_courserole_details', 'report_security');
+
+        return $result;
+    }
+
+    $roleids = array_keys($student_roles);
+
+    $sql = "SELECT DISTINCT rc.roleid
+              FROM {$CFG->prefix}role_capabilities rc
+             WHERE (rc.capability = 'moodle/legacy:coursecreator' OR rc.capability = 'moodle/legacy:admin'
+                    OR rc.capability = 'moodle/legacy:teacher' OR rc.capability = 'moodle/legacy:editingteacher')
+                   AND rc.permission = ".CAP_ALLOW."";
+
+    $riskyroleids = get_records_sql($sql);
+    $riskyroleids = array_keys($riskyroleids);
+
+
+    // first test if do anything enabled - that would be really crazy!!!!!!
+    $inroles = implode(',', $roleids);
+    $sql = "SELECT rc.roleid, rc.contextid
+              FROM {$CFG->prefix}role_capabilities rc
+             WHERE rc.capability = 'moodle/site:doanything'
+                   AND rc.permission = ".CAP_ALLOW."
+                   AND rc.roleid IN ($inroles)
+          GROUP BY rc.roleid, rc.contextid
+          ORDER BY rc.roleid, rc.contextid";
+
+    $rs = get_recordset_sql($sql);
+    while ($res = rs_fetch_next_record($rs)) {
+        $roleid    = $res->roleid;
+        $contextid = $res->contextid;
+        if ($contextid == SYSCONTEXTID) {
+            $a = "$CFG->wwwroot/$CFG->admin/roles/manage.php?action=view&amp;roleid=$roleid";
+        } else {
+            $a = "$CFG->wwwroot/$CFG->admin/roles/override.php?contextid=$contextid&amp;roleid=$roleid";
+        }
+        $problems[] = get_string('check_courserole_anything', 'report_security', $a);
+    }
+    rs_close($rs);
+
+    // any XSS legacy cap does not make any sense here!
+    $inroles = implode(',', $riskyroleids);
+    $sql = "SELECT DISTINCT c.id, c.shortname
+              FROM {$CFG->prefix}course c
+             WHERE c.defaultrole IN ($inroles)
+          ORDER BY c.sortorder";
+    if ($courses = get_records_sql($sql)) {
+        foreach ($courses as $course) {
+            $a = (object)array('url'=>"$CFG->wwwroot/course/edit.php?id=$course->id", 'shortname'=>$course->shortname);
+            $problems[] = get_string('check_courserole_riskylegacy', 'report_security', $a);
+        }
+    } else {
+        $course = array();
+    }
+
+    // risky caps in any level for roles not marked as risky yet - usually very dangerous!!
+    if ($checkroles = array_diff($roleids, $riskyroleids)) {
+        $inroles = implode(',', $checkroles);
+        $sql = "SELECT rc.roleid, rc.contextid
+                  FROM {$CFG->prefix}role_capabilities rc
+                  JOIN {$CFG->prefix}capabilities cap ON cap.name = rc.capability
+                 WHERE ".sql_bitand('cap.riskbitmask', (RISK_XSS | RISK_CONFIG))." <> 0
+                       AND rc.permission = ".CAP_ALLOW."
+                       AND rc.roleid IN ($inroles)
+              GROUP BY rc.roleid, rc.contextid
+              ORDER BY rc.roleid, rc.contextid";
+        $rs = get_recordset_sql($sql);
+        while ($res = rs_fetch_next_record($rs)) {
+            $roleid    = $res->roleid;
+            $contextid = $res->contextid;
+            if ($contextid == SYSCONTEXTID) {
+                $a = "$CFG->wwwroot/$CFG->admin/roles/manage.php?action=view&amp;roleid=$roleid";
+            } else {
+                $a = "$CFG->wwwroot/$CFG->admin/roles/override.php?contextid=$contextid&amp;roleid=$roleid";
+            }
+            $problems[] = get_string('check_courserole_risky', 'report_security', $a);
+        }
+        rs_close($rs);
+    }
+
+
+    if ($problems) {
+        $result->status  = REPORT_SECURITY_CRITICAL;
+        $result->info    = get_string('check_courserole_error', 'report_security');
+        if ($detailed) {
+            $result->details .= "<ul>";
+            foreach ($problems as $problem) {
+                $result->details .= "<li>$problem</li>";
+            }
+            $result->details .= "</ul>";
+        }
+
+    } else {
+        $result->status  = REPORT_SECURITY_OK;
+        $result->info    = get_string('check_courserole_ok', 'report_security');
+    }
+
+    return $result;
+}
+

admin/report/spamcleaner/index.php

@@ -0,0 +1,372 @@
+<?php
+
+/**
+ * Spam Cleaner
+ *
+ * Helps an admin to clean up spam in Moodle
+ *
+ * @version $Id$
+ * @authors Dongsheng Cai, Martin Dougiamas, Amr Hourani
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ */
+
+// Configuration
+
+// List of known spammy keywords, please add more here
+
+$autokeywords = array(
+                    "<img",
+                    "fuck",
+                    "casino",
+                    "porn",
+                    "xxx",
+                    "cialis",
+                    "viagra",
+                    "poker",
+                    "warcraft"
+                );
+
+/////////////////////////////////////////////////////////////////////////////////
+
+require_once('../../../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+function delete_user($user) {
+    $updateuser = new object();
+    $updateuser->id           = $user->id;
+    $updateuser->deleted      = 1;
+    $updateuser->username     = addslashes("$user->email.".time());
+    $updateuser->email        = '';
+    $updateuser->idnumber     = '';
+    $updateuser->timemodified = time();
+    if (update_record('user', $updateuser)) {
+        role_unassign(0, $user->id);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+$keyword = optional_param('keyword', '', PARAM_RAW);
+$autodetect = optional_param('autodetect', '', PARAM_RAW);
+$del = optional_param('del', '', PARAM_RAW);
+$delall = optional_param('delall', '', PARAM_RAW);
+$ignore = optional_param('ignore', '', PARAM_RAW);
+$reset = optional_param('reset', '', PARAM_RAW);
+$id = optional_param('id', '', PARAM_INT);
+
+require_login();
+$adminroot = admin_get_root();
+admin_externalpage_setup('reportspamcleaner', $adminroot);
+
+// Implement some AJAX calls 
+
+// Delete one user
+if (!empty($del) && confirm_sesskey() && ($id != $USER->id)) {
+    if (isset($SESSION->users_result[$id])) {
+        $user = $SESSION->users_result[$id];
+        if (delete_user($user)) {
+            unset($SESSION->users_result[$id]);
+            echo 1;
+        } else {
+            echo 0;
+        }
+    } else {
+        echo 0;
+    }
+    exit;
+}
+
+// Delete lots of users
+if (!empty($delall) && confirm_sesskey()) {
+    if (!empty($SESSION->users_result)) {
+        foreach ($SESSION->users_result as $userid => $user) {
+            if ($userid != $USER->id) {
+                if (delete_user($user)) {
+                    unset($SESSION->users_result[$userid]);
+                }
+            }
+        }
+    }
+    echo 1;
+    exit;
+}
+
+if (!empty($ignore)) {
+    unset($SESSION->users_result[$id]);
+    echo 1;
+    exit;
+}
+
+admin_externalpage_print_header($adminroot);
+
+// Print headers and things
+
+print_spamcleaner_javascript();
+
+print_box(get_string('spamcleanerintro', 'report_spamcleaner'));
+
+print_box_start();     // The forms section at the top
+
+?>
+
+<div class="mdl-align">
+
+<form method="post" action="index.php">
+  <div>
+    <input type="text" name="keyword" id="keyword_el" value="<?php p($keyword) ?>" /> 
+    <input type="hidden" name="sesskey" value="<?php echo sesskey();?>" />
+    <input type="submit" value="<?php echo get_string('spamsearch', 'report_spamcleaner')?>" />
+  </div>
+</form>
+<p><?php echo get_string('spameg', 'report_spamcleaner');?></p>
+
+<hr />
+
+<form method="post"  action="index.php">
+  <div>
+    <input type="submit" name="autodetect" value="<?php echo get_string('spamauto', 'report_spamcleaner');?>" />
+  </div>
+</form>
+
+
+</div>
+
+<?php
+print_box_end(); 
+
+echo '<div id="result" class="mdl-align">';
+
+// Print list of resulting profiles
+
+if (!empty($keyword)) {               // Use the keyword(s) supplied by the user
+    $keywords = explode(',', $keyword);
+    foreach ($keywords as $key => $keyword) {
+        $keywords[$key] = trim($keyword);
+    }
+    search_spammers($keywords);
+
+} else if (!empty($autodetect)) {     // Use the inbuilt keyword list to detect users
+    search_spammers($autokeywords);
+}
+
+echo '</div>';
+
+/////////////////////////////////////////////////////////////////////////////////
+
+
+///  Functions 
+
+
+function search_spammers($keywords) {
+
+    global $CFG, $USER, $DB; 
+
+    if (!is_array($keywords)) {
+        $keywords = array($keywords);    // Make it into an array
+    }
+
+    $like = sql_ilike();
+
+    $keywordfull = array();
+    foreach ($keywords as $keyword) {
+        $keyword = addslashes($keyword);   // Just to be safe
+        $keywordfull[] = " description $like '%$keyword%' ";
+        $keywordfull2[] = " p.summary $like '%$keyword%' ";
+    }
+    $conditions = '( '.implode(' OR ', $keywordfull).' )';
+    $conditions2 = '( '.implode(' OR ', $keywordfull2).' )';
+
+    $sql = "SELECT * FROM {$CFG->prefix}user WHERE deleted = 0 AND id <> {$USER->id} AND $conditions";  // Exclude oneself
+    $sql2= "SELECT u.*, p.summary FROM {$CFG->prefix}user AS u, {$CFG->prefix}post AS p WHERE $conditions2 AND u.deleted = 0 AND u.id=p.userid AND u.id <> {$USER->id}";
+    $spamusers_desc = get_recordset_sql($sql);
+    $spamusers_blog = get_recordset_sql($sql2);
+
+    $keywordlist = implode(', ', $keywords);
+    print_box(get_string('spamresult', 'report_spamcleaner').s($keywordlist)).' ...';
+
+    print_user_list(array($spamusers_desc, $spamusers_blog), $keywords);
+
+}
+
+function print_user_list($users_rs, $keywords) {
+    global $CFG, $SESSION;
+
+    // reset session everytime this function is called
+    $SESSION->users_result = array();
+    $count = 0;
+
+    foreach ($users_rs as $rs) {
+        while ($user = rs_fetch_next_record($rs)) {
+            if (!$count) {
+                echo '<table border="1" width="100%" id="data-grid"><tr><th>&nbsp;</th><th>'.get_string('user','admin').'</th><th>'.get_string('spamdesc', 'report_spamcleaner').'</th><th>'.get_string('spamoperation', 'report_spamcleaner').'</th></tr>';
+            }
+            $count++;
+            filter_user($user, $keywords, $count);
+        }
+    }
+
+    if (!$count) {
+        echo get_string('spamcannotfinduser', 'report_spamcleaner');
+
+    } else {
+        echo '</table>';
+        echo '<div class="mld-align">
+              <button id="removeall_btn">'.get_string('spamdeleteall', 'report_spamcleaner').'</button>
+              </div>';
+    }
+}
+function filter_user($user, $keywords, $count) {
+    global $CFG;
+    $image_search = false;
+    if (in_array('<img', $keywords)) {
+        $image_search = true;
+    }
+    if (isset($user->summary)) {
+        $user->description = '<h3>'.get_string('spamfromblog', 'report_spamcleaner').'</h3>'.$user->summary;
+        unset($user->summary);
+    }
+    if (preg_match('#<img.*src=[\"\']('.$CFG->pixpath.')#', $user->description, $matches)
+        && $image_search) {
+        $result = false;
+        foreach ($keywords as $keyword) {
+            if (preg_match('#'.$keyword.'#', $user->description)
+                && ($keyword != '<img')) {
+                $result = true;
+            }
+        }
+        if ($result) {
+            echo print_user_entry($user, $keywords, $count);
+        } else {
+            unset($user);
+        }
+    } else {
+        echo print_user_entry($user, $keywords, $count);
+    }
+}
+
+
+function print_user_entry($user, $keywords, $count) {
+
+    global $SESSION, $CFG;
+
+    $smalluserobject = new object;      // All we need to delete them later
+    $smalluserobject->id = $user->id;
+    $smalluserobject->email = $user->email;
+    $smalluserobject->auth = $user->auth;
+    $smalluserobject->firstname = $user->firstname;
+    $smalluserobject->lastname = $user->lastname;
+
+    if (empty($SESSION->users_result[$user->id])) {
+        $SESSION->users_result[$user->id] = $smalluserobject;
+        $html = '<tr valign="top" id="row-'.$user->id.'" class="result-row">';
+        $html .= '<td width="10">'.$count.'</td>';
+        $html .= '<td width="30%" align="left"><a href="'.$CFG->wwwroot."/user/view.php?course=1&amp;id=".$user->id.'" title="'.s($user->username).'">'.fullname($user).'</a>';
+
+        $html .= "<ul>";
+        $profile_set = array('city'=>true, 'country'=>true, 'email'=>true);
+        foreach ($profile_set as $key=>$value) {
+            if (isset($user->$key)){
+                $html .= '<li>'.$user->$key.'</li>';
+            }
+        }
+        $html .= "</ul>";
+        $html .= '</td>';
+
+        foreach ($keywords as $keyword) {
+            $user->description = highlight($keyword, $user->description);
+        }
+
+        $html .= '<td align="left">'.format_text($user->description, FORMAT_MOODLE).'</td>';
+        $html .= '<td width="100px" align="center">';
+        $html .= '<button onclick="del_user(this,'.$user->id.')">'.get_string('deleteuser', 'admin').'</button><br />';
+        $html .= '<button onclick="ignore_user(this,'.$user->id.')">'.get_string('ignore', 'admin').'</button>';
+        $html .= '</td>';
+        $html .= '</tr>';
+        return $html;
+    } else {
+        return null;
+    }
+
+
+}
+
+function print_spamcleaner_javascript()  {
+    global $CFG;
+
+$sesskey = sesskey();
+
+?>
+<script type="text/javascript" src="<?php echo $CFG->wwwroot;?>/lib/yui/yahoo-dom-event/yahoo-dom-event.js"></script>
+<script type="text/javascript" src="<?php echo $CFG->wwwroot;?>/lib/yui/connection/connection-min.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+var row = null;
+var delall_cb = {
+    success: function(o){
+        var resp = o.responseText;
+        if(resp){
+            window.location.href=window.location.href;
+        }
+    }
+}
+function init() {
+    YAHOO.util.Event.addListener("removeall_btn", "click", function(){
+        var yes = confirm('<?php echo get_string('spamdeleteallconfirm', 'report_spamcleaner');?>');
+        if(yes){
+            var cObj = YAHOO.util.Connect.asyncRequest('POST', '<?php echo me();?>?delall=yes&sesskey=<?php echo $sesskey;?>', delall_cb); 
+        }
+    });
+}
+var del_cb = {
+    success: function(o) {
+        var resp = o.responseText;
+        if(row) {
+            if(resp){
+                while(row.tagName != 'TR') {
+                    row = row.parentNode;
+                }
+                row.parentNode.removeChild(row);
+                row = null;
+            } else {
+                alert('<?php echo get_string('spamcannotdelete', 'report_spamcleaner');?>');
+            }
+        }
+    }
+}
+var ignore_cb = {
+    success: function(o){
+        var resp = o.responseText;
+        if(row) {
+            if(resp){
+                while(row.tagName != 'TR') {
+                    row = row.parentNode;
+                }
+                row.parentNode.removeChild(row);
+                row = null;
+            }
+        }
+    }
+}
+function del_user(obj, id) {
+    var yes = confirm('<?php echo get_string('spamdeleteconfirm', 'report_spamcleaner');?>');
+    if(yes){
+        row = obj;
+        var cObj = YAHOO.util.Connect.asyncRequest('POST', '<?php echo me();?>?del=yes&sesskey=<?php echo $sesskey;?>&id='+id, del_cb); 
+    }
+}
+function ignore_user(obj, id) {
+    row = obj;
+    var cObj = YAHOO.util.Connect.asyncRequest('POST', '<?php echo me();?>?ignore=yes&sesskey=<?php echo $sesskey;?>&id='+id, ignore_cb); 
+}
+window.onload = function(){
+    init();
+}
+//]]>
+</script>
+
+<?php 
+}
+
+admin_externalpage_print_footer($adminroot);
+
+?>

admin/report/spamcleaner/settings.php

@@ -0,0 +1,5 @@
+<?php
+
+// spam cleaner
+$ADMIN->add('reports', new admin_externalpage('reportspamcleaner', get_string('spamcleaner','report_spamcleaner'), "$CFG->wwwroot/$CFG->admin/report/spamcleaner/index.php", 'moodle/site:config'));
+

admin/settings/mnet.php

@@ -3,19 +3,19 @@
 // This file defines settingpages and externalpages under the "mnet" category
 
 $ADMIN->add('mnet', new admin_externalpage('net', get_string('settings', 'mnet'), 
-                                           $CFG->wwwroot . '/admin/mnet/index.php', 
+                                           "$CFG->wwwroot/$CFG->admin/mnet/index.php",
                                            'moodle/site:config'));
 
 $ADMIN->add('mnet', new admin_externalpage('mnetpeers', get_string('mnetpeers', 'mnet'), 
-                                           $CFG->wwwroot . '/admin/mnet/peers.php', 
+                                           "$CFG->wwwroot/$CFG->admin/mnet/peers.php",
                                            'moodle/site:config'));
 $ADMIN->add('mnet', new admin_externalpage('ssoaccesscontrol', get_string('ssoaccesscontrol', 'mnet'),
-                                           $CFG->wwwroot . '/admin/mnet/access_control.php', 
+                                           "$CFG->wwwroot/$CFG->admin/mnet/access_control.php",
                                            'moodle/site:config'));
 $ADMIN->add('mnet', new admin_externalpage('mnetenrol', get_string('mnetenrol', 'mnet'), 
-                                           $CFG->wwwroot . '/admin/mnet/enr_hosts.php', 
+                                           "$CFG->wwwroot/$CFG->admin/mnet/enr_hosts.php",
                                            'moodle/site:config'));
 $ADMIN->add('mnet', new admin_externalpage('trustedhosts', get_string('trustedhosts', 'mnet'), 
-                                           $CFG->wwwroot . '/admin/mnet/trustedhosts.php', 
+                                           "$CFG->wwwroot/$CFG->admin/mnet/trustedhosts.php",
                                            'moodle/site:config'));
 ?>

admin/settings/security.php

@@ -33,6 +33,8 @@ $temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', '
                                                                                                                                           1 => get_string('personalblogs','blog'),
                                                                                                                                           0 => get_string('disableblogs','blog'))));
 
+$temp->add(new admin_setting_configcheckbox('profilesforenrolledusersonly', get_string('profilesforenrolledusersonly','admin'),get_string('configprofilesforenrolledusersonly', 'admin'),'1'));
+
 $temp->add(new admin_setting_configcheckbox('cronclionly', get_string('cronclionly', 'admin'), get_string('configcronclionly', 'admin'), 0));
 $temp->add(new admin_setting_configtext('cronremotepassword', get_string('cronremotepassword', 'admin'), get_string('configcronremotepassword', 'admin'), '', PARAM_RAW));
 $temp->add(new admin_setting_configcheckbox('emailchangeconfirmation', get_string('emailchangeconfirmation', 'admin'), get_string('configemailchangeconfirmation', 'admin'), 1));

admin/xmldb/actions/edit_field/edit_field.class.php

@@ -84,7 +84,7 @@ class edit_field extends XMLDBAction {
     /// Fetch request data
         $tableparam = required_param('table', PARAM_CLEAN);
         if (!$table =& $structure->getTable($tableparam)) {
-            $this->errormsg = 'Wrong table specified: ' . $tableparm;
+            $this->errormsg = 'Wrong table specified: ' . $tableparam;
             return false;
         }
         $fieldparam = required_param('field', PARAM_CLEAN);

admin/xmldb/actions/edit_index/edit_index.class.php

@@ -84,7 +84,7 @@ class edit_index extends XMLDBAction {
     /// Fetch request data
         $tableparam = required_param('table', PARAM_CLEAN);
         if (!$table =& $structure->getTable($tableparam)) {
-            $this->errormsg = 'Wrong table specified: ' . $tableparm;
+            $this->errormsg = 'Wrong table specified: ' . $tableparam;
             return false;
         }
         $indexparam = required_param('index', PARAM_CLEAN);

admin/xmldb/actions/edit_key/edit_key.class.php

@@ -84,7 +84,7 @@ class edit_key extends XMLDBAction {
     /// Fetch request data
         $tableparam = required_param('table', PARAM_CLEAN);
         if (!$table =& $structure->getTable($tableparam)) {
-            $this->errormsg = 'Wrong table specified: ' . $tableparm;
+            $this->errormsg = 'Wrong table specified: ' . $tableparam;
             return false;
         }
         $keyparam = required_param('key', PARAM_CLEAN);

admin/xmldb/actions/view_table_sql/view_table_sql.class.php

@@ -80,7 +80,7 @@ class view_table_sql extends XMLDBAction {
     /// Get parameters
         $tableparam = required_param('table', PARAM_PATH);
         if (!$table =& $structure->getTable($tableparam)) {
-            $this->errormsg = 'Wrong table specified: ' . $tableparm;
+            $this->errormsg = 'Wrong table specified: ' . $tableparam;
             return false;
         }
         $generatorparam = optional_param('generator', null, PARAM_ALPHANUM);

auth/cas/auth.php

@@ -57,8 +57,8 @@ class auth_plugin_cas extends auth_plugin_base {
      * @return bool Authentication success or failure.
      */
     function user_login ($username, $password) {
-		$this->connectCAS();	
-        return phpCAS::isAuthenticated();
+		$this->connectCAS();
+        return phpCAS::isAuthenticated() && (phpCAS::getUser() == $username);
     }
     /**
      * Returns true if this authentication plugin is 'internal'.
@@ -97,7 +97,7 @@ class auth_plugin_cas extends auth_plugin_base {
           return;		  
         }
 
-		// Test si cas activé et paramêtres non remplis
+		// Test si cas activ� et param�tres non remplis
 	  if (empty($this->config->hostname)) {
 		  return;
 		  }
@@ -107,7 +107,7 @@ class auth_plugin_cas extends auth_plugin_base {
 // Connection to CAS server
 	 $this->connectCAS();
 
-	  // Gestion de la connection CAS si accès direct d'un ent ou autre	 
+	  // Gestion de la connection CAS si acc�s direct d'un ent ou autre	 
 	 if (phpCAS::checkAuthentication()) {
 		$frm->username=phpCAS::getUser();
 //		if (phpCAS::getUser()=='esup9992')
@@ -405,7 +405,7 @@ if ( !is_object($PHPCAS_CLIENT) ) {
                 $result[$key] = $ldapval;
             }
         }
-        @ldap_close($ldapconnection);
+        $this->ldap_close($ldapconnection);
         return $result;
     }
     /**
@@ -435,6 +435,16 @@ if ( !is_object($PHPCAS_CLIENT) ) {
      * @return connection result
      */
     function ldap_connect($binddn='',$bindpwd='') {
+        // Cache ldap connections (they are expensive to set up
+        // and can drain the TCP/IP ressources on the server if we 
+        // are syncing a lot of users (as we try to open a new connection
+        // to get the user details). This is the least invasive way
+        // to reuse existing connections without greater code surgery.
+        if(!empty($this->ldapconnection)) {
+            $this->ldapconns++;
+            return $this->ldapconnection;
+        }
+
         //Select bind password, With empty values use
         //ldap_bind_* variables or anonymous bind if ldap_bind_* are empty
         if ($binddn == '' and $bindpwd == '') {
@@ -469,6 +479,10 @@ if ( !is_object($PHPCAS_CLIENT) ) {
                 ldap_set_option($connresult, LDAP_OPT_DEREF, $this->config->opt_deref);
             }
             if ($bindresult) {
+                // Set the connection counter so we can call PHP's ldap_close()
+                // when we call $this->ldap_close() for the last 'open' connection.
+                $this->ldapconns = 1;  
+                $this->ldapconnection = $connresult;
                 return $connresult;
             }
             $debuginfo .= "<br/>Server: '$server' <br/> Connection: '$connresult'<br/> Bind result: '$bindresult'</br>";
@@ -477,6 +491,18 @@ if ( !is_object($PHPCAS_CLIENT) ) {
         print_error('auth_ldap_noconnect_all','auth',$this->config->user_type);
         return false;
     }
+    /**
+     * disconnects from a ldap server
+     *
+     */
+    function ldap_close() {
+        $this->ldapconns--;
+        if($this->ldapconns == 0) {
+            @ldap_close($this->ldapconnection);
+            unset($this->ldapconnection);
+        }
+    }
+
     /**
      * retuns user attribute mappings between moodle and ldap
      *
@@ -629,7 +655,7 @@ if ( !is_object($PHPCAS_CLIENT) ) {
         print "Connecting to ldap...\n";
         $ldapconnection = $this->ldap_connect();
         if (!$ldapconnection) {
-            @ldap_close($ldapconnection);
+            $this->ldap_close($ldapconnection);
             print get_string('auth_ldap_noconnect','auth',$this->config->host_url);
             exit;
         }
@@ -878,6 +904,7 @@ if ( !is_object($PHPCAS_CLIENT) ) {
         } else {
             print "No users to be added\n";
         }
+        $this->ldap_close();
         return true;
     }
     /**
@@ -1016,6 +1043,7 @@ if (!empty($this->config->attrcreators)) {
                 }
           }
         }
+        $this->ldap_close();
         return $result;
     }
    /**
@@ -1055,6 +1083,7 @@ if (!empty($this->config->attrcreators)) {
                 array_push($fresult, ($users[$i][$this->config->user_attribute][0]) );
             }
         }
+        $this->ldap_close();
         return $fresult;
     }
     /**

auth/fc/fcFPP.php

@@ -16,7 +16,8 @@
 /*                                                                      */
 /* This program is free software. You can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
-/* the Free Software Foundation; either version 2 of the License.       */
+/* the Free Software Foundation; either version 2 of the License or any */
+/* later version.                                                       */
 /************************************************************************/
 /* Author: Torsten Anderson, torsten.anderson@skeria.skelleftea.se
  */

auth/ldap/auth.php

@@ -109,19 +109,19 @@ class auth_plugin_ldap extends auth_plugin_base {
 
             //if ldap_user_dn is empty, user does not exist
             if (!$ldap_user_dn) {
-                ldap_close($ldapconnection);
+                $this->ldap_close();
                 return false;
             }
 
             // Try to bind with current username and password
             $ldap_login = @ldap_bind($ldapconnection, $ldap_user_dn, $extpassword);
-            ldap_close($ldapconnection);
+            $this->ldap_close();
             if ($ldap_login) {
                 return true;
             }
         }
         else {
-            @ldap_close($ldapconnection);
+            $this->ldap_close();
             print_error('auth_ldap_noconnect','auth','',$this->config->host_url);
         }
         return false;
@@ -195,7 +195,7 @@ class auth_plugin_ldap extends auth_plugin_base {
             }
         }
 
-        @ldap_close($ldapconnection);
+        $this->ldap_close();
         return $result;
     }
 
@@ -301,7 +301,7 @@ class auth_plugin_ldap extends auth_plugin_base {
                print_error('auth_ldap_unsupportedusertype','auth','',$this->config->user_type);
         }
         $uadd = ldap_add($ldapconnection, $this->config->user_attribute.'="'.$this->ldap_addslashes($userobject->username).','.$this->config->create_context.'"', $newuser);
-        ldap_close($ldapconnection);
+        $this->ldap_close();
         return $uadd;
 
     }
@@ -416,7 +416,7 @@ class auth_plugin_ldap extends auth_plugin_base {
         $ldapconnection = $this->ldap_connect();
 
         if (!$ldapconnection) {
-            @ldap_close($ldapconnection);
+            $this->ldap_close();
             print get_string('auth_ldap_noconnect','auth',$this->config->host_url);
             exit;
         }
@@ -671,6 +671,9 @@ class auth_plugin_ldap extends auth_plugin_base {
                 $user->confirmed  = 1;
                 $user->auth       = 'ldap';
                 $user->mnethostid = $CFG->mnet_localhost_id;
+                // get_userinfo_asobj() might have replaced $user->username with the value
+                // from the LDAP server (which can be mixed-case). Make sure it's lowercase
+                $user->username = trim(moodle_strtolower($user->username));
                 if (empty($user->lang)) {
                     $user->lang = $CFG->lang;
                 }
@@ -697,6 +700,7 @@ class auth_plugin_ldap extends auth_plugin_base {
         } else {
             print "No users to be added\n";
         }
+        $this->ldap_close();
         return true;
     }
 
@@ -791,7 +795,7 @@ class auth_plugin_ldap extends auth_plugin_base {
                 error ('auth: ldap user_activate() does not support selected usertype:"'.$this->config->user_type.'" (..yet)');
         }
         $result = ldap_modify($ldapconnection, $userdn, $newinfo);
-        ldap_close($ldapconnection);
+        $this->ldap_close();
         return $result;
     }
 
@@ -816,7 +820,7 @@ class auth_plugin_ldap extends auth_plugin_base {
                 error ('auth: ldap user_disable() does not support selected usertype (..yet)');
         }
         $result = ldap_modify($ldapconnection, $userdn, $newinfo);
-        ldap_close($ldapconnection);
+        $this->ldap_close();
         return $result;
     }*/
 
@@ -1001,11 +1005,11 @@ class auth_plugin_ldap extends auth_plugin_base {
             }
         } else {
             error_log("ERROR:No user found in LDAP");
-            @ldap_close($ldapconnection);
+            $this->ldap_close();
             return false;
         }
 
-        @ldap_close($ldapconnection);
+        $this->ldap_close();
 
         return true;
 
@@ -1129,7 +1133,7 @@ class auth_plugin_ldap extends auth_plugin_base {
 
         }
 
-        @ldap_close($ldapconnection);
+        $this->ldap_close();
         return $result;
     }
 
@@ -1362,6 +1366,16 @@ class auth_plugin_ldap extends auth_plugin_base {
      * @return connection result
      */
     function ldap_connect($binddn='',$bindpwd='') {
+        // Cache ldap connections (they are expensive to set up
+        // and can drain the TCP/IP ressources on the server if we 
+        // are syncing a lot of users (as we try to open a new connection
+        // to get the user details). This is the least invasive way
+        // to reuse existing connections without greater code surgery.
+        if(!empty($this->ldapconnection)) {
+            $this->ldapconns++;
+            return $this->ldapconnection;
+        }
+
         //Select bind password, With empty values use
         //ldap_bind_* variables or anonymous bind if ldap_bind_* are empty
         if ($binddn == '' and $bindpwd == '') {
@@ -1408,6 +1422,10 @@ class auth_plugin_ldap extends auth_plugin_base {
             }
 
             if ($bindresult) {
+		// Set the connection counter so we can call PHP's ldap_close()
+		// when we call $this->ldap_close() for the last 'open' connection.
+                $this->ldapconns = 1;  
+                $this->ldapconnection = $connresult;
                 return $connresult;
             }
 
@@ -1419,6 +1437,18 @@ class auth_plugin_ldap extends auth_plugin_base {
         return false;
     }
 
+    /**
+     * disconnects from a ldap server
+     *
+     */
+    function ldap_close() {
+        $this->ldapconns--;
+        if($this->ldapconns == 0) {
+            @ldap_close($this->ldapconnection);
+            unset($this->ldapconnection);
+        }
+    }
+
     /**
      * retuns dn of username
      *

auth/ldap/config.html

@@ -86,7 +86,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     <td align="right"><label for="menuversion"><?php print_string('auth_ldap_version_key','auth') ?></label></td>
     <td>
     <?php
-       $varsions = array();
+       $versions = array();
        $versions[2] = '2';
        $versions[3] = '3';
        choose_from_menu($versions, 'version', $config->version, '');

auth/mnet/auth.php

@@ -771,76 +771,76 @@ class auth_plugin_mnet extends auth_plugin_base {
                           join("\n", $mnet_request->error));
                 break;
             }
+            $mnethostlogssql = '
+            SELECT
+                mhostlogs.remoteid, mhostlogs.time, mhostlogs.userid, mhostlogs.ip,
+                mhostlogs.course, mhostlogs.module, mhostlogs.cmid, mhostlogs.action,
+                mhostlogs.url, mhostlogs.info, mhostlogs.username, c.fullname as coursename,
+                c.modinfo
+            FROM
+                (
+                    SELECT
+                        l.id as remoteid, l.time, l.userid, l.ip, l.course, l.module, l.cmid,
+                        l.action, l.url, l.info, u.username
+                    FROM
+                        ' . $CFG->prefix . 'user u
+                        INNER JOIN ' . $CFG->prefix . 'log l on l.userid = u.id
+                    WHERE
+                        u.mnethostid = ' . $mnethostid . '
+                        AND l.id > ' . $mnet_request->response['last log id'] . '
+                    ORDER BY remoteid ASC
+                    LIMIT 500
+                ) mhostlogs
+                INNER JOIN ' . $CFG->prefix . 'course c on c.id = mhostlogs.course
+            ORDER by mhostlogs.remoteid ASC';
 
-            $query = "SELECT
-                          l.id as remoteid,
-                          l.time,
-                          l.userid,
-                          l.ip,
-                          l.course,
-                          l.module,
-                          l.cmid,
-                          l.action,
-                          l.url,
-                          l.info,
-                          c.fullname as coursename,
-                          c.modinfo as modinfo,
-                          u.username
-                      FROM
-                          {$CFG->prefix}user u,
-                          {$CFG->prefix}log l,
-                          {$CFG->prefix}course c
-                      WHERE
-                          l.userid = u.id AND
-                          u.mnethostid = '$mnethostid' AND
-                          l.id > '".$mnet_request->response['last log id']."' AND
-                          c.id = l.course
-                      ORDER BY
-                          remoteid ASC";
+            $mnethostlogs = get_records_sql($mnethostlogssql);
 
-            $results = get_records_sql($query);
+            if ($mnethostlogs == false) {
+                continue;
+            }
 
-            if (false == $results) continue;
+            $processedlogs = array();
 
-            $param = array();
-
-            foreach($results as $result) {
-                if (!empty($result->modinfo) && !empty($result->cmid)) {
-                    $modinfo = unserialize($result->modinfo);
-                    unset($result->modinfo);
+            foreach($mnethostlogs as $hostlog) {
+                // Extract the name of the relevant module instance from the
+                // course modinfo if possible.
+                if (!empty($hostlog->modinfo) && !empty($hostlog->cmid)) {
+                    $modinfo = unserialize($hostlog->modinfo);
+                    unset($hostlog->modinfo);
                     $modulearray = array();
                     foreach($modinfo as $module) {
                         $modulearray[$module->cm] = urldecode($module->name);
                     }
-                    $result->resource_name = $modulearray[$result->cmid];
+                    $hostlog->resource_name = $modulearray[$hostlog->cmid];
                 } else {
-                    $result->resource_name = '';
+                    $hostlog->resource_name = '';
                 }
 
-                $param[] = array (
-                                    'remoteid'      => $result->remoteid,
-                                    'time'          => $result->time,
-                                    'userid'        => $result->userid,
-                                    'ip'            => $result->ip,
-                                    'course'        => $result->course,
-                                    'coursename'    => $result->coursename,
-                                    'module'        => $result->module,
-                                    'cmid'          => $result->cmid,
-                                    'action'        => $result->action,
-                                    'url'           => $result->url,
-                                    'info'          => $result->info,
-                                    'resource_name' => $result->resource_name,
-                                    'username'      => $result->username
+                $processedlogs[] = array (
+                                    'remoteid'      => $hostlog->remoteid,
+                                    'time'          => $hostlog->time,
+                                    'userid'        => $hostlog->userid,
+                                    'ip'            => $hostlog->ip,
+                                    'course'        => $hostlog->course,
+                                    'coursename'    => $hostlog->coursename,
+                                    'module'        => $hostlog->module,
+                                    'cmid'          => $hostlog->cmid,
+                                    'action'        => $hostlog->action,
+                                    'url'           => $hostlog->url,
+                                    'info'          => $hostlog->info,
+                                    'resource_name' => $hostlog->resource_name,
+                                    'username'      => $hostlog->username
                                  );
             }
 
-            unset($result);
+            unset($hostlog);
 
             $mnet_request = new mnet_xmlrpc_client();
             $mnet_request->set_method('auth/mnet/auth.php/refresh_log');
 
             // set $token and $useragent parameters
-            $mnet_request->add_param($param);
+            $mnet_request->add_param($processedlogs);
 
             if ($mnet_request->send($mnet_peer) === true) {
                 if ($mnet_request->response['code'] > 0) {
@@ -885,10 +885,12 @@ class auth_plugin_mnet extends auth_plugin_base {
 
             unset($logEntryObj->username);
 
+            $logEntryObj = $this->trim_logline($logEntryObj);
             $insertok = insert_record('mnet_log', addslashes_object($logEntryObj), false);
 
             if ($insertok) {
                 $MNET_REMOTE_CLIENT->last_log_id = $logEntryObj->remoteid;
+                $MNET_REMOTE_CLIENT->updateparams->last_log_id = $logEntryObj->remoteid;
             } else {
                 $returnString .= 'Record with id '.$logEntryObj->remoteid." failed to insert.\n";
             }
@@ -1351,6 +1353,25 @@ class auth_plugin_mnet extends auth_plugin_base {
         }
     }
 
+    /**
+     * Trims a log line from mnet peer to limit each part to a length which can be stored in our DB
+     *
+     * @param object $logline The log information to be trimmed
+     * @return object The passed logline object trimmed to not exceed storable limits
+     */
+    function trim_logline ($logline) {
+        $limits = array('ip' => 15, 'coursename' => 40, 'module' => 20, 'action' => 40,
+                        'url' => 255);
+        foreach ($limits as $property => $limit) {
+            if (isset($logline->$property)) {
+                $logline->$property = substr($logline->$property, 0, $limit);
+            }
+        }
+
+        return $logline;
+    }
+
+
 }
 
 ?>

auth/shibboleth/README.txt

@@ -170,6 +170,39 @@ Example file:
 ?>
 --
 
+
+How to upgrade your Service Provider to 2.x
+-------------------------------------------------------------------------------
+
+In case your upgrade your Service Provider 1.3.x to 2.x, be aware of the fact 
+that in version 2.0 the default behaviour regarding attribute propagation 
+changed.
+While the Service Provider 1.3.x published the Shibboleth attributes to the
+web server environment as HTTP Request headers, the Service Provider 2.x 
+publishes attributes as environment variables, which increases the security for
+some platforms.
+However, this change has the effect that the attribute names change.
+E.g. while the surname attribute was published as 'HTTP_SHIB_PERSON_SURNAME' 
+with 1.3.x, this attribute will be available in $_SERVER['Shib-Person-surname']
+or depending on your /etc/shibboleth/attribute-map.xml file just as 
+$_SERVER['sn'].
+Because Moodle needs to know what Shibboleth attributes it shall map onto which
+Moodle user profile field, one has to make sure the mapping is updated as well
+after the Service Provider upgrade.
+
+********************************************************************************
+Because you risk locking yourself out of Moodle it is strongly 
+recommended to use the following approach when upgrading the Service Provider:
+1. Enable manual authentication before the upgrade. 
+2. Make sure that you have at least one manual account with administration 
+   privileges working before upgrading your Service Provider to 2.x.
+3. After the SP upgrade, use this account to log into Moodle and adapt the 
+   attribute mapping in 'Site Administration -> Users -> Shibboleth' to reflect 
+   the changed attribute names.
+4. Test the login with a Shibboleth account
+5. If all is working, disable manual authentication again
+********************************************************************************
+
 --------------------------------------------------------------------------------
 In case of problems and questions with Shibboleth authentication, contact
 Lukas Haemmerle <haemmerle@switch.ch> or Markus Hagman <hagman@hytti.uku.fi>

auth/shibboleth/index.php

@@ -86,7 +86,7 @@
 
     // If we can find any (user independent) Shibboleth attributes but no user
     // attributes we probably didn't receive any user attributes
-    elseif (!empty($_SERVER['HTTP_SHIB_APPLICATION_ID'])) {
+    elseif (!empty($_SERVER['HTTP_SHIB_APPLICATION_ID'])  || !empty($_SERVER['Shib-Application-ID'])) {
         error(get_string( 'shib_no_attributes_error', 'auth' , '\''.$pluginconfig->user_attribute.'\', \''.$pluginconfig->field_map_firstname.'\', \''.$pluginconfig->field_map_lastname.'\' and \''.$pluginconfig->field_map_email.'\''));
     } else {
          error(get_string( 'shib_not_set_up_error', 'auth'));

backup/backup_scheduled.php

@@ -177,7 +177,7 @@ function schedule_backup_cron() {
         //Reference
         if ($count_error != 0 || $count_unfinished != 0) {
             $message .= "  ".get_string('backupfailed')."\n\n";
-            $dest_url = $CFG->wwwroot.'/admin/report/backups/index.php';
+            $dest_url = "$CFG->wwwroot/$CFG->admin/report/backups/index.php";
             $message .= "  ".get_string('backuptakealook','',$dest_url)."\n\n";
             //Set message priority
             $admin->priority = 1;

backup/restore_check.html

@@ -22,8 +22,8 @@
         $course_header->course_fullname =   stripslashes_safe($form1->fullname);   //"update_FullName";  
     /// Roll dates only if the backup course has a start date
     /// (some formats like main page, social..., haven't it and rolling dates
-    /// from 0 produces crazy dates. MDL-10125
-        if ($course_header->course_startdate) {
+    /// from 0 produces crazy dates. MDL-10125 and we have passed some custom startyear/month/day. MDL-12922
+        if ($course_header->course_startdate && !empty($form1->startyear)) {
             $form1->startdate = make_timestamp($form1->startyear, $form1->startmonth, $form1->startday);
             $currentcoursestartdate = $course_header->course_startdate;
             $coursestartdatedateoffset = $form1->startdate - $currentcoursestartdate;

backup/restore_form.html

@@ -254,6 +254,11 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
         }
         helpbutton("coursestartdate", get_string("startdate"));
         echo "</td></tr>";
+    } else {
+    /// If user cannot create course, prevent any change in startyear/month/day (so restore wont calculate any roll. MDL-12922
+        echo '<input type="hidden" name="startyear" value="0" />';
+        echo '<input type="hidden" name="startmonth" value="0" />';
+        echo '<input type="hidden" name="startday" value="0" />';
     }
     //Line
     echo "<tr><td colspan=\"4\"><hr /></td></tr>";
@@ -635,4 +640,4 @@ function restore_is_samerole($rolea, $roleb) {
     }
     return true;
 }
-?>
+?>

backup/restorelib.php

@@ -974,6 +974,11 @@
                     //Get section id when restoring in existing course
                     $rec = get_record("course_sections","course",$restore->course_id,
                                                         "section",$section->section);
+                    //If section exists, has empty summary and backup has some summary, use it. MDL-8848
+                    if ($rec && empty($rec->summary) && !empty($section->summary)) {
+                        $rec->summary = $section->summary;
+                        update_record("course_sections", $rec);
+                    }
                     //If that section doesn't exist, get section 0 (every mod will be
                     //asigned there
                     if(!$rec) {

blocks/admin/block_admin.php

@@ -164,10 +164,10 @@ class block_admin extends block_list {
 
         if (empty($course->metacourse) && ($course->id!==SITEID)) {
             if (has_capability('moodle/legacy:guest', $context, NULL, false)) {   // Are a guest now
-                $this->content->items[]='<a href="enrol.php?id='.$this->instance->pageid.'">'.get_string('enrolme', '', format_string($course->shortname)).'</a>';
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/enrol.php?id='.$this->instance->pageid.'">'.get_string('enrolme', '', format_string($course->shortname)).'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" class="icon" alt="" />';
             } else if (has_capability('moodle/role:unassignself', $context, NULL, false)) {  // Have some role
-                $this->content->items[]='<a href="unenrol.php?id='.$this->instance->pageid.'">'.get_string('unenrolme', '', format_string($course->shortname)).'</a>';
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/unenrol.php?id='.$this->instance->pageid.'">'.get_string('unenrolme', '', format_string($course->shortname)).'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" class="icon" alt="" />';
             }
         }

blocks/admin_tree/block_admin_tree.php

@@ -196,7 +196,7 @@ class block_admin_tree extends block_base {
             $searchcontent = isset($CFG->adminsearchquery) ? $CFG->adminsearchquery : '';
 
             $this->content->footer = '<div class="adminsearchform">'.
-                                     '<form action="'.$CFG->wwwroot.'/admin/search.php" method="get"><div>'.
+                                     '<form action="'.$CFG->wwwroot.'/'.$CFG->admin.'/search.php" method="get"><div>'.
                                      '<label for="query" class="accesshide">'.get_string('searchinsettings', 'admin').'</label>'.
                                      '<input type="text" name="query" id="query" size="8" value="'.s($searchcontent).'" />'.
                                      '<input type="submit" value="'.get_string('search').'" /></div>'.

blocks/html/block_html.php

@@ -12,7 +12,7 @@ class block_html extends block_base {
     }
 
     function specialization() {
-        $this->title = isset($this->config->title) ? $this->config->title : get_string('newhtmlblock', 'block_html');
+        $this->title = isset($this->config->title) ? format_string($this->config->title) : get_string('newhtmlblock', 'block_html');
     }
 
     function instance_allow_multiple() {
@@ -24,8 +24,13 @@ class block_html extends block_base {
             return $this->content;
         }
 
-        $filteropt = new stdClass;
-        $filteropt->noclean = true;
+        if (!empty($this->instance->pinned) or $this->instance->pagetype === 'course-view') {
+            // fancy html allowed only on course page and in pinned blocks for security reasons
+            $filteropt = new stdClass;
+            $filteropt->noclean = true;
+        } else {
+            $filteropt = null;
+        }
 
         $this->content = new stdClass;
         $this->content->text = isset($this->config->text) ? format_text($this->config->text, FORMAT_HTML, $filteropt) : '';

blocks/html/config_instance.html

@@ -1,4 +1,11 @@
-<?php $usehtmleditor = can_use_html_editor(); ?>
+<?php
+    $usehtmleditor = can_use_html_editor();
+
+    $text = isset($this->config->text) ? $this->config->text : '';
+    if (empty($this->instance->pinned) and $this->instance->pagetype !== 'course-view') {
+        $text = clean_text($text, FORMAT_HTML);
+    }
+?>
 <table cellpadding="9" cellspacing="0">
 <tr valign="top">
     <td align="right"><?php print_string('configtitle', 'block_html'); ?>:</td>
@@ -6,7 +13,7 @@
 </tr>
 <tr valign="top">
     <td align="right"><?php print_string('configcontent', 'block_html'); ?>:</td>
-    <td><?php print_textarea($usehtmleditor, 25, 50, 0, 0, 'text', isset($this->config->text)?$this->config->text:'') ?></td>
+    <td><?php print_textarea($usehtmleditor, 25, 50, 0, 0, 'text', $text) ?></td>
 </tr>
 <tr>
     <td colspan="3" align="center">

blog/lib.php

@@ -216,8 +216,8 @@
         echo '<div class="audience">'.$blogtype.'</div>';
 
         // Print whole message
-        echo format_text($template['body']);
-        
+        echo $template['body'];
+
         /// Print attachments
         echo $attachedimages;
     /// Links to tags

calendar/export_execute.php

@@ -11,12 +11,12 @@ $authtoken = required_param('authtoken', PARAM_ALPHANUM);
 //Fetch user information
 if (!$user = get_complete_user_data('username', $username)) {
    //No such user
-   die("No such user '$username'");
+    die('Invalid authentication');
 }
 
 //Check authentication token
 if ($authtoken != sha1($username . $user->password)) {
-    die('Invalid authentication token');
+    die('Invalid authentication');
 }
 
 $what = optional_param('preset_what', 'all', PARAM_ALPHA);

course/editsection.php

@@ -52,7 +52,7 @@
         $stredit      = get_string('edit', '', " $sectionname");
         $strsummaryof = get_string('summaryof', '', " $sectionname");
     } else {
-        $sectionname  = get_string("name$course->format");
+        $sectionname  = get_section_name($course->format);
         $stredit      = get_string('edit', '', " $sectionname $section->section");
         $strsummaryof = get_string('summaryof', '', " $sectionname $form->section");
     }

course/lib.php

@@ -244,24 +244,52 @@ function make_log_url($module, $url) {
         case 'message':
         case 'calendar':
         case 'blog':
-            return "/$module/$url";
+            if (strpos($url, '../') === 0) {
+                $url = ltrim($url, '.');
+            } else {
+                $url = "/course/$url";
+            }
             break;
         case 'mnet course':
-            return "/course/$url";
+            $url = "/course/$url";
             break;
         case 'upload':
-            return $url;
+            $url = $url;
             break;
         case 'library':
         case '':
-            return '/';
+            $url = '/';
             break;
         default:
-            return "/mod/$module/$url";
+            $url = "/mod/$module/$url";
             break;
     }
-}
 
+    //now let's sanitise urls - there might be some ugly nasties:-(
+    $parts = explode('?', $url);
+    $script = array_shift($parts);
+    if (strpos($script, 'http') === 0) {
+        $script = clean_param($script, PARAM_URL);
+    } else {
+        $script = clean_param($script, PARAM_PATH);
+    }
+
+    $query = '';
+    if ($parts) {
+        $query = implode('', $parts);
+        $query = str_replace('&', '&', $query); // both & and & are stored in db :-|
+        $parts = explode('&', $query);
+        $eq = urlencode('=');
+        foreach ($parts as $key=>$part) {
+            $part = urlencode(urldecode($part));
+            $part = str_replace($eq, '=', $part);
+            $parts[$key] = $part;
+        }
+        $query = '?'.implode('&', $parts);
+    }
+
+    return $script.$query;
+}
 
 function build_mnet_logs_array($hostid, $course, $user=0, $date=0, $order="l.time ASC", $limitfrom='', $limitnum='',
                    $modname="", $modid=0, $modaction="", $groupid=0) {
@@ -504,10 +532,6 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
         //Filter log->info
         $log->info = format_string($log->info);
 
-        $log->url  = strip_tags(urldecode($log->url));   // Some XSS protection
-        $log->info = strip_tags(urldecode($log->info));  // Some XSS protection
-        $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) {
             echo "<td class=\"cell c0\">\n";
@@ -615,10 +639,6 @@ function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC",
         //Filter log->info 
         $log->info = format_string($log->info);
 
-        $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
-
         echo '<tr class="r'.$row.'">';
         if ($course->id == SITEID) {
             echo "<td class=\"r$row c0\" >\n";
@@ -710,10 +730,7 @@ function print_log_csv($course, $user, $date, $order='l.time DESC', $modname,
 
         //Filter log->info
         $log->info = format_string($log->info);
-
-        $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
 
         $firstField = $courses[$log->course];
         $fullname = fullname($log, has_capability('moodle/site:viewfullnames', get_context_instance(CONTEXT_COURSE, $course->id)));
@@ -1378,14 +1395,15 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
                 }
 
                 if ($mod->modname == "label") {
+                    echo "<span class=\"";
                     if (!$mod->visible) {
-                        echo "<span class=\"dimmed_text\">";
+                        echo 'dimmed_text';
+                    } else {
+                        echo 'label';
                     }
+                    echo '">';
                     echo format_text($extra, FORMAT_HTML, $labelformatoptions);
-                    if (!$mod->visible) {
-                        echo "</span>";
-                    }
-
+                    echo "</span>"; 
                 } else { // Normal activity
 
                     //Accessibility: for files get description via icon.
@@ -2541,16 +2559,8 @@ function move_courses ($courseids, $categoryid) {
 
                     $course->category  = $categoryid;
                     $course->sortorder = $sortorder;
-                    $course->fullname = addslashes($course->fullname);
-                    $course->shortname = addslashes($course->shortname);
-                    $course->summary = addslashes($course->summary);
-                    $course->password = addslashes($course->password);
-                    $course->teacher = addslashes($course->teacher);
-                    $course->teachers = addslashes($course->teachers);
-                    $course->student = addslashes($course->student);
-                    $course->students = addslashes($course->students);
 
-                    if (!update_record('course', $course)) {
+                    if (!update_record('course', addslashes_recursive($course))) {
                         notify("An error occurred - course not moved!");
                     }
                     // parents changed (course category), do not delete child context relations

course/mod.php

@@ -587,7 +587,7 @@
         $form->mode         = "add";
         $form->sesskey      = !empty($USER->id) ? $USER->sesskey : '';
 
-        $sectionname    = get_string("name$course->format");
+        $sectionname    = get_section_name($course->format);
         $fullmodulename = get_string("modulename", $module->name);
 
         if ($form->section) {
@@ -636,7 +636,7 @@
             $form->type = $type;
         }
 
-        $sectionname    = get_string("name$course->format");
+        $sectionname    = get_section_name($course->format);
         $fullmodulename = get_string("modulename", $module->name);
 
         if ($form->section && $course->format != 'site') {

enrol/flatfile/enrol.php

@@ -238,7 +238,7 @@ function get_access_icons($course) {
    
                         if ($fields[1] == "student") {
 
-                            if ($teachers = get_users_by_capability($context, 'moodle/course:update', 'u.*,ra.hidden', 'sortorder ASC')) {
+                            if ($teachers = get_users_by_capability($context, 'moodle/course:update', 'u.*,ra.hidden', 'ra.sortorder ASC')) {
                                 foreach ($teachers as $u) {
                                     if (!$u->hidden || has_capability('moodle/role:viewhiddenassigns', $context)) {
                                         $teacher = $u;

filter/activitynames/filter.php

@@ -41,13 +41,15 @@
                     //Exclude labels and hidden items
                     if ($activity->mod != "label" && $activity->visible) {
                         $title = trim(strip_tags(urldecode($activity->name)));
+                        $currentname = trim(urldecode($activity->name));
+                        $entitisedname  = s($currentname);
                         /// Avoid empty or unlinkable activity names
                         if (!empty($title)) {
                             $title = str_replace('"', "'", $title);
                             $href_tag_begin = "<a class=\"autolink\" title=\"$title\" href=\"$CFG->wwwroot/mod/$activity->mod/view.php?id=$activity->cm\" $CFG->frametarget>";
-                            $currentname = urldecode($activity->name);
-                            if ($currentname = trim($currentname)) {
-                                $activitylist[] = new filterobject($currentname, $href_tag_begin, '</a>', false, true);
+                            $activitylist[] = new filterobject($currentname, $href_tag_begin, '</a>', false, true);
+                            if ($currentname != $entitisedname) { /// If name has some entity (&amp; &quot; &lt; &gt;) add that filter too. MDL-17545
+                                $activitylist[] = new filterobject($entitisedname, $href_tag_begin, '</a>', false, true);
                             }
                         }
                     }

filter/algebra/algebradebug.php

@@ -16,6 +16,8 @@
         }
     }
 
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
+
     $CFG->texfilterdir = "filter/tex";
     $CFG->algebrafilterdir = "filter/algebra";
     $CFG->algebraimagedir = "filter/algebra";
@@ -233,6 +235,7 @@ function tex2image($texexp, $md5, $return=false) {
         } 
         $commandpath = "";
         $cmd = "";
+        $texexp = tex_sanitize_formula($texexp);
         $texexp = escapeshellarg($texexp);
         switch (PHP_OS) {
             case "Linux":

filter/algebra/pix.php

@@ -19,6 +19,7 @@
     // disable moodle specific debug messages
     disable_debugging();
 
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
     require_once($CFG->libdir.'/filelib.php');
 
     $CFG->texfilterdir     = 'filter/tex';
@@ -54,6 +55,7 @@
             $texexp = str_replace('>','>',$texexp);
             $texexp = preg_replace('!\r\n?!',' ',$texexp);
             $texexp = '\Large ' . $texexp;
+            $texexp = tex_sanitize_formula($texexp);
             $texexp = escapeshellarg($texexp);
 
             if ((PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows")) {

filter/mediaplugin/flvplayer.README.txt

@@ -1,4 +1,4 @@
 The FLV player is by Jeroen Wijering - www.jeroenwijering.com 
-and included in Moodle by his permission under the GPL.
+and included in Moodle by his permission under the GNU GPL version 2 or later.
 
 Thanks, Jeroen!

filter/tex/latex.php

@@ -44,9 +44,11 @@
          * @return string the latex document
          */
         function construct_latex_document( $formula, $fontsize=12 ) {
-            // $fontsize don't affects to formula's size. $density can change size
-
             global $CFG;
+
+            $formula = tex_sanitize_formula($formula);
+
+            // $fontsize don't affects to formula's size. $density can change size
             $doc =  "\\documentclass[{$fontsize}pt]{article}\n"; 
             $doc .=  $CFG->filter_tex_latexpreamble;
             $doc .= "\\pagestyle{empty}\n";

filter/tex/lib.php

@@ -0,0 +1,40 @@
+<?php  //$Id$
+
+function tex_sanitize_formula($texexp) {
+    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain)
+    $tex_blacklist = array(
+        'include','command','loop','repeat','open','toks','output',
+        'input','catcode','name','^^',
+        '\def','\edef','\gdef','\xdef',
+        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
+        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
+        '\lowercase','\relax','\aftergroup',
+        '\afterassignment','\expandafter','\noexpand','\special',
+        '\let', '\futurelet','\else','\fi','\chardef','\makeatletter','\afterground',
+        '\noexpand','\line','\mathcode','\item','\section','\mbox','\declarerobustcommand'
+    );
+
+    return  str_ireplace($tex_blacklist, 'forbiddenkeyword', $texexp);
+}
+
+/**
+ * Purge all caches when settings changed.
+ */
+function filter_tex_updatedcallback($name) {
+    global $CFG;
+
+    if (file_exists("$CFG->dataroot/filter/tex")) {
+        remove_dir("$CFG->dataroot/filter/tex");
+    }
+    if (file_exists("$CFG->dataroot/filter/algebra")) {
+        remove_dir("$CFG->dataroot/filter/algebra");
+    }
+    if (file_exists("$CFG->dataroot/temp/latex")) {
+        remove_dir("$CFG->dataroot/temp/latex");
+    }
+
+    delete_records('cache_filters', 'filter', 'tex');
+    delete_records('cache_filters', 'filter', 'algebra');
+}
+
+?>

filter/tex/pix.php

@@ -20,8 +20,9 @@
     disable_debugging();
 
     require_once($CFG->libdir.'/filelib.php');
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
+    require_once($CFG->dirroot.'/filter/tex/latex.php');
     require_once('defaultsettings.php' );
-    require_once('latex.php');
 
     $CFG->texfilterdir = 'filter/tex';
     $CFG->teximagedir  = 'filter/tex';
@@ -69,6 +70,7 @@
                 $texexp = str_replace('>','>',$texexp);
                 $texexp = preg_replace('!\r\n?!',' ',$texexp);
                 $texexp = '\Large ' . $texexp;
+                $texexp = tex_sanitize_formula($texexp);
                 $texexp = escapeshellarg($texexp);
 
                 if ((PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows")) {

filter/tex/texdebug.php

@@ -1,12 +1,9 @@
-<?PHP // $Id$
+<?php // $Id$
       // This function fetches math. images from the data directory
       // If not, it obtains the corresponding TeX expression from the cache_tex db table
       // and uses mimeTeX to create the image file
 
-    $nomoodlecookie = true;     // Because it interferes with caching
-
     require_once("../../config.php");
-    require( 'latex.php' );
 
     if (empty($CFG->textfilters)) {
         error ('Filter not enabled!');
@@ -17,6 +14,9 @@
         }
     }
 
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
+    require_once($CFG->dirroot.'/filter/tex/latex.php');
+
     $CFG->texfilterdir = "filter/tex";
     $CFG->teximagedir = "filter/tex";
  
@@ -24,6 +24,9 @@
     $param->action = optional_param( 'action','',PARAM_ALPHA );
     $param->tex = optional_param( 'tex','' );
 
+    require_login();
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM), $USER->id); /// Required cap to run this. MDL-18552
+
     $query = urldecode($_SERVER['QUERY_STRING']);
     error_reporting(E_ALL);
     $output = '';
@@ -140,6 +143,7 @@
             }
             $commandpath = "";
             $cmd = "";
+            $texexp = tex_sanitize_formula($texexp);
             $texexp = escapeshellarg($texexp);
             switch (PHP_OS) {
                 case "Linux":

filter/tex/texed.php

@@ -6,6 +6,7 @@
     $nomoodlecookie = true;     // Because it interferes with caching
 
     require_once("../../config.php");
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
 
     if (empty($CFG->textfilters)) {
         error ('Filter not enabled!');
@@ -32,6 +33,7 @@
             make_upload_directory($CFG->teximagedir);
         }
         $pathname = "$CFG->dataroot/$CFG->teximagedir/$image";
+        $texexp = tex_sanitize_formula($texexp);
         $texexp = escapeshellarg($texexp);
 
         switch (PHP_OS) {

grade/lib.php

@@ -238,7 +238,7 @@ function grade_get_formatted_grades() {
                                 }
                                 $all_categories["$cur_category"]["$instance->name"]['grade_against'] = $all_categories["$cur_category"]["$instance->name"]['scaled_max'];
                                 if (!isset($all_categories["$cur_category"]['stats']['weight'])) {
-                                    $weight = grade_get_category_weight($course->id, $cur_category);        
+                                    $weight = grade_get_category_weight($course->id, addslashes($cur_category));
                                     $all_categories["$cur_category"]['stats']['weight'] = $weight->weight;
                                 }
         
@@ -248,7 +248,7 @@ function grade_get_formatted_grades() {
                                 $all_categories["$cur_category"]["$instance->name"]['modname'] = $modname->name;
         
                                 // get bonus points and drop the x lowest                            
-                                $drop = get_record('grade_category', 'courseid', $course->id, 'name', $cur_category);
+                                $drop = get_record('grade_category', 'courseid', $course->id, 'name', addslashes($cur_category));
                                 $all_categories["$cur_category"]['stats']['drop'] = $drop->drop_x_lowest;
                                 $all_categories["$cur_category"]['stats']['bonus_points'] = $drop->bonus_points;
                             }
@@ -2324,7 +2324,7 @@ function grade_set_grade_weights() {
             $submitted_category = optional_param($form_catname);    
             if (is_numeric($submitted_category)) {
                 // see if there is a weight if so see if it needs to be updated
-                $weight = grade_get_category_weight($course->id, $category->name);
+                $weight = grade_get_category_weight($course->id, addslashes($category->name));
                 if ($weight) {
                     if ($weight->weight != $submitted_category)
                     {                        

group/index.php

@@ -11,6 +11,7 @@
 require_once('../config.php');
 require_once('lib.php');
 require_once($CFG->libdir.'/moodlelib.php');
+ini_set('include_path', $CFG->libdir.'/pear'.PATH_SEPARATOR.ini_get('include_path'));
 require_once('HTML/AJAX/JSON.php');
 
 require_js('yui_yahoo');

index.php

@@ -103,7 +103,7 @@
                                             BLOCK_R_MAX_WIDTH);
 
     print_header($SITE->fullname, $SITE->fullname, 'home', '',
-                 '<meta name="description" content="'. s(strip_tags($SITE->summary)) .'" />',
+                 '<meta name="description" content="'. strip_tags(format_text($SITE->summary, FORMAT_HTML)) .'" />',
                  true, '', user_login_string($SITE).$langmenu);
 
 ?>

install.php

@@ -427,7 +427,8 @@ if ($INSTALL['stage'] == ENVIRONMENT) {
     $dbconnected = $db->Connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'],$INSTALL['dbname']);
     error_reporting(7);  // Show errors
     if ($dbconnected) {
-    /// Execute environment check, printing results
+    /// Execute environment check, not printing results
+        @remove_dir($INSTALL['dataroot'] . '/environment'); /// Always delete downloaded env. info to force use of the released one. MDL-9796
         if (!check_moodle_environment($INSTALL['release'], $environment_results, false)) {
              $nextstage = ENVIRONMENT;
         }
@@ -714,6 +715,8 @@ if ($nextstage == SAVE) {
 function form_table($nextstage = WELCOME, $formaction = "install.php") {
     global $INSTALL, $db;
 
+    $enablenext = true;
+
     /// Print the standard form if we aren't in the DOWNLOADLANG page
     /// because it has its own form.
     if ($nextstage != DOWNLOADLANG) {
@@ -748,12 +751,16 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
 
             /// Check that PHP is of a sufficient version
             print_compatibility_row(inst_check_php_version(), get_string('phpversion', 'install'), get_string('phpversionerror', 'install'), 'phpversionhelp');
+            $enablenext = $enablenext && inst_check_php_version();
             /// Check session auto start
             print_compatibility_row(!ini_get_bool('session.auto_start'), get_string('sessionautostart', 'install'), get_string('sessionautostarterror', 'install'), 'sessionautostarthelp');
+            $enablenext = $enablenext && !ini_get_bool('session.auto_start');
             /// Check magic quotes
             print_compatibility_row(!ini_get_bool('magic_quotes_runtime'), get_string('magicquotesruntime', 'install'), get_string('magicquotesruntimeerror', 'install'), 'magicquotesruntimehelp');
+            $enablenext = $enablenext && !ini_get_bool('magic_quotes_runtime');
             /// 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');
+            print_compatibility_row(!ini_get_bool('register_globals'), get_string('globalsquotes', 'install'), get_string('globalswarning', 'install'));
+            $enablenext = $enablenext && !ini_get_bool('register_globals');
             /// Check safe mode
             print_compatibility_row(!ini_get_bool('safe_mode'), get_string('safemode', 'install'), get_string('safemodeerror', 'install'), 'safemodehelp', true);
             /// Check file uploads
@@ -861,6 +868,7 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
                     error_reporting(7);  // Show errors
                     if ($dbconnected) {
                     /// Execute environment check, printing results
+                        @remove_dir($INSTALL['dataroot'] . '/environment'); /// Always delete downloaded env. info to force use of the released one. MDL-9796
                         check_moodle_environment($INSTALL['release'], $environment_results, true);
                     } else {
                     /// We never should reach this because DB has been tested before arriving here
@@ -925,9 +933,11 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
             <input type="hidden" name="stage" value="<?php echo $nextstage ?>" />
 <?php
     }
+
+    $disabled = $enablenext ? '' : 'disabled="disabled"';
 ?>
 
-            <?php echo ($nextstage < SAVE) ? "<input type=\"submit\" name=\"next\" value=\"".get_string('next')."  &raquo;\" style=\"float: ".fix_align_rtl("right")."\"/>\n" : "&nbsp;\n" ?>
+            <?php echo ($nextstage < SAVE) ? "<input $disabled type=\"submit\" name=\"next\" value=\"".get_string('next')."  &raquo;\" style=\"float: ".fix_align_rtl("right")."\"/>\n" : "&nbsp;\n" ?>
             <?php echo ($nextstage > WELCOME) ? "<input type=\"submit\" name=\"prev\" value=\"&laquo;  ".get_string('previous')."\" style=\"float: ".fix_align_rtl("left")."\"/>\n" : "&nbsp;\n" ?>
 
 <?php
@@ -971,7 +981,9 @@ function print_compatibility_row($success, $testtext, $errormessage, $helpfield=
         echo "</p></td>\n";
         echo "<td valign=\"top\">";
         echo "<p>$errormessage ";
-        install_helpbutton("install.php?help=$helpfield");
+        if ($helpfield !== '') {
+            install_helpbutton("install.php?help=$helpfield");
+        }
         echo "</p></td>\n";
     }
     echo "</tr>\n";

install/lang/af_utf8/installer.php

@@ -11,10 +11,8 @@
 
 $string['closewindow'] = 'Maak die venster toe';
 $string['continue'] = 'Gaan voort';
-$string['doyouagree'] = 'Het jy die voorwaardes gelees en verstaan jy dit?';
 $string['error'] = 'Fout';
 $string['help'] = 'Help';
-$string['invalidemail'] = 'Ongeldige email adres';
 $string['language'] = 'Taal';
 $string['name'] = 'Naam';
 $string['next'] = 'Volgende';

install/lang/ar_utf8/installer.php

@@ -12,7 +12,6 @@
 $string['admindirerror'] = 'مجلد الإدارة المحدد غير صحيح';
 $string['admindirname'] = 'مجلد الإدارة';
 $string['admindirsettinghead'] = 'أعداد دليل المدير';
-$string['availablelangs'] = 'حزم اللغة المتوفره';
 $string['bypassed'] = 'مرور';
 $string['cannotcreatelangdir'] = 'لم يتم أنشاء دليل اللغة';
 $string['cannotcreatetempdir'] = 'لم يتم أنشاء الدليل المؤقت';
@@ -24,13 +23,10 @@ $string['cannotsavezipfile'] = 'لم يتم حفظ الملف المضغوط';
 $string['cannotunzipfile'] = 'لم يتم فك الملف المضغوط';
 $string['caution'] = 'تحذير';
 $string['check'] = 'أختر';
-$string['chooselanguage'] = 'اختر اللغة';
 $string['chooselanguagehead'] = 'اختر اللغة';
 $string['closewindow'] = 'أغلق هذه النافذة';
-$string['compatibilitysettings'] = 'أفحص إعدادات الـ PHP';
 $string['compatibilitysettingshead'] = 'أفحص إعدادات الـ PHP';
 $string['configfilewritten'] = 'تم انشاء ملف config.php بنجاح';
-$string['configurationcomplete'] = 'تمت عملية الإعداد';
 $string['configurationcompletehead'] = 'تمت عملية الإعداد';
 $string['continue'] = 'استمر';
 $string['database'] = 'قاعدة بيانات';
@@ -39,14 +35,12 @@ $string['datarooterror'] = 'إعداد المعلومات غير صحيح';
 $string['dbconnectionerror'] = 'لم يتم التوصيل بقاعدة البيانات المحددة. تأكد من إعدادات قاعدة البيانات.';
 $string['dbcreationerror'] = 'خطاء في إنشاء قاعدة البيانات. لم يم انشاء قاعدة البيانات المسماه في الأعدادات المعطاه.';
 $string['dbhost'] = 'الخادم المضيف';
-$string['dbpass'] = 'كلمة مرور';
 $string['dbprefix'] = 'مقدمة الجداول';
 $string['dbtype'] = 'نوع';
 $string['dirroot'] = 'دليل مودل';
 $string['dirrooterror'] = 'إعدادّّّ\"المجلد\" غير صحيح. حاول إعادة الإعداد';
 $string['download'] = 'تنزيل';
 $string['downloadlanguagehead'] = 'تنزيل حزمة اللغة';
-$string['doyouagree'] = 'هل قمت بقراءة هذه الشروط واستيعابها؟';
 $string['environmenterrortodo'] = 'يجب عليك تصحيح كل المشاكل (الأخطاء) الموضحه أعلاه قبل الأستمرار في ثتبيت هذا الأصدار لموّدل';
 $string['environmenthead'] = 'يتم فحص البيئة';
 $string['environmentrecommendinstall'] = 'ينصح بتثبيته/تمكينه';
@@ -63,7 +57,6 @@ $string['help'] = 'مساعدة';
 $string['iconvrecommended'] = 'ينصح بشدة تثبيت مكتبة ICONV الاختيارية وذلك لتحسين أداء موقعك خصوصا لو كنت تستخدم لغات غير لاتينيه.';
 $string['info'] = 'معلومات';
 $string['installation'] = 'تثبيت';
-$string['invalidemail'] = 'عنوان البريد الإلكتروني غير صحيح';
 $string['language'] = 'اللغة';
 $string['magicquotesruntimeerror'] = 'هذا يجب ان يكون معطل';
 $string['mbstringrecommended'] = 'يفضل وبشدة تثبيت مكتبة (MBSTRING) الاختيارية وذلك لتسحين اداء الموقع وبذات لوكان موقعك يدعم لغات غير لاتينية.';

install/lang/be_utf8/installer.php

@@ -11,32 +11,23 @@
 
 $string['admindirerror'] = 'Абраны каталог адміністратара няслушны';
 $string['admindirname'] = 'Каталог адміністратара';
-$string['admindirsetting'] = 'Толькі некаторыя web-сайты выкарыстоўваюць /admin як спецыяльны адрас для доступу да панелі кіравання ці іншага. На жаль, ён канфліктуе з стандартным змяшчэннем старонак адміністравання Moodle. Вы можаце адрэдагаваць гэтую памылку, пераназваў папку admin ў вашай інсталяцыі і пазначыў яе імя тут. Напрыклад:
-<br /> <br /><b>moodleadmin</b><br /> <br />
-Будзе правільная настроўваць спасылкі на admin ў Moodle.';
 $string['caution'] = 'Папярэджанне';
-$string['chooselanguage'] = 'Выбярыце мову';
 $string['closewindow'] = 'Згарнуць вакно';
-$string['compatibilitysettings'] = 'Праверка настроек PHP...';
 $string['configfilenotwritten'] = 'Скрыпт ўстаноўкі не змог аўтаматычна стварыць файл config.php, які ўтрымлівае Вамі абраныя настроўкі, па прычыне, што нельга пісаць у папку з устаноўкай Moodle. Вы можаце ўручную скапіяваць наступны код ў файл з назвай config.php і змясць яго ў карнявую папку ўстаноўкі Moodle.';
 $string['configfilewritten'] = 'config.php быў паспяхова створаны';
-$string['configurationcomplete'] = 'Настройка завершаная';
 $string['continue'] = 'Працягнуць';
 $string['database'] = 'База Дадзеных';
 $string['dataroot'] = 'Каталог дадзеных';
 $string['dbhost'] = 'Хост сэрвера';
-$string['dbpass'] = 'Пароль';
 $string['dbprefix'] = 'Прэфікс табліцаў';
 $string['dbtype'] = 'Тып';
 $string['dirroot'] = 'Каталог Moodle';
 $string['download'] = 'Загрузіць';
-$string['doyouagree'] = 'Ці прачыталі Вы ўмовы?';
 $string['error'] = 'Памылка';
 $string['fail'] = 'Памылка';
 $string['gdversion'] = 'GD версія';
 $string['help'] = 'Дапамога';
 $string['installation'] = 'Ладаванне';
-$string['invalidemail'] = 'Няправільны фармат для e-mail';
 $string['language'] = 'Мова';
 $string['memorylimit'] = 'Мяжа памяці';
 $string['name'] = 'Назва';

install/lang/bg_utf8/installer.php

@@ -11,11 +11,9 @@
 
 $string['closewindow'] = 'Затваряне на прозореца';
 $string['continue'] = 'Напред';
-$string['doyouagree'] = 'Прочетохте ли и разбрахте ли условията?';
 $string['error'] = 'Грешка';
 $string['help'] = 'Помощ';
 $string['info'] = "Information";
-$string['invalidemail'] = 'Невалиден електронен адрес';
 $string['language'] = 'Език';
 $string['name'] = 'Име';
 $string['next'] = 'Напред';

install/lang/bn_utf8/installer.php

@@ -9,7 +9,6 @@
 /// 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'] = 'বাংলা';

install/lang/bs_utf8/installer.php

@@ -11,47 +11,22 @@
 
 $string['admindirerror'] = 'Određeni administratorski direktorij je nepravilan';
 $string['admindirname'] = 'Administratorski direktorij';
-$string['admindirsetting'] = 'Veoma nekoliko ili priližno nekoliko webhostova koristi administrator kao specijalni URL za Vaš pristup kontrolnoj ploči. Na nesreću ovo je konflikt sa standardnom lokacijom za Moodle administratorsku stranicu. Možete ovo fiksirati preimenovanjem administratorskog direktorija u Vašoj instalaciji, postavijajući ovdje novo ime. Na primjer: <br /> <br /><b>moodleadmin</b><br /> <br />
-Ovo će fiksirati administratorski link na Moodle.';
 $string['caution'] = 'Pažnja';
-$string['chooselanguage'] = 'Izaberite jezik';
 $string['closewindow'] = 'Zatvorite prozor';
-$string['compatibilitysettings'] = 'Provjerite Vaša PHP podešavanja ...';
 $string['configfilenotwritten'] = 'Instalacijska skripta nije u mogućnosti da automatski kreira config.php datoteku koja obuhvata Vaše izabrano podešavanje, vjerovatno zbog Moodle direktorija koji nije pisan. Možete ručno kopirati prateći kod u ime fajla config.php unutar osnovnog direktorija za Moodle.';
 $string['configfilewritten'] = 'config.php je bio uspješno kreiran';
-$string['configurationcomplete'] = 'Konfiguracija je kompletirana';
 $string['continue'] = 'Nastavak';
 $string['database'] = 'Baza podataka';
-$string['databasesettings'] = 'Sada Vam je potrebno da konfigurišete bazu podataka gdje će i većina Moodle podataka biti pohranjena. Ova baza podataka već mora biti kreirana i korisničko ime i lozinku kreirajte da je dostupno.<br />
-<br /> <br />
-<b>Tip:</b> mysql or postgres7<br />
-<b>Glavni:</b> eg lokalhost ili db.isp.com<br />
-<b>Ime:</b> ime baze podataka, eg moodle<br />
-<b>Korisnik:</b> Vaše korisničko ime baze podataka<br />
-<b>Lozinka:</b> your database password<br />
-<b>Tabelarni prefiks:</b> alternativni prefiks da koristi svim imenima tabela';
 $string['dataroot'] = 'Direktorij podataka';
 $string['datarooterror'] = '\'Directorij podataka\' koji ste naveli ne može biti pronađen ili kreiran.  Svaka korekcija puta ili pravljenja ručno tog direktorija.';
 $string['dbconnectionerror'] = 'Ne možemo se spojiti na bazu podataka koju ste naveli. Molimo Vas da provjerite svoja podešavanja baze podataka.';
 $string['dbcreationerror'] = 'Greška prilikom pravljenja baze podataka. Ne možete napraviti ime date baze podataka sa predviđenim podešavanjima';
 $string['dbhost'] = 'Glavni server';
-$string['dbpass'] = 'Lozinka';
 $string['dbprefix'] = 'Lista prefiksa';
 $string['dbtype'] = 'Tip';
-$string['directorysettings'] = '<p>Molim Vas potvrdite lokaciju ove Moodle instalacije.</p>
-
-<p><b>Web Adresa:</b>
-Navedite punu web adresu gdje će Moodle biti dostupan. Ako je Vaš web sajt dostupan preko više URLa tada izaberite što prirodniji jedan od onih koje će Vaši studenti koristiti. Ne uključujte prateću crticu.</p>
-
-<p><b>Moodle Directorij:</b>
-Navedite punu putanju direktorija za ovu instalaciju. Budite sigurni da je gornji/donji slučaj tačan.</p>
-
-<p><b>Directorij podataka:</b>
-Potrebno Vam je mjesto gdje Moodle možete spasiti učitavajući datoteke. Ovaj direktorij bi trebao biti čitljiv i pisan od web server korisnika (obično \'niko\' ili \'apache\'), ali to neće biti direktno pristupačno od weba.</p>';
 $string['dirroot'] = 'Direktorij Moodla';
 $string['dirrooterror'] = 'Podešavanje \'Direktorija Moodla\' izgleda je netačno - ne možemo tamo naći Moodle instalaciju. Niža vrijednost će biti ponovo dovedena na početni položaj.';
 $string['download'] = 'Preuzeti';
-$string['doyouagree'] = 'Da li ste pročitali i razumjeli ove uslove?';
 $string['error'] = 'Greška';
 $string['fail'] = 'Izostati';
 $string['fileuploads'] = 'Katalog za učitavanja datoteka';
@@ -72,7 +47,6 @@ $string['gdversionhelp'] = '<p>Vaš server neće izgledati isto imajući GD inst
 <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['invalidemail'] = 'Pogrešna elektronska adresa';
 $string['language'] = 'Jezik';
 $string['magicquotesruntime'] = 'Čari naznake vremenskog kretanja';
 $string['magicquotesruntimeerror'] = 'Ovo bi trebalo biti isključeno';

install/lang/ca_utf8/installer.php

@@ -9,25 +9,12 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
-$string['aborting'] = 'S\'està interrompent la instal·lació';
 $string['admindirerror'] = 'El directori d\'administració especificat és incorrecte';
 $string['admindirname'] = 'Directori d\'administració';
-$string['admindirsetting'] = 'Alguns servidors web utilitzen un URL especial /admin per accedir a un tauler de control o quelcom semblant. Malauradament aquesta és també la ubicació estàndard de les pàgines d\'administració de Moodle. Podeu arreglar aquest problema canviant el nom del directori d\'administració de Moodle en la vostra instal·lació i posant el nou nom aquí. Per exemple:<br /> <br /><b>moodleadmin</b><br /> <br />
-Això modificarà els enllaços d\'administració de Moodle.';
 $string['admindirsettinghead'] = 'S\'està configurant el directori d\'administració...';
 $string['admindirsettingsub'] = 'Alguns proveïdors d\'espai web utilitzen /admin com una adreça URL especial per accedir a un tauler de control o quelcom semblant. Malauradament això interfereix amb la ubicació estàndard de les pàgines d\'administració de Moodle. Podeu solucionar aquest problema canviant el nom del directori admin en la vostra instal·lació i introduint aquí el nou nom. Per exemple: <br /> <br /><b>moodleadmin</b><br /> <br />
 Això repararà tots els enllaços d\'administració de Moodle.';
-$string['adminemail'] = 'Correu electrònic:';
-$string['adminfirstname'] = 'Nom:';
-$string['admininfo'] = 'Dades de l\'administrador';
-$string['adminlastname'] = 'Cognoms:';
-$string['adminpassword'] = 'Contrasenya:';
-$string['adminusername'] = 'Nom d\'usuari/ària';
-$string['askcontinue'] = 'Continua (sí/no)';
-$string['availabledbtypes'] = 'Tipus de base de dades disponibles';
-$string['availablelangs'] = 'Llista d\'idiomes disponibles';
 $string['bypassed'] = 'S\'ha deixat de banda';
-$string['cannotconnecttodb'] = 'No es pot obrir la connexió amb la base de dades';
 $string['cannotcreatelangdir'] = 'No s\'ha pogut crear el directori d\'idiomes.';
 $string['cannotcreatetempdir'] = 'No s\'ha pogut crear el directori temporal';
 $string['cannotdownloadcomponents'] = 'No s\'han pogut baixar components';
@@ -38,38 +25,23 @@ $string['cannotsavezipfile'] = 'No s\'ha pogut desar el fitxer zip';
 $string['cannotunzipfile'] = 'No s\'ha pogut descomprimir el fitxer';
 $string['caution'] = 'Alerta';
 $string['check'] = 'Reviseu';
-$string['checkingphpsettings'] = 'S\'estan comprovant els paràmetres del PHP';
-$string['chooselanguage'] = 'Trieu un idioma';
 $string['chooselanguagehead'] = 'Trieu un idioma';
 $string['chooselanguagesub'] = 'Trieu un idioma NOMÉS per a la instal·lació. En una pantalla posterior podreu triar idiomes per al lloc i per als usuaris.';
 $string['closewindow'] = 'Tanca aquesta finestra';
-$string['compatibilitysettings'] = 'S\'estan comprovant els paràmetres del PHP...';
 $string['compatibilitysettingshead'] = 'S\'estan comprovant els paràmetres del PHP...';
 $string['compatibilitysettingssub'] = 'El vostre servidor hauria de passar totes aquestes proves per tal que Moodle funcioni correctament.';
 $string['componentisuptodate'] = 'El component està al dia';
-$string['configfilecreated'] = 'El fitxer de configuració s\'ha creat correctament';
-$string['configfiledoesnotexist'] = 'El fitxer de configuració no existeix';
 $string['configfilenotwritten'] = 'La seqüència d\'instal·lació no ha estat capaç de crear automàticament un fitxer config.php que contingui els paràmetres que heu triat, probablement perquè no pugui escriure al directori de Moodle. Podeu copiar a mà el codi següent en un fitxer anomenat config.php dins del directori arrel de Moodle.';
 $string['configfilewritten'] = 'S\'ha creat correctament el fitxer config.php';
-$string['configurationcomplete'] = 'S\'ha completat la configuració';
 $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['configurationfileexist'] = 'Ja existeix un fitxer de configuració';
 $string['continue'] = 'Continua';
-$string['creatingconfigfile'] = 'S\'està  creant el fitxer de configuració...';
 $string['ctyperecommended'] = 'Es recomana instal·lar l\'extensió de PHP ctype a fi de millorar el rendiment del lloc, especialment si teniu usuaris que treballen amb idiomes no occidentals.';
 $string['ctyperequired'] = 'A hores d\'ara Moodle requereix l\'extensió de PHP ctype, a fi de millorar el rendiment del lloc i oferir compatibilitat amb diferents idiomes.';
 $string['curlrecommended'] = 'Es recomana instal·lar la biblioteca opcional Curl a fi d\'habilitar la funcionalitat de Moodle en Xarxa.';
-$string['curlrequired'] = 'L\'extensió de PHP cURL és ara necessària per a comunicar-se amb repositoris Moodle.';
+$string['curlrequired'] = 'L\'extensió de PHP cURL és ara necessària per a comunicar-se amb repositoris Moodle.'; // ORPHANED
 $string['customcheck'] = 'Altres comprovacions';
 $string['database'] = 'Base de dades';
-$string['databasecreationsettings'] = 'Ara cal configurar els paràmetres de la base de dades on s\'emmagatzemara la majoria de dades de Moodle. L\'instal·lador Moodle4Windows crearà automàticament aquesta base de dades amb els paràmetres que especifiqueu aquí.<br /><br /><br />
-<b>Tipus:</b> mysql (determinat per l\'instal·lador).<br />
-<b>Servidor:</b> localhost (determinat per l\'instal·lador.<br />
-<b>Nom:</b> nom de la base de dades, p. ex. moodle.<br />
-<b>Usuari:</b> root (determinat per l\'instal·lador).<br />
-<b>Contrasenya</b>: la vostra contrasenya per a la base de dades.<br />
-<b>Prefix de les taules:</b>: prefix opcional per als noms de les taules.';
 $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 />
 <b>Servidor:</b> fixat a \"localhost\" per l\'instal·lador<br />
@@ -77,18 +49,6 @@ $string['databasecreationsettingssub'] = '<b>Tipus:</b> fixat a \"mysql\" per l\
 <b>Usuari:</b> fixat a \"root\" per l\'instal·lador<br />
 <b>Contrasenya:</b> la contrasenya de l\'usuari \"root\" de la base de dades<br />
 <b>Prefix de les taules:</b> prefix opcional per utilitzar en els noms de totes les taules';
-$string['databasehost'] = 'Servidor de base de dades:';
-$string['databasename'] = 'Nom de la base de dades:';
-$string['databasepass'] = 'Contrasenya de la base de dades:';
-$string['databasesettings'] = 'Ara cal configurar la base de dades on s\'emmagatzemaran la majoria de dades de Moodle. Aquesta base de dades s\'ha d\'haver creat abans i cal tenir un nom d\'usuari i una contrasenya per accedir-hi.<br />
-<br /> <br />
-<b>Tipus:</b> mysql o postgres7<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> 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['databasesettingsformoodle'] = 'Paràmetres de la base de dades de Moodle';
 $string['databasesettingshead'] = 'Ara cal configurar la base de dades on s\'emmagatzemaran la majoria de dades de Moodle. Aquesta base de dades s\'ha d\'haver creat abans i cal tenir un nom d\'usuari i una contrasenya per accedir-hi.';
 $string['databasesettingssub'] = '<b>Tipus:</b> mysql o postgres7<br />
 <b>Servidor:</b> p. ex. localhost o db.isp.com<br />
@@ -138,38 +98,19 @@ $string['databasesettingssub_postgres7'] = '<b>Tipus:</b> PostgreSQL<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_sqlite3_pdo'] = '<b>Tipus:</b> SQLite 3 (PDO) <b><strong class=\"errormsg\">Experimental! (no l\'utilitzeu en producció)</strong></b><br />
-<b>Servidor:</b> camí (complet) del directori on es desarà el fitxer de la base de dades; en blanc o localhost per utilitzar el directori de dades de Moodle<br />
-<b>Nom:</b> nom de la base de dades, p. ex. moodle (opcional)<br />
-<b>Usuari:</b> el vostre nom d\'usuari de la base de dades (opcional)<br />
-<b>Contrasenya:</b> la vostra contrasenya de la base de dades (opcional)<br />
-<b>Prefix de les taules:</b> prefix que cal anteposar als noms de totes les taules (obligatori)<br />
-El nom del fitxer de la base de dades es determinarà mitjançant el nom d\'usuari, el nom de la base de dades i la contrasenya que definiu més amunt.';
 $string['databasesettingswillbecreated'] = '<strong>Nota</strong >: l\'instal·lador intentarà crear automàticament la base de dades si no existeix.';
-$string['databasetype'] = 'Tipus de base de dades:';
-$string['databaseuser'] = 'Usuari de la base de dades:';
 $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['datarootpublicerror'] = 'El directori de dades que heu especificat és accessible directament per web. Utilitzeu una altra ubicació.';
 $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.';
 $string['dbcreationerror'] = 'Error en la creació de la base de dades. No s\'ha pogut crear la base de dades amb els paràmetres proporcionats.';
 $string['dbhost'] = 'Ordinador servidor';
-$string['dbpass'] = 'Contrasenya';
 $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['directorysettings'] = '<p>Confirmeu les ubicacions d\'aquesta instal·lació de Moodle.</p>
-
-<p><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>
-
-<p><b>Directori de Moodle:</b>
-Especifiqueu el camí complet del directori d\'aquesta instal·lació. Assegureu-vos que les majúscules/minúscules són correctes.</p>
-
-<p><b>Directori de dades:</b>
-Necessiteu un lloc on Moodle pugui desar els fitxers que es pengin. L\'usuari del servidor web (generalment \'nobody\' o \'apache\') ha de tenir permisos de lectura i d\'ESCRIPTURA en aquest directori, però no hauria de ser accessible directament per web.</p>';
 $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>
@@ -181,16 +122,12 @@ Especifiqueu el camí complet del directori d\'aquesta instal·lació. Assegureu
 Necessiteu un lloc on Moodle pugui desar els fitxers que es pengin. L\'usuari del servidor web (generalment \'nobody\' o \'apache\') ha de tenir permisos de lectura i d\'ESCRIPTURA en aquest directori, però no hauria de ser accessible directament via web.</p>';
 $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['disagreelicense'] = 'No es pot continuar l\'actualització sense acceptar la GPL.';
 $string['download'] = 'Baixa';
 $string['downloadedfilecheckfailed'] = 'Ha fallat la comprovació del fitxer baixat.';
 $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['downloadlanguagepack'] = 'Voleu baixar ara el paquet d\'idioma (sí/no)?';
 $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.)';
-$string['downloadsuccess'] = 'El paquet d\'idioma s\'ha baixat correctament';
-$string['doyouagree'] = 'Esteu d\'acord (sí/no)?';
 $string['environmenterrortodo'] = 'Abans d\'instal·lar aquesta versió de Moodle heu de resoldre tots els problemes d\'entorn (errors) que s\'han trobat.';
 $string['environmenthead'] = 'S\'està comprovant el vostre entorn';
 $string['environmentrecommendcustomcheck'] = 'si aquesta prova falla, això indica un problema en potència';
@@ -202,7 +139,6 @@ $string['environmentrequireversion'] = 'esteu executant la versió $a->current i
 $string['environmentsub'] = 'S\'està comprovant si els diferents components del vostre sistema satisfan els requeriments';
 $string['environmentxmlerror'] = 'S\'ha produït un error en llegir les dades de l\'entorn ($a->error_code)';
 $string['error'] = 'Error';
-$string['errorsinenvironment'] = 'Hi ha errors en l\'entorn.';
 $string['fail'] = 'Error';
 $string['fileuploads'] = 'Càrrega de fitxers';
 $string['fileuploadserror'] = 'Hauria d\'estar habilitada';
@@ -234,29 +170,11 @@ $string['globalswarning'] = '<p><strong>Avís de seguretat</strong>: per a opera
 $string['help'] = 'Ajuda';
 $string['iconvrecommended'] = 'És sumament recomanable instal·lar la biblioteca opcional ICONV a fi de millorar el rendiment del lloc, especialment si el vostre lloc utilitza llengües no romàniques.';
 $string['info'] = 'Informació';
-$string['inputdatadirectory'] = 'Directori de dades:';
-$string['inputwebadress'] = 'Adreça web:';
-$string['inputwebdirectory'] = 'Directori de Moodle';
 $string['installation'] = 'Instal·lació';
-$string['installationiscomplete'] = 'S\'ha completat la instal·lació';
-$string['invalidargumenthelp'] = 'Error: els arguments no són vàlids.
-Ús: $php cliupgrade.php OPCIONS
-Utilitzeu l\'opció --help per a més informació';
-$string['invalidemail'] = 'L\'adreça de correu no és vàlida';
-$string['invalidhost'] = 'El servidor no és vàlid';
-$string['invalidint'] = 'Error: el valor no és un enter';
-$string['invalidintrange'] = 'Error: el valor és fora dels límits';
 $string['invalidmd5'] = 'El md5 no és vàlid';
-$string['invalidpath'] = 'El camí no és vàlid';
-$string['invalidsetelement'] = 'Error: el valor que heu proporcionat no coincideix amb cap de les opcions permeses';
-$string['invalidtextvalue'] = 'El text no és vàlid';
-$string['invalidurl'] = 'L\'URL no és vàlid';
-$string['invalidvalueforlanguage'] = 'El valor no és vàlid per a l\'opció --lang. Utilitzeu --help per a més informació';
-$string['invalidyesno'] = 'Error: el valor no és un argument vàlid sí/no.';
 $string['langdownloaderror'] = 'Dissortadament l\'idioma \"$a\" no està instal·lat. La instal·lació prosseguirà en anglès.';
 $string['langdownloadok'] = 'L\'dioma \"$a\" s\'ha instal·lat amb èxit. La instal·lació prosseguirà en aquest idioma.';
 $string['language'] = 'Idioma';
-$string['locationanddirectories'] = 'Ubicació i directoris';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Hauria d\'estar desactivat';
 $string['magicquotesruntimehelp'] = '<p>Aquest paràmetre hauria d\'estar desactivat per tal que Moodle funcioni correctament.</p>
@@ -284,8 +202,8 @@ $string['memorylimithelp'] = '<p>El límit de memòria del PHP del vostre servid
 $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['mssql_n'] = 'SQL*Server amb UTF-8 (mssql_n)';
 $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.';
@@ -296,28 +214,24 @@ $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['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $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['php52versionerror'] = 'La versió de PHP ha de ser 5.2.0 o superior';
-$string['php52versionhelp'] = '<p>Moodle requereix una versió de PHP 5.2.0 o superior.</p>
-<p>A hores d\'ara esteu utilitzant la versió $a.</p>
-<p>Heu d\'actualitzar el PHP o canviar de servidor.</p>';
 $string['phpversion'] = 'Versió PHP';
-$string['phpversionerror'] = 'La versió del PHP ha de ser com a mínim la 4.1.0'; // ORPHANED
+$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['postgresqlwarning'] = '<strong>Nota:</strong> Si experimenteu problemes de connexió, podeu provar a deixar en blanc els camps de base de dades, usuari i contrasenya i definir el camp de servidor així: host=\'postgresql_host\' port=\'5432\' dbname=\'postgresql_database_name\' user=\'postgresql_user\' password=\'postgresql_user_password\'. Més informació en <a href=\"http://docs.moodle.org/en/Installing_Postgres_for_PHP\">Moodle Docs</a>';
 $string['previous'] = 'Anterior';
 $string['qtyperqpwillberemoved'] = 'Durant l\'actualització, el tipus de pregunta RPQ se suprimirà. No estàveu utilitzant aquest tipus de pregunta, de manera que no hauríeu d\'experimentar cap problema.';
 $string['qtyperqpwillberemovedanyway'] = 'Durant l\'actualització, el tipus de pregunta RPQ se suprimirà. Teniu algunes preguntes RQP en la base de dades que deixaran de funcionar si no reinstal·leu el codi de http://moodle.org/mod/data/view.php?d=13&amp;rid=797 abans de prosseguir l\'actualització.';
-$string['releasenoteslink'] = 'Per a més informació sobre aquesta versió de Moodle, consulteu les Notes de llançament en $a';
 $string['remotedownloaderror'] = 'No s\'ha pogut baixar el component al vostre servidor. Verifiqueu els paràmetres de servidor intermediari. Es recomana l\'extensió cURL.<br /><br />Haureu de baixar manualment el fitxer <a href=\"$a->url\">$a->url</a>, copiar-lo a la ubicació \"$a->dest\" del vostre servidor i descomprimir-lo allí.';
 $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';
@@ -329,74 +243,20 @@ $string['safemodehelp'] = '<p>Moodle pot tenir diversos problemes amb el mode se
 <p>Normalment el mode segur només està habilitat en servidors webs públics una mica paranoics, de manera que és probable que hàgiu de buscar un altre servei d\'allotjament per al vostre Moodle.</p>
 
 <p>Podeu continuar la instal·lació si voleu, però trobareu problemes de funcionament més endavant.</p>';
-$string['selectlanguage'] = 'Selecció d\'idioma per a la instal·lació';
 $string['serverchecks'] = 'Proves del servidor';
 $string['sessionautostart'] = 'Autoinici de sessió';
 $string['sessionautostarterror'] = 'Hauria d\'estar desactivat';
 $string['sessionautostarthelp'] = '<p>Moodle necessita suport per a sessions i no funcionarà sense.</p>
 
 <p>Les sessions es poden habilitar en el fitxer php.ini. Comproveu el paràmetre session.auto_start.</p>';
-$string['sitefullname'] = 'Nom complet del lloc';
-$string['siteinfo'] = 'Detalls del lloc';
-$string['sitenewsitems'] = 'Titulars de notícies:';
-$string['siteshortname'] = 'Nom curt del lloc:';
-$string['sitesummary'] = 'Resum del lloc:';
 $string['skipdbencodingtest'] = 'Omet la prova de codificació de la base de dades';
-$string['sqlite3_pdo'] = 'SQLite 3 (PDO) <b><strong class=\"errormsg\">Experimental! (no l\'utilitzeu en producció)</strong></b>';
-$string['sqliteextensionisnotpresentinphp'] = 'El PHP no ha estat configurat correctament amb l\'extensió SQLite. Reviseu el fitxer php.ini o torneu a compilar el PHP.';
 $string['status'] = 'Estat';
-$string['tableprefix'] = 'Prefix de taules:';
 $string['thischarset'] = 'UTF-8';
 $string['thisdirection'] = 'ltr';
 $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['upgradingactivitymodule'] = 'S\'està actualitzant el mòdul d\'activitat';
-$string['upgradingbackupdb'] = 'S\'està actualitzant la base de dades de còpies de seguretat';
-$string['upgradingblocksdb'] = 'S\'està actualitzant la base de dades de blocs';
-$string['upgradingblocksplugin'] = 'S\'està actualitzant el connector de blocs';
-$string['upgradingcompleted'] = 'S\'ha completat l\'actualització...';
-$string['upgradingcourseformatplugin'] = 'S\'està actualitzant el connector de format de curs';
-$string['upgradingenrolplugin'] = 'S\'està actualitzant el connector d\'inscripcions';
-$string['upgradinggradeexportplugin'] = 'S\'està actualitzant el connector d\'exportació de qualificacions';
-$string['upgradinggradeimportplugin'] = 'S\'està actualitzant el connector d\'importació de qualificacions';
-$string['upgradinggradereportplugin'] = 'S\'està actualitzant el connector d\'informes de qualificacions';
-$string['upgradinglocaldb'] = 'S\'està actualitzant la base de dades local';
-$string['upgradingmessageoutputpluggin'] = 'S\'està actualitzant el connector de sortida de missatges';
-$string['upgradingqtypeplugin'] = 'S\'està actualitzant el connector de tipus de preguntes';
-$string['upgradingrpcfunctions'] = 'S\'estan actualitzant les funcions RPC';
-$string['usagehelp'] = 'Sinopsi:
-$php cliupgrade.php OPCIONS
-
-OPCIONS
---lang Idioma vàlid instal·lat per a la instal·lació. Per defecte anglès (en)
---webaddr Adreça web per al lloc Moodle
---moodledir Ubicació del directori web de moodle
---datadir Ubicació del directori de dades de moodle (no hauria de ser visible per web)
---dbtype Tipus de base de dades. Per defecte mysql
---dbhost Servidor de la base de dade. Per defecte localhost
---dbname Nom de la base de dades. Per defecte moodle
---dbuser Usuari d\'accés a la base de dades. Per defecte en blanc
---dbpass Contrasenya d\'accés a la base de dades. Per defecte en blanc
---prefix Prefix de les taules de la base de dades. Per defecte mdl
---verbose 0 sense sortida, 1 sortida resumida (per defecte), 2 sortida detallada
---interactivelevel 0 no interactiu, 1 semiinteractiu (per defecte), 2 interactiu
---agreelicense Yes (per defecte) o No
---confirmrelease Yes (per defecte) o No
---sitefullname Nom complet del lloc. Per defecte: Moodle Site (canvieu-lo!)
---siteshortname Nom curt del lloc. Per defecte: moodle
---sitesummary Resum del lloc. Per defecte en blanc
---adminfirstname Nom de l\'administrador/a. Per defecte Admin
---adminlastname Cognom de l\'administrador/a. Per defecte User
---adminusername Nom d\'usuari/ària de l\'administrador/a. Per defecte admin
---adminpassword Contrasenya de l\'administrador/a. Per defecte admin
---adminemail Correu electrònic de l\'administrador/a. Per defecte root@localhost
---help mostra aquesta ajuda
-
-Ús:
-$php cliupgrade.php --lang=en --webaddr=http://www.example.com --moodledir=/var/www/html/moodle --datadir=/var/moodledata --dbtype=mysql --dbhost=localhost --dbname=moodle --dbuser=root --prefix=mdl --agreelicense=yes --confirmrelease=yes --sitefullname=\"Lloc Moodle de mostra\" --siteshortname=moodle --sitesummary=siteforme --adminfirstname=Admin --adminlastname=User --adminusername=admin --adminpassword=admin --adminemail=admin@example.com --verbose=1 --interactivelevel=2';
 $string['user'] = 'Usuari';
-$string['versionerror'] = 'L\'usuari ha interromput per un error de versió';
 $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!';
 $string['welcomep30'] = 'Aquesta versió de <strong>$a->installername</strong> inclou les aplicacions necessàries per crear un entorn en el qual funcioni <strong>Moodle</strong>:';
@@ -406,13 +266,10 @@ $string['welcomep50'] = 'L\'ús de totes les aplicacions d\'aquest paquet és go
 sota llicència <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>.';
 $string['welcomep60'] = 'Les pàgines següents us guiaran per una sèrie de passos fàcils de seguir per configurar <strong>Moodle</strong> en el vostre ordinador. Podeu acceptar els paràmetres per defecte o, opcionalment, modificar-los perquè s\'ajustin a les vostres necessitats.';
 $string['welcomep70'] = 'Feu clic en el botó \"Següent\" per continuar la configuració de <strong>Moodle</strong>.';
-$string['welcometext'] = '--- Benvinguts a l\'instal·lador de línia d\'ordres de Moodle ---';
-$string['writetoconfigfilefaild'] = 'Error: no s\'ha pogut escriure el fitxer de configuració';
 $string['wrongdestpath'] = 'El camí de destinació és erroni';
 $string['wrongsourcebase'] = 'L\'adreça (URL) base de la font és errònia';
 $string['wrongzipfilename'] = 'El nom del fitxer ZIP és erroni';
 $string['wwwroot'] = 'Adreça web';
 $string['wwwrooterror'] = 'L\'adreça web no sembla vàlida. La instal·lació de Moodle no sembla que sigui en aquesta ubicació,';
 $string['xmlrpcrecommended'] = 'Instal·lar l\'extensió opcional xmlrpc és útil per a la funcionalitat de Moodle en Xarxa.';
-$string['yourchoice'] = 'La vostra elecció:';
 ?>

install/lang/cs_utf8/installer.php

@@ -11,12 +11,9 @@
 
 $string['admindirerror'] = 'Adresář pro správu (admin) není zadán správně.';
 $string['admindirname'] = 'Adresář pro správu (admin)';
-$string['admindirsetting'] = 'Na některých serverech je URL adresa /admin vyhrazena pro speciální účely (např. pro ovládací panel). Na takových serverech může dojít ke kolizi se standardním umístěním stránek pro správu Moodlu. Máte-li tento problém, přejmenujte adresář \'admin\' ve vaší instalaci Moodlu a do tohoto pole zadejte jeho nový název. Příklad: <br /> <br /><b>moodleadmin</b><br /> <br />
-Všechny generované odkazy na stránky správy Moodlu budou používat tento nový název.';
 $string['admindirsettinghead'] = 'Nastavování adresáře \'admin\'...';
 $string['admindirsettingsub'] = 'Na některých serverech je URL adresa /admin vyhrazena pro speciální účely (např. pro ovládací panel). Na takových serverech může dojít ke kolizi se standardním umístěním stránek pro správu Moodlu. Máte-li tento problém, přejmenujte adresář \'admin\' ve vaší instalaci Moodlu a do tohoto pole zadejte jeho nový název. Příklad: <br /> <br /><b>moodleadmin</b><br /> <br />
 Všechny generované odkazy na stránky správy Moodlu budou používat tento nový název.';
-$string['availablelangs'] = 'Dostupné jazykové balíčky';
 $string['bypassed'] = 'Přeskočeno';
 $string['cannotcreatelangdir'] = 'Nelze vytvořit adresář pro jazykové soubory';
 $string['cannotcreatetempdir'] = 'Nelze vytvořit dočasný adresář.';
@@ -28,17 +25,14 @@ $string['cannotsavezipfile'] = 'Nelze uložit soubor ZIP.';
 $string['cannotunzipfile'] = 'Nelze dekomprimovat soubor.';
 $string['caution'] = 'Varování';
 $string['check'] = 'Prověřit';
-$string['chooselanguage'] = 'Vyberte jazyk';
 $string['chooselanguagehead'] = 'Vyberte jazyk';
 $string['chooselanguagesub'] = 'Zvolte si jazyk PRO INSTALOVÁNÍ. Jazyk pro stránky Moodlu a pro uživatele budete moci vybrat později.';
 $string['closewindow'] = 'Zavřít toto okno';
-$string['compatibilitysettings'] = 'Kontrola nastavení PHP...';
 $string['compatibilitysettingshead'] = 'Kontrola nastavení PHP...';
 $string['compatibilitysettingssub'] = 'Pro správný běh Moodlu by váš server měl vyhovět ve všech následujících testech.';
 $string['componentisuptodate'] = 'Komponenta je aktuální.';
 $string['configfilenotwritten'] = 'Instalačnímu skriptu se nepodařilo automaticky vytvořit soubor config.php s vaší konfigurací -- proces webového serveru zřejmě nemá právo zapisovat do adresáře s instalací Moodlu. Můžete ručně zkopírovat následující kód do souboru s názvem config.php a uložit jej do kořenového adresáře vaší instalace Moodlu.';
 $string['configfilewritten'] = 'Soubor config.php byl úspěšně vytvořen.';
-$string['configurationcomplete'] = 'Konfigurace dokončena';
 $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';
@@ -47,14 +41,6 @@ $string['ctyperequired'] = 'Rozšíření PHP ctype je Moodlem vyžadováno z d
 $string['curlrecommended'] = 'Pro běh síťových funkcionalit (\"Moodle Networking\") je potřeba nainstalovat volitelnou knihovnu Curl.';
 $string['customcheck'] = 'Další kontroly';
 $string['database'] = 'Databáze';
-$string['databasecreationsettings'] = '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í.<br/>
-<br /> <br />
-<b>Typ:</b> instalátor nastaví na \"mysql\"<br />
-<b>Hostitel:</b> instalátor nastaví na \"localhost\"<br />
-<b>Název:</b> název databáze, např. moodle<br />
-<b>Uživatel:</b> instalátor nastaví na \"root\"<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['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 />
 <b>Hostitel:</b> instalátor nastaví na \"localhost\"<br />
@@ -62,14 +48,6 @@ $string['databasecreationsettingssub'] = '<b>Typ:</b> instalátor nastaví na \"
 <b>Uživatel:</b> instalátor nastaví na \"root\"<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['databasesettings'] = 'Nyní musíte nastavit připojení k databázi, kam si bude Moodle ukládat většinu svých dat. Tato databáze již musí být vytvořena, stejně jako musí být nastaveno uživatelské jméno a heslo pro přístup k ní.<br/>
-<br /> <br />
-<b>Typ:</b> mysql nebo postgres7<br />
-<b>Hostitel:</b> např. localhost nebo db.naseskola.cz<br />
-<b>Název:</b> název databáze, např. moodle<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['databasesettingshead'] = 'Nyní musíte nastavit připojení k databázi, kam si bude Moodle ukládat většinu svých dat. Tato databáze již musí být vytvořena, stejně jako musí být nastaveno uživatelské jméno a heslo pro přístup k ní.';
 $string['databasesettingssub'] = '<b>Typ:</b> mysql nebo postgres7<br />
 <b>Hostitel:</b> např. localhost nebo db.naseskola.cz<br />
@@ -126,23 +104,12 @@ $string['datarootpublicerror'] = 'Zadaný datový adresář (dataroot) je přím
 $string['dbconnectionerror'] = 'Nepodařilo se připojit k databázi, kterou jste zadali. Zkontrolujte prosím nastavení databáze.';
 $string['dbcreationerror'] = 'Chyba při vytváření databáze. Nelze vytvořit databázi zadaného jména a nastavení.';
 $string['dbhost'] = 'Hostitelský server';
-$string['dbpass'] = 'Heslo';
 $string['dbprefix'] = 'Předpona tabulek';
 $string['dbtype'] = 'Typ';
 $string['dbwrongencoding'] = 'Vybraná databáze používá nedoporučené kódování $a. Vhodnější by bylo používat databázi s kódováním Unicode (UTF-8). Tuto kontrolu můžete přeskočit zaškrtnutím pole \"Přeskočit test kódování DB\", můžete však v budoucnu narazit na problémy.';
 $string['dbwronghostserver'] = 'Chyba v názvu hostitele.';
 $string['dbwrongnlslang'] = 'Proměnná prostředí Vašeho serveru NLS_LANG musí používat znakovou sadu AL32UTF8. Viz dokumentaci PHP o konfiguraci vlastnosti OCI8.';
 $string['dbwrongprefix'] = 'Chyba v předponě názvů tabulek.';
-$string['directorysettings'] = '<p>Potvrďte prosím základní adresy této instalace Moodlu.</p>
-
-<p><b>Webová adresa</b>
-Zadejte úplnou webovou adresu, na níž bude Moodle dostupný. Jsou-li vaše stránky dostupné na více URL, vyberte z nich tu, kterou budou vaši studenti používat nejčastěji. Na konci adresy neuvádějte lomítko.</p>
-
-<p><b>Adresář Moodlu</b>
-Zadejte úplnou cestu k adresáři s touto instalací. Ujistěte se, že jsou v ní správně uvedena malá/VELKÁ písmena.</p>
-
-<p><b>Datový adresář</b>
-Potřebujete diskový prostor, kam bude Moodle ukládat nahrané (uploadované) soubory. K tomuto adresáři musí mít proces webového serveru právo ke čtení I ZÁPISU (webový server bývá spouštěn pod uživatelem \'nobody\' nebo \'apache\' nebo podobně). Tento adresář by ale zároveň neměl být dostupný přímo přes webové rozhraní (může obsahovat neveřejná data).</p>';
 $string['directorysettingshead'] = 'Potvrďte prosím adresy této instalace Moodlu.';
 $string['directorysettingssub'] = '<b>Webová adresa</b>:
 zadejte úplnou webovou adresu, na níž bude Moodle dostupný. Jsou-li vaše stránky dostupné na více URL, vyberte z nich tu, kterou budou vaši studenti používat nejčastěji. Na konci adresy neuvádějte lomítko.
@@ -162,13 +129,12 @@ $string['downloadlanguagebutton'] = 'Stáhnout jazykový balíček \"$a\"';
 $string['downloadlanguagehead'] = 'Stáhnout jazykový balíček';
 $string['downloadlanguagenotneeded'] = 'V instalaci lze nyní pokračovat v jazyce \"$a\".';
 $string['downloadlanguagesub'] = 'Nyní máte možnost stáhnout si některý z jazykových balíčků Moodlu a pokračovat v tomto jazyce.<br /><br />Pokud si momentálně nemůžete nebo nechcete stáhnout jazykový balíček, bude instalační proces pokračovat v angličtině. Jazykové balíčky si budete moci stáhnout i později po ukončení instalace.';
-$string['doyouagree'] = 'Přečetli jste si tyto podmínky a rozumíte jim?';
 $string['environmenterrortodo'] = 'Pro pokračování v instalaci této verze Moodlu je nutné nejdříve vyřešit problémy v programovém prostředí (chyby) serveru uvedené výše!';
 $string['environmenthead'] = 'Kontrola programového prostředí...';
 $string['environmentrecommendcustomcheck'] = 'Pokud tento test selhal, znamená to možné problémy';
 $string['environmentrecommendinstall'] = 'doporučená komponenta';
 $string['environmentrecommendversion'] = 'doporučena je verze $a->needed, nyní používáte verzi $a->current';
-$string['environmentrequirecustomcheck'] = 'Tebto test musí projít';
+$string['environmentrequirecustomcheck'] = 'Tento test musí projít';
 $string['environmentrequireinstall'] = 'vyžadovaná komponenta';
 $string['environmentrequireversion'] = 'vyžadována je verze $a->needed, nyní používáte verzi $a->current';
 $string['environmentsub'] = 'Nyní se prověřuje, zda vybrané komponenty vašeho systému splňují požadavky instalace.';
@@ -207,9 +173,7 @@ $string['help'] = 'Nápověda';
 $string['iconvrecommended'] = 'Instalace volitelné knihovny ICONV je silně doporučena, neboť zvyšuje výkon stránek, zejména pokud používáte jazyky nezaložené na latince.';
 $string['info'] = 'Informace';
 $string['installation'] = 'Instalace';
-$string['invalidemail'] = 'Neplatná e-mailová adresa';
 $string['invalidmd5'] = 'Neplatný MD5 hash';
-$string['invalidurl'] = 'Neplatná URL';
 $string['langdownloaderror'] = 'Bohužel, jazyk \"$a\" se nepodařilo nainstalovat. Instalace bude pokračovat v angličtine.';
 $string['langdownloadok'] = 'Podařilo se úspěšně nainstalovat jazykový balíček \"$a\". Instalace bude pokračovat v tomto jazyce.';
 $string['language'] = 'Jazyk';
@@ -242,8 +206,8 @@ na hodnotu blízkou 40M. Nemáte-li taková práva, požádejte správce vašeho
 $string['missingrequiredfield'] = 'Chybí některé z povinných polí';
 $string['moodledocslink'] = 'Dokumentace k této stránce';
 $string['mssql'] = 'SQL*Server (mssql)';
-$string['mssql_n'] = 'SQL*Server s podporou UTF-8 (mssql_n)';
 $string['mssqlextensionisnotpresentinphp'] = 'PHP nebylo korektně nakonfigurováno pro komunikaci s SQL*Server přes rozšíření MSSQL. Zkontrolujte váš php.ini nebo překompilujte PHP.';
+$string['mssql_n'] = 'SQL*Server s podporou UTF-8 (mssql_n)';
 $string['mysql'] = 'MySQL (mysql)';
 $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.';
@@ -254,8 +218,8 @@ $string['name'] = 'Název';
 $string['next'] = 'Další';
 $string['oci8po'] = 'Oracle (oci8po)';
 $string['ociextensionisnotpresentinphp'] = 'PHP nebylo korektně nakonfigurováno pro komunikaci s Oracle přes rozšíření OCI8. Zkontrolujte váš php.ini nebo překompilujte PHP.';
-$string['odbc_mssql'] = 'SQL*Server přes ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'PHP nebylo korektně nakonfigurováno pro komunikaci s SQL*Server přes rozšíření ODBC. Zkontrolujte váš php.ini nebo překompilujte PHP.';
+$string['odbc_mssql'] = 'SQL*Server přes ODBC (odbc_mssql)';
 $string['ok'] = 'OK';
 $string['opensslrecommended'] = 'Pro běh síťových funkcionalit (\"Moodle Networking\") je potřeba nainstalovat volitelnou knihovnu OpenSSL.';
 $string['parentlanguage'] = '<< Pokud chcete definovat sekundární 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: sk_utf8>>';
@@ -270,10 +234,12 @@ $string['phpversionhelp'] = '<p>Moodle vyžaduje PHP alespoň verze 4.3.0 nebo 5
 <p>Musíte PHP upgradovat, nebo přejít k hostiteli s vyšší verzí!<br />
 (U PHP 5.0.x můžete také přejít na nižší verzi 4.4.x či 4.3.x.)</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
+$string['postgresqlwarning'] = '<strong>Poznámka:</strong> Pokud máte problém s konektivitou k databázi, zkuste nastavit pole \"Hostitelský server\" na hodnotu
+host=\'postgresql_hostitel\' port=\'5432\' dbname=\'nazev_postgresql_databaze\' user=\'uzivatel_postgresql\' password=\'heslo_uzivatele_postgresql\' a 
+ponechte pole Databáze, Uživatel a Heslo prázdné. Více informací najdete v <a href=\"http://docs.moodle.org/en/Installing_Postgres_for_PHP\">dokumentaci</a>';
 $string['previous'] = 'Předchozí';
 $string['qtyperqpwillberemoved'] = 'Během upgrade bude odstraněn typ testové úlohy RQP. Tento typ jste nepoužívali, takže byste neměli zaznamenta žádné problémy.';
 $string['qtyperqpwillberemovedanyway'] = 'Během upgrade bude odstraněn typ testové úlohy RQP. Ve vaší databázi existuje několik takových úloh a ty nebudou fungovat, dokud nepřeinstalujete kód z http://moodle.org/mod/data/view.php?d=13&amp;rid=797 před pokračováním upgrade.';
-$string['releasenoteslink'] = 'Informace o této verzi Moodlu najdete v <a target=\"_new\" href=\"$a\">Poznámkách k verzi</a>';
 $string['remotedownloaderror'] = 'Stahování komponenty na váš server selhalo. Prověřte nastavení proxy. Vřele doporučujeme PHP rozšíření cURL.<br /><br />Nyní musíte stáhnout soubor <a href=\"$a->url\">$a->url</a> ručně, překopírovat jej do \"$a->dest\" na vašem serveru a tam jej rozbalit.';
 $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'] = 'Sestava';

install/lang/cy_utf8/installer.php

@@ -11,12 +11,6 @@
 
 $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 â  
@@ -24,7 +18,6 @@ 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.';
@@ -36,32 +29,20 @@ $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 />
@@ -70,15 +51,6 @@ $string['databasecreationsettingssub'] = '<b>Math:</b> wedi\'i osod i \"mysql\"
        <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 />
@@ -128,29 +100,12 @@ $string['datarooterror'] = 'Heb lwyddo i ddod o hyd i\'r \'Cyfeiriadur Data\' a
 $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.  
@@ -175,7 +130,6 @@ $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';
@@ -223,7 +177,6 @@ $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.';
@@ -262,8 +215,8 @@ $string['memorylimithelp'] = '<p>Mae maint y cof PHP yn eich gweinydd ar hyn o b
 $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['mssql_n'] = 'SQL*Server gyda chefnogaeth UTF-8t (mssql_n)';
 $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.';
@@ -272,8 +225,8 @@ $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['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['ok'] = 'IAWN';
 $string['opensslrecommended'] = 'Argymhellir yn gryf eich bod yn gosod y llyfrgell OpenSSL ddewisol -- mae\'n galluogi Rhwydweithio Moodle.';
 $string['pass'] = 'Pasio';
@@ -288,7 +241,6 @@ $string['phpversionhelp'] = '<p>Mae angen o leiaf fersiwn PHP 4.3.0 neu 5.1.0 ar
 (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';

install/lang/da_utf8/installer.php

@@ -11,12 +11,9 @@
 
 $string['admindirerror'] = 'Det angivne adminbibliotek er forkert';
 $string['admindirname'] = 'Adminbibliotek';
-$string['admindirsetting'] = 'Nogle få web-hoteller bruger /admin som en speciel URL til at administrere web-hotellet. Det er et problem da Moodle også bruger /admin som standard til administrationssiderne. Hvis det er så kan du omdøbe adminbiblioteket og så angive den nye sti til admin biblioteket her. For eksempel: <br/> <br /><b>moodleadmin</b><br /> <br />
-Dette vil rette admin linkene i Moodle.';
 $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['availablelangs'] = 'Tilgængelige sprogpakker';
 $string['bypassed'] = 'Forbigået';
 $string['cannotcreatelangdir'] = 'Kan ikke oprette sprogmappe';
 $string['cannotcreatetempdir'] = 'Kan ikke oprette temp-mappe';
@@ -28,29 +25,18 @@ $string['cannotsavezipfile'] = 'Kan ikke gemme zip-fil';
 $string['cannotunzipfile'] = 'Kan ikke unzippe filen';
 $string['caution'] = 'Pas på';
 $string['check'] = 'Kontroller';
-$string['chooselanguage'] = 'Vælg et sprog';
 $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['compatibilitysettings'] = 'Kontrollerer dine PHP-indstillinger...';
 $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 ajour';
 $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['configurationcomplete'] = 'Konfigurationen er færdig.';
 $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['databasecreationsettings'] = 'Nu skal du konfigurere indstillingerne i databasen for hvor de fleste Moodle-data skal gemmes. Databasen vil blive oprettet automatisk af installationsprogrammet med indstillingerne herunder.<br />
-<br /> <br />
-<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['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 />
@@ -58,14 +44,6 @@ $string['databasecreationsettingssub'] = '<b>Type:</b> fikseret til \"mysql\" af
 <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['databasesettings'] = '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 password til en brugerkonto der har rettigheder til at oprette og hente data.<br/>
-<br /> <br />
-<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['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 />
@@ -91,6 +69,12 @@ $string['databasesettingssub_mysql'] = '<b>Type:</b> MySQL<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_mysqli'] = '<b>Type:</b> Forbedret MySQL<br />
+<b>Vært:</b> ex localhost eller db.isp.com<br />
+<b>Navn:</b> databasenavn, ex moodle<br />
+<b>Bruger:</b> dit brugernavn til databasen<br />
+<b>Adgangskode:</b> din adgangskode til databasen<br />
+<b>Tabelprefix:</b> prefix til alle navne i tabellen (valgfri)';
 $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 />
@@ -112,10 +96,10 @@ $string['databasesettingssub_postgres7'] = '<b>Type:</b> PostgreSQL<br />
 $string['databasesettingswillbecreated'] = '<b>Note:</b> Installationsprocessen vil søge at oprette en database hvis ikke den findes allerede.';
 $string['dataroot'] = 'Databibliotek';
 $string['datarooterror'] = 'Data-biblioteket du specificerede kan ikke findes eller oprettes. Ret stien til biblioteket eller opret det manuelt.';
+$string['datarootpublicerror'] = 'Den datamappe du har angivet har direkte adgang fra internettet, du skal bruge en anden mappe.';
 $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ærtsserver';
-$string['dbpass'] = 'Password';
 $string['dbprefix'] = 'Præfix for tabeller';
 $string['dbtype'] = 'Type';
 $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. 
@@ -123,16 +107,6 @@ Du kan alligevel springe denne test over ved at vælge \"Skip DB Encoding Test\"
 $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['directorysettings'] = '<p>Kontroller venligst placeringen af af Moodle-installationen.</p>
-
-<p><b>Web-adresse:<b>
-Angiv den fulde web-adresse (URL) til Moodle. Hvis sitet kan tilgås fra flere URL\'er så vælg den mest naturlige, den som de studerende oftest vil bruge. Der må ikke være en skråstreg til sidst.</p>
-
-<p><b>Moodle-bibliotek:</b>
-Angiv den fulde sti til Moodle-installationen. Stien er casesensitiv.</p>
-
-<p><b>Moodles Databibliotek</b>
-Det bibliotek hvor Moodle kan gemme uploadede filer. Dette bibliotek skal være læsbart OG SKRIVBART af den bruger apache kører under, (typisk \'nobody\' eller \'apache\') men der må ikke være direkte adgang til det fra internettet.</p>';
 $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).
@@ -154,7 +128,6 @@ $string['downloadlanguagenotneeded'] = 'Du kan fortsætte installationen med sta
 $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['doyouagree'] = 'Har du læst og forstået disse betingelser?';
 $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';
@@ -198,9 +171,7 @@ $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['invalidemail'] = 'Ugyldig e-mail-adresse';
 $string['invalidmd5'] = 'Ugyldig md5';
-$string['invalidurl'] = 'Ugyldig URL';
 $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';
@@ -232,18 +203,20 @@ indstillingen så der er minimum 16Mb til rådighed. Hvis du ikke har direkte ad
 $string['missingrequiredfield'] = 'Der mangler nogle obligatoriske felter';
 $string['moodledocslink'] = 'Moodle Docs 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['mssql_n'] = 'SQL*Server med UTF-8 support (mssql_n)';
 $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['mysqli'] = 'Forbedret MySql (mysqli)';
+$string['mysqliextensionisnotpresentinphp'] = 'PHP er ikke konfigureret korrekt med MySqli extensionen så den kan kommunikere med MySql. Tjek php.ini eller rekompiler PHP, MySqli extensionen er ikke tilgængelig for PHP 4';
 $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['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['ok'] = 'OK';
 $string['pass'] = 'OK';
 $string['password'] = 'Adgangskode';
@@ -256,7 +229,6 @@ $string['phpversionhelp'] = '<p>Moodle kræver en PHP version der er nyere end 4
 <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['releasenoteslink'] = 'For information om denne version af Moodle kan du læse <a target=\"_new\" href=\"$a\">Versions info</a> online';
 $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';

install/lang/de_du_utf8/installer.php

@@ -9,23 +9,12 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
-$string['admindirsetting'] = '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['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['databasecreationsettings'] = 'Du musst die Datenbankeinstellungen für die Speicherung der Moodle-Daten konfigurieren. Die Datenbank wird automatisch vom Moodle4Windows-Installationsprozess mit den unten festgelegten Einstellungen angelegt:
-<br />
-<br /> <br />
-<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['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 />
@@ -33,14 +22,6 @@ $string['databasecreationsettingssub'] = '<b>Typ:</b> \"mysql\" vom Installer fe
 <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['databasesettings'] = 'Jetzt wird die Datenbank erstellt, in der die meisten Moodle-Daten gespeichert werden. Diese Datenbank muss bereits vorher angelegt sein und du musst den Datenbankuser und das Passwort kennen.<br />
- <br />
-<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 Benutzername für die Datenbank<br />
-<b>Passwort:</b> Dein Passwort für die Datenbank<br />
-<b>Tabellen Prefix:</b> optionaler Prefix, der für alle Tabellen genutzt wird';
 $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 />
@@ -90,16 +71,6 @@ $string['dbwrongencoding'] = 'Die ausgewählte Datenbank läuft unter einem nich
 $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['directorysettings'] = '<p>Bitte überprüfe das Verzeichnis für diese Moodle-Installation.</p>
-
-<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['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>
@@ -112,7 +83,6 @@ Moodle benötigt ein Verzeichnis, indem hochgeladene Dateien abgelegt werden. Di
 $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['doyouagree'] = 'Hast du diese Bedingungen gelesen, verstanden und stimmst ihnen zu?';
 $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['fileuploadshelp'] = '<p>Dateien hochladen ist auf diesem Server abgestellt.</p>
@@ -159,7 +129,6 @@ $string['phpversionhelp'] = '<p>Moodle erwartet PHP mindestens in der Version 4.
 <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['releasenoteslink'] = 'Weitere Informationen über diese Version findest du online: <a target=\"_new\" href=\"$a\">Versionsinformation</a>';
 $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['safemodehelp'] = '<p>Moodle kann beim Betrieb im Safe Mode verschiedene Probleme haben, nicht zuletzt kann es unmöglich sein, neue Dateien zu erzeugen. </p>
 <p>Safe Mode ist zumeist nur auf einigen öffentlichen Webservern eingestellt. Suche dir einen Anbieter, der auf diese Einstellung verzichtet oder bitte deinen Dienstleister, dass du auf einen Server \'umziehen\' kannst, der diese Einstellung nicht verwendet.</p>

install/lang/de_utf8/installer.php

@@ -9,27 +9,14 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
-$string['aborting'] = 'Installation abbrechen';
 $string['admindirerror'] = 'Das angegebene Admin-Verzeichnis ist falsch.';
 $string['admindirname'] = 'Name für das Admin-Verzeichnis';
-$string['admindirsetting'] = '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['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['adminemail'] = 'E-Mail :';
-$string['adminfirstname'] = 'Vorname :';
-$string['admininfo'] = 'Administratordetails';
-$string['adminlastname'] = 'Nachname :';
-$string['adminpassword'] = 'Passwort :';
-$string['adminusername'] = 'Anmeldename :';
-$string['askcontinue'] = 'Fortsetzen (ja/nein) :';
-$string['availabledbtypes'] = 'Verfügbare Datenbank-Typen';
-$string['availablelangs'] = 'Liste der verfügbaren Sprachen';
 $string['bypassed'] = 'Unberücksichtigt';
-$string['cannotconnecttodb'] = 'Verbindung zur Datenbank gescheitert';
-$string['cannotcreatelangdir'] = 'Das Verzeichnis \"lang\" kann nicht angelegt werden.';
+$string['cannotcreatelangdir'] = 'Verzeichnis \"lang\" kann nicht angelegt werden';
 $string['cannotcreatetempdir'] = 'Das Verzeichnis \"temp\" kann nicht angelegt werden.';
 $string['cannotdownloadcomponents'] = 'Einige Komponenten können nicht heruntergeladen werden.';
 $string['cannotdownloadzipfile'] = 'ZIP-Datei kann nicht heruntergeladen werden.';
@@ -39,125 +26,86 @@ $string['cannotsavezipfile'] = 'Die ZIP-Datei kann nicht gespeichert werden.';
 $string['cannotunzipfile'] = 'Die Datei kann nicht entpackt werden.';
 $string['caution'] = 'Warnung';
 $string['check'] = 'Prüfen';
-$string['checkingphpsettings'] = 'PHP-Einstellungen prüfen';
-$string['chooselanguage'] = 'Sprache wählen';
 $string['chooselanguagehead'] = '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['compatibilitysettings'] = 'Prüfung Ihrer PHP-Einstellungen ...';
 $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 aktuell.';
-$string['configfilecreated'] = 'Konfiguartionsdatei wurde erfolgreich erstellt';
-$string['configfiledoesnotexist'] = 'Keine Konfiguarationsdatei gefunden!!!';
 $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['configurationcomplete'] = 'Konfiguration ist abgeschlossen.';
 $string['configurationcompletehead'] = 'Konfiguration ist abgeschlossen';
 $string['configurationcompletesub'] = 'Moodle speichert Ihre Konfigurationseinstellungen nun im Hauptverzeichnis Ihrer Moodle-Installation.';
-$string['configurationfileexist'] = 'Konfiguarationsdatei existiert bereits!';
 $string['continue'] = 'Weiter';
-$string['creatingconfigfile'] = 'Konfiguarationsdatei wird erstellt ...';
 $string['ctyperecommended'] = 'Die Installation der optionalen Bibliothek ctype wird empfohlen, um die Geschwindigkeit der Website zu steigern. Dies ist besonders wichtig, wenn Sie Sprachen mit anderen als lateinischen Zeichensätzen verwenden.';
 $string['ctyperequired'] = 'Die PHP-Erweiterung ctype wird von Moodle benötigt, um die Geschwindigkeit der Website zu steigern und die Mehrsprachkompatibilität zu ermöglichen.';
 $string['curlrecommended'] = 'Die Installation der optionalen Bibliothek cURL wird empfohlen, um die Netzwerk-Funktionalität von Moodle einzuschalten.';
 $string['curlrequired'] = 'Die PHP-Erweiterung cURL wird von Moodle benötigt, um mit den Moodle Repositories zu kommunizieren';
 $string['customcheck'] = 'Weitere Überprüfungen';
 $string['database'] = 'Datenbank';
-$string['databasecreationsettings'] = 'Sie müssen die Datenbankeinstellungen für die Speicherung der Moodle-Daten konfigurieren. Die Datenbank wird automatisch vom Moodle4Windows-Installationsprozess mit den unten festgelegten Einstellungen angelegt:
-<br />
-<br /> <br />
-<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['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 />
+$string['databasecreationsettingssub'] = '<b>Typ:</b> vom Installer festgelegt auf  \"mysql\" <br />
+<b>Host:</b> vom Installer festgelegt auf  \"localhost\"<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['databasehost'] = 'Datenbank-Server :';
-$string['databasename'] = 'Datenbank-Name :';
-$string['databasepass'] = 'Datenbank-Passwort :';
-$string['databasesettings'] = 'Jetzt wird die Datenbank erstellt, in der die meisten Moodle-Daten gespeichert werden. Diese Datenbank muss bereits vorher angelegt sein und Sie müssen den Datenbankuser und das Passwort kennen.<br />
- <br />
-<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>Passwort:</b> Ihr Passwort für die Datenbank<br />
-<b>Tabellen Prefix:</b> optionaler Prefix, der für alle Tabellen genutzt wird';
-$string['databasesettingsformoodle'] = 'Datenbank-Einstellungen für Moodle';
+<b>Nutzer:</b> vom Installer festgelegt auf  \"root\"<br />
+<b>Passwort:</b> Ihr Datenbankpasswort<br />
+<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellennamen';
 $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>User:</b> Ihr Anmeldename für die Datenbank<br />
-<b>Password:</b> Ihr Passwort für die Datenbank<br />
-<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellen';
+<b>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellennamen';
 $string['databasesettingssub_mssql'] = '<b>Typ:</b> SQL*Server (ohne UTF-8)<b><strong class=\"errormsg\">Experimentell! (nicht für Produktivumgebungen)</strong></b><br /><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)';
+<b>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellennamen (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>Nutzer:</b> Ihr Anmeldename für die Datenbank<br />
+<b>Passwort:</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>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank<br />
 <b>Tabellen-Prefix:</b> Prefix für alle Tabellen (optional)';
 $string['databasesettingssub_mysqli'] = '<b>Typ:</b> Improved MySQL<br />
 <b>Host:</b> z.B. localhost oder db.domain.com<br />
 <b>Name:</b> Datenbank-Name, z.B moodle<br />
-<b>User:</b> Ihr Datenbank-Anmeldename<br />
-<b>Passwort:</b> Ihr Datenbank-Passwort<br />
+<b>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</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>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</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>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</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>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank<br />
 <b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
-$string['databasesettingssub_sqlite3_pdo'] = '<b>Typ:</b> SQLite 3 (PDO) <b><strong class=\"errormsg\">Experimentell! (nicht für produktive Server benutzen!!)</strong></b><br />
-<b>Host:</b> Pfad zum Verzeichnis, in dem die Datenbankdatei gespeichert werden soll (vollständiger Pfad); mit localhost oder einem leeren Feld wird dasdas Moodle Datenverzeichnis verwendet<br />
-<b>Name:</b> Datenbankname, z.B. moodle (optional)<br />
-<b>User:</b> Ihr Anmeldename für die Datenbank (optional)<br />
-<b>Password:</b> Ihr Passwort für die Datenbank (optional)<br />
-<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellen<br />
-Der Name der Datenbankdatei wird über den Nutzernamen erkannt, der Datenbankname und das Passwort sind oben angegeben.';
 $string['databasesettingswillbecreated'] = '<b>Hinweis: </b> Das Installationsprogramm wird versuchen, automatisch eine Datenbank anzulegen, sofern diese noch nicht besteht.';
-$string['databasetype'] = 'Datenbank-Typ :';
-$string['databaseuser'] = 'Datenbank-Nutzer :';
 $string['dataroot'] = 'Daten-Verzeichnis';
 $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['datarootpublicerror'] = 'Das von Ihnen angegebene Verzeichnis dataroot ist direkt aus dem Internet zugänglich. Sie müssen das Verzeichnis ändern!';
 $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'] = 'Server';
-$string['dbpass'] = 'Passwort';
 $string['dbprefix'] = 'Tabellen-Prefix';
 $string['dbtype'] = 'Typ';
 $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.
@@ -165,17 +113,6 @@ Die ausgewählte Datenbank läuft unter einem nicht empfohlenen Zeichensatz. Es
 $string['dbwronghostserver'] = 'Sie müssen den oben genannten \"Server\"-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['directorysettings'] = '<p>Bitte überprüfen Sie das Verzeichnis für diese Moodle-Installation.</p>
-
-<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>
-
-<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>
-
-<p><b>Datenverzeichnis:</b>
-Moodle benötigt ein Verzeichnis, indem hochgeladene Dateien abgelegt werden. Dieses Verzeichnis muss Lese- und Schreibrechte für den 
-web-user des Servers haben. (üblicherweise \'nobody\' or \'apache\'), aber es sollte nicht direkt über das Internet erreichbar sein.</p>';
 $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>
@@ -188,16 +125,12 @@ Moodle benötigt ein Verzeichnis, indem hochgeladene Dateien abgelegt werden. Di
 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['disagreelicense'] = 'Das Upgrade wird nicht ohne Zustimmung zur GPL durchgeführt!';
 $string['download'] = 'Herunterladen';
 $string['downloadedfilecheckfailed'] = 'Die Überprü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['downloadlanguagepack'] = 'Möchten Sie jetzt das Sprachpaket herunterladen (ja/nein) :';
 $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['downloadsuccess'] = 'Sprachpaket erfolgreich heruntergeladen';
-$string['doyouagree'] = 'Stimmen Sie zu ? (ja/nein)';
 $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['environmentrecommendcustomcheck'] = 'Wenn dieser Test fehlschlägt, dann ist ein  mögliches Problem vorhanden.';
@@ -209,7 +142,6 @@ $string['environmentrequireversion'] = 'Version $a->needed ist erforderlich - ak
 $string['environmentsub'] = 'Es wird geprüft, ob die verschiedenen Komponenten Ihres Systems die Installationsanforderungen erfüllen.';
 $string['environmentxmlerror'] = 'Fehler beim Auslesen der Server-Konfiguration ($a->error_code)';
 $string['error'] = 'Fehler';
-$string['errorsinenvironment'] = 'Fehler bei den Anforderungen!';
 $string['fail'] = 'Fehlgeschlagen';
 $string['fileuploads'] = 'Dateien hochladen';
 $string['fileuploadserror'] = 'Dies sollte eingeschaltet sein';
@@ -234,29 +166,11 @@ $string['globalswarning'] = '<p><strong>Sicherheitshinweis</strong>: Um ordnungs
 $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'] = 'Informationen';
-$string['inputdatadirectory'] = 'Daten-Verzeichnis :';
-$string['inputwebadress'] = 'Web-Adresse';
-$string['inputwebdirectory'] = 'Moodle-Verzeichnis :';
 $string['installation'] = 'Installation';
-$string['installationiscomplete'] = 'Die Installation ist abgeschlossen!';
-$string['invalidargumenthelp'] = 'Fehler: Ungültige Argumente
-Benutzung: $php cliupgrade.php OPTIONS
-Geben Sie --help ein, um weitere Hilfe zu bekommen';
-$string['invalidemail'] = 'Ungültige E-Mail';
-$string['invalidhost'] = 'Ungültiger Server';
-$string['invalidint'] = 'Fehler: Wert ist keine Zahl';
-$string['invalidintrange'] = 'Fehler: Wert ist außerhalb des Bereichs';
 $string['invalidmd5'] = 'md5 ungültig';
-$string['invalidpath'] = 'Ungültiger Pfad';
-$string['invalidsetelement'] = 'Fehler: Wert ist nicht in den vorgegebenen Optionen enthalten';
-$string['invalidtextvalue'] = 'Ungültiger Text';
-$string['invalidurl'] = 'Ungültige URL';
-$string['invalidvalueforlanguage'] = 'Ungültiger Wert für die Option --lang. Geben Sie --help ein, um mehr Hilfe zu bekommen';
-$string['invalidyesno'] = 'Fehler: Wert ist kein gültiges Ja/Nein-Argument';
 $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['locationanddirectories'] = 'Speicherort und -verzeichnisse';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Dies sollte ausgeschaltet sein (\'off\')';
 $string['magicquotesruntimehelp'] = '<p>Magic Quotes Runtime sollte abgeschaltet \'off\' sein, damit Moodle richtig läuft.  </p>
@@ -277,8 +191,8 @@ $string['memorylimithelp'] = '<p>Die PHP-Einstellung memory_limit für Ihren Ser
 $string['missingrequiredfield'] = 'Einige erforderliche Felder sind nicht ausgefüllt.';
 $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['mssql_n'] = 'SQL*Server mit UTF-8-Unterstützung (mssql_n)';
 $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.';
@@ -289,8 +203,8 @@ $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['odbc_mssql'] = 'SQL*Server über ODBC (odbc_mssql)';
 $string['ok'] = 'OK';
 $string['opensslrecommended'] = 'Die optionale Installation der OpenSSL Bibliothek wird dringend empfohlen. Dadurch wird die Moodle-Netzwerk-Funktionalität ermöglicht.';
 $string['parentlanguage'] = 'en_utf8';
@@ -298,10 +212,6 @@ $string['pass'] = 'Durchgang';
 $string['password'] = 'Kennwort';
 $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['php52versionerror'] = 'PHP-Version muss mindestens 5.2.4 sein.';
-$string['php52versionhelp'] = '<p>Moodle benötigt mindestens PHP Version 5.2.4</p>
-<p>Sie nutzen zur Zeit Version $a.</p>
-<p>Ihre PHP-Version muss aktualisiert oder ein anderer Host genutzt werden.</p>';
 $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).'; // ORPHANED
 $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>
@@ -309,14 +219,9 @@ $string['phpversionhelp'] = '<p>Moodle erwartet PHP mindestens in der Version 4.
 <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['prefixcannotbeempty'] = '<p>Fehler: Datenbanktabellen-Prefix kann nicht leer sein.(§a)</p>
-<p>Der Administrator muss dieses Problem beseitigen.</p>';
-$string['prefixtoolong'] = '<p>Fehler: Datenbanktabellen-Prefix ist zu lang ($a->dbfamily)</p>
-<p>Der Administrator muß dieses Problem anpassen. Tabellen -Prefixes in $a->dbfamily ist max. $a->maxlength Zeichen lang.</p>';
 $string['previous'] = 'Frühere';
 $string['qtyperqpwillberemoved'] = 'Während des Updates wird der Fragentyp RQP entfernt. Da Sie diesen Fragentyp nicht benutzen, sollten Sie keinerlei Probleme bekommen.';
 $string['qtyperqpwillberemovedanyway'] = 'Während des Updates wird der Fragentyp RQP entfernt. Sie haben einige RQP Fragen in Ihrer Datenbank, die nicht mehr funktionieren werden, falls Sie nicht den dafür notwendigen Code vor der Fortsetzung dieses Updates installieren. http://moodle.org/mod/data/view.php?d=13&amp;rid=797';
-$string['releasenoteslink'] = 'Um Informationen über diese Moodle-Version zu erhalten, schauen Sie bitte in die Release-Hinweise auf $a';
 $string['remotedownloaderror'] = 'Der Download auf Ihren Server konnte nicht ausgeführt werden. Prüfen Sie bitte die Proxy-Einstellungen, die PHP CURL Erweiterung wird dringend empfohlen.<br /><br />Die Datei <a href=\"$a->url\">$a->url</a> muss nun manuell herunter geladen, entpackt und auf den Server nach \"$a->dest\" kopiert werden. there.';
 $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';
@@ -326,73 +231,19 @@ $string['safemodeerror'] = 'Die Nutzung von Moodle im Safe Mode kann zu Schwieri
 $string['safemodehelp'] = '<p>Moodle kann beim Betrieb im Safe Mode verschiedene Probleme haben, nicht zuletzt kann es unmöglich sein, neue Dateien zu erzeugen. </p>
 <p>Safe Mode ist zumeist nur auf einigen öffentlichen Webservern eingestellt. Suchen Sie sich einen Anbieter, der auf diese Einstellung verzichtet oder bitten Sie Ihren Dienstleister, dass Sie auf einen Server \'umziehen\' können, der diese Einstellung nicht verwendet.</p>
 <p>Sie können versuchen, die Installation fortzusetzen. Sie müssen aber später mit Problemen rechnen. </p>';
-$string['selectlanguage'] = 'Sprache für die Installation auswählen';
 $string['serverchecks'] = 'Server-Überprüfung';
 $string['sessionautostart'] = 'Session Auto Start';
 $string['sessionautostarterror'] = 'Diese Option sollte abgeschaltet sein';
 $string['sessionautostarthelp'] = '<p>Moodle benötigt den Session Support und kann ohne diese Einstellung nicht funktionieren.</p>
 <p>Sessions sind durch Einstellungen in der Datei php.ini möglich. Bitte suchen Sie nach der Einstellung für session.auto_start </p>';
-$string['sitefullname'] = 'Name der gesamten Website :';
-$string['siteinfo'] = 'Details der Website';
-$string['sitenewsitems'] = 'Anzahl neuer Nachrichten :';
-$string['siteshortname'] = 'Kurzname der Website :';
-$string['sitesummary'] = 'Beschreibung der Website :';
 $string['skipdbencodingtest'] = 'Prüfung der Datenbank-Verschlüsselung überspringen';
-$string['sqlite3_pdo'] = 'SQLite 3 (PDO) <b><strong class=\"errormsg\">Experimentell! (nicht für produktive Server benutzen!!)</strong></b>';
-$string['sqliteextensionisnotpresentinphp'] = 'PHP ist für die Erweiterung SQLite nicht richtig konfiguriert. Bitte prüfen Sie Ihre php.ini oder übersetzen Sie PHP neu.';
 $string['status'] = 'Status';
-$string['tableprefix'] = 'Tabellen-Prefix :';
 $string['thischarset'] = 'UTF-8';
 $string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Deutsch';
 $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['upgradingactivitymodule'] = 'Aktivitäten-Module aktualisieren';
-$string['upgradingbackupdb'] = 'Datenbanktabelle zum Backup aktualisieren';
-$string['upgradingblocksdb'] = 'Datenbanktabelle für Blöcke aktualisieren';
-$string['upgradingblocksplugin'] = 'Plugin für Blöcke aktualisieren';
-$string['upgradingcompleted'] = 'Aktualisierung abgeschlossen ...';
-$string['upgradingcourseformatplugin'] = 'Plugin für das Kursformat aktualisieren';
-$string['upgradingenrolplugin'] = 'Plugin zur Einschreibung aktualisieren';
-$string['upgradinggradeexportplugin'] = 'Plugin zum Bewertungsexport aktualisieren';
-$string['upgradinggradeimportplugin'] = 'Plugin zum Bewertungsimport aktualisieren';
-$string['upgradinggradereportplugin'] = 'Plugin zum Bewertungsbericht aktualisieren';
-$string['upgradinglocaldb'] = 'Lokale Datenbank aktualisieren';
-$string['upgradingmessageoutputpluggin'] = 'Plugin zur Mitteilungsausgabe aktualisieren';
-$string['upgradingqtypeplugin'] = 'Plugin für Frage/Typ aktualisieren';
-$string['upgradingrpcfunctions'] = 'RPC-Funktionen aktualisieren';
-$string['usagehelp'] = 'Übersicht:
-$php cliupgrade.php --Parameter
-
-Parameter:
---lang : Spracheinstellung für die Installation (Standard Englisch (en))
---webaddr : Web-Adresse der Moodle-Site
---moodledir : Pfad zum Moodle-Verzeichnis
---datadir : Pfad zum Daten-Verzeichnis (sollte vor direktem Zugriff geschützt sein!!)
---dbtype : Datenbank-Typ (Standard mysql)
---dbhost : Datenbank-Server (Standard localhost)
---dbname : Datenbank-Name (Standard moodle)
---dbuser : Datenbank-Nutzer
---dbpass : Datenbank-Passwort
---prefix : Tabellen-Prefix für alle Datenbank-Tabellen. (Standard mdl_)
---verbose : 0 keine Ausgabe, 1 Zusammenfassung (Standard), 2 Ausgabe aller Details
---interactivelevel : 0 nicht interaktiv, 1 semi-interaktiv (Standard), 2 interaktiv
---agreelicense : Yes (Standard) oder No
---confirmrelease : Yes (Standard) oder No
---sitefullname : Name der Website. (Standard \"Moodle Site\" - bitte ändern!!)
---siteshortname : Kurzname der Website (Standard moodle)
---sitesummary : Bescheibung der Website
---adminfirstname : Vorname des Adminstrators (Standard Admin)
---adminlastname : Nachname des Adminstrators (Standard User)
---adminusername : Anmeldename des Adminstrators (Standard admin)
---adminpassword : Passwort für den Adminstrator (Standard admin)
---adminemail : E-Mail-Adresse des Adminstrators (Standard root@localhost)
---help : Hilfe anzeigen
-
-Nutzungsbeispiel:
-$php cliupgrade.php --lang=en --webaddr=http://www.example.com --moodledir=/var/www/html/moodle --datadir=/var/moodledata --dbtype=mysql --dbhost=localhost --dbname=moodle --dbuser=root --prefix=mdl --agreelicense=yes --confirmrelease=yes --sitefullname=\"Example Moodle Site\" --siteshortname=moodle --sitesummary=siteforme --adminfirstname=Admin --adminlastname=User --adminusername=admin --adminpassword=admin --adminemail=admin@example.com --verbose=1 --interactivelevel=2';
 $string['user'] = 'Nutzer';
-$string['versionerror'] = 'Fehler: Nutzerabbruch bei der Versionsabfrage';
 $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:';
@@ -401,14 +252,11 @@ $string['welcomep50'] = 'Die Nutzung dieser Anwendungen ist lizenzrechtlich gepr
 <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['welcometext'] = '--- Moodle-Installation über die Komandozeile ---';
-$string['writetoconfigfilefaild'] = 'Fehler beim Schreiben der Konfigurationsdatei';
 $string['wrongdestpath'] = 'Falscher Pfad';
 $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.';
-$string['xmlrpcrecommended'] = 'Die Installation der optionalen xmlrpc Erweiterung ist für die Moodle-Network Funktionen nützlich.';
-$string['yourchoice'] = 'Ihre Wahl :';
+$string['xmlrpcrecommended'] = 'Die Installation der optionalen PHP-Erweiterung xmlrpc ist für die Moodle-Network Funktionen nötig.';
 $string['ziprequired'] = 'Die PHP-Erweiterung zip wird ab sofort von Moodle gefordert. Die Pakete info-ZIP oder PclZip werden nicht weiter eingesetzt.';
 ?>

install/lang/el_utf8/installer.php

@@ -9,17 +9,14 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
-$string['availablelangs'] = 'Διαθέσιμα γλωσσικά πακέτα';
 $string['check'] = 'Επιλογή';
 $string['closewindow'] = 'Κλείστε αυτό το παράθυρο';
 $string['continue'] = 'Συνέχεια';
 $string['download'] = 'Κατέβασμα';
-$string['doyouagree'] = 'Έχετε διαβάσει και κατανοήσει αυτούς τους όρους;';
 $string['error'] = 'Σφάλμα';
 $string['gdversion'] = 'Έκδοση GD';
 $string['help'] = 'Βοήθεια';
 $string['info'] = 'Πληροφορίες';
-$string['invalidemail'] = 'Εσφαλμένη διεύθυνση ηλεκτρονικού ταχυδρομείου';
 $string['language'] = 'Γλώσσα';
 $string['moodledocslink'] = 'Αρχεία βοήθειας για αυτήν την σελίδα';
 $string['name'] = 'Όνομα';

install/lang/en_utf8/installer.php

@@ -11,12 +11,6 @@
 
 $string['admindirerror'] = 'The admin directory specified is incorrect';
 $string['admindirname'] = 'Admin Directory';
-$string['admindirsetting'] = 'A very few webhosts use /admin as a special URL for you to access a 
-    control panel or something.  Unfortunately this conflicts with the 
-    standard location for the Moodle admin pages.  You can fix this by 
-    renaming the admin directory in your installation, and putting that 
-    new name here.  For example: <br /> <br /><b>moodleadmin</b><br /> <br />
-    This will fix admin links in Moodle.';
 $string['admindirsettinghead'] = 'Setting the admin directory ...';
 $string['admindirsettingsub'] = 'A very few webhosts use /admin as a special URL for you to access a 
     control panel or something.  Unfortunately this conflicts with the 
@@ -24,7 +18,6 @@ $string['admindirsettingsub'] = 'A very few webhosts use /admin as a special URL
     renaming the admin directory in your installation, and putting that 
     new name here.  For example: <br /> <br /><b>moodleadmin</b><br /> <br />
     This will fix admin links in Moodle.';
-$string['availablelangs'] = 'Available language packs';
 $string['bypassed'] = 'Bypassed';
 $string['cannotcreatelangdir'] = 'Cannot create lang directory';
 $string['cannotcreatetempdir'] = 'Cannot create temp directory';
@@ -36,17 +29,14 @@ $string['cannotsavezipfile'] = 'Cannot save ZIP file';
 $string['cannotunzipfile'] = 'Cannot unzip file';
 $string['caution'] = 'Caution';
 $string['check'] = 'Check';
-$string['chooselanguage'] = 'Choose a language';
 $string['chooselanguagehead'] = 'Choose a language';
 $string['chooselanguagesub'] = 'Please choose a language for the installation ONLY. You will be able to choose site and user languages on a later screen.';
 $string['closewindow'] = 'Close this window';
-$string['compatibilitysettings'] = 'Checking your PHP settings ...';
 $string['compatibilitysettingshead'] = 'Checking your PHP settings ...';
 $string['compatibilitysettingssub'] = 'Your server should pass all these tests to make Moodle run properly';
 $string['componentisuptodate'] = 'Component is up-to-date';
 $string['configfilenotwritten'] = 'The installer script was not able to automatically create a config.php file containing your chosen settings, probably because the Moodle directory is not writeable. You can manually copy the following code into a file named config.php within the root directory of Moodle.';
 $string['configfilewritten'] = 'config.php has been successfully created';
-$string['configurationcomplete'] = 'Configuration completed';
 $string['configurationcompletehead'] = 'Configuration completed';
 $string['configurationcompletesub'] = 'Moodle made an attempt to save your configuration in a file in the root of your Moodle installation.';
 $string['continue'] = 'Continue';
@@ -55,16 +45,6 @@ $string['ctyperequired'] = 'The ctype PHP extension is now required by Moodle, i
 $string['curlrecommended'] = 'Installing the optional Curl library is highly recommended in order to enable Moodle Networking functionality.';
 $string['customcheck'] = 'Other Checks';
 $string['database'] = 'Database';
-$string['databasecreationsettings'] = 'Now you need to configure the database settings where most Moodle data
-    will be stored.  This database will be created automatically by the installer
-    with the settings specified below.<br />
-    <br /> <br />
-       <b>Type:</b> fixed to \"mysql\" by the installer<br />
-       <b>Host:</b> fixed to \"localhost\" by the installer<br />
-       <b>Name:</b> database name, eg moodle<br />
-       <b>User:</b> fixed to \"root\" by the installer<br />
-       <b>Password:</b> your database password<br />
-       <b>Tables Prefix:</b> optional prefix to use for all table names';
 $string['databasecreationsettingshead'] = 'Now you need to configure the database settings where most Moodle data
     will be stored.  This database will be created automatically by the installer
     with the settings specified below.';
@@ -74,16 +54,6 @@ $string['databasecreationsettingssub'] = '<b>Type:</b> fixed to \"mysql\" by the
        <b>User:</b> fixed to \"root\" by the installer<br />
        <b>Password:</b> your database password<br />
        <b>Tables Prefix:</b> optional prefix to use for all table names';
-$string['databasesettings'] = 'Now you need to configure the database where most Moodle data
-    will be stored.  This database must already have been created
-    and a username and password created to access it.<br />
-    <br /> <br />
-       <b>Type:</b> mysql or postgres7<br />
-       <b>Host:</b> eg localhost or db.isp.com<br />
-       <b>Name:</b> database name, eg moodle<br />
-       <b>User:</b> your database username<br />
-       <b>Password:</b> your database password<br />
-       <b>Tables Prefix:</b> optional prefix to use for all table names';
 $string['databasesettingshead'] = 'Now you need to configure the database where most Moodle data
     will be stored.  This database must already have been created
     and a username and password created to access it.';
@@ -134,30 +104,12 @@ $string['datarooterror'] = 'The \'Data Directory\' you specified could not be fo
 $string['dbconnectionerror'] = 'We could not connect to the database you specified. Please check your database settings.';
 $string['dbcreationerror'] = 'Database creation error. Could not create the given database name with the settings provided';
 $string['dbhost'] = 'Host Server';
-$string['dbpass'] = 'Password';
 $string['dbprefix'] = 'Tables prefix';
 $string['dbtype'] = 'Type';
 $string['dbwrongencoding'] = 'The selected database is running under one non-recommended encoding ($a). It would be better to use one Unicode (UTF-8) encoded database instead. Anyway, you can bypass this test by selecting the \"Skip DB Encoding Test\" check below, but you could experience problems in the future.';
 $string['dbwronghostserver'] = 'You must follow \"Host\" rules as explained above.';
 $string['dbwrongnlslang'] = 'The NLS_LANG environment variable in your web server must use the AL32UTF8 charset. See PHP documentation about how to configure OCI8 properly.';
 $string['dbwrongprefix'] = 'You must follow \"Tables Prefix\" rules as explained above.';
-$string['directorysettings'] = '<p>Please confirm the locations of this Moodle installation.</p>
-
-<p><b>Web Address:</b>
-Specify the full web address where Moodle will be accessed.  
-If your web site is accessible via multiple URLs then choose the 
-most natural one that your students would use.  Do not include 
-a trailing slash.</p>
-
-<p><b>Moodle Directory:</b>
-Specify the full directory path to this installation
-Make sure the upper/lower case is correct.</p>
-
-<p><b>Data Directory:</b>
-You need a place where Moodle can save uploaded files.  This
-directory should be readable AND WRITEABLE by the web server user 
-(usually \'nobody\' or \'apache\'), but it must not be accessible 
-directly via the web.</p>';
 $string['directorysettingshead'] = 'Please confirm the locations of this Moodle installation';
 $string['directorysettingssub'] = '<b>Web Address:</b>
 Specify the full web address where Moodle will be accessed.  
@@ -184,7 +136,6 @@ $string['downloadlanguagebutton'] = 'Download the &quot;$a&quot; language pack';
 $string['downloadlanguagehead'] = 'Download language pack';
 $string['downloadlanguagenotneeded'] = 'You may continue the installation process using the default language pack, \"$a\".';
 $string['downloadlanguagesub'] = 'You now have the option of downloading a language pack and continuing the installation process in this language.<br /><br />If you are unable to download the language pack, the installation process will continue in English. (Once the installation process is complete, you will have the opportunity to download and install additional language packs.)';
-$string['doyouagree'] = 'Have you read these conditions and understood them?';
 $string['environmenterrortodo'] = 'You must solve all the environmental problems (errors) found above before proceeding to install this Moodle version!';
 $string['environmenthead'] = 'Checking your environment ...';
 $string['environmentrecommendcustomcheck'] = 'if this test fails, it indicates a potential problem';
@@ -235,7 +186,6 @@ $string['help'] = 'Help';
 $string['iconvrecommended'] = 'Installing the optional ICONV library is highly recommended in order to improve site performance, particularly if your site is supporting non-latin languages.';
 $string['info'] = 'Information';
 $string['installation'] = 'Installation';
-$string['invalidemail'] = 'Invalid email address';
 $string['invalidmd5'] = 'Invalid md5';
 $string['langdownloaderror'] = 'Unfortunately the language \"$a\" was not installed. The installation process will continue in English.';
 $string['langdownloadok'] = 'The language \"$a\" was installed successfully. The installation process will continue in this language.';
@@ -275,8 +225,8 @@ $string['memorylimithelp'] = '<p>The PHP memory limit for your server is current
 $string['missingrequiredfield'] = 'Some required field is missing';
 $string['moodledocslink'] = 'Moodle Docs for this page';
 $string['mssql'] = 'SQL*Server (mssql)';
-$string['mssql_n'] = 'SQL*Server with UTF-8 support (mssql_n)';
 $string['mssqlextensionisnotpresentinphp'] = 'PHP has not been properly configured with the MSSQL extension so that it can communicate with SQL*Server.  Please check your php.ini file or recompile PHP.';
+$string['mssql_n'] = 'SQL*Server with UTF-8 support (mssql_n)';
 $string['mysql'] = 'MySQL (mysql)';
 $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.';
@@ -285,8 +235,8 @@ $string['name'] = 'Name';
 $string['next'] = 'Next';
 $string['oci8po'] = 'Oracle (oci8po)';
 $string['ociextensionisnotpresentinphp'] = 'PHP has not been properly configured with the OCI8 extension so that it can communicate with Oracle.  Please check your php.ini file or recompile PHP.';
-$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'PHP has not been properly configured with the ODBC extension so that it can communicate with SQL*Server.  Please check your php.ini file or recompile PHP.';
+$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['ok'] = 'OK';
 $string['opensslrecommended'] = 'Installing the optional OpenSSL library is highly recommended -- it enables Moodle Networking functionality.';
 $string['pass'] = 'Pass';
@@ -301,7 +251,6 @@ $string['phpversionhelp'] = '<p>Moodle requires a PHP version of at least 4.3.0
 (In case of 5.0.x you could also downgrade to 4.4.x version)</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Previous';
-$string['releasenoteslink'] = 'For information about this version of Moodle, please see the online <a target=\"_new\" href=\"$a\">Release Notes</a>';
 $string['remotedownloadnotallowed'] = 'Download of components to your server isn\'t allowed (allow_url_fopen is disabled).<br /><br />You must download the <a href=\"$a->url\">$a->url</a> file manually, copy it to \"$a->dest\" in your server and unzip it there.';
 $string['report'] = 'Report';
 $string['restricted'] = 'Restricted';

install/lang/es_es_utf8/installer.php

@@ -11,10 +11,8 @@
 
 $string['closewindow'] = 'Cerrar esta ventana';
 $string['continue'] = 'Continuar';
-$string['doyouagree'] = '¿Ha leído y comprendido estas condiciones?';
 $string['error'] = 'Error';
 $string['help'] = 'Ayuda';
-$string['invalidemail'] = 'Dirección de correo no válida';
 $string['language'] = 'Idioma';
 $string['name'] = 'Nombre';
 $string['next'] = 'Siguiente';