@@ -26,37 +26,37 @@ |
||
26 | 26 | namespace OC\Template; |
27 | 27 | |
28 | 28 | class TemplateFileLocator { |
29 | - protected $dirs; |
|
30 | - private $path; |
|
29 | + protected $dirs; |
|
30 | + private $path; |
|
31 | 31 | |
32 | - /** |
|
33 | - * @param string[] $dirs |
|
34 | - */ |
|
35 | - public function __construct($dirs) { |
|
36 | - $this->dirs = $dirs; |
|
37 | - } |
|
32 | + /** |
|
33 | + * @param string[] $dirs |
|
34 | + */ |
|
35 | + public function __construct($dirs) { |
|
36 | + $this->dirs = $dirs; |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * @param string $template |
|
41 | - * @return string |
|
42 | - * @throws \Exception |
|
43 | - */ |
|
44 | - public function find($template) { |
|
45 | - if ($template === '') { |
|
46 | - throw new \InvalidArgumentException('Empty template name'); |
|
47 | - } |
|
39 | + /** |
|
40 | + * @param string $template |
|
41 | + * @return string |
|
42 | + * @throws \Exception |
|
43 | + */ |
|
44 | + public function find($template) { |
|
45 | + if ($template === '') { |
|
46 | + throw new \InvalidArgumentException('Empty template name'); |
|
47 | + } |
|
48 | 48 | |
49 | - foreach ($this->dirs as $dir) { |
|
50 | - $file = $dir.$template.'.php'; |
|
51 | - if (is_file($file)) { |
|
52 | - $this->path = $dir; |
|
53 | - return $file; |
|
54 | - } |
|
55 | - } |
|
56 | - throw new \Exception('template file not found: template:'.$template); |
|
57 | - } |
|
49 | + foreach ($this->dirs as $dir) { |
|
50 | + $file = $dir.$template.'.php'; |
|
51 | + if (is_file($file)) { |
|
52 | + $this->path = $dir; |
|
53 | + return $file; |
|
54 | + } |
|
55 | + } |
|
56 | + throw new \Exception('template file not found: template:'.$template); |
|
57 | + } |
|
58 | 58 | |
59 | - public function getPath() { |
|
60 | - return $this->path; |
|
61 | - } |
|
59 | + public function getPath() { |
|
60 | + return $this->path; |
|
61 | + } |
|
62 | 62 | } |
@@ -28,56 +28,56 @@ |
||
28 | 28 | use OCP\Diagnostics\IEventLogger; |
29 | 29 | |
30 | 30 | class EventLogger implements IEventLogger { |
31 | - /** |
|
32 | - * @var \OC\Diagnostics\Event[] |
|
33 | - */ |
|
34 | - private $events = []; |
|
31 | + /** |
|
32 | + * @var \OC\Diagnostics\Event[] |
|
33 | + */ |
|
34 | + private $events = []; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @var bool - Module needs to be activated by some app |
|
38 | - */ |
|
39 | - private $activated = false; |
|
36 | + /** |
|
37 | + * @var bool - Module needs to be activated by some app |
|
38 | + */ |
|
39 | + private $activated = false; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @inheritdoc |
|
43 | - */ |
|
44 | - public function start($id, $description) { |
|
45 | - if ($this->activated) { |
|
46 | - $this->events[$id] = new Event($id, $description, microtime(true)); |
|
47 | - } |
|
48 | - } |
|
41 | + /** |
|
42 | + * @inheritdoc |
|
43 | + */ |
|
44 | + public function start($id, $description) { |
|
45 | + if ($this->activated) { |
|
46 | + $this->events[$id] = new Event($id, $description, microtime(true)); |
|
47 | + } |
|
48 | + } |
|
49 | 49 | |
50 | - /** |
|
51 | - * @inheritdoc |
|
52 | - */ |
|
53 | - public function end($id) { |
|
54 | - if ($this->activated && isset($this->events[$id])) { |
|
55 | - $timing = $this->events[$id]; |
|
56 | - $timing->end(microtime(true)); |
|
57 | - } |
|
58 | - } |
|
50 | + /** |
|
51 | + * @inheritdoc |
|
52 | + */ |
|
53 | + public function end($id) { |
|
54 | + if ($this->activated && isset($this->events[$id])) { |
|
55 | + $timing = $this->events[$id]; |
|
56 | + $timing->end(microtime(true)); |
|
57 | + } |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * @inheritdoc |
|
62 | - */ |
|
63 | - public function log($id, $description, $start, $end) { |
|
64 | - if ($this->activated) { |
|
65 | - $this->events[$id] = new Event($id, $description, $start); |
|
66 | - $this->events[$id]->end($end); |
|
67 | - } |
|
68 | - } |
|
60 | + /** |
|
61 | + * @inheritdoc |
|
62 | + */ |
|
63 | + public function log($id, $description, $start, $end) { |
|
64 | + if ($this->activated) { |
|
65 | + $this->events[$id] = new Event($id, $description, $start); |
|
66 | + $this->events[$id]->end($end); |
|
67 | + } |
|
68 | + } |
|
69 | 69 | |
70 | - /** |
|
71 | - * @inheritdoc |
|
72 | - */ |
|
73 | - public function getEvents() { |
|
74 | - return $this->events; |
|
75 | - } |
|
70 | + /** |
|
71 | + * @inheritdoc |
|
72 | + */ |
|
73 | + public function getEvents() { |
|
74 | + return $this->events; |
|
75 | + } |
|
76 | 76 | |
77 | - /** |
|
78 | - * @inheritdoc |
|
79 | - */ |
|
80 | - public function activate() { |
|
81 | - $this->activated = true; |
|
82 | - } |
|
77 | + /** |
|
78 | + * @inheritdoc |
|
79 | + */ |
|
80 | + public function activate() { |
|
81 | + $this->activated = true; |
|
82 | + } |
|
83 | 83 | } |
@@ -30,66 +30,66 @@ |
||
30 | 30 | * Uses a simple FIFO expiry mechanism |
31 | 31 | */ |
32 | 32 | class CappedMemoryCache implements ICache, \ArrayAccess { |
33 | - private $capacity; |
|
34 | - private $cache = []; |
|
35 | - |
|
36 | - public function __construct($capacity = 512) { |
|
37 | - $this->capacity = $capacity; |
|
38 | - } |
|
39 | - |
|
40 | - public function hasKey($key) { |
|
41 | - return isset($this->cache[$key]); |
|
42 | - } |
|
43 | - |
|
44 | - public function get($key) { |
|
45 | - return isset($this->cache[$key]) ? $this->cache[$key] : null; |
|
46 | - } |
|
47 | - |
|
48 | - public function set($key, $value, $ttl = 0) { |
|
49 | - if (is_null($key)) { |
|
50 | - $this->cache[] = $value; |
|
51 | - } else { |
|
52 | - $this->cache[$key] = $value; |
|
53 | - } |
|
54 | - $this->garbageCollect(); |
|
55 | - } |
|
56 | - |
|
57 | - public function remove($key) { |
|
58 | - unset($this->cache[$key]); |
|
59 | - return true; |
|
60 | - } |
|
61 | - |
|
62 | - public function clear($prefix = '') { |
|
63 | - $this->cache = []; |
|
64 | - return true; |
|
65 | - } |
|
66 | - |
|
67 | - public function offsetExists($offset) { |
|
68 | - return $this->hasKey($offset); |
|
69 | - } |
|
70 | - |
|
71 | - public function &offsetGet($offset) { |
|
72 | - return $this->cache[$offset]; |
|
73 | - } |
|
74 | - |
|
75 | - public function offsetSet($offset, $value) { |
|
76 | - $this->set($offset, $value); |
|
77 | - } |
|
78 | - |
|
79 | - public function offsetUnset($offset) { |
|
80 | - $this->remove($offset); |
|
81 | - } |
|
82 | - |
|
83 | - public function getData() { |
|
84 | - return $this->cache; |
|
85 | - } |
|
86 | - |
|
87 | - |
|
88 | - private function garbageCollect() { |
|
89 | - while (count($this->cache) > $this->capacity) { |
|
90 | - reset($this->cache); |
|
91 | - $key = key($this->cache); |
|
92 | - $this->remove($key); |
|
93 | - } |
|
94 | - } |
|
33 | + private $capacity; |
|
34 | + private $cache = []; |
|
35 | + |
|
36 | + public function __construct($capacity = 512) { |
|
37 | + $this->capacity = $capacity; |
|
38 | + } |
|
39 | + |
|
40 | + public function hasKey($key) { |
|
41 | + return isset($this->cache[$key]); |
|
42 | + } |
|
43 | + |
|
44 | + public function get($key) { |
|
45 | + return isset($this->cache[$key]) ? $this->cache[$key] : null; |
|
46 | + } |
|
47 | + |
|
48 | + public function set($key, $value, $ttl = 0) { |
|
49 | + if (is_null($key)) { |
|
50 | + $this->cache[] = $value; |
|
51 | + } else { |
|
52 | + $this->cache[$key] = $value; |
|
53 | + } |
|
54 | + $this->garbageCollect(); |
|
55 | + } |
|
56 | + |
|
57 | + public function remove($key) { |
|
58 | + unset($this->cache[$key]); |
|
59 | + return true; |
|
60 | + } |
|
61 | + |
|
62 | + public function clear($prefix = '') { |
|
63 | + $this->cache = []; |
|
64 | + return true; |
|
65 | + } |
|
66 | + |
|
67 | + public function offsetExists($offset) { |
|
68 | + return $this->hasKey($offset); |
|
69 | + } |
|
70 | + |
|
71 | + public function &offsetGet($offset) { |
|
72 | + return $this->cache[$offset]; |
|
73 | + } |
|
74 | + |
|
75 | + public function offsetSet($offset, $value) { |
|
76 | + $this->set($offset, $value); |
|
77 | + } |
|
78 | + |
|
79 | + public function offsetUnset($offset) { |
|
80 | + $this->remove($offset); |
|
81 | + } |
|
82 | + |
|
83 | + public function getData() { |
|
84 | + return $this->cache; |
|
85 | + } |
|
86 | + |
|
87 | + |
|
88 | + private function garbageCollect() { |
|
89 | + while (count($this->cache) > $this->capacity) { |
|
90 | + reset($this->cache); |
|
91 | + $key = key($this->cache); |
|
92 | + $this->remove($key); |
|
93 | + } |
|
94 | + } |
|
95 | 95 | } |
@@ -29,13 +29,13 @@ |
||
29 | 29 | */ |
30 | 30 | class Audio extends File { |
31 | 31 | |
32 | - /** |
|
33 | - * Type name; translated in templates |
|
34 | - * @var string |
|
35 | - */ |
|
36 | - public $type = 'audio'; |
|
32 | + /** |
|
33 | + * Type name; translated in templates |
|
34 | + * @var string |
|
35 | + */ |
|
36 | + public $type = 'audio'; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @TODO add ID3 information |
|
40 | - */ |
|
38 | + /** |
|
39 | + * @TODO add ID3 information |
|
40 | + */ |
|
41 | 41 | } |
@@ -29,13 +29,13 @@ |
||
29 | 29 | */ |
30 | 30 | class Image extends File { |
31 | 31 | |
32 | - /** |
|
33 | - * Type name; translated in templates |
|
34 | - * @var string |
|
35 | - */ |
|
36 | - public $type = 'image'; |
|
32 | + /** |
|
33 | + * Type name; translated in templates |
|
34 | + * @var string |
|
35 | + */ |
|
36 | + public $type = 'image'; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @TODO add EXIF information |
|
40 | - */ |
|
38 | + /** |
|
39 | + * @TODO add EXIF information |
|
40 | + */ |
|
41 | 41 | } |
@@ -29,9 +29,9 @@ |
||
29 | 29 | */ |
30 | 30 | class Folder extends File { |
31 | 31 | |
32 | - /** |
|
33 | - * Type name; translated in templates |
|
34 | - * @var string |
|
35 | - */ |
|
36 | - public $type = 'folder'; |
|
32 | + /** |
|
33 | + * Type name; translated in templates |
|
34 | + * @var string |
|
35 | + */ |
|
36 | + public $type = 'folder'; |
|
37 | 37 | } |
@@ -33,44 +33,44 @@ |
||
33 | 33 | */ |
34 | 34 | class File extends \OCP\Search\Provider { |
35 | 35 | |
36 | - /** |
|
37 | - * Search for files and folders matching the given query |
|
38 | - * @param string $query |
|
39 | - * @return \OCP\Search\Result |
|
40 | - */ |
|
41 | - public function search($query) { |
|
42 | - $files = Filesystem::search($query); |
|
43 | - $results = []; |
|
44 | - // edit results |
|
45 | - foreach ($files as $fileData) { |
|
46 | - // skip versions |
|
47 | - if (strpos($fileData['path'], '_versions') === 0) { |
|
48 | - continue; |
|
49 | - } |
|
50 | - // skip top-level folder |
|
51 | - if ($fileData['name'] === 'files' && $fileData['parent'] === -1) { |
|
52 | - continue; |
|
53 | - } |
|
54 | - // create audio result |
|
55 | - if ($fileData['mimepart'] === 'audio') { |
|
56 | - $result = new \OC\Search\Result\Audio($fileData); |
|
57 | - } |
|
58 | - // create image result |
|
59 | - elseif ($fileData['mimepart'] === 'image') { |
|
60 | - $result = new \OC\Search\Result\Image($fileData); |
|
61 | - } |
|
62 | - // create folder result |
|
63 | - elseif ($fileData['mimetype'] === 'httpd/unix-directory') { |
|
64 | - $result = new \OC\Search\Result\Folder($fileData); |
|
65 | - } |
|
66 | - // or create file result |
|
67 | - else { |
|
68 | - $result = new \OC\Search\Result\File($fileData); |
|
69 | - } |
|
70 | - // add to results |
|
71 | - $results[] = $result; |
|
72 | - } |
|
73 | - // return |
|
74 | - return $results; |
|
75 | - } |
|
36 | + /** |
|
37 | + * Search for files and folders matching the given query |
|
38 | + * @param string $query |
|
39 | + * @return \OCP\Search\Result |
|
40 | + */ |
|
41 | + public function search($query) { |
|
42 | + $files = Filesystem::search($query); |
|
43 | + $results = []; |
|
44 | + // edit results |
|
45 | + foreach ($files as $fileData) { |
|
46 | + // skip versions |
|
47 | + if (strpos($fileData['path'], '_versions') === 0) { |
|
48 | + continue; |
|
49 | + } |
|
50 | + // skip top-level folder |
|
51 | + if ($fileData['name'] === 'files' && $fileData['parent'] === -1) { |
|
52 | + continue; |
|
53 | + } |
|
54 | + // create audio result |
|
55 | + if ($fileData['mimepart'] === 'audio') { |
|
56 | + $result = new \OC\Search\Result\Audio($fileData); |
|
57 | + } |
|
58 | + // create image result |
|
59 | + elseif ($fileData['mimepart'] === 'image') { |
|
60 | + $result = new \OC\Search\Result\Image($fileData); |
|
61 | + } |
|
62 | + // create folder result |
|
63 | + elseif ($fileData['mimetype'] === 'httpd/unix-directory') { |
|
64 | + $result = new \OC\Search\Result\Folder($fileData); |
|
65 | + } |
|
66 | + // or create file result |
|
67 | + else { |
|
68 | + $result = new \OC\Search\Result\File($fileData); |
|
69 | + } |
|
70 | + // add to results |
|
71 | + $results[] = $result; |
|
72 | + } |
|
73 | + // return |
|
74 | + return $results; |
|
75 | + } |
|
76 | 76 | } |
@@ -27,104 +27,104 @@ |
||
27 | 27 | use OCP\ICertificate; |
28 | 28 | |
29 | 29 | class Certificate implements ICertificate { |
30 | - protected $name; |
|
31 | - |
|
32 | - protected $commonName; |
|
33 | - |
|
34 | - protected $organization; |
|
35 | - |
|
36 | - protected $serial; |
|
37 | - |
|
38 | - protected $issueDate; |
|
39 | - |
|
40 | - protected $expireDate; |
|
41 | - |
|
42 | - protected $issuerName; |
|
43 | - |
|
44 | - protected $issuerOrganization; |
|
45 | - |
|
46 | - /** |
|
47 | - * @param string $data base64 encoded certificate |
|
48 | - * @param string $name |
|
49 | - * @throws \Exception If the certificate could not get parsed |
|
50 | - */ |
|
51 | - public function __construct($data, $name) { |
|
52 | - $this->name = $name; |
|
53 | - $gmt = new \DateTimeZone('GMT'); |
|
54 | - |
|
55 | - // If string starts with "file://" ignore the certificate |
|
56 | - $query = 'file://'; |
|
57 | - if (strtolower(substr($data, 0, strlen($query))) === $query) { |
|
58 | - throw new \Exception('Certificate could not get parsed.'); |
|
59 | - } |
|
60 | - |
|
61 | - $info = openssl_x509_parse($data); |
|
62 | - if (!is_array($info)) { |
|
63 | - throw new \Exception('Certificate could not get parsed.'); |
|
64 | - } |
|
65 | - |
|
66 | - $this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null; |
|
67 | - $this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null; |
|
68 | - $this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt); |
|
69 | - $this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt); |
|
70 | - $this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null; |
|
71 | - $this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null; |
|
72 | - } |
|
73 | - |
|
74 | - /** |
|
75 | - * @return string |
|
76 | - */ |
|
77 | - public function getName() { |
|
78 | - return $this->name; |
|
79 | - } |
|
80 | - |
|
81 | - /** |
|
82 | - * @return string|null |
|
83 | - */ |
|
84 | - public function getCommonName() { |
|
85 | - return $this->commonName; |
|
86 | - } |
|
87 | - |
|
88 | - /** |
|
89 | - * @return string |
|
90 | - */ |
|
91 | - public function getOrganization() { |
|
92 | - return $this->organization; |
|
93 | - } |
|
94 | - |
|
95 | - /** |
|
96 | - * @return \DateTime |
|
97 | - */ |
|
98 | - public function getIssueDate() { |
|
99 | - return $this->issueDate; |
|
100 | - } |
|
101 | - |
|
102 | - /** |
|
103 | - * @return \DateTime |
|
104 | - */ |
|
105 | - public function getExpireDate() { |
|
106 | - return $this->expireDate; |
|
107 | - } |
|
108 | - |
|
109 | - /** |
|
110 | - * @return bool |
|
111 | - */ |
|
112 | - public function isExpired() { |
|
113 | - $now = new \DateTime(); |
|
114 | - return $this->issueDate > $now or $now > $this->expireDate; |
|
115 | - } |
|
116 | - |
|
117 | - /** |
|
118 | - * @return string|null |
|
119 | - */ |
|
120 | - public function getIssuerName() { |
|
121 | - return $this->issuerName; |
|
122 | - } |
|
123 | - |
|
124 | - /** |
|
125 | - * @return string|null |
|
126 | - */ |
|
127 | - public function getIssuerOrganization() { |
|
128 | - return $this->issuerOrganization; |
|
129 | - } |
|
30 | + protected $name; |
|
31 | + |
|
32 | + protected $commonName; |
|
33 | + |
|
34 | + protected $organization; |
|
35 | + |
|
36 | + protected $serial; |
|
37 | + |
|
38 | + protected $issueDate; |
|
39 | + |
|
40 | + protected $expireDate; |
|
41 | + |
|
42 | + protected $issuerName; |
|
43 | + |
|
44 | + protected $issuerOrganization; |
|
45 | + |
|
46 | + /** |
|
47 | + * @param string $data base64 encoded certificate |
|
48 | + * @param string $name |
|
49 | + * @throws \Exception If the certificate could not get parsed |
|
50 | + */ |
|
51 | + public function __construct($data, $name) { |
|
52 | + $this->name = $name; |
|
53 | + $gmt = new \DateTimeZone('GMT'); |
|
54 | + |
|
55 | + // If string starts with "file://" ignore the certificate |
|
56 | + $query = 'file://'; |
|
57 | + if (strtolower(substr($data, 0, strlen($query))) === $query) { |
|
58 | + throw new \Exception('Certificate could not get parsed.'); |
|
59 | + } |
|
60 | + |
|
61 | + $info = openssl_x509_parse($data); |
|
62 | + if (!is_array($info)) { |
|
63 | + throw new \Exception('Certificate could not get parsed.'); |
|
64 | + } |
|
65 | + |
|
66 | + $this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null; |
|
67 | + $this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null; |
|
68 | + $this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt); |
|
69 | + $this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt); |
|
70 | + $this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null; |
|
71 | + $this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null; |
|
72 | + } |
|
73 | + |
|
74 | + /** |
|
75 | + * @return string |
|
76 | + */ |
|
77 | + public function getName() { |
|
78 | + return $this->name; |
|
79 | + } |
|
80 | + |
|
81 | + /** |
|
82 | + * @return string|null |
|
83 | + */ |
|
84 | + public function getCommonName() { |
|
85 | + return $this->commonName; |
|
86 | + } |
|
87 | + |
|
88 | + /** |
|
89 | + * @return string |
|
90 | + */ |
|
91 | + public function getOrganization() { |
|
92 | + return $this->organization; |
|
93 | + } |
|
94 | + |
|
95 | + /** |
|
96 | + * @return \DateTime |
|
97 | + */ |
|
98 | + public function getIssueDate() { |
|
99 | + return $this->issueDate; |
|
100 | + } |
|
101 | + |
|
102 | + /** |
|
103 | + * @return \DateTime |
|
104 | + */ |
|
105 | + public function getExpireDate() { |
|
106 | + return $this->expireDate; |
|
107 | + } |
|
108 | + |
|
109 | + /** |
|
110 | + * @return bool |
|
111 | + */ |
|
112 | + public function isExpired() { |
|
113 | + $now = new \DateTime(); |
|
114 | + return $this->issueDate > $now or $now > $this->expireDate; |
|
115 | + } |
|
116 | + |
|
117 | + /** |
|
118 | + * @return string|null |
|
119 | + */ |
|
120 | + public function getIssuerName() { |
|
121 | + return $this->issuerName; |
|
122 | + } |
|
123 | + |
|
124 | + /** |
|
125 | + * @return string|null |
|
126 | + */ |
|
127 | + public function getIssuerOrganization() { |
|
128 | + return $this->issuerOrganization; |
|
129 | + } |
|
130 | 130 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | use OCP\Encryption\Exceptions\GenericEncryptionException; |
28 | 28 | |
29 | 29 | class EncryptionHeaderToLargeException extends GenericEncryptionException { |
30 | - public function __construct() { |
|
31 | - parent::__construct('max header size exceeded'); |
|
32 | - } |
|
30 | + public function __construct() { |
|
31 | + parent::__construct('max header size exceeded'); |
|
32 | + } |
|
33 | 33 | } |