changes according to comments on merge-request

florian030

2014-02-25 5b3d2c2b17c9191a60017a8d08db06b8a9366b16

 server/lib/classes/aps_installer.inc.php

@@ -277,7 +277,8 @@
      if(substr($this->document_root, -1) != '/') $this->document_root .= '/';

      // Attention: ISPConfig Special: web files are in subfolder 'web' -> append it:
      if($domain_res['type'] == 'vhostsubdomain') $this->document_root .= $domain_res['web_folder'] . '/';
        if(($domain_res['type'] == 'vhostsubdomain') || ($domain_res['type'] == 'vhostalias'))
           $this->document_root .= $domain_res['web_folder'] . '/';
      else $this->document_root .= 'web/';

      // If a subfolder is given, make sure it's path doesn't begin with / i.e. /phpbb
@@ -739,6 +740,10 @@
      {
         $app->db->query('DELETE FROM aps_instances WHERE id = "'.$app->db->quote($task['instance_id']).'";');
         $app->db->query('DELETE FROM aps_instances_settings WHERE instance_id = "'.$app->db->quote($task['instance_id']).'";');
         if ($app->dbmaster != $app->db) {
            $app->dbmaster->query('DELETE FROM aps_instances WHERE id = "'.$app->db->quote($task['instance_id']).'";');
            $app->dbmaster->query('DELETE FROM aps_instances_settings WHERE instance_id = "'.$app->db->quote($task['instance_id']).'";');
         }
      }

      unset($sxe);