moved core stuff to /core

files/css/files.css

@@ -110,5 +110,5 @@ table td.filename a
 	width:16px;
 	display: -moz-inline-box; /* fallback for older firefox versions*/
 	display: inline-block;
-	background-image:url('../../img/drop-arrow.png');
+	background-image:url('../img/drop-arrow.png');
 }

lib/helper.php

@@ -44,6 +44,9 @@ class OC_HELPER {
 				return $WEBROOT . '/apps/' . $app . $file;
 			}
 		}
+		else{
+			$app = 'core';
+		}
 		return $WEBROOT . '/' . $app . $file;
 	}
 
@@ -58,14 +61,16 @@ class OC_HELPER {
 	public static function imagePath( $app, $image ){
 		global $SERVERROOT;
 		global $WEBROOT;
+		
 		// Check if the app is in the app folder
 		if( file_exists( "$SERVERROOT/apps/$app/img/$image" )){
 			return "$WEBROOT/apps/$app/img/$image";
 		}
-		if( !empty( $app )){
+		elseif( !empty( $app )){
 			return "$WEBROOT/$app/img/$image";
-		}else{
+		}
-			return "$WEBROOT/img/$image";
+		else{
+			return "$WEBROOT/core/img/$image";
 		}
 	}
 
@@ -84,15 +89,15 @@ class OC_HELPER {
 
 		// Is it a dir?
 		if( $mimetype == "dir" ){
-			return "$WEBROOT/img/places/folder.png";
+			return "$WEBROOT/core/img/places/folder.png";
 		}
 
 		// Icon exists?
-		if( file_exists( "$SERVERROOT/img/mimetypes/$mimetype.png" )){
+		if( file_exists( "$SERVERROOT/core/img/mimetypes/$mimetype.png" )){
-			return "$WEBROOT/img/mimetypes/$mimetype.png";
+			return "$WEBROOT/core/img/mimetypes/$mimetype.png";
 		}
 		else{
-			return "$WEBROOT/img/mimetypes/file.png";
+			return "$WEBROOT/core/img/mimetypes/file.png";
 		}
 	}
 

lib/template.php

@@ -95,8 +95,8 @@ class OC_TEMPLATE{
 		global $SERVERROOT;
 
 		// Get the right template folder
-		$template = "$SERVERROOT/templates/";
+		$template = "$SERVERROOT/core/templates/";
-		if( $app != "core" && $app != "" ){
+		if( $app != "" ){
 			// Check if the app is in the app folder
 			if( file_exists( "$SERVERROOT/apps/$app/templates/" )){
 				$template = "$SERVERROOT/apps/$app/templates/";
@@ -222,16 +222,24 @@ class OC_TEMPLATE{
 			foreach(OC_UTIL::$scripts as $script){
 				if(is_file("$SERVERROOT/apps/$script.js" )){
 					$page->append( "jsfiles", "$WEBROOT/apps/$script.js" );
-				}else{
+				}
+				elseif(is_file("$SERVERROOT/$script.js" )){
 					$page->append( "jsfiles", "$WEBROOT/$script.js" );
 				}
+				else{
+					$page->append( "jsfiles", "$WEBROOT/core/$script.js" );
+				}
 			}
 			foreach(OC_UTIL::$styles as $style){
 				if(is_file("$SERVERROOT/apps/$style.css" )){
 					$page->append( "cssfiles", "$WEBROOT/apps/$style.css" );
-				}else{
+				}
+				elseif(is_file("$SERVERROOT/$style.css" )){
 					$page->append( "cssfiles", "$WEBROOT/$style.css" );
 				}
+				else{
+					$page->append( "cssfiles", "$WEBROOT/core/$style.css" );
+				}
 			}
 
 			// Add css files and js files