mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change parameter 'web' to 'url' and take array of array in config instead of : separated values

This commit is contained in:
Brice Maron 2012-06-07 20:36:55 +00:00
parent 9f1c46b6f6
commit 9ec68c819b
5 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/app.php
View File

@ -342,7 +342,7 @@ class OC_App{
public static function getAppWebPath($appid) { public static function getAppWebPath($appid) {
foreach(OC::$APPSROOTS as $dir) { foreach(OC::$APPSROOTS as $dir) {
if(file_exists($dir['path'].'/'.$appid)) { if(file_exists($dir['path'].'/'.$appid)) {
return $dir['web'].'/'.$appid; return $dir['url'].'/'.$appid;
} }
} }
return false; return false;

21
lib/base.php
View File

@ -55,7 +55,7 @@ class OC{
*/ */
public static $THIRDPARTYWEBROOT = ''; public static $THIRDPARTYWEBROOT = '';
/** /**
* The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'real' and web path in 'web' * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and web path in 'url'
*/ */
public static $APPSROOTS = array(); public static $APPSROOTS = array();
/* /*
@ -161,22 +161,17 @@ class OC{
echo("3rdparty directory not found! Please put the ownCloud 3rdparty folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file."); echo("3rdparty directory not found! Please put the ownCloud 3rdparty folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
exit; exit;
} }
// search the apps folder // search the apps folder
if(OC_Config::getValue('appsroot', '')<>''){ $config_paths = OC_Config::getValue('apps_paths', array());
$real_a = explode(':',OC_Config::getValue('appsroot', '')); if(! empty($config_paths)){
$web_a = explode(':',OC_Config::getValue('appsurl', '')); foreach($config_paths as $paths) {
foreach($real_a as $k => $path) { if( isset($paths['url']) && isset($paths['path']))
if(!isset($web_a[$k])){ OC::$APPSROOTS[] = $paths;
echo("Apps root and appsurl not mathing. You need to have the same number of paths");
exit;
}
OC::$APPSROOTS[] = array('path'=> $path, 'web' => $web_a[$k]);
} }
}elseif(file_exists(OC::$SERVERROOT.'/apps')){ }elseif(file_exists(OC::$SERVERROOT.'/apps')){
OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'web' => OC::$WEBROOT.'/apps/'); OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => OC::$WEBROOT.'/apps/');
}elseif(file_exists(OC::$SERVERROOT.'/../apps')){ }elseif(file_exists(OC::$SERVERROOT.'/../apps')){
OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'web' => rtrim(dirname(OC::$WEBROOT), '/').'/apps/'); OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => rtrim(dirname(OC::$WEBROOT), '/').'/apps/');
OC::$APPSROOT=rtrim(dirname(OC::$SERVERROOT), '/'); OC::$APPSROOT=rtrim(dirname(OC::$SERVERROOT), '/');
} }

6
lib/minimizer/css.php
View File

@ -28,8 +28,8 @@ class OC_Minimizer_CSS extends OC_Minimizer
$append = false; $append = false;
foreach( OC::$APPSROOTS as $apps_dir) foreach( OC::$APPSROOTS as $apps_dir)
{ {
if($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$style$fext.css", true)) { $append =true; break; } if($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$style$fext.css", true)) { $append =true; break; }
elseif($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$style.css", true )) { $append =true; break; } elseif($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$style.css", true )) { $append =true; break; }
} }
if(! $append) { if(! $append) {
echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
@ -65,7 +65,7 @@ class OC_Minimizer_CSS extends OC_Minimizer
$in_root = false; $in_root = false;
foreach(OC::$APPSROOTS as $app_root) { foreach(OC::$APPSROOTS as $app_root) {
if(strpos($file, $app_root['path']) == 0) { if(strpos($file, $app_root['path']) == 0) {
$in_root = $app_root['web']; $in_root = $app_root['url'];
break; break;
} }
} }

4
lib/minimizer/js.php
View File

@ -42,8 +42,8 @@ class OC_Minimizer_JS extends OC_Minimizer
$append = false; $append = false;
foreach( OC::$APPSROOTS as $apps_dir) foreach( OC::$APPSROOTS as $apps_dir)
{ {
if($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$script$fext.js" , true)) { $append =true; break; } if($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$script$fext.js" , true)) { $append =true; break; }
elseif($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$script.js", true )) { $append =true; break; } elseif($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$script.js", true )) { $append =true; break; }
} }
if(! $append) { if(! $append) {
echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);

8
lib/template.php
View File

@ -426,8 +426,8 @@ class OC_Template{
$append = false; $append = false;
foreach( OC::$APPSROOTS as $apps_dir) foreach( OC::$APPSROOTS as $apps_dir)
{ {
if($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script$fext.js" , true)) { $append =true; break; } if($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['url'], "$script$fext.js" , true)) { $append =true; break; }
elseif($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script.js", true )) { $append =true; break; } elseif($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['url'], "$script.js", true )) { $append =true; break; }
} }
if(! $append) { if(! $append) {
echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
@ -454,8 +454,8 @@ class OC_Template{
$append = false; $append = false;
foreach( OC::$APPSROOTS as $apps_dir) foreach( OC::$APPSROOTS as $apps_dir)
{ {
if($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style$fext.css", true)) { $append =true; break; } if($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['url'], "$style$fext.css", true)) { $append =true; break; }
elseif($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style.css", true )) { $append =true; break; } elseif($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['url'], "$style.css", true )) { $append =true; break; }
} }
if(! $append) { if(! $append) {
echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);