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

tbrehm

2012-02-13 f038c0a4cecc7a7a56b6d175c3ec42c1f80a4ac7

 server/lib/classes/modules.inc.php

@@ -98,12 +98,14 @@
               $data = unserialize($d['data']);
            }
            //** Decode data back to locale
            /*
            foreach($data['old'] as $key => $val) {
               $data['old'][$key] = utf8_decode($val);
            }
            foreach($data['new'] as $key => $val) {
               $data['new'][$key] = utf8_decode($val);
            }
            */
            
            $replication_error = false;
            
@@ -137,7 +139,7 @@
                  $app->db->query($sql);
                  if($app->db->errorNumber > 0) {
                     $replication_error = true;
                     $app->log("Replication failed. Error: (" . $d[dbtable] . ") in MySQL server: (".$app->db->dbHost.") " . $app->db->errorMessage . " # SQL: " . $sql,LOGLEVEL_ERROR);
                     $app->log("Replication failed. Error: (" . $d['dbtable'] . ") in MySQL server: (".$app->db->dbHost.") " . $app->db->errorMessage . " # SQL: " . $sql,LOGLEVEL_ERROR);
                  }
                  $app->log('Replicated from master: '.$sql,LOGLEVEL_DEBUG);
               }
@@ -206,12 +208,14 @@
               $data = unserialize($d['data']);
            }
            //** decode data back to current locale
            /*
            foreach($data['old'] as $key => $val) {
               $data['old'][$key] = utf8_decode($val);
            }
            foreach($data['new'] as $key => $val) {
               $data['new'][$key] = utf8_decode($val);
            }
            */
            
            $this->current_datalog_id = $d['datalog_id'];
            if(is_array($data['old']) || is_array($data['new'])) {
@@ -225,8 +229,46 @@
            $app->log('Processed datalog_id '.$d['datalog_id'],LOGLEVEL_DEBUG);
         }
      }
   }
	
   function processActions() {
      global $app,$conf;
      
      //* get the server_id of the local server
      $server_id = intval($conf["server_id"]);
      
      include_once (SCRIPT_PATH."/lib/remote_action.inc.php");
		
      //* SQL query to get all pending actions
      $sql = "SELECT action_id, action_type, action_param " .
            "FROM sys_remoteaction " .
            "WHERE server_id = " . $server_id . " ".
            " AND  action_id > " . intval($maxid_remote_action) . " ".
            "ORDER BY action_id";
		
      $actions = $app->dbmaster->queryAllRecords($sql);
		
      if(is_array($actions)) {
         foreach($actions as $action) {
				
            //* Raise the action
            $state = $app->plugins->raiseAction($action['action_type'],$action['action_param']);
				
            //* Update the action state
            $sql = "UPDATE sys_remoteaction " .
                  "SET action_state = '" . $app->dbmaster->quote($state) . "' " .
                  "WHERE action_id = " . intval($action['action_id']);
            $app->dbmaster->query($sql);

            /*
            * Then save the maxid for the next time...
            */
            $fp = fopen(ISPC_LIB_PATH."/remote_action.inc.php", 'wb');
            $content = '<?php' . "\n" . '$maxid_remote_action = ' . $action['action_id'] . ';' . "\n?>";
            fwrite($fp, $content);
            fclose($fp);
         }
      }
      
      
      
@@ -243,9 +285,10 @@
         foreach($hooks as $hook) {
            $module_name = $hook['module'];
            $function_name = $hook['function'];
            // Claa the processing function of the module
            // Call the processing function of the module
            if($this->debug) $app->log("Call function '$function_name' in module '$module_name' raised by TableHook '$table_name'.",LOGLEVEL_DEBUG);
            call_user_method($function_name,$app->loaded_modules[$module_name],$table_name,$action,$data);
            // call_user_method($function_name,$app->loaded_modules[$module_name],$table_name,$action,$data);
            call_user_func(array($app->loaded_modules[$module_name],$function_name),$table_name,$action,$data);
            unset($module_name);
            unset($function_name);
         }