' .implode(', ', $errors) . '
' . $tempfield->readableInfo(), @@ -309,8 +309,8 @@ class edit_field_save extends XMLDBAction { $next->setChanged(true); } } - - /// Set comment + + /// Set comment $field->setComment($comment); /// Set the rest of fields @@ -323,7 +323,7 @@ class edit_field_save extends XMLDBAction { $field->setEnum($enum); $field->setEnumValues($enumvalues); $field->setDefault($default); - + /// If the hash has changed from the old one, change the version /// and mark the structure as changed $field->calculateHash(true); @@ -338,7 +338,7 @@ class edit_field_save extends XMLDBAction { } /// Launch postaction if exists (leave this here!) - if ($this->getPostAction() && $result) { + if ($this->getPostAction() && $result) { return $this->launch($this->getPostAction()); } } diff --git a/admin/xmldb/actions/edit_index/edit_index.class.php b/admin/xmldb/actions/edit_index/edit_index.class.php index f73dd88426b..5e7a5e7f715 100644 --- a/admin/xmldb/actions/edit_index/edit_index.class.php +++ b/admin/xmldb/actions/edit_index/edit_index.class.php @@ -28,7 +28,7 @@ class edit_index extends XMLDBAction { - /** + /** * Init method, every subclass will have its own */ function init() { @@ -148,7 +148,7 @@ class edit_index extends XMLDBAction { $this->output = $o; /// Launch postaction if exists (leave this here!) - if ($this->getPostAction() && $result) { + if ($this->getPostAction() && $result) { return $this->launch($this->getPostAction()); } diff --git a/admin/xmldb/actions/edit_index_save/edit_index_save.class.php b/admin/xmldb/actions/edit_index_save/edit_index_save.class.php index 0ec2ebd11e4..8fd2e3b5dc3 100644 --- a/admin/xmldb/actions/edit_index_save/edit_index_save.class.php +++ b/admin/xmldb/actions/edit_index_save/edit_index_save.class.php @@ -28,7 +28,7 @@ class edit_index_save extends XMLDBAction { - /** + /** * Init method, every subclass will have its own */ function init() { @@ -164,8 +164,8 @@ class edit_index_save extends XMLDBAction { $tempindex->setFields($fieldsarr); /// Prepare the output $site = get_site(); - print_header("$site->shortname: XMLDB", - "$site->fullname", + print_header("$site->shortname: XMLDB", + "$site->fullname", "" . $this->str['administration'] . " -> XMLDB"); notice ('
' .implode(', ', $errors) . '
' . $tempindex->readableInfo(), @@ -190,14 +190,14 @@ class edit_index_save extends XMLDBAction { $next->setChanged(true); } } - - /// Set comment + + /// Set comment $index->setComment($comment); /// Set the rest of fields $index->setUnique($unique); $index->setFields($fieldsarr); - + /// If the hash has changed from the old one, change the version /// and mark the structure as changed $index->calculateHash(true); @@ -212,7 +212,7 @@ class edit_index_save extends XMLDBAction { } /// Launch postaction if exists (leave this here!) - if ($this->getPostAction() && $result) { + if ($this->getPostAction() && $result) { return $this->launch($this->getPostAction()); } } diff --git a/admin/xmldb/actions/edit_key/edit_key.class.php b/admin/xmldb/actions/edit_key/edit_key.class.php index 5e2df276ac8..68812de24da 100644 --- a/admin/xmldb/actions/edit_key/edit_key.class.php +++ b/admin/xmldb/actions/edit_key/edit_key.class.php @@ -28,7 +28,7 @@ class edit_key extends XMLDBAction { - /** + /** * Init method, every subclass will have its own */ function init() { @@ -160,7 +160,7 @@ class edit_key extends XMLDBAction { $this->output = $o; /// Launch postaction if exists (leave this here!) - if ($this->getPostAction() && $result) { + if ($this->getPostAction() && $result) { return $this->launch($this->getPostAction()); } diff --git a/admin/xmldb/actions/edit_key/edit_key.js b/admin/xmldb/actions/edit_key/edit_key.js index 8230e0f1434..eb3dd67377c 100644 --- a/admin/xmldb/actions/edit_key/edit_key.js +++ b/admin/xmldb/actions/edit_key/edit_key.js @@ -27,7 +27,7 @@ /// Register the needed events - onload=function() { + onload=function() { /// Adjust the form on load transformForm(); diff --git a/admin/xmldb/actions/edit_key_save/edit_key_save.class.php b/admin/xmldb/actions/edit_key_save/edit_key_save.class.php index 68297d4873b..ec663af8229 100644 --- a/admin/xmldb/actions/edit_key_save/edit_key_save.class.php +++ b/admin/xmldb/actions/edit_key_save/edit_key_save.class.php @@ -28,7 +28,7 @@ class edit_key_save extends XMLDBAction { - /** + /** * Init method, every subclass will have its own */ function init() { @@ -187,11 +187,11 @@ class edit_key_save extends XMLDBAction { /// Check reftable is not empty if (empty($reftable)) { $errors[] = $this->str['noreftablespecified']; - } else + } else /// Check reffields are not empty if (empty($reffieldsarr[0])) { $errors[] = $this->str['noreffieldsspecified']; - } else + } else /// Check the number of fields is correct if (count($fieldsarr) != count($reffieldsarr)) { $errors[] = $this->str['wrongnumberofreffields']; @@ -240,8 +240,8 @@ class edit_key_save extends XMLDBAction { } /// Prepare the output $site = get_site(); - print_header("$site->shortname: XMLDB", - "$site->fullname", + print_header("$site->shortname: XMLDB", + "$site->fullname", "" . $this->str['administration'] . " -> XMLDB"); notice ('
' .implode(', ', $errors) . '
' . $tempkey->readableInfo(), @@ -266,8 +266,8 @@ class edit_key_save extends XMLDBAction { $next->setChanged(true); } } - - /// Set comment + + /// Set comment $key->setComment($comment); /// Set the rest of fields @@ -278,7 +278,7 @@ class edit_key_save extends XMLDBAction { $key->setRefTable($reftable); $key->setRefFields($reffieldsarr); } - + /// If the hash has changed from the old one, change the version /// and mark the structure as changed $key->calculateHash(true); @@ -293,7 +293,7 @@ class edit_key_save extends XMLDBAction { } /// Launch postaction if exists (leave this here!) - if ($this->getPostAction() && $result) { + if ($this->getPostAction() && $result) { return $this->launch($this->getPostAction()); } } diff --git a/admin/xmldb/actions/edit_sentence/edit_sentence.class.php b/admin/xmldb/actions/edit_sentence/edit_sentence.class.php index 5e7ca302c8a..24bf5902722 100644 --- a/admin/xmldb/actions/edit_sentence/edit_sentence.class.php +++ b/admin/xmldb/actions/edit_sentence/edit_sentence.class.php @@ -28,7 +28,7 @@ class edit_sentence extends XMLDBAction { - /** + /** * Init method, every subclass will have its own */ function init() { @@ -137,12 +137,12 @@ class edit_sentence extends XMLDBAction { $b .= ' [' . $this->str['back'] . ']'; $b .= '
'; $o .= $b; - + $this->output = $o; } - + /// Launch postaction if exists (leave this here!) - if ($this->getPostAction() && $result) { + if ($this->getPostAction() && $result) { return $this->launch($this->getPostAction()); } diff --git a/admin/xmldb/actions/edit_sentence_save/edit_sentence_save.class.php b/admin/xmldb/actions/edit_sentence_save/edit_sentence_save.class.php index c9990ed9c11..426b6d72bc8 100644 --- a/admin/xmldb/actions/edit_sentence_save/edit_sentence_save.class.php +++ b/admin/xmldb/actions/edit_sentence_save/edit_sentence_save.class.php @@ -28,7 +28,7 @@ class edit_sentence_save extends XMLDBAction { - /** + /** * Init method, every subclass will have its own */ function init() { @@ -116,12 +116,12 @@ class edit_sentence_save extends XMLDBAction { if ($result && count($fields) != count($values)) { $errors[] = $this->str['wrongnumberoffieldsorvalues']; } - + if (!empty($errors)) { /// Prepare the output $site = get_site(); - print_header("$site->shortname: XMLDB", - "$site->fullname", + print_header("$site->shortname: XMLDB", + "$site->fullname", "" . $this->str['administration'] . " -> XMLDB"); notice ('' .implode(', ', $errors) . '
' . s($sentence), @@ -132,7 +132,7 @@ class edit_sentence_save extends XMLDBAction { /// Continue if we aren't under errors if (empty($errors)) { $sentences[$sentenceparam] = $sentence; - + /// If the sentence has changed from the old one, change the version /// and mark the statement and structure as changed if ($oldsentence != $sentence) { @@ -143,7 +143,7 @@ class edit_sentence_save extends XMLDBAction { } /// Launch postaction if exists (leave this here!) - if ($this->getPostAction() && $result) { + if ($this->getPostAction() && $result) { return $this->launch($this->getPostAction()); } } diff --git a/admin/xmldb/actions/edit_statement/edit_statement.class.php b/admin/xmldb/actions/edit_statement/edit_statement.class.php index c47d59e4fc0..f109b698834 100644 --- a/admin/xmldb/actions/edit_statement/edit_statement.class.php +++ b/admin/xmldb/actions/edit_statement/edit_statement.class.php @@ -28,7 +28,7 @@ class edit_statement extends XMLDBAction { - /** + /** * Init method, every subclass will have its own */ function init() { @@ -138,7 +138,7 @@ class edit_statement extends XMLDBAction { ///$statement->deleteSentence('changeme'); /// Add the fields list - $sentences =& $statement->getSentences(); + $sentences =& $statement->getSentences(); if (!empty($sentences)) { $o .= '
' . $this->str['sentences'] . '
'; $o .= '| ' . $p . $sentence . $b . ' |
| ' . $p . $sentence . $b . ' |
' . $this->str['fields'] . '
'; $o .= '| '; /// The delete button (if we have more than one and it isn't used - if (count($fields) > 1 && + if (count($fields) > 1 && !$structure->getFieldUses($table->getName(), $field->getName())) { $b .= '[' . $this->str['delete'] . ']'; } else { @@ -210,13 +210,13 @@ class edit_table extends XMLDBAction { /// The readable info $r = ' | ' . $field->readableInfo() . ' | '; /// Print table row - $o .= '
| ' . $field->getName() . '' . $b . $r . ' |
| ' . $field->getName() . '' . $b . $r . ' |
' . $this->str['keys'] . '
'; $o .= '| ' . $key->readableInfo() . ' | '; /// Print table row - $o .= '
| ' . $key->getName() . '' . $b . $r .' |
| ' . $key->getName() . '' . $b . $r .' |
' . $this->str['indexes'] . '
'; $o .= '| ' . $index->readableInfo() . ' | '; /// Print table row - $o .= '
| ' . $index->getName() . '' . $b . $r .' |
| ' . $index->getName() . '' . $b . $r .' |
' . $this->str['tables'] . '
'; $o .= '| ' . $table->getName() . '' . $b . ' |
| ' . $table->getName() . '' . $b . ' |
' . $this->str['statements'] . '
'; $o .= '| ' . $statement->getName() . '' . $b . ' |
| ' . $statement->getName() . '' . $b . ' |
' . $this->str['table'] . ': ' . s($tableparam) . '
'; /// Calculate the popup of commands - $commands = array('add_field', + $commands = array('add_field', 'drop_field', 'rename_field'); foreach ($commands as $command) { @@ -171,7 +171,7 @@ class view_table_php extends XMLDBAction { $this->output = $o; /// Launch postaction if exists (leave this here!) - if ($this->getPostAction() && $result) { + if ($this->getPostAction() && $result) { return $this->launch($this->getPostAction()); } @@ -180,9 +180,9 @@ class view_table_php extends XMLDBAction { } /** - * This function will generate all the PHP code needed to + * This function will generate all the PHP code needed to * create one field using XMLDB objects and functions - * + * * @param XMLDBStructure structure object containing all the info * @param string table table name * @param string field field name to be created @@ -224,9 +224,9 @@ class view_table_php extends XMLDBAction { } /** - * This function will generate all the PHP code needed to + * This function will generate all the PHP code needed to * drop one field using XMLDB objects and functions - * + * * @param XMLDBStructure structure object containing all the info * @param string table table name * @param string field field name to be dropped @@ -267,9 +267,9 @@ class view_table_php extends XMLDBAction { } /** - * This function will generate all the PHP code needed to + * This function will generate all the PHP code needed to * rename one field using XMLDB objects and functions - * + * * @param XMLDBStructure structure object containing all the info * @param string table table name * @param string field field name to be renamed diff --git a/admin/xmldb/actions/view_table_php/view_table_php.js b/admin/xmldb/actions/view_table_php/view_table_php.js index fcd9dded1f9..1fb1d888bfe 100644 --- a/admin/xmldb/actions/view_table_php/view_table_php.js +++ b/admin/xmldb/actions/view_table_php/view_table_php.js @@ -33,13 +33,13 @@ /** * This function disables some elements from the fields/keys/indexes drop down */ -function disablePopupHeads() { - var popup = document.getElementById("menufieldkeyindex"); - var i = popup.length; - while (i--) { - option = popup[i]; - if (option.value == "fieldshead" || option.value == "keyshead" || option.value == "indexeshead") { - popup[i].disabled = true; - } +function disablePopupHeads() { + var popup = document.getElementById("menufieldkeyindex"); + var i = popup.length; + while (i--) { + option = popup[i]; + if (option.value == "fieldshead" || option.value == "keyshead" || option.value == "indexeshead") { + popup[i].disabled = true; + } } } diff --git a/admin/xmldb/actions/view_table_sql/view_table_sql.class.php b/admin/xmldb/actions/view_table_sql/view_table_sql.class.php index cb6de34e751..c1488f97ec6 100644 --- a/admin/xmldb/actions/view_table_sql/view_table_sql.class.php +++ b/admin/xmldb/actions/view_table_sql/view_table_sql.class.php @@ -29,7 +29,7 @@ class view_table_sql extends XMLDBAction { - /** + /** * Init method, every subclass will have its own */ function init() { @@ -128,7 +128,7 @@ class view_table_sql extends XMLDBAction { $this->output = $o; /// Launch postaction if exists (leave this here!) - if ($this->getPostAction() && $result) { + if ($this->getPostAction() && $result) { return $this->launch($this->getPostAction()); } diff --git a/admin/xmldb/actions/view_table_xml/view_table_xml.class.php b/admin/xmldb/actions/view_table_xml/view_table_xml.class.php index d8070510cde..36ad3f77176 100644 --- a/admin/xmldb/actions/view_table_xml/view_table_xml.class.php +++ b/admin/xmldb/actions/view_table_xml/view_table_xml.class.php @@ -28,7 +28,7 @@ class view_table_xml extends XMLDBAction { - /** + /** * Init method, every subclass will have its own */ function init() { diff --git a/admin/xmldb/actions/view_xml/view_xml.class.php b/admin/xmldb/actions/view_xml/view_xml.class.php index e1bd483e33d..5e5872d4459 100644 --- a/admin/xmldb/actions/view_xml/view_xml.class.php +++ b/admin/xmldb/actions/view_xml/view_xml.class.php @@ -28,7 +28,7 @@ class view_xml extends XMLDBAction { - /** + /** * Init method, every subclass will have its own */ function init() { @@ -66,7 +66,7 @@ class view_xml extends XMLDBAction { /// Get the file parameter $file = required_param('file', PARAM_PATH); $file = $CFG->dirroot . stripslashes_safe($file); - /// File must be under $CFG->wwwroot and + /// File must be under $CFG->wwwroot and /// under one db directory (simple protection) if (substr($file, 0, strlen($CFG->dirroot)) == $CFG->dirroot && substr(dirname($file), -2, 2) == 'db') { diff --git a/admin/xmldb/index.php b/admin/xmldb/index.php index 6b03c05e852..91632a3818d 100644 --- a/admin/xmldb/index.php +++ b/admin/xmldb/index.php @@ -46,7 +46,7 @@ require_once('../../lib/xmldb/classes/XMLDBIndex.class.php'); require_once('../../lib/xmldb/classes/XMLDBStatement.class.php'); -/// Add Moodle config script (this is loaded AFTER all the rest +/// Add Moodle config script (this is loaded AFTER all the rest /// of classes because it starts the SESSION and classes to be /// stored there MUST be declared before in order to avoid /// getting "incomplete" objects @@ -81,7 +81,7 @@ $stradministration = get_string('administration'); /// Body of the script, based on action, we delegate the work - $action = optional_param ('action', 'main_view', PARAM_ALPHAEXT); + $action = optional_param ('action', 'main_view', PARAM_ALPHAEXT); /// Get the action path and invoke it $actionsroot = "$CFG->dirroot/$CFG->admin/xmldb/actions"; @@ -98,14 +98,14 @@ /// Based on getDoesGenerate() switch ($xmldb_action->getDoesGenerate()) { case ACTION_GENERATE_HTML: - /// Define $CFG->javascript to use our custom javascripts. + /// Define $CFG->javascript to use our custom javascripts. /// Save the original one to add it from ours. Global too! :-( global $standard_javascript; $standard_javascript = $CFG->javascript; // Save original javascript file $CFG->javascript = $CFG->dirroot.'/admin/xmldb/javascript.php'; //Use our custom javascript code /// Go with standard header - print_header("$site->shortname: XMLDB", - "$site->fullname", + print_header("$site->shortname: XMLDB", + "$site->fullname", "$stradministration -> XMLDB"); print_heading($xmldb_action->getTitle()); echo $xmldb_action->getOutput(); @@ -126,7 +126,7 @@ error ("Error: wrong action specified ($action)"); } - if ($xmldb_action->getDoesGenerate() != ACTION_GENERATE_XML) { + if ($xmldb_action->getDoesGenerate() != ACTION_GENERATE_XML) { if (debugging()) { ///print_object($XMLDB); } diff --git a/blocks/rss_client/db/access.php b/blocks/rss_client/db/access.php index f46264d97a5..a04b5a02c8c 100644 --- a/blocks/rss_client/db/access.php +++ b/blocks/rss_client/db/access.php @@ -32,9 +32,9 @@ $block_rss_client_capabilities = array( - + 'block/rss_client:createprivatefeeds' => array( - + 'captype' => 'write', 'contextlevel' => CONTEXT_SYSTEM, 'legacy' => array( @@ -46,9 +46,9 @@ $block_rss_client_capabilities = array( 'admin' => CAP_ALLOW ) ), - + 'block/rss_client:createsharedfeeds' => array( - + 'captype' => 'write', 'contextlevel' => CONTEXT_SYSTEM, 'legacy' => array( @@ -60,9 +60,9 @@ $block_rss_client_capabilities = array( 'admin' => CAP_ALLOW ) ), - + 'block/rss_client:manageownfeeds' => array( - + 'captype' => 'write', 'contextlevel' => CONTEXT_SYSTEM, 'legacy' => array( @@ -74,9 +74,9 @@ $block_rss_client_capabilities = array( 'admin' => CAP_ALLOW ) ), - + 'block/rss_client:manageanyfeeds' => array( - + 'captype' => 'write', 'contextlevel' => CONTEXT_SYSTEM, 'legacy' => array( @@ -88,7 +88,7 @@ $block_rss_client_capabilities = array( 'admin' => CAP_ALLOW ) ) - + ); ?> \ No newline at end of file diff --git a/lib/accesslib.php b/lib/accesslib.php index a961b709f2f..e7c825a38da 100755 --- a/lib/accesslib.php +++ b/lib/accesslib.php @@ -69,10 +69,10 @@ function load_guest_role($context=NULL) { } } - if ($capabilities = get_records_select('role_capabilities', + if ($capabilities = get_records_select('role_capabilities', "roleid = $guestrole->id AND contextid = $sitecontext->id")) { foreach ($capabilities as $capability) { - $USER->capabilities[$context->id][$capability->capability] = $capability->permission; + $USER->capabilities[$context->id][$capability->capability] = $capability->permission; } } @@ -81,7 +81,7 @@ function load_guest_role($context=NULL) { /** * Load default not logged in role capabilities when user is not logged in - * @return bool + * @return bool */ function load_notloggedin_role() { global $CFG, $USER; @@ -98,10 +98,10 @@ function load_notloggedin_role() { } } - if ($capabilities = get_records_select('role_capabilities', + if ($capabilities = get_records_select('role_capabilities', "roleid = $CFG->notloggedinroleid AND contextid = $sitecontext->id")) { foreach ($capabilities as $capability) { - $USER->capabilities[$sitecontext->id][$capability->capability] = $capability->permission; + $USER->capabilities[$sitecontext->id][$capability->capability] = $capability->permission; } } @@ -110,7 +110,7 @@ function load_notloggedin_role() { /** * Load default not logged in role capabilities when user is not logged in - * @return bool + * @return bool */ function load_defaultuser_role() { global $CFG, $USER; @@ -127,18 +127,18 @@ function load_defaultuser_role() { } } - if ($capabilities = get_records_select('role_capabilities', + if ($capabilities = get_records_select('role_capabilities', "roleid = $CFG->defaultuserroleid AND contextid = $sitecontext->id")) { foreach ($capabilities as $capability) { if (!isset($USER->capabilities[$sitecontext->id][$capability->capability])) { // Don't overwrite - $USER->capabilities[$sitecontext->id][$capability->capability] = $capability->permission; + $USER->capabilities[$sitecontext->id][$capability->capability] = $capability->permission; } } - // SPECIAL EXCEPTION: If the default user role is actually a guest role, then + // SPECIAL EXCEPTION: If the default user role is actually a guest role, then // remove some capabilities so this user doesn't get confused with a REAL guest if (isset($USER->capabilities[$sitecontext->id]['moodle/legacy:guest']) and $USER->username != 'guest') { - unset($USER->capabilities[$sitecontext->id]['moodle/legacy:guest']); + unset($USER->capabilities[$sitecontext->id]['moodle/legacy:guest']); unset($USER->capabilities[$sitecontext->id]['moodle/course:view']); // No access to courses by default } } @@ -167,9 +167,9 @@ function get_guest_role() { * @return array of contextids */ function get_parent_cats($context, $type) { - + $parents = array(); - + switch ($type) { case CONTEXT_COURSECAT: if (!$cat = get_record('course_categories','id',$context->instanceid)) { @@ -184,7 +184,7 @@ function get_parent_cats($context, $type) { $cat = get_record('course_categories','id',$cat->parent); } break; - + case CONTEXT_COURSE: if (!$course = get_record('course', 'id', $context->instanceid)) { break; @@ -207,7 +207,7 @@ function get_parent_cats($context, $type) { $cat = get_record('course_categories','id',$cat->parent); } break; - + default: break; } @@ -226,7 +226,7 @@ function get_parent_cats($context, $type) { * @param string $errorstring - an errorstring * @param string $stringfile - which stringfile to get it from */ -function require_capability($capability, $context=NULL, $userid=NULL, $doanything=true, +function require_capability($capability, $context=NULL, $userid=NULL, $doanything=true, $errormessage="nopermissions", $stringfile='') { global $USER; @@ -240,7 +240,7 @@ function require_capability($capability, $context=NULL, $userid=NULL, $doanythin require_login(); } } - + /// OK, if they still don't have the capability then print a nice error message if (!has_capability($capability, $context, $userid, $doanything)) { @@ -306,9 +306,9 @@ function has_capability($capability, $context=NULL, $userid=NULL, $doanything=tr if (isset($capabilities[$sitecontext->id]['moodle/site:doanything'])) { return (0 < $capabilities[$sitecontext->id]['moodle/site:doanything']); } - + switch ($context->aggregatelevel) { - + case CONTEXT_COURSECAT: // Check parent cats. $parentcats = get_parent_cats($context, CONTEXT_COURSECAT); @@ -531,7 +531,7 @@ function load_user_capability($capability='', $context ='', $userid='') { $usercontexts = array(); if ($context) { // if context is specified - $usercontexts = get_parent_contexts($context); + $usercontexts = get_parent_contexts($context); } else { // else, we load everything if ($userroles = get_records('role_assignments','userid',$userid)) { foreach ($userroles as $userrole) { @@ -553,7 +553,7 @@ function load_user_capability($capability='', $context ='', $userid='') { if ($capability) { $capsearch = " AND rc.capability = '$capability' "; } else { - $capsearch =""; + $capsearch =""; } /// Then we use 1 giant SQL to bring out all relevant capabilities. @@ -565,7 +565,7 @@ function load_user_capability($capability='', $context ='', $userid='') { $SQL = " SELECT rc.capability, c1.id, (c1.aggregatelevel * 100) AS aggrlevel, SUM(rc.permission) AS sum FROM - {$CFG->prefix}role_assignments ra, + {$CFG->prefix}role_assignments ra, {$CFG->prefix}role_capabilities rc, {$CFG->prefix}context c1 WHERE @@ -573,7 +573,7 @@ function load_user_capability($capability='', $context ='', $userid='') { ra.roleid=rc.roleid AND ra.userid=$userid AND $searchcontexts1 - rc.contextid=$siteinstance->id + rc.contextid=$siteinstance->id $capsearch GROUP BY rc.capability, (c1.aggregatelevel * 100), c1.id @@ -590,14 +590,14 @@ function load_user_capability($capability='', $context ='', $userid='') { {$CFG->prefix}context c2 WHERE ra.contextid=c1.id AND - ra.roleid=rc.roleid AND - ra.userid=$userid AND - rc.contextid=c2.id AND + ra.roleid=rc.roleid AND + ra.userid=$userid AND + rc.contextid=c2.id AND $searchcontexts1 $searchcontexts2 rc.contextid != $siteinstance->id $capsearch - + GROUP BY rc.capability, (c1.aggregatelevel * 100 + c2.aggregatelevel), c1.id HAVING @@ -615,7 +615,7 @@ function load_user_capability($capability='', $context ='', $userid='') { while (!$rs->EOF) { $array = $rs->fields; $temprecord = new object; - + foreach ($array as $key=>$val) { if ($key == 'aggrlevel') { $temprecord->aggregatelevel = $val; @@ -627,14 +627,14 @@ function load_user_capability($capability='', $context ='', $userid='') { $rs->MoveNext(); } } - + /* so up to this point we should have somethign like this * $capabilities[1] ->aggregatelevel = 1000 ->module = SITEID ->capability = do_anything ->id = 1 (id is the context id) ->sum = 0 - + * $capabilities[2] ->aggregatelevel = 1000 ->module = SITEID ->capability = post_messages @@ -652,7 +652,7 @@ function load_user_capability($capability='', $context ='', $userid='') { ->capability = view_course_activities ->id = 26 ->sum = 0 (this is another course) - + * $capabilities[5] ->aggregatelevel = 3050 ->module = course ->capability = view_course_activities @@ -680,21 +680,21 @@ function load_user_capability($capability='', $context ='', $userid='') { $context = get_context_instance_by_id($capability->id); if (!empty($otheruserid)) { // we are pulling out other user's capabilities, do not write to session - + if (capability_prohibits($capability->capability, $context, $capability->sum, $usercap)) { $usercap[$capability->id][$capability->capability] = -9000; continue; } - $usercap[$capability->id][$capability->capability] = $capability->sum; - + $usercap[$capability->id][$capability->capability] = $capability->sum; + } else { if (capability_prohibits($capability->capability, $context, $capability->sum)) { // if any parent or parent's parent is set to prohibit $USER->capabilities[$capability->id][$capability->capability] = -9000; continue; } - + // if no parental prohibit set // just write to session, i am not sure this is correct yet // since 3050 shows up after 3000, and 3070 shows up after 3050, @@ -705,12 +705,12 @@ function load_user_capability($capability='', $context ='', $userid='') { $USER->capabilities[$capability->id][$capability->capability] = $capability->sum; } } - + // now we don't care about the huge array anymore, we can dispose it. unset($capabilities); - + if (!empty($otheruserid)) { - return $usercap; // return the array + return $usercap; // return the array } // see array in session to see what it looks like @@ -718,13 +718,13 @@ function load_user_capability($capability='', $context ='', $userid='') { /* * Check all the login enrolment information for the given user object - * by querying the enrolment plugins + * by querying the enrolment plugins */ function check_enrolment_plugins(&$user) { global $CFG; require_once($CFG->dirroot .'/enrol/enrol.class.php'); - + if (!($plugins = explode(',', $CFG->enrol_plugins_enabled))) { $plugins = array($CFG->enrol); } @@ -770,21 +770,21 @@ function capability_prohibits($capability, $context, $sum='', $array='') { // If this capability is set to prohibit. return true; } - + if (isset($array)) { - if (isset($array[$context->id][$capability]) + if (isset($array[$context->id][$capability]) && $array[$context->id][$capability] < -8000) { return true; - } + } } else { // Else if set in session. - if (isset($USER->capabilities[$context->id][$capability]) + if (isset($USER->capabilities[$context->id][$capability]) && $USER->capabilities[$context->id][$capability] < -8000) { return true; } } switch ($context->aggregatelevel) { - + case CONTEXT_SYSTEM: // By now it's a definite an inherit. return 0; @@ -858,7 +858,7 @@ function capability_prohibits($capability, $context, $sum='', $array='') { */ function print_capabilities($modid=0) { global $CFG; - + $capabilities = array(); if ($modid) { @@ -868,7 +868,7 @@ function print_capabilities($modid=0) { // Call the function that grabs the file and parse. $cm = get_record('course_modules', 'id', $modid); $module = get_record('modules', 'id', $cm->module); - + } else { // Print all capabilities. foreach ($capabilities as $capability) { @@ -886,20 +886,20 @@ function print_capabilities($modid=0) { function moodle_install_roles() { global $CFG, $db; - + // Create a system wide context for assignemnt. $systemcontext = $context = get_context_instance(CONTEXT_SYSTEM, SITEID); // Create default/legacy roles and capabilities. // (1 legacy capability per legacy role at system level). - $adminrole = create_role(get_string('administrator'), 'admin', get_string('administratordescription'), 'moodle/legacy:admin'); + $adminrole = create_role(get_string('administrator'), 'admin', get_string('administratordescription'), 'moodle/legacy:admin'); if (!assign_capability('moodle/site:doanything', CAP_ALLOW, $adminrole, $systemcontext->id)) { error('Could not assign moodle/site:doanything to the admin role'); } - $coursecreatorrole = create_role(get_string('coursecreators'), 'coursecreator', get_string('coursecreatorsdescription'), 'moodle/legacy:coursecreator'); - $editteacherrole = create_role(get_string('defaultcourseteacher'), 'editingteacher', get_string('defaultcourseteacherdescription'), 'moodle/legacy:editingteacher'); - $noneditteacherrole = create_role(get_string('noneditingteacher'), 'teacher', get_string('noneditingteacherdescription'), 'moodle/legacy:teacher'); + $coursecreatorrole = create_role(get_string('coursecreators'), 'coursecreator', get_string('coursecreatorsdescription'), 'moodle/legacy:coursecreator'); + $editteacherrole = create_role(get_string('defaultcourseteacher'), 'editingteacher', get_string('defaultcourseteacherdescription'), 'moodle/legacy:editingteacher'); + $noneditteacherrole = create_role(get_string('noneditingteacher'), 'teacher', get_string('noneditingteacherdescription'), 'moodle/legacy:teacher'); $studentrole = create_role(get_string('defaultcoursestudent'), 'student', get_string('defaultcoursestudentdescription'), 'moodle/legacy:student'); $guestrole = create_role(get_string('guest'), 'guest', get_string('guestdescription'), 'moodle/legacy:guest'); @@ -908,14 +908,14 @@ function moodle_install_roles() { // assign above new roles. If a user has both teacher and student role, // only teacher role is assigned. The assignment should be system level. $dbtables = $db->MetaTables('TABLES'); - + /** * Upgrade the admins. * Sort using id ASC, first one is primary admin. */ if (in_array($CFG->prefix.'user_admins', $dbtables)) { - if ($useradmins = get_records_sql('SELECT * from '.$CFG->prefix.'user_admins ORDER BY ID ASC')) { + if ($useradmins = get_records_sql('SELECT * from '.$CFG->prefix.'user_admins ORDER BY ID ASC')) { foreach ($useradmins as $admin) { role_assign($adminrole, $admin->userid, 0, $systemcontext->id); } @@ -966,7 +966,7 @@ function moodle_install_roles() { */ if (in_array($CFG->prefix.'user_students', $dbtables)) { if ($userstudents = get_records('user_students')) { - foreach ($userstudents as $student) { + foreach ($userstudents as $student) { // populate the user_lastaccess table unset($access); $access->timeaccess = $student->timeaccess; @@ -989,31 +989,31 @@ function moodle_install_roles() { } /** - * Insert the correct records for legacy roles + * Insert the correct records for legacy roles */ allow_assign($adminrole, $adminrole); allow_assign($adminrole, $coursecreatorrole); allow_assign($adminrole, $noneditteacherrole); - allow_assign($adminrole, $editteacherrole); + allow_assign($adminrole, $editteacherrole); allow_assign($adminrole, $studentrole); allow_assign($adminrole, $guestrole); - + allow_assign($coursecreatorrole, $noneditteacherrole); allow_assign($coursecreatorrole, $editteacherrole); - allow_assign($coursecreatorrole, $studentrole); + allow_assign($coursecreatorrole, $studentrole); allow_assign($coursecreatorrole, $guestrole); - - allow_assign($editteacherrole, $noneditteacherrole); - allow_assign($editteacherrole, $studentrole); + + allow_assign($editteacherrole, $noneditteacherrole); + allow_assign($editteacherrole, $studentrole); allow_assign($editteacherrole, $guestrole); - + /// overrides allow_override($adminrole, $adminrole); allow_override($adminrole, $coursecreatorrole); allow_override($adminrole, $noneditteacherrole); - allow_override($adminrole, $editteacherrole); + allow_override($adminrole, $editteacherrole); allow_override($adminrole, $studentrole); - allow_override($adminrole, $guestrole); + allow_override($adminrole, $guestrole); // Should we delete the tables after we are done? Not yet. @@ -1032,11 +1032,11 @@ function moodle_install_roles() { * @return boolean - success or failure. */ function assign_legacy_capabilities($capability, $legacyperms) { - + foreach ($legacyperms as $type => $perm) { - + $systemcontext = get_context_instance(CONTEXT_SYSTEM, SITEID); - + // The legacy capabilities are: // 'moodle/legacy:guest' // 'moodle/legacy:student' @@ -1044,7 +1044,7 @@ function assign_legacy_capabilities($capability, $legacyperms) { // 'moodle/legacy:editingteacher' // 'moodle/legacy:coursecreator' // 'moodle/legacy:admin' - + if ($roles = get_roles_with_capability('moodle/legacy:'.$type, CAP_ALLOW)) { foreach ($roles as $role) { // Assign a site level capability. @@ -1065,9 +1065,9 @@ function assign_legacy_capabilities($capability, $legacyperms) { */ function islegacy($capabilityname) { if (strstr($capabilityname, 'legacy') === false) { - return false; + return false; } else { - return true; + return true; } } @@ -1180,46 +1180,46 @@ function get_local_override($roleid, $contextid, $capability) { * @return id or false */ function create_role($name, $shortname, $description, $legacy='') { - + // check for duplicate role name - + if ($role = get_record('role','name', $name)) { - error('there is already a role with this name!'); + error('there is already a role with this name!'); } - + if ($role = get_record('role','shortname', $shortname)) { - error('there is already a role with this shortname!'); + error('there is already a role with this shortname!'); } $role->name = $name; $role->shortname = $shortname; $role->description = $description; - - $context = get_context_instance(CONTEXT_SYSTEM, SITEID); - + + $context = get_context_instance(CONTEXT_SYSTEM, SITEID); + if ($id = insert_record('role', $role)) { - if ($legacy) { - assign_capability($legacy, CAP_ALLOW, $id, $context->id); + if ($legacy) { + assign_capability($legacy, CAP_ALLOW, $id, $context->id); } - + /// By default, users with role:manage at site level /// should be able to assign users to this new role, and override this new role's capabilities - + // find all admin roles if ($adminroles = get_roles_with_capability('moodle/role:manage', CAP_ALLOW, $context)) { // foreach admin role foreach ($adminroles as $arole) { // write allow_assign and allow_overrid allow_assign($arole->id, $id); - allow_override($arole->id, $id); + allow_override($arole->id, $id); } } - + return $id; } else { - return false; + return false; } - + } /** @@ -1231,13 +1231,13 @@ function create_role($name, $shortname, $description, $legacy='') { * @param permission - int 1,-1 or -1000 */ function assign_capability($capability, $permission, $roleid, $contextid, $overwrite=false) { - + global $USER; - + if (empty($permission) || $permission == 0) { // if permission is not set - unassign_capability($capability, $roleid, $contextid); + unassign_capability($capability, $roleid, $contextid); } - + $existing = get_record('role_capabilities', 'contextid', $contextid, 'roleid', $roleid, 'capability', $capability); if ($existing and !$overwrite) { // We want to keep whatever is there already @@ -1268,7 +1268,7 @@ function assign_capability($capability, $permission, $roleid, $contextid, $overw * @return boolean - success or failure */ function unassign_capability($capability, $roleid, $contextid=NULL) { - + if (isset($contextid)) { $status = delete_records('role_capabilities', 'capability', $capability, 'roleid', $roleid, 'contextid', $contextid); @@ -1292,20 +1292,20 @@ function unassign_capability($capability, $roleid, $contextid=NULL) { function get_roles_with_capability($capability, $permission=NULL, $context='') { global $CFG; - + if ($context) { if ($contexts = get_parent_contexts($context)) { $listofcontexts = '('.implode(',', $contexts).')'; } else { $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); - $listofcontexts = '('.$sitecontext->id.')'; // must be site - } + $listofcontexts = '('.$sitecontext->id.')'; // must be site + } $contextstr = "AND (rc.contextid = '$context->id' OR rc.contextid IN $listofcontexts)"; } else { $contextstr = ''; } - - $selectroles = "SELECT r.* + + $selectroles = "SELECT r.* FROM {$CFG->prefix}role r, {$CFG->prefix}role_capabilities rc WHERE rc.capability = '$capability' @@ -1345,7 +1345,7 @@ function role_assign($roleid, $userid, $groupid, $contextid, $timestart=0, $time notify('Either userid or groupid must be provided'); return false; } - + if ($userid && !record_exists('user', 'id', $userid)) { notify('User does not exist!'); return false; @@ -1426,7 +1426,7 @@ function role_assign($roleid, $userid, $groupid, $contextid, $timestart=0, $time /// Make sure they have an entry in user_lastaccess for courses they can access // role_add_lastaccess_entries($userid, $context); } - + /// now handle metacourse role assignments if in course context if ($success and $context->aggregatelevel == CONTEXT_COURSE) { if ($parents = get_records('course_meta', 'child_course', $context->instanceid)) { @@ -1451,7 +1451,7 @@ function role_assign($roleid, $userid, $groupid, $contextid, $timestart=0, $time function role_unassign($roleid=0, $userid=0, $groupid=0, $contextid=0) { global $USER, $CFG; - + $success = true; $args = array('roleid', 'userid', 'groupid', 'contextid'); @@ -1512,8 +1512,8 @@ function role_unassign($roleid=0, $userid=0, $groupid=0, $contextid=0) { return $success; } -/* - * A convenience function to take care of the common case where you +/* + * A convenience function to take care of the common case where you * just want to enrol someone using the default role into a course * * @param object $course @@ -1536,9 +1536,9 @@ function enrol_into_course($course, $user, $enrol) { if (role_assign($role->id, $user->id, 0, $context->id, $timestart, $timeend, 0, $enrol)) { return false; } - + email_welcome_message_to_user($course, $user); - + add_to_log($course->id, 'course', 'enrol', 'view.php?id='.$course->id, $user->id); return true; @@ -1590,7 +1590,7 @@ function role_add_lastaccess_entries($userid, $context) { } } break; - + case CONTEXT_COURSE: // For a whole course if ($course = get_record('course', 'id', $context->instanceid)) { @@ -1628,7 +1628,7 @@ function load_capability_def($component) { $varprefix = 'moodle'; } else { $compparts = explode('/', $component); - + if ($compparts[0] == 'block') { // Blocks are an exception. Blocks directory is 'blocks', and not // 'block'. So we need to jump through hoops. @@ -1641,7 +1641,7 @@ function load_capability_def($component) { } } $capabilities = array(); - + if (file_exists($defpath)) { require_once($defpath); $capabilities = ${$varprefix.'_capabilities'}; @@ -1675,13 +1675,13 @@ function get_cached_capabilities($component='moodle') { * * Note that the absence of the db/access.php capabilities definition file * will cause any stored capabilities for the component to be removed from - * the database. + * the database. * * @param $component - examples: 'moodle', 'mod/forum', 'block/quiz_results' * @return boolean */ function update_capabilities($component='moodle') { - + $storedcaps = array(); $filecaps = load_capability_def($component); @@ -1708,9 +1708,9 @@ function update_capabilities($component='moodle') { // Are there new capabilities in the file definition? $newcaps = array(); - + foreach ($filecaps as $filecap => $def) { - if (!$storedcaps || + if (!$storedcaps || ($storedcaps && in_array($filecap, $storedcaps) === false)) { if (!array_key_exists('riskbitmask', $def)) { $def['riskbitmask'] = 0; // no risk if not specified @@ -1726,11 +1726,11 @@ function update_capabilities($component='moodle') { $capability->contextlevel = $capdef['contextlevel']; $capability->component = $component; $capability->riskbitmask = $capdef['riskbitmask']; - + if (!insert_record('capabilities', $capability, false, 'id')) { return false; } - + global $db; $db->debug= 999; // Do we need to assign the new capabilities to roles that have the @@ -1744,7 +1744,7 @@ function update_capabilities($component='moodle') { // definition that we need to delete from the stored capabilities and // role assignments? capabilities_cleanup($component, $filecaps); - + return true; } @@ -1758,14 +1758,14 @@ function update_capabilities($component='moodle') { * @return int - number of deprecated capabilities that have been removed */ function capabilities_cleanup($component, $newcapdef=NULL) { - + $removedcount = 0; - + if ($cachedcaps = get_cached_capabilities($component)) { foreach ($cachedcaps as $cachedcap) { if (empty($newcapdef) || array_key_exists($cachedcap->name, $newcapdef) === false) { - + // Remove from capabilities cache. if (!delete_records('capabilities', 'name', $cachedcap->name)) { error('Could not delete deprecated capability '.$cachedcap->name); @@ -1868,7 +1868,7 @@ function print_context_name($context) { /** - * Extracts the relevant capabilities given a contextid. + * Extracts the relevant capabilities given a contextid. * All case based, example an instance of forum context. * Will fetch all forum related capabilities, while course contexts * Will fetch all capabilities @@ -1882,11 +1882,11 @@ function print_context_name($context) { * `component` varchar(100) NOT NULL, */ function fetch_context_capabilities($context) { - + global $CFG; $sort = 'ORDER BY contextlevel,component,id'; // To group them sensibly for display - + switch ($context->aggregatelevel) { case CONTEXT_SYSTEM: // all @@ -1896,11 +1896,11 @@ function fetch_context_capabilities($context) { case CONTEXT_PERSONAL: $SQL = "select * from {$CFG->prefix}capabilities where contextlevel = ".CONTEXT_PERSONAL; break; - + case CONTEXT_USER: $SQL = "select * from {$CFG->prefix}capabilities where contextlevel = ".CONTEXT_USER; break; - + case CONTEXT_COURSECAT: // all $SQL = "select * from {$CFG->prefix}capabilities"; break; @@ -1915,7 +1915,7 @@ function fetch_context_capabilities($context) { case CONTEXT_MODULE: // mod caps $cm = get_record('course_modules', 'id', $context->instanceid); $module = get_record('modules', 'id', $cm->module); - + $SQL = "select * from {$CFG->prefix}capabilities where contextlevel = ".CONTEXT_MODULE." and component = 'mod/$module->name'"; break; @@ -1923,7 +1923,7 @@ function fetch_context_capabilities($context) { case CONTEXT_BLOCK: // block caps $cb = get_record('block_instance', 'id', $context->instanceid); $block = get_record('block', 'id', $cb->blockid); - + $SQL = "select * from {$CFG->prefix}capabilities where contextlevel = ".CONTEXT_BLOCK." and component = 'block/$block->name'"; break; @@ -1953,7 +1953,7 @@ function fetch_context_capabilities($context) { } // end of special sorting return $records; - + } @@ -1963,13 +1963,13 @@ function fetch_context_capabilities($context) { * @return array of capability records from the capabilities table. */ function fetch_context_independent_capabilities() { - + $contextindependentcaps = array( 'moodle/site:accessallgroups' ); $records = array(); - + foreach ($contextindependentcaps as $capname) { $record = get_record('capabilities', 'name', $capname); array_push($records, $record); @@ -1989,42 +1989,42 @@ function fetch_context_independent_capabilities() { */ function role_context_capabilities($roleid, $context, $cap='') { global $CFG; - + $contexts = get_parent_contexts($context); $contexts[] = $context->id; $contexts = '('.implode(',', $contexts).')'; - + if ($cap) { $search = " AND rc.capability = '$cap' "; } else { - $search = ''; + $search = ''; } - - $SQL = "SELECT rc.* - FROM {$CFG->prefix}role_capabilities rc, + + $SQL = "SELECT rc.* + FROM {$CFG->prefix}role_capabilities rc, {$CFG->prefix}context c WHERE rc.contextid in $contexts AND rc.roleid = $roleid AND rc.contextid = c.id $search - ORDER BY c.aggregatelevel DESC, - rc.capability DESC"; + ORDER BY c.aggregatelevel DESC, + rc.capability DESC"; $capabilities = array(); - + if ($records = get_records_sql($SQL)) { // We are traversing via reverse order. foreach ($records as $record) { // If not set yet (i.e. inherit or not set at all), or currently we have a prohibit if (!isset($capabilities[$record->capability]) || $record->permission<-500) { $capabilities[$record->capability] = $record->permission; - } + } } } return $capabilities; } /** - * Recursive function which, given a context, find all parent context ids, + * Recursive function which, given a context, find all parent context ids, * and return the array in reverse order, i.e. parent first, then grand * parent, etc. * @param object $context @@ -2045,7 +2045,7 @@ function get_parent_contexts($context) { return array($parent->id); } break; - + case CONTEXT_USER: if (!$parent = get_context_instance(CONTEXT_SYSTEM, SITEID)) { return array(); @@ -2053,7 +2053,7 @@ function get_parent_contexts($context) { return array($parent->id); } break; - + case CONTEXT_COURSECAT: // Coursecat -> coursecat or site if (!$coursecat = get_record('course_categories','id',$context->instanceid)) { return array(); @@ -2126,7 +2126,7 @@ function get_parent_contexts($context) { */ function get_related_contexts_string($context) { if ($parents = get_parent_contexts($context)) { - return (' IN ('.$context->id.','.implode(',', $parents).')'); + return (' IN ('.$context->id.','.implode(',', $parents).')'); } else { return (' ='.$context->id); } @@ -2157,19 +2157,19 @@ function get_role_context_capability($contextid, $capability, $capabilities) { * @param $capabilityname - e.g. mod/choice:readresponses */ function get_capability_string($capabilityname) { - + // Typical capabilityname is mod/choice:readresponses $names = split('/', $capabilityname); $stringname = $names[1]; // choice:readresponses - $components = split(':', $stringname); + $components = split(':', $stringname); $componentname = $components[0]; // choice switch ($names[0]) { case 'mod': $string = get_string($stringname, $componentname); break; - + case 'block': $string = get_string($stringname, 'block_'.$componentname); break; @@ -2177,15 +2177,15 @@ function get_capability_string($capabilityname) { case 'moodle': $string = get_string($stringname, 'role'); break; - + case 'enrol': $string = get_string($stringname, 'enrol_'.$componentname); - break; - + break; + default: $string = get_string($stringname); - break; - + break; + } return $string; } @@ -2240,7 +2240,7 @@ function get_component_string($component, $contextlevel) { default: error ('This is an unknown context!'); return false; - + } return $string; } @@ -2254,35 +2254,35 @@ function get_roles_used_in_context($context) { global $CFG; $contextlist = get_related_contexts_string($context); - + $sql = "SELECT DISTINCT r.id, r.name, r.shortname, r.sortorder FROM {$CFG->prefix}role_assignments ra, - {$CFG->prefix}role r - WHERE r.id = ra.roleid + {$CFG->prefix}role r + WHERE r.id = ra.roleid AND ra.contextid $contextlist ORDER BY r.sortorder ASC"; - + return get_records_sql($sql); } -/** this function is used to print roles column in user profile page. +/** this function is used to print roles column in user profile page. * @param int userid * @param int contextid * @return string */ function get_user_roles_in_context($userid, $contextid){ global $CFG; - + $rolestring = ''; $SQL = 'select * from '.$CFG->prefix.'role_assignments ra, '.$CFG->prefix.'role r where ra.userid='.$userid.' and ra.contextid='.$contextid.' and ra.roleid = r.id'; if ($roles = get_records_sql($SQL)) { foreach ($roles as $userrole) { $rolestring .= ''.$userrole->name.', '; - } - + } + } return rtrim($rolestring, ', '); } @@ -2298,7 +2298,7 @@ function user_can_override($context, $targetroleid) { // first check if user has override capability // if not return false; if (!has_capability('moodle/role:override', $context)) { - return false; + return false; } // pull out all active roles of this user from this context(or above) if ($userroles = get_user_roles($context)) { @@ -2309,9 +2309,9 @@ function user_can_override($context, $targetroleid) { } } } - + return false; - + } /** @@ -2321,11 +2321,11 @@ function user_can_override($context, $targetroleid) { * @return boolean */ function user_can_assign($context, $targetroleid) { - + // first check if user has override capability // if not return false; if (!has_capability('moodle/role:assign', $context)) { - return false; + return false; } // pull out all active roles of this user from this context(or above) if ($userroles = get_user_roles($context)) { @@ -2336,8 +2336,8 @@ function user_can_assign($context, $targetroleid) { } } } - - return false; + + return false; } /** @@ -2373,12 +2373,12 @@ function get_user_roles($context, $userid=0, $checkparentcontexts=true) { WHERE ra.userid = '.$userid. ' AND ra.roleid = r.id AND ra.contextid = c.id - AND '.$contexts. + AND '.$contexts. ' ORDER BY c.aggregatelevel DESC'); } /** - * Creates a record in the allow_override table + * Creates a record in the allow_override table * @param int sroleid - source roleid * @param int troleid - target roleid * @return int - id or false @@ -2390,7 +2390,7 @@ function allow_override($sroleid, $troleid) { } /** - * Creates a record in the allow_assign table + * Creates a record in the allow_assign table * @param int sroleid - source roleid * @param int troleid - target roleid * @return int - id or false @@ -2437,15 +2437,15 @@ function get_overridable_roles ($context) { } } } - - return $options; + + return $options; } /* * Returns a role object that is the default role for new enrolments * in a given course * - * @param object $course + * @param object $course * @return object $role */ function get_default_course_role($course) { @@ -2483,28 +2483,28 @@ function get_default_course_role($course) { * @param $fields - fields to be pulled * @param $sort - the sort order * @param $limitfrom - number of records to skip (offset) - * @param $limitnum - number of records to fetch + * @param $limitnum - number of records to fetch * @param $groups - single group or array of groups - group(s) user is in * @param $exceptions - list of users to exclude */ -function get_users_by_capability($context, $capability, $fields='', $sort='', +function get_users_by_capability($context, $capability, $fields='', $sort='', $limitfrom='', $limitnum='', $groups='', $exceptions='') { global $CFG; - + /// Sorting out groups if ($groups) { $groupjoin = 'INNER JOIN '.$CFG->prefix.'groups_members gm ON gm.userid = ra.userid'; - + if (is_array($groups)) { $groupsql = 'AND gm.groupid IN ('.implode(',', $groups).')'; } else { - $groupsql = 'AND gm.groupid = '.$groups; + $groupsql = 'AND gm.groupid = '.$groups; } } else { $groupjoin = ''; - $groupsql = ''; + $groupsql = ''; } - + /// Sorting out exceptions $exceptionsql = $exceptions ? "AND u.id NOT IN ($exceptions)" : ''; @@ -2518,8 +2518,8 @@ function get_users_by_capability($context, $capability, $fields='', $sort='', $sort = 'ul.timeaccess'; } - $sortby = $sort ? " ORDER BY $sort " : ''; - + $sortby = $sort ? " ORDER BY $sort " : ''; + /// If context is a course, then construct sql for ul if ($context->aggregatelevel == CONTEXT_COURSE) { $courseid = $context->instanceid; @@ -2536,23 +2536,23 @@ function get_users_by_capability($context, $capability, $fields='', $sort='', if ($caps[$capability] > 0) { // resolved capability > 0 $validroleids[] = $prole->id; } - } + } $roleids = '('.implode(',', $validroleids).')'; /// Construct the main SQL $select = " SELECT $fields"; - $from = " FROM {$CFG->prefix}user u - INNER JOIN {$CFG->prefix}role_assignments ra ON ra.userid = u.id + $from = " FROM {$CFG->prefix}user u + INNER JOIN {$CFG->prefix}role_assignments ra ON ra.userid = u.id LEFT OUTER JOIN {$CFG->prefix}user_lastaccess ul ON ul.userid = u.id $groupjoin"; - $where = " WHERE ra.contextid ".get_related_contexts_string($context)." - AND u.deleted = 0 - AND ra.roleid in $roleids + $where = " WHERE ra.contextid ".get_related_contexts_string($context)." + AND u.deleted = 0 + AND ra.roleid in $roleids $exceptionsql $coursesql $groupsql"; - return get_records_sql($select.$from.$where.$sortby, $limitfrom, $limitnum); + return get_records_sql($select.$from.$where.$sortby, $limitfrom, $limitnum); } /** @@ -2564,28 +2564,28 @@ function get_users_by_capability($context, $capability, $fields='', $sort='', */ function get_role_users($roleid, $context, $parent=false) { global $CFG; - + if ($parent) { if ($contexts = get_parent_contexts($context)) { $parentcontexts = 'r.contextid IN ('.implode(',', $contexts).')'; } else { - $parentcontexts = ''; + $parentcontexts = ''; } } else { - $parentcontexts = ''; + $parentcontexts = ''; } - - $SQL = "select u.* - from {$CFG->prefix}role_assignments r, - {$CFG->prefix}user u - where (r.contextid = $context->id $parentcontexts) - and r.roleid = $roleid + + $SQL = "select u.* + from {$CFG->prefix}role_assignments r, + {$CFG->prefix}user u + where (r.contextid = $context->id $parentcontexts) + and r.roleid = $roleid and u.id = r.userid"; // join now so that we can just use fullname() later - + return get_records_sql($SQL); } -/** +/** * This function gets the list of courses that this user has a particular capability in * This is not the most efficient way of doing this * @param string capability @@ -2593,19 +2593,19 @@ function get_role_users($roleid, $context, $parent=false) { * @return array */ function get_user_capability_course($capability, $userid='') { - + global $USER; if (!$userid) { - $userid = $USER->id; + $userid = $USER->id; } - + $usercourses = array(); $courses = get_records_select('course', '', '', 'id, id'); - + foreach ($courses as $course) { if (has_capability($capability, get_context_capability(CONTEXT_COURSE, $course->id))) { $usercourses[] = $course; } } - return $usercourses; + return $usercourses; } \ No newline at end of file diff --git a/lib/adminlib.php b/lib/adminlib.php index 1fce4e7cd0b..d571befad72 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -17,7 +17,7 @@ * @param string $type The type of plugins that should be updated (e.g. 'enrol', 'qtype') * @param string $dir The directory where the plugins are located (e.g. 'question/questiontypes') * @param string $return The url to prompt the user to continue to - */ + */ function upgrade_plugins($type, $dir, $return) { global $CFG, $db; @@ -62,7 +62,7 @@ function upgrade_plugins($type, $dir, $return) { $info->currentmoodle = $CFG->version; $info->requiremoodle = $plugin->requires; if (!$updated_plugins) { - print_header($strpluginsetup, $strpluginsetup, $strpluginsetup, '', + print_header($strpluginsetup, $strpluginsetup, $strpluginsetup, '', '', false, ' ', ' '); } @@ -81,12 +81,12 @@ function upgrade_plugins($type, $dir, $return) { if (!isset($CFG->$pluginversion)) { set_config($pluginversion, 0); } - + if ($CFG->$pluginversion == $plugin->version) { // do nothing } else if ($CFG->$pluginversion < $plugin->version) { if (!$updated_plugins) { - print_header($strpluginsetup, $strpluginsetup, $strpluginsetup, '', + print_header($strpluginsetup, $strpluginsetup, $strpluginsetup, '', '', false, ' ', ' '); } @@ -104,12 +104,12 @@ function upgrade_plugins($type, $dir, $return) { $status = install_from_xmldb_file($fullplug . '/db/install.xml'); //New method } else if (file_exists($fullplug .'/db/'. $CFG->dbtype .'.sql')) { $status = modify_database($fullplug .'/db/'. $CFG->dbtype .'.sql'); //Old method - } else { + } else { $status = true; } $db->debug = false; - /// Continue with the instalation, roles and other stuff + /// Continue with the instalation, roles and other stuff if ($status) { // OK so far, now update the plugins record set_config($pluginversion, $plugin->version); @@ -180,7 +180,7 @@ function upgrade_plugins($type, $dir, $return) { * @uses $CFG * @param string $return The url to prompt the user to continue to * @todo Finish documenting this function - */ + */ function upgrade_activity_modules($return) { global $CFG, $db; @@ -231,7 +231,7 @@ function upgrade_activity_modules($return) { $info->currentmoodle = $CFG->version; $info->requiremoodle = $module->requires; if (!$updated_modules) { - print_header($strmodulesetup, $strmodulesetup, $strmodulesetup, '', + print_header($strmodulesetup, $strmodulesetup, $strmodulesetup, '', '', false, ' ', ' '); } @@ -244,7 +244,7 @@ function upgrade_activity_modules($return) { } $module->name = $mod; // The name MUST match the directory - + if ($currmodule = get_record('modules', 'name', $module->name)) { if ($currmodule->version == $module->version) { // do nothing @@ -256,7 +256,7 @@ function upgrade_activity_modules($return) { continue; } if (!$updated_modules) { - print_header($strmodulesetup, $strmodulesetup, $strmodulesetup, '', + print_header($strmodulesetup, $strmodulesetup, $strmodulesetup, '', '', false, ' ', ' '); } @@ -308,15 +308,15 @@ function upgrade_activity_modules($return) { } $updated_modules = true; - + } else { upgrade_log_start(); error('Version mismatch: '. $module->name .' can\'t downgrade '. $currmodule->version .' -> '. $module->version .' !'); } - + } else { // module not installed yet, so install it if (!$updated_modules) { - print_header($strmodulesetup, $strmodulesetup, $strmodulesetup, '', + print_header($strmodulesetup, $strmodulesetup, $strmodulesetup, '', '', false, ' ', ' '); } @@ -346,7 +346,7 @@ function upgrade_activity_modules($return) { } else { error($module->name .' module could not be added to the module list!'); } - } else { + } else { error($module->name .' tables could NOT be set up successfully!'); } } @@ -366,7 +366,7 @@ function upgrade_activity_modules($return) { if ( is_readable($fullmod .'/defaults.php')) { // Insert default values for any important configuration variables unset($defaults); - include_once($fullmod .'/defaults.php'); + include_once($fullmod .'/defaults.php'); if (!empty($defaults)) { foreach ($defaults as $name => $value) { if (!isset($CFG->$name)) { @@ -386,7 +386,7 @@ function upgrade_activity_modules($return) { } } -/** +/** * This function will return FALSE if the lock fails to be set (ie, if it's already locked) * * @param string $name ? @@ -620,12 +620,12 @@ function is_dataroot_insecure() { /// This file performs the following tasks: /// -it defines the necessary objects and interfaces to build the Moodle /// admin hierarchy -/// -it defines the admin_externalpage_setup(), admin_externalpage_print_header(), +/// -it defines the admin_externalpage_setup(), admin_externalpage_print_header(), /// and admin_externalpage_print_footer() functions used on admin pages /// ADMIN_SETTING OBJECTS -/// Moodle settings are represented by objects that inherit from the admin_setting +/// Moodle settings are represented by objects that inherit from the admin_setting /// class. These objects encapsulate how to read a setting, how to write a new value /// to a setting, and how to appropriately display the HTML to modify the setting. @@ -648,7 +648,7 @@ function is_dataroot_insecure() { /// admin/settings/first.php (at the end of the file) or to some other file in /// admin/settings: -/// $ADMIN->add('userinterface', new admin_externalpage('foo', get_string('foo'), +/// $ADMIN->add('userinterface', new admin_externalpage('foo', get_string('foo'), /// $CFG->wwwdir . '/' . '$CFG->admin . '/foo.php', 'some_role_permission')); /// Next, in foo.php, your file structure would resemble the following: @@ -733,9 +733,9 @@ class part_of_admin_tree { * @param string $name The internal name of the part_of_admin_tree we're searching for. * @return mixed An object reference or a NULL reference. */ - function &locate($name) { - trigger_error('Admin class does not implement method locate()', E_USER_WARNING); - return; + function &locate($name) { + trigger_error('Admin class does not implement method locate()', E_USER_WARNING); + return; } /** @@ -745,9 +745,9 @@ class part_of_admin_tree { * @return boolean success. */ function prune($name) { - trigger_error('Admin class does not implement method prune()', E_USER_WARNING); + trigger_error('Admin class does not implement method prune()', E_USER_WARNING); return; - } + } /** * Verifies current user's access to this part_of_admin_tree. @@ -761,11 +761,11 @@ class part_of_admin_tree { * * @return bool True if the user has access, false if she doesn't. */ - function check_access() { - trigger_error('Admin class does not implement method check_access()', E_USER_WARNING); - return; + function check_access() { + trigger_error('Admin class does not implement method check_access()', E_USER_WARNING); + return; } - + /** * Determines the path to $name in the admin tree. * @@ -785,9 +785,9 @@ class part_of_admin_tree { * @param array $path Not used on external calls. Defaults to empty array. * @return mixed If found, an array containing the internal names of each part_of_admin_tree that leads to $name. If not found, NULL. */ - function path($name, $path = array()) { - trigger_error('Admin class does not implement method path()', E_USER_WARNING); - return; + function path($name, $path = array()) { + trigger_error('Admin class does not implement method path()', E_USER_WARNING); + return; } } @@ -796,14 +796,14 @@ class part_of_admin_tree { * * The pseudointerface implemented by any part_of_admin_tree that can be a parent * to other part_of_admin_tree's. (For now, this only includes admin_category.) Apart - * from ensuring part_of_admin_tree compliancy, it also ensures inheriting methods + * from ensuring part_of_admin_tree compliancy, it also ensures inheriting methods * include an add method for adding other part_of_admin_tree objects as children. * * @author Vincenzo K. Marcovecchio * @package admin */ class parentable_part_of_admin_tree extends part_of_admin_tree { - + /** * Adds a part_of_admin_tree object to the admin tree. * @@ -816,16 +816,16 @@ class parentable_part_of_admin_tree extends part_of_admin_tree { * @param part_of_admin_tree &$something The object to be added. * @return bool True on success, false on failure. */ - function add($destinationname, &$something) { - trigger_error('Admin class does not implement method add()', E_USER_WARNING); - return; + function add($destinationname, &$something) { + trigger_error('Admin class does not implement method add()', E_USER_WARNING); + return; } - + } /** * The object used to represent folders (a.k.a. categories) in the admin tree block. - * + * * Each admin_category object contains a number of part_of_admin_tree objects. * * @author Vincenzo K. Marcovecchio @@ -837,17 +837,17 @@ class admin_category extends parentable_part_of_admin_tree { * @var mixed An array of part_of_admin_tree objects that are this object's children */ var $children; - + /** * @var string An internal name for this category. Must be unique amongst ALL part_of_admin_tree objects */ var $name; - + /** * @var string The displayed name for this category. Usually obtained through get_string() */ var $visiblename; - + // constructor for an empty admin category // $name is the internal name of the category. it MUST be unique in the entire hierarchy // $visiblename is the displayed name of the category. use a get_string for this @@ -864,7 +864,7 @@ class admin_category extends parentable_part_of_admin_tree { $this->name = $name; $this->visiblename = $visiblename; } - + /** * Finds the path to the part_of_admin_tree called $name. * @@ -873,21 +873,21 @@ class admin_category extends parentable_part_of_admin_tree { * @return mixed An array of internal names that leads to $name, or NULL if not found. */ function path($name, $path = array()) { - + $path[count($path)] = $this->name; - + if ($this->name == $name) { return $path; } - + foreach($this->children as $child) { if ($return = $child->path($name, $path)) { return $return; } } - + return NULL; - + } /** @@ -897,11 +897,11 @@ class admin_category extends parentable_part_of_admin_tree { * @return mixed A reference to the object with internal name $name if found, otherwise a reference to NULL. */ function &locate($name) { - + if ($this->name == $name) { return $this; } - + foreach($this->children as $child) { if ($return =& $child->locate($name)) { return $return; @@ -926,7 +926,7 @@ class admin_category extends parentable_part_of_admin_tree { foreach($this->children as $precedence => $child) { if ($child->name == $name) { // found it! - unset($this->children[$precedence]); + unset($this->children[$precedence]); return true; } if ($this->children[$precedence]->prune($name)) { @@ -945,7 +945,7 @@ class admin_category extends parentable_part_of_admin_tree { * @return bool True if successfully added, false if &$something is not a part_of_admin_tree or if $name is not found. */ function add($destinationname, &$something, $precedence = '') { - + if (!is_a($something, 'part_of_admin_tree')) { return false; } @@ -961,11 +961,11 @@ class admin_category extends parentable_part_of_admin_tree { } return true; } - + unset($entries); - + $entries = array_keys($this->children); - + foreach($entries as $entry) { $child =& $this->children[$entry]; if (is_a($child, 'parentable_part_of_admin_tree')) { @@ -974,27 +974,27 @@ class admin_category extends parentable_part_of_admin_tree { } } } - + return false; - + } - + /** * Checks if the user has access to anything in this category. * * @return bool True if the user has access to atleast one child in this category, false otherwise. */ function check_access() { - + $return = false; foreach ($this->children as $child) { $return = $return || $child->check_access(); } - + return $return; - + } - + } /** @@ -1007,26 +1007,26 @@ class admin_category extends parentable_part_of_admin_tree { */ class admin_externalpage extends part_of_admin_tree { - /** + /** * @var string An internal name for this external page. Must be unique amongst ALL part_of_admin_tree objects */ var $name; - + /** * @var string The displayed name for this external page. Usually obtained through get_string(). */ var $visiblename; - + /** * @var string The external URL that we should link to when someone requests this external page. */ var $url; - + /** * @var string The role capability/permission a user must have to access this external page. */ var $role; - + /** * Constructor for adding an external page into the admin tree. * @@ -1041,7 +1041,7 @@ class admin_externalpage extends part_of_admin_tree { $this->url = $url; $this->role = $role; } - + /** * Finds the path to the part_of_admin_tree called $name. * @@ -1057,7 +1057,7 @@ class admin_externalpage extends part_of_admin_tree { return NULL; } } - + /** * Returns a reference to the part_of_admin_tree object with internal name $name. * @@ -1084,7 +1084,7 @@ class admin_externalpage extends part_of_admin_tree { if (!get_site()) { return true; // no access check before site is fully set up } - $context = get_context_instance(CONTEXT_SYSTEM, SITEID); + $context = get_context_instance(CONTEXT_SYSTEM, SITEID); return has_capability($this->role, $context); } @@ -1098,11 +1098,11 @@ class admin_externalpage extends part_of_admin_tree { */ class admin_settingpage extends part_of_admin_tree { - /** + /** * @var string An internal name for this external page. Must be unique amongst ALL part_of_admin_tree objects */ var $name; - + /** * @var string The displayed name for this external page. Usually obtained through get_string(). */ @@ -1111,12 +1111,12 @@ class admin_settingpage extends part_of_admin_tree { * @var mixed An array of admin_setting objects that are part of this setting page. */ var $settings; - + /** * @var string The role capability/permission a user must have to access this external page. */ var $role; - + // see admin_category function path($name, $path = array()) { if ($name == $this->name) { @@ -1126,7 +1126,7 @@ class admin_settingpage extends part_of_admin_tree { return NULL; } } - + // see admin_category function &locate($name) { $return = ($this->name == $name ? $this : NULL); @@ -1145,7 +1145,7 @@ class admin_settingpage extends part_of_admin_tree { $this->visiblename = $visiblename; $this->role = $role; } - + // not the same as add for admin_category. adds an admin_setting to this admin_settingpage. settings appear (on the settingpage) in the order in which they're added // n.b. each admin_setting in an admin_settingpage must have a unique internal name // &$setting is the admin_setting object you want to add @@ -1157,16 +1157,16 @@ class admin_settingpage extends part_of_admin_tree { } return false; } - + // see admin_externalpage function check_access() { if (!get_site()) { return true; // no access check before site is fully set up } - $context = get_context_instance(CONTEXT_SYSTEM, SITEID); + $context = get_context_instance(CONTEXT_SYSTEM, SITEID); return has_capability($this->role, $context); } - + // outputs this page as html in a table (suitable for inclusion in an admin pagetype) // returns a string of the html function output_html() { @@ -1211,19 +1211,19 @@ class admin_setting { $this->description = $description; $this->defaultsetting = $defaultsetting; } - + function get_setting() { return NULL; // has to be overridden } - + function write_setting($data) { return; // has to be overridden } - + function output_html() { return; // has to be overridden } - + } @@ -1241,7 +1241,7 @@ class admin_setting_configtext extends admin_setting { global $CFG; return (isset($CFG->{$this->name}) ? $CFG->{$this->name} : NULL); } - + // $data is a string function write_setting($data) { if (is_string($this->paramtype)) { @@ -1283,7 +1283,7 @@ class admin_setting_configcheckbox extends admin_setting { global $CFG; return (isset($CFG->{$this->name}) ? $CFG->{$this->name} : NULL); } - + function write_setting($data) { if ($data == '1') { return (set_config($this->name,1) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . ''); @@ -1308,7 +1308,7 @@ class admin_setting_configcheckbox extends admin_setting { class admin_setting_configselect extends admin_setting { var $choices; - + function admin_setting_configselect($name, $visiblename, $description, $defaultsetting, $choices) { $this->choices = $choices; parent::admin_setting($name, $visiblename, $description, $defaultsetting); @@ -1318,17 +1318,17 @@ class admin_setting_configselect extends admin_setting { global $CFG; return (isset($CFG->{$this->name}) ? $CFG->{$this->name} : NULL); } - + function write_setting($data) { // check that what we got was in the original choices // or that the data is the default setting - needed during install when choices can not be constructed yet if ($data != $this->defaultsetting and ! in_array($data, array_keys($this->choices))) { return 'Error setting ' . $this->visiblename . '
'; } - + return (set_config($this->name, $data) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . '
'); } - + function output_html() { if ($this->get_setting() === NULL) { $current = $this->defaultsetting; @@ -1370,16 +1370,16 @@ class admin_setting_configtime extends admin_setting { global $CFG; return (isset($CFG->{$this->name}) && isset($CFG->{$this->name2}) ? array('h' => $CFG->{$this->name}, 'm' => $CFG->{$this->name2}) : NULL); } - + function write_setting($data) { // check that what we got was in the original choices if (!(in_array($data['h'], array_keys($this->choices)) && in_array($data['m'], array_keys($this->choices2)))) { return get_string('errorsetting', 'admin') . $this->visiblename . '
'; } - + return (set_config($this->name, $data['h']) && set_config($this->name2, $data['m']) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . '
'); } - + function output_html() { if ($this->get_setting() === NULL) { $currentsetting = $this->defaultsetting; @@ -1393,7 +1393,7 @@ class admin_setting_configtime extends admin_setting { $return .= '
'; } } - + return (set_config($this->name, implode(',',$data)) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . '
'); } - + function output_html() { if ($this->get_setting() === NULL) { $currentsetting = $this->defaultsetting; @@ -1438,7 +1438,7 @@ class admin_setting_configmultiselect extends admin_setting_configselect { } class admin_setting_special_adminseesall extends admin_setting_configcheckbox { - + function admin_setting_special_adminseesall() { $name = 'calendar_adminseesall'; $visiblename = get_string('adminseesall', 'admin'); @@ -1461,14 +1461,14 @@ class admin_setting_sitesetselect extends admin_setting_configselect { $this->id = SITEID; parent::admin_setting_configselect($name, $visiblename, $description, $defaultsetting, $choices); - + } - + function get_setting() { $site = get_site(); return (isset($site->{$this->name}) ? $site->{$this->name} : NULL); } - + function write_setting($data) { if (!in_array($data, array_keys($this->choices))) { return get_string('errorsetting', 'admin') . $this->visiblename . '
'; @@ -1480,7 +1480,7 @@ class admin_setting_sitesetselect extends admin_setting_configselect { $record->timemodified = time(); return (update_record('course', $record) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . '
'); } - + } @@ -1503,12 +1503,12 @@ class admin_setting_courselist_frontpage extends admin_setting_configselect { $defaults = FRONTPAGECOURSELIST.',,,'; parent::admin_setting_configselect($name, $visiblename, $description, $defaults, $choices); } - + function get_setting() { global $CFG; return (isset($CFG->{$this->name}) ? explode(',', $CFG->{$this->name}) : NULL); } - + function write_setting($data) { if (empty($data)) { $data = array(); @@ -1522,7 +1522,7 @@ class admin_setting_courselist_frontpage extends admin_setting_configselect { } return (set_config($this->name, implode(',', $data)) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . '
'); } - + function output_html() { if ($this->get_setting() === NULL) { $currentsetting = $this->defaultsetting; @@ -1536,7 +1536,7 @@ class admin_setting_courselist_frontpage extends admin_setting_configselect { } $return = '
'); } - + } class admin_setting_sitesettext extends admin_setting_configtext { @@ -1585,9 +1585,9 @@ class admin_setting_sitesettext extends admin_setting_configtext { $this->id = SITEID; parent::admin_setting_configtext($name, $visiblename, $description, $defaultsetting, $paramtype); - + } - + function get_setting() { $site = get_site(); return (isset($site->{$this->name}) ? $site->{$this->name} : NULL); @@ -1601,7 +1601,7 @@ class admin_setting_sitesettext extends admin_setting_configtext { } else { $data = clean_param($data, $this->paramtype); } - + $record = new stdClass(); $record->id = $this->id; $record->{$this->name} = $data; @@ -1612,13 +1612,13 @@ class admin_setting_sitesettext extends admin_setting_configtext { function validate($data) { return preg_match($this->paramtype, $data); } - + } class admin_setting_special_frontpagedesc extends admin_setting { var $id; - + function admin_setting_special_frontpagedesc() { $this->id = SITEID; $name = 'summary'; @@ -1628,50 +1628,50 @@ class admin_setting_special_frontpagedesc extends admin_setting { } function output_html() { - + if ($this->get_setting() === NULL) { $currentsetting = $this->defaultsetting; } else { $currentsetting = $this->get_setting(); } - + $usehtmleditor = can_use_html_editor(); - + $return = '
'); - + } } @@ -1706,7 +1706,7 @@ class admin_setting_special_editorfontlist extends admin_setting { 'v8' => 'wingdings'); parent::admin_setting($name, $visiblename, $description, $defaults); } - + function get_setting() { global $CFG; if (isset($CFG->editorfontlist)) { @@ -1724,16 +1724,16 @@ class admin_setting_special_editorfontlist extends admin_setting { return NULL; } } - + function write_setting($data) { - + // there miiight be an easier way to do this :) // if this is changed, make sure the $defaults array above is modified so that this // function processes it correctly - + $keys = array(); $values = array(); - + foreach ($data as $key => $value) { if (substr($key,0,1) == 'k') { $keys[substr($key,1)] = $value; @@ -1741,27 +1741,27 @@ class admin_setting_special_editorfontlist extends admin_setting { $values[substr($key,1)] = $value; } } - + $result = ''; for ($i = 0; $i < count($keys); $i++) { if (($keys[$i] !== '') && ($values[$i] !== '')) { $result .= clean_param($keys[$i],PARAM_NOTAGS) . ':' . clean_param($values[$i], PARAM_NOTAGS) . ';'; } } - + $result = substr($result, 0, -1); // trim the last semicolon - + return (set_config($this->name, $result) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . '
'); } - + function output_html() { - + if ($this->get_setting() === NULL) { $currentsetting = $this->defaultsetting; } else { $currentsetting = $this->get_setting(); } - + $return = '
| '; - + $count = 0; - + foreach($this->items as $key => $value) { if ($count % 15 == 0) { $return .= ' | ';
}
-
+
$return .= ($value == '' ? get_string($key,'editor') : ' ') . ' ';
$return .= ' ';
$count++;
@@ -1957,8 +1957,8 @@ class admin_setting_special_editorhidebuttons extends admin_setting {
$return .= ''; } } - - $return .= ' |
'; } - + return (backup_set_config($this->name, $data) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . '
'); } @@ -1997,12 +1997,12 @@ class admin_setting_special_backupsaveto extends admin_setting_configtext { $description = get_string('backupsavetohelp'); parent::admin_setting_configtext($name, $visiblename, $description, '', PARAM_PATH); } - + function get_setting() { $backup_config = backup_get_config(); return (isset($backup_config->{$this->name}) ? $backup_config->{$this->name} : NULL); } - + function write_setting($data) { $data = clean_param($data, PARAM_PATH); if (!empty($data) and (substr($data,-1) == '/' or substr($data,-1) == '\\')) { @@ -2028,7 +2028,7 @@ class admin_setting_backupcheckbox extends admin_setting_configcheckbox { return (backup_set_config($this->name, 0) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . '
'); } } - + function get_setting() { $backup_config = backup_get_config(); return (isset($backup_config->{$this->name}) ? $backup_config->{$this->name} : NULL); @@ -2046,21 +2046,21 @@ class admin_setting_special_backuptime extends admin_setting_configtime { $default = array('h' => 0, 'm' => 0); parent::admin_setting_configtime($name, $name2, $visiblename, $description, $default); } - + function get_setting() { $backup_config = backup_get_config(); return (isset($backup_config->{$this->name}) && isset($backup_config->{$this->name}) ? array($backup_config->{$this->name}, $backup_config->{$this->name2}) : NULL); } - + function write_setting($data) { // check that what we got was in the original choices if (!(in_array($data['h'], array_keys($this->choices)) && in_array($data['m'], array_keys($this->choices2)))) { return get_string('errorsetting', 'admin') . $this->visiblename . '
'; } - - return (backup_set_config($this->name, $data['h']) && backup_set_config($this->name2, $data['m']) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . '
'); + + return (backup_set_config($this->name, $data['h']) && backup_set_config($this->name2, $data['m']) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . '
'); } - + } class admin_setting_special_backupdays extends admin_setting { @@ -2071,7 +2071,7 @@ class admin_setting_special_backupdays extends admin_setting { $description = get_string('backupschedulehelp'); parent::admin_setting($name, $visiblename, $description, array()); } - + function get_setting() { $backup_config = backup_get_config(); if (isset($backup_config->{$this->name})) { @@ -2087,36 +2087,36 @@ class admin_setting_special_backupdays extends admin_setting { return NULL; } } - + function output_html() { - + if ($this->get_setting() === NULL) { $currentsetting = $this->defaultsetting; } else { $currentsetting = $this->get_setting(); } - + // rewrite for simplicity - $currentsetting = $currentsetting['u'] . $currentsetting['m'] . $currentsetting['t'] . $currentsetting['w'] . + $currentsetting = $currentsetting['u'] . $currentsetting['m'] . $currentsetting['t'] . $currentsetting['w'] . $currentsetting['r'] . $currentsetting['f'] . $currentsetting['s']; - + return '
' . get_string('sunday', 'calendar') . ' | ' .
+ '
' .
+ ' | ' .
+ ' | ' .
+ ' | ' .
+ ' | ' .
+ ' | ' .
+ ' | ' .
+ ' | |
'); } - + function output_html() { if ($this->get_setting() === NULL) { @@ -2210,20 +2210,20 @@ class admin_setting_special_calendar_weekend extends admin_setting { } return '
' . get_string('sunday', 'calendar') . ' | ' .
+ '
' .
+ ' | ' .
+ ' | ' .
+ ' | ' .
+ ' | ' .
+ ' | ' .
+ ' | ' .
+ ' | |
';
@@ -2369,7 +2369,7 @@ function admin_get_root() {
}
}
}
-
+
return $ADMIN;
}
@@ -2386,9 +2386,9 @@ function apply_default_settings(&$node) {
apply_default_settings($node->children[$entry]);
}
return;
- }
+ }
- if (is_a($node, 'admin_settingpage')) {
+ if (is_a($node, 'admin_settingpage')) {
foreach ($node->settings as $setting) {
$CFG->{$setting->name} = $setting->defaultsetting;
$setting->write_setting($setting->defaultsetting);
diff --git a/lib/db/access.php b/lib/db/access.php
index c590a5dcb88..94e22bd52b9 100644
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -32,56 +32,56 @@
$moodle_capabilities = array(
-
+
'moodle/site:doanything' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG,
'captype' => 'admin',
'contextlevel' => CONTEXT_SYSTEM
),
-
+
'moodle/legacy:guest' => array(
'captype' => 'legacy',
'contextlevel' => CONTEXT_SYSTEM
),
-
-
+
+
'moodle/legacy:student' => array(
'riskbitmask' => RISK_SPAM,
'captype' => 'legacy',
'contextlevel' => CONTEXT_SYSTEM
),
-
-
+
+
'moodle/legacy:teacher' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
'captype' => 'legacy',
'contextlevel' => CONTEXT_SYSTEM
),
-
-
+
+
'moodle/legacy:editingteacher' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
'captype' => 'legacy',
'contextlevel' => CONTEXT_SYSTEM
),
-
-
+
+
'moodle/legacy:coursecreator' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
'captype' => 'legacy',
'contextlevel' => CONTEXT_SYSTEM
),
-
-
+
+
'moodle/legacy:admin' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG,
'captype' => 'legacy',
'contextlevel' => CONTEXT_SYSTEM
),
-
-
+
+
'moodle/site:config' => array(
-
+
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG,
'captype' => 'write',
@@ -95,9 +95,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/site:readallmessages' => array(
-
+
'captype' => 'read',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
@@ -109,9 +109,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/site:approvecourse' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
@@ -123,9 +123,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/site:import' => array(
-
+
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
'captype' => 'write',
@@ -139,9 +139,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/site:backup' => array(
-
+
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
'captype' => 'write',
@@ -155,9 +155,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/site:restore' => array(
-
+
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
'captype' => 'write',
@@ -171,9 +171,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/site:manageblocks' => array(
-
+
'riskbitmask' => RISK_SPAM | RISK_XSS,
'captype' => 'write',
@@ -187,9 +187,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/site:accessallgroups' => array(
-
+
'captype' => 'read',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
@@ -201,9 +201,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/site:viewfullnames' => array(
-
+
'captype' => 'read',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
@@ -215,9 +215,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/site:viewparticipants' => array(
-
+
'captype' => 'read',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
@@ -229,9 +229,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/site:viewreports' => array(
-
+
'riskbitmask' => RISK_PERSONAL,
'captype' => 'read',
@@ -245,9 +245,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/site:trustcontent' => array(
-
+
'riskbitmask' => RISK_XSS,
'captype' => 'write',
@@ -261,9 +261,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/user:create' => array(
-
+
'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
'captype' => 'write',
@@ -277,9 +277,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/user:delete' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
@@ -291,9 +291,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/user:update' => array(
-
+
'riskbitmask' => RISK_SPAM,
'captype' => 'write',
@@ -307,9 +307,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/user:viewdetails' => array(
-
+
'captype' => 'read',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
@@ -323,7 +323,7 @@ $moodle_capabilities = array(
),
'moodle/user:viewhiddendetails' => array(
-
+
'riskbitmask' => RISK_PERSONAL,
'captype' => 'read',
@@ -337,9 +337,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/role:assign' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
@@ -351,9 +351,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/role:override' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
@@ -365,9 +365,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/role:manage' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
@@ -405,9 +405,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/category:create' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_COURSECAT,
'legacy' => array(
@@ -419,9 +419,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/category:delete' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_COURSECAT,
'legacy' => array(
@@ -433,9 +433,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/category:update' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_COURSECAT,
'legacy' => array(
@@ -447,9 +447,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/category:visibility' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_COURSECAT,
'legacy' => array(
@@ -461,9 +461,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:create' => array(
-
+
'riskbitmask' => RISK_XSS,
'captype' => 'write',
@@ -477,9 +477,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:delete' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
@@ -491,9 +491,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:update' => array(
-
+
'riskbitmask' => RISK_XSS,
'captype' => 'write',
@@ -507,9 +507,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:view' => array(
-
+
'captype' => 'read',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
@@ -521,9 +521,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:viewhiddenuserfields' => array(
-
+
'riskbitmask' => RISK_PERSONAL,
'captype' => 'read',
@@ -537,9 +537,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:viewhiddencourses' => array(
-
+
'captype' => 'read',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
@@ -551,9 +551,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:visibility' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
@@ -565,9 +565,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:managefiles' => array(
-
+
'riskbitmask' => RISK_XSS,
'captype' => 'write',
@@ -581,9 +581,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:managequestions' => array(
-
+
'riskbitmask' => RISK_XSS,
'captype' => 'write',
@@ -597,9 +597,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:manageactivities' => array(
-
+
'riskbitmask' => RISK_XSS,
'captype' => 'write',
@@ -613,9 +613,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:managemetacourse' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
@@ -627,9 +627,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:activityvisibility' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
@@ -641,9 +641,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:viewhiddenactivities' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
@@ -655,9 +655,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:viewparticipants' => array(
-
+
'captype' => 'read',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
@@ -669,9 +669,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:viewscales' => array(
-
+
'captype' => 'read',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
@@ -683,9 +683,9 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:managescales' => array(
-
+
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
@@ -697,7 +697,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:managegroups' => array(
'captype' => 'write',
@@ -711,7 +711,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:reset' => array(
'captype' => 'write',
@@ -725,7 +725,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/blog:view' => array(
'captype' => 'read',
@@ -739,7 +739,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/blog:create' => array(
'riskbitmask' => RISK_SPAM,
@@ -755,7 +755,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/blog:manageofficialtags' => array(
'riskbitmask' => RISK_SPAM,
@@ -771,7 +771,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/blog:managepersonaltags' => array(
'riskbitmask' => RISK_SPAM,
@@ -787,7 +787,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/blog:manageentries' => array(
'riskbitmask' => RISK_SPAM,
@@ -803,7 +803,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/calendar:manageownentries' => array(
'riskbitmask' => RISK_SPAM,
@@ -819,7 +819,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/calendar:manageentries' => array(
'riskbitmask' => RISK_SPAM,
@@ -835,8 +835,8 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
- // The next 3 might make no sense for some roles, e.g teacher, etc.
+
+ // The next 3 might make no sense for some roles, e.g teacher, etc.
// since the next level up is site. These are more for the parent role
'moodle/user:readuserposts' => array(
'captype' => 'read',
@@ -850,7 +850,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/user:readuserblogs' => array(
'captype' => 'read',
'contextlevel' => CONTEXT_USER,
@@ -863,7 +863,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/user:viewuseractivitiesreport' => array(
'captype' => 'read',
'contextlevel' => CONTEXT_USER,
@@ -876,7 +876,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/user:editprofile' => array(
'riskbitmask' => RISK_SPAM,
@@ -892,7 +892,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/question:import' => array(
'riskbitmask' => RISK_XSS,
@@ -908,7 +908,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/question:export' => array(
'captype' => 'read',
'contextlevel' => CONTEXT_COURSE,
@@ -921,7 +921,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/question:managecategory' => array(
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
@@ -934,7 +934,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/question:manage' => array(
'riskbitmask' => RISK_XSS,
@@ -963,7 +963,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:sectionvisibility' => array(
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
@@ -976,7 +976,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:useremail' => array(
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
@@ -989,7 +989,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:viewhiddensections' => array(
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
@@ -1002,7 +1002,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:setcurrentsection' => array(
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
@@ -1015,7 +1015,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:viewcoursegrades' => array(
'captype' => 'read',
'contextlevel' => CONTEXT_COURSE,
@@ -1028,7 +1028,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/course:managegrades' => array(
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
@@ -1041,7 +1041,7 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
-
+
'moodle/user:viewusergrades' => array(
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
diff --git a/lib/ddllib.php b/lib/ddllib.php
index 0ae3541e5e7..30b60c8714b 100644
--- a/lib/ddllib.php
+++ b/lib/ddllib.php
@@ -26,10 +26,10 @@
// This library includes all the required functions used to handle the DB
// structure (DDL) independently of the underlying RDBMS in use. All the functions
-// rely on the XMLDBDriver classes to be able to generate the correct SQL
+// rely on the XMLDBDriver classes to be able to generate the correct SQL
// syntax needed by each DB.
//
-// To define any structure to be created we'll use the schema defined
+// To define any structure to be created we'll use the schema defined
// by the XMLDB classes, for tables, fields, indexes, keys and other
// statements instead of direct handling of SQL sentences.
//
@@ -59,7 +59,7 @@
/// Add other libraries
require_once($CFG->libdir . '/xmlize.php');
-
+
/**
* Add a new field to a table, or modify an existing one (if oldfield is defined).
@@ -244,7 +244,7 @@ function table_column($table, $oldfield, $field, $type='integer', $size='10',
* SQL statements, specific for each RDBMS ($CFG->dbtype) and, finally, it
* will execute all those statements against the DB.
*
- * @uses $CFG, $db
+ * @uses $CFG, $db
* @param $file full path to the XML file to be used
* @return boolean (true on success, false on error)
*/
@@ -279,7 +279,7 @@ function install_from_xmldb_file($file) {
* This function will create the table passed as argument with all its
* fields/keys/indexes/sequences, everything based in the XMLDB object
*
- * @uses $CFG, $db
+ * @uses $CFG, $db
* @param XMLDBTable table object (full specs are required)
* @param boolean continue to specify if must continue on error (true) or stop (false)
* @param boolean feedback to specify to show status info (true) or not (false)
@@ -307,7 +307,7 @@ function create_table($table, $continue=true, $feedback=true) {
* and all the associated objects (keys, indexes, constaints, sequences, triggers)
* will be dropped too.
*
- * @uses $CFG, $db
+ * @uses $CFG, $db
* @param XMLDBTable table object (just the name is mandatory)
* @param boolean continue to specify if must continue on error (true) or stop (false)
* @param boolean feedback to specify to show status info (true) or not (false)
@@ -333,7 +333,7 @@ function drop_table($table, $continue=true, $feedback=true) {
/**
* This function will add the field to the table passed as arguments
*
- * @uses $CFG, $db
+ * @uses $CFG, $db
* @param XMLDBTable table object (just the name is mandatory)
* @param XMLDBField field object (full specs are required)
* @param boolean continue to specify if must continue on error (true) or stop (false)
@@ -363,7 +363,7 @@ function add_field($table, $field, $continue=true, $feedback=true) {
/**
* This function will drop the field from the table passed as arguments
*
- * @uses $CFG, $db
+ * @uses $CFG, $db
* @param XMLDBTable table object (just the name is mandatory)
* @param XMLDBField field object (just the name is mandatory)
* @param boolean continue to specify if must continue on error (true) or stop (false)
diff --git a/lib/dmllib.php b/lib/dmllib.php
index defb681c136..1e84bf062df 100644
--- a/lib/dmllib.php
+++ b/lib/dmllib.php
@@ -23,7 +23,7 @@
// //
///////////////////////////////////////////////////////////////////////////
-/// This library contains all the Data Manipulation Language (DML) functions
+/// This library contains all the Data Manipulation Language (DML) functions
/// used to interact with the DB. All the dunctions in this library must be
/// generic and work against the major number of RDBMS possible. This is the
/// list of currently supported and tested DBs: mysql, postresql, mssql, oracle
@@ -101,7 +101,7 @@ function begin_sql() {
return true;
}
/**
-* on DBs that support it, commit the transaction
+* on DBs that support it, commit the transaction
*/
function rollback_sql() {
/// Completely general function - it just runs some SQL and reports success.
@@ -132,7 +132,7 @@ function db_lowercase() {
}
/**
-* on DBs that support it, commit the transaction
+* on DBs that support it, commit the transaction
*/
function commit_sql() {
/// Completely general function - it just runs some SQL and reports success.
@@ -155,7 +155,7 @@ function commit_sql() {
*
* @uses $CFG
* @param string $sqlfile The path where a file with sql commands can be found on the server.
- * @param string $sqlstring If no path is supplied then a string with semicolon delimited sql
+ * @param string $sqlstring If no path is supplied then a string with semicolon delimited sql
* commands can be supplied in this argument.
* @return bool Returns true if databse was modified successfully.
*/
@@ -332,11 +332,11 @@ function count_records_select($table, $select='', $countitem='COUNT(*)') {
*/
function count_records_sql($sql) {
$rs = get_recordset_sql($sql);
-
+
if ($rs) {
return reset($rs->fields);
} else {
- return 0;
+ return 0;
}
}
@@ -370,12 +370,12 @@ function get_record($table, $field1, $value1, $field2='', $value2='', $field3=''
* The SQL statement should normally only return one record. In debug mode
* you will get a warning if more record is returned (unless you
* set $expectmultiple to true). In non-debug mode, it just returns
- * the first record.
+ * the first record.
*
* @uses $CFG
* @uses $db
* @param string $sql The SQL string you wish to be executed, should normally only return one record.
- * @param bool $expectmultiple If the SQL cannot be written to conviniently return just one record,
+ * @param bool $expectmultiple If the SQL cannot be written to conviniently return just one record,
* set this to true to hide the debug message.
* @param bool $nolimit sometimes appending ' LIMIT 1' to the SQL causes an error. Set this to true
* to stop your SQL being modified. This argument should probably be deprecated.
@@ -392,7 +392,7 @@ function get_record_sql($sql, $expectmultiple=false, $nolimit=false) {
/// Only a few uses of the 2nd and 3rd parameter have been found
/// I think that we should avoid to use them completely, one
/// record is one record, and everything else should return error.
-/// So the proposal is to change all the uses, (4-5 inside Moodle
+/// So the proposal is to change all the uses, (4-5 inside Moodle
/// Core), drop them from the definition and delete the next two
/// "if" sentences. (eloy, 2006-08-19)
@@ -404,20 +404,20 @@ function get_record_sql($sql, $expectmultiple=false, $nolimit=false) {
$limitnum = 1;
} else if (debugging()) {
// Debugging mode - don't use a limit of 1, but do change the SQL, because sometimes that
- // causes errors, and in non-debug mode you don't see the error message and it is
+ // causes errors, and in non-debug mode you don't see the error message and it is
// impossible to know what's wrong.
$limitfrom = 0;
$limitnum = 100;
}
if (!$rs = get_recordset_sql($sql, $limitfrom, $limitnum)) {
- return false;
+ return false;
}
-
+
$recordcount = $rs->RecordCount();
if ($recordcount == 0) { // Found no records
- return false;
+ return false;
} else if ($recordcount == 1) { // Found one record
/// DIRTY HACK to retrieve all the ' ' (1 space) fields converted back
@@ -467,23 +467,23 @@ function get_record_select($table, $select='', $fields='*') {
* Get a number of records as an ADODB RecordSet.
*
* Selects records from the table $table.
- *
+ *
* If specified, only records where the field $field has value $value are retured.
- *
+ *
* If specified, the results will be sorted as specified by $sort. This
* is added to the SQL as "ORDER BY $sort". Example values of $sort
* mightbe "time ASC" or "time DESC".
- *
+ *
* If $fields is specified, only those fields are returned.
*
- * This function is internal to datalib, and should NEVER should be called directly
+ * This function is internal to datalib, and should NEVER should be called directly
* from general Moodle scripts. Use get_record, get_records etc.
- *
+ *
* If you only want some of the records, specify $limitfrom and $limitnum.
* The query will skip the first $limitfrom records (according to the sort
* order) and then return the next $limitnum records. If either of $limitfrom
* or $limitnum is specified, both must be present.
- *
+ *
* The return value is an ADODB RecordSet object
* @link http://phplens.com/adodb/reference.functions.adorecordset.html
* if the query succeeds. If an error occurrs, false is returned.
@@ -504,7 +504,7 @@ function get_recordset($table, $field='', $value='', $sort='', $fields='*', $lim
} else {
$select = '';
}
-
+
return get_recordset_select($table, $select, $sort, $fields, $limitfrom, $limitnum);
}
@@ -513,8 +513,8 @@ function get_recordset($table, $field='', $value='', $sort='', $fields='*', $lim
*
* If given, $select is used as the SELECT parameter in the SQL query,
* otherwise all records from the table are returned.
- *
- * Other arguments and the return type as for @see function get_recordset.
+ *
+ * Other arguments and the return type as for @see function get_recordset.
*
* @uses $CFG
* @param string $table the table to query.
@@ -552,8 +552,8 @@ function get_recordset_select($table, $select='', $sort='', $fields='*', $limitf
* Only records where $field takes one of the values $values are returned.
* $values should be a comma-separated list of values, for example "4,5,6,10"
* or "'foo','bar','baz'".
- *
- * Other arguments and the return type as for @see function get_recordset.
+ *
+ * Other arguments and the return type as for @see function get_recordset.
*
* @param string $table the table to query.
* @param string $field a field to check (optional).
@@ -577,10 +577,10 @@ function get_recordset_list($table, $field='', $values='', $sort='', $fields='*'
/**
* Get a number of records as an ADODB RecordSet. $sql must be a complete SQL query.
- * This function is internal to datalib, and should NEVER should be called directly
+ * This function is internal to datalib, and should NEVER should be called directly
* from general Moodle scripts. Use get_record, get_records etc.
- *
- * The return type is as for @see function get_recordset.
+ *
+ * The return type is as for @see function get_recordset.
*
* @uses $CFG
* @uses $db
@@ -620,7 +620,7 @@ function get_recordset_sql($sql, $limitfrom=null, $limitnum=null) {
/**
* Utility function used by the following 4 methods.
- *
+ *
* @param object an ADODB RecordSet object.
* @return mixed mixed an array of objects, or false if an error occured or the RecordSet was empty.
*/
@@ -654,7 +654,7 @@ function recordset_to_array($rs) {
}
}
-/**
+/**
* This function is used to convert all the Oracle 1-space defaults to the empty string
* like a really DIRTY HACK to allow it to work better until all those NOT NULL DEFAULT ''
* fields will be out from Moodle.
@@ -671,7 +671,7 @@ function onespace2empty(&$item, $key) {
*
* If the query succeeds and returns at least one record, the
* return value is an array of objects, one object for each
- * record found. The array key is the value from the first
+ * record found. The array key is the value from the first
* column of the result set. The object associated with that key
* has a member variable for each column of the results.
*
@@ -728,7 +728,7 @@ function get_records_list($table, $field='', $values='', $sort='', $fields='*',
* Get a number of records as an array of objects.
*
* Return value as for @see function get_records.
- *
+ *
* @param string $sql the SQL select query to execute.
* @param int $limitfrom return a subset of records, starting at this point (optional, required if $limitnum is set).
* @param int $limitnum return a subset comprising this many records (optional, required if $limitfrom is set).
@@ -741,7 +741,7 @@ function get_records_sql($sql, $limitfrom='', $limitnum='') {
/**
* Utility function used by the following 3 methods.
- *
+ *
* @param object an ADODB RecordSet object with two columns.
* @return mixed an associative array, or false if an error occured or the RecordSet was empty.
*/
@@ -764,7 +764,7 @@ function recordset_to_menu($rs) {
* Get the first two columns from a number of records as an associative array.
*
* Arguments as for @see function get_recordset.
- *
+ *
* If no errors occur, and at least one records is found, the return value
* is an associative whose keys come from the first field of each record,
* and whose values are the corresponding second fields. If no records are found,
@@ -867,7 +867,7 @@ function get_field_sql($sql) {
}
/**
- * Get an array of data from one or more fields from a database
+ * Get an array of data from one or more fields from a database
* use to get a column, or a series of distinct values
*
* @uses $CFG
@@ -1027,16 +1027,16 @@ function insert_record($table, $dataobject, $returnid=true, $primarykey='id') {
/// Postgres doesn't have the concept of primary key built in
/// and will return the OID which isn't what we want.
-/// The efficient and transaction-safe strategy is to
+/// The efficient and transaction-safe strategy is to
/// move the sequence forward first, and make the insert
/// with an explicit id.
if ( $CFG->dbtype === 'postgres7' && $returnid == true ) {
if ($nextval = (int)get_field_sql("SELECT NEXTVAL('{$CFG->prefix}{$table}_{$primarykey}_seq')")) {
- $dataobject->{$primarykey} = $nextval;
- }
+ $dataobject->{$primarykey} = $nextval;
+ }
}
-/// First basic support of insert for Oracle. As it doesn't
+/// First basic support of insert for Oracle. As it doesn't
/// support autogenerated fields, we rely on the corresponding
/// sequence. It will work automatically, unless we need to
/// return the primary from the function, in this case we
@@ -1049,7 +1049,7 @@ function insert_record($table, $dataobject, $returnid=true, $primarykey='id') {
$generator->setPrefix($CFG->prefix);
$seqname = $generator->getNameForObject($table, $primarykey, 'seq');
if ($nextval = (int)get_field_sql("SELECT $seqname.NEXTVAL from dual")) {
- $dataobject->{$primarykey} = $nextval;
+ $dataobject->{$primarykey} = $nextval;
}
}
/// Also, for Oracle DB, empty strings are converted to NULLs in DB
@@ -1059,7 +1059,7 @@ function insert_record($table, $dataobject, $returnid=true, $primarykey='id') {
/// What we are going to do is to examine all the data being inserted and if it's
/// an empty string (NULL for Oracle) and the field is defined as NOT NULL, we'll modify
/// such data in the best form possible ("0" for booleans and numbers and " " for the
-/// rest of strings. It isn't optimal, but the only way to do so.
+/// rest of strings. It isn't optimal, but the only way to do so.
/// In the oppsite, when retrieving records from Oracle, we'll decode " " back to
/// empty strings to allow everything to work properly. DIRTY HACK.
if ( $CFG->dbtype === 'oci8po') {
@@ -1130,9 +1130,9 @@ function insert_record($table, $dataobject, $returnid=true, $primarykey='id') {
}
/// This only gets triggered with non-Postgres databases
-/// however we have some postgres fallback in case we failed
+/// however we have some postgres fallback in case we failed
/// to find the sequence.
- $id = $db->Insert_ID();
+ $id = $db->Insert_ID();
if ($CFG->dbtype === 'postgres7') {
// try to get the primary key based on id
@@ -1140,7 +1140,7 @@ function insert_record($table, $dataobject, $returnid=true, $primarykey='id') {
&& ($rs->RecordCount() == 1) ) {
trigger_error("Retrieved $primarykey from oid on table $table because we could not find the sequence.");
return (integer)reset($rs->fields);
- }
+ }
trigger_error('Failed to retrieve primary key after insert: SELECT '. $primarykey .
' FROM '. $CFG->prefix . $table .' WHERE oid = '. $id);
return false;
@@ -1257,7 +1257,7 @@ function sql_ilike() {
/**
* Returns the proper SQL (for the dbms in use) to concatenate $firstname and $lastname
- *
+ *
* @uses $CFG
* @param string $firstname User's first name
* @param string $lastname User's last name
@@ -1295,7 +1295,7 @@ function sql_isnull($fieldname) {
}
}
-/**
+/**
* Returns the proper AS keyword to be used to aliase columns
* SQL defines the keyword as optional and nobody but PG
* seems to require it. This function should be used inside all
@@ -1318,7 +1318,7 @@ function sql_as() {
/**
* Returns the SQL text to be used to order by one TEXT (clob) column, because
- * some RDBMS doesn't support direct ordering of such fields.
+ * some RDBMS doesn't support direct ordering of such fields.
* Note that the use or queries being ordered by TEXT columns must be minimised,
* because it's really slooooooow.
* @param string fieldname the name of the TEXT field we need to order by
@@ -1341,13 +1341,13 @@ function sql_order_by_text($fieldname, $numchars=32) {
}
}
-/**
+/**
* Prepare a SQL WHERE clause to select records where the given fields match the given values.
- *
+ *
* Prepares a where clause of the form
* WHERE field1 = value1 AND field2 = value2 AND field3 = value3
* except that you need only specify as many arguments (zero to three) as you need.
- *
+ *
* @param string $field1 the first field to check (optional).
* @param string $value1 the value field1 must have (requred if field1 is given, else optional).
* @param string $field2 the second field to check (optional).
diff --git a/lib/xmldb/classes/XMLDBConstants.php b/lib/xmldb/classes/XMLDBConstants.php
index f6d38e66d58..85ac444a7db 100644
--- a/lib/xmldb/classes/XMLDBConstants.php
+++ b/lib/xmldb/classes/XMLDBConstants.php
@@ -24,7 +24,7 @@
// //
///////////////////////////////////////////////////////////////////////////
-/// This file contains all the constants and variables used
+/// This file contains all the constants and variables used
/// by the XMLDB interface
/// First, some constants to be used by actions
@@ -35,9 +35,9 @@
/// Now the allowed DB Field Types
define ('XMLDB_TYPE_INCORRECT', 0); //Wrong DB Type
- define ('XMLDB_TYPE_INTEGER', 1); //Integer
- define ('XMLDB_TYPE_NUMBER', 2); //Decimal number
- define ('XMLDB_TYPE_FLOAT', 3); //Floating Point number
+ define ('XMLDB_TYPE_INTEGER', 1); //Integer
+ define ('XMLDB_TYPE_NUMBER', 2); //Decimal number
+ define ('XMLDB_TYPE_FLOAT', 3); //Floating Point number
define ('XMLDB_TYPE_CHAR', 4); //String
define ('XMLDB_TYPE_TEXT', 5); //Text
define ('XMLDB_TYPE_BINARY', 6); //Binary
@@ -46,9 +46,9 @@
/// Now the allowed DB Keys
define ('XMLDB_KEY_INCORRECT', 0); //Wrong DB Key
- define ('XMLDB_KEY_PRIMARY', 1); //Primary Keys
+ define ('XMLDB_KEY_PRIMARY', 1); //Primary Keys
define ('XMLDB_KEY_UNIQUE', 2); //Unique Keys
- define ('XMLDB_KEY_FOREIGN', 3); //Foreign Keys
+ define ('XMLDB_KEY_FOREIGN', 3); //Foreign Keys
define ('XMLDB_KEY_CHECK', 4); //Check Constraints - NOT USED!
define ('XMLDB_KEY_FOREIGN_UNIQUE',5); //Foreign Key + Unique Key
diff --git a/lib/xmldb/classes/XMLDBField.class.php b/lib/xmldb/classes/XMLDBField.class.php
index 5bf2c0aa9fc..798973f1b53 100644
--- a/lib/xmldb/classes/XMLDBField.class.php
+++ b/lib/xmldb/classes/XMLDBField.class.php
@@ -27,7 +27,7 @@
/// This class represent one XMLDB Field
class XMLDBField extends XMLDBObject {
-
+
var $type;
var $length;
var $unsigned;
@@ -395,7 +395,7 @@ class XMLDBField extends XMLDBObject {
if (isset($xmlarr['@']['DECIMALS'])) {
$decimals = trim($xmlarr['@']['DECIMALS']);
/// Check for integer values
- if ($this->type == XMLDB_TYPE_NUMBER ||
+ if ($this->type == XMLDB_TYPE_NUMBER ||
$this->type == XMLDB_TYPE_FLOAT) {
if (!(is_numeric($decimals)&&(intval($decimals)==floatval($decimals)))) {
$this->errormsg = 'Incorrect DECIMALS attribute for number field';
@@ -446,7 +446,7 @@ class XMLDBField extends XMLDBObject {
function getXMLDBFieldType($type) {
$result = XMLDB_TYPE_INCORRECT;
-
+
switch (strtolower($type)) {
case 'int':
$result = XMLDB_TYPE_INTEGER;
@@ -481,7 +481,7 @@ class XMLDBField extends XMLDBObject {
function getXMLDBTypeName($type) {
$result = "";
-
+
switch (strtolower($type)) {
case XMLDB_TYPE_INTEGER:
$result = 'int';
@@ -526,7 +526,7 @@ class XMLDBField extends XMLDBObject {
}
}
- /**
+ /**
*This function will output the XML text for one field
*/
function xmlOutput() {
@@ -642,7 +642,7 @@ class XMLDBField extends XMLDBObject {
$this->type = XMLDB_TYPE_TEXT;
}
/// Calculate the length of the field
- if ($adofield->max_length > 0 &&
+ if ($adofield->max_length > 0 &&
($this->type == XMLDB_TYPE_INTEGER ||
$this->type == XMLDB_TYPE_NUMBER ||
$this->type == XMLDB_TYPE_FLOAT ||
@@ -683,13 +683,13 @@ class XMLDBField extends XMLDBObject {
}
/// Calculate the decimals of the field
if ($adofield->max_length > 0 &&
- $adofield->scale &&
+ $adofield->scale &&
($this->type == XMLDB_TYPE_NUMBER ||
$this->type == XMLDB_TYPE_FLOAT)) {
$this->decimals = $adofield->scale;
}
/// Calculate the unsigned field
- if ($adofield->unsigned &&
+ if ($adofield->unsigned &&
($this->type == XMLDB_TYPE_INTEGER ||
$this->type == XMLDB_TYPE_NUMBER ||
$this->type == XMLDB_TYPE_FLOAT)) {
@@ -702,7 +702,7 @@ class XMLDBField extends XMLDBObject {
/// Calculate the default field
if ($adofield->has_default) {
$this->default = $adofield->default_value;
- }
+ }
/// Calculate the sequence field
if ($adofield->auto_increment) {
$this->sequence = true;
diff --git a/lib/xmldb/classes/XMLDBFile.class.php b/lib/xmldb/classes/XMLDBFile.class.php
index 24e40104700..571aa99ba27 100644
--- a/lib/xmldb/classes/XMLDBFile.class.php
+++ b/lib/xmldb/classes/XMLDBFile.class.php
@@ -94,7 +94,7 @@ class XMLDBFile extends XMLDBObject {
return $structure;
}
- /**
+ /**
* This function saves the whole XMLDBStructure to its file
*/
function saveXMLFile() {
diff --git a/lib/xmldb/classes/XMLDBIndex.class.php b/lib/xmldb/classes/XMLDBIndex.class.php
index 8333b42d5e9..c23e5f25b17 100644
--- a/lib/xmldb/classes/XMLDBIndex.class.php
+++ b/lib/xmldb/classes/XMLDBIndex.class.php
@@ -27,7 +27,7 @@
/// This class represent one XMLDB Index
class XMLDBIndex extends XMLDBObject {
-
+
var $unique;
var $fields;
@@ -72,7 +72,7 @@ class XMLDBIndex extends XMLDBObject {
$this->fields = $fields;
}
- /**
+ /**
* Get the index fields
*/
function &getFields() {
@@ -113,7 +113,7 @@ class XMLDBIndex extends XMLDBObject {
$this->errormsg = 'Undefined UNIQUE attribute';
$result = false;
}
-
+
if (isset($xmlarr['@']['FIELDS'])) {
$fields = strtolower(trim($xmlarr['@']['FIELDS']));
if ($fields) {
@@ -169,7 +169,7 @@ class XMLDBIndex extends XMLDBObject {
}
}
- /**
+ /**
*This function will output the XML text for one index
*/
function xmlOutput() {
@@ -236,7 +236,7 @@ class XMLDBIndex extends XMLDBObject {
return $result;
}
- /**
+ /**
* Shows info in a readable format
*/
function readableInfo() {
diff --git a/lib/xmldb/classes/XMLDBKey.class.php b/lib/xmldb/classes/XMLDBKey.class.php
index 76fab318fad..61555431ad8 100644
--- a/lib/xmldb/classes/XMLDBKey.class.php
+++ b/lib/xmldb/classes/XMLDBKey.class.php
@@ -27,7 +27,7 @@
/// This class represent one XMLDB Key
class XMLDBKey extends XMLDBObject {
-
+
var $type;
var $fields;
var $reftable;
@@ -94,7 +94,7 @@ class XMLDBKey extends XMLDBObject {
$this->reffields = $reffields;
}
- /**
+ /**
* Get the key fields
*/
function &getFields() {
@@ -127,7 +127,7 @@ class XMLDBKey extends XMLDBObject {
/// print_object ($GLOBALS['traverse_array']); //Debug
/// $GLOBALS['traverse_array']=""; //Debug
- /// Process key attributes (name, type, fields, reftable,
+ /// Process key attributes (name, type, fields, reftable,
/// reffields, comment, previous, next)
if (isset($xmlarr['@']['NAME'])) {
$this->name = trim($xmlarr['@']['NAME']);
@@ -175,8 +175,8 @@ class XMLDBKey extends XMLDBObject {
if (isset($xmlarr['@']['REFTABLE'])) {
/// Check we are in a FK
- if ($this->type == XMLDB_KEY_FOREIGN ||
- $this->type == XMLDB_KEY_FOREIGN_UNIQUE) {
+ if ($this->type == XMLDB_KEY_FOREIGN ||
+ $this->type == XMLDB_KEY_FOREIGN_UNIQUE) {
$reftable = strtolower(trim($xmlarr['@']['REFTABLE']));
if (!$reftable) {
$this->errormsg = 'Empty REFTABLE attribute';
@@ -258,7 +258,7 @@ class XMLDBKey extends XMLDBObject {
function getXMLDBKeyType($type) {
$result = XMLDB_KEY_INCORRECT;
-
+
switch (strtolower($type)) {
case 'primary':
$result = XMLDB_KEY_PRIMARY;
@@ -287,7 +287,7 @@ class XMLDBKey extends XMLDBObject {
function getXMLDBKeyName($type) {
$result = '';
-
+
switch (strtolower($type)) {
case XMLDB_KEY_PRIMARY:
$result = 'primary';
@@ -326,7 +326,7 @@ class XMLDBKey extends XMLDBObject {
}
}
- /**
+ /**
*This function will output the XML text for one key
*/
function xmlOutput() {
@@ -392,14 +392,14 @@ class XMLDBKey extends XMLDBObject {
case XMLDB_KEY_FOREIGN:
$result .= 'XMLDB_KEY_FOREIGN' . ', ';
break;
- }
+ }
/// The fields
$keyfields = $this->getFields();
if (!empty($keyfields)) {
$result .= 'array(' . "'". implode("', '", $keyfields) . "')";
} else {
$result .= 'null';
- }
+ }
/// The FKs attributes
if ($this->getType() == XMLDB_KEY_FOREIGN) {
/// The reftable
@@ -408,7 +408,7 @@ class XMLDBKey extends XMLDBObject {
$result .= ", '" . $reftable . "', ";
} else {
$result .= 'null, ';
- }
+ }
/// The reffields
$reffields = $this->getRefFields();
if (!empty($reffields)) {
@@ -421,9 +421,9 @@ class XMLDBKey extends XMLDBObject {
return $result;
}
- /**
+ /**
* Shows info in a readable format
- */
+ */
function readableInfo() {
$o = '';
/// type
diff --git a/lib/xmldb/classes/XMLDBObject.class.php b/lib/xmldb/classes/XMLDBObject.class.php
index efd6f1f6941..41c3cab5540 100644
--- a/lib/xmldb/classes/XMLDBObject.class.php
+++ b/lib/xmldb/classes/XMLDBObject.class.php
@@ -28,7 +28,7 @@
/// are defined
class XMLDBObject {
-
+
var $name;
var $comment;
var $previous;
@@ -66,14 +66,14 @@ class XMLDBObject {
return $this->changed;
}
- /**
+ /**
* This function returns the comment of one XMLDBObject
*/
function getComment() {
return $this->comment;
}
- /**
+ /**
* This function returns the hash of one XMLDBObject
*/
function getHash() {
@@ -189,7 +189,7 @@ class XMLDBObject {
return $result;
}
- /**
+ /**
* This function will check that all the elements in one array
* have a consistent info in their previous/next fields
*/
@@ -316,9 +316,9 @@ class XMLDBObject {
function &findObjectInArray($objectname, $arr) {
foreach ($arr as $i => $object) {
if ($objectname == $object->getName()) {
- return $i;
- }
- }
+ return $i;
+ }
+ }
$null = NULL;
return $null;
}
@@ -332,7 +332,7 @@ class XMLDBObject {
}
/**
- * Returns one array of elements from one comma separated string,
+ * Returns one array of elements from one comma separated string,
* supporting quoted strings containing commas and concat function calls
*/
function comma2array($string) {
diff --git a/lib/xmldb/classes/XMLDBStatement.class.php b/lib/xmldb/classes/XMLDBStatement.class.php
index 2844ea879c5..0fa063ed37c 100644
--- a/lib/xmldb/classes/XMLDBStatement.class.php
+++ b/lib/xmldb/classes/XMLDBStatement.class.php
@@ -29,7 +29,7 @@
/// (only INSERT is allowed for now)
class XMLDBStatement extends XMLDBObject {
-
+
var $table; // Table we are handling
var $type; // XMLDB_STATEMENT_TYPE
var $sentences; // Collection of sentences in the statement
@@ -136,7 +136,7 @@ class XMLDBStatement extends XMLDBObject {
}
}
}
-
+
/// Finally, set the array of sentences
$this->sentences = $sentencesarr;
@@ -200,7 +200,7 @@ class XMLDBStatement extends XMLDBObject {
function getXMLDBStatementType($type) {
$result = XMLDB_STATEMENT_INCORRECT;
-
+
switch (strtolower($type)) {
case 'insert':
$result = XMLDB_STATEMENT_INSERT;
@@ -218,7 +218,7 @@ class XMLDBStatement extends XMLDBObject {
/// Return the normalized XMLDB_STATEMENT
return $result;
}
-
+
/**
* This function returns the correct name value for the
* XMLDB_STATEMENT_XXX passed as argument
@@ -226,7 +226,7 @@ class XMLDBStatement extends XMLDBObject {
function getXMLDBStatementName($type) {
$result = '';
-
+
switch (strtolower($type)) {
case XMLDB_STATEMENT_INSERT:
$result = 'insert';
@@ -257,7 +257,7 @@ class XMLDBStatement extends XMLDBObject {
}
}
- /**
+ /**
* This function will output the XML text for one statement
*/
function xmlOutput() {
@@ -302,7 +302,7 @@ class XMLDBStatement extends XMLDBObject {
$this->changed = true;
}
- /**
+ /**
* Shows info in a readable format
*/
function readableInfo() {
@@ -323,7 +323,7 @@ class XMLDBStatement extends XMLDBObject {
* This function will return an array of fields from one INSERT sentence
*/
function getFieldsFromInsertSentence($sentence) {
-
+
$fields = array();
/// Get first part from the sentence (before VALUES)
@@ -344,7 +344,7 @@ class XMLDBStatement extends XMLDBObject {
* This function will return an array of values from one INSERT sentence
*/
function getValuesFromInsertSentence($sentence) {
-
+
$values = array();
/// Get second part from the sentence (after VALUES)
@@ -364,7 +364,7 @@ class XMLDBStatement extends XMLDBObject {
/**
* This function will return the code needed to execute a collection
* of sentences present inside one statement for the specified BD
- * and prefix.
+ * and prefix.
* For now it only supports INSERT statements
*/
function getExecuteStatementSQL ($dbtype, $prefix, $statement_end=true) {
diff --git a/lib/xmldb/classes/XMLDBStructure.class.php b/lib/xmldb/classes/XMLDBStructure.class.php
index d711f57f83e..4d64e27038d 100644
--- a/lib/xmldb/classes/XMLDBStructure.class.php
+++ b/lib/xmldb/classes/XMLDBStructure.class.php
@@ -27,7 +27,7 @@
/// This class represent one XMLDB structure
class XMLDBStructure extends XMLDBObject {
-
+
var $path;
var $version;
var $tables;
@@ -63,7 +63,7 @@ class XMLDBStructure extends XMLDBObject {
*/
function &getTable($tablename) {
$i = $this->findTableInArray($tablename);
- if ($i !== NULL) {
+ if ($i !== NULL) {
return $this->tables[$i];
}
$null = NULL;
@@ -134,7 +134,7 @@ class XMLDBStructure extends XMLDBObject {
*/
function &getStatement($statementname) {
$i = $this->findStatementInArray($statementname);
- if ($i !== NULL) {
+ if ($i !== NULL) {
return $this->statements[$i];
}
$null = NULL;
@@ -148,7 +148,7 @@ class XMLDBStructure extends XMLDBObject {
return $this->statements;
}
- /**
+ /**
* Set the structure version
*/
function setVersion($version) {
@@ -311,14 +311,14 @@ class XMLDBStructure extends XMLDBObject {
}
}
- /**
+ /**
* Set the tables
*/
function setTables(&$tables) {
$this->tables = $tables;
}
- /**
+ /**
* Set the statements
*/
function setStatements(&$statements) {
@@ -412,7 +412,7 @@ class XMLDBStructure extends XMLDBObject {
}
}
}
-
+
/// Perform some general checks over statements
if ($result && $this->statements) {
/// Check statements names are ok (lowercase, a-z _-)
@@ -470,7 +470,7 @@ class XMLDBStructure extends XMLDBObject {
}
}
- /**
+ /**
* This function will output the XML text for one structure
*/
function xmlOutput() {
@@ -508,7 +508,7 @@ class XMLDBStructure extends XMLDBObject {
/**
* This function returns the number of uses of one table inside
- * a whole XMLDStructure. Useful to detect if the table must be
+ * a whole XMLDStructure. Useful to detect if the table must be
* locked. Return false if no uses are found.
*/
function getTableUses($tablename) {
@@ -543,7 +543,7 @@ class XMLDBStructure extends XMLDBObject {
/**
* This function returns the number of uses of one field inside
- * a whole XMLDBStructure. Useful to detect if the field must be
+ * a whole XMLDBStructure. Useful to detect if the field must be
* locked. Return false if no uses are found.
*/
function getFieldUses($tablename, $fieldname) {
@@ -558,7 +558,7 @@ class XMLDBStructure extends XMLDBObject {
in_array($fieldname, $key->getRefFields())) {
$uses[] = 'table ' . $table->getName() . ' key ' . $key->getName();
}
- }
+ }
}
/// Check if any index in the table is using it
$table = $this->getTable($tablename);
@@ -567,7 +567,7 @@ class XMLDBStructure extends XMLDBObject {
if (in_array($fieldname, $index->getFields())) {
$uses[] = 'table ' . $table->getName() . ' index ' . $index->getName();
}
- }
+ }
}
/// Check if some foreign key in the whole structure is using it
/// By comparing the reftable and refields with the field)
@@ -600,7 +600,7 @@ class XMLDBStructure extends XMLDBObject {
/**
* This function returns the number of uses of one key inside
- * a whole XMLDBStructure. Useful to detect if the key must be
+ * a whole XMLDBStructure. Useful to detect if the key must be
* locked. Return false if no uses are found.
*/
function getKeyUses($tablename, $keyname) {
@@ -639,7 +639,7 @@ class XMLDBStructure extends XMLDBObject {
/**
* This function returns the number of uses of one index inside
- * a whole XMLDBStructure. Useful to detect if the index must be
+ * a whole XMLDBStructure. Useful to detect if the index must be
* locked. Return false if no uses are found.
*/
function getIndexUses($tablename, $indexname) {
@@ -657,7 +657,7 @@ class XMLDBStructure extends XMLDBObject {
}
}
- /**
+ /**
* This function will return all the errors found in one structure
* looking recursively inside each table/statement. Returns
* an array of errors or false
@@ -673,7 +673,7 @@ class XMLDBStructure extends XMLDBObject {
if ($tables = $this->getTables()) {
foreach ($tables as $table) {
if ($tableerrors = $table->getAllErrors()) {
-
+
}
}
/// Add them to the errors array
@@ -697,14 +697,14 @@ class XMLDBStructure extends XMLDBObject {
}
}
- /**
+ /**
* This function will return the SQL code needed to create the table for the specified DB and
* prefix. Just one simple wrapper over generators.
*/
function getCreateStructureSQL ($dbtype, $prefix, $statement_end=true) {
$results = array();
-
+
if ($tables = $this->getTables()) {
foreach ($tables as $table) {
$results = array_merge($results, $table->getCreateTableSQL($dbtype, $prefix, $statement_end));
diff --git a/lib/xmldb/classes/XMLDBTable.class.php b/lib/xmldb/classes/XMLDBTable.class.php
index 1f869bb592c..d2bda59d7c6 100644
--- a/lib/xmldb/classes/XMLDBTable.class.php
+++ b/lib/xmldb/classes/XMLDBTable.class.php
@@ -27,7 +27,7 @@
/// This class represent one XMLDB table
class XMLDBTable extends XMLDBObject {
-
+
var $fields;
var $keys;
var $indexes;
@@ -625,7 +625,7 @@ class XMLDBTable extends XMLDBObject {
}
}
- /**
+ /**
* This function will output the XML text for one table
*/
function xmlOutput() {
@@ -706,7 +706,7 @@ class XMLDBTable extends XMLDBObject {
$key->setAttributes($type, $fields, $reftable, $reffields);
$this->addKey($key);
}
-
+
/**
* This function will add one new index to the table with all
* its attributes defined
@@ -720,8 +720,8 @@ class XMLDBTable extends XMLDBObject {
$index->setAttributes($type, $fields);
$this->addIndex($index);
}
-
- /**
+
+ /**
* This function will return all the errors found in one table
* looking recursively inside each field/key/index. Returns
* an array of errors or false
@@ -765,7 +765,7 @@ class XMLDBTable extends XMLDBObject {
}
}
- /**
+ /**
* This function will return the SQL code needed to create the table for the specified DB and
* prefix. Just one simple wrapper over generators.
*/
@@ -783,7 +783,7 @@ class XMLDBTable extends XMLDBObject {
return $results;
}
- /**
+ /**
* This function will return the SQL code needed to create the table for the specified DB and
* prefix. Just one simple wrapper over generators.
*/
@@ -801,7 +801,7 @@ class XMLDBTable extends XMLDBObject {
return $results;
}
- /**
+ /**
* This function will return the SQL code needed to drop the table for the specified DB and
* prefix. Just one simple wrapper over generators.
*/
@@ -819,7 +819,7 @@ class XMLDBTable extends XMLDBObject {
return $results;
}
- /**
+ /**
* This function will return the SQL code needed to add one field to the table for the specified DB and
* prefix. Just one simple wrapper over generators.
*/
@@ -837,7 +837,7 @@ class XMLDBTable extends XMLDBObject {
return $results;
}
- /**
+ /**
* This function will return the SQL code needed to drop one field from the table for the specified DB and
* prefix. Just one simple wrapper over generators.
*/
@@ -855,7 +855,7 @@ class XMLDBTable extends XMLDBObject {
return $results;
}
- /**
+ /**
* This function will return the SQL code needed to rename one field from the table for the specified DB and
* prefix. Just one simple wrapper over generators.
*/
diff --git a/lib/xmldb/classes/generators/XMLDBGenerator.class.php b/lib/xmldb/classes/generators/XMLDBGenerator.class.php
index b15278aead1..10baa0a13ea 100644
--- a/lib/xmldb/classes/generators/XMLDBGenerator.class.php
+++ b/lib/xmldb/classes/generators/XMLDBGenerator.class.php
@@ -25,14 +25,14 @@
///////////////////////////////////////////////////////////////////////////
/// This class represent the base generator class where all the
-/// needed functions to generate proper SQL are defined.
+/// needed functions to generate proper SQL are defined.
/// The rest of classes will inherit, by default, the same logic.
/// Functions will be overriden as needed to generate correct SQL.
class XMLDBgenerator {
-/// Please, avoid editing this defaults in this base class!
+/// Please, avoid editing this defaults in this base class!
/// It could change the behaviour of the rest of generators
/// that, by default, inherit this configuration.
/// To change any of them, do it in extended classes instead.
@@ -403,7 +403,7 @@ class XMLDBgenerator {
} else {
/// We force default '' for not null char columns without proper default
/// some day this should be out!
- if ($this->default_for_char !== NULL &&
+ if ($this->default_for_char !== NULL &&
$xmldb_field->getType() == XMLDB_TYPE_CHAR &&
$xmldb_field->getNotNull()) {
$default .= ' default ' . "'" . $this->default_for_char . "'";
@@ -415,7 +415,7 @@ class XMLDBgenerator {
/**
* Given one correct XMLDBTable and the new name, returns the SQL statements
* to rename it (inside one array)
- */
+ */
function getRenameTableSQL($xmldb_table, $newname) {
$results = array(); //Array where all the sentences will be stored
@@ -437,7 +437,7 @@ class XMLDBgenerator {
/**
* Given one correct XMLDBTable and the new name, returns the SQL statements
* to drop it (inside one array)
- */
+ */
function getDropTableSQL($xmldb_table) {
$results = array(); //Array where all the sentences will be stored
@@ -607,7 +607,7 @@ class XMLDBgenerator {
foreach($values as $key => $value) {
/// Trim single quotes
$value = trim($value,"'");
- if (stristr($value, 'CONCAT') !== false){
+ if (stristr($value, 'CONCAT') !== false){
/// Look for data between parentesis
preg_match("/CONCAT\s*\((.*)\)$/is", trim($value), $matches);
if (isset($matches[1])) {
@@ -665,7 +665,7 @@ class XMLDBgenerator {
}
}
- /**
+ /**
* Given one string (or one array), ends it with statement_end
*/
function getEndedStatements ($input) {
@@ -674,7 +674,7 @@ class XMLDBgenerator {
foreach ($input as $key=>$content) {
$input[$key] = $this->getEndedStatements($content);
}
- return $input;
+ return $input;
} else {
$input = trim($input) . $this->statement_end;
return $input;
@@ -705,7 +705,7 @@ class XMLDBgenerator {
}
/**
- * Returns the code (array of statements) needed
+ * Returns the code (array of statements) needed
* to create one sequence for the xmldb_table and xmldb_field passes
*/
function getCreateSequenceSQL ($xmldb_table, $xmldb_field) {
@@ -741,7 +741,7 @@ class XMLDBgenerator {
/// Some well-know reserved words
$reserved_words = array (
'user', 'scale', 'type', 'comment', 'view', 'value', 'table', 'index', 'key', 'sequence', 'trigger'
- );
+ );
return $reserved_words;
}
@@ -753,7 +753,7 @@ class XMLDBgenerator {
/// Some well-known tables to be created without prefix
$tables = array (
'adodb_logsql'
- );
+ );
return $tables;
}
}
diff --git a/lib/xmldb/classes/generators/mssql/mssql.class.php b/lib/xmldb/classes/generators/mssql/mssql.class.php
index 151078002cd..366ff044e0d 100644
--- a/lib/xmldb/classes/generators/mssql/mssql.class.php
+++ b/lib/xmldb/classes/generators/mssql/mssql.class.php
@@ -125,11 +125,11 @@ class XMLDBmssql extends XMLDBgenerator {
return $dbtype;
}
- /**
+ /**
* Returns the code needed to create one enum for the xmldb_table and xmldb_field passes
- */
+ */
function getEnumExtraSQL ($xmldb_table, $xmldb_field) {
-
+
$sql = 'CONSTRAINT ' . $this->getNameForObject($xmldb_table->getName(), $xmldb_field->getName(), 'ck');
$sql.= ' CHECK (' . $this->getEncQuoted($xmldb_field->getName()) . ' IN (' . implode(', ', $xmldb_field->getEnumValues()) . '))';
@@ -180,36 +180,36 @@ class XMLDBmssql extends XMLDBgenerator {
/// This file contains the reserved words for MSSQL databases
/// from http://msdn2.microsoft.com/en-us/library/ms189822.aspx
$reserved_words = array (
- 'add', 'all', 'alter', 'and', 'any', 'as', 'asc', 'authorization',
- 'avg', 'backup', 'begin', 'between', 'break', 'browse', 'bulk',
- 'by', 'cascade', 'case', 'check', 'checkpoint', 'close', 'clustered',
- 'coalesce', 'collate', 'column', 'commit', 'committed', 'compute',
- 'confirm', 'constraint', 'contains', 'containstable', 'continue',
- 'controlrow', 'convert', 'count', 'create', 'cross', 'current',
- 'current_date', 'current_time', 'current_timestamp', 'current_user',
- 'cursor', 'database', 'dbcc', 'deallocate', 'declare', 'default', 'delete',
- 'deny', 'desc', 'disk', 'distinct', 'distributed', 'double', 'drop', 'dummy',
- 'dump', 'else', 'end', 'errlvl', 'errorexit', 'escape', 'except', 'exec',
- 'execute', 'exists', 'exit', 'fetch', 'file', 'fillfactor', 'floppy',
- 'for', 'foreign', 'freetext', 'freetexttable', 'from', 'full', 'function',
- 'goto', 'grant', 'group', 'having', 'holdlock', 'identity', 'identitycol',
- 'identity_insert', 'if', 'in', 'index', 'inner', 'insert', 'intersect', 'into',
- 'is', 'isolation', 'join', 'key', 'kill', 'left', 'level', 'like', 'lineno',
- 'load', 'max', 'min', 'mirrorexit', 'national', 'nocheck', 'nonclustered',
- 'not', 'null', 'nullif', 'of', 'off', 'offsets', 'on', 'once', 'only', 'open',
- 'opendatasource', 'openquery', 'openrowset', 'openxml', 'option', 'or', 'order',
- 'outer', 'over', 'percent', 'perm', 'permanent', 'pipe', 'plan', 'precision',
- 'prepare', 'primary', 'print', 'privileges', 'proc', 'procedure', 'processexit',
- 'public', 'raiserror', 'read', 'readtext', 'reconfigure', 'references',
- 'repeatable', 'replication', 'restore', 'restrict', 'return', 'revoke',
- 'right', 'rollback', 'rowcount', 'rowguidcol', 'rule', 'save', 'schema',
- 'select', 'serializable', 'session_user', 'set', 'setuser', 'shutdown', 'some',
- 'statistics', 'sum', 'system_user', 'table', 'tape', 'temp', 'temporary',
- 'textsize', 'then', 'to', 'top', 'tran', 'transaction', 'trigger', 'truncate',
- 'tsequal', 'uncommitted', 'union', 'unique', 'update', 'updatetext', 'use',
- 'user', 'values', 'varying', 'view', 'waitfor', 'when', 'where', 'while',
+ 'add', 'all', 'alter', 'and', 'any', 'as', 'asc', 'authorization',
+ 'avg', 'backup', 'begin', 'between', 'break', 'browse', 'bulk',
+ 'by', 'cascade', 'case', 'check', 'checkpoint', 'close', 'clustered',
+ 'coalesce', 'collate', 'column', 'commit', 'committed', 'compute',
+ 'confirm', 'constraint', 'contains', 'containstable', 'continue',
+ 'controlrow', 'convert', 'count', 'create', 'cross', 'current',
+ 'current_date', 'current_time', 'current_timestamp', 'current_user',
+ 'cursor', 'database', 'dbcc', 'deallocate', 'declare', 'default', 'delete',
+ 'deny', 'desc', 'disk', 'distinct', 'distributed', 'double', 'drop', 'dummy',
+ 'dump', 'else', 'end', 'errlvl', 'errorexit', 'escape', 'except', 'exec',
+ 'execute', 'exists', 'exit', 'fetch', 'file', 'fillfactor', 'floppy',
+ 'for', 'foreign', 'freetext', 'freetexttable', 'from', 'full', 'function',
+ 'goto', 'grant', 'group', 'having', 'holdlock', 'identity', 'identitycol',
+ 'identity_insert', 'if', 'in', 'index', 'inner', 'insert', 'intersect', 'into',
+ 'is', 'isolation', 'join', 'key', 'kill', 'left', 'level', 'like', 'lineno',
+ 'load', 'max', 'min', 'mirrorexit', 'national', 'nocheck', 'nonclustered',
+ 'not', 'null', 'nullif', 'of', 'off', 'offsets', 'on', 'once', 'only', 'open',
+ 'opendatasource', 'openquery', 'openrowset', 'openxml', 'option', 'or', 'order',
+ 'outer', 'over', 'percent', 'perm', 'permanent', 'pipe', 'plan', 'precision',
+ 'prepare', 'primary', 'print', 'privileges', 'proc', 'procedure', 'processexit',
+ 'public', 'raiserror', 'read', 'readtext', 'reconfigure', 'references',
+ 'repeatable', 'replication', 'restore', 'restrict', 'return', 'revoke',
+ 'right', 'rollback', 'rowcount', 'rowguidcol', 'rule', 'save', 'schema',
+ 'select', 'serializable', 'session_user', 'set', 'setuser', 'shutdown', 'some',
+ 'statistics', 'sum', 'system_user', 'table', 'tape', 'temp', 'temporary',
+ 'textsize', 'then', 'to', 'top', 'tran', 'transaction', 'trigger', 'truncate',
+ 'tsequal', 'uncommitted', 'union', 'unique', 'update', 'updatetext', 'use',
+ 'user', 'values', 'varying', 'view', 'waitfor', 'when', 'where', 'while',
'with', 'work', 'writetext'
- );
+ );
return $reserved_words;
}
}
diff --git a/lib/xmldb/classes/generators/mysql/mysql.class.php b/lib/xmldb/classes/generators/mysql/mysql.class.php
index 936ec7a3dcd..ea26ce798a3 100644
--- a/lib/xmldb/classes/generators/mysql/mysql.class.php
+++ b/lib/xmldb/classes/generators/mysql/mysql.class.php
@@ -161,7 +161,7 @@ class XMLDBmysql extends XMLDBGenerator {
function getCommentSQL ($xmldb_table) {
$comment = '';
-
+
if ($xmldb_table->getComment()) {
$comment .= 'ALTER TABLE ' . $this->getEncQuoted($this->prefix . $xmldb_table->getName());
$comment .= " COMMENT='" . substr($xmldb_table->getComment(), 0, 250) . "'";
@@ -216,7 +216,7 @@ class XMLDBmysql extends XMLDBGenerator {
'utc_timestamp', 'values', 'varbinary', 'varchar', 'varcharacter',
'varying', 'when', 'where', 'while', 'with', 'write', 'x509',
'xor', 'year_month', 'zerofill'
- );
+ );
return $reserved_words;
}
}
diff --git a/lib/xmldb/classes/generators/oci8po/oci8po.class.php b/lib/xmldb/classes/generators/oci8po/oci8po.class.php
index 77c660c05bd..6e434adb3b4 100644
--- a/lib/xmldb/classes/generators/oci8po/oci8po.class.php
+++ b/lib/xmldb/classes/generators/oci8po/oci8po.class.php
@@ -114,11 +114,11 @@ class XMLDBoci8po extends XMLDBgenerator {
return $dbtype;
}
- /**
+ /**
* Returns the code needed to create one enum for the xmldb_table and xmldb_field passes
- */
+ */
function getEnumExtraSQL ($xmldb_table, $xmldb_field) {
-
+
$sql = 'CONSTRAINT ' . $this->getNameForObject($xmldb_table->getName(), $xmldb_field->getName(), 'ck');
$sql.= ' CHECK (' . $this->getEncQuoted($xmldb_field->getName()) . ' IN (' . implode(', ', $xmldb_field->getEnumValues()) . '))';
@@ -131,14 +131,14 @@ class XMLDBoci8po extends XMLDBgenerator {
function getCreateSequenceSQL ($xmldb_table, $xmldb_field) {
$sequence_name = $this->getNameForObject($xmldb_table->getName(), $xmldb_field->getName(), 'seq');
-
+
$sequence = "CREATE SEQUENCE " . $sequence_name;
$sequence.= "\n START WITH 1";
$sequence.= "\n INCREMENT BY 1";
$sequence.= "\n NOMAXVALUE";
$trigger_name = $this->getNameForObject($xmldb_table->getName(), $xmldb_field->getName(), 'trg');
-
+
$trigger = "CREATE OR REPLACE TRIGGER " . $trigger_name;
$trigger.= "\n BEFORE INSERT";
$trigger.= "\nON " . $this->getEncQuoted($this->prefix . $xmldb_table->getName());
@@ -158,11 +158,11 @@ class XMLDBoci8po extends XMLDBgenerator {
function getDropSequenceSQL ($xmldb_table, $xmldb_field, $include_trigger=false) {
$sequence_name = $this->getNameForObject($xmldb_table->getName(), $xmldb_field->getName(), 'seq');
-
+
$sequence = "DROP SEQUENCE " . $sequence_name;
$trigger_name = $this->getNameForObject($xmldb_table->getName(), $xmldb_field->getName(), 'trg');
-
+
$trigger = "DROP TRIGGER " . $trigger_name;
if ($include_trigger) {
@@ -222,7 +222,7 @@ class XMLDBoci8po extends XMLDBgenerator {
'unique', 'update', 'user', 'validate', 'values',
'varchar', 'varchar2', 'view', 'whenever',
'where', 'with'
- );
+ );
return $reserved_words;
}
}
diff --git a/lib/xmldb/classes/generators/postgres7/postgres7.class.php b/lib/xmldb/classes/generators/postgres7/postgres7.class.php
index ba8bd60e6e1..333a0823b37 100644
--- a/lib/xmldb/classes/generators/postgres7/postgres7.class.php
+++ b/lib/xmldb/classes/generators/postgres7/postgres7.class.php
@@ -114,11 +114,11 @@ class XMLDBpostgres7 extends XMLDBgenerator {
return $dbtype;
}
- /**
+ /**
* Returns the code needed to create one enum for the xmldb_table and xmldb_field passes
- */
+ */
function getEnumExtraSQL ($xmldb_table, $xmldb_field) {
-
+
$sql = 'CONSTRAINT ' . $this->getNameForObject($xmldb_table->getName(), $xmldb_field->getName(), 'ck');
$sql.= ' CHECK (' . $this->getEncQuoted($xmldb_field->getName()) . ' IN (' . implode(', ', $xmldb_field->getEnumValues()) . '))';
@@ -143,21 +143,21 @@ class XMLDBpostgres7 extends XMLDBgenerator {
/// This file contains the reserved words for PostgreSQL databases
/// http://www.postgresql.org/docs/current/static/sql-keywords-appendix.html
$reserved_words = array (
- 'all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc',
- 'asymmetric', 'authorization', 'between', 'binary', 'both', 'case',
- 'cast', 'check', 'collate', 'column', 'constraint', 'create', 'cross',
- 'current_date', 'current_role', 'current_time', 'current_timestamp',
- 'current_user', 'default', 'deferrable', 'desc', 'distinct', 'do',
- 'else', 'end', 'except', 'false', 'for', 'foreign', 'freeze', 'from',
- 'full', 'grant', 'group', 'having', 'ilike', 'in', 'initially', 'inner',
- 'intersect', 'into', 'is', 'isnull', 'join', 'leading', 'left', 'like',
- 'limit', 'localtime', 'localtimestamp', 'natural', 'new', 'not',
- 'notnull', 'null', 'off', 'offset', 'old', 'on', 'only', 'or', 'order',
- 'outer', 'overlaps', 'placing', 'primary', 'references', 'right', 'select',
- 'session_user', 'similar', 'some', 'symmetric', 'table', 'then', 'to',
- 'trailing', 'true', 'union', 'unique', 'user', 'using', 'verbose',
+ 'all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc',
+ 'asymmetric', 'authorization', 'between', 'binary', 'both', 'case',
+ 'cast', 'check', 'collate', 'column', 'constraint', 'create', 'cross',
+ 'current_date', 'current_role', 'current_time', 'current_timestamp',
+ 'current_user', 'default', 'deferrable', 'desc', 'distinct', 'do',
+ 'else', 'end', 'except', 'false', 'for', 'foreign', 'freeze', 'from',
+ 'full', 'grant', 'group', 'having', 'ilike', 'in', 'initially', 'inner',
+ 'intersect', 'into', 'is', 'isnull', 'join', 'leading', 'left', 'like',
+ 'limit', 'localtime', 'localtimestamp', 'natural', 'new', 'not',
+ 'notnull', 'null', 'off', 'offset', 'old', 'on', 'only', 'or', 'order',
+ 'outer', 'overlaps', 'placing', 'primary', 'references', 'right', 'select',
+ 'session_user', 'similar', 'some', 'symmetric', 'table', 'then', 'to',
+ 'trailing', 'true', 'union', 'unique', 'user', 'using', 'verbose',
'when', 'where'
- );
+ );
return $reserved_words;
}
}
diff --git a/lib/xmldb/xmldb.xsd b/lib/xmldb/xmldb.xsd
index 0829bb1b293..ee0e594b759 100644
--- a/lib/xmldb/xmldb.xsd
+++ b/lib/xmldb/xmldb.xsd
@@ -19,7 +19,7 @@
Starting index update (additions)...');
mtrace('Index size before: '.$CFG->search_index_size."\n");
-
+
//get all modules
if ($mods = get_records_select('modules')) {
//append virtual modules onto array
$mods = array_merge($mods, search_get_additional_modules());
-
+
foreach ($mods as $mod) {
//build include file and function names
- $class_file = $CFG->dirroot.'/search/documents/'.$mod->name.'_document.php';
+ $class_file = $CFG->dirroot.'/search/documents/'.$mod->name.'_document.php';
$db_names_function = $mod->name.'_db_names';
$get_document_function = $mod->name.'_single_document';
- $additions = array();
-
+ $additions = array();
+
if (file_exists($class_file)) {
require_once($class_file);
-
+
//if both required functions exist
if (function_exists($db_names_function) and function_exists($get_document_function)) {
mtrace("Checking $mod->name module for additions.");
$values = $db_names_function();
- $where = (isset($values[4])) ? $values[4] : '';
-
+ $where = (isset($values[4])) ? $values[4] : '';
+
//select records in MODULE table, but not in SEARCH_DATABASE_TABLE
$sql = "select id, ".$values[0]." as docid from ".$values[1].
" where id not in".
" (select docid from ".SEARCH_DATABASE_TABLE." where doctype like '$mod->name')".
" and ".$values[2]." > $indexdate".
- " $where";
+ " $where";
+
+ $records = get_records_sql($sql);
- $records = get_records_sql($sql);
-
//foreach record, build a module specific search document using the get_document function
- if (is_array($records)) {
+ if (is_array($records)) {
foreach($records as $record) {
$additions[] = $get_document_function($record->id);
} //foreach
- } //if
-
+ } //if
+
//foreach document, add it to the index and database table
foreach ($additions as $add) {
++$addition_count;
-
+
//object to insert into db
- $dbid = $dbcontrol->addDocument($add);
-
+ $dbid = $dbcontrol->addDocument($add);
+
//synchronise db with index
- $add->addField(Zend_Search_Lucene_Field::Keyword('dbid', $dbid));
-
+ $add->addField(Zend_Search_Lucene_Field::Keyword('dbid', $dbid));
+
mtrace(" Add: $add->title (database id = $add->dbid, moodle instance id = $add->docid)");
-
+
$index->addDocument($add);
} //foreach
-
+
mtrace("Finished $mod->name.\n");
- } //if
+ } //if
} //if
} //foreach
} //if
-
+
//commit changes
$index->commit();
-
+
//update index date and size
set_config("search_indexer_run_date", time());
set_config("search_index_size", (int)$CFG->search_index_size + (int)$addition_count);
diff --git a/search/cron.php b/search/cron.php
index 245ffa1a48b..36797e3c140 100644
--- a/search/cron.php
+++ b/search/cron.php
@@ -1,22 +1,22 @@
dirroot/search/lib.php");
-
+
mtrace(" |
Admin: There appears to be no index, click here to create one."; } //if @@ -236,42 +236,42 @@ print ''; print_simple_box_end(); - + if ($sq->is_valid()) { print_simple_box_start('center', '50%', 'white', 10); - - search_stopwatch(); - $hit_count = $sq->count(); - + + search_stopwatch(); + $hit_count = $sq->count(); + print "
"; print $hit_count." results returned for '".stripslashes($query_string)."'."; print "
"; - - if ($hit_count > 0) { - $page_links = $sq->page_numbers(); + + if ($hit_count > 0) { + $page_links = $sq->page_numbers(); $hits = $sq->results(); - + if ($advanced) { - //if in advanced mode, search options are saved in the session, so + //if in advanced mode, search options are saved in the session, so //we can remove the query string var from the page links, and replace //it with a=1 (Advanced = on) instead $page_links = preg_replace("/query_string=[^&]+/", 'a=1', $page_links); } //if - + print "
- ";
-
+
foreach ($hits as $listing) {
print "
- $listing->title
\n" - ."".search_shorten_url($listing->url, 70)."
\n" - ."Type: ".$listing->doctype.", score: ".round($listing->score, 3).", author: ".$listing->author."
\n" + ."".search_shorten_url($listing->url, 70)."
\n" + ."Type: ".$listing->doctype.", score: ".round($listing->score, 3).", author: ".$listing->author."
\n" ." \n";
} //for
-
+
print "
";
-
+
+ $ret = "
";
+
//shorten really long page lists, to stop table distorting width-ways
if (strlen($ret) > 70) {
$start = 4;
- $end = $page - 5;
+ $end = $page - 5;
$ret = preg_replace("/";
+
//Back is disabled if we're on page 1
if ($page > 1) {
$ret .= "< $back ";
} else {
$ret .= "< $back ";
} //else
-
+
//don't the current page
for ($i = 1; $i <= $pages; $i++) {
if ($page == $i) {
@@ -250,48 +250,48 @@
$ret .= "$i ";
} //else
} //for
-
+
//Next disabled if we're on the last page
- if ($page < $pages) {
+ if ($page < $pages) {
$ret .= "$next > ";
} else {
$ret .= "$next > ";
} //else
-
- $ret .= "
";
-
+
+ $ret .= "Server Time: '.date('r',time()));
mtrace("Testing global search capabilities:\n");
-
+
$phpversion = phpversion();
-
- if (!search_check_php5()) {
+
+ if (!search_check_php5()) {
mtrace("ERROR: PHP 5.0.0 or later required (currently using version $phpversion).");
exit(0);
} else {
@@ -34,35 +34,35 @@
//fix paths for testing
set_include_path(get_include_path().":../");
require_once("$CFG->dirroot/search/Zend/Search/Lucene.php");
-
+
mtrace("Checking activity modules:\n");
-
+
//the presence of the required search functions -
// * mod_iterator
// * mod_get_content_for_index
//are the sole basis for including a module in the index at the moment.
-
+
if ($mods = get_records_select('modules')) {
$mods = array_merge($mods, search_get_additional_modules());
-
+
foreach ($mods as $mod) {
- $class_file = $CFG->dirroot.'/search/documents/'.$mod->name.'_document.php';
-
+ $class_file = $CFG->dirroot.'/search/documents/'.$mod->name.'_document.php';
+
if (file_exists($class_file)) {
include_once($class_file);
-
+
if (!defined('SEARCH_TYPE_'.strtoupper($mod->name))) {
mtrace("ERROR: Constant 'SEARCH_TYPE_".strtoupper($mod->name)."' is not defined in /search/lib.php");
continue;
} //if
-
+
$iter_function = $mod->name.'_iterator';
$index_function = $mod->name.'_get_content_for_index';
-
+
if (function_exists($index_function) && function_exists($iter_function)) {
if (is_array($iter_function())) {
$documents = $index_function(array_pop($iter_function()));
-
+
if (is_array($documents)) {
mtrace("Success: '$mod->name' module seems to be ready for indexing.");
} else {
@@ -79,13 +79,13 @@
} //else
} //foreach
} //if
-
+
//finished modules
mtrace("\nFinished checking activity modules.");
-
+
//now blocks...
//
-
+
mtrace("
Back to query page or Start indexing.");
mtrace('');
diff --git a/search/update.php b/search/update.php
index d784acd4f13..0217afd3e40 100644
--- a/search/update.php
+++ b/search/update.php
@@ -2,100 +2,100 @@
require_once('../config.php');
require_once("$CFG->dirroot/search/lib.php");
-
+
require_login();
if (!isadmin()) {
error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
} //if
-
+
//check for php5 (lib.php)
if (!search_check_php5()) {
$phpversion = phpversion();
mtrace("Sorry, global search requires PHP 5.0.0 or later (currently using version $phpversion)");
exit(0);
- } //if
-
- require_once("$CFG->dirroot/search/indexlib.php");
-
+ } //if
+
+ require_once("$CFG->dirroot/search/indexlib.php");
+
$index = new Zend_Search_Lucene(SEARCH_INDEX_PATH);
$dbcontrol = new IndexDBControl();
$update_count = 0;
-
+
$indexdate = $CFG->search_indexer_run_date;
- mtrace("Starting index update (updates)...\n");
-
+ mtrace("Starting index update (updates)...\n");
+
if ($mods = get_records_select('modules')) {
$mods = array_merge($mods, search_get_additional_modules());
-
+
foreach ($mods as $mod) {
$class_file = $CFG->dirroot.'/search/documents/'.$mod->name.'_document.php';
$get_document_function = $mod->name.'_single_document';
$delete_function = $mod->name.'_delete';
$db_names_function = $mod->name.'_db_names';
- $updates = array();
-
+ $updates = array();
+
if (file_exists($class_file)) {
require_once($class_file);
-
+
if (function_exists($delete_function) and function_exists($db_names_function) and function_exists($get_document_function)) {
mtrace("Checking $mod->name module for updates.");
$values = $db_names_function();
-
+
//TODO: check 'in' syntax with other RDBMS' (add and update.php as well)
$sql = "select id, ".$values[0]." as docid from ".$values[1].
" where ".$values[3]." > $indexdate".
" and id in (select docid from ".SEARCH_DATABASE_TABLE.")";
-
- $records = get_records_sql($sql);
-
- if (is_array($records)) {
+
+ $records = get_records_sql($sql);
+
+ if (is_array($records)) {
foreach($records as $record) {
$updates[] = $delete_function($record->docid);
} //foreach
- } //if
-
+ } //if
+
foreach ($updates as $update) {
++$update_count;
-
- //delete old document
- $doc = $index->find("+docid:$update +doctype:$mod->name");
-
+
+ //delete old document
+ $doc = $index->find("+docid:$update +doctype:$mod->name");
+
//get the record, should only be one
- foreach ($doc as $thisdoc) {
+ foreach ($doc as $thisdoc) {
mtrace(" Delete: $thisdoc->title (database id = $thisdoc->dbid, index id = $thisdoc->id, moodle instance id = $thisdoc->docid)");
-
+
$dbcontrol->delDocument($thisdoc);
- $index->delete($thisdoc->id);
+ $index->delete($thisdoc->id);
} //foreach
-
+
//add new modified document back into index
$add = $get_document_function($update);
-
+
//object to insert into db
- $dbid = $dbcontrol->addDocument($add);
-
+ $dbid = $dbcontrol->addDocument($add);
+
//synchronise db with index
- $add->addField(Zend_Search_Lucene_Field::Keyword('dbid', $dbid));
-
+ $add->addField(Zend_Search_Lucene_Field::Keyword('dbid', $dbid));
+
mtrace(" Add: $add->title (database id = $add->dbid, moodle instance id = $add->docid)");
-
- $index->addDocument($add);
+
+ $index->addDocument($add);
} //foreach
-
+
mtrace("Finished $mod->name.\n");
- } //if
+ } //if
} //if
} //foreach
} //if
-
+
//commit changes
$index->commit();
-
+
//update index date
set_config("search_indexer_run_date", time());
- mtrace("Finished $update_count updates.");
+ mtrace("Finished $update_count updates.");
?>
\ No newline at end of file