[Alba-desarrollo] SVN Alba r5354 - prosistem/alba/trunk/alba/web/instalar

Mie Dic 26 21:14:04 CET 2007

Author: ftoledo
Date: 2007-12-26 17:14:04 -0300 (Wed, 26 Dec 2007)
New Revision: 5354

Modified:
   prosistem/alba/trunk/alba/web/instalar/funciones.php
   prosistem/alba/trunk/alba/web/instalar/paso1.php
Log:
comprobacion del directorio de informes y versiones de apache
las funciones de apacha solo estan disponibles si se usa el php com omodulo de apache
no asi en nla version cgi o suphp.




Modified: prosistem/alba/trunk/alba/web/instalar/funciones.php
===================================================================

--- prosistem/alba/trunk/alba/web/instalar/funciones.php	2007-12-26 19:12:06 UTC (rev 5353)
+++ prosistem/alba/trunk/alba/web/instalar/funciones.php	2007-12-26 20:14:04 UTC (rev 5354)
@@ -184,24 +184,31 @@
 }
 function check_apache2() {
     DebugLog("Comprobando version de apache");
-    $version = 0;
-    preg_match('!Apache/(.*) !U', apache_get_version(), $version);
-    return version_compare($version[1],'2.0.0','>=');
-
+    if (extension_loaded('apache')) {
+	$version = 0;
+	preg_match('!Apache/(.*) !U', apache_get_version(), $version);
+        return version_compare($version[1],'2.0.0','>=');
+    }
+    else
+        return 0;
 }
 function check_rewrite() {
     DebugLog("Comprobando mod_rewrite");
-    $modulos = apache_get_modules();
-    if(count($modulos)>0) {
-        $res = array_search('mod_rewrite', $modulos);
-        if($res === false) {
+    if (extension_loaded('apache')) {
+        $modulos = apache_get_modules();
+        if(count($modulos)>0) {
+            $res = array_search('mod_rewrite', $modulos);
+            if($res === false) {
+                return false;
+            } else {
+                return true;
+            }
+        } else {
             return false;
-        } else {
-            return true;
         }
-    } else {
+    }
+    else
         return false;
-    }
 }
 
 ?>
\ No newline at end of file

Modified: prosistem/alba/trunk/alba/web/instalar/paso1.php
===================================================================
--- prosistem/alba/trunk/alba/web/instalar/paso1.php	2007-12-26 19:12:06 UTC (rev 5353)
+++ prosistem/alba/trunk/alba/web/instalar/paso1.php	2007-12-26 20:14:04 UTC (rev 5354)
@@ -39,6 +39,7 @@
     'web' . DIRECTORY_SEPARATOR . 'tmp',
     'web' . DIRECTORY_SEPARATOR. 'uploads',
     'web' . DIRECTORY_SEPARATOR. 'uploads' .DIRECTORY_SEPARATOR. 'assets',
+    'web' . DIRECTORY_SEPARATOR. 'uploads' .DIRECTORY_SEPARATOR. 'informes',
 );
  
 $alba_path = AlbaPath();


