nextcloud /
server
@@ -134,7 +134,7 @@ |
||
| 134 | 134 | } |
| 135 | 135 | if(is_dir($source.'/'.$file)) { |
| 136 | 136 | $this->addRecursive($path.'/'.$file, $source.'/'.$file); |
| 137 | - }else{ |
|
| 137 | + } else{ |
|
| 138 | 138 | $this->addFile($path.'/'.$file, $source.'/'.$file); |
| 139 | 139 | } |
| 140 | 140 | } |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | * @param string $source either a local file or string data |
| 50 | 50 | * @return bool |
| 51 | 51 | */ |
| 52 | - public abstract function addFile($path, $source=''); |
|
| 52 | + public abstract function addFile($path, $source = ''); |
|
| 53 | 53 | /** |
| 54 | 54 | * rename a file or folder in the archive |
| 55 | 55 | * @param string $source |
@@ -126,15 +126,15 @@ discard block |
||
| 126 | 126 | */ |
| 127 | 127 | public function addRecursive($path, $source) { |
| 128 | 128 | $dh = opendir($source); |
| 129 | - if(is_resource($dh)) { |
|
| 129 | + if (is_resource($dh)) { |
|
| 130 | 130 | $this->addFolder($path); |
| 131 | 131 | while (($file = readdir($dh)) !== false) { |
| 132 | - if($file === '.' || $file === '..') { |
|
| 132 | + if ($file === '.' || $file === '..') { |
|
| 133 | 133 | continue; |
| 134 | 134 | } |
| 135 | - if(is_dir($source.'/'.$file)) { |
|
| 135 | + if (is_dir($source.'/'.$file)) { |
|
| 136 | 136 | $this->addRecursive($path.'/'.$file, $source.'/'.$file); |
| 137 | - }else{ |
|
| 137 | + } else { |
|
| 138 | 138 | $this->addFile($path.'/'.$file, $source.'/'.$file); |
| 139 | 139 | } |
| 140 | 140 | } |
@@ -31,110 +31,110 @@ |
||
| 31 | 31 | namespace OC\Archive; |
| 32 | 32 | |
| 33 | 33 | abstract class Archive { |
| 34 | - /** |
|
| 35 | - * @param $source |
|
| 36 | - */ |
|
| 37 | - public abstract function __construct($source); |
|
| 38 | - /** |
|
| 39 | - * add an empty folder to the archive |
|
| 40 | - * @param string $path |
|
| 41 | - * @return bool |
|
| 42 | - */ |
|
| 43 | - public abstract function addFolder($path); |
|
| 44 | - /** |
|
| 45 | - * add a file to the archive |
|
| 46 | - * @param string $path |
|
| 47 | - * @param string $source either a local file or string data |
|
| 48 | - * @return bool |
|
| 49 | - */ |
|
| 50 | - public abstract function addFile($path, $source=''); |
|
| 51 | - /** |
|
| 52 | - * rename a file or folder in the archive |
|
| 53 | - * @param string $source |
|
| 54 | - * @param string $dest |
|
| 55 | - * @return bool |
|
| 56 | - */ |
|
| 57 | - public abstract function rename($source, $dest); |
|
| 58 | - /** |
|
| 59 | - * get the uncompressed size of a file in the archive |
|
| 60 | - * @param string $path |
|
| 61 | - * @return int |
|
| 62 | - */ |
|
| 63 | - public abstract function filesize($path); |
|
| 64 | - /** |
|
| 65 | - * get the last modified time of a file in the archive |
|
| 66 | - * @param string $path |
|
| 67 | - * @return int |
|
| 68 | - */ |
|
| 69 | - public abstract function mtime($path); |
|
| 70 | - /** |
|
| 71 | - * get the files in a folder |
|
| 72 | - * @param string $path |
|
| 73 | - * @return array |
|
| 74 | - */ |
|
| 75 | - public abstract function getFolder($path); |
|
| 76 | - /** |
|
| 77 | - * get all files in the archive |
|
| 78 | - * @return array |
|
| 79 | - */ |
|
| 80 | - public abstract function getFiles(); |
|
| 81 | - /** |
|
| 82 | - * get the content of a file |
|
| 83 | - * @param string $path |
|
| 84 | - * @return string |
|
| 85 | - */ |
|
| 86 | - public abstract function getFile($path); |
|
| 87 | - /** |
|
| 88 | - * extract a single file from the archive |
|
| 89 | - * @param string $path |
|
| 90 | - * @param string $dest |
|
| 91 | - * @return bool |
|
| 92 | - */ |
|
| 93 | - public abstract function extractFile($path, $dest); |
|
| 94 | - /** |
|
| 95 | - * extract the archive |
|
| 96 | - * @param string $dest |
|
| 97 | - * @return bool |
|
| 98 | - */ |
|
| 99 | - public abstract function extract($dest); |
|
| 100 | - /** |
|
| 101 | - * check if a file or folder exists in the archive |
|
| 102 | - * @param string $path |
|
| 103 | - * @return bool |
|
| 104 | - */ |
|
| 105 | - public abstract function fileExists($path); |
|
| 106 | - /** |
|
| 107 | - * remove a file or folder from the archive |
|
| 108 | - * @param string $path |
|
| 109 | - * @return bool |
|
| 110 | - */ |
|
| 111 | - public abstract function remove($path); |
|
| 112 | - /** |
|
| 113 | - * get a file handler |
|
| 114 | - * @param string $path |
|
| 115 | - * @param string $mode |
|
| 116 | - * @return resource |
|
| 117 | - */ |
|
| 118 | - public abstract function getStream($path, $mode); |
|
| 119 | - /** |
|
| 120 | - * add a folder and all its content |
|
| 121 | - * @param string $path |
|
| 122 | - * @param string $source |
|
| 123 | - */ |
|
| 124 | - public function addRecursive($path, $source) { |
|
| 125 | - $dh = opendir($source); |
|
| 126 | - if(is_resource($dh)) { |
|
| 127 | - $this->addFolder($path); |
|
| 128 | - while (($file = readdir($dh)) !== false) { |
|
| 129 | - if($file === '.' || $file === '..') { |
|
| 130 | - continue; |
|
| 131 | - } |
|
| 132 | - if(is_dir($source.'/'.$file)) { |
|
| 133 | - $this->addRecursive($path.'/'.$file, $source.'/'.$file); |
|
| 134 | - }else{ |
|
| 135 | - $this->addFile($path.'/'.$file, $source.'/'.$file); |
|
| 136 | - } |
|
| 137 | - } |
|
| 138 | - } |
|
| 139 | - } |
|
| 34 | + /** |
|
| 35 | + * @param $source |
|
| 36 | + */ |
|
| 37 | + public abstract function __construct($source); |
|
| 38 | + /** |
|
| 39 | + * add an empty folder to the archive |
|
| 40 | + * @param string $path |
|
| 41 | + * @return bool |
|
| 42 | + */ |
|
| 43 | + public abstract function addFolder($path); |
|
| 44 | + /** |
|
| 45 | + * add a file to the archive |
|
| 46 | + * @param string $path |
|
| 47 | + * @param string $source either a local file or string data |
|
| 48 | + * @return bool |
|
| 49 | + */ |
|
| 50 | + public abstract function addFile($path, $source=''); |
|
| 51 | + /** |
|
| 52 | + * rename a file or folder in the archive |
|
| 53 | + * @param string $source |
|
| 54 | + * @param string $dest |
|
| 55 | + * @return bool |
|
| 56 | + */ |
|
| 57 | + public abstract function rename($source, $dest); |
|
| 58 | + /** |
|
| 59 | + * get the uncompressed size of a file in the archive |
|
| 60 | + * @param string $path |
|
| 61 | + * @return int |
|
| 62 | + */ |
|
| 63 | + public abstract function filesize($path); |
|
| 64 | + /** |
|
| 65 | + * get the last modified time of a file in the archive |
|
| 66 | + * @param string $path |
|
| 67 | + * @return int |
|
| 68 | + */ |
|
| 69 | + public abstract function mtime($path); |
|
| 70 | + /** |
|
| 71 | + * get the files in a folder |
|
| 72 | + * @param string $path |
|
| 73 | + * @return array |
|
| 74 | + */ |
|
| 75 | + public abstract function getFolder($path); |
|
| 76 | + /** |
|
| 77 | + * get all files in the archive |
|
| 78 | + * @return array |
|
| 79 | + */ |
|
| 80 | + public abstract function getFiles(); |
|
| 81 | + /** |
|
| 82 | + * get the content of a file |
|
| 83 | + * @param string $path |
|
| 84 | + * @return string |
|
| 85 | + */ |
|
| 86 | + public abstract function getFile($path); |
|
| 87 | + /** |
|
| 88 | + * extract a single file from the archive |
|
| 89 | + * @param string $path |
|
| 90 | + * @param string $dest |
|
| 91 | + * @return bool |
|
| 92 | + */ |
|
| 93 | + public abstract function extractFile($path, $dest); |
|
| 94 | + /** |
|
| 95 | + * extract the archive |
|
| 96 | + * @param string $dest |
|
| 97 | + * @return bool |
|
| 98 | + */ |
|
| 99 | + public abstract function extract($dest); |
|
| 100 | + /** |
|
| 101 | + * check if a file or folder exists in the archive |
|
| 102 | + * @param string $path |
|
| 103 | + * @return bool |
|
| 104 | + */ |
|
| 105 | + public abstract function fileExists($path); |
|
| 106 | + /** |
|
| 107 | + * remove a file or folder from the archive |
|
| 108 | + * @param string $path |
|
| 109 | + * @return bool |
|
| 110 | + */ |
|
| 111 | + public abstract function remove($path); |
|
| 112 | + /** |
|
| 113 | + * get a file handler |
|
| 114 | + * @param string $path |
|
| 115 | + * @param string $mode |
|
| 116 | + * @return resource |
|
| 117 | + */ |
|
| 118 | + public abstract function getStream($path, $mode); |
|
| 119 | + /** |
|
| 120 | + * add a folder and all its content |
|
| 121 | + * @param string $path |
|
| 122 | + * @param string $source |
|
| 123 | + */ |
|
| 124 | + public function addRecursive($path, $source) { |
|
| 125 | + $dh = opendir($source); |
|
| 126 | + if(is_resource($dh)) { |
|
| 127 | + $this->addFolder($path); |
|
| 128 | + while (($file = readdir($dh)) !== false) { |
|
| 129 | + if($file === '.' || $file === '..') { |
|
| 130 | + continue; |
|
| 131 | + } |
|
| 132 | + if(is_dir($source.'/'.$file)) { |
|
| 133 | + $this->addRecursive($path.'/'.$file, $source.'/'.$file); |
|
| 134 | + }else{ |
|
| 135 | + $this->addFile($path.'/'.$file, $source.'/'.$file); |
|
| 136 | + } |
|
| 137 | + } |
|
| 138 | + } |
|
| 139 | + } |
|
| 140 | 140 | } |
@@ -25,14 +25,14 @@ |
||
| 25 | 25 | namespace OC; |
| 26 | 26 | |
| 27 | 27 | class NaturalSort_DefaultCollator { |
| 28 | - public function compare($a, $b) { |
|
| 29 | - $result = strcasecmp($a, $b); |
|
| 30 | - if ($result === 0) { |
|
| 31 | - if ($a === $b) { |
|
| 32 | - return 0; |
|
| 33 | - } |
|
| 34 | - return ($a > $b) ? -1 : 1; |
|
| 35 | - } |
|
| 36 | - return ($result < 0) ? -1 : 1; |
|
| 37 | - } |
|
| 28 | + public function compare($a, $b) { |
|
| 29 | + $result = strcasecmp($a, $b); |
|
| 30 | + if ($result === 0) { |
|
| 31 | + if ($a === $b) { |
|
| 32 | + return 0; |
|
| 33 | + } |
|
| 34 | + return ($a > $b) ? -1 : 1; |
|
| 35 | + } |
|
| 36 | + return ($result < 0) ? -1 : 1; |
|
| 37 | + } |
|
| 38 | 38 | } |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | parent::__construct( 'core', 'layout.user' ); |
| 62 | 62 | if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) { |
| 63 | 63 | $this->assign('bodyid', 'body-settings'); |
| 64 | - }else{ |
|
| 64 | + } else{ |
|
| 65 | 65 | $this->assign('bodyid', 'body-user'); |
| 66 | 66 | } |
| 67 | 67 | |
@@ -57,41 +57,41 @@ discard block |
||
| 57 | 57 | * @param string $renderAs |
| 58 | 58 | * @param string $appId application id |
| 59 | 59 | */ |
| 60 | - public function __construct( $renderAs, $appId = '' ) { |
|
| 60 | + public function __construct($renderAs, $appId = '') { |
|
| 61 | 61 | |
| 62 | 62 | // yes - should be injected .... |
| 63 | 63 | $this->config = \OC::$server->getConfig(); |
| 64 | 64 | |
| 65 | - if(\OCP\Util::isIE()) { |
|
| 65 | + if (\OCP\Util::isIE()) { |
|
| 66 | 66 | \OC_Util::addStyle('ie'); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | // Decide which page we show |
| 70 | - if($renderAs === 'user') { |
|
| 71 | - parent::__construct( 'core', 'layout.user' ); |
|
| 72 | - if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) { |
|
| 70 | + if ($renderAs === 'user') { |
|
| 71 | + parent::__construct('core', 'layout.user'); |
|
| 72 | + if (in_array(\OC_App::getCurrentApp(), ['settings', 'admin', 'help']) !== false) { |
|
| 73 | 73 | $this->assign('bodyid', 'body-settings'); |
| 74 | - }else{ |
|
| 74 | + } else { |
|
| 75 | 75 | $this->assign('bodyid', 'body-user'); |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | // Add navigation entry |
| 79 | - $this->assign( 'application', ''); |
|
| 80 | - $this->assign( 'appid', $appId ); |
|
| 79 | + $this->assign('application', ''); |
|
| 80 | + $this->assign('appid', $appId); |
|
| 81 | 81 | $navigation = \OC::$server->getNavigationManager()->getAll(); |
| 82 | - $this->assign( 'navigation', $navigation); |
|
| 82 | + $this->assign('navigation', $navigation); |
|
| 83 | 83 | $settingsNavigation = \OC::$server->getNavigationManager()->getAll('settings'); |
| 84 | - $this->assign( 'settingsnavigation', $settingsNavigation); |
|
| 85 | - foreach($navigation as $entry) { |
|
| 84 | + $this->assign('settingsnavigation', $settingsNavigation); |
|
| 85 | + foreach ($navigation as $entry) { |
|
| 86 | 86 | if ($entry['active']) { |
| 87 | - $this->assign( 'application', $entry['name'] ); |
|
| 87 | + $this->assign('application', $entry['name']); |
|
| 88 | 88 | break; |
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - foreach($settingsNavigation as $entry) { |
|
| 92 | + foreach ($settingsNavigation as $entry) { |
|
| 93 | 93 | if ($entry['active']) { |
| 94 | - $this->assign( 'application', $entry['name'] ); |
|
| 94 | + $this->assign('application', $entry['name']); |
|
| 95 | 95 | break; |
| 96 | 96 | } |
| 97 | 97 | } |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | $this->assign('user_uid', \OC_User::getUser()); |
| 131 | 131 | } else if ($renderAs === 'public') { |
| 132 | 132 | parent::__construct('core', 'layout.public'); |
| 133 | - $this->assign( 'appid', $appId ); |
|
| 133 | + $this->assign('appid', $appId); |
|
| 134 | 134 | $this->assign('bodyid', 'body-public'); |
| 135 | 135 | $this->assign('showSimpleSignUpLink', $this->config->getSystemValue('simpleSignUpLink.shown', true) !== false); |
| 136 | 136 | } else { |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $this->assign('language', $lang); |
| 147 | 147 | $this->assign('locale', $locale); |
| 148 | 148 | |
| 149 | - if(\OC::$server->getSystemConfig()->getValue('installed', false)) { |
|
| 149 | + if (\OC::$server->getSystemConfig()->getValue('installed', false)) { |
|
| 150 | 150 | if (empty(self::$versionHash)) { |
| 151 | 151 | $v = \OC_App::getAppVersions(); |
| 152 | 152 | $v['core'] = implode('.', \OCP\Util::getVersion()); |
@@ -178,10 +178,10 @@ discard block |
||
| 178 | 178 | $this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash])); |
| 179 | 179 | } |
| 180 | 180 | } |
| 181 | - foreach($jsFiles as $info) { |
|
| 181 | + foreach ($jsFiles as $info) { |
|
| 182 | 182 | $web = $info[1]; |
| 183 | 183 | $file = $info[2]; |
| 184 | - $this->append( 'jsfiles', $web.'/'.$file . $this->getVersionHashSuffix() ); |
|
| 184 | + $this->append('jsfiles', $web.'/'.$file.$this->getVersionHashSuffix()); |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | try { |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | |
| 193 | 193 | // Do not initialise scss appdata until we have a fully installed instance |
| 194 | 194 | // Do not load scss for update, errors, installation or login page |
| 195 | - if(\OC::$server->getSystemConfig()->getValue('installed', false) |
|
| 195 | + if (\OC::$server->getSystemConfig()->getValue('installed', false) |
|
| 196 | 196 | && !\OCP\Util::needUpgrade() |
| 197 | 197 | && $pathInfo !== '' |
| 198 | 198 | && !preg_match('/^\/login/', $pathInfo) |
@@ -209,19 +209,19 @@ discard block |
||
| 209 | 209 | $this->assign('cssfiles', array()); |
| 210 | 210 | $this->assign('printcssfiles', []); |
| 211 | 211 | $this->assign('versionHash', self::$versionHash); |
| 212 | - foreach($cssFiles as $info) { |
|
| 212 | + foreach ($cssFiles as $info) { |
|
| 213 | 213 | $web = $info[1]; |
| 214 | 214 | $file = $info[2]; |
| 215 | 215 | |
| 216 | 216 | if (substr($file, -strlen('print.css')) === 'print.css') { |
| 217 | - $this->append( 'printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix() ); |
|
| 217 | + $this->append('printcssfiles', $web.'/'.$file.$this->getVersionHashSuffix()); |
|
| 218 | 218 | } else { |
| 219 | 219 | $suffix = $this->getVersionHashSuffix($web, $file); |
| 220 | 220 | |
| 221 | 221 | if (strpos($file, '?v=') == false) { |
| 222 | - $this->append( 'cssfiles', $web.'/'.$file . $suffix); |
|
| 222 | + $this->append('cssfiles', $web.'/'.$file.$suffix); |
|
| 223 | 223 | } else { |
| 224 | - $this->append( 'cssfiles', $web.'/'.$file . '-' . substr($suffix, 3)); |
|
| 224 | + $this->append('cssfiles', $web.'/'.$file.'-'.substr($suffix, 3)); |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | } |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | |
| 248 | 248 | if ($this->config->getSystemValue('installed', false)) { |
| 249 | 249 | if (\OC::$server->getAppManager()->isInstalled('theming')) { |
| 250 | - $themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0'); |
|
| 250 | + $themingSuffix = '-'.$this->config->getAppValue('theming', 'cachebuster', '0'); |
|
| 251 | 251 | } |
| 252 | 252 | $v = \OC_App::getAppVersions(); |
| 253 | 253 | } |
@@ -255,21 +255,21 @@ discard block |
||
| 255 | 255 | // Try the webroot path for a match |
| 256 | 256 | if ($path !== false && $path !== '') { |
| 257 | 257 | $appName = $this->getAppNamefromPath($path); |
| 258 | - if(array_key_exists($appName, $v)) { |
|
| 258 | + if (array_key_exists($appName, $v)) { |
|
| 259 | 259 | $appVersion = $v[$appName]; |
| 260 | - return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix; |
|
| 260 | + return '?v='.substr(md5($appVersion), 0, 8).$themingSuffix; |
|
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | 263 | // fallback to the file path instead |
| 264 | 264 | if ($file !== false && $file !== '') { |
| 265 | 265 | $appName = $this->getAppNamefromPath($file); |
| 266 | - if(array_key_exists($appName, $v)) { |
|
| 266 | + if (array_key_exists($appName, $v)) { |
|
| 267 | 267 | $appVersion = $v[$appName]; |
| 268 | - return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix; |
|
| 268 | + return '?v='.substr(md5($appVersion), 0, 8).$themingSuffix; |
|
| 269 | 269 | } |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | - return '?v=' . self::$versionHash . $themingSuffix; |
|
| 272 | + return '?v='.self::$versionHash.$themingSuffix; |
|
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | /** |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | // Read the selected theme from the config file |
| 281 | 281 | $theme = \OC_Util::getTheme(); |
| 282 | 282 | |
| 283 | - if($compileScss) { |
|
| 283 | + if ($compileScss) { |
|
| 284 | 284 | $SCSSCacher = \OC::$server->query(SCSSCacher::class); |
| 285 | 285 | } else { |
| 286 | 286 | $SCSSCacher = null; |
@@ -289,8 +289,8 @@ discard block |
||
| 289 | 289 | $locator = new \OC\Template\CSSResourceLocator( |
| 290 | 290 | \OC::$server->getLogger(), |
| 291 | 291 | $theme, |
| 292 | - array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 293 | - array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 292 | + array(\OC::$SERVERROOT => \OC::$WEBROOT), |
|
| 293 | + array(\OC::$SERVERROOT => \OC::$WEBROOT), |
|
| 294 | 294 | $SCSSCacher |
| 295 | 295 | ); |
| 296 | 296 | $locator->find($styles); |
@@ -325,8 +325,8 @@ discard block |
||
| 325 | 325 | $locator = new \OC\Template\JSResourceLocator( |
| 326 | 326 | \OC::$server->getLogger(), |
| 327 | 327 | $theme, |
| 328 | - array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 329 | - array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 328 | + array(\OC::$SERVERROOT => \OC::$WEBROOT), |
|
| 329 | + array(\OC::$SERVERROOT => \OC::$WEBROOT), |
|
| 330 | 330 | \OC::$server->query(JSCombiner::class) |
| 331 | 331 | ); |
| 332 | 332 | $locator->find($scripts); |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | */ |
| 342 | 342 | public static function convertToRelativePath($filePath) { |
| 343 | 343 | $relativePath = explode(\OC::$SERVERROOT, $filePath); |
| 344 | - if(count($relativePath) !== 2) { |
|
| 344 | + if (count($relativePath) !== 2) { |
|
| 345 | 345 | throw new \Exception('$filePath is not under the \OC::$SERVERROOT'); |
| 346 | 346 | } |
| 347 | 347 | |
@@ -46,307 +46,307 @@ |
||
| 46 | 46 | |
| 47 | 47 | class TemplateLayout extends \OC_Template { |
| 48 | 48 | |
| 49 | - private static $versionHash = ''; |
|
| 50 | - |
|
| 51 | - /** |
|
| 52 | - * @var \OCP\IConfig |
|
| 53 | - */ |
|
| 54 | - private $config; |
|
| 55 | - |
|
| 56 | - /** |
|
| 57 | - * @param string $renderAs |
|
| 58 | - * @param string $appId application id |
|
| 59 | - */ |
|
| 60 | - public function __construct( $renderAs, $appId = '' ) { |
|
| 61 | - |
|
| 62 | - // yes - should be injected .... |
|
| 63 | - $this->config = \OC::$server->getConfig(); |
|
| 64 | - |
|
| 65 | - if(\OCP\Util::isIE()) { |
|
| 66 | - \OC_Util::addStyle('ie'); |
|
| 67 | - } |
|
| 68 | - |
|
| 69 | - // Decide which page we show |
|
| 70 | - if($renderAs === 'user') { |
|
| 71 | - parent::__construct( 'core', 'layout.user' ); |
|
| 72 | - if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) { |
|
| 73 | - $this->assign('bodyid', 'body-settings'); |
|
| 74 | - }else{ |
|
| 75 | - $this->assign('bodyid', 'body-user'); |
|
| 76 | - } |
|
| 77 | - |
|
| 78 | - // Add navigation entry |
|
| 79 | - $this->assign( 'application', ''); |
|
| 80 | - $this->assign( 'appid', $appId ); |
|
| 81 | - $navigation = \OC::$server->getNavigationManager()->getAll(); |
|
| 82 | - $this->assign( 'navigation', $navigation); |
|
| 83 | - $settingsNavigation = \OC::$server->getNavigationManager()->getAll('settings'); |
|
| 84 | - $this->assign( 'settingsnavigation', $settingsNavigation); |
|
| 85 | - foreach($navigation as $entry) { |
|
| 86 | - if ($entry['active']) { |
|
| 87 | - $this->assign( 'application', $entry['name'] ); |
|
| 88 | - break; |
|
| 89 | - } |
|
| 90 | - } |
|
| 91 | - |
|
| 92 | - foreach($settingsNavigation as $entry) { |
|
| 93 | - if ($entry['active']) { |
|
| 94 | - $this->assign( 'application', $entry['name'] ); |
|
| 95 | - break; |
|
| 96 | - } |
|
| 97 | - } |
|
| 98 | - $userDisplayName = \OC_User::getDisplayName(); |
|
| 99 | - $this->assign('user_displayname', $userDisplayName); |
|
| 100 | - $this->assign('user_uid', \OC_User::getUser()); |
|
| 101 | - |
|
| 102 | - if (\OC_User::getUser() === false) { |
|
| 103 | - $this->assign('userAvatarSet', false); |
|
| 104 | - } else { |
|
| 105 | - $this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists()); |
|
| 106 | - $this->assign('userAvatarVersion', $this->config->getUserValue(\OC_User::getUser(), 'avatar', 'version', 0)); |
|
| 107 | - } |
|
| 108 | - |
|
| 109 | - // check if app menu icons should be inverted |
|
| 110 | - try { |
|
| 111 | - /** @var \OCA\Theming\Util $util */ |
|
| 112 | - $util = \OC::$server->query(\OCA\Theming\Util::class); |
|
| 113 | - $this->assign('themingInvertMenu', $util->invertTextColor(\OC::$server->getThemingDefaults()->getColorPrimary())); |
|
| 114 | - } catch (\OCP\AppFramework\QueryException $e) { |
|
| 115 | - $this->assign('themingInvertMenu', false); |
|
| 116 | - } catch (\OCP\AutoloadNotAllowedException $e) { |
|
| 117 | - $this->assign('themingInvertMenu', false); |
|
| 118 | - } |
|
| 119 | - |
|
| 120 | - } else if ($renderAs === 'error') { |
|
| 121 | - parent::__construct('core', 'layout.guest', '', false); |
|
| 122 | - $this->assign('bodyid', 'body-login'); |
|
| 123 | - $this->assign('user_displayname', ''); |
|
| 124 | - $this->assign('user_uid', ''); |
|
| 125 | - } else if ($renderAs === 'guest') { |
|
| 126 | - parent::__construct('core', 'layout.guest'); |
|
| 127 | - \OC_Util::addStyle('guest'); |
|
| 128 | - $this->assign('bodyid', 'body-login'); |
|
| 129 | - |
|
| 130 | - $userDisplayName = \OC_User::getDisplayName(); |
|
| 131 | - $this->assign('user_displayname', $userDisplayName); |
|
| 132 | - $this->assign('user_uid', \OC_User::getUser()); |
|
| 133 | - } else if ($renderAs === 'public') { |
|
| 134 | - parent::__construct('core', 'layout.public'); |
|
| 135 | - $this->assign( 'appid', $appId ); |
|
| 136 | - $this->assign('bodyid', 'body-public'); |
|
| 137 | - $this->assign('showSimpleSignUpLink', $this->config->getSystemValue('simpleSignUpLink.shown', true) !== false); |
|
| 138 | - } else { |
|
| 139 | - parent::__construct('core', 'layout.base'); |
|
| 140 | - |
|
| 141 | - } |
|
| 142 | - // Send the language and the locale to our layouts |
|
| 143 | - $lang = \OC::$server->getL10NFactory()->findLanguage(); |
|
| 144 | - $locale = \OC::$server->getL10NFactory()->findLocale($lang); |
|
| 145 | - $localeLang = \OC::$server->getL10NFactory()->findLanguageFromLocale('lib', $locale); |
|
| 146 | - |
|
| 147 | - $lang = str_replace('_', '-', $lang); |
|
| 148 | - $this->assign('language', $lang); |
|
| 149 | - $this->assign('locale', $locale); |
|
| 150 | - |
|
| 151 | - if(\OC::$server->getSystemConfig()->getValue('installed', false)) { |
|
| 152 | - if (empty(self::$versionHash)) { |
|
| 153 | - $v = \OC_App::getAppVersions(); |
|
| 154 | - $v['core'] = implode('.', \OCP\Util::getVersion()); |
|
| 155 | - self::$versionHash = substr(md5(implode(',', $v)), 0, 8); |
|
| 156 | - } |
|
| 157 | - } else { |
|
| 158 | - self::$versionHash = md5('not installed'); |
|
| 159 | - } |
|
| 160 | - |
|
| 161 | - // Add the js files |
|
| 162 | - $jsFiles = self::findJavascriptFiles(\OC_Util::$scripts); |
|
| 163 | - $this->assign('jsfiles', array()); |
|
| 164 | - if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') { |
|
| 165 | - if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) { |
|
| 166 | - $jsConfigHelper = new JSConfigHelper( |
|
| 167 | - \OC::$server->getL10N('lib', $localeLang ?: $lang), |
|
| 168 | - \OC::$server->query(Defaults::class), |
|
| 169 | - \OC::$server->getAppManager(), |
|
| 170 | - \OC::$server->getSession(), |
|
| 171 | - \OC::$server->getUserSession()->getUser(), |
|
| 172 | - $this->config, |
|
| 173 | - \OC::$server->getGroupManager(), |
|
| 174 | - \OC::$server->getIniWrapper(), |
|
| 175 | - \OC::$server->getURLGenerator(), |
|
| 176 | - \OC::$server->getCapabilitiesManager() |
|
| 177 | - ); |
|
| 178 | - $this->assign('inline_ocjs', $jsConfigHelper->getConfig()); |
|
| 179 | - } else { |
|
| 180 | - $this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash])); |
|
| 181 | - } |
|
| 182 | - } |
|
| 183 | - foreach($jsFiles as $info) { |
|
| 184 | - $web = $info[1]; |
|
| 185 | - $file = $info[2]; |
|
| 186 | - $this->append( 'jsfiles', $web.'/'.$file . $this->getVersionHashSuffix() ); |
|
| 187 | - } |
|
| 188 | - |
|
| 189 | - try { |
|
| 190 | - $pathInfo = \OC::$server->getRequest()->getPathInfo(); |
|
| 191 | - } catch (\Exception $e) { |
|
| 192 | - $pathInfo = ''; |
|
| 193 | - } |
|
| 194 | - |
|
| 195 | - // Do not initialise scss appdata until we have a fully installed instance |
|
| 196 | - // Do not load scss for update, errors, installation or login page |
|
| 197 | - if(\OC::$server->getSystemConfig()->getValue('installed', false) |
|
| 198 | - && !\OCP\Util::needUpgrade() |
|
| 199 | - && $pathInfo !== '' |
|
| 200 | - && !preg_match('/^\/login/', $pathInfo) |
|
| 201 | - && $renderAs !== 'error' |
|
| 202 | - ) { |
|
| 203 | - $cssFiles = self::findStylesheetFiles(\OC_Util::$styles); |
|
| 204 | - } else { |
|
| 205 | - // If we ignore the scss compiler, |
|
| 206 | - // we need to load the guest css fallback |
|
| 207 | - \OC_Util::addStyle('guest'); |
|
| 208 | - $cssFiles = self::findStylesheetFiles(\OC_Util::$styles, false); |
|
| 209 | - } |
|
| 210 | - |
|
| 211 | - $this->assign('cssfiles', array()); |
|
| 212 | - $this->assign('printcssfiles', []); |
|
| 213 | - $this->assign('versionHash', self::$versionHash); |
|
| 214 | - foreach($cssFiles as $info) { |
|
| 215 | - $web = $info[1]; |
|
| 216 | - $file = $info[2]; |
|
| 217 | - |
|
| 218 | - if (substr($file, -strlen('print.css')) === 'print.css') { |
|
| 219 | - $this->append( 'printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix() ); |
|
| 220 | - } else { |
|
| 221 | - $suffix = $this->getVersionHashSuffix($web, $file); |
|
| 222 | - |
|
| 223 | - if (strpos($file, '?v=') == false) { |
|
| 224 | - $this->append( 'cssfiles', $web.'/'.$file . $suffix); |
|
| 225 | - } else { |
|
| 226 | - $this->append( 'cssfiles', $web.'/'.$file . '-' . substr($suffix, 3)); |
|
| 227 | - } |
|
| 228 | - |
|
| 229 | - } |
|
| 230 | - } |
|
| 231 | - |
|
| 232 | - /** @var InitialStateService $initialState */ |
|
| 233 | - $initialState = \OC::$server->query(InitialStateService::class); |
|
| 234 | - $this->assign('initialStates', $initialState->getInitialStates()); |
|
| 235 | - } |
|
| 236 | - |
|
| 237 | - /** |
|
| 238 | - * @param string $path |
|
| 239 | - * @param string $file |
|
| 240 | - * @return string |
|
| 241 | - */ |
|
| 242 | - protected function getVersionHashSuffix($path = false, $file = false) { |
|
| 243 | - if ($this->config->getSystemValue('debug', false)) { |
|
| 244 | - // allows chrome workspace mapping in debug mode |
|
| 245 | - return ""; |
|
| 246 | - } |
|
| 247 | - $themingSuffix = ''; |
|
| 248 | - $v = []; |
|
| 249 | - |
|
| 250 | - if ($this->config->getSystemValue('installed', false)) { |
|
| 251 | - if (\OC::$server->getAppManager()->isInstalled('theming')) { |
|
| 252 | - $themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0'); |
|
| 253 | - } |
|
| 254 | - $v = \OC_App::getAppVersions(); |
|
| 255 | - } |
|
| 256 | - |
|
| 257 | - // Try the webroot path for a match |
|
| 258 | - if ($path !== false && $path !== '') { |
|
| 259 | - $appName = $this->getAppNamefromPath($path); |
|
| 260 | - if(array_key_exists($appName, $v)) { |
|
| 261 | - $appVersion = $v[$appName]; |
|
| 262 | - return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix; |
|
| 263 | - } |
|
| 264 | - } |
|
| 265 | - // fallback to the file path instead |
|
| 266 | - if ($file !== false && $file !== '') { |
|
| 267 | - $appName = $this->getAppNamefromPath($file); |
|
| 268 | - if(array_key_exists($appName, $v)) { |
|
| 269 | - $appVersion = $v[$appName]; |
|
| 270 | - return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix; |
|
| 271 | - } |
|
| 272 | - } |
|
| 273 | - |
|
| 274 | - return '?v=' . self::$versionHash . $themingSuffix; |
|
| 275 | - } |
|
| 276 | - |
|
| 277 | - /** |
|
| 278 | - * @param array $styles |
|
| 279 | - * @return array |
|
| 280 | - */ |
|
| 281 | - static public function findStylesheetFiles($styles, $compileScss = true) { |
|
| 282 | - // Read the selected theme from the config file |
|
| 283 | - $theme = \OC_Util::getTheme(); |
|
| 284 | - |
|
| 285 | - if($compileScss) { |
|
| 286 | - $SCSSCacher = \OC::$server->query(SCSSCacher::class); |
|
| 287 | - } else { |
|
| 288 | - $SCSSCacher = null; |
|
| 289 | - } |
|
| 290 | - |
|
| 291 | - $locator = new \OC\Template\CSSResourceLocator( |
|
| 292 | - \OC::$server->getLogger(), |
|
| 293 | - $theme, |
|
| 294 | - array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 295 | - array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 296 | - $SCSSCacher |
|
| 297 | - ); |
|
| 298 | - $locator->find($styles); |
|
| 299 | - return $locator->getResources(); |
|
| 300 | - } |
|
| 301 | - |
|
| 302 | - /** |
|
| 303 | - * @param string $path |
|
| 304 | - * @return string|boolean |
|
| 305 | - */ |
|
| 306 | - public function getAppNamefromPath($path) { |
|
| 307 | - if ($path !== '' && is_string($path)) { |
|
| 308 | - $pathParts = explode('/', $path); |
|
| 309 | - if ($pathParts[0] === 'css') { |
|
| 310 | - // This is a scss request |
|
| 311 | - return $pathParts[1]; |
|
| 312 | - } |
|
| 313 | - return end($pathParts); |
|
| 314 | - } |
|
| 315 | - return false; |
|
| 316 | - |
|
| 317 | - } |
|
| 318 | - |
|
| 319 | - /** |
|
| 320 | - * @param array $scripts |
|
| 321 | - * @return array |
|
| 322 | - */ |
|
| 323 | - static public function findJavascriptFiles($scripts) { |
|
| 324 | - // Read the selected theme from the config file |
|
| 325 | - $theme = \OC_Util::getTheme(); |
|
| 326 | - |
|
| 327 | - $locator = new \OC\Template\JSResourceLocator( |
|
| 328 | - \OC::$server->getLogger(), |
|
| 329 | - $theme, |
|
| 330 | - array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 331 | - array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 332 | - \OC::$server->query(JSCombiner::class) |
|
| 333 | - ); |
|
| 334 | - $locator->find($scripts); |
|
| 335 | - return $locator->getResources(); |
|
| 336 | - } |
|
| 337 | - |
|
| 338 | - /** |
|
| 339 | - * Converts the absolute file path to a relative path from \OC::$SERVERROOT |
|
| 340 | - * @param string $filePath Absolute path |
|
| 341 | - * @return string Relative path |
|
| 342 | - * @throws \Exception If $filePath is not under \OC::$SERVERROOT |
|
| 343 | - */ |
|
| 344 | - public static function convertToRelativePath($filePath) { |
|
| 345 | - $relativePath = explode(\OC::$SERVERROOT, $filePath); |
|
| 346 | - if(count($relativePath) !== 2) { |
|
| 347 | - throw new \Exception('$filePath is not under the \OC::$SERVERROOT'); |
|
| 348 | - } |
|
| 349 | - |
|
| 350 | - return $relativePath[1]; |
|
| 351 | - } |
|
| 49 | + private static $versionHash = ''; |
|
| 50 | + |
|
| 51 | + /** |
|
| 52 | + * @var \OCP\IConfig |
|
| 53 | + */ |
|
| 54 | + private $config; |
|
| 55 | + |
|
| 56 | + /** |
|
| 57 | + * @param string $renderAs |
|
| 58 | + * @param string $appId application id |
|
| 59 | + */ |
|
| 60 | + public function __construct( $renderAs, $appId = '' ) { |
|
| 61 | + |
|
| 62 | + // yes - should be injected .... |
|
| 63 | + $this->config = \OC::$server->getConfig(); |
|
| 64 | + |
|
| 65 | + if(\OCP\Util::isIE()) { |
|
| 66 | + \OC_Util::addStyle('ie'); |
|
| 67 | + } |
|
| 68 | + |
|
| 69 | + // Decide which page we show |
|
| 70 | + if($renderAs === 'user') { |
|
| 71 | + parent::__construct( 'core', 'layout.user' ); |
|
| 72 | + if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) { |
|
| 73 | + $this->assign('bodyid', 'body-settings'); |
|
| 74 | + }else{ |
|
| 75 | + $this->assign('bodyid', 'body-user'); |
|
| 76 | + } |
|
| 77 | + |
|
| 78 | + // Add navigation entry |
|
| 79 | + $this->assign( 'application', ''); |
|
| 80 | + $this->assign( 'appid', $appId ); |
|
| 81 | + $navigation = \OC::$server->getNavigationManager()->getAll(); |
|
| 82 | + $this->assign( 'navigation', $navigation); |
|
| 83 | + $settingsNavigation = \OC::$server->getNavigationManager()->getAll('settings'); |
|
| 84 | + $this->assign( 'settingsnavigation', $settingsNavigation); |
|
| 85 | + foreach($navigation as $entry) { |
|
| 86 | + if ($entry['active']) { |
|
| 87 | + $this->assign( 'application', $entry['name'] ); |
|
| 88 | + break; |
|
| 89 | + } |
|
| 90 | + } |
|
| 91 | + |
|
| 92 | + foreach($settingsNavigation as $entry) { |
|
| 93 | + if ($entry['active']) { |
|
| 94 | + $this->assign( 'application', $entry['name'] ); |
|
| 95 | + break; |
|
| 96 | + } |
|
| 97 | + } |
|
| 98 | + $userDisplayName = \OC_User::getDisplayName(); |
|
| 99 | + $this->assign('user_displayname', $userDisplayName); |
|
| 100 | + $this->assign('user_uid', \OC_User::getUser()); |
|
| 101 | + |
|
| 102 | + if (\OC_User::getUser() === false) { |
|
| 103 | + $this->assign('userAvatarSet', false); |
|
| 104 | + } else { |
|
| 105 | + $this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists()); |
|
| 106 | + $this->assign('userAvatarVersion', $this->config->getUserValue(\OC_User::getUser(), 'avatar', 'version', 0)); |
|
| 107 | + } |
|
| 108 | + |
|
| 109 | + // check if app menu icons should be inverted |
|
| 110 | + try { |
|
| 111 | + /** @var \OCA\Theming\Util $util */ |
|
| 112 | + $util = \OC::$server->query(\OCA\Theming\Util::class); |
|
| 113 | + $this->assign('themingInvertMenu', $util->invertTextColor(\OC::$server->getThemingDefaults()->getColorPrimary())); |
|
| 114 | + } catch (\OCP\AppFramework\QueryException $e) { |
|
| 115 | + $this->assign('themingInvertMenu', false); |
|
| 116 | + } catch (\OCP\AutoloadNotAllowedException $e) { |
|
| 117 | + $this->assign('themingInvertMenu', false); |
|
| 118 | + } |
|
| 119 | + |
|
| 120 | + } else if ($renderAs === 'error') { |
|
| 121 | + parent::__construct('core', 'layout.guest', '', false); |
|
| 122 | + $this->assign('bodyid', 'body-login'); |
|
| 123 | + $this->assign('user_displayname', ''); |
|
| 124 | + $this->assign('user_uid', ''); |
|
| 125 | + } else if ($renderAs === 'guest') { |
|
| 126 | + parent::__construct('core', 'layout.guest'); |
|
| 127 | + \OC_Util::addStyle('guest'); |
|
| 128 | + $this->assign('bodyid', 'body-login'); |
|
| 129 | + |
|
| 130 | + $userDisplayName = \OC_User::getDisplayName(); |
|
| 131 | + $this->assign('user_displayname', $userDisplayName); |
|
| 132 | + $this->assign('user_uid', \OC_User::getUser()); |
|
| 133 | + } else if ($renderAs === 'public') { |
|
| 134 | + parent::__construct('core', 'layout.public'); |
|
| 135 | + $this->assign( 'appid', $appId ); |
|
| 136 | + $this->assign('bodyid', 'body-public'); |
|
| 137 | + $this->assign('showSimpleSignUpLink', $this->config->getSystemValue('simpleSignUpLink.shown', true) !== false); |
|
| 138 | + } else { |
|
| 139 | + parent::__construct('core', 'layout.base'); |
|
| 140 | + |
|
| 141 | + } |
|
| 142 | + // Send the language and the locale to our layouts |
|
| 143 | + $lang = \OC::$server->getL10NFactory()->findLanguage(); |
|
| 144 | + $locale = \OC::$server->getL10NFactory()->findLocale($lang); |
|
| 145 | + $localeLang = \OC::$server->getL10NFactory()->findLanguageFromLocale('lib', $locale); |
|
| 146 | + |
|
| 147 | + $lang = str_replace('_', '-', $lang); |
|
| 148 | + $this->assign('language', $lang); |
|
| 149 | + $this->assign('locale', $locale); |
|
| 150 | + |
|
| 151 | + if(\OC::$server->getSystemConfig()->getValue('installed', false)) { |
|
| 152 | + if (empty(self::$versionHash)) { |
|
| 153 | + $v = \OC_App::getAppVersions(); |
|
| 154 | + $v['core'] = implode('.', \OCP\Util::getVersion()); |
|
| 155 | + self::$versionHash = substr(md5(implode(',', $v)), 0, 8); |
|
| 156 | + } |
|
| 157 | + } else { |
|
| 158 | + self::$versionHash = md5('not installed'); |
|
| 159 | + } |
|
| 160 | + |
|
| 161 | + // Add the js files |
|
| 162 | + $jsFiles = self::findJavascriptFiles(\OC_Util::$scripts); |
|
| 163 | + $this->assign('jsfiles', array()); |
|
| 164 | + if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') { |
|
| 165 | + if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) { |
|
| 166 | + $jsConfigHelper = new JSConfigHelper( |
|
| 167 | + \OC::$server->getL10N('lib', $localeLang ?: $lang), |
|
| 168 | + \OC::$server->query(Defaults::class), |
|
| 169 | + \OC::$server->getAppManager(), |
|
| 170 | + \OC::$server->getSession(), |
|
| 171 | + \OC::$server->getUserSession()->getUser(), |
|
| 172 | + $this->config, |
|
| 173 | + \OC::$server->getGroupManager(), |
|
| 174 | + \OC::$server->getIniWrapper(), |
|
| 175 | + \OC::$server->getURLGenerator(), |
|
| 176 | + \OC::$server->getCapabilitiesManager() |
|
| 177 | + ); |
|
| 178 | + $this->assign('inline_ocjs', $jsConfigHelper->getConfig()); |
|
| 179 | + } else { |
|
| 180 | + $this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash])); |
|
| 181 | + } |
|
| 182 | + } |
|
| 183 | + foreach($jsFiles as $info) { |
|
| 184 | + $web = $info[1]; |
|
| 185 | + $file = $info[2]; |
|
| 186 | + $this->append( 'jsfiles', $web.'/'.$file . $this->getVersionHashSuffix() ); |
|
| 187 | + } |
|
| 188 | + |
|
| 189 | + try { |
|
| 190 | + $pathInfo = \OC::$server->getRequest()->getPathInfo(); |
|
| 191 | + } catch (\Exception $e) { |
|
| 192 | + $pathInfo = ''; |
|
| 193 | + } |
|
| 194 | + |
|
| 195 | + // Do not initialise scss appdata until we have a fully installed instance |
|
| 196 | + // Do not load scss for update, errors, installation or login page |
|
| 197 | + if(\OC::$server->getSystemConfig()->getValue('installed', false) |
|
| 198 | + && !\OCP\Util::needUpgrade() |
|
| 199 | + && $pathInfo !== '' |
|
| 200 | + && !preg_match('/^\/login/', $pathInfo) |
|
| 201 | + && $renderAs !== 'error' |
|
| 202 | + ) { |
|
| 203 | + $cssFiles = self::findStylesheetFiles(\OC_Util::$styles); |
|
| 204 | + } else { |
|
| 205 | + // If we ignore the scss compiler, |
|
| 206 | + // we need to load the guest css fallback |
|
| 207 | + \OC_Util::addStyle('guest'); |
|
| 208 | + $cssFiles = self::findStylesheetFiles(\OC_Util::$styles, false); |
|
| 209 | + } |
|
| 210 | + |
|
| 211 | + $this->assign('cssfiles', array()); |
|
| 212 | + $this->assign('printcssfiles', []); |
|
| 213 | + $this->assign('versionHash', self::$versionHash); |
|
| 214 | + foreach($cssFiles as $info) { |
|
| 215 | + $web = $info[1]; |
|
| 216 | + $file = $info[2]; |
|
| 217 | + |
|
| 218 | + if (substr($file, -strlen('print.css')) === 'print.css') { |
|
| 219 | + $this->append( 'printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix() ); |
|
| 220 | + } else { |
|
| 221 | + $suffix = $this->getVersionHashSuffix($web, $file); |
|
| 222 | + |
|
| 223 | + if (strpos($file, '?v=') == false) { |
|
| 224 | + $this->append( 'cssfiles', $web.'/'.$file . $suffix); |
|
| 225 | + } else { |
|
| 226 | + $this->append( 'cssfiles', $web.'/'.$file . '-' . substr($suffix, 3)); |
|
| 227 | + } |
|
| 228 | + |
|
| 229 | + } |
|
| 230 | + } |
|
| 231 | + |
|
| 232 | + /** @var InitialStateService $initialState */ |
|
| 233 | + $initialState = \OC::$server->query(InitialStateService::class); |
|
| 234 | + $this->assign('initialStates', $initialState->getInitialStates()); |
|
| 235 | + } |
|
| 236 | + |
|
| 237 | + /** |
|
| 238 | + * @param string $path |
|
| 239 | + * @param string $file |
|
| 240 | + * @return string |
|
| 241 | + */ |
|
| 242 | + protected function getVersionHashSuffix($path = false, $file = false) { |
|
| 243 | + if ($this->config->getSystemValue('debug', false)) { |
|
| 244 | + // allows chrome workspace mapping in debug mode |
|
| 245 | + return ""; |
|
| 246 | + } |
|
| 247 | + $themingSuffix = ''; |
|
| 248 | + $v = []; |
|
| 249 | + |
|
| 250 | + if ($this->config->getSystemValue('installed', false)) { |
|
| 251 | + if (\OC::$server->getAppManager()->isInstalled('theming')) { |
|
| 252 | + $themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0'); |
|
| 253 | + } |
|
| 254 | + $v = \OC_App::getAppVersions(); |
|
| 255 | + } |
|
| 256 | + |
|
| 257 | + // Try the webroot path for a match |
|
| 258 | + if ($path !== false && $path !== '') { |
|
| 259 | + $appName = $this->getAppNamefromPath($path); |
|
| 260 | + if(array_key_exists($appName, $v)) { |
|
| 261 | + $appVersion = $v[$appName]; |
|
| 262 | + return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix; |
|
| 263 | + } |
|
| 264 | + } |
|
| 265 | + // fallback to the file path instead |
|
| 266 | + if ($file !== false && $file !== '') { |
|
| 267 | + $appName = $this->getAppNamefromPath($file); |
|
| 268 | + if(array_key_exists($appName, $v)) { |
|
| 269 | + $appVersion = $v[$appName]; |
|
| 270 | + return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix; |
|
| 271 | + } |
|
| 272 | + } |
|
| 273 | + |
|
| 274 | + return '?v=' . self::$versionHash . $themingSuffix; |
|
| 275 | + } |
|
| 276 | + |
|
| 277 | + /** |
|
| 278 | + * @param array $styles |
|
| 279 | + * @return array |
|
| 280 | + */ |
|
| 281 | + static public function findStylesheetFiles($styles, $compileScss = true) { |
|
| 282 | + // Read the selected theme from the config file |
|
| 283 | + $theme = \OC_Util::getTheme(); |
|
| 284 | + |
|
| 285 | + if($compileScss) { |
|
| 286 | + $SCSSCacher = \OC::$server->query(SCSSCacher::class); |
|
| 287 | + } else { |
|
| 288 | + $SCSSCacher = null; |
|
| 289 | + } |
|
| 290 | + |
|
| 291 | + $locator = new \OC\Template\CSSResourceLocator( |
|
| 292 | + \OC::$server->getLogger(), |
|
| 293 | + $theme, |
|
| 294 | + array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 295 | + array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 296 | + $SCSSCacher |
|
| 297 | + ); |
|
| 298 | + $locator->find($styles); |
|
| 299 | + return $locator->getResources(); |
|
| 300 | + } |
|
| 301 | + |
|
| 302 | + /** |
|
| 303 | + * @param string $path |
|
| 304 | + * @return string|boolean |
|
| 305 | + */ |
|
| 306 | + public function getAppNamefromPath($path) { |
|
| 307 | + if ($path !== '' && is_string($path)) { |
|
| 308 | + $pathParts = explode('/', $path); |
|
| 309 | + if ($pathParts[0] === 'css') { |
|
| 310 | + // This is a scss request |
|
| 311 | + return $pathParts[1]; |
|
| 312 | + } |
|
| 313 | + return end($pathParts); |
|
| 314 | + } |
|
| 315 | + return false; |
|
| 316 | + |
|
| 317 | + } |
|
| 318 | + |
|
| 319 | + /** |
|
| 320 | + * @param array $scripts |
|
| 321 | + * @return array |
|
| 322 | + */ |
|
| 323 | + static public function findJavascriptFiles($scripts) { |
|
| 324 | + // Read the selected theme from the config file |
|
| 325 | + $theme = \OC_Util::getTheme(); |
|
| 326 | + |
|
| 327 | + $locator = new \OC\Template\JSResourceLocator( |
|
| 328 | + \OC::$server->getLogger(), |
|
| 329 | + $theme, |
|
| 330 | + array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 331 | + array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 332 | + \OC::$server->query(JSCombiner::class) |
|
| 333 | + ); |
|
| 334 | + $locator->find($scripts); |
|
| 335 | + return $locator->getResources(); |
|
| 336 | + } |
|
| 337 | + |
|
| 338 | + /** |
|
| 339 | + * Converts the absolute file path to a relative path from \OC::$SERVERROOT |
|
| 340 | + * @param string $filePath Absolute path |
|
| 341 | + * @return string Relative path |
|
| 342 | + * @throws \Exception If $filePath is not under \OC::$SERVERROOT |
|
| 343 | + */ |
|
| 344 | + public static function convertToRelativePath($filePath) { |
|
| 345 | + $relativePath = explode(\OC::$SERVERROOT, $filePath); |
|
| 346 | + if(count($relativePath) !== 2) { |
|
| 347 | + throw new \Exception('$filePath is not under the \OC::$SERVERROOT'); |
|
| 348 | + } |
|
| 349 | + |
|
| 350 | + return $relativePath[1]; |
|
| 351 | + } |
|
| 352 | 352 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | public function execute($jobList, ILogger $logger = null) { |
| 59 | 59 | // add an interval of 15 mins |
| 60 | - $this->setInterval(15*60); |
|
| 60 | + $this->setInterval(15 * 60); |
|
| 61 | 61 | |
| 62 | 62 | $this->jobList = $jobList; |
| 63 | 63 | $this->logger = $logger; |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | try { |
| 91 | 91 | $repair->addStep($step); |
| 92 | 92 | } catch (\Exception $ex) { |
| 93 | - $this->logger->logException($ex,[ |
|
| 93 | + $this->logger->logException($ex, [ |
|
| 94 | 94 | 'app' => 'migration' |
| 95 | 95 | ]); |
| 96 | 96 | |
@@ -38,82 +38,82 @@ |
||
| 38 | 38 | */ |
| 39 | 39 | class BackgroundRepair extends TimedJob { |
| 40 | 40 | |
| 41 | - /** @var IJobList */ |
|
| 42 | - private $jobList; |
|
| 41 | + /** @var IJobList */ |
|
| 42 | + private $jobList; |
|
| 43 | 43 | |
| 44 | - /** @var ILogger */ |
|
| 45 | - private $logger; |
|
| 44 | + /** @var ILogger */ |
|
| 45 | + private $logger; |
|
| 46 | 46 | |
| 47 | - /** @var EventDispatcherInterface */ |
|
| 48 | - private $dispatcher; |
|
| 47 | + /** @var EventDispatcherInterface */ |
|
| 48 | + private $dispatcher; |
|
| 49 | 49 | |
| 50 | - public function __construct(EventDispatcherInterface $dispatcher) { |
|
| 51 | - $this->dispatcher = $dispatcher; |
|
| 52 | - } |
|
| 50 | + public function __construct(EventDispatcherInterface $dispatcher) { |
|
| 51 | + $this->dispatcher = $dispatcher; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * run the job, then remove it from the job list |
|
| 56 | - * |
|
| 57 | - * @param JobList $jobList |
|
| 58 | - * @param ILogger|null $logger |
|
| 59 | - */ |
|
| 60 | - public function execute($jobList, ILogger $logger = null) { |
|
| 61 | - // add an interval of 15 mins |
|
| 62 | - $this->setInterval(15*60); |
|
| 54 | + /** |
|
| 55 | + * run the job, then remove it from the job list |
|
| 56 | + * |
|
| 57 | + * @param JobList $jobList |
|
| 58 | + * @param ILogger|null $logger |
|
| 59 | + */ |
|
| 60 | + public function execute($jobList, ILogger $logger = null) { |
|
| 61 | + // add an interval of 15 mins |
|
| 62 | + $this->setInterval(15*60); |
|
| 63 | 63 | |
| 64 | - $this->jobList = $jobList; |
|
| 65 | - $this->logger = $logger; |
|
| 66 | - parent::execute($jobList, $logger); |
|
| 67 | - } |
|
| 64 | + $this->jobList = $jobList; |
|
| 65 | + $this->logger = $logger; |
|
| 66 | + parent::execute($jobList, $logger); |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * @param array $argument |
|
| 71 | - * @throws \Exception |
|
| 72 | - * @throws \OC\NeedsUpdateException |
|
| 73 | - */ |
|
| 74 | - protected function run($argument) { |
|
| 75 | - if (!isset($argument['app']) || !isset($argument['step'])) { |
|
| 76 | - // remove the job - we can never execute it |
|
| 77 | - $this->jobList->remove($this, $this->argument); |
|
| 78 | - return; |
|
| 79 | - } |
|
| 80 | - $app = $argument['app']; |
|
| 69 | + /** |
|
| 70 | + * @param array $argument |
|
| 71 | + * @throws \Exception |
|
| 72 | + * @throws \OC\NeedsUpdateException |
|
| 73 | + */ |
|
| 74 | + protected function run($argument) { |
|
| 75 | + if (!isset($argument['app']) || !isset($argument['step'])) { |
|
| 76 | + // remove the job - we can never execute it |
|
| 77 | + $this->jobList->remove($this, $this->argument); |
|
| 78 | + return; |
|
| 79 | + } |
|
| 80 | + $app = $argument['app']; |
|
| 81 | 81 | |
| 82 | - try { |
|
| 83 | - $this->loadApp($app); |
|
| 84 | - } catch (NeedsUpdateException $ex) { |
|
| 85 | - // as long as the app is not yet done with it's offline migration |
|
| 86 | - // we better not start with the live migration |
|
| 87 | - return; |
|
| 88 | - } |
|
| 82 | + try { |
|
| 83 | + $this->loadApp($app); |
|
| 84 | + } catch (NeedsUpdateException $ex) { |
|
| 85 | + // as long as the app is not yet done with it's offline migration |
|
| 86 | + // we better not start with the live migration |
|
| 87 | + return; |
|
| 88 | + } |
|
| 89 | 89 | |
| 90 | - $step = $argument['step']; |
|
| 91 | - $repair = new Repair([], $this->dispatcher); |
|
| 92 | - try { |
|
| 93 | - $repair->addStep($step); |
|
| 94 | - } catch (\Exception $ex) { |
|
| 95 | - $this->logger->logException($ex,[ |
|
| 96 | - 'app' => 'migration' |
|
| 97 | - ]); |
|
| 90 | + $step = $argument['step']; |
|
| 91 | + $repair = new Repair([], $this->dispatcher); |
|
| 92 | + try { |
|
| 93 | + $repair->addStep($step); |
|
| 94 | + } catch (\Exception $ex) { |
|
| 95 | + $this->logger->logException($ex,[ |
|
| 96 | + 'app' => 'migration' |
|
| 97 | + ]); |
|
| 98 | 98 | |
| 99 | - // remove the job - we can never execute it |
|
| 100 | - $this->jobList->remove($this, $this->argument); |
|
| 101 | - return; |
|
| 102 | - } |
|
| 99 | + // remove the job - we can never execute it |
|
| 100 | + $this->jobList->remove($this, $this->argument); |
|
| 101 | + return; |
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - // execute the repair step |
|
| 105 | - $repair->run(); |
|
| 104 | + // execute the repair step |
|
| 105 | + $repair->run(); |
|
| 106 | 106 | |
| 107 | - // remove the job once executed successfully |
|
| 108 | - $this->jobList->remove($this, $this->argument); |
|
| 109 | - } |
|
| 107 | + // remove the job once executed successfully |
|
| 108 | + $this->jobList->remove($this, $this->argument); |
|
| 109 | + } |
|
| 110 | 110 | |
| 111 | - /** |
|
| 112 | - * @codeCoverageIgnore |
|
| 113 | - * @param $app |
|
| 114 | - * @throws NeedsUpdateException |
|
| 115 | - */ |
|
| 116 | - protected function loadApp($app) { |
|
| 117 | - OC_App::loadApp($app); |
|
| 118 | - } |
|
| 111 | + /** |
|
| 112 | + * @codeCoverageIgnore |
|
| 113 | + * @param $app |
|
| 114 | + * @throws NeedsUpdateException |
|
| 115 | + */ |
|
| 116 | + protected function loadApp($app) { |
|
| 117 | + OC_App::loadApp($app); |
|
| 118 | + } |
|
| 119 | 119 | } |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | if ($command instanceof ICommand) { |
| 56 | 56 | // ensure the command can be serialized |
| 57 | 57 | $serialized = serialize($command); |
| 58 | - if(strlen($serialized) > 4000) { |
|
| 58 | + if (strlen($serialized) > 4000) { |
|
| 59 | 59 | throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)'); |
| 60 | 60 | } |
| 61 | 61 | $unserialized = unserialize($serialized); |
@@ -26,48 +26,48 @@ |
||
| 26 | 26 | use OCP\Command\ICommand; |
| 27 | 27 | |
| 28 | 28 | class QueueBus implements IBus { |
| 29 | - /** |
|
| 30 | - * @var ICommand[]|callable[] |
|
| 31 | - */ |
|
| 32 | - private $queue = []; |
|
| 29 | + /** |
|
| 30 | + * @var ICommand[]|callable[] |
|
| 31 | + */ |
|
| 32 | + private $queue = []; |
|
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * Schedule a command to be fired |
|
| 36 | - * |
|
| 37 | - * @param \OCP\Command\ICommand | callable $command |
|
| 38 | - */ |
|
| 39 | - public function push($command) { |
|
| 40 | - $this->queue[] = $command; |
|
| 41 | - } |
|
| 34 | + /** |
|
| 35 | + * Schedule a command to be fired |
|
| 36 | + * |
|
| 37 | + * @param \OCP\Command\ICommand | callable $command |
|
| 38 | + */ |
|
| 39 | + public function push($command) { |
|
| 40 | + $this->queue[] = $command; |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * Require all commands using a trait to be run synchronous |
|
| 45 | - * |
|
| 46 | - * @param string $trait |
|
| 47 | - */ |
|
| 48 | - public function requireSync($trait) { |
|
| 49 | - } |
|
| 43 | + /** |
|
| 44 | + * Require all commands using a trait to be run synchronous |
|
| 45 | + * |
|
| 46 | + * @param string $trait |
|
| 47 | + */ |
|
| 48 | + public function requireSync($trait) { |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * @param \OCP\Command\ICommand | callable $command |
|
| 53 | - */ |
|
| 54 | - private function runCommand($command) { |
|
| 55 | - if ($command instanceof ICommand) { |
|
| 56 | - // ensure the command can be serialized |
|
| 57 | - $serialized = serialize($command); |
|
| 58 | - if(strlen($serialized) > 4000) { |
|
| 59 | - throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)'); |
|
| 60 | - } |
|
| 61 | - $unserialized = unserialize($serialized); |
|
| 62 | - $unserialized->handle(); |
|
| 63 | - } else { |
|
| 64 | - $command(); |
|
| 65 | - } |
|
| 66 | - } |
|
| 51 | + /** |
|
| 52 | + * @param \OCP\Command\ICommand | callable $command |
|
| 53 | + */ |
|
| 54 | + private function runCommand($command) { |
|
| 55 | + if ($command instanceof ICommand) { |
|
| 56 | + // ensure the command can be serialized |
|
| 57 | + $serialized = serialize($command); |
|
| 58 | + if(strlen($serialized) > 4000) { |
|
| 59 | + throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)'); |
|
| 60 | + } |
|
| 61 | + $unserialized = unserialize($serialized); |
|
| 62 | + $unserialized->handle(); |
|
| 63 | + } else { |
|
| 64 | + $command(); |
|
| 65 | + } |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - public function run() { |
|
| 69 | - while ($command = array_shift($this->queue)) { |
|
| 70 | - $this->runCommand($command); |
|
| 71 | - } |
|
| 72 | - } |
|
| 68 | + public function run() { |
|
| 69 | + while ($command = array_shift($this->queue)) { |
|
| 70 | + $this->runCommand($command); |
|
| 71 | + } |
|
| 72 | + } |
|
| 73 | 73 | } |
@@ -25,12 +25,12 @@ |
||
| 25 | 25 | use OC\BackgroundJob\QueuedJob; |
| 26 | 26 | |
| 27 | 27 | class CallableJob extends QueuedJob { |
| 28 | - protected function run($serializedCallable) { |
|
| 29 | - $callable = unserialize($serializedCallable); |
|
| 30 | - if (is_callable($callable)) { |
|
| 31 | - $callable(); |
|
| 32 | - } else { |
|
| 33 | - throw new \InvalidArgumentException('Invalid serialized callable'); |
|
| 34 | - } |
|
| 35 | - } |
|
| 28 | + protected function run($serializedCallable) { |
|
| 29 | + $callable = unserialize($serializedCallable); |
|
| 30 | + if (is_callable($callable)) { |
|
| 31 | + $callable(); |
|
| 32 | + } else { |
|
| 33 | + throw new \InvalidArgumentException('Invalid serialized callable'); |
|
| 34 | + } |
|
| 35 | + } |
|
| 36 | 36 | } |
@@ -26,13 +26,13 @@ |
||
| 26 | 26 | use SuperClosure\Serializer; |
| 27 | 27 | |
| 28 | 28 | class ClosureJob extends QueuedJob { |
| 29 | - protected function run($serializedCallable) { |
|
| 30 | - $serializer = new Serializer(); |
|
| 31 | - $callable = $serializer->unserialize($serializedCallable); |
|
| 32 | - if (is_callable($callable)) { |
|
| 33 | - $callable(); |
|
| 34 | - } else { |
|
| 35 | - throw new \InvalidArgumentException('Invalid serialized callable'); |
|
| 36 | - } |
|
| 37 | - } |
|
| 29 | + protected function run($serializedCallable) { |
|
| 30 | + $serializer = new Serializer(); |
|
| 31 | + $callable = $serializer->unserialize($serializedCallable); |
|
| 32 | + if (is_callable($callable)) { |
|
| 33 | + $callable(); |
|
| 34 | + } else { |
|
| 35 | + throw new \InvalidArgumentException('Invalid serialized callable'); |
|
| 36 | + } |
|
| 37 | + } |
|
| 38 | 38 | } |
@@ -25,12 +25,12 @@ |
||
| 25 | 25 | use OCP\IUser; |
| 26 | 26 | |
| 27 | 27 | trait FileAccess { |
| 28 | - protected function setupFS(IUser $user){ |
|
| 29 | - \OC_Util::setupFS($user->getUID()); |
|
| 30 | - } |
|
| 28 | + protected function setupFS(IUser $user){ |
|
| 29 | + \OC_Util::setupFS($user->getUID()); |
|
| 30 | + } |
|
| 31 | 31 | |
| 32 | - protected function getUserFolder(IUser $user) { |
|
| 33 | - $this->setupFS($user); |
|
| 34 | - return \OC::$server->getUserFolder($user->getUID()); |
|
| 35 | - } |
|
| 32 | + protected function getUserFolder(IUser $user) { |
|
| 33 | + $this->setupFS($user); |
|
| 34 | + return \OC::$server->getUserFolder($user->getUID()); |
|
| 35 | + } |
|
| 36 | 36 | } |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | use OCP\IUser; |
| 26 | 26 | |
| 27 | 27 | trait FileAccess { |
| 28 | - protected function setupFS(IUser $user){ |
|
| 28 | + protected function setupFS(IUser $user) { |
|
| 29 | 29 | \OC_Util::setupFS($user->getUID()); |
| 30 | 30 | } |
| 31 | 31 | |
@@ -29,12 +29,12 @@ |
||
| 29 | 29 | * Wrap a command in the background job interface |
| 30 | 30 | */ |
| 31 | 31 | class CommandJob extends QueuedJob { |
| 32 | - protected function run($serializedCommand) { |
|
| 33 | - $command = unserialize($serializedCommand); |
|
| 34 | - if ($command instanceof ICommand) { |
|
| 35 | - $command->handle(); |
|
| 36 | - } else { |
|
| 37 | - throw new \InvalidArgumentException('Invalid serialized command'); |
|
| 38 | - } |
|
| 39 | - } |
|
| 32 | + protected function run($serializedCommand) { |
|
| 33 | + $command = unserialize($serializedCommand); |
|
| 34 | + if ($command instanceof ICommand) { |
|
| 35 | + $command->handle(); |
|
| 36 | + } else { |
|
| 37 | + throw new \InvalidArgumentException('Invalid serialized command'); |
|
| 38 | + } |
|
| 39 | + } |
|
| 40 | 40 | } |
