From: Petr Skoda Date: Sun, 1 Nov 2009 10:32:02 +0000 (+0000) Subject: MDL-20700 coding style cleanup - cvs keywords removed, closign php tag removed, trail... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=11b749ca90ec3a36d1d57c737d0c18de46894f1d;p=moodle.git MDL-20700 coding style cleanup - cvs keywords removed, closign php tag removed, trailing whitespace cleanup --- diff --git a/admin/dbtransfer/database_export_form.php b/admin/dbtransfer/database_export_form.php index 9ea1e37750..87f5614448 100644 --- a/admin/dbtransfer/database_export_form.php +++ b/admin/dbtransfer/database_export_form.php @@ -1,4 +1,4 @@ -libdir.'/formslib.php'; diff --git a/admin/dbtransfer/database_transfer_form.php b/admin/dbtransfer/database_transfer_form.php index bf199e7cf0..2f42d6b6ab 100644 --- a/admin/dbtransfer/database_transfer_form.php +++ b/admin/dbtransfer/database_transfer_form.php @@ -1,4 +1,4 @@ -libdir.'/formslib.php'; diff --git a/admin/dbtransfer/dbexport.php b/admin/dbtransfer/dbexport.php index 2a32c4d6c7..28127b4d8c 100644 --- a/admin/dbtransfer/dbexport.php +++ b/admin/dbtransfer/dbexport.php @@ -1,4 +1,4 @@ - $lastFunction, "comment" => $lastFunctionComment, "args" => $argBuffer); - + $bufferingArgs = false; $argBuffer = ""; $lastFunction = ""; $lastFunctionComment = ""; } } - + } } else { // token array list($id, $text) = $token; - + if($bufferingArgs) { - $argBuffer .= $text; + $argBuffer .= $text; } - switch ($id) + switch ($id) { - + case T_COMMENT: case T_ML_COMMENT: // we've defined this case T_DOC_COMMENT: // and this @@ -178,7 +178,7 @@ class MethodTable $waitingForOpenParenthesis = true; $lastFunction = $text; $lastFunctionComment = $lastComment; - $lastComment = ""; + $lastComment = ""; } if($waitingForClassName) { @@ -197,12 +197,12 @@ class MethodTable } } } - + foreach ($classMethods as $key => $value) { $methodSignature = $value['args']; $methodName = $value['name']; $methodComment = $value['comment']; - + $description = MethodTable::getMethodDescription($methodComment) . " " . MethodTable::getMethodCommentAttribute($methodComment, "desc"); $description = trim($description); $access = MethodTable::getMethodCommentAttributeFirstWord($methodComment, "access"); @@ -212,7 +212,7 @@ class MethodTable $pagesize = MethodTable::getMethodCommentAttributeFirstWord($methodComment, "pagesize"); $params = MethodTable::getMethodCommentArguments($methodComment); - + //description, arguments, access, [roles, [instance, [returns, [pagesize]]]] $methodTable[$methodName] = array(); //$methodTable[$methodName]["signature"] = $methodSignature; //debug purposes @@ -225,14 +225,14 @@ class MethodTable if($returns != "") $methodTable[$methodName]["returns"] = $returns; if($pagesize != "") $methodTable[$methodName]["pagesize"] = $pagesize; } - + return $methodTable; - + } - + /** - * - */ + * + */ function getMethodCommentServices($comment) { $pieces = explode('@service', $comment); @@ -248,10 +248,10 @@ class MethodTable } return $args; } - - + + /** - * + * */ function getMethodCommentArguments($comment) { @@ -269,7 +269,7 @@ class MethodTable return $args; } - + /** * Returns the description from the comment. * The description is(are) the first line(s) in the comment. @@ -282,8 +282,8 @@ class MethodTable $comment = MethodTable::cleanComment(strrstr($comment, "@")); return trim($comment); } - - + + /** * Returns the value of a comment attribute. * @@ -302,7 +302,7 @@ class MethodTable } return ""; } - + /** * Returns the value of a comment attribute. * @@ -326,7 +326,7 @@ class MethodTable } return ""; } - + /** * Returns the value of a comment attribute. * @@ -354,7 +354,7 @@ class MethodTable } return $result; } - + function getMethodCommentAttributeFirstWord($comment, $attribute){ $pieces = strstrafter($comment, '@' . $attribute); if($pieces !== FALSE) @@ -364,7 +364,7 @@ class MethodTable } return ""; } - + /** * Returns an array with the arguments of a method. * @@ -380,10 +380,10 @@ class MethodTable //clean the arguments before returning them $result = MethodTable::cleanArguments(explode(",", $methodSignature), $commentParams); } - + return $result; } - + /** * Cleans the function or method's return value. * @@ -394,7 +394,7 @@ class MethodTable function cleanReturnValue($value){ $result = array(); $value = trim($value); - + list($result['type'], $result['description']) = explode(' ', $value, 2); $result['type'] = MethodTable::standardizeType($result['type']); @@ -415,12 +415,12 @@ class MethodTable if('str' == $type || 'string' == $type) return 'string'; if('int' == $type || 'integer' == $type) return 'int'; if('bool' == $type || 'boolean' == $type) return 'boolean'; - + // Note that object is not a valid XMLRPC type if('object' == $type || 'class' == $type) return 'object'; if('float' == $type || 'dbl' == $type || 'double' == $type || 'flt' == $type) return 'double'; - // Note that null is not a valid XMLRPC type. The null type can have + // Note that null is not a valid XMLRPC type. The null type can have // only one value - null. if('null' == $type) return 'null'; @@ -429,12 +429,12 @@ class MethodTable if('array' == $type || 'arr' == $type) return 'array'; if('assoc' == $type || 'struct' == $type) return 'struct'; - // Note that this is not a valid XMLRPC type. As references cannot be + // Note that this is not a valid XMLRPC type. As references cannot be // serialized or exported, there is no way this could be XML-RPCed. if('reference' == $type || 'ref' == $type) return 'reference'; return 'string'; } - + /** * Cleans the arguments array. * This method removes all whitespaces and the leading "$" sign from each argument @@ -448,7 +448,7 @@ class MethodTable $result = array(); if(!is_array($args)) return array(); - + foreach($args as $index => $arg){ $arg = strrstr(str_replace(array('$','&$'), array('','&'), $arg), '='); if(!isset($commentParams[$index])) @@ -459,12 +459,12 @@ class MethodTable { $start = trim($arg); $end = trim(str_replace('$', '', $commentParams[$index])); - - // Suppress Notice of 'Undefined offset' with @ + + // Suppress Notice of 'Undefined offset' with @ @list($word0, $word1, $tail) = preg_split("/[\s]+/", $end, 3); $word0 = strtolower($word0); $word1 = strtolower($word1); - + $wordBase0 = preg_replace('/^[&$]+/','',$word0); $wordBase1 = preg_replace('/^[&$]+/','',$word1); $startBase = strtolower(preg_replace('/^[&$]+/','',$start)); @@ -496,7 +496,7 @@ class MethodTable $type = 'double'; } elseif($type == 'null') { // Note that this is not a valid XMLRPC type - // The null type can have only one value - null. Why would + // The null type can have only one value - null. Why would // that be an argument to a function? Just in case: $type = 'null'; } elseif($type == 'mixed') { @@ -521,8 +521,8 @@ class MethodTable return $result; } - - + + /** * Cleans the comment string by removing all comment start and end characters. * @@ -549,7 +549,7 @@ class MethodTable foreach($methodTable as $methodName=>$methodProps){ $result .= "\n\t\"" . $methodName . "\" => array("; - + foreach($methodProps as $key=>$value){ $result .= "\n\t\t\"" . $key . "\" => "; @@ -568,16 +568,15 @@ class MethodTable $result .= ","; } - + $result = substr($result, 0, -1); $result .= "\n\t),"; } - + $result = substr($result, 0, -1); $result = "\$this->methodTable = array(" . $result; $result .= "\n);"; - + return $result; } } -?> diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php index 2d7876ad58..6d0fb49f46 100644 --- a/admin/mnet/access_control.php +++ b/admin/mnet/access_control.php @@ -1,4 +1,4 @@ -box_end(); echo $OUTPUT->footer(); - -?> diff --git a/admin/mnet/adminlib.php b/admin/mnet/adminlib.php index 4514f9c722..7a8ff37cbc 100644 --- a/admin/mnet/adminlib.php +++ b/admin/mnet/adminlib.php @@ -209,4 +209,4 @@ function upgrade_RPC_functions() { } } } -?> + diff --git a/admin/mnet/delete.php b/admin/mnet/delete.php index ec33908d3b..412bcee939 100644 --- a/admin/mnet/delete.php +++ b/admin/mnet/delete.php @@ -11,7 +11,7 @@ require_login(); $context = get_context_instance(CONTEXT_SYSTEM); - + require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions"); $site = get_site(); @@ -53,4 +53,3 @@ $mnet_peer->delete(); redirect('peers.php', get_string('hostdeleted', 'mnet'), 5); } -?> diff --git a/admin/mnet/enr_course_enrol.php b/admin/mnet/enr_course_enrol.php index a661964e84..3a2efeba25 100644 --- a/admin/mnet/enr_course_enrol.php +++ b/admin/mnet/enr_course_enrol.php @@ -1,4 +1,4 @@ -footer(); - -?> diff --git a/admin/mnet/enr_courses.php b/admin/mnet/enr_courses.php index 35d552ef0c..aa8a8aab74 100644 --- a/admin/mnet/enr_courses.php +++ b/admin/mnet/enr_courses.php @@ -1,4 +1,4 @@ -'; echo $OUTPUT->footer(); - -?> diff --git a/admin/mnet/enr_hosts.php b/admin/mnet/enr_hosts.php index 769770de71..f850bd0006 100644 --- a/admin/mnet/enr_hosts.php +++ b/admin/mnet/enr_hosts.php @@ -1,4 +1,4 @@ -'; echo $OUTPUT->footer(); - -?> diff --git a/admin/mnet/index.php b/admin/mnet/index.php index badc0c9256..32378c864a 100644 --- a/admin/mnet/index.php +++ b/admin/mnet/index.php @@ -1,4 +1,4 @@ -mnet_confirm_delete_key)) { // fail - you're being attacked? } @@ -132,4 +132,3 @@ footer(); -?> diff --git a/admin/mnet/mnet_review.html b/admin/mnet/mnet_review.html index 37bcdecb69..8f5ebd53a7 100644 --- a/admin/mnet/mnet_review.html +++ b/admin/mnet/mnet_review.html @@ -58,7 +58,7 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) { } ?> - public_key)) { print_string('nopubkey', 'mnet'); } @@ -130,7 +130,7 @@ if (!empty($credentials)) { ?> : - 
 $credential) {
             if (is_scalar($credential)) {
                 echo str_pad($key, 16, " ", STR_PAD_LEFT).': '.$credential."\n";
diff --git a/admin/mnet/mnet_services.php b/admin/mnet/mnet_services.php
index 9240e31aa8..2bed53ec01 100644
--- a/admin/mnet/mnet_services.php
+++ b/admin/mnet/mnet_services.php
@@ -57,7 +57,7 @@
                 $host2service = new stdClass();
                 $host2service->hostid = $_POST['hostid'];
                 $host2service->serviceid = $key;
-                
+
                 $host2service->publish = $publish;
                 $host2service->subscribe = $subscribe;
 
@@ -178,4 +178,3 @@
     }
 
     include('./mnet_services.html');
-?>
diff --git a/admin/mnet/mnet_themes.php b/admin/mnet/mnet_themes.php
index 126e22705e..8e842a171b 100644
--- a/admin/mnet/mnet_themes.php
+++ b/admin/mnet/mnet_themes.php
@@ -72,4 +72,3 @@
     }
     $adminroot = admin_get_root();
     require('./mnet_themes.html');
-?>
diff --git a/admin/mnet/peers.php b/admin/mnet/peers.php
index 1ac9fbfa06..715c3d6c27 100644
--- a/admin/mnet/peers.php
+++ b/admin/mnet/peers.php
@@ -1,4 +1,4 @@
-id)) {
             $form->id = clean_param($form->id, PARAM_INT);
             $mnet_peer->set_id($form->id);
@@ -90,11 +90,11 @@ if (($form = data_submitted()) && confirm_sesskey()) {
             $form->name = clean_param($form->name, PARAM_NOTAGS);
             $mnet_peer->set_name($form->name);
         }
-    
+
         if (isset($form->deleted) && ($form->deleted == '0' || $form->deleted == '1')) {
             $mnet_peer->deleted = $form->deleted;
         }
-    
+
         if (isset($form->public_key)) {
             $form->public_key = clean_param($form->public_key, PARAM_PEM);
             if (empty($form->public_key)) {
@@ -150,27 +150,27 @@ if (($form = data_submitted()) && confirm_sesskey()) {
         include('./mnet_review_allhosts.html');
     }
 } else {
-    $hosts = $DB->get_records_sql('  SELECT 
-                                    h.id, 
-                                    h.wwwroot, 
-                                    h.ip_address, 
-                                    h.name, 
-                                    h.public_key, 
-                                    h.public_key_expires, 
-                                    h.transport, 
-                                    h.portno, 
-                                    h.last_connect_time, 
-                                    h.last_log_id, 
-                                    h.applicationid, 
-                                    a.name as app_name, 
-                                    a.display_name as app_display_name, 
+    $hosts = $DB->get_records_sql('  SELECT
+                                    h.id,
+                                    h.wwwroot,
+                                    h.ip_address,
+                                    h.name,
+                                    h.public_key,
+                                    h.public_key_expires,
+                                    h.transport,
+                                    h.portno,
+                                    h.last_connect_time,
+                                    h.last_log_id,
+                                    h.applicationid,
+                                    a.name as app_name,
+                                    a.display_name as app_display_name,
                                     a.xmlrpc_server_url
-                                FROM  
-                                    {mnet_host} h,  
-                                    {mnet_application} a  
-                                WHERE 
-                                    h.id <> ? AND  
-                                    h.deleted = 0 AND  
+                                FROM
+                                    {mnet_host} h,
+                                    {mnet_application} a
+                                WHERE
+                                    h.id <> ? AND
+                                    h.deleted = 0 AND
                                     h.applicationid=a.id',
                         array($CFG->mnet_localhost_id));;
 
@@ -178,4 +178,4 @@ if (($form = data_submitted()) && confirm_sesskey()) {
     $applications = $DB->get_records('mnet_application');
     include('./peers.html');
 }
-?>
+
diff --git a/admin/mnet/trustedhosts.php b/admin/mnet/trustedhosts.php
index 061d0304cf..df80fe0ed5 100644
--- a/admin/mnet/trustedhosts.php
+++ b/admin/mnet/trustedhosts.php
@@ -16,7 +16,7 @@
         admin_externalpage_print_header();
         print_error('requiresopenssl', 'mnet', '', NULL, true);
     }
-    
+
     $site = get_site();
 
     $trusted_hosts = '';//array();
@@ -61,4 +61,3 @@
     }
 
     include('./trustedhosts.html');
-?>
diff --git a/admin/roles/allow.php b/admin/roles/allow.php
index 1acdee1e87..b458b5d1da 100755
--- a/admin/roles/allow.php
+++ b/admin/roles/allow.php
@@ -1,4 +1,4 @@
-';
 
     echo $OUTPUT->footer();
-?>
diff --git a/admin/roles/check.php b/admin/roles/check.php
index e4b78415fe..9a7dd6e9e0 100755
--- a/admin/roles/check.php
+++ b/admin/roles/check.php
@@ -190,4 +190,4 @@
     }
 
     echo $OUTPUT->footer();
-?>
+
diff --git a/admin/roles/define.php b/admin/roles/define.php
index c711acd313..9ecd045c1f 100755
--- a/admin/roles/define.php
+++ b/admin/roles/define.php
@@ -189,4 +189,3 @@
     echo '';
 
     echo $OUTPUT->footer();
-?>
diff --git a/admin/roles/explain.php b/admin/roles/explain.php
index d904be28e7..edcf5c75b8 100755
--- a/admin/roles/explain.php
+++ b/admin/roles/explain.php
@@ -278,4 +278,3 @@ if ($userid && $capability != 'moodle/site:doanything' && !$userhascapability &&
 }
 echo $OUTPUT->close_window_button();
 echo $OUTPUT->footer();
-?>
diff --git a/admin/roles/lib.php b/admin/roles/lib.php
index acbb45d660..44a46e8808 100644
--- a/admin/roles/lib.php
+++ b/admin/roles/lib.php
@@ -1,4 +1,4 @@
-
diff --git a/admin/roles/manage.php b/admin/roles/manage.php
index 7a8fe97fdc..38f2a294f2 100755
--- a/admin/roles/manage.php
+++ b/admin/roles/manage.php
@@ -1,4 +1,4 @@
-old_icon_url('spacer') . '" class="iconsmall" alt="" /> ';
 }
-?>
diff --git a/admin/roles/managetabs.php b/admin/roles/managetabs.php
index bb969c6704..78558e61ff 100755
--- a/admin/roles/managetabs.php
+++ b/admin/roles/managetabs.php
@@ -1,4 +1,4 @@
-
diff --git a/admin/roles/tabs.php b/admin/roles/tabs.php
index 5bb49ec1fc..c382234bc3 100755
--- a/admin/roles/tabs.php
+++ b/admin/roles/tabs.php
@@ -1,4 +1,4 @@
-contextlevel != CONTEXT_SYSTEM) {    // Print tabs for anything ex
 
     print_tabs($tabs, $currenttab, $inactive, $activetwo);
 
-
-?>
diff --git a/admin/roles/usersroles.php b/admin/roles/usersroles.php
index 9a1c7576ab..b7d3aa66d6 100644
--- a/admin/roles/usersroles.php
+++ b/admin/roles/usersroles.php
@@ -1,4 +1,4 @@
-';
     }
 }
-?>
diff --git a/admin/settings/appearance.php b/admin/settings/appearance.php
index f2242a0632..5172b73f71 100644
--- a/admin/settings/appearance.php
+++ b/admin/settings/appearance.php
@@ -1,4 +1,4 @@
-add('appearance', new admin_externalpage('managetags', get_string('managetags', 'tag'), "$CFG->wwwroot/tag/manage.php"));
 
 } // end of speedup
-?>
diff --git a/admin/settings/courses.php b/admin/settings/courses.php
index 5287a55d33..c9eb6c6579 100644
--- a/admin/settings/courses.php
+++ b/admin/settings/courses.php
@@ -1,4 +1,4 @@
-add('courses', $temp);
 
 } // end of speedup
-
-?>
diff --git a/admin/settings/development.php b/admin/settings/development.php
index ad3174e229..6fb46f29f3 100644
--- a/admin/settings/development.php
+++ b/admin/settings/development.php
@@ -1,4 +1,4 @@
-
diff --git a/admin/settings/frontpage.php b/admin/settings/frontpage.php
index d57f4cb17a..bd7d5cfcef 100644
--- a/admin/settings/frontpage.php
+++ b/admin/settings/frontpage.php
@@ -1,4 +1,4 @@
-add(new admin_setting_special_frontpagedesc());
         $temp->add(new admin_setting_courselist_frontpage(false)); // non-loggedin version of the setting (that's what the parameter is for :) )
         $temp->add(new admin_setting_courselist_frontpage(true)); // loggedin version of the setting
-        
+
         $options = array();
         $options[] = get_string('unlimited');
         for ($i=1; $i<100; $i++) {
             $options[$i] = $i;
         }
         $temp->add(new admin_setting_configselect('maxcategorydepth', get_string('configsitemaxcategorydepth','admin'), get_string('configsitemaxcategorydepthhelp','admin'), 0, $options));
-        
+
         $temp->add(new admin_setting_sitesetcheckbox('numsections', get_string('sitesection'), get_string('sitesectionhelp','admin'), 1));
         $temp->add(new admin_setting_sitesetselect('newsitems', get_string('newsitemsnumber'), '', 3,
              array('0' => '0',
@@ -82,4 +82,3 @@ if (!during_initial_install()) { //do not use during installation
         $ADMIN->add('frontpage', new admin_externalpage('sitefiles', get_string('sitefiles'), $CFG->wwwroot . '/files/index.php?id=' . SITEID, 'moodle/course:managefiles', false, $frontpagecontext));
     }
 }
-?>
diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index 414b79549b..998c1b248e 100644
--- a/admin/settings/grades.php
+++ b/admin/settings/grades.php
@@ -1,4 +1,4 @@
-add('language', new admin_externalpage('multilangupgrade', get_string('multilangupgrade', 'admin'), $CFG->wwwroot.'/'.$CFG->admin.'/multilangupgrade.php', 'moodle/site:config', !empty($CFG->filter_multilang_converted)));
 
 } // end of speedup
-
-?>
diff --git a/admin/settings/location.php b/admin/settings/location.php
index 60890f4ade..4ef1f6fc80 100644
--- a/admin/settings/location.php
+++ b/admin/settings/location.php
@@ -1,4 +1,4 @@
-add('location', new admin_externalpage('timezoneimport', get_string('updatetimezones', 'admin'), "$CFG->wwwroot/$CFG->admin/timezoneimport.php"));
 
 } // end of speedup
-
-?>
diff --git a/admin/settings/mnet.php b/admin/settings/mnet.php
index 8db1cc0249..20c3418eb1 100644
--- a/admin/settings/mnet.php
+++ b/admin/settings/mnet.php
@@ -1,4 +1,4 @@
-add('mnet', new admin_externalpage('trustedhosts', get_string('trustedho
                                            'moodle/site:config'));
 
 } // end of speedup
-
-?>
diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index 98e9359411..d35de24d1a 100644
--- a/admin/settings/plugins.php
+++ b/admin/settings/plugins.php
@@ -1,4 +1,4 @@
-add('security', $temp);
 
 } // end of speedup
-
-
diff --git a/admin/settings/server.php b/admin/settings/server.php
index 2c5ed69ff4..465ec601f4 100644
--- a/admin/settings/server.php
+++ b/admin/settings/server.php
@@ -1,4 +1,4 @@
-
diff --git a/admin/settings/subsystems.php b/admin/settings/subsystems.php
index d5dad0943f..d4e46e61ec 100644
--- a/admin/settings/subsystems.php
+++ b/admin/settings/subsystems.php
@@ -1,4 +1,4 @@
-add(new admin_setting_configselect('mnet_dispatcher_mode', get_string('net', 'mnet'), get_string('configmnet', 'mnet'), 'off', $options));
 
     // Conditional activities: completion and availability
-    $optionalsubsystems->add(new admin_setting_configcheckbox('enablecompletion', 
-        get_string('enablecompletion','completion'), 
+    $optionalsubsystems->add(new admin_setting_configcheckbox('enablecompletion',
+        get_string('enablecompletion','completion'),
         get_string('configenablecompletion','completion'), 0));
-    $optionalsubsystems->add(new admin_setting_pickroles('progresstrackedroles', 
+    $optionalsubsystems->add(new admin_setting_pickroles('progresstrackedroles',
         get_string('progresstrackedroles','completion'),
         get_string('configprogresstrackedroles', 'completion'),
         array('moodle/legacy:student')));
diff --git a/admin/settings/top.php b/admin/settings/top.php
index f1069217ad..497d112daf 100644
--- a/admin/settings/top.php
+++ b/admin/settings/top.php
@@ -1,4 +1,4 @@
-add('root', new admin_externalpage('adminnotifications', get_string('notifications'), "$CFG->wwwroot/$CFG->admin/index.php"));
 
 // Show the annoying registration button if registration hasn't been done or is 6 months old (15552000 seconds) MDL-17429
-if (empty($CFG->registered) || ($CFG->registered < (time() - 15552000))) { 
+if (empty($CFG->registered) || ($CFG->registered < (time() - 15552000))) {
     $ADMIN->add('root', new admin_externalpage('adminregistration', get_string('registration','admin'), "$CFG->wwwroot/$CFG->admin/register.php"));
 }
 
@@ -42,5 +42,3 @@ $ADMIN->add('root', new admin_category('unsupported', get_string('unsupported',
 
 // hidden search script
 $ADMIN->add('root', new admin_externalpage('search', get_string('searchresults'), "$CFG->wwwroot/$CFG->admin/search.php", 'moodle/site:config', true));
-
-?>
diff --git a/admin/settings/unsupported.php b/admin/settings/unsupported.php
index 9d095b3bda..b5cd7e55a7 100644
--- a/admin/settings/unsupported.php
+++ b/admin/settings/unsupported.php
@@ -1,4 +1,4 @@
-add('unsupported', new admin_externalpage('replace', 'Search and replace', $CFG->wwwroot.'/'.$CFG->admin.'/replace.php', 'moodle/site:config', true));
 
 } // end of speedup
-
-?>
diff --git a/admin/settings/users.php b/admin/settings/users.php
index 080be841d8..2a5ebf3b26 100644
--- a/admin/settings/users.php
+++ b/admin/settings/users.php
@@ -1,4 +1,4 @@
-add(new admin_setting_configtext('allowemailaddresses', get_string('allowemailaddresses', 'admin'), get_string('configallowemailaddresses', 'admin'), '', PARAM_NOTAGS));
     $temp->add(new admin_setting_configtext('denyemailaddresses', get_string('denyemailaddresses', 'admin'), get_string('configdenyemailaddresses', 'admin'), '', PARAM_NOTAGS));
     $temp->add(new admin_setting_configcheckbox('verifychangedemail', get_string('verifychangedemail', 'admin'), get_string('configverifychangedemail', 'admin'), 1));
-    
+
     $temp->add(new admin_setting_configtext('recaptchapublickey', get_string('recaptchapublickey', 'admin'), get_string('configrecaptchapublickey', 'admin'), '', PARAM_NOTAGS));
     $temp->add(new admin_setting_configtext('recaptchaprivatekey', get_string('recaptchaprivatekey', 'admin'), get_string('configrecaptchaprivatekey', 'admin'), '', PARAM_NOTAGS));
     $ADMIN->add('authsettings', $temp);
@@ -112,7 +112,7 @@ if ($hassiteconfig
                 $defaultguestid = reset($guestroles);
                 $defaultguestid = $defaultguestid->id;
             }
-            
+
             // we must not use assignable roles here:
             //   1/ unsetting roles as assignable for admin might bork the settings!
             //   2/ default user role should not be assignable anyway
@@ -179,5 +179,3 @@ if ($hassiteconfig
     $ADMIN->add('roles', new admin_externalpage('checkpermissions', get_string('checkglobalpermissions', 'role'), "$CFG->wwwroot/$CFG->admin/roles/check.php?contextid=".$systemcontext->id, array('moodle/role:assign', 'moodle/role:safeoverride', 'moodle/role:override', 'moodle/role:manage')));
 
 } // end of speedup
-
-?>