diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-04-26 05:56:09 -0700 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-04-26 05:56:09 -0700 |
| commit | 948e3d5b7c6d6611ff5df6905f94a2adaddb80af (patch) | |
| tree | 763f391bca36c10c250bde94ed31c39017a97e3e /lib | |
| parent | 7e89a017bf2c41db0af13cf6070a5987c50612fa (diff) | |
| parent | b46f6e4f9792f652666fa8ccbb83eaa0dbb6a1ce (diff) | |
| download | nextcloud-server-948e3d5b7c6d6611ff5df6905f94a2adaddb80af.tar.gz nextcloud-server-948e3d5b7c6d6611ff5df6905f94a2adaddb80af.zip | |
Merge pull request #3028 from owncloud/simplyfy-resource-locating
Simplify resource locating in templatelayout
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/templatelayout.php | 59 |
1 files changed, 17 insertions, 42 deletions
diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 3c496f56e41..686a38a7386 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -64,25 +64,8 @@ class OC_TemplateLayout extends OC_Template { $root = $info[0]; $web = $info[1]; $file = $info[2]; - $paths = explode('/', $file); - $in_root = false; - foreach(OC::$APPSROOTS as $app_root) { - if($root == $app_root['path']) { - $in_root = true; - break; - } - } - - if($in_root ) { - $app = $paths[0]; - unset($paths[0]); - $path = implode('/', $paths); - $this->append( 'cssfiles', OC_Helper::linkTo($app, $path) . $versionParameter); - } - else { - $this->append( 'cssfiles', $web.'/'.$file); - } + $this->append( 'cssfiles', $web.'/'.$file . $versionParameter); } } @@ -123,20 +106,15 @@ class OC_TemplateLayout extends OC_Template { }elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) { }else{ - $append = false; - // or in apps? - foreach( OC::$APPSROOTS as $apps_dir) - { - if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style$fext.css")) { - $append = true; - break; - } - elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style.css")) { - $append = true; - break; - } + $app = substr($style, 0, strpos($style, '/')); + $style = substr($style, strpos($style, '/')+1); + $app_path = OC_App::getAppPath($app); + $app_url = OC::$WEBROOT . '/index.php/apps/' . $app; + if(self::appendIfExist($files, $app_path, $app_url, "$style$fext.css")) { } - if(! $append) { + elseif(self::appendIfExist($files, $app_path, $app_url, "$style.css")) { + } + else { echo('css file not found: style:'.$style.' formfactor:'.$fext .' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); die(); @@ -195,18 +173,15 @@ class OC_TemplateLayout extends OC_Template { }else{ // Is it part of an app? - $append = false; - foreach( OC::$APPSROOTS as $apps_dir) { - if(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script$fext.js")) { - $append = true; - break; - } - elseif(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script.js")) { - $append = true; - break; - } + $app = substr($script, 0, strpos($script, '/')); + $script = substr($script, strpos($script, '/')+1); + $app_path = OC_App::getAppPath($app); + $app_url = OC_App::getAppWebPath($app); + if(self::appendIfExist($files, $app_path, $app_url, "$script$fext.js")) { + } + elseif(self::appendIfExist($files, $app_path, $app_url, "$script.js")) { } - if(! $append) { + else { echo('js file not found: script:'.$script.' formfactor:'.$fext .' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); die(); |