Changeset 203

Timestamp:

09/24/2009 01:25:39 AM (2 years ago)

Author:

Acinonyx

Message:

[awmn] Add zone name validation

Location:

branches/awmn

Files:

• globals/functions.php (modified) (2 diffs)
• globals/language/english.php (modified) (1 diff)
• globals/language/greek.php (modified) (1 diff)
• includes/pages/mynodes/mynodes_dnszone.php (modified) (3 diffs)

branches/awmn/globals/functions.php

@@ -4 +4 @@
  *
  * Copyright (C) 2005 Nikolaos Nikalexis <winner@cube.gr>
+ * Copyright (C) 2009 Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -312 +313 @@
 }
 
+function validate_zone($name) {
+        $name = str_replace("_", "-", $name);
+        $name = strtolower($name);
+        if (preg_match('/^((([[:alnum:]]|[[:alnum:]][[:alnum:]-]*[[:alnum:]])\.)*([[:alnum:]]|[[:alnum:]][[:alnum:]-]*[[:alnum:]])|)$/', $name) == 0) return NULL;
+        return $name;
+}
+
 function validate_name_ns($name, $node) {
         global $db;

branches/awmn/globals/language/english.php

@@ -496 +496 @@
                                 'body' => 'The node you are looking for does not exist. Check that you supplied the correct data and try again. If you are sure that you submit the correct data, it is likely that the node has been deleted or that the user has not activated his/her account yet.'
                         ),
+                        'zone_invalid_name' => array(
+                                'title' => 'Invalid zone name',
+                                body => 'The name of the zone contains invalid characters.'
+                        ),
                         'generic' => array(
                                 'title' => "General error",

branches/awmn/globals/language/greek.php

@@ -686 +686 @@
  λογαριασΌού.'
                         ),
+                        'zone_invalid_name' => array(
+                                'title' => 'Μη έγκÏ
+ρο όΜοΌα ζώΜης',
+                                body => '΀ο όΜοΌα ζώΜης ποÏ
+ Ύηλώσατε περιέχει Όη έγκÏ
+ροÏ
+ς χαρακτήρες.'
+                        ),
                         'generic' => array(
                                 'title' => "ΓεΜικό σφάλΌα",

branches/awmn/includes/pages/mynodes/mynodes_dnszone.php

@@ -4 +4 @@
  *
  * Copyright (C) 2005 Nikolaos Nikalexis <winner@cube.gr>
+ * Copyright (C) 2009 Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -77 +78 @@
                         $_POST['dns_zones__name'] = substr($_POST['dns_zones__name'], 0, -strlen($vars['dns']['root_zone'])-1);
                 }
+                $_POST['dns_zones__name'] = validate_zone($_POST['dns_zones__name']);
                 $form_zone = $this->form_zone();
                 $ret = TRUE;
@@ -82 +84 @@
                 if (get('zone') == 'add') {
                         if ($_POST['dns_zones__name'] == '') {
-                                $db->output_error_fields_required(array('dns_zones__name'));
+                                if (is_null($_POST['dns_zones__name'])) $main->message->set_fromlang('error', 'zone_invalid_name');
+                                else $db->output_error_fields_required(array('dns_zones__name'));
                                 return;
                         }