mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring

This commit is contained in:
Jakob Sack 2011-04-18 15:07:51 +02:00
parent b57823baa5 a977ba31ce
commit 6f07cf2651
4 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.php
View File

@ -21,6 +21,8 @@
* *
*/ */
$RUNTIME_NOAPPS=true;//no apps, yet
require_once( 'lib/base.php' ); require_once( 'lib/base.php' );
require_once( 'appconfig.php' ); require_once( 'appconfig.php' );
require_once( 'template.php' ); require_once( 'template.php' );
@ -48,6 +50,7 @@ if(count($errors)>0){
exit(); exit();
} }
}elseif(isset($_POST["user"])){ }elseif(isset($_POST["user"])){
OC_APP::loadApps();
if( OC_USER::login( $_POST["user"], $_POST["password"] )){ if( OC_USER::login( $_POST["user"], $_POST["password"] )){
header( "Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue( "core", "defaultpage", "files/index.php" )); header( "Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue( "core", "defaultpage", "files/index.php" ));
exit(); exit();
@ -55,6 +58,7 @@ if(count($errors)>0){
OC_TEMPLATE::printGuestPage( "", "login", array( "error" => true)); OC_TEMPLATE::printGuestPage( "", "login", array( "error" => true));
} }
}else{ }else{
OC_APP::loadApps();
OC_TEMPLATE::printGuestPage( "", "login", array( "error" => false )); OC_TEMPLATE::printGuestPage( "", "login", array( "error" => false ));
} }

16
lib/installer.php
View File

@ -97,6 +97,9 @@ class OC_INSTALLER{
OC_GROUP::createGroup('admin'); OC_GROUP::createGroup('admin');
OC_GROUP::addToGroup($username,'admin'); OC_GROUP::addToGroup($username,'admin');
//create htaccess files for apache hosts
self::createHtaccess();//TODO detect if apache is used
//and we are done //and we are done
OC_CONFIG::setValue('installed',true); OC_CONFIG::setValue('installed',true);
} }
@ -125,6 +128,19 @@ class OC_INSTALLER{
$query="CREATE USER '$name'@'%' IDENTIFIED BY '$password'"; $query="CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
$result = mysql_query($query,$connection); $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);
}
} }
?> ?>

7
plugins/publiclink/get.php
View File

@ -19,6 +19,13 @@ if($path!==false){
$subPath=''; $subPath='';
} }
$path.=$subPath; $path.=$subPath;
if(!OC_FILESYSTEM::file_exists($path)){
header("HTTP/1.0 404 Not Found");
$tmpl = new OC_TEMPLATE( '', '404', 'guest' );
$tmpl->assign('file',$subPath);
$tmpl->printPage();
exit;
}
if(OC_FILESYSTEM::is_dir($path)){ if(OC_FILESYSTEM::is_dir($path)){
$files = array(); $files = array();
$rootLength=strlen($root); $rootLength=strlen($root);

10
templates/404.php
View File

@ -1,3 +1,13 @@
<?php
if(!isset($_)){//also provide standalone error page
require_once '../lib/base.php';
require( 'template.php' );
$tmpl = new OC_TEMPLATE( '', '404', 'guest' );
$tmpl->printPage();
exit;
}
?>
<div id="login"> <div id="login">
<img src="<?php echo image_path("", "weather-clear.png"); ?>" alt="ownCloud" /> <img src="<?php echo image_path("", "weather-clear.png"); ?>" alt="ownCloud" />
<ul> <ul>