Remove references to /apps/ and correct inclusion of settings

This commit is contained in:
Brice Maron 2012-06-22 22:05:39 +00:00
parent 33165e3915
commit d39d7fb9ff
5 changed files with 17 additions and 17 deletions

View File

@ -1,6 +1,6 @@
<?php
require_once('apps/files_versions/versions.php');
require_once('files_versions/versions.php');
OCP\App::registerAdmin('files_versions', 'settings');
OCP\App::registerPersonal('files_versions','settings-personal');

View File

@ -21,13 +21,13 @@
*
*/
OC::$CLASSPATH['OC_Gallery_Album'] = 'apps/gallery/lib/album.php';
OC::$CLASSPATH['OC_Gallery_Photo'] = 'apps/gallery/lib/photo.php';
OC::$CLASSPATH['OC_Gallery_Scanner'] = 'apps/gallery/lib/scanner.php';
OC::$CLASSPATH['OC_Gallery_Sharing'] = 'apps/gallery/lib/sharing.php';
OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'apps/gallery/lib/hooks_handlers.php';
OC::$CLASSPATH['Pictures_Managers'] = 'apps/gallery/lib/managers.php';
OC::$CLASSPATH['Pictures_Tiles'] = 'apps/gallery/lib/tiles.php';
OC::$CLASSPATH['OC_Gallery_Album'] = 'gallery/lib/album.php';
OC::$CLASSPATH['OC_Gallery_Photo'] = 'gallery/lib/photo.php';
OC::$CLASSPATH['OC_Gallery_Scanner'] = 'gallery/lib/scanner.php';
OC::$CLASSPATH['OC_Gallery_Sharing'] = 'gallery/lib/sharing.php';
OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'gallery/lib/hooks_handlers.php';
OC::$CLASSPATH['Pictures_Managers'] = 'gallery/lib/managers.php';
OC::$CLASSPATH['Pictures_Tiles'] = 'gallery/lib/tiles.php';
$l = OC_L10N::get('gallery');
@ -52,4 +52,4 @@ class OC_GallerySearchProvider extends OC_Search_Provider{
//OC_Search::registerProvider('OC_GallerySearchProvider');
require_once('apps/gallery/lib/hooks_handlers.php');
require_once('gallery/lib/hooks_handlers.php');

View File

@ -31,7 +31,7 @@ OCP\Util::addStyle('files', 'files');
OCP\Util::addStyle('gallery', 'styles');
OCP\Util::addScript('gallery', 'pictures');
include('apps/gallery/lib/tiles.php');
include('gallery/lib/tiles.php');
$root = !empty($_GET['root']) ? $_GET['root'] : '/';
$images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER::getUser().'/files'.$root);

View File

@ -22,9 +22,9 @@
$l=OC_L10N::get('media');
require_once('apps/media/lib_media.php');
require_once('apps/media/lib_collection.php');
require_once('apps/media/lib_scanner.php');
require_once('media/lib_media.php');
require_once('media/lib_collection.php');
require_once('media/lib_scanner.php');
OCP\Util::addscript('media','loader');
OCP\App::registerPersonal('media','settings');

View File

@ -492,21 +492,21 @@ class OC_App{
* register a settings form to be shown
*/
public static function registerSettings($app,$page){
self::$settingsForms[]='apps/'.$app.'/'.$page.'.php';
self::$settingsForms[]= $app.'/'.$page.'.php';
}
/**
* register an admin form to be shown
*/
public static function registerAdmin($app,$page){
self::$adminForms[]='apps/'.$app.'/'.$page.'.php';
self::$adminForms[]= $app.'/'.$page.'.php';
}
/**
* register a personal form to be shown
*/
public static function registerPersonal($app,$page){
self::$personalForms[]='apps/'.$app.'/'.$page.'.php';
self::$personalForms[]= $app.'/'.$page.'.php';
}
/**