From: Robin Appelman <icewind1991@gmail.com>
Date: Sat, 16 Apr 2011 08:13:52 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.0~267^2~558^2~153^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e42dbbf7f3c98f55d00339e9ce2589890a6e55ba;p=nextcloud-server.git

merge
---

e42dbbf7f3c98f55d00339e9ce2589890a6e55ba
diff --cc docs/skeleton/admin.php
index 00000000000,f237e84d852..aaf6136692d
mode 000000,100644..100644
--- a/docs/skeleton/admin.php
+++ b/docs/skeleton/admin.php
@@@ -1,0 -1,56 +1,56 @@@
+ <?php
+ 
+ /**
+ * ownCloud - Sample application
+ *
+ * @author Jakob Sack
+ * @copyright 2011 Jakob Sack kde@jakobsack.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+ 
+ // Do not prepare the file system (for demonstration purpose)
+ // We HAVE TO set this var before including base.php
+ $RUNTIME_NOSETUPFS = true;
+ 
+ // Init owncloud
+ require_once('../lib/base.php');
+ 
+ // We need the file system although we said do not load it! Do it by hand now
+ OC_UTIL::setupFS();
+ 
+ // We load OC_TEMPLATE, too. This one is not loaded by base
 -oc_require( 'template.php' );
++require( 'template.php' );
+ 
+ // The user should have admin rights. This is an admin page!
+ if( !OC_USER::isLoggedIn() || !OC_USER::ingroup( $_SESSION['username'], 'admin' )){
+ 	// Bad boy! Go to the very first page of owncloud
+ 	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+ 	exit();
+ }
+ 
+ // Do some crazy Stuff over here
+ $myvar = 2;
+ $myarray = array( "foo" => array( 0, 1, 2 ), "bar" => "baz" );
+ 
+ // Preparing for output!
+ $tmpl = new OC_TEMPLATE( "skeleton", "admin", "admin" ); // Programname, template, mode
+ // Assign the vars
+ $tmpl->assign( "var", $myvar );
+ $tmpl->assign( "array", $myarray );
+ // Print page
+ $tmpl->printPage();
+ 
+ ?>
diff --cc docs/skeleton/index.php
index 00000000000,25a9f0297dc..6d237ed6152
mode 000000,100644..100644
--- a/docs/skeleton/index.php
+++ b/docs/skeleton/index.php
@@@ -1,0 -1,64 +1,64 @@@
+ <?php
+ 
+ /**
+ * ownCloud - ajax frontend
+ *
+ * @author Robin Appelman
+ * @copyright 2010 Robin Appelman icewind1991@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+ 
+ 
+ // Init owncloud
+ require_once('../lib/base.php');
 -oc_require( 'template.php' );
++require( 'template.php' );
+ 
+ // Check if we are a user
+ if( !OC_USER::isLoggedIn()){
+ 	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+ 	exit();
+ }
+ 
+ // Load the files we need
+ OC_UTIL::addStyle( "files", "files" );
+ OC_UTIL::addScript( "files", "files" );
+ 
+ // Load the files
+ $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+ 
+ $files = array();
+ foreach( OC_FILES::getdirectorycontent( $dir ) as $i ){
+ 	$i["date"] = date( $CONFIG_DATEFORMAT, $i["mtime"] );
+ 	$files[] = $i;
+ }
+ 
+ // Make breadcrumb
+ $breadcrumb = array();
+ $pathtohere = "/";
+ foreach( explode( "/", $dir ) as $i ){
+ 	if( $i != "" ){
+ 		$pathtohere .= "$i/";
+ 		$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
+ 	}
+ }
+ 
+ // return template
+ $tmpl = new OC_TEMPLATE( "files", "index", "user" );
+ $tmpl->assign( "files", $files );
+ $tmpl->assign( "breadcrumb", $breadcrumb );
+ $tmpl->printPage();
+ 
+ ?>
diff --cc lib/app.php
index ddbad4ee2ec,4a7c2b3a963..f9101ba4052
--- a/lib/app.php
+++ b/lib/app.php
@@@ -49,12 -49,17 +49,17 @@@ class OC_APP
  			return true;
  		}
  
- 		// Get all appinfo
- 		$dir = opendir( $SERVERROOT );
+ 		// Our very own core apps are hardcoded
+ 		foreach( array( "admin", "files", "log", "settings" ) as $app ){
+ 			oc_require( "$app/appinfo/app.php" );
+ 		}
+ 
+ 		// The rest comes here
+ 		$dir = opendir( "$SERVERROOT/apps" );
  		while( false !== ( $filename = readdir( $dir ))){
  			if( substr( $filename, 0, 1 ) != '.' ){
- 				if( file_exists( "$SERVERROOT/$filename/appinfo/app.php" )){
- 					require( "$filename/appinfo/app.php" );
+ 				if( file_exists( "$SERVERROOT/apps/$filename/appinfo/app.php" )){
 -					oc_require( "apps/$filename/appinfo/app.php" );
++					require( "apps/$filename/appinfo/app.php" );
  				}
  			}
  		}