Added in cronlist on server a comment with domain and domain in cronlist

xaver

2011-09-22 4be8f776aa144ce6747c40add8ef621e84532ebe

 server/plugins-available/mysql_clientdb_plugin.inc.php

@@ -66,16 +66,16 @@
      
   }
   
  function process_host_list($action, $database_name, $database_user, $database_password, $host_list, $link, $database_rename_user = "") {
  function process_host_list($action, $database_name, $database_user, $database_password, $host_list, $link, $database_rename_user = '') {
      global $app;
      
      $action = strtoupper($action);
      
      // set to all hosts if none given
      if(trim($host_list) == "") $host_list = "%";
      if(trim($host_list) == '') $host_list = '%';
      
      // process arrays and comma separated strings
      if(!is_array($host_list)) $host_list = split(",", $host_list);
      if(!is_array($host_list)) $host_list = split(',', $host_list);
      
      $success = true;
      
@@ -85,10 +85,10 @@
          
          // check if entry is valid ip address
          $valid = true;
        if($db_host == "%") {
        if($db_host == '%') {
           $valid = true;
        } elseif(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $db_host)) {
              $groups = explode(".", $db_host);
              $groups = explode('.', $db_host);
              foreach($groups as $group){
                if($group<0 OR $group>255)
                $valid=false;
@@ -99,15 +99,15 @@
          
          if($valid == false) continue;
          
          if($action == "GRANT") {
          if($action == 'GRANT') {
              if(!mysql_query("GRANT ALL ON ".mysql_real_escape_string($database_name,$link).".* TO '".mysql_real_escape_string($database_user,$link)."'@'$db_host' IDENTIFIED BY '".mysql_real_escape_string($database_password,$link)."';",$link)) $success = false;
          } elseif($action == "REVOKE") {
          } elseif($action == 'REVOKE') {
              //mysql_query("REVOKE ALL PRIVILEGES ON ".mysql_real_escape_string($database_name,$link).".* FROM '".mysql_real_escape_string($database_user,$link)."';",$link);
          } elseif($action == "DROP") {
          } elseif($action == 'DROP') {
              if(!mysql_query("DROP USER '".mysql_real_escape_string($database_user,$link)."'@'$db_host';",$link)) $success = false;
          } elseif($action == "RENAME") {
          } elseif($action == 'RENAME') {
              if(!mysql_query("RENAME USER '".mysql_real_escape_string($database_user,$link)."'@'$db_host' TO '".mysql_real_escape_string($database_rename_user,$link)."'@'$db_host'",$link)) $success = false;
          } elseif($action == "PASSWORD") {
          } elseif($action == 'PASSWORD') {
              if(!mysql_query("SET PASSWORD FOR '".mysql_real_escape_string($database_user,$link)."'@'$db_host' = PASSWORD('".mysql_real_escape_string($database_password,$link)."');",$link)) $success = false;
          }
      }
@@ -118,13 +118,13 @@
   function db_insert($event_name,$data) {
      global $app, $conf;
      
      if($data["new"]["type"] == 'mysql') {
      if($data['new']['type'] == 'mysql') {
         if(!include(ISPC_LIB_PATH.'/mysql_clientdb.conf')) {
            $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf',LOGLEVEL_ERROR);
            return;
         }
         
         if($data["new"]["database_user"] == 'root') {
         if($data['new']['database_user'] == 'root') {
            $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
            return;
         }
@@ -137,33 +137,33 @@
         }

         // Charset for the new table
         if($data["new"]["database_charset"] != '') {
        $query_charset_table = ' DEFAULT CHARACTER SET '.$data["new"]["database_charset"];
         if($data['new']['database_charset'] != '') {
        $query_charset_table = ' DEFAULT CHARACTER SET '.$data['new']['database_charset'];
         } else {
        $query_charset_table = '';
         }

         //* Create the new database
         if (mysql_query('CREATE DATABASE '.mysql_real_escape_string($data["new"]["database_name"]).$query_charset_table,$link)) {
            $app->log('Created MySQL database: '.$data["new"]["database_name"],LOGLEVEL_DEBUG);
         if (mysql_query('CREATE DATABASE '.mysql_real_escape_string($data['new']['database_name']).$query_charset_table,$link)) {
            $app->log('Created MySQL database: '.$data['new']['database_name'],LOGLEVEL_DEBUG);
         } else {
            $app->log('Unable to connect to the database'.mysql_error($link),LOGLEVEL_ERROR);
            $app->log('Unable to create the database: '.mysql_error($link),LOGLEVEL_WARNING);
         }
         
         // Create the database user if database is active
         if($data["new"]["active"] == 'y') {
         if($data['new']['active'] == 'y') {
            
            if($data["new"]["remote_access"] == 'y') {
          $this->process_host_list("GRANT", $data["new"]["database_name"], $data["new"]["database_user"], $data["new"]["database_password"], $data["new"]["remote_ips"], $link);
            if($data['new']['remote_access'] == 'y') {
          $this->process_host_list('GRANT', $data['new']['database_name'], $data['new']['database_user'], $data['new']['database_password'], $data['new']['remote_ips'], $link);
            }
            
            $db_host = 'localhost';
            mysql_query("GRANT ALL ON ".mysql_real_escape_string($data["new"]["database_name"],$link).".* TO '".mysql_real_escape_string($data["new"]["database_user"],$link)."'@'$db_host' IDENTIFIED BY '".mysql_real_escape_string($data["new"]["database_password"],$link)."';",$link);
            mysql_query("GRANT ALL ON `".str_replace(array('_','%'),array('\\_','\\%'),mysql_real_escape_string($data['new']['database_name'],$link))."`.* TO '".mysql_real_escape_string($data['new']['database_user'],$link)."'@'$db_host' IDENTIFIED BY '".mysql_real_escape_string($data['new']['database_password'],$link)."';",$link);

            
         }
         
         mysql_query("FLUSH PRIVILEGES;",$link);
         mysql_query('FLUSH PRIVILEGES;',$link);
         mysql_close($link);
      }
   }
@@ -171,13 +171,13 @@
   function db_update($event_name,$data) {
      global $app, $conf;
      
      if($data["new"]["type"] == 'mysql') {
      if($data['new']['type'] == 'mysql') {
         if(!include(ISPC_LIB_PATH.'/mysql_clientdb.conf')) {
            $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf',LOGLEVEL_ERROR);
            return;
         }
         
         if($data["new"]["database_user"] == 'root') {
         if($data['new']['database_user'] == 'root') {
            $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
            return;
         }
@@ -185,79 +185,79 @@
         //* Connect to the database
         $link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
         if (!$link) {
            $app->log('Unable to connect to the database'.mysql_error($link),LOGLEVEL_ERROR);
            $app->log('Unable to connect to the database: '.mysql_error($link),LOGLEVEL_ERROR);
            return;
         }
         
         // Create the database user if database was disabled before
         if($data["new"]["active"] == 'y' && $data["old"]["active"] == 'n') {
         if($data['new']['active'] == 'y' && $data['old']['active'] == 'n') {
            
            if($data["new"]["remote_access"] == 'y') {
          $this->process_host_list("GRANT", $data["new"]["database_name"], $data["new"]["database_user"], $data["new"]["database_password"], $data["new"]["remote_ips"], $link);
            if($data['new']['remote_access'] == 'y') {
          $this->process_host_list('GRANT', $data['new']['database_name'], $data['new']['database_user'], $data['new']['database_password'], $data['new']['remote_ips'], $link);
            }
            
            $db_host = 'localhost';
            mysql_query("GRANT ALL ON ".mysql_real_escape_string($data["new"]["database_name"],$link).".* TO '".mysql_real_escape_string($data["new"]["database_user"],$link)."'@'$db_host' IDENTIFIED BY '".mysql_real_escape_string($data["new"]["database_password"],$link)."';",$link);
            mysql_query("GRANT ALL ON `".str_replace(array('_','%'),array('\\_','\\%'),mysql_real_escape_string($data['new']['database_name'],$link))."`.* TO '".mysql_real_escape_string($data['new']['database_user'],$link)."'@'$db_host' IDENTIFIED BY '".mysql_real_escape_string($data['new']['database_password'],$link)."';",$link);
            
            // mysql_query("GRANT ALL ON ".mysql_real_escape_string($data["new"]["database_name"],$link).".* TO '".mysql_real_escape_string($data["new"]["database_user"],$link)."'@'$db_host' IDENTIFIED BY '".mysql_real_escape_string($data["new"]["database_password"],$link)."';",$link);
            //echo "GRANT ALL ON ".mysql_real_escape_string($data["new"]["database_name"]).".* TO '".mysql_real_escape_string($data["new"]["database_user"])."'@'$db_host' IDENTIFIED BY '".mysql_real_escape_string($data["new"]["database_password"])."';";
         }
         
         // Remove database user, if inactive
         if($data["new"]["active"] == 'n' && $data["old"]["active"] == 'y') {
         if($data['new']['active'] == 'n' && $data['old']['active'] == 'y') {
            
            if($data["old"]["remote_access"] == 'y') {
          $this->process_host_list("DROP", "", $data["old"]["database_user"], "", $data["old"]["remote_ips"], $link);
            if($data['old']['remote_access'] == 'y') {
          $this->process_host_list('DROP', '', $data['old']['database_user'], '', $data['old']['remote_ips'], $link);
            }
            
            $db_host = 'localhost';
            mysql_query("DROP USER '".mysql_real_escape_string($data["old"]["database_user"],$link)."'@'$db_host';",$link);
            mysql_query("DROP USER '".mysql_real_escape_string($data['old']['database_user'],$link)."'@'$db_host';",$link);
            
            
            //mysql_query("REVOKE ALL PRIVILEGES ON ".mysql_real_escape_string($data["new"]["database_name"],$link).".* FROM '".mysql_real_escape_string($data["new"]["database_user"],$link)."';",$link);
         }
         
         //* Rename User
         if($data["new"]["database_user"] != $data["old"]["database_user"]) {
         if($data['new']['database_user'] != $data['old']['database_user']) {
            $db_host = 'localhost';
            mysql_query("RENAME USER '".mysql_real_escape_string($data["old"]["database_user"],$link)."'@'$db_host' TO '".mysql_real_escape_string($data["new"]["database_user"],$link)."'@'$db_host'",$link);
            if($data["old"]["remote_access"] == 'y') {
          $this->process_host_list("RENAME", "", $data["new"]["database_user"], "", $data["new"]["remote_ips"], $link, $data["new"]["database_user"]);
            mysql_query("RENAME USER '".mysql_real_escape_string($data['old']['database_user'],$link)."'@'$db_host' TO '".mysql_real_escape_string($data['new']['database_user'],$link)."'@'$db_host'",$link);
            if($data['old']['remote_access'] == 'y') {
               $this->process_host_list('RENAME', '', $data['old']['database_user'], '', $data['new']['remote_ips'], $link, $data['new']['database_user']);
            }
            $app->log('Renaming mysql user: '.$data["old"]["database_user"].' to '.$data["new"]["database_user"],LOGLEVEL_DEBUG);
            $app->log('Renaming MySQL user: '.$data['old']['database_user'].' to '.$data['new']['database_user'],LOGLEVEL_DEBUG);
         }
         
         //* Remote access option has changed.
         if($data["new"]["remote_access"] != $data["old"]["remote_access"]) {
         if($data['new']['remote_access'] != $data['old']['remote_access']) {
            
            //* revoke old priveliges
            //mysql_query("REVOKE ALL PRIVILEGES ON ".mysql_real_escape_string($data["new"]["database_name"],$link).".* FROM '".mysql_real_escape_string($data["new"]["database_user"],$link)."';",$link);
            
            //* set new priveliges
            if($data["new"]["remote_access"] == 'y') { 		
               $this->process_host_list("GRANT", $data["new"]["database_name"], $data["new"]["database_user"], $data["new"]["database_password"], $data["new"]["remote_ips"], $link);
            if($data['new']['remote_access'] == 'y') { 		
               $this->process_host_list('GRANT', $data['new']['database_name'], $data['new']['database_user'], $data['new']['database_password'], $data['new']['remote_ips'], $link);
            } else {
               $this->process_host_list("DROP", "", $data["old"]["database_user"], "", $data["old"]["remote_ips"], $link);
               $this->process_host_list('DROP', '', $data['old']['database_user'], '', $data['old']['remote_ips'], $link);
            }
            $app->log('Changing mysql remote access priveliges for database: '.$data["new"]["database_name"],LOGLEVEL_DEBUG);
         } elseif($data["new"]["remote_access"] == 'y' && $data["new"]["remote_ips"] != $data["old"]["remote_ips"]) {
            $app->log('Changing MySQL remote access privileges for database: '.$data['new']['database_name'],LOGLEVEL_DEBUG);
         } elseif($data['new']['remote_access'] == 'y' && $data['new']['remote_ips'] != $data['old']['remote_ips']) {
          //* Change remote access list
          $this->process_host_list("DROP", "", $data["old"]["database_user"], "", $data["old"]["remote_ips"], $link);
          $this->process_host_list("GRANT", $data["new"]["database_name"], $data["new"]["database_user"], $data["new"]["database_password"], $data["new"]["remote_ips"], $link);
          $this->process_host_list('DROP', '', $data['old']['database_user'], '', $data['old']['remote_ips'], $link);
          $this->process_host_list('GRANT', $data['new']['database_name'], $data['new']['database_user'], $data['new']['database_password'], $data['new']['remote_ips'], $link);
      }
      
         //* Change password
         if($data["new"]["database_password"] != $data["old"]["database_password"]) {
         if($data['new']['database_password'] != $data['old']['database_password']) {
            $db_host = 'localhost';
            mysql_query("SET PASSWORD FOR '".mysql_real_escape_string($data["new"]["database_user"],$link)."'@'$db_host' = PASSWORD('".mysql_real_escape_string($data["new"]["database_password"],$link)."');",$link);
            mysql_query("SET PASSWORD FOR '".mysql_real_escape_string($data['new']['database_user'],$link)."'@'$db_host' = PASSWORD('".mysql_real_escape_string($data['new']['database_password'],$link)."');",$link);

            if($data["new"]["remote_access"] == 'y') {
          $this->process_host_list("PASSWORD", "", $data["new"]["database_user"], $data["new"]["database_password"], $data["new"]["remote_ips"], $link);
            if($data['new']['remote_access'] == 'y') {
          $this->process_host_list('PASSWORD', '', $data['new']['database_user'], $data['new']['database_password'], $data['new']['remote_ips'], $link);
            }
            $app->log('Changing mysql user password for: '.$data["new"]["database_user"],LOGLEVEL_DEBUG);
            $app->log('Changing MySQL user password for: '.$data['new']['database_user'],LOGLEVEL_DEBUG);
         }
         
         mysql_query("FLUSH PRIVILEGES;",$link);
         mysql_query('FLUSH PRIVILEGES;',$link);
         mysql_close($link);
      }
      
@@ -266,7 +266,7 @@
   function db_delete($event_name,$data) {
      global $app, $conf;
      
      if($data["old"]["type"] == 'mysql') {
      if($data['old']['type'] == 'mysql') {
         if(!include(ISPC_LIB_PATH.'/mysql_clientdb.conf')) {
            $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf',LOGLEVEL_ERROR);
            return;
@@ -275,32 +275,32 @@
         //* Connect to the database
         $link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
         if (!$link) {
            $app->log('Unable to connect to the database'.mysql_error($link),LOGLEVEL_ERROR);
            $app->log('Unable to connect to the database: '.mysql_error($link),LOGLEVEL_ERROR);
            return;
         }
         
         //* Get the db host setting for the access priveliges
         if($data["old"]["remote_access"] == 'y') {
             if($this->process_host_list("DROP", "", $data["old"]["database_user"], "", $data["old"]["remote_ips"], $link)) {
           $app->log('Dropping mysql user: '.$data["old"]["database_user"],LOGLEVEL_DEBUG);
         if($data['old']['remote_access'] == 'y') {
             if($this->process_host_list('DROP', '', $data['old']['database_user'], '', $data['old']['remote_ips'], $link)) {
           $app->log('Dropping MySQL user: '.$data['old']['database_user'],LOGLEVEL_DEBUG);
            } else {
               $app->log('Error while dropping mysql user: '.$data["old"]["database_user"].' '.mysql_error($link),LOGLEVEL_ERROR);
               $app->log('Error while dropping MySQL user: '.$data['old']['database_user'].' '.mysql_error($link),LOGLEVEL_WARNING);
            }
         }
         $db_host = 'localhost';
         if(mysql_query("DROP USER '".mysql_real_escape_string($data["old"]["database_user"],$link)."'@'$db_host';",$link)) {
            $app->log('Dropping mysql user: '.$data["old"]["database_user"],LOGLEVEL_DEBUG);
         if(mysql_query("DROP USER '".mysql_real_escape_string($data['old']['database_user'],$link)."'@'$db_host';",$link)) {
            $app->log('Dropping MySQL user: '.$data['old']['database_user'],LOGLEVEL_DEBUG);
         } else {
            $app->log('Error while dropping mysql user: '.$data["old"]["database_user"].' '.mysql_error($link),LOGLEVEL_ERROR);
            $app->log('Error while dropping MySQL user: '.$data['old']['database_user'].' '.mysql_error($link),LOGLEVEL_WARNING);
         }
         
         if(mysql_query('DROP DATABASE '.mysql_real_escape_string($data["old"]["database_name"],$link),$link)) {
            $app->log('Dropping mysql database: '.$data["old"]["database_name"],LOGLEVEL_DEBUG);
         if(mysql_query('DROP DATABASE '.mysql_real_escape_string($data['old']['database_name'],$link),$link)) {
            $app->log('Dropping MySQL database: '.$data['old']['database_name'],LOGLEVEL_DEBUG);
         } else {
            $app->log('Error while dropping mysql database: '.$data["old"]["database_name"].' '.mysql_error($link),LOGLEVEL_ERROR);
            $app->log('Error while dropping MySQL database: '.$data['old']['database_name'].' '.mysql_error($link),LOGLEVEL_WARNING);
         }
         
         mysql_query("FLUSH PRIVILEGES;",$link);
         mysql_query('FLUSH PRIVILEGES;',$link);
         mysql_close($link);
      }
      
@@ -312,4 +312,4 @@

} // end class

?>
?>