tbrehm
2012-10-15 49df59c9fb814834bfca91fc8efc0f2248b6a0e5
interface/lib/classes/aps_guicontroller.inc.php
@@ -199,8 +199,8 @@
    {
      global $app;
      
      include_once(ISPC_WEB_PATH.'/sites/tools.inc.php');
      $app->uses('tools_sites');
      $webserver_id = 0;
        $websrv = $this->db->queryOneRecord("SELECT * FROM web_domain WHERE domain = '".$this->db->quote($settings['main_domain'])."';");
        if(!empty($websrv)) $webserver_id = $websrv['server_id'];
@@ -210,7 +210,7 @@
      
      //* Get server config of the web server
      $this->app->uses("getconf");
      $web_config = $this->app->getconf->get_server_config(intval($websrv["server_id"]),'web');
      $web_config = $this->app->getconf->get_server_config($app->functions->intval($websrv["server_id"]),'web');
         
      //* Set mysql mode to php-fcgi and enable suexec in website on apache servers
      if($web_config['server_type'] == 'apache') {
@@ -231,15 +231,15 @@
         $tmp = array();
         $tmp['parent_domain_id'] = $websrv['domain_id'];
         $tmp['sys_groupid'] = $websrv['sys_groupid'];
         $dbname_prefix = replacePrefix($global_config['dbname_prefix'], $tmp);
         $dbuser_prefix = replacePrefix($global_config['dbuser_prefix'], $tmp);
         $dbname_prefix = $app->tools_sites->replacePrefix($global_config['dbname_prefix'], $tmp);
         $dbuser_prefix = $app->tools_sites->replacePrefix($global_config['dbuser_prefix'], $tmp);
         unset($tmp);
         
         //* get the default database server of the client
         $client = $app->db->queryOneRecord("SELECT default_dbserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ".$websrv['sys_groupid']);
         if(is_array($client) && $client['default_dbserver'] > 0 && $client['default_dbserver'] != $websrv['server_id']) {
            $mysql_db_server_id =  $client['default_dbserver'];
            $dbserver_config = $web_config = $app->getconf->get_server_config(intval($mysql_db_server_id),'server');
            $dbserver_config = $web_config = $app->getconf->get_server_config($app->functions->intval($mysql_db_server_id),'server');
            $mysql_db_host = $dbserver_config['ip_address'];
            $mysql_db_remote_access = 'y';
            $mysql_db_remote_ips = $dbserver_config['ip_address'];
@@ -317,10 +317,14 @@
        $this->db->datalogSave('aps', 'DELETE', 'id', $instanceid, array(), $datalog);
      */
      
      $sql = "SELECT web_database.database_id as database_id FROM aps_instances_settings, web_database WHERE aps_instances_settings.value = web_database.database_name AND aps_instances_settings.value =  aps_instances_settings.name = 'main_database_name' AND aps_instances_settings.instance_id = ".$instanceid." LIMIT 0,1";
      $sql = "SELECT web_database.database_id as database_id, web_database.database_user_id as `database_user_id` FROM aps_instances_settings, web_database WHERE aps_instances_settings.value = web_database.database_name AND aps_instances_settings.value =  aps_instances_settings.name = 'main_database_name' AND aps_instances_settings.instance_id = ".$instanceid." LIMIT 0,1";
      $tmp = $this->db->queryOneRecord($sql);
      if($tmp['database_id'] > 0) $this->db->datalogDelete('web_database', 'database_id', $tmp['database_id']);
      
        $database_user = $tmp['database_user_id'];
        $tmp = $this->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_database` WHERE `database_user_id` = '" . $app->functions->intval($database_user) . "' OR `database_ro_user_id` = '" . $app->functions->intval($database_user) . "'");
        if($tmp['cnt'] < 1) $this->db->datalogDelete('web_database_user', 'database_user_id', $database_user);
      $this->db->datalogUpdate('aps_instances', "instance_status = ".INSTANCE_REMOVE, 'id', $instanceid);
    }
    
@@ -445,6 +449,8 @@
     */
    public function validateInstallerInput($postinput, $pkg_details, $domains, $settings = array())
    {
        global $app;
        $ret = array();
        $input = array(); 
        $error = array();
@@ -562,12 +568,12 @@
            {
                if($setting['SettingType'] == 'string' || $setting['SettingType'] == 'password')
                {
                    if(intval($setting['SettingMinLength']) != 0
                    && strlen($postinput[$setting_id]) < intval($setting['SettingMinLength']))
                    if($app->functions->intval($setting['SettingMinLength'], true) != 0
                    && strlen($postinput[$setting_id]) < $app->functions->intval($setting['SettingMinLength'], true))
                        $temp_errstr = sprintf($this->app->lng('error_short_value_for'), $setting['setting_name']);
                        
                    if(intval($setting['SettingMaxLength']) != 0
                    && strlen($postinput[$setting_id]) > intval($setting['SettingMaxLength']))
                    if($app->functions->intval($setting['SettingMaxLength'], true) != 0
                    && strlen($postinput[$setting_id]) > $app->functions->intval($setting['SettingMaxLength'], true))
                        $temp_errstr = sprintf($this->app->lng('error_long_value_for'), $setting['setting_name']);
                    if(isset($setting['SettingRegex'])