From: Robin Appelman <icewind1991@gmail.com>
Date: Mon, 18 Apr 2011 12:05:21 +0000 (+0200)
Subject: create .htaccess files during installation for apache users
X-Git-Tag: v3.0~267^2~558^2~53^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a977ba31ce2dfa5b29151fd34166178a9ac1f6bd;p=nextcloud-server.git

create .htaccess files during installation for apache users
---

diff --git a/index.php b/index.php
index c582cbdaace..6815aa43dcc 100644
--- a/index.php
+++ b/index.php
@@ -21,6 +21,8 @@
 *
 */
 
+$RUNTIME_NOAPPS=true;//no apps, yet
+
 require_once( 'lib/base.php' );
 require_once( 'appconfig.php' );
 require_once( 'template.php' );
@@ -48,6 +50,7 @@ if(count($errors)>0){
 		exit();
 	}
 }elseif(isset($_POST["user"])){
+	OC_APP::loadApps();
 	if( OC_USER::login( $_POST["user"], $_POST["password"] )){
 		header( "Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue( "core", "defaultpage", "files/index.php" ));
 		exit();
@@ -55,6 +58,7 @@ if(count($errors)>0){
 		OC_TEMPLATE::printGuestPage( "", "login", array( "error" => true));
 	}
 }else{
+	OC_APP::loadApps();
 	OC_TEMPLATE::printGuestPage( "", "login", array( "error" => false ));
 }
 
diff --git a/lib/installer.php b/lib/installer.php
index 965642e8476..1222a22e71c 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -97,6 +97,9 @@ class OC_INSTALLER{
 				OC_GROUP::createGroup('admin');
 				OC_GROUP::addToGroup($username,'admin');
 				
+				//create htaccess files for apache hosts
+				self::createHtaccess();//TODO detect if apache is used
+				
 				//and we are done
 				OC_CONFIG::setValue('installed',true);
 			}
@@ -125,6 +128,19 @@ class OC_INSTALLER{
 		$query="CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
 		$result = mysql_query($query,$connection);
 	}
+	
+	/**
+	 * create .htaccess files for apache hosts
+	 */
+	private static function createHtaccess(){
+		global $SERVERROOT;
+		global $WEBROOT;
+		$content="ErrorDocument 404 /$WEBROOT/templates/404.php\n";
+		file_put_contents($SERVERROOT.'/.htaccess',$content);
+		
+		$content="deny from all";
+		file_put_contents(OC_CONFIG::getValue('datadirectory',$SERVERROOT.'/data').'/.htaccess',$content);
+	}
 }
 
 ?>
\ No newline at end of file