MDL-3381 - Remove all remaining core calls to ctype_* functions in 1.…

…9, and make ctype required for 2.0. (merge from 1.9)
NoelDeMartin · Apr 24, 2008 · bbbfc05 · bbbfc05
1 parent 5832a6f
commit bbbfc05
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/admin/environment.xml b/admin/environment.xml
@@ -177,6 +177,11 @@
           <ON_CHECK message="xmlrpcrecommended" />
         </FEEDBACK>
       </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ctyperecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
     </PHP_EXTENSIONS>
     <CUSTOM_CHECKS>
       <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">
@@ -249,6 +254,11 @@
           <ON_CHECK message="xmlrpcrecommended" />
         </FEEDBACK>
       </PHP_EXTENSION>
+     <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
     </PHP_EXTENSIONS>
     <CUSTOM_CHECKS>
       <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">

diff --git a/course/lib.php b/course/lib.php
@@ -117,7 +117,7 @@ function build_mnet_logs_array($hostid, $course, $user=0, $date=0, $order="l.tim
 
     if ($modaction) {
         $firstletter = substr($modaction, 0, 1);
-        if (ctype_alpha($firstletter)) {
+        if (preg_match('/[[:alpha:]]/', $firstletter)) {
             $where .= " AND\n                lower(l.action) LIKE '%" . strtolower($modaction) . "%'";
         } else if ($firstletter == '-') {
             $where .= " AND\n                lower(l.action) NOT LIKE '%" . strtolower(substr($modaction, 1)) . "%'";
@@ -180,7 +180,7 @@ function build_logs_array($course, $user=0, $date=0, $order="l.time ASC", $limit
 
     if ($modaction) {
         $firstletter = substr($modaction, 0, 1);
-        if (ctype_alpha($firstletter)) {
+        if (preg_match('/[[:alpha:]]/', $firstletter)) {
             $joins[] = "lower(l.action) LIKE '%" . strtolower($modaction) . "%'";
         } else if ($firstletter == '-') {
             $joins[] = "lower(l.action) NOT LIKE '%" . strtolower(substr($modaction, 1)) . "%'";

diff --git a/install/lang/en_utf8/installer.php b/install/lang/en_utf8/installer.php
@@ -65,6 +65,8 @@
 $string['configurationfileexist']='Configuration file already exist!';
 $string['continue'] = 'Continue';
 $string['creatingconfigfile'] =' Creating configuration file ...';
+$string['ctyperecommended'] = 'Installing the optional ctype PHP extension is highly recommended in order to improve site performance, particularly if your site is supporting non-latin languages.';
+$string['ctyperequired'] = 'The ctype PHP extension is now required by Moodle, in order to improve site performance and to offer multilingual compatibility.';
 $string['curlrecommended'] = 'Installing the optional cURL library is highly recommended in order to enable Moodle Networking functionality.';
 $string['customcheck'] = 'Other Checks';
 $string['database'] = 'Database';

diff --git a/install/stringnames.txt b/install/stringnames.txt
@@ -45,6 +45,8 @@ configurationcompletesub
 configurationfileexist
 continue
 creatingconfigfile
+ctyperecommended
+ctyperequired
 curlrecommended
 customcheck
 database

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
@@ -258,6 +258,8 @@
 $string['cronerrorpassword'] = 'Sorry, you have not provided a valid password to access this page';
 $string['cronremotepassword'] = 'Cron password for remote access';
 $string['cronwarning'] = 'The <a href=\"cron.php\">cron.php maintenance script</a> has not been run for at least 24 hours.';
+$string['ctyperecommended'] = 'Installing the optional ctype PHP extension is highly recommended in order to improve site performance, particularly if your site is supporting non-latin languages.';
+$string['ctyperequired'] = 'The ctype PHP extension is now required by Moodle, in order to improve site performance and to offer multilingual compatibility.';
 $string['csvdelimiter'] = 'CSV delimiter';
 $string['curlrecommended'] = 'Installing the optional cURL library is highly recommended in order to enable Moodle Networking functionality.';
 $string['customcheck'] = 'Other Checks';