Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/lib/classes/remote.d/client.inc.php

@@ -406,7 +406,7 @@
         $app->db->query("DELETE FROM sys_user WHERE client_id = ?", $client_id);

         //* Delete all records (sub-clients, mail, web, etc....)  of this client.
         $tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_traffic';
         $tables = 'cron,client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_traffic,domain';
         $tables_array = explode(',', $tables);
         $client_group_id = $app->functions->intval($client_group['groupid']);

@@ -683,39 +683,6 @@
      
      return $returnval;
   }
	
   public function client_activate($session_id, $params){
      global $app;
      /*
      if (!$this->checkPerm($session_id, 'client_update')){
         throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
         return false;
      }
      */
		
      if(!is_file(ISPC_WEB_PATH.'/robot/lib/robot_config.inc.php')){
         throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
         return false;
      }
		
      $client = $app->db->queryOneRecord("SELECT * FROM client WHERE customer_no = '".$app->db->quote($params['customer_no'])."' AND email = '".$app->db->quote($params['email'])."' AND activation_code = '".$app->db->quote($params['activation_code'])."' AND validation_status = 'review'");
      //file_put_contents('/tmp/test.txt', "SELECT * FROM client WHERE customer_no = '".$app->db->quote($params['customer_no'])."' AND email = '".$app->db->quote($params['email'])."' AND activation_code = '".$app->db->quote($params['activation_code'])."' AND validation_status = 'review'");
		
      if(is_array($client) && !empty($client)){
         $client_id = intval($client['client_id']);
			
         $app->functions->client_activate($client_id);
	
         return true;
      } else {
         $client = $app->db->queryOneRecord("SELECT * FROM client WHERE email = '".$app->db->quote($params['email'])."' AND validation_status = 'review'");
         if(is_array($client) && !empty($client)){
            $app->functions->client_activation_failed($client);
         }
         return false;
      }
   }

}

?>