More usage of wrapper functions

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 308939d9b888cb1eef89341830a6bf9d0bbe6ccc..886fd1d07d9333245c4bba42df3e5b90cf4bc367 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -594,7 +594,7 @@ function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
        // Walk through all files
        foreach ($menuArray as $file) {
                // Is this a PHP script?
-               if ((!isDirectory($file)) && (strpos($file, '' . $type . '-') > -1) && (strpos($file, '.php') > 0)) {
+               if ((!isDirectory($file)) && (isInString('' . $type . '-', $file)) && (isInString('.php', $file))) {
                        // Then test if the file is readable
                        $test = sprintf("inc/modules/%s/%s", $menu, $file);
 
@@ -1398,7 +1398,7 @@ function adminTestProxySettings ($settingsArray) {
        $content = sendGetRequest('check-updates3.php');
 
        // Is the first line with "200 OK"?
-       $valid = (strpos($content[0], '200 OK') !== false);
+       $valid = isInString('200 OK', $content[0]);
 
        // Return result
        return $valid;