Fix merge conflicts

1 files changed, 110 insertions, 104 deletions

diff --git a/lib/app.php b/lib/app.php
index 7863153d9b9..620732f6006 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -48,30 +48,27 @@ class OC_App{
 	 *
 	 * if $types is set, only apps of those types will be loaded
 	 */
-	public static function loadApps($types=null){
+	public static function loadApps($types=null) {
 		// Load the enabled apps here
 		$apps = self::getEnabledApps();
 		// prevent app.php from printing output
 		ob_start();
-		foreach( $apps as $app ){
-			if((is_null($types) or self::isType($app,$types)) && !in_array($app, self::$loadedApps)){
+		foreach( $apps as $app ) {
+			if((is_null($types) or self::isType($app, $types)) && !in_array($app, self::$loadedApps)) {
 				self::loadApp($app);
 				self::$loadedApps[] = $app;
 			}
 		}
 		ob_end_clean();
 
-		if (!defined('DEBUG') || !DEBUG){
-			if (is_null($types)) {
+		if (!defined('DEBUG') || !DEBUG) {
+			if (is_null($types)
+			    && empty(OC_Util::$core_scripts) 
+			    && empty(OC_Util::$core_styles)) {
 				OC_Util::$core_scripts = OC_Util::$scripts;
 				OC_Util::$scripts = array();
 				OC_Util::$core_styles = OC_Util::$styles;
 				OC_Util::$styles = array();
-
-				if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) {
-					OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
-					OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
-				}
 			}
 		}
 		// return
@@ -82,10 +79,10 @@ class OC_App{
 	 * load a single app
 	 * @param string app
 	 */
-	public static function loadApp($app){
-		if(is_file(self::getAppPath($app).'/appinfo/app.php')){
+	public static function loadApp($app) {
+		if(is_file(self::getAppPath($app).'/appinfo/app.php')) {
 			self::checkUpgrade($app);
-			require_once( $app.'/appinfo/app.php' );
+			require_once $app.'/appinfo/app.php';
 		}
 	}
 
@@ -94,13 +91,13 @@ class OC_App{
 	 * @param string $app
 	 * @param string/array $types
 	 */
-	public static function isType($app,$types){
-		if(is_string($types)){
+	public static function isType($app,$types) {
+		if(is_string($types)) {
 			$types=array($types);
 		}
 		$appTypes=self::getAppTypes($app);
-		foreach($types as $type){
-			if(array_search($type,$appTypes)!==false){
+		foreach($types as $type) {
+			if(array_search($type, $appTypes)!==false) {
 				return true;
 			}
 		}
@@ -112,14 +109,14 @@ class OC_App{
 	 * @param string $app
 	 * @return array
 	 */
-	private static function getAppTypes($app){
+	private static function getAppTypes($app) {
 		//load the cache
-		if(count(self::$appTypes)==0){
-			self::$appTypes=OC_Appconfig::getValues(false,'types');
+		if(count(self::$appTypes)==0) {
+			self::$appTypes=OC_Appconfig::getValues(false, 'types');
 		}
 
-		if(isset(self::$appTypes[$app])){
-			return explode(',',self::$appTypes[$app]);
+		if(isset(self::$appTypes[$app])) {
+			return explode(',', self::$appTypes[$app]);
 		}else{
 			return array();
 		}
@@ -128,16 +125,16 @@ class OC_App{
 	/**
 	 * read app types from info.xml and cache them in the database
 	 */
-	public static function setAppTypes($app){
+	public static function setAppTypes($app) {
 		$appData=self::getAppInfo($app);
 
-		if(isset($appData['types'])){
-			$appTypes=implode(',',$appData['types']);
+		if(isset($appData['types'])) {
+			$appTypes=implode(',', $appData['types']);
 		}else{
 			$appTypes='';
 		}
 
-		OC_Appconfig::setValue($app,'types',$appTypes);
+		OC_Appconfig::setValue($app, 'types', $appTypes);
 	}
 	
 	/**
@@ -157,14 +154,14 @@ class OC_App{
 	/**
 	 * get all enabled apps
 	 */
-	public static function getEnabledApps(){
+	public static function getEnabledApps() {
 		if(!OC_Config::getValue('installed', false))
 			return array();
 		$apps=array('files');
-		$query = OC_DB::prepare( 'SELECT appid FROM *PREFIX*appconfig WHERE configkey = \'enabled\' AND configvalue=\'yes\'' );
+		$query = OC_DB::prepare( 'SELECT `appid` FROM `*PREFIX*appconfig` WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'' );
 		$result=$query->execute();
-		while($row=$result->fetchRow()){
-			if(array_search($row['appid'],$apps)===false){
+		while($row=$result->fetchRow()) {
+			if(array_search($row['appid'], $apps)===false) {
 				$apps[]=$row['appid'];
 			}
 		}
@@ -178,8 +175,8 @@ class OC_App{
 	 *
 	 * This function checks whether or not an app is enabled.
 	 */
-	public static function isEnabled( $app ){
-		if( 'files'==$app or 'yes' == OC_Appconfig::getValue( $app, 'enabled' )){
+	public static function isEnabled( $app ) {
+		if( 'files'==$app or 'yes' == OC_Appconfig::getValue( $app, 'enabled' )) {
 			return true;
 		}
 
@@ -193,24 +190,24 @@ class OC_App{
 	 *
 	 * This function set an app as enabled in appconfig.
 	 */
-	public static function enable( $app ){
-		if(!OC_Installer::isInstalled($app)){
+	public static function enable( $app ) {
+		if(!OC_Installer::isInstalled($app)) {
 			// check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string
-			if(!is_numeric($app)){
-				OC_Installer::installShippedApp($app);
+			if(!is_numeric($app)) {
+				$app = OC_Installer::installShippedApp($app);
 			}else{
-				$download=OC_OCSClient::getApplicationDownload($app,1);
+				$download=OC_OCSClient::getApplicationDownload($app, 1);
 				if(isset($download['downloadlink']) and $download['downloadlink']!='') {
 					$app=OC_Installer::installApp(array('source'=>'http','href'=>$download['downloadlink']));
 				}
 			}
 		}
-		if($app!==false){
+		if($app!==false) {
 			// check if the app is compatible with this version of ownCloud
 			$info=OC_App::getAppInfo($app);
 			$version=OC_Util::getVersion();
-			if(!isset($info['require']) or ($version[0]>$info['require'])){
-				OC_Log::write('core','App "'.$info['name'].'" can\'t be installed because it is not compatible with this version of ownCloud',OC_Log::ERROR);
+			if(!isset($info['require']) or ($version[0]>$info['require'])) {
+				OC_Log::write('core', 'App "'.$info['name'].'" can\'t be installed because it is not compatible with this version of ownCloud', OC_Log::ERROR);
 				return false;
 			}else{
 				OC_Appconfig::setValue( $app, 'enabled', 'yes' );
@@ -219,6 +216,7 @@ class OC_App{
 		}else{
 			return false;
 		}
+		return $app;
 	}
 
 	/**
@@ -228,7 +226,7 @@ class OC_App{
 	 *
 	 * This function set an app as disabled in appconfig.
 	 */
-	public static function disable( $app ){
+	public static function disable( $app ) {
 		// check if app is a shiped app or not. if not delete
 		OC_Appconfig::setValue( $app, 'enabled', 'no' );
 	}
@@ -250,9 +248,9 @@ class OC_App{
 	 *   - order: integer, that influences the position of your application in
 	 *     the navigation. Lower values come first.
 	 */
-	public static function addNavigationEntry( $data ){
+	public static function addNavigationEntry( $data ) {
 		$data['active']=false;
-		if(!isset($data['icon'])){
+		if(!isset($data['icon'])) {
 			$data['icon']='';
 		}
 		OC_App::$navigation[] = $data;
@@ -268,7 +266,7 @@ class OC_App{
 	 * property from all other entries. The templates can use this for
 	 * highlighting the current position of the user.
 	 */
-	public static function setActiveNavigationEntry( $id ){
+	public static function setActiveNavigationEntry( $id ) {
 		self::$activeapp = $id;
 		return true;
 	}
@@ -280,7 +278,7 @@ class OC_App{
 	 * This function returns the id of the active navigation entry (set by
 	 * setActiveNavigationEntry
 	 */
-	public static function getActiveNavigationEntry(){
+	public static function getActiveNavigationEntry() {
 		return self::$activeapp;
 	}
 
@@ -291,15 +289,15 @@ class OC_App{
 	 * This function returns an array containing all settings pages added. The
 	 * entries are sorted by the key 'order' ascending.
 	 */
-	public static function getSettingsNavigation(){
-		$l=OC_L10N::get('core');
+	public static function getSettingsNavigation() {
+		$l=OC_L10N::get('lib');
 
 		$settings = array();
 		// by default, settings only contain the help menu
-		if(OC_Config::getValue('knowledgebaseenabled', true)==true){
+		if(OC_Config::getValue('knowledgebaseenabled', true)==true) {
 			$settings = array(
 				array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "help.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" ))
- 			);
+			);
 		}
 
 		// if the user is logged-in
@@ -312,26 +310,31 @@ class OC_App{
 				// settings menu
 				$settings[]=array( "id" => "settings", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "settings.php" ), "name" => $l->t("Settings"), "icon" => OC_Helper::imagePath( "settings", "settings.svg" ));
 
-			// if the user is an admin
-			if(OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
+			//SubAdmins are also allowed to access user management
+			if(OC_SubAdmin::isSubAdmin($_SESSION["user_id"]) || OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
 				// admin users menu
 				$settings[] = array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" ));
+			}
+
+
+			// if the user is an admin
+			if(OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
 				// admin apps menu
 				$settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php" ).'?installed', "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" ));
 
 				$settings[]=array( "id" => "admin", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "admin.php" ), "name" => $l->t("Admin"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
 			}
- 		}
+		}
 
 		$navigation = self::proceedNavigation($settings);
 		return $navigation;
 	}
 
 	/// This is private as well. It simply works, so don't ask for more details
-	private static function proceedNavigation( $list ){
-		foreach( $list as &$naventry ){
+	private static function proceedNavigation( $list ) {
+		foreach( $list as &$naventry ) {
 			$naventry['subnavigation'] = array();
-			if( $naventry['id'] == self::$activeapp ){
+			if( $naventry['id'] == self::$activeapp ) {
 				$naventry['active'] = true;
 			}
 			else{
@@ -339,7 +342,7 @@ class OC_App{
 			}
 		} unset( $naventry );
 
-		usort( $list, create_function( '$a, $b', 'if( $a["order"] == $b["order"] ){return 0;}elseif( $a["order"] < $b["order"] ){return -1;}else{return 1;}' ));
+		usort( $list, create_function( '$a, $b', 'if( $a["order"] == $b["order"] ) {return 0;}elseif( $a["order"] < $b["order"] ) {return -1;}else{return 1;}' ));
 
 		return $list;
 	}
@@ -357,7 +360,7 @@ class OC_App{
 				return $dir['path'];
 		}
 
-		OC_Log::write('core','No application directories are marked as writable.',OC_Log::ERROR);
+		OC_Log::write('core', 'No application directories are marked as writable.', OC_Log::ERROR);
 		return null;
 	}
 
@@ -396,14 +399,14 @@ class OC_App{
 	/**
 	 * get the last version of the app, either from appinfo/version or from appinfo/info.xml
 	 */
-	public static function getAppVersion($appid){
+	public static function getAppVersion($appid) {
 		$file= self::getAppPath($appid).'/appinfo/version';
 		$version=@file_get_contents($file);
-		if($version){
+		if($version) {
 			return trim($version);
 		}else{
 			$appData=self::getAppInfo($appid);
-			return $appData['version'];
+			return isset($appData['version'])? $appData['version'] : '';
 		}
 	}
 
@@ -413,38 +416,41 @@ class OC_App{
 	 * @param boolean path (optional)
 	 * @returns array
 	*/
-	public static function getAppInfo($appid,$path=false){
-		if($path){
+	public static function getAppInfo($appid,$path=false) {
+		if($path) {
 			$file=$appid;
 		}else{
-			if(isset(self::$appInfo[$appid])){
+			if(isset(self::$appInfo[$appid])) {
 				return self::$appInfo[$appid];
 			}
 			$file= self::getAppPath($appid).'/appinfo/info.xml';
 		}
 		$data=array();
 		$content=@file_get_contents($file);
-		if(!$content){
+		if(!$content) {
 			return;
 		}
 		$xml = new SimpleXMLElement($content);
 		$data['info']=array();
 		$data['remote']=array();
 		$data['public']=array();
-		foreach($xml->children() as $child){
-			if($child->getName()=='remote'){
-				foreach($child->children() as $remote){
+		foreach($xml->children() as $child) {
+			if($child->getName()=='remote') {
+				foreach($child->children() as $remote) {
 					$data['remote'][$remote->getName()]=(string)$remote;
 				}
-			}elseif($child->getName()=='public'){
-				foreach($child->children() as $public){
+			}elseif($child->getName()=='public') {
+				foreach($child->children() as $public) {
 					$data['public'][$public->getName()]=(string)$public;
 				}
-			}elseif($child->getName()=='types'){
+			}elseif($child->getName()=='types') {
 				$data['types']=array();
-				foreach($child->children() as $type){
+				foreach($child->children() as $type) {
 					$data['types'][]=$type->getName();
 				}
+			}elseif($child->getName()=='description') {
+				$xml=(string)$child->asXML();
+				$data[$child->getName()]=substr($xml, 13, -14);//script <description> tags
 			}else{
 				$data[$child->getName()]=(string)$child;
 			}
@@ -464,7 +470,7 @@ class OC_App{
 	 *   - children: array that is empty if the key 'active' is false or
 	 *     contains the subentries if the key 'active' is true
 	 */
-	public static function getNavigation(){
+	public static function getNavigation() {
 		$navigation = self::proceedNavigation( self::$navigation );
 		return $navigation;
 	}
@@ -473,12 +479,12 @@ class OC_App{
 	 * get the id of loaded app
 	 * @return string
 	 */
-	public static function getCurrentApp(){
-		$script=substr($_SERVER["SCRIPT_NAME"],strlen(OC::$WEBROOT)+1);
-		$topFolder=substr($script,0,strpos($script,'/'));
-		if($topFolder=='apps'){
+	public static function getCurrentApp() {
+		$script=substr($_SERVER["SCRIPT_NAME"], strlen(OC::$WEBROOT)+1);
+		$topFolder=substr($script, 0, strpos($script, '/'));
+		if($topFolder=='apps') {
 			$length=strlen($topFolder);
-			return substr($script,$length+1,strpos($script,'/',$length+1)-$length-1);
+			return substr($script, $length+1, strpos($script, '/', $length+1)-$length-1);
 		}else{
 			return $topFolder;
 		}
@@ -488,9 +494,9 @@ class OC_App{
 	/**
 	 * get the forms for either settings, admin or personal
 	 */
-	public static function getForms($type){
+	public static function getForms($type) {
 		$forms=array();
-		switch($type){
+		switch($type) {
 			case 'settings':
 				$source=self::$settingsForms;
 				break;
@@ -501,7 +507,7 @@ class OC_App{
 				$source=self::$personalForms;
 				break;
 		}
-		foreach($source as $form){
+		foreach($source as $form) {
 			$forms[]=include $form;
 		}
 		return $forms;
@@ -510,33 +516,33 @@ class OC_App{
 	/**
 	 * register a settings form to be shown
 	 */
-	public static function registerSettings($app,$page){
+	public static function registerSettings($app,$page) {
 		self::$settingsForms[]= $app.'/'.$page.'.php';
 	}
 
 	/**
 	 * register an admin form to be shown
 	 */
-	public static function registerAdmin($app,$page){
+	public static function registerAdmin($app,$page) {
 		self::$adminForms[]= $app.'/'.$page.'.php';
 	}
 
 	/**
 	 * register a personal form to be shown
 	 */
-	public static function registerPersonal($app,$page){
+	public static function registerPersonal($app,$page) {
 		self::$personalForms[]= $app.'/'.$page.'.php';
 	}
 
 	/**
 	 * get a list of all apps in the apps folder
 	 */
-	public static function getAllApps(){
+	public static function getAllApps() {
 		$apps=array();
 		foreach(OC::$APPSROOTS as $apps_dir) {
 			$dh=opendir($apps_dir['path']);
-			while($file=readdir($dh)){
-				if($file[0]!='.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')){
+			while($file=readdir($dh)) {
+				if($file[0]!='.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) {
 					$apps[]=$file;
 				}
 			}
@@ -557,7 +563,7 @@ class OC_App{
 		if ($currentVersion) {
 			$installedVersion = $versions[$app];
 			if (version_compare($currentVersion, $installedVersion, '>')) {
-				OC_Log::write($app, 'starting app upgrade from '.$installedVersion.' to '.$currentVersion,OC_Log::DEBUG);
+				OC_Log::write($app, 'starting app upgrade from '.$installedVersion.' to '.$currentVersion, OC_Log::DEBUG);
 				OC_App::updateApp($app);
 				OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app));
 			}
@@ -570,7 +576,7 @@ class OC_App{
 	 * This is important if you upgrade ownCloud and have non ported 3rd
 	 * party apps installed.
 	 */
-	public static function checkAppsRequirements($apps = array()){
+	public static function checkAppsRequirements($apps = array()) {
 		if (empty($apps)) {
 			$apps = OC_App::getEnabledApps();
 		}
@@ -578,8 +584,8 @@ class OC_App{
 		foreach($apps as $app) {
 			// check if the app is compatible with this version of ownCloud
 			$info = OC_App::getAppInfo($app);
-			if(!isset($info['require']) or ($version[0]>$info['require'])){
-				OC_Log::write('core','App "'.$info['name'].'" can\'t be used because it is not compatible with this version of ownCloud',OC_Log::ERROR);
+			if(!isset($info['require']) or ($version[0]>$info['require'])) {
+				OC_Log::write('core', 'App "'.$info['name'].'" ('.$app.') can\'t be used because it is not compatible with this version of ownCloud', OC_Log::ERROR);
 				OC_App::disable( $app );
 			}
 		}
@@ -588,15 +594,15 @@ class OC_App{
 	/**
 	 * get the installed version of all apps
 	 */
-	public static function getAppVersions(){
+	public static function getAppVersions() {
 		static $versions;
 		if (isset($versions)) {   // simple cache, needs to be fixed
 			return $versions; // when function is used besides in checkUpgrade
 		}
 		$versions=array();
-		$query = OC_DB::prepare( 'SELECT appid, configvalue FROM *PREFIX*appconfig WHERE configkey = \'installed_version\'' );
+		$query = OC_DB::prepare( 'SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig` WHERE `configkey` = \'installed_version\'' );
 		$result = $query->execute();
-		while($row = $result->fetchRow()){
+		while($row = $result->fetchRow()) {
 			$versions[$row['appid']]=$row['configvalue'];
 		}
 		return $versions;
@@ -606,24 +612,24 @@ class OC_App{
 	 * update the database for the app and call the update script
 	 * @param string appid
 	 */
-	public static function updateApp($appid){
-		if(file_exists(self::getAppPath($appid).'/appinfo/database.xml')){
+	public static function updateApp($appid) {
+		if(file_exists(self::getAppPath($appid).'/appinfo/database.xml')) {
 			OC_DB::updateDbFromStructure(self::getAppPath($appid).'/appinfo/database.xml');
 		}
-		if(!self::isEnabled($appid)){
+		if(!self::isEnabled($appid)) {
 			return;
 		}
-		if(file_exists(self::getAppPath($appid).'/appinfo/update.php')){
+		if(file_exists(self::getAppPath($appid).'/appinfo/update.php')) {
 			self::loadApp($appid);
 			include self::getAppPath($appid).'/appinfo/update.php';
 		}
 
 		//set remote/public handelers
 		$appData=self::getAppInfo($appid);
-		foreach($appData['remote'] as $name=>$path){
+		foreach($appData['remote'] as $name=>$path) {
 			OCP\CONFIG::setAppValue('core', 'remote_'.$name, $appid.'/'.$path);
 		}
-		foreach($appData['public'] as $name=>$path){
+		foreach($appData['public'] as $name=>$path) {
 			OCP\CONFIG::setAppValue('core', 'public_'.$name, $appid.'/'.$path);
 		}
 
@@ -634,20 +640,20 @@ class OC_App{
 	 * @param string appid
 	 * @return OC_FilesystemView
 	 */
-	public static function getStorage($appid){
-		if(OC_App::isEnabled($appid)){//sanity check
-			if(OC_User::isLoggedIn()){
+	public static function getStorage($appid) {
+		if(OC_App::isEnabled($appid)) {//sanity check
+			if(OC_User::isLoggedIn()) {
 				$view = new OC_FilesystemView('/'.OC_User::getUser());
 				if(!$view->file_exists($appid)) {
 					$view->mkdir($appid);
 				}
 				return new OC_FilesystemView('/'.OC_User::getUser().'/'.$appid);
 			}else{
-				OC_Log::write('core','Can\'t get app storage, app, user not logged in',OC_Log::ERROR);
+				OC_Log::write('core', 'Can\'t get app storage, app, user not logged in', OC_Log::ERROR);
 				return false;
 			}
 		}else{
-			OC_Log::write('core','Can\'t get app storage, app '.$appid.' not enabled',OC_Log::ERROR);
+			OC_Log::write('core', 'Can\'t get app storage, app '.$appid.' not enabled', OC_Log::ERROR);
 			false;
 		}
 	}