mcramer
2013-02-25 3fc28c0142bf8ab4e2cfae44931e2a51aadc4d51
interface/lib/classes/aps_guicontroller.inc.php
@@ -220,12 +220,18 @@
      $app->uses("getconf");
      $web_config = $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
      //* Set PHP mode to php-fcgi and enable suexec in website on apache servers / set PHP mode to PHP-FPM on nginx servers
      if($web_config['server_type'] == 'apache') {
         if($websrv['php'] != 'fast-cgi' || $websrv['suexec'] != 'y') {
         if(($websrv['php'] != 'fast-cgi' || $websrv['suexec'] != 'y') && $websrv['php'] != 'php-fpm') {
            $app->db->datalogUpdate('web_domain', "php = 'fast-cgi', suexec = 'y'", 'domain_id', $websrv['domain_id']);
         }
      } else {
         // nginx
         if($websrv['php'] != 'php-fpm' && $websrv['php'] != 'fast-cgi') {
            $app->db->datalogUpdate('web_domain', "php = 'php-fpm'", 'domain_id', $websrv['domain_id']);
         }
      }
      
      //* Create the MySQL database for the application
      $pkg = $app->db->queryOneRecord('SELECT * FROM aps_packages WHERE id = '.$app->db->quote($packageid).';');
@@ -542,7 +548,7 @@
                    // is not empty for further validation
                    if(!empty($doc_root))
                    {
                        $used_path = $docroot['document_root'];
                        $used_path = $doc_root['document_root'];
                        if(substr($used_path, -1) != '/') $used_path .= '/';
                        
                        $location_for_domain = $app->db->queryOneRecord("SELECT value 
@@ -550,7 +556,7 @@
                            AND instance_id = '".$app->db->quote($instance_domains[$i]['instance_id'])."';");
                        
                        // The location might be empty but the DB return must not be false!
                        if($location_for_domain) $used_path .= $location_for_domain['value'];
                        if($location_for_domain) $used_path .= $location_for_domain['value'];
                        if($new_path == $used_path)
                        {