diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-12-14 23:22:46 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-12-15 00:43:46 +0100 |
| commit | 85bd28c5081e7c2fea236c4528c23be283aa7350 (patch) | |
| tree | 8d79b78d14831057bf2db8c8be2e889460e93063 | |
| parent | f39454ed12018402f38a8f6bf99fc94d676a0a3a (diff) | |
| download | nextcloud-server-85bd28c5081e7c2fea236c4528c23be283aa7350.tar.gz nextcloud-server-85bd28c5081e7c2fea236c4528c23be283aa7350.zip | |
Fix some of "Closing brace must be on a line by itself"
| -rw-r--r-- | apps/files_versions/templates/history.php | 4 | ||||
| -rw-r--r-- | lib/files.php | 4 | ||||
| -rw-r--r-- | lib/templatelayout.php | 20 |
3 files changed, 22 insertions, 6 deletions
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php index 854d032da62..cc5a494f19e 100644 --- a/apps/files_versions/templates/history.php +++ b/apps/files_versions/templates/history.php @@ -23,7 +23,9 @@ if( isset( $_['message'] ) ) { echo ' '; echo OCP\Util::formatDate( doubleval($v['version']) ); echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />'; - if ( $v['cur'] ) { echo ' (<b>Current</b>)'; } + if ( $v['cur'] ) { + echo ' (<b>Current</b>)'; + } echo '<br /><br />'; } diff --git a/lib/files.php b/lib/files.php index b4a4145a493..152ed8f34a7 100644 --- a/lib/files.php +++ b/lib/files.php @@ -492,7 +492,9 @@ class OC_Files { if(is_writable(OC::$SERVERROOT.'/.htaccess')) { file_put_contents(OC::$SERVERROOT.'/.htaccess', $htaccess); return OC_Helper::computerFileSize($size); - } else { OC_Log::write('files', 'Can\'t write upload limit to '.OC::$SERVERROOT.'/.htaccess. Please check the file permissions', OC_Log::WARN); } + } else { + OC_Log::write('files', 'Can\'t write upload limit to '.OC::$SERVERROOT.'/.htaccess. Please check the file permissions', OC_Log::WARN); + } return false; } diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 87b5620932c..4173e008ba7 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -130,8 +130,14 @@ class OC_TemplateLayout extends OC_Template { // 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; } + 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; + } } if(! $append) { echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); @@ -192,8 +198,14 @@ class OC_TemplateLayout extends OC_Template { // 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; } + 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; + } } if(! $append) { echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); |