diff options
| -rw-r--r-- | core/Command/Integrity/CheckApp.php | 3 | ||||
| -rw-r--r-- | core/Command/Integrity/CheckCore.php | 3 | ||||
| -rw-r--r-- | core/css/header.css | 7 | ||||
| -rw-r--r-- | lib/private/IntegrityCheck/Checker.php | 10 | ||||
| -rw-r--r-- | lib/private/Memcache/Memcached.php | 25 | ||||
| -rw-r--r-- | lib/private/Share20/DefaultShareProvider.php | 2 | ||||
| -rw-r--r-- | ocs/v1.php | 4 |
7 files changed, 30 insertions, 24 deletions
diff --git a/core/Command/Integrity/CheckApp.php b/core/Command/Integrity/CheckApp.php index 0774cca6582..3e4d8b9cba7 100644 --- a/core/Command/Integrity/CheckApp.php +++ b/core/Command/Integrity/CheckApp.php @@ -66,6 +66,9 @@ class CheckApp extends Base { $path = strval($input->getOption('path')); $result = $this->checker->verifyAppSignature($appid, $path); $this->writeArrayInOutputFormat($input, $output, $result); + if (count($result)>0){ + return 1; + } } } diff --git a/core/Command/Integrity/CheckCore.php b/core/Command/Integrity/CheckCore.php index 5aaf9c2dec8..a3426ce9345 100644 --- a/core/Command/Integrity/CheckCore.php +++ b/core/Command/Integrity/CheckCore.php @@ -60,5 +60,8 @@ class CheckCore extends Base { protected function execute(InputInterface $input, OutputInterface $output) { $result = $this->checker->verifyCoreSignature(); $this->writeArrayInOutputFormat($input, $output, $result); + if (count($result)>0){ + return 1; + } } } diff --git a/core/css/header.css b/core/css/header.css index f81a71070f0..d18181d13a0 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -152,7 +152,7 @@ margin-top: 0; padding-bottom: 10px; background-color: rgba(255, 255, 255, .97); - box-shadow: 0 1px 10px rgba(50, 50, 50, .7); + box-shadow: 0 1px 10px rgba(150, 150, 150, .75); border-radius: 3px; border-top-left-radius: 0; border-top-right-radius: 0; @@ -339,13 +339,12 @@ } #expanddiv { position: absolute; - right: 10px; + right: 13px; top: 45px; z-index: 2000; display: none; background: rgb(255, 255, 255); - border: 1px solid rgb(204, 204, 204); - box-shadow: 0 1px 10px rgba(50, 50, 50, .7); + box-shadow: 0 1px 10px rgba(150, 150, 150, .75); border-radius: 3px; border-top-left-radius: 0; border-top-right-radius: 0; diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php index 102fe42a99d..cba290e6aa7 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -96,12 +96,8 @@ class Checker { * @return bool */ public function isCodeCheckEnforced() { - $signedChannels = [ - 'daily', - 'testing', - 'stable', - ]; - if(!in_array($this->environmentHelper->getChannel(), $signedChannels, true)) { + $notSignedChannels = [ '', 'git']; + if (in_array($this->environmentHelper->getChannel(), $notSignedChannels, true)) { return false; } @@ -115,7 +111,7 @@ class Checker { } else { $isIntegrityCheckDisabled = false; } - if($isIntegrityCheckDisabled === true) { + if ($isIntegrityCheckDisabled === true) { return false; } diff --git a/lib/private/Memcache/Memcached.php b/lib/private/Memcache/Memcached.php index 12f45739374..dbff6dc2ec2 100644 --- a/lib/private/Memcache/Memcached.php +++ b/lib/private/Memcache/Memcached.php @@ -46,16 +46,6 @@ class Memcached extends Cache implements IMemcache { parent::__construct($prefix); if (is_null(self::$cache)) { self::$cache = new \Memcached(); - $servers = \OC::$server->getSystemConfig()->getValue('memcached_servers'); - if (!$servers) { - $server = \OC::$server->getSystemConfig()->getValue('memcached_server'); - if ($server) { - $servers = array($server); - } else { - $servers = array(array('localhost', 11211)); - } - } - self::$cache->addServers($servers); $defaultOptions = [ \Memcached::OPT_CONNECT_TIMEOUT => 50, @@ -85,6 +75,17 @@ class Memcached extends Cache implements IMemcache { } else { throw new HintException("Expected 'memcached_options' config to be an array, got $options"); } + + $servers = \OC::$server->getSystemConfig()->getValue('memcached_servers'); + if (!$servers) { + $server = \OC::$server->getSystemConfig()->getValue('memcached_server'); + if ($server) { + $servers = [$server]; + } else { + $servers = [['localhost', 11211]]; + } + } + self::$cache->addServers($servers); } } @@ -110,7 +111,9 @@ class Memcached extends Cache implements IMemcache { } else { $result = self::$cache->set($this->getNamespace() . $key, $value); } - $this->verifyReturnCode(); + if ($result !== true) { + $this->verifyReturnCode(); + } return $result; } diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index fded7442d20..23e8db34d7f 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -162,7 +162,6 @@ class DefaultShareProvider implements IShareProvider { $this->dbConn->beginTransaction(); $qb->execute(); $id = $this->dbConn->lastInsertId('*PREFIX*share'); - $this->dbConn->commit(); // Now fetch the inserted share and create a complete share object $qb = $this->dbConn->getQueryBuilder(); @@ -172,6 +171,7 @@ class DefaultShareProvider implements IShareProvider { $cursor = $qb->execute(); $data = $cursor->fetch(); + $this->dbConn->commit(); $cursor->closeCursor(); if ($data === false) { diff --git a/ocs/v1.php b/ocs/v1.php index 5aec27ad981..79e74f20cdf 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -65,8 +65,10 @@ try { } catch (MethodNotAllowedException $e) { OC_API::setContentType(); OC_Response::setStatus(405); -} catch (\OC\OCS\Exception $ex) { + exit(); +} catch (Exception $ex) { OC_API::respond($ex->getResult(), OC_API::requestedFormat()); + exit(); } /* |