Changeset ,493

Timestamp:

11/04/08 12:38:28 (2 months ago)

Author:

fidojones

branch-nick:

bzr

Message:

algunas correciones y chequeos mas al crear subdominios

Files:

• trunk/panel/admin_panel/modulos/mod_apache/include_funciones.php (modified) (1 diff)

trunk/panel/admin_panel/modulos/mod_apache/include_funciones.php

@@ -205 +205 @@
                         $tpl->assign(SUBDOMINIO, $substrip);
                         $tpl->assign(DOMINIO, $domstrip);
-                        if($variables["APACHE_DOCUMENTROOT"]!=_CFG_APACHE_DESACTIVADO)
-                                $tpl->assign(APACHE_SUBDOCUMENTROOT, substr($variables["APACHE_DOCUMENTROOT"],0,-(strlen($carpetastrip))));
-                        else
+                        $ruta_minima=_CFG_APACHE_DOCUMENTROOT.$domstrip;
+                        if($variables["APACHE_DOCUMENTROOT"]!=_CFG_APACHE_DESACTIVADO && strpos($carpetastrip,$domstrip)===false){
+                                $openbasedir_path=substr($variables["APACHE_DOCUMENTROOT"],0,-(strlen($carpetastrip)));
+                                if(strpos($openbasedir_path,$ruta_minima)!==false){
+                                        $tpl->assign(APACHE_SUBDOCUMENTROOT, $openbasedir_path);
+                                }else{
+                                        $tpl->assign(APACHE_SUBDOCUMENTROOT, $ruta_minima);
+                                        $variables["CFG_DOCUMENTROOT"]=$ruta_minima;
+                                }
+                        }else{
                                 $tpl->assign(APACHE_SUBDOCUMENTROOT, $variables["APACHE_DOCUMENTROOT"]);
+                        }
                 }else{
                         $tpl->assign(DOMINIO, $dominio);