Fixed: FS#2669 - ISPConig template generator creates date columns with wron...

Till Brehm

2014-02-15 8748b35d2cfcea7d37baeb8a8d893e974bc3ba6f

 install/lib/installer_base.lib.php

@@ -474,7 +474,15 @@
               $this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
            }

            $query = "GRANT SELECT, UPDATE ON ".$value['db'].".`aps_instances` TO '".$value['user']."'@'".$host."' ";
            $query = "GRANT SELECT, UPDATE, DELETE ON ".$value['db'].".`aps_instances` TO '".$value['user']."'@'".$host."' ";
            if ($verbose){
               echo $query ."\n";
            }
            if(!$this->dbmaster->query($query)) {
               $this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
            }
				
            $query = "GRANT SELECT, DELETE ON ".$value['db'].".`aps_instances_settings` TO '".$value['user']."'@'".$host."' ";
            if ($verbose){
               echo $query ."\n";
            }
@@ -1511,6 +1519,11 @@
         $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
         $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];
         $apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '')?'':'ServerName '.$conf['web']['apps_vhost_servername'];
			
         //* Get the apps vhost port
         if($this->is_update == true) {
            $conf['web']['apps_vhost_port'] = get_apps_vhost_port_number();
         }

         // Dont just copy over the virtualhost template but add some custom settings
         $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_apps.vhost.master', 'tpl/apache_apps.vhost.master');