Fixed: FS#782 - issue with moving of web to other client

tbrehm

2009-07-21 4369754abd4bc1d451a60dba3c496135451cf35a

Fixed: FS#782 - issue with moving of web to other client

 interface/web/sites/web_domain_edit.php

@@ -346,10 +346,10 @@
            // Set the values for document_root, system_user and system_group
            $system_user = 'web'.$this->id;
            $system_group = 'client'.$client_id;
            //$document_root = str_replace("[client_id]",$client_id,$document_root);
            $document_root = str_replace("[client_id]",$client_id,$document_root);
        
            // $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root' WHERE domain_id = ".$this->id;
            $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group' WHERE domain_id = ".$this->id;
            $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root' WHERE domain_id = ".$this->id;
            //$sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group' WHERE domain_id = ".$this->id;
            $app->db->query($sql);
        }
        

 server/plugins-available/apache2_plugin.inc.php

@@ -261,7 +261,7 @@
                    // Remove trailing slash
                    if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
                    // create the symlinks, if not exist
                    if(!is_link($tmp_symlink)) {
                    if(is_link($tmp_symlink)) {
                        exec("rm -f ".escapeshellcmd($tmp_symlink));
                        $app->log("Removed Symlink: rm -f ".$tmp_symlink,LOGLEVEL_DEBUG);
                    }