Changeset 149

Timestamp:

10/16/07 16:59:38 (15 months ago)

Author:

chris

Message:

Dropped support for the ctype library 12

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• classes/HellaController.php (modified) (2 diffs)
• index.php (modified) (7 diffs)
• progress.php (modified) (1 diff)

trunk/CHANGELOG

@@ -11 +11 @@
 * Fixed a bug where the automatic refresh wouldn't update the final queue
   item when it began downloading [ticket:13]
+
+* Dropped requirement for the Ctype library [ticket:12]
 
 1.8

trunk/classes/HellaController.php

@@ -408 +408 @@
                  */
                         if ($articleid === false) throw new Exception('Invalid ID provided');
-                        if (!ctype_digit($articleid)) {
+                        if (!preg_match('/^\d+$/', $articleid)) {
                                 throw new Exception('Invalid Newzbin article ID provided');
                         }
@@ -468 +468 @@
                  *      $rate must be an integer value containing the rate limit.
                  */
-                        if (!ctype_digit($rate)) {
+                        if (!preg_match('/^\d+$/', $rate)) {
                                 throw new Exception('Invalid rate provided');
                         }

trunk/index.php

@@ -98 +98 @@
                 $self = htmlentities($_SERVER['PHP_SELF']);
 
-                if (array_key_exists('id', $_GET) && ctype_digit($_GET['id'])) {
+                if (array_key_exists('id', $_GET) && preg_match('/^\d+$/', $_GET['id'])) {
                         $nzbid = $_GET['id'];
                 } else {
                         $nzbid = false;
                 }
-                if (array_key_exists('action', $_GET) && ctype_digit($_GET['action'])) {
+                if (array_key_exists('action', $_GET) && preg_match('/^\d+$/', $_GET['action'])) {
                         switch ($_GET['action']) {
                                 case 1:
@@ -150 +150 @@
                 }
 
-                if (array_key_exists('refresher', $_GET) && ctype_digit($_GET['refresher'])) {
+                if (array_key_exists('refresher', $_GET) && preg_match('/^\d+$/', $_GET['refresher'])) {
                         if ($_GET['refresher'] == 1) {
                                 include 'templates/json.php';
@@ -157 +157 @@
                 }
 
-                if (array_key_exists('reorder', $_POST) && array_key_exists('sorttype', $_POST) && ctype_digit($_POST['sorttype'])) {
+                if (array_key_exists('reorder', $_POST) && array_key_exists('sorttype', $_POST) && preg_match('/^\d+$/', $_POST['sorttype'])) {
                         $type = $_POST['sorttype'];
                         if ($type == 1 && array_key_exists('order', $_POST) && is_array($_POST['order'])) {
@@ -163 +163 @@
                                 $c->multiCallStart();
                                 foreach($_POST['order'] as $queueindex => $neworder) {
-                                        if (ctype_digit($neworder) && $queueindex != $neworder) {
+                                        if (preg_match('/^\d+$/', $neworder) && $queueindex != $neworder) {
                                                 $c->move($c->queue[$queueindex]['id'], $neworder);
                                         }
                                 }
                                 $c->multiCallCommit();
-                        } elseif (array_key_exists('sortdirection', $_POST) && ctype_digit($_POST['sortdirection'])) {
+                        } elseif (array_key_exists('sortdirection', $_POST) && preg_match('/^\d+$/', $_POST['sortdirection'])) {
                                 $sortdir = $_POST['sortdirection'];
                                 if ($type == 2) {
@@ -229 +229 @@
                 if (array_key_exists('nzbdownload', $_GET)) {
                         $nzbdownload = trim($_GET['nzbdownload']);
-                        if (ctype_digit($nzbdownload)) {
+                        if (preg_match('/^\d+$/', $nzbdownload)) {
                                 $c->enqueueNewzbin($nzbdownload);
                         } else {
@@ -248 +248 @@
                 }
 
-                if (array_key_exists('maxrate', $_GET) && ctype_digit($_GET['maxrate'])) {
+                if (array_key_exists('maxrate', $_GET) && preg_match('/^\d+$/', $_GET['maxrate'])) {
                         $c->setRate($_GET['maxrate']);
                         header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . $self);
                 }
 
-                if (array_key_exists('info', $_GET) && ctype_digit($_GET['info'])) {
+                if (array_key_exists('info', $_GET) && preg_match('/^\d+$/', $_GET['info'])) {
                         $index = $_GET['info'] - 1;
                         include 'templates/rarpass.php';
@@ -286 +286 @@
                 }
 
-                if (array_key_exists('removefinished', $_GET) && ctype_digit($_GET['removefinished']) && $x) {
+                if (array_key_exists('removefinished', $_GET) && preg_match('/^\d+$/', $_GET['removefinished']) && $x) {
                         $id = --$_GET['removefinished'];
                         if (isset($x->item[$id])) {

trunk/progress.php

@@ -41 +41 @@
         $height = 10;
 
-        if (array_key_exists('percentage', $_GET) && ctype_digit($_GET['percentage'])) {
+        if (array_key_exists('percentage', $_GET) && preg_match('/^\d+$/', $_GET['percentage'])) {
                 $percentage = $_GET['percentage'];
         } else {