print_simple_box(_start/_end) and preg_replace() fixes

diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index 30c622d3cb504871b55d670a49223d8ef8119b05..d3a9cf4c3b2da69589231fd91a2327712605b83f 100755 (executable)
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -29,7 +29,8 @@ class enrolment_plugin_authorize
      */
     public function print_entry($course)
     {
-        global $CFG, $USER, $form;
+        global $CFG, $USER, $OUTPUT;
+        global $form;
 
         $zerocost = zero_cost($course);
         if ($zerocost) {
@@ -96,9 +97,9 @@ class enrolment_plugin_authorize
                 }
             }
 
-            print_box_start();
+            $OUTPUT->box_start();
             $frmenrol->display();
-            print_box_end();
+            $OUTPUT->box_end();
         }
 
         if ($course->password) {
@@ -149,7 +150,7 @@ class enrolment_plugin_authorize
      */
     private function cc_submit($form, $course)
     {
-        global $CFG, $USER, $SESSION, $DB;
+        global $CFG, $USER, $SESSION, $OUTPUT, $DB;
 
         prevent_double_paid($course);
 
@@ -314,13 +315,13 @@ class enrolment_plugin_authorize
 
                     load_all_capabilities();
 
-                    print_box_start('generalbox', 'notice');
+                    $OUTPUT->box_start('generalbox notice');
                     echo '<p>'. get_string('paymentthanks', 'moodle', $course->fullname) .'</p>';
                     echo '<div class="buttons">';
                     print_single_button("$CFG->wwwroot/enrol/authorize/index.php", array('order'=>$order->id), get_string('payments'));
                     print_single_button("$CFG->wwwroot/course/view.php", array('id'=>$course->id), $course->fullname);
                     echo '</div>';
-                    print_box_end();
+                    $OUTPUT->box_end();
                     print_footer($course);
                     exit; // break;
                 }

diff --git a/enrol/authorize/enrol_form.php b/enrol/authorize/enrol_form.php
index 56abdda74f7fb701286b30c4f3cf5528b62d93ee..9be66831888ce64d824bc5784ff2208bf5854563 100755 (executable)
--- a/enrol/authorize/enrol_form.php
+++ b/enrol/authorize/enrol_form.php
@@ -272,7 +272,7 @@ class enrol_authorize_form extends moodleform
         $GoodCard = true;
 
         //  Get rid of any non-digits
-        $Num = preg_replace("/[^0-9]~", "", $Num);
+        $Num = preg_replace("/[^0-9]~/", "", $Num);
 
         // Perform card-specific checks, if applicable
         switch ($Name)