Implemented: FS#2024 - Sanity check zones with named-checkzone

tbrehm

2012-02-13 f038c0a4cecc7a7a56b6d175c3ec42c1f80a4ac7

 interface/lib/classes/remoting.inc.php

@@ -348,8 +348,8 @@
         $this->server->fault('permission_denied','You do not have the permissions to access this function.');
         return false;
      }
      $affected_rows = $this->deleteQuery('../mail/form/mail_user_filter.tform.php', $primary_id);
      $app->plugin->raiseEvent('mail:mail_user_filter:on_after_delete',$this);
      $affected_rows = $this->deleteQuery('../mail/form/mail_user_filter.tform.php', $primary_id,'mail:mail_user_filter:on_after_delete');
      // $app->plugin->raiseEvent('mail:mail_user_filter:on_after_delete',$this);
      return $affected_rows;
   }

@@ -1558,6 +1558,30 @@
      $app->remoting_lib->loadFormDef('../dns/form/dns_soa.tform.php');
      return $app->remoting_lib->getDataRecord($primary_id);
   }
    
    //* Get record id by origin
    public function dns_zone_get_id($session_id, $origin)
    {
        global $app;
        
        if(!$this->checkPerm($session_id, 'dns_zone_get_id')) {
            $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
            return false;
        }
        
        if (preg_match('/^[a-z0-9][a-z0-9\-]+[a-z0-9](\.[a-z]{2,4})+$/i', $origin)) {
            $this->server->fault('no_domain_found', 'Invalid domain name.');
            return false;
        }

        $rec = $app->db->queryOneRecord("SELECT id FROM dns_soa WHERE origin like '".$origin.'%');
        if(isset($rec['id'])) {
            return intval($rec['id']);
        } else {
            $this->server->fault('no_domain_found', 'There is no domain ID with informed domain name.');
            return false;
        }
    }
   
   //* Add a record
   public function dns_zone_add($session_id, $client_id, $params)
@@ -2156,14 +2180,28 @@
      
      //* Get the SQL query
      $sql = $app->remoting_lib->getSQL($params,'INSERT',0);
      $app->db->query($sql);
      
      //* Check if no system user with that username exists
      $username = $app->db->quote($params["username"]);
      $tmp = $app->db->queryOneRecord("SELECT count(userid) as number FROM sys_user WHERE username = '$username'");
      if($tmp['number'] > 0) $app->remoting_lib->errorMessage .= "Duplicate username<br />";
		
      //* Stop on error while preparing the sql query
      if($app->remoting_lib->errorMessage != '') {
         $this->server->fault('data_processing_error', $app->remoting_lib->errorMessage);
         return false;
      }
      
      //* Execute the SQL query
      $app->db->query($sql);
      $insert_id = $app->db->insertID();
		
		
      //* Stop on error while executing the sql query
      if($app->remoting_lib->errorMessage != '') {
         $this->server->fault('data_processing_error', $app->remoting_lib->errorMessage);
         return false;
      }
      
      $this->id = $insert_id;
      $this->dataRecord = $params;
@@ -2303,22 +2341,23 @@
      // set a few values for compatibility with tform actions, mostly used by plugins
      $this->oldDataRecord = $old_rec;
      $this->id = $primary_id;
      $this->dataRecord = $params;
      $this->dataRecord = $old_rec;
      //$this->dataRecord = $params;
      
      //* Get the SQL query
      $sql = $app->remoting_lib->getDeleteSQL($primary_id);
		
      $app->db->errorMessage = '';
      $app->db->query($sql);
      $affected_rows = $app->db->affectedRows();
      
      if($app->db->errorMessage != '') {
			
         if($event_identifier != '') $app->plugin->raiseEvent($event_identifier,$this);
			
         $this->server->fault('database_error', $app->db->errorMessage . ' '.$sql);
         return false;
      }
      
      $affected_rows = $app->db->affectedRows();
      if($event_identifier != '') {
         $app->plugin->raiseEvent($event_identifier,$this);
      }
      
      //* Save changes to Datalog
      if($app->remoting_lib->formDef["db_history"] == 'yes') {