Validation function moved to related file.

Lennie · Jan 28, 2022 · c2ae290 · c2ae290
1 parent a28cf51
commit c2ae290
Show file tree

Hide file tree

Showing 24 changed files with 90 additions and 54 deletions.
diff --git a/add_record.php b/add_record.php
@@ -28,10 +28,11 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once('inc/toolkit.inc.php');
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
 require_once 'inc/syslog.inc.php';
 
-include_once('inc/header.inc.php');
+include_once 'inc/header.inc.php';
 
 global $pdnssec_use;
 

diff --git a/add_zone_master.php b/add_zone_master.php
@@ -28,10 +28,11 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
 require_once 'inc/syslog.inc.php';
 
-include_once("inc/header.inc.php");
+include_once 'inc/header.inc.php';
 
 echo "  <script type=\"text/javascript\" src=\"inc/helper.js\"></script>";
 

diff --git a/add_zone_slave.php b/add_zone_slave.php
@@ -28,10 +28,11 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
 require_once 'inc/syslog.inc.php';
 
-include_once("inc/header.inc.php");
+include_once 'inc/header.inc.php';
 
 global $dns_third_level_check;
 

diff --git a/add_zone_templ_record.php b/add_zone_templ_record.php
@@ -28,8 +28,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 global $dns_ttl;
 

diff --git a/bulk_registration.php b/bulk_registration.php
@@ -28,8 +28,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 $owner = "-1";
 if ((isset($_POST['owner'])) && (v_num($_POST['owner']))) {

diff --git a/delete_domain.php b/delete_domain.php
@@ -28,10 +28,11 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
 require_once 'inc/syslog.inc.php';
 
-include_once("inc/header.inc.php");
+include_once 'inc/header.inc.php';
 
 global $pdnssec_use;
 

diff --git a/delete_perm_templ.php b/delete_perm_templ.php
@@ -28,8 +28,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 $perm_templ = "-1";
 if (isset($_GET['id']) && (v_num($_GET['id']))) {

diff --git a/delete_record.php b/delete_record.php
@@ -28,10 +28,11 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
 require_once 'inc/syslog.inc.php';
 
-include_once("inc/header.inc.php");
+include_once 'inc/header.inc.php';
 
 global $pdnssec_use;
 

diff --git a/delete_supermaster.php b/delete_supermaster.php
@@ -28,8 +28,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 $master_ip = "-1";
 if (isset($_GET['master_ip']) && (is_valid_ipv4($_GET['master_ip']) || is_valid_ipv6($_GET['master_ip']))) {

diff --git a/delete_user.php b/delete_user.php
@@ -28,8 +28,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 do_hook('verify_permission' , 'user_edit_own' ) ? $perm_edit_own = "1" : $perm_edit_own = "0";
 do_hook('verify_permission' , 'user_edit_others' ) ? $perm_edit_others = "1" : $perm_edit_others = "0";

diff --git a/delete_zone_templ.php b/delete_zone_templ.php
@@ -28,8 +28,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 $zone_templ_id = "-1";
 if (isset($_GET['id']) && (v_num($_GET['id']))) {

diff --git a/delete_zone_templ_record.php b/delete_zone_templ_record.php
@@ -28,8 +28,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 $record_id = "-1";
 if (isset($_GET['id']) && v_num($_GET['id'])) {

diff --git a/dnssec.php b/dnssec.php
@@ -29,8 +29,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 global $pdnssec_use;
 global $perm_meta_edit;

diff --git a/dnssec_add_key.php b/dnssec_add_key.php
@@ -28,7 +28,9 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
 include_once("inc/header.inc.php");
 
 $zone_id = "-1";

diff --git a/dnssec_delete_key.php b/dnssec_delete_key.php
@@ -28,8 +28,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 global $pdnssec_use;
 

diff --git a/dnssec_ds_dnskey.php b/dnssec_ds_dnskey.php
@@ -29,8 +29,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 global $pdnssec_use;
 global $perm_view;

diff --git a/dnssec_edit_key.php b/dnssec_edit_key.php
@@ -28,8 +28,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 global $pdnssec_use;
 

diff --git a/edit.php b/edit.php
@@ -34,6 +34,7 @@
 
 require_once 'inc/toolkit.inc.php';
 require_once 'inc/pagination.inc.php';
+require_once 'inc/validation.inc.php';
 
 include_once 'inc/header.inc.php';
 

diff --git a/edit_perm_templ.php b/edit_perm_templ.php
@@ -28,8 +28,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 $id = "-1";
 if ((isset($_GET['id'])) || (v_num($_GET['id']))) {

diff --git a/edit_user.php b/edit_user.php
@@ -28,8 +28,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 $edit_id = "-1";
 if (isset($_GET['id']) && v_num($_GET['id'])) {

diff --git a/edit_zone_templ.php b/edit_zone_templ.php
@@ -30,6 +30,7 @@
  */
 require_once 'inc/toolkit.inc.php';
 require_once 'inc/pagination.inc.php';
+require_once 'inc/validation.inc.php';
 
 include_once 'inc/header.inc.php';
 

diff --git a/edit_zone_templ_record.php b/edit_zone_templ_record.php
@@ -28,8 +28,10 @@
  * @copyright   2010-2022  Poweradmin Development Team
  * @license     https://opensource.org/licenses/GPL-3.0 GPL
  */
-require_once("inc/toolkit.inc.php");
-include_once("inc/header.inc.php");
+require_once 'inc/toolkit.inc.php';
+require_once 'inc/validation.inc.php';
+
+include_once 'inc/header.inc.php';
 
 $record_id = "-1";
 if (isset($_GET['id']) && v_num($_GET['id'])) {

diff --git a/inc/toolkit.inc.php b/inc/toolkit.inc.php
@@ -112,7 +112,6 @@
 require_once "dnssec.inc.php";
 require_once "templates.inc.php";
 
-//do_hook('hook_post_includes');
 do_hook('authenticate');
 
 /* * ***********
@@ -132,17 +131,3 @@ function success($msg) {
         echo "     <div class=\"success\">" . _('Something has been successfully performed. What exactly, however, will remain a mystery.') . "</div>\n";
     }
 }
-
-/** Validate numeric string
- *
- * @param string $string number
- *
- * @return boolean true if number, false otherwise
- */
-function v_num($string) {
-    if (!preg_match("/^[0-9]+$/i", $string)) {
-        return false;
-    } else {
-        return true;
-    }
-}
diff --git a/inc/validation.inc.php b/inc/validation.inc.php
@@ -13,3 +13,17 @@ function is_valid_email($address) {
     }
     return true;
 }
+
+/** Validate numeric string
+ *
+ * @param string $string number
+ *
+ * @return boolean true if number, false otherwise
+ */
+function v_num($string) {
+    if (!preg_match("/^[0-9]+$/i", $string)) {
+        return false;
+    } else {
+        return true;
+    }
+}