diff --git a/README.txt b/README.txt index 4a207c22dfd24..82627eb945717 100644 --- a/README.txt +++ b/README.txt @@ -1,18 +1,18 @@ QUICK INSTALL ============= -For the impatient, here is a basic outline of the -installation process, which normally takes me only +For the impatient, here is a basic outline of the +installation process, which normally takes me only a few minutes: -1) Move the Moodle files into your web directory. +1) Move the Moodle files into your web directory. 2) Create a single database for Moodle to store all it's tables in (or choose an existing database). -3) Visit your Moodle site with a browser, you should +3) Visit your Moodle site with a browser, you should be taken to the install.php script, which will lead - you through creating a config.php file and then + you through creating a config.php file and then setting up Moodle, creating an admin account etc. 4) Set up a cron task to call the file admin/cron.php @@ -21,9 +21,9 @@ a few minutes: For more information, see the INSTALL DOCUMENTATION: - http://docs.moodle.org/en/Installing_Moodle + http://docs.moodle.org/en/Installing_Moodle -A local copy can also be found in +A local copy can also be found in lang/en_utf8/help/install.html (or your language) diff --git a/TRADEMARK.txt b/TRADEMARK.txt index f38d588345c07..d73a0765b19b3 100644 --- a/TRADEMARK.txt +++ b/TRADEMARK.txt @@ -4,29 +4,29 @@ Moodle Trademark License The name Moodle™ is a registered trademark of the Moodle Trust. -A key part of the business model that allows us to produce and -distribute Moodle as completely Free open source software is that -we restrict the commercial use of the Moodle trademark to those +A key part of the business model that allows us to produce and +distribute Moodle as completely Free open source software is that +we restrict the commercial use of the Moodle trademark to those who have contracted to support Moodle development (Moodle Partners). -If you are intending to use the name (and/or logo) to advertise -generic Moodle™ services (eg Moodle Hosting, Moodle Support, -Moodle Certification, Moodle Training, Moodle Consulting, -Moodle Customisation, Moodle Courseware Development, Moodle -Theme design, Moodle Integrations, Moodle Installations, etc) -or as the name of a software package, then you must seek -direct permission in writing from the Moodle Trust via the -moodle.com helpdesk, in accordance with normal trademark +If you are intending to use the name (and/or logo) to advertise +generic Moodle™ services (eg Moodle Hosting, Moodle Support, +Moodle Certification, Moodle Training, Moodle Consulting, +Moodle Customisation, Moodle Courseware Development, Moodle +Theme design, Moodle Integrations, Moodle Installations, etc) +or as the name of a software package, then you must seek +direct permission in writing from the Moodle Trust via the +moodle.com helpdesk, in accordance with normal trademark restrictions. -There are no restrictions on how you use the name in other -contexts (for example, if you use Moodle just to provide -courses then you can use the name freely to refer to it.) +There are no restrictions on how you use the name in other +contexts (for example, if you use Moodle just to provide +courses then you can use the name freely to refer to it.) -If you aren't sure of a particular case, please ask us via -http://moodle.com/helpdesk: we'll be happy to either provide -you with official permission in writing or help you fix -your wording. +If you aren't sure of a particular case, please ask us via +http://moodle.com/helpdesk: we'll be happy to either provide +you with official permission in writing or help you fix +your wording. Martin Dougiamas Executive Director diff --git a/blog/external_blogs.php b/blog/external_blogs.php index f789d0c873b26..796f970a91c1c 100644 --- a/blog/external_blogs.php +++ b/blog/external_blogs.php @@ -45,7 +45,7 @@ if ($externalbloguserid == $USER->id) { $DB->delete_records('blog_external', array('id' => $delete)); $message = get_string('externalblogdeleted', 'blog'); - } + } } $blogs = $DB->get_records('blog_external', array('userid' => $USER->id)); diff --git a/blog/lib.php b/blog/lib.php index 14f8b108c4472..85f1b9cf1bbd8 100755 --- a/blog/lib.php +++ b/blog/lib.php @@ -316,7 +316,7 @@ function blog_get_headers() { $blogurl = new moodle_url($CFG->wwwroot . '/blog/index.php'); // If the title is not yet set, it's likely that the context isn't set either, so skip this part - $pagetitle = $PAGE->title; + $pagetitle = $PAGE->title; if (!empty($pagetitle)) { $contexturl = blog_get_context_url(); diff --git a/comment/admin.js b/comment/admin.js index 6e25f5923e638..dc29ba930e14b 100644 --- a/comment/admin.js +++ b/comment/admin.js @@ -1,4 +1,4 @@ -YAHOO.util.Event.onDOMReady(init); +YAHOO.util.Event.onDOMReady(init); function init() { var select_all = document.getElementById('comment_select_all'); select_all.onclick = function() { @@ -37,7 +37,7 @@ function delete_comments() { } var data = { 'commentids': list, - 'sesskey': moodle_cfg.sesskey + 'sesskey': moodle_cfg.sesskey } var trans = YAHOO.util.Connect.asyncRequest('POST', url+'?action=delete', cb, build_querystring(data)); diff --git a/comment/comment.js b/comment/comment.js index 13430641d315d..7d4feeb3cc6ce 100644 --- a/comment/comment.js +++ b/comment/comment.js @@ -86,7 +86,7 @@ function post_comment(cid) { backgroundColor: { to: '#FFE390' } }; var anim = new YAHOO.util.ColorAnim(ids[i], attributes); - anim.animate(); + anim.animate(); } } } @@ -102,7 +102,7 @@ function post_comment(cid) { backgroundColor: { from: '#FFE390', to:'#FFFFFF' } }; var anim = new YAHOO.util.ColorAnim('dlg-content-'+cid, attributes); - anim.animate(); + anim.animate(); } } function delete_comment(client_id, comment_id) { @@ -128,11 +128,11 @@ function delete_comment(client_id, comment_id) { height:{to:0} }; var anim = new YAHOO.util.Anim(htmlid, attributes, 1, YAHOO.util.Easing.easeOut); - anim.onComplete.subscribe(this.remove_dom, [], this); - anim.animate(); + anim.onComplete.subscribe(this.remove_dom, [], this); + anim.animate(); }, remove_dom: function() { - this.el.parentNode.removeChild(this.el); + this.el.parentNode.removeChild(this.el); } } var trans = YAHOO.util.Connect.asyncRequest('POST', diff --git a/comment/lib.php b/comment/lib.php index 48187c69f55ec..6ebabeb9200a5 100644 --- a/comment/lib.php +++ b/comment/lib.php @@ -11,7 +11,7 @@ class comment_manager { /** * Return comments by pages - * @param int $page + * @param int $page * @return mixed */ function get_comments($page) { @@ -22,7 +22,7 @@ function get_comments($page) { } else { $start = $page*$this->perpage; } - $sql = "SELECT c.id, c.contextid, c.itemid, c.commentarea, c.userid, c.content, u.username, u.firstname, u.lastname, c.timecreated + $sql = "SELECT c.id, c.contextid, c.itemid, c.commentarea, c.userid, c.content, u.username, u.firstname, u.lastname, c.timecreated FROM {comments} c, {user} u WHERE u.id=c.userid ORDER BY c.timecreated ASC"; @@ -75,7 +75,7 @@ private function _setup_plugin($comment) { /** * Print comments - * @param int $page + * @param int $page */ function print_comments($page=0) { global $CFG, $OUTPUT, $DB; @@ -100,14 +100,14 @@ function print_comments($page=0) { $action .= "".get_string('commentincontext').''; } $table->data[] = array($checkbox, $c->username, $c->content, $action); - } + } echo $OUTPUT->table($table); echo $OUTPUT->paging_bar(moodle_paging_bar::make($count, $page, $this->perpage, $CFG->wwwroot.'/comment/index.php')); } /** * delete a comment - * @param int $commentid + * @param int $commentid */ public function delete_comment($commentid) { global $DB; @@ -118,7 +118,7 @@ public function delete_comment($commentid) { } /** * delete comments - * @param int $commentid + * @param int $commentid */ public function delete_comments($list) { global $DB; diff --git a/error/index.php b/error/index.php index 9dac9675631b2..bf7f1c93c86af 100644 --- a/error/index.php +++ b/error/index.php @@ -6,7 +6,7 @@ if ($form = data_submitted()) { // form submitted, do not check referer (original page unknown)! /// Only deal with real users - if (!isloggedin()) { + if (!isloggedin()) { redirect($CFG->wwwroot); } @@ -32,7 +32,7 @@ $eventdata->fullmessagehtml = ''; $eventdata->smallmessage = ''; events_trigger('message_send', $eventdata); - + redirect($CFG->wwwroot .'/course/', 'Message sent, thanks', 3); exit; } @@ -41,7 +41,7 @@ $redirecturl = empty($_SERVER['REDIRECT_URL']) ? '' : $_SERVER['REDIRECT_URL']; $httpreferer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']; $requesturi = empty($_SERVER['REQUEST_URI']) ? '' : $_SERVER['REQUEST_URI']; - + header("HTTP/1.0 404 Not Found"); header("Status: 404 Not Found"); diff --git a/group/clientlib.js b/group/clientlib.js index f074ec1afb1bd..2ab972424f078 100644 --- a/group/clientlib.js +++ b/group/clientlib.js @@ -1,6 +1,6 @@ /** * Client-side JavaScript for group management interface. - * @author vy-shane AT moodle.com + * @author vy-shane AT moodle.com * @license http://www.gnu.org/copyleft/gpl.html GNU Public License * @package groups */ @@ -144,7 +144,7 @@ UpdatableMembersCombo.prototype.refreshMembers = function () { if(singleSelection) { createLoaderImg("membersloader", "memberslabel", this.wwwRoot); } - + // Update the label. var spanEl = document.getElementById("thegroup"); if (singleSelection) { @@ -160,7 +160,7 @@ UpdatableMembersCombo.prototype.refreshMembers = function () { selectEl.removeChild(selectEl.firstChild); } } - + document.getElementById("showaddmembersform").disabled = !singleSelection; document.getElementById("showeditgroupsettingsform").disabled = !singleSelection; document.getElementById("deletegroup").disabled = selectionCount == 0; diff --git a/group/index.php b/group/index.php index 6e3f62963ecb2..7c33cf8a6df34 100644 --- a/group/index.php +++ b/group/index.php @@ -197,7 +197,7 @@ $selectedname = $groupname; } } - + echo "\n"; } } else { diff --git a/group/lib.php b/group/lib.php index 9abacf49a4522..0dc59a461f244 100644 --- a/group/lib.php +++ b/group/lib.php @@ -119,7 +119,7 @@ function groups_remove_member($grouporid, $userorid) { function groups_create_group($data, $editform=false) { global $CFG, $DB; require_once("$CFG->libdir/gdlib.php"); - + //check that courseid exists $course = $DB->get_record('course', array('id' => $data->courseid), '*', MUST_EXIST); @@ -413,7 +413,7 @@ function groups_delete_groupings($courseid, $showfeedback=false) { /** * Obtains a list of the possible roles that group members might come from, - * on a course. Generally this includes all the roles who would have + * on a course. Generally this includes all the roles who would have * course:view on that course, except the doanything roles. * @param object $context Context of course * @return Array of role ID integers, or false if error/none. @@ -450,7 +450,7 @@ function groups_get_possible_roles($context) { return $validroleids; } else { return false; // No need to continue, since no roles have this capability set - } + } } @@ -579,7 +579,7 @@ function groups_unassign_grouping($groupingid, $groupid) { /** * Lists users in a group based on their role on the course. - * Returns false if there's an error or there are no users in the group. + * Returns false if there's an error or there are no users in the group. * Otherwise returns an array of role ID => role data, where role data includes: * (role) $id, $shortname, $name * $users: array of objects for each user which include the specified fields @@ -600,7 +600,7 @@ function groups_get_members_by_role($groupid, $courseid, $fields='u.*', global $CFG, $DB; // Retrieve information about all users and their roles on the course or - // parent ('related') contexts + // parent ('related') contexts $context = get_context_instance(CONTEXT_COURSE, $courseid); if ($extrawheretest) { @@ -611,7 +611,7 @@ function groups_get_members_by_role($groupid, $courseid, $fields='u.*', u.id AS userid, $fields FROM {groups_members} gm JOIN {user} u ON u.id = gm.userid - JOIN {role_assignments} ra ON ra.userid = u.id + JOIN {role_assignments} ra ON ra.userid = u.id JOIN {role} r ON r.id = ra.roleid WHERE gm.groupid=? AND ra.contextid ".get_related_contexts_string($context). @@ -630,7 +630,7 @@ function groups_get_members_by_role($groupid, $courseid, $fields='u.*', * * @param object $rs The record set (may be false) * @param int $contextid ID of course context - * @return array As described in groups_get_members_by_role + * @return array As described in groups_get_members_by_role */ function groups_calculate_role_people($rs, $context) { global $CFG, $DB; diff --git a/group/members.php b/group/members.php index 98fbaa60881da..c95164fc030f0 100644 --- a/group/members.php +++ b/group/members.php @@ -42,7 +42,7 @@ $potentialmembersselector = new group_non_members_selector('addselect', array('groupid' => $groupid, 'courseid' => $course->id)); $potentialmembersselector->set_extra_fields(array()); - + if (optional_param('add', false, PARAM_BOOL) && confirm_sesskey()) { $userstoadd = $potentialmembersselector->get_selected_users(); if (!empty($userstoadd)) { diff --git a/group/simpletest/ broken_testexternal.php b/group/simpletest/ broken_testexternal.php index 9794c7326ab39..50c67cb1b629c 100644 --- a/group/simpletest/ broken_testexternal.php +++ b/group/simpletest/ broken_testexternal.php @@ -237,11 +237,11 @@ function test_add_group_members2() { } function test_add_group_members3() { - //the user is not a participant + //the user is not a participant $params = array(array("groupid" => $this->group->id, "userid" => $this->userid5)); $this->expectException(new moodle_exception('userisnotaparticipant')); $result = group_external::add_groupmembers($params); - + } function test_get_groupmembers() { @@ -249,7 +249,7 @@ function test_get_groupmembers() { $groups = group_external::get_groupmembers($params); $this->assertEqual(sizeof($groups), 2); $this->assertEqual(sizeof($groups[0]['members']), 2); - $this->assertEqual(sizeof($groups[1]['members']), 1); + $this->assertEqual(sizeof($groups[1]['members']), 1); } function test_delete_group_members() { diff --git a/install.php b/install.php index 283140b00f43c..d12826dbf643e 100644 --- a/install.php +++ b/install.php @@ -158,7 +158,7 @@ ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include_path')); //point zend include path to moodles lib/zend so that includes and requires will search there for files before anywhere else ini_set('include_path', $CFG->libdir.'/zend' . PATH_SEPARATOR . ini_get('include_path')); - + require('version.php'); $CFG->target_release = $release; diff --git a/install/README.txt b/install/README.txt index c2eead85c5205..b72d814277942 100644 --- a/install/README.txt +++ b/install/README.txt @@ -1,6 +1,6 @@ The file stringnames.txt contains a list of all the strings used during the install process. -A daily cron job will pick up the changes to this file and update all the language files +A daily cron job will pick up the changes to this file and update all the language files (ie those in install/lang/*/install.php) automatically. diff --git a/iplookup/README.txt b/iplookup/README.txt index 4295eb20772b9..f68a610052d6b 100644 --- a/iplookup/README.txt +++ b/iplookup/README.txt @@ -20,4 +20,4 @@ original Earth map from: marker.gif custom made in Inkscape -Petr Skoda (skodak), January 2008 +Petr Skoda (skodak), January 2008 diff --git a/lib/blocklib.php b/lib/blocklib.php index 6f6aa04a61596..e7e01e5abbb5a 100644 --- a/lib/blocklib.php +++ b/lib/blocklib.php @@ -1273,7 +1273,7 @@ public function process_url_move() { } $this->reposition_block($block->instance->id, $newregion, $newweight); } - + $this->page->ensure_param_not_in_url('bui_moveid'); $this->page->ensure_param_not_in_url('bui_newregion'); $this->page->ensure_param_not_in_url('bui_newweight'); diff --git a/lib/boxlib.php b/lib/boxlib.php index a412cbb26ec02..a647223209906 100755 --- a/lib/boxlib.php +++ b/lib/boxlib.php @@ -56,13 +56,13 @@ public function __construct($api_key, $auth_token = '', $debug = false) { } else { $this->debug = false; } - } + } /** * Setup for Functions * * @param string $method * @param array $params - * @return array + * @return array */ function makeRequest($method, $params = array()) { $this->_clearErrors(); @@ -88,7 +88,7 @@ function makeRequest($method, $params = array()) { } /** * @param array $params - * @return array + * @return array */ function getTicket($params = array()) { $params['api_key'] = $this->api_key; @@ -217,7 +217,7 @@ function buildtree($sax, &$tree){ $tmp = array('title'=>(string)$file->attributes()->file_name, 'size'=>display_size((int)$file->attributes()->size), 'thumbnail'=>$thumbnail, - 'date'=>userdate((int)$file->attributes()->updated), + 'date'=>userdate((int)$file->attributes()->updated), 'source'=>'http://box.net/api/1.0/download/' .$this->auth_token.'/'.(string)$file->attributes()->id, 'url'=>(string)$file->attributes()->shared_link); @@ -333,7 +333,7 @@ function CreateFolder($new_folder_name, $params = array()) { return $ret_array; } - /** + /** * Upload a File * @param array $params the file MUST be present in key 'file' and be a moodle stored_file object. * @return array|bool Array or false diff --git a/lib/csvlib.class.php b/lib/csvlib.class.php index 8ef0878395ff2..5bf1d4f2d5994 100644 --- a/lib/csvlib.class.php +++ b/lib/csvlib.class.php @@ -1,6 +1,6 @@ . /** * This is a one-line short description of the file * - * You can have a rather longer description of the file as well, + * You can have a rather longer description of the file as well, * if you like, and it can span multiple lines. - * + * * @copyright Petr Skoda * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @package moodlecore diff --git a/lib/customcheckslib.php b/lib/customcheckslib.php index 5d860b27e7f97..38eee30baaf79 100644 --- a/lib/customcheckslib.php +++ b/lib/customcheckslib.php @@ -1,6 +1,6 @@ . diff --git a/lib/db/messages.php b/lib/db/messages.php index 2a4f2d6b164b4..2b1e4dc2f4447 100644 --- a/lib/db/messages.php +++ b/lib/db/messages.php @@ -29,7 +29,7 @@ $messageproviders = array ( /// Notices that an admin might be interested in - 'notices' => array ( + 'notices' => array ( 'capability' => 'moodle/site:config' ), @@ -40,5 +40,5 @@ 'instantmessage' => array ( ), - + ); diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php index 233d68452240b..04377c204066d 100644 --- a/lib/deprecatedlib.php +++ b/lib/deprecatedlib.php @@ -3678,7 +3678,7 @@ function build_navigation($extranavlinks, $cm = null) { } } } - + return(array('newnav' => true, 'navlinks' => array())); } diff --git a/lib/dropdown.js b/lib/dropdown.js index c922db52b4698..617693f23b532 100644 --- a/lib/dropdown.js +++ b/lib/dropdown.js @@ -9,14 +9,14 @@ These functions fix this problem. global variables Note: -if I didn't use global variables, we would need to pass them as parameter: -=> in initSelect(): +if I didn't use global variables, we would need to pass them as parameter: +=> in initSelect(): I would write "theSelect.onchange = selectChanged(...);" This code causes a javascript error on IE. (not firefox) so I had to write theSelect.onchange = selectChanged; It's why I use global variables . Because I use global variables, I didn't put this code in javascript-static.js. This file is loaded in javascript.php. -*/ +*/ var select_formid; var select_targetwindow; @@ -37,14 +37,14 @@ function initSelect(formId,targetWindow) theSelect.onchange = selectChanged; theSelect.onkeydown = selectKeyed; theSelect.onclick = selectClicked; - + return true; } function selectChanged(theElement) { var theSelect; - + if (theElement && theElement.value) { theSelect = theElement; @@ -53,15 +53,15 @@ function selectChanged(theElement) { theSelect = this; } - + if (!theSelect.changed) { return false; } //here is the onchange redirection - select_targetwindow.location=document.getElementById(select_formid).jump.options[document.getElementById(select_formid).jump.selectedIndex].value; - + select_targetwindow.location=document.getElementById(select_formid).jump.options[document.getElementById(select_formid).jump.selectedIndex].value; + return true; } @@ -73,7 +73,7 @@ function selectClicked() function selectFocussed() { this.initValue = this.value; - + return true; } @@ -85,7 +85,7 @@ function selectKeyed(e) var keyCodeTab = "9"; var keyCodeEnter = "13"; var keyCodeEsc = "27"; - + if (e) { theEvent = e; @@ -108,6 +108,6 @@ function selectKeyed(e) { this.changed = false; } - + return true; } \ No newline at end of file diff --git a/lib/dtl/dbdata.xsd b/lib/dtl/dbdata.xsd index 174aaba022fe6..745e2b154f3b2 100644 --- a/lib/dtl/dbdata.xsd +++ b/lib/dtl/dbdata.xsd @@ -1,6 +1,6 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/eaccelerator.class.php b/lib/eaccelerator.class.php index 44b7fc59563c5..9636308e3d9f3 100644 --- a/lib/eaccelerator.class.php +++ b/lib/eaccelerator.class.php @@ -1,7 +1,7 @@ . /** * This class abstracts eaccelerator/turckmmcache * API to provide - * + * * - get() * - set() * - delete() @@ -26,7 +26,7 @@ * - releaseforfill() * * Note: do NOT store booleans here. For compatibility with - * memcached, a false value is indistinguisable from a + * memcached, a false value is indistinguisable from a * "not found in cache" response. * * @copyright Martin Langhoff @@ -105,38 +105,38 @@ function get($key) { return false; } return unserialize($rec); - } - + } + /** * @todo Document this function * * @param string $key * @return mixed - */ + */ function delete($key) { $fn = $this->mode . '_rm'; return $fn($this->prefix . $key); } /** - * In the simple case, this function will + * In the simple case, this function will * get the cached value if available. If the entry * is not cached, it will try to get an exclusive * lock that announces that this process will * populate the cache. * * If we fail to get the lock -- this means another - * process is doing it. + * process is doing it. * so we wait (block) for a few microseconds while we wait for * the cache to be filled or the lock to timeout. - * + * * If you get a false from this call, you _must_ * populate the cache ASAP or indicate that * you won't by calling releaseforfill(). * - * This technique forces serialisation and so helps deal - * with thundering herd scenarios where a lot of clients - * ask the for the same idempotent (and costly) operation. + * This technique forces serialisation and so helps deal + * with thundering herd scenarios where a lot of clients + * ask the for the same idempotent (and costly) operation. * The implementation is based on suggestions in this message * http://marc.theaimsgroup.com/?l=git&m=116562052506776&w=2 * @@ -146,7 +146,7 @@ function delete($key) { function getforfill ($key) { $get = $this->mode . '_get'; $lock = $this->mode . '_lock'; - + $rec = $get($this->prefix . $key); if (!is_null($rec)) { return unserialize($rec); @@ -170,7 +170,7 @@ function getforfill ($key) { } /** - * Release the exclusive lock obtained by + * Release the exclusive lock obtained by * getforfill(). See getforfill() * for more details. * diff --git a/lib/evalmath/evalmath.class.php b/lib/evalmath/evalmath.class.php index 5af83986bccc7..c4cfdcea73a27 100644 --- a/lib/evalmath/evalmath.class.php +++ b/lib/evalmath/evalmath.class.php @@ -10,7 +10,7 @@ NAME EvalMath - safely evaluate math expressions - + SYNOPSIS evaluate('3*f(42,a)'); ?> - + DESCRIPTION - Use the EvalMath class when you want to evaluate mathematical expressions + Use the EvalMath class when you want to evaluate mathematical expressions from untrusted sources. You can define your own variables and functions, which are stored in the object. Try it, it's fun! @@ -37,13 +37,13 @@ Evaluates the expression and returns the result. If an error occurs, prints a warning and returns false. If $expr is a function assignment, returns true on success. - + $m->e($expr) A synonym for $m->evaluate(). - + $m->vars() Returns an associative array of all user-defined variables and values. - + $m->funcs() Returns an array of all user-defined functions. @@ -62,7 +62,7 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1 Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright @@ -71,7 +71,7 @@ 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -89,14 +89,14 @@ /** * This class was heavily modified in order to get usefull spreadsheet emulation ;-) * skodak - * + * */ class EvalMath { var $suppress_errors = false; var $last_error = null; - + var $v = array(); // variables (and constants) var $f = array(); // user-defined functions var $vb = array(); // constants @@ -110,14 +110,14 @@ class EvalMath { 'average'=>array(-1), 'max'=>array(-1), 'min'=>array(-1), 'mod'=>array(2), 'pi'=>array(0), 'power'=>array(2), 'round'=>array(1, 2), 'sum'=>array(-1)); - + function EvalMath() { } - + function e($expr) { return $this->evaluate($expr); } - + function evaluate($expr) { $this->last_error = null; $expr = trim($expr); @@ -157,11 +157,11 @@ function evaluate($expr) { return $this->pfx($this->nfx($expr)); // straight up evaluation, woo } } - + function vars() { return $this->v; } - + function funcs() { $output = array(); foreach ($this->f as $fnn=>$dat) @@ -173,23 +173,23 @@ function funcs() { // Convert infix to postfix notation function nfx($expr) { - + $index = 0; $stack = new EvalMathStack; $output = array(); // postfix form of expression, to be passed to pfx() $expr = trim(strtolower($expr)); - + $ops = array('+', '-', '*', '/', '^', '_'); - $ops_r = array('+'=>0,'-'=>0,'*'=>0,'/'=>0,'^'=>1); // right-associative operator? + $ops_r = array('+'=>0,'-'=>0,'*'=>0,'/'=>0,'^'=>1); // right-associative operator? $ops_p = array('+'=>0,'-'=>0,'*'=>1,'/'=>1,'_'=>1,'^'=>2); // operator precedence - + $expecting_op = false; // we use this in syntax-checking the expression // and determining when a - is a negation - + if (preg_match("/[^\w\s+*^\/()\.,-]/", $expr, $matches)) { // make sure the characters are all good return $this->trigger("illegal character '{$matches[0]}'"); } - + while(1) { // 1 Infinite Loop ;) $op = substr($expr, $index, 1); // get the first character at the current index // find out if we're currently at the beginning of a number/variable/function/parenthesis/operand @@ -198,7 +198,7 @@ function nfx($expr) { if ($op == '-' and !$expecting_op) { // is it a negation instead of a minus? $stack->push('_'); // put a negation on the stack $index++; - } elseif ($op == '_') { // we have to explicitly deny this, because it's legal on the stack + } elseif ($op == '_') { // we have to explicitly deny this, because it's legal on the stack return $this->trigger("illegal character '_'"); // but not in the input expression //=============== } elseif ((in_array($op, $ops) or $ex) and $expecting_op) { // are we putting an operator on the stack? @@ -243,7 +243,7 @@ function nfx($expr) { $index++; //=============== } elseif ($op == ',' and $expecting_op) { // did we just finish a function argument? - while (($o2 = $stack->pop()) != '(') { + while (($o2 = $stack->pop()) != '(') { if (is_null($o2)) return $this->trigger("unexpected ','"); // oops, never had a ( else $output[] = $o2; // pop the argument expression stuff and push onto the output } @@ -307,11 +307,11 @@ function nfx($expr) { break; } } - while (substr($expr, $index, 1) == ' ') { // step the index past whitespace (pretty much turns whitespace + while (substr($expr, $index, 1) == ' ') { // step the index past whitespace (pretty much turns whitespace $index++; // into implicit multiplication if no operator is there) } - - } + + } while (!is_null($op = $stack->pop())) { // pop everything off the stack and push onto output if ($op == '(') return $this->trigger("expecting ')'"); // if there are (s on the stack, ()s were unbalanced $output[] = $op; @@ -321,11 +321,11 @@ function nfx($expr) { // evaluate postfix notation function pfx($tokens, $vars = array()) { - + if ($tokens == false) return false; - + $stack = new EvalMathStack; - + foreach ($tokens as $token) { // nice and easy // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on @@ -393,7 +393,7 @@ function pfx($tokens, $vars = array()) { if ($stack->count != 1) return $this->trigger("internal error"); return $stack->pop(); } - + // trigger an error, but nicely, if need be function trigger($msg) { $this->last_error = $msg; @@ -407,12 +407,12 @@ class EvalMathStack { var $stack = array(); var $count = 0; - + function push($val) { $this->stack[$this->count] = $val; $this->count++; } - + function pop() { if ($this->count > 0) { $this->count--; @@ -420,7 +420,7 @@ function pop() { } return null; } - + function last($n=1) { if ($this->count - $n >= 0) { return $this->stack[$this->count-$n]; diff --git a/lib/form/editor.php b/lib/form/editor.php index 271895aa9124e..0eae06bb1a4cf 100644 --- a/lib/form/editor.php +++ b/lib/form/editor.php @@ -189,7 +189,7 @@ function toHtml() { $str .= $PAGE->requires->js_function_call('destroy_item', array("{$id}_filemanager"))->asap(); } } else { - // should disable file picker + // should disable file picker $str .= 'No file allowed'; } diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js index 958adfd9196cc..6dbab8ff00258 100644 --- a/lib/form/filemanager.js +++ b/lib/form/filemanager.js @@ -163,12 +163,12 @@ function html_compiler(client_id, options) { // hide file browser and breadcrumb container.style.display='none'; if (options.path.length <= 1) { - breadcrumb.style.display='none'; + breadcrumb.style.display='none'; } return; } else { container.style.display='block'; - breadcrumb.style.display='block'; + breadcrumb.style.display='block'; } count = 0; for(var i in list) { @@ -211,7 +211,7 @@ function html_compiler(client_id, options) { } break; } - var fullname = list[i].fullname; + var fullname = list[i].fullname; if (ismainfile) { fullname = ""+list[i].fullname+" "; } @@ -567,7 +567,7 @@ function create_menu(ev, menuid, menuitems, file, options) { var rootNode = tree.getRoot(); tree.setDynamicLoad(this.loadDataForNode); - tree.removeChildren(rootNode); + tree.removeChildren(rootNode); var textnode = {label: "Files", path: '/', itemid: obj.itemid}; var tmpNode = new YAHOO.widget.TextNode(textnode, rootNode, true); tree.draw(); @@ -614,10 +614,10 @@ function setup_filebrowser(client_id, options) { fm_cfg[client_id] = options; fm_cfg[client_id].mainfile = options.mainfile; fm_cfg[client_id].currentpath = '/'; - fm_cfg[client_id].currentfiles = 0; + fm_cfg[client_id].currentfiles = 0; // XXX: When editing existing folder, currentfiles shouldn't // be 0 - fm_cfg[client_id].maxfiles = options.maxfiles; + fm_cfg[client_id].maxfiles = options.maxfiles; if (options.mainfile) { var mainfilename = document.getElementById(options.mainfile+'-id'); if (mainfilename.value) { @@ -683,7 +683,7 @@ function setup_buttons(client_id, options) { success:function(o) { var result = json_decode(o.responseText); refresh_filemanager(result.filepath, fm_cfg[this.client_id]); - var win = window.open(result.fileurl, 'fm-download-folder'); + var win = window.open(result.fileurl, 'fm-download-folder'); if (!win) { alert(mstr.repository.popupblockeddownload); } diff --git a/lib/form/header.php b/lib/form/header.php index 4825c2337d19b..86bef4db58183 100644 --- a/lib/form/header.php +++ b/lib/form/header.php @@ -18,7 +18,7 @@ class MoodleQuickForm_header extends HTML_QuickForm_header function MoodleQuickForm_header($elementName = null, $text = null) { parent::HTML_QuickForm_header($elementName, $text); } - + // {{{ accept() /** diff --git a/lib/form/hidden.php b/lib/form/hidden.php index 4aa14a7a04d25..70014cb78466f 100644 --- a/lib/form/hidden.php +++ b/lib/form/hidden.php @@ -18,7 +18,7 @@ class MoodleQuickForm_hidden extends HTML_QuickForm_hidden{ function MoodleQuickForm_hidden($elementName=null, $value='', $attributes=null) { parent::HTML_QuickForm_hidden($elementName, $value, $attributes); } - + /** * set html for help button * diff --git a/lib/form/text.php b/lib/form/text.php index 5b9a20d315df8..9c650a719fd27 100644 --- a/lib/form/text.php +++ b/lib/form/text.php @@ -19,7 +19,7 @@ class MoodleQuickForm_text extends HTML_QuickForm_text{ function MoodleQuickForm_text($elementName=null, $elementLabel=null, $attributes=null) { parent::HTML_QuickForm_text($elementName, $elementLabel, $attributes); } - + function setHiddenLabel($hiddenLabel){ $this->_hiddenLabel = $hiddenLabel; } diff --git a/lib/gdlib.php b/lib/gdlib.php index 26a2cceb3d021..1982a94ebccf2 100644 --- a/lib/gdlib.php +++ b/lib/gdlib.php @@ -1,7 +1,7 @@ . @@ -30,14 +30,14 @@ * @global object * @param object $dst_img * @param object $src_img - * @param int $dst_x - * @param int $dst_y - * @param int $src_x - * @param int $src_y - * @param int $dst_w - * @param int $dst_h - * @param int $src_w - * @param int $src_h + * @param int $dst_x + * @param int $dst_y + * @param int $src_x + * @param int $src_y + * @param int $dst_w + * @param int $dst_h + * @param int $src_w + * @param int $src_h * @return bool * @todo Finish documenting this function */ @@ -124,7 +124,7 @@ function create_profile_image_destination($id, $dir='user') { return false; } } - + if ($dir == 'user') { $destination = make_user_directory($id, true); } else { diff --git a/lib/htaccess b/lib/htaccess index 380fc541ef773..d0597fcd81055 100644 --- a/lib/htaccess +++ b/lib/htaccess @@ -1,19 +1,19 @@ # On some PHP servers it may help if this file is copied # to the main moodle directory and renamed .htaccess # -# As soon as you do this, check your web site. Is it +# As soon as you do this, check your web site. Is it # still working OK? If you are getting a "configuration # error" then you may need to enable overrides by editing # the main httpd.conf for Apache and in the main server # or virtual server area, adding something like: # # -# AllowOverride All +# AllowOverride All # # ### Firstly, if you are using Apache 2, you need the following -### three lines to allow Apache to pass a PATH_INFO variable +### three lines to allow Apache to pass a PATH_INFO variable ### correctly for URLs like http://server/file.php/arg1/arg2 @@ -42,7 +42,7 @@ php_flag session.bug_compat_warn 0 LimitRequestBody 0 -### These are optional - you may not want to override php.ini +### These are optional - you may not want to override php.ini ### To enable them, remove the leading hash (#) #php_value upload_max_filesize 2M @@ -50,9 +50,9 @@ LimitRequestBody 0 #php_value session.gc_maxlifetime 7200 -### You can change the following line to point to the -### error/index.php file in your Moodle distribution. -### It provides a form which emails you (the admin) +### You can change the following line to point to the +### error/index.php file in your Moodle distribution. +### It provides a form which emails you (the admin) ### about 404 errors (URL not found). #ErrorDocument 404 http://example.org/moodle/error/index.php diff --git a/lib/javascript-navigation.js b/lib/javascript-navigation.js index b4e67f89ade41..fa5e3d3e2367a 100644 --- a/lib/javascript-navigation.js +++ b/lib/javascript-navigation.js @@ -422,7 +422,7 @@ navigation_tree.prototype.move_to_block_position = function(e) { } YAHOO.moodle.navigation.tabpanel.remove_from_tab_panel(this.name); - + var block = this.cachedcontent; while (!YAHOO.util.Dom.hasClass(block, 'sideblock')) { block = block.parentNode; diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 7e09d1a666383..196a3d52ef74e 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -762,10 +762,10 @@ function addonload(fn) { } /** * Replacement for getElementsByClassName in browsers that aren't cool enough - * + * * Relying on the built-in getElementsByClassName is far, far faster than * using YUI. - * + * * Note: the third argument used to be an object with odd behaviour. It now * acts like the 'name' in the HTML5 spec, though the old behaviour is still * mimicked if you pass an object. diff --git a/lib/kses.php b/lib/kses.php index 5825823980530..5824fa0062ba3 100644 --- a/lib/kses.php +++ b/lib/kses.php @@ -470,7 +470,7 @@ function kses_bad_protocol($string, $allowed_protocols) ############################################################################### { $string = kses_no_null($string); - $string = preg_replace('/([^\xc3-\xcf])\xad+/', '\\1', $string); # deals with Opera "feature" -- moodle utf8 fix + $string = preg_replace('/([^\xc3-\xcf])\xad+/', '\\1', $string); # deals with Opera "feature" -- moodle utf8 fix $string2 = $string.'a'; while ($string != $string2) diff --git a/lib/packer/file_packer.php b/lib/packer/file_packer.php index 38b8b5a12a846..4936737d5c8ae 100644 --- a/lib/packer/file_packer.php +++ b/lib/packer/file_packer.php @@ -32,7 +32,7 @@ abstract class file_packer { /** * Archive files and store the result in file storage - * @param array $files array with zip paths as keys (archivepath=>ospathname or archivepath=>stored_file) + * @param array $files array with zip paths as keys (archivepath=>ospathname or archivepath=>stored_file) * @param int $contextid * @param string $filearea * @param int $itemid @@ -44,7 +44,7 @@ public abstract function archive_to_storage($files, $contextid, $filearea, $item /** * Archive files and store the result in os file - * @param array $files array with zip paths as keys (archivepath=>ospathname or archivepath=>stored_file) + * @param array $files array with zip paths as keys (archivepath=>ospathname or archivepath=>stored_file) * @param string $archivefile path to target zip file * @return bool success */ diff --git a/lib/packer/zip_packer.php b/lib/packer/zip_packer.php index 6ea044e7f8b17..b6aa754520958 100644 --- a/lib/packer/zip_packer.php +++ b/lib/packer/zip_packer.php @@ -35,7 +35,7 @@ class zip_packer extends file_packer { /** * Zip files and store the result in file storage - * @param array $files array with full zip paths (including directory information) as keys (archivepath=>ospathname or archivepath/subdir=>stored_file) + * @param array $files array with full zip paths (including directory information) as keys (archivepath=>ospathname or archivepath/subdir=>stored_file) * @param int $contextid * @param string $filearea * @param int $itemid @@ -75,7 +75,7 @@ public function archive_to_storage($files, $contextid, $filearea, $itemid, $file /** * Zip files and store the result in os file - * @param array $files array with zip paths as keys (archivepath=>ospathname or archivepath=>stored_file) + * @param array $files array with zip paths as keys (archivepath=>ospathname or archivepath=>stored_file) * @param string $archivefile path to target zip file * @return bool success */ diff --git a/lib/rsslib.php b/lib/rsslib.php index ea9e6ab0a9fcc..b9858b309d8b1 100644 --- a/lib/rsslib.php +++ b/lib/rsslib.php @@ -264,7 +264,7 @@ function rss_add_items($items) { $result .= rss_full_tag('link',3,false,$item->link); $result .= rss_add_enclosures($item); $result .= rss_full_tag('pubDate',3,false,gmdate('D, d M Y H:i:s',$item->pubdate).' GMT'); # MDL-12563 - //Include the author if exists + //Include the author if exists if (isset($item->author)) { //$result .= rss_full_tag('author',3,false,$item->author); //We put it in the description instead because it's more important diff --git a/lib/simplepie/moodle_simplepie.php b/lib/simplepie/moodle_simplepie.php index 3ea8e9580439a..deef6c5fa641d 100644 --- a/lib/simplepie/moodle_simplepie.php +++ b/lib/simplepie/moodle_simplepie.php @@ -48,11 +48,11 @@ */ class moodle_simplepie extends SimplePie { - /** + /** * Constructor - creates an instance of the SimplePie class * with Moodle defaults. * - * @param string $feedurl optional URL of the feed + * @param string $feedurl optional URL of the feed */ function __construct($feedurl = null) { @@ -91,7 +91,7 @@ private static function get_cache_directory() { } /** - * Reset RSS cache + * Reset RSS cache * * @return boolean success if cache clear or didn't exist */ @@ -124,7 +124,7 @@ function moodle_simplepie_file($url, $timeout = 10, $redirects = 5, $headers = n $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_CURL; $curl = new curl(); - $curl->setopt( array( + $curl->setopt( array( 'CURLOPT_HEADER' => true, 'CURLOPT_TIMEOUT' => $timeout, 'CURLOPT_CONNECTTIMEOUT' => $timeout )); diff --git a/local/readme.txt b/local/readme.txt index b4cb65185d97c..b1c4923fc246a 100644 --- a/local/readme.txt +++ b/local/readme.txt @@ -23,7 +23,7 @@ Local customisations directory ============================== -This directory is the recommended place for local customisations. +This directory is the recommended place for local customisations. Wherever possible, customisations should be written using one of the standard plug-in points like modules, blocks, auth plugins, themes, etc. @@ -94,7 +94,7 @@ $ADMIN->add('tweaks', new admin_externalpage('nicehackery', 'Tweak something', Custom event handlers --------------------- Events intended primarily for communication "core --> plugins". (It should not -be use in opposite direction!) In theory it could be also used for +be use in opposite direction!) In theory it could be also used for "plugin --> plugin" communication too. The list of core events is documented in lib/db/events.php @@ -103,7 +103,7 @@ sample files $handlers = array ( 'user_deleted' => array ( 'handlerfile' => '/local/nicehack/lib.php', - 'handlerfunction' => 'nicehack_userdeleted_handler', + 'handlerfunction' => 'nicehack_userdeleted_handler', 'schedule' => 'instant' ), ); diff --git a/mod/README.txt b/mod/README.txt index 85288a94e4cd1..b7e9d22f2d0e3 100644 --- a/mod/README.txt +++ b/mod/README.txt @@ -13,7 +13,7 @@ Each of these modules contains a number of expected components: icon.gif: a 16x16 icon for the module db/install.xml: an SQL dump of all the required db tables and data - + index.php: a page to list all instances in a course view.php: a page to view a particular instance @@ -37,6 +37,6 @@ Each of these modules contains a number of expected components: If you are a developer and interested in developing new Modules see: - + Moodle Documentation: http://moodle.org/doc Moodle Community: http://moodle.org/community diff --git a/mod/upgrade.txt b/mod/upgrade.txt index 939a79ff7c480..b6611812d8a79 100644 --- a/mod/upgrade.txt +++ b/mod/upgrade.txt @@ -14,7 +14,7 @@ required changes in code: * rewrite trusstext support - new db table columns needed * migrade all module features from mod_edit.php form to lib.php/modulename_supports() function * implement new gradebook support (legacy 1.8.x grading not supported anymore) -* migrate custom resource module subtypes into separate modules +* migrate custom resource module subtypes into separate modules optional - no changes needed in older code: * portfolio support diff --git a/pix/smartpix.php b/pix/smartpix.php index 9e84124e2fdb9..dcebbefd9b248 100644 --- a/pix/smartpix.php +++ b/pix/smartpix.php @@ -1,13 +1,13 @@ -smartpix is // turned on. $matches=array(); // Reusable array variable for preg_match - + // This does NOT use config.php. This is because doing that makes database requests // which cause this to take longer (I benchmarked this at 16ms, 256ms with config.php) // A version using normal Moodle functions is included in comment at end in case we -// want to switch to it in future. +// want to switch to it in future. function error($text,$notfound=false) { header($notfound ? 'HTTP/1.0 404 Not Found' : 'HTTP/1.0 500 Internal Server Error'); @@ -44,7 +44,7 @@ function strip_querystring($url) { return $url; } } - + // get query string function get_query($name) { if (!empty($_SERVER['REQUEST_URI'])) { @@ -57,7 +57,7 @@ function get_query($name) { } // Nicked from weblib then cutdown /** - * Extracts file argument either from file parameter or PATH_INFO. + * Extracts file argument either from file parameter or PATH_INFO. * @param string $scriptname name of the calling script * @return string file path (only safe characters) */ @@ -84,10 +84,10 @@ function get_file_argument_limited($scriptname) { if (!empty($arr[1])) { return makesafe(rawurldecode(strip_querystring($arr[1]))); } - + error('Unexpected PHP set up. Turn off the smartpix config option.'); -} - +} + // We do need to get dirroot from config.php if(!$config=@file_get_contents(dirname(__FILE__).'/../config.php')) { error("Can't open config.php"); @@ -138,17 +138,17 @@ function get_file_argument_limited($scriptname) { $file=$possibility; } else { // Is there a parent theme? - while(true) { + while(true) { require("$dirroot/theme/$theme/config.php"); // Sets up $THEME if(!$THEME->parent) { break; - } + } $theme=$THEME->parent; if(file_exists($possibility="$dirroot/theme/$theme/pix/$path")) { $file=$possibility; // Found in parent theme break; - } + } } if(!$file) { if(preg_match('|^mod/|',$path)) { @@ -176,11 +176,11 @@ function get_file_argument_limited($scriptname) { } header('Last-Modified: '.gmdate('D, d M Y H:i:s',$filedate).' GMT'); -// As I'm not loading config table from DB, this is hardcoded here; expiry +// As I'm not loading config table from DB, this is hardcoded here; expiry // 4 hours, unless the hacky file reduceimagecache.dat exists in dataroot if(file_exists($reducefile=$dataroot.'/reduceimagecache.dat')) { $lifetime=file_read_contents($reducefile); -} else { +} else { $lifetime=4*60*60; } @@ -198,7 +198,7 @@ function get_file_argument_limited($scriptname) { fclose($handle); // Slower Moodle-style version follows: - + //// Outputs pictures from theme or core pix folder. Only used if $CFG->smartpix is //// turned on. // @@ -208,7 +208,7 @@ function get_file_argument_limited($scriptname) { //global $CFG; // //$matches=array(); // Reusable array variable for preg_match -// +// //// Split path - starts with theme name, then actual image path inside pix //$path=get_file_argument('smartpix.php'); //$match=array(); @@ -237,17 +237,17 @@ function get_file_argument_limited($scriptname) { // $file=$possibility; //} else { // // Is there a parent theme? -// while(true) { +// while(true) { // require("$CFG->dirroot/theme/$theme/config.php"); // Sets up $THEME // if(!$THEME->parent) { // break; -// } +// } // $theme=$THEME->parent; // if(file_exists($possibility="$CFG->dirroot/theme/$theme/pix/$path")) { // $file=$possibility; // // Found in parent theme // break; -// } +// } // } // if(!$file) { // if(preg_match('|^mod/|',$path)) { diff --git a/rss/file.php b/rss/file.php index e13d664e13ef8..e986e55cb7efd 100644 --- a/rss/file.php +++ b/rss/file.php @@ -24,7 +24,7 @@ $lifetime = 3600; // Seconds for files to remain in caches - 1 hour // this is a big one big hack - NO_MOODLE_COOKIES is not compatible with capabilities MDL-7243 - // it should be replaced once we get to codes in urls + // it should be replaced once we get to codes in urls $relativepath = get_file_argument(); @@ -79,7 +79,7 @@ $context = get_context_instance(CONTEXT_COURSE, $course->id); $isuser = has_capability('moodle/course:view', $context, $userid); } - + //Check for "security" if !course->guest or course->password if ($course->id != SITEID) { if ((!$course->guest || $course->password) && (!$isuser)) { diff --git a/sso/hive/expired.php b/sso/hive/expired.php index 689cadf9da429..e635db8131c9a 100644 --- a/sso/hive/expired.php +++ b/sso/hive/expired.php @@ -11,7 +11,7 @@ // It's a security risk to carry that in $SESSION so we put up login form. $PAGE->set_url(new moodle_url($CFG->wwwroot.'/sso/hive/expired.php')); echo $OUTPUT->header(); - echo $OUTPUT->notification('Your session has expired. Please log in again.'); + echo $OUTPUT->notification('Your session has expired. Please log in again.'); ?>
diff --git a/sso/hive/login.php b/sso/hive/login.php index c1e105494e27b..465612976d3c9 100644 --- a/sso/hive/login.php +++ b/sso/hive/login.php @@ -7,11 +7,11 @@ require_login(); - // get the login data + // get the login data $frm = data_submitted(); // log back into Hive - if (sso_user_login($frm->username, $frm->password)) { + if (sso_user_login($frm->username, $frm->password)) { /// reopen Hive redirect($CFG->wwwroot.'/mod/resource/type/repository/hive/openlitebrowse.php'); diff --git a/tag/tag.js b/tag/tag.js index 0031dce0e1c56..e7251ee12a768 100644 --- a/tag/tag.js +++ b/tag/tag.js @@ -17,7 +17,7 @@ function init_tag_autocomplete() { document.getElementById('id_relatedtags').style.width = '30%'; myAutoComp.allowBrowserAutocomplete = false; myAutoComp.maxResultsDisplayed = 20; - myAutoComp.delimChar = [","," "]; + myAutoComp.delimChar = [","," "]; myAutoComp.formatResult = function(oResultData, sQuery, sResultMatch) { return (sResultMatch); }; diff --git a/tag/tag_autocomplete.php b/tag/tag_autocomplete.php index ef87e09d0e1ff..33fef4bccd3a8 100644 --- a/tag/tag_autocomplete.php +++ b/tag/tag_autocomplete.php @@ -9,7 +9,7 @@ print_error('tagsaredisabled', 'tag'); } -$query = optional_param('query', '', PARAM_RAW); +$query = optional_param('query', '', PARAM_RAW); if ($similar_tags = tag_autocomplete($query)) { foreach ($similar_tags as $tag) { diff --git a/webservice/amf/testclient/moodleclient.mxml b/webservice/amf/testclient/moodleclient.mxml index 77b8483499ab1..8ee787f90dd77 100644 --- a/webservice/amf/testclient/moodleclient.mxml +++ b/webservice/amf/testclient/moodleclient.mxml @@ -42,19 +42,19 @@ public function initApp():void{ moodleWebServices = new RemoteObject(); - var cs:ChannelSet = new ChannelSet(); + var cs:ChannelSet = new ChannelSet(); cs.addChannel(new AMFChannel("myAmf", Application.application.parameters.amfurl)); - moodleWebServices.destination = "Dest"; + moodleWebServices.destination = "Dest"; moodleWebServices.channelSet = cs; moodleWebServices.showBusyCursor = true; moodleWebServices.get_users.addEventListener('result', handleReturnGetUsers); moodleWebServices.update_users.addEventListener('result', handleReturn); moodleWebServices.create_users.addEventListener('result', handleReturn); - + moodleWebServices.addEventListener('fault', handleFault); moodleWebServices.addEventListener('result', handleReturn); - + print_props('Application.application.parameters.amfurl', Application.application.parameters.amfurl); print_props('moodleWebServices', moodleWebServices); getUsers(''); @@ -106,7 +106,7 @@ import mx.events.DataGridEvent; private function itemEditEndEvent(event:DataGridEvent):void { print_props('event:DataGridEvent', event); - var newData:String= + var newData:String= TextInput(event.currentTarget.itemEditorInstance).text; if (newData!=userlist.editedItemRenderer.data[event.dataField]) { @@ -123,38 +123,38 @@ var invalid:Boolean = false; vResult = usernameValidator.validate(); - if (vResult.type==ValidationResultEvent.INVALID) + if (vResult.type==ValidationResultEvent.INVALID) invalid=true; vResult = passwordValidator.validate(); - if (vResult.type==ValidationResultEvent.INVALID) + if (vResult.type==ValidationResultEvent.INVALID) invalid=true; vResult = firstnameValidator.validate(); - if (vResult.type==ValidationResultEvent.INVALID) + if (vResult.type==ValidationResultEvent.INVALID) invalid=true; vResult = lastnameValidator.validate(); - if (vResult.type==ValidationResultEvent.INVALID) + if (vResult.type==ValidationResultEvent.INVALID) invalid=true; vResult = emailValidator.validate(); - if (vResult.type==ValidationResultEvent.INVALID) + if (vResult.type==ValidationResultEvent.INVALID) invalid=true; if (invalid){ return; } var itemToAdd:Object= {status:'to insert', - username : username.text, - idnumber : idnumber.text, - firstname : firstname.text, - lastname : lastname.text, - email : email.text, - password : password.text, - auth : auth.text, - confirmed : confirmed.text, - timezone : timezone.text, - country : country.text, - emailstop : emailstop.text, - theme : theme.text, - lang : lang.text, + username : username.text, + idnumber : idnumber.text, + firstname : firstname.text, + lastname : lastname.text, + email : email.text, + password : password.text, + auth : auth.text, + confirmed : confirmed.text, + timezone : timezone.text, + country : country.text, + emailstop : emailstop.text, + theme : theme.text, + lang : lang.text, mailformat : mailformat.text}; if (initDG==null){ initData(new Array(itemToAdd)) @@ -206,8 +206,8 @@ The text area below displays some debug messages. - + @@ -233,7 +233,7 @@ The text area below displays some debug messages. - + diff --git a/webservice/soap/locallib.php b/webservice/soap/locallib.php index ae439601fe983..114b16a6e7ce7 100644 --- a/webservice/soap/locallib.php +++ b/webservice/soap/locallib.php @@ -39,7 +39,7 @@ public function __construct($simple) { ini_set('soap.wsdl_cache_enabled', '0'); require_once 'Zend/Soap/Server.php'; require_once 'Zend/Soap/AutoDiscover.php'; - + if (optional_param('wsdl', 0, PARAM_BOOL)) { parent::__construct($simple, 'Zend_Soap_AutoDiscover'); } else { @@ -114,7 +114,7 @@ protected function send_error($ex=null) { } else { $info = 'Unknown error'; } - + $xml = '