@@ -30,23 +30,23 @@ |
||
30 | 30 | * error code for functions not provided by the group backend |
31 | 31 | * @deprecated Use \OC_Group_Backend::NOT_IMPLEMENTED instead |
32 | 32 | */ |
33 | -define('OC_GROUP_BACKEND_NOT_IMPLEMENTED', -501); |
|
33 | +define('OC_GROUP_BACKEND_NOT_IMPLEMENTED', -501); |
|
34 | 34 | |
35 | 35 | /** |
36 | 36 | * actions that user backends can define |
37 | 37 | */ |
38 | 38 | /** @deprecated Use \OC_Group_Backend::CREATE_GROUP instead */ |
39 | -define('OC_GROUP_BACKEND_CREATE_GROUP', 0x00000001); |
|
39 | +define('OC_GROUP_BACKEND_CREATE_GROUP', 0x00000001); |
|
40 | 40 | /** @deprecated Use \OC_Group_Backend::DELETE_GROUP instead */ |
41 | -define('OC_GROUP_BACKEND_DELETE_GROUP', 0x00000010); |
|
41 | +define('OC_GROUP_BACKEND_DELETE_GROUP', 0x00000010); |
|
42 | 42 | /** @deprecated Use \OC_Group_Backend::ADD_TO_GROUP instead */ |
43 | -define('OC_GROUP_BACKEND_ADD_TO_GROUP', 0x00000100); |
|
43 | +define('OC_GROUP_BACKEND_ADD_TO_GROUP', 0x00000100); |
|
44 | 44 | /** @deprecated Use \OC_Group_Backend::REMOVE_FROM_GOUP instead */ |
45 | -define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP', 0x00001000); |
|
45 | +define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP', 0x00001000); |
|
46 | 46 | /** @deprecated Obsolete */ |
47 | -define('OC_GROUP_BACKEND_GET_DISPLAYNAME', 0x00010000); //OBSOLETE |
|
47 | +define('OC_GROUP_BACKEND_GET_DISPLAYNAME', 0x00010000); //OBSOLETE |
|
48 | 48 | /** @deprecated Use \OC_Group_Backend::COUNT_USERS instead */ |
49 | -define('OC_GROUP_BACKEND_COUNT_USERS', 0x00100000); |
|
49 | +define('OC_GROUP_BACKEND_COUNT_USERS', 0x00100000); |
|
50 | 50 | |
51 | 51 | /** |
52 | 52 | * Abstract base class for user management |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | header('X-Accel-Buffering: no'); |
61 | 61 | $this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true'; |
62 | 62 | if ($this->fallback) { |
63 | - $this->fallBackId = (int)$_GET['fallback_id']; |
|
63 | + $this->fallBackId = (int) $_GET['fallback_id']; |
|
64 | 64 | /** |
65 | 65 | * FIXME: The default content-security-policy of ownCloud forbids inline |
66 | 66 | * JavaScript for security reasons. IE starting on Windows 10 will |
@@ -73,11 +73,11 @@ discard block |
||
73 | 73 | */ |
74 | 74 | header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'"); |
75 | 75 | header("Content-Type: text/html"); |
76 | - echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy |
|
76 | + echo str_repeat('<span></span>'.PHP_EOL, 10); //dummy data to keep IE happy |
|
77 | 77 | } else { |
78 | 78 | header("Content-Type: text/event-stream"); |
79 | 79 | } |
80 | - if(!\OC::$server->getRequest()->passesStrictCookieCheck()) { |
|
80 | + if (!\OC::$server->getRequest()->passesStrictCookieCheck()) { |
|
81 | 81 | header('Location: '.\OC::$WEBROOT); |
82 | 82 | exit(); |
83 | 83 | } |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | */ |
101 | 101 | public function send($type, $data = null) { |
102 | 102 | if ($data and !preg_match('/^[A-Za-z0-9_]+$/', $type)) { |
103 | - throw new BadMethodCallException('Type needs to be alphanumeric ('. $type .')'); |
|
103 | + throw new BadMethodCallException('Type needs to be alphanumeric ('.$type.')'); |
|
104 | 104 | } |
105 | 105 | $this->init(); |
106 | 106 | if (is_null($data)) { |
@@ -109,13 +109,13 @@ discard block |
||
109 | 109 | } |
110 | 110 | if ($this->fallback) { |
111 | 111 | $response = '<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack(' |
112 | - . $this->fallBackId . ',"' . $type . '",' . OCP\JSON::encode($data) . ')</script>' . PHP_EOL; |
|
112 | + . $this->fallBackId.',"'.$type.'",'.OCP\JSON::encode($data).')</script>'.PHP_EOL; |
|
113 | 113 | echo $response; |
114 | 114 | } else { |
115 | 115 | if ($type) { |
116 | - echo 'event: ' . $type . PHP_EOL; |
|
116 | + echo 'event: '.$type.PHP_EOL; |
|
117 | 117 | } |
118 | - echo 'data: ' . OCP\JSON::encode($data) . PHP_EOL; |
|
118 | + echo 'data: '.OCP\JSON::encode($data).PHP_EOL; |
|
119 | 119 | } |
120 | 120 | echo PHP_EOL; |
121 | 121 | flush(); |
@@ -85,9 +85,9 @@ discard block |
||
85 | 85 | public function isComplete() { |
86 | 86 | $prefix = $this->getPrefix(); |
87 | 87 | $cache = $this->getCache(); |
88 | - $chunkcount = (int)$this->info['chunkcount']; |
|
88 | + $chunkcount = (int) $this->info['chunkcount']; |
|
89 | 89 | |
90 | - for($i=($chunkcount-1); $i >= 0; $i--) { |
|
90 | + for ($i = ($chunkcount - 1); $i >= 0; $i--) { |
|
91 | 91 | if (!$cache->hasKey($prefix.$i)) { |
92 | 92 | return false; |
93 | 93 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | public function cleanup() { |
144 | 144 | $cache = $this->getCache(); |
145 | 145 | $prefix = $this->getPrefix(); |
146 | - for($i=0; $i < $this->info['chunkcount']; $i++) { |
|
146 | + for ($i = 0; $i < $this->info['chunkcount']; $i++) { |
|
147 | 147 | $cache->remove($prefix.$i); |
148 | 148 | } |
149 | 149 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * along with this program. If not, see <http://www.gnu.org/licenses/> |
29 | 29 | * |
30 | 30 | */ |
31 | -class OC_Hook{ |
|
31 | +class OC_Hook { |
|
32 | 32 | public static $thrownExceptions = []; |
33 | 33 | |
34 | 34 | static private $registered = array(); |
@@ -46,15 +46,15 @@ discard block |
||
46 | 46 | * |
47 | 47 | * TODO: write example |
48 | 48 | */ |
49 | - static public function connect($signalClass, $signalName, $slotClass, $slotName ) { |
|
49 | + static public function connect($signalClass, $signalName, $slotClass, $slotName) { |
|
50 | 50 | // If we're trying to connect to an emitting class that isn't |
51 | 51 | // yet registered, register it |
52 | - if( !array_key_exists($signalClass, self::$registered )) { |
|
52 | + if (!array_key_exists($signalClass, self::$registered)) { |
|
53 | 53 | self::$registered[$signalClass] = array(); |
54 | 54 | } |
55 | 55 | // If we're trying to connect to an emitting method that isn't |
56 | 56 | // yet registered, register it with the emitting class |
57 | - if( !array_key_exists( $signalName, self::$registered[$signalClass] )) { |
|
57 | + if (!array_key_exists($signalName, self::$registered[$signalClass])) { |
|
58 | 58 | self::$registered[$signalClass][$signalName] = array(); |
59 | 59 | } |
60 | 60 | |
@@ -90,27 +90,27 @@ discard block |
||
90 | 90 | |
91 | 91 | // Return false if no hook handlers are listening to this |
92 | 92 | // emitting class |
93 | - if( !array_key_exists($signalClass, self::$registered )) { |
|
93 | + if (!array_key_exists($signalClass, self::$registered)) { |
|
94 | 94 | return false; |
95 | 95 | } |
96 | 96 | |
97 | 97 | // Return false if no hook handlers are listening to this |
98 | 98 | // emitting method |
99 | - if( !array_key_exists( $signalName, self::$registered[$signalClass] )) { |
|
99 | + if (!array_key_exists($signalName, self::$registered[$signalClass])) { |
|
100 | 100 | return false; |
101 | 101 | } |
102 | 102 | |
103 | 103 | // Call all slots |
104 | - foreach( self::$registered[$signalClass][$signalName] as $i ) { |
|
104 | + foreach (self::$registered[$signalClass][$signalName] as $i) { |
|
105 | 105 | try { |
106 | - call_user_func( array( $i["class"], $i["name"] ), $params ); |
|
107 | - } catch (Exception $e){ |
|
106 | + call_user_func(array($i["class"], $i["name"]), $params); |
|
107 | + } catch (Exception $e) { |
|
108 | 108 | self::$thrownExceptions[] = $e; |
109 | 109 | \OC::$server->getLogger()->logException($e); |
110 | - if($e instanceof \OC\HintException) { |
|
110 | + if ($e instanceof \OC\HintException) { |
|
111 | 111 | throw $e; |
112 | 112 | } |
113 | - if($e instanceof \OC\ServerNotAvailableException) { |
|
113 | + if ($e instanceof \OC\ServerNotAvailableException) { |
|
114 | 114 | throw $e; |
115 | 115 | } |
116 | 116 | } |
@@ -124,15 +124,15 @@ discard block |
||
124 | 124 | * @param string $signalClass |
125 | 125 | * @param string $signalName |
126 | 126 | */ |
127 | - static public function clear($signalClass='', $signalName='') { |
|
127 | + static public function clear($signalClass = '', $signalName = '') { |
|
128 | 128 | if ($signalClass) { |
129 | 129 | if ($signalName) { |
130 | - self::$registered[$signalClass][$signalName]=array(); |
|
131 | - }else{ |
|
132 | - self::$registered[$signalClass]=array(); |
|
130 | + self::$registered[$signalClass][$signalName] = array(); |
|
131 | + } else { |
|
132 | + self::$registered[$signalClass] = array(); |
|
133 | 133 | } |
134 | - }else{ |
|
135 | - self::$registered=array(); |
|
134 | + } else { |
|
135 | + self::$registered = array(); |
|
136 | 136 | } |
137 | 137 | } |
138 | 138 |
@@ -29,12 +29,12 @@ discard block |
||
29 | 29 | |
30 | 30 | class Streamer { |
31 | 31 | // array of regexp. Matching user agents will get tar instead of zip |
32 | - private $preferTarFor = [ '/macintosh|mac os x/i' ]; |
|
32 | + private $preferTarFor = ['/macintosh|mac os x/i']; |
|
33 | 33 | |
34 | 34 | // streamer instance |
35 | 35 | private $streamerInstance; |
36 | 36 | |
37 | - public function __construct(){ |
|
37 | + public function __construct() { |
|
38 | 38 | /** @var \OCP\IRequest */ |
39 | 39 | $request = \OC::$server->getRequest(); |
40 | 40 | |
@@ -49,9 +49,9 @@ discard block |
||
49 | 49 | * Send HTTP headers |
50 | 50 | * @param string $name |
51 | 51 | */ |
52 | - public function sendHeaders($name){ |
|
52 | + public function sendHeaders($name) { |
|
53 | 53 | $extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar'; |
54 | - $fullName = $name . $extension; |
|
54 | + $fullName = $name.$extension; |
|
55 | 55 | $this->streamerInstance->sendHeaders($fullName); |
56 | 56 | } |
57 | 57 | |
@@ -60,27 +60,27 @@ discard block |
||
60 | 60 | * @param string $dir |
61 | 61 | * @param string $internalDir |
62 | 62 | */ |
63 | - public function addDirRecursive($dir, $internalDir='') { |
|
63 | + public function addDirRecursive($dir, $internalDir = '') { |
|
64 | 64 | $dirname = basename($dir); |
65 | - $rootDir = $internalDir . $dirname; |
|
65 | + $rootDir = $internalDir.$dirname; |
|
66 | 66 | if (!empty($rootDir)) { |
67 | 67 | $this->streamerInstance->addEmptyDir($rootDir); |
68 | 68 | } |
69 | - $internalDir .= $dirname . '/'; |
|
69 | + $internalDir .= $dirname.'/'; |
|
70 | 70 | // prevent absolute dirs |
71 | 71 | $internalDir = ltrim($internalDir, '/'); |
72 | 72 | |
73 | - $files= \OC\Files\Filesystem::getDirectoryContent($dir); |
|
74 | - foreach($files as $file) { |
|
73 | + $files = \OC\Files\Filesystem::getDirectoryContent($dir); |
|
74 | + foreach ($files as $file) { |
|
75 | 75 | $filename = $file['name']; |
76 | - $file = $dir . '/' . $filename; |
|
77 | - if(\OC\Files\Filesystem::is_file($file)) { |
|
76 | + $file = $dir.'/'.$filename; |
|
77 | + if (\OC\Files\Filesystem::is_file($file)) { |
|
78 | 78 | $filesize = \OC\Files\Filesystem::filesize($file); |
79 | 79 | $fileTime = \OC\Files\Filesystem::filemtime($file); |
80 | 80 | $fh = \OC\Files\Filesystem::fopen($file, 'r'); |
81 | - $this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime); |
|
81 | + $this->addFileFromStream($fh, $internalDir.$filename, $filesize, $fileTime); |
|
82 | 82 | fclose($fh); |
83 | - }elseif(\OC\Files\Filesystem::is_dir($file)) { |
|
83 | + }elseif (\OC\Files\Filesystem::is_dir($file)) { |
|
84 | 84 | $this->addDirRecursive($file, $internalDir); |
85 | 85 | } |
86 | 86 | } |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | * @param string $dirName Directory Path and name to be added to the archive. |
117 | 117 | * @return bool $success |
118 | 118 | */ |
119 | - public function addEmptyDir($dirName){ |
|
119 | + public function addEmptyDir($dirName) { |
|
120 | 120 | return $this->streamerInstance->addEmptyDir($dirName); |
121 | 121 | } |
122 | 122 | |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | * closing, the file is completely written to the output stream. |
127 | 127 | * @return bool $success |
128 | 128 | */ |
129 | - public function finalize(){ |
|
129 | + public function finalize() { |
|
130 | 130 | return $this->streamerInstance->finalize(); |
131 | 131 | } |
132 | 132 | } |
@@ -41,13 +41,13 @@ |
||
41 | 41 | */ |
42 | 42 | public function cas($key, $old, $new) { |
43 | 43 | //no native cas, emulate with locking |
44 | - if ($this->add($key . '_lock', true)) { |
|
44 | + if ($this->add($key.'_lock', true)) { |
|
45 | 45 | if ($this->get($key) === $old) { |
46 | 46 | $this->set($key, $new); |
47 | - $this->remove($key . '_lock'); |
|
47 | + $this->remove($key.'_lock'); |
|
48 | 48 | return true; |
49 | 49 | } else { |
50 | - $this->remove($key . '_lock'); |
|
50 | + $this->remove($key.'_lock'); |
|
51 | 51 | return false; |
52 | 52 | } |
53 | 53 | } else { |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | use CADTrait; |
38 | 38 | |
39 | 39 | public function get($key) { |
40 | - $result = apcu_fetch($this->getPrefix() . $key, $success); |
|
40 | + $result = apcu_fetch($this->getPrefix().$key, $success); |
|
41 | 41 | if (!$success) { |
42 | 42 | return null; |
43 | 43 | } |
@@ -45,24 +45,24 @@ discard block |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | public function set($key, $value, $ttl = 0) { |
48 | - return apcu_store($this->getPrefix() . $key, $value, $ttl); |
|
48 | + return apcu_store($this->getPrefix().$key, $value, $ttl); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | public function hasKey($key) { |
52 | - return apcu_exists($this->getPrefix() . $key); |
|
52 | + return apcu_exists($this->getPrefix().$key); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | public function remove($key) { |
56 | - return apcu_delete($this->getPrefix() . $key); |
|
56 | + return apcu_delete($this->getPrefix().$key); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | public function clear($prefix = '') { |
60 | - $ns = $this->getPrefix() . $prefix; |
|
60 | + $ns = $this->getPrefix().$prefix; |
|
61 | 61 | $ns = preg_quote($ns, '/'); |
62 | - if(class_exists('\APCIterator')) { |
|
63 | - $iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY); |
|
62 | + if (class_exists('\APCIterator')) { |
|
63 | + $iter = new \APCIterator('user', '/^'.$ns.'/', APC_ITER_KEY); |
|
64 | 64 | } else { |
65 | - $iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY); |
|
65 | + $iter = new \APCUIterator('/^'.$ns.'/', APC_ITER_KEY); |
|
66 | 66 | } |
67 | 67 | return apcu_delete($iter); |
68 | 68 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * @return bool |
77 | 77 | */ |
78 | 78 | public function add($key, $value, $ttl = 0) { |
79 | - return apcu_add($this->getPrefix() . $key, $value, $ttl); |
|
79 | + return apcu_add($this->getPrefix().$key, $value, $ttl); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221 |
101 | 101 | * for details |
102 | 102 | */ |
103 | - return apcu_exists($this->getPrefix() . $key) |
|
104 | - ? apcu_inc($this->getPrefix() . $key, $step) |
|
103 | + return apcu_exists($this->getPrefix().$key) |
|
104 | + ? apcu_inc($this->getPrefix().$key, $step) |
|
105 | 105 | : false; |
106 | 106 | } |
107 | 107 | |
@@ -125,8 +125,8 @@ discard block |
||
125 | 125 | * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221 |
126 | 126 | * for details |
127 | 127 | */ |
128 | - return apcu_exists($this->getPrefix() . $key) |
|
129 | - ? apcu_dec($this->getPrefix() . $key, $step) |
|
128 | + return apcu_exists($this->getPrefix().$key) |
|
129 | + ? apcu_dec($this->getPrefix().$key, $step) |
|
130 | 130 | : false; |
131 | 131 | } |
132 | 132 | |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | public function cas($key, $old, $new) { |
142 | 142 | // apc only does cas for ints |
143 | 143 | if (is_int($old) and is_int($new)) { |
144 | - return apcu_cas($this->getPrefix() . $key, $old, $new); |
|
144 | + return apcu_cas($this->getPrefix().$key, $old, $new); |
|
145 | 145 | } else { |
146 | 146 | return $this->casEmulated($key, $old, $new); |
147 | 147 | } |
@@ -38,13 +38,13 @@ |
||
38 | 38 | */ |
39 | 39 | public function cad($key, $old) { |
40 | 40 | //no native cas, emulate with locking |
41 | - if ($this->add($key . '_lock', true)) { |
|
41 | + if ($this->add($key.'_lock', true)) { |
|
42 | 42 | if ($this->get($key) === $old) { |
43 | 43 | $this->remove($key); |
44 | - $this->remove($key . '_lock'); |
|
44 | + $this->remove($key.'_lock'); |
|
45 | 45 | return true; |
46 | 46 | } else { |
47 | - $this->remove($key . '_lock'); |
|
47 | + $this->remove($key.'_lock'); |
|
48 | 48 | return false; |
49 | 49 | } |
50 | 50 | } else { |
@@ -103,10 +103,10 @@ discard block |
||
103 | 103 | $meta['status'] = $this->succeeded() ? 'ok' : 'failure'; |
104 | 104 | $meta['statuscode'] = $this->statusCode; |
105 | 105 | $meta['message'] = $this->message; |
106 | - if(isset($this->items)) { |
|
106 | + if (isset($this->items)) { |
|
107 | 107 | $meta['totalitems'] = $this->items; |
108 | 108 | } |
109 | - if(isset($this->perPage)) { |
|
109 | + if (isset($this->perPage)) { |
|
110 | 110 | $meta['itemsperpage'] = $this->perPage; |
111 | 111 | } |
112 | 112 | return $meta; |
@@ -136,11 +136,11 @@ discard block |
||
136 | 136 | * @return $this |
137 | 137 | */ |
138 | 138 | public function addHeader($name, $value) { |
139 | - $name = trim($name); // always remove leading and trailing whitespace |
|
139 | + $name = trim($name); // always remove leading and trailing whitespace |
|
140 | 140 | // to be able to reliably check for security |
141 | 141 | // headers |
142 | 142 | |
143 | - if(is_null($value)) { |
|
143 | + if (is_null($value)) { |
|
144 | 144 | unset($this->headers[$name]); |
145 | 145 | } else { |
146 | 146 | $this->headers[$name] = $value; |