Fix "There must be a single space between the closing parenthesis and the opening brace"
This commit is contained in:
parent
85bd28c508
commit
2ef2dc4dda
|
@ -160,7 +160,7 @@ if ($linkItem) {
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files'));
|
$basePath = substr($pathAndUser['path'], strlen('/'.$fileOwner.'/files'));
|
||||||
$path = $basePath;
|
$path = $basePath;
|
||||||
if (isset($_GET['path'])) {
|
if (isset($_GET['path'])) {
|
||||||
$path .= $_GET['path'];
|
$path .= $_GET['path'];
|
||||||
|
|
|
@ -355,7 +355,7 @@ class OC_FileCache{
|
||||||
if($sizeDiff==0) return;
|
if($sizeDiff==0) return;
|
||||||
$item = OC_FileCache_Cached::get($path);
|
$item = OC_FileCache_Cached::get($path);
|
||||||
//stop walking up the filetree if we hit a non-folder or reached to root folder
|
//stop walking up the filetree if we hit a non-folder or reached to root folder
|
||||||
if($path == '/' || $path=='' || $item['mimetype'] !== 'httpd/unix-directory'){
|
if($path == '/' || $path=='' || $item['mimetype'] !== 'httpd/unix-directory') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$id = $item['id'];
|
$id = $item['id'];
|
||||||
|
@ -363,13 +363,13 @@ class OC_FileCache{
|
||||||
$query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `size`=`size`+? WHERE `id`=?');
|
$query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `size`=`size`+? WHERE `id`=?');
|
||||||
$query->execute(array($sizeDiff, $id));
|
$query->execute(array($sizeDiff, $id));
|
||||||
$path=dirname($path);
|
$path=dirname($path);
|
||||||
if($path == '' or $path =='/'){
|
if($path == '' or $path =='/') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$parent = OC_FileCache_Cached::get($path);
|
$parent = OC_FileCache_Cached::get($path);
|
||||||
$id = $parent['id'];
|
$id = $parent['id'];
|
||||||
//stop walking up the filetree if we hit a non-folder
|
//stop walking up the filetree if we hit a non-folder
|
||||||
if($parent['mimetype'] !== 'httpd/unix-directory'){
|
if($parent['mimetype'] !== 'httpd/unix-directory') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@ class OC_Request {
|
||||||
if(OC::$CLI) {
|
if(OC::$CLI) {
|
||||||
return 'localhost';
|
return 'localhost';
|
||||||
}
|
}
|
||||||
if(OC_Config::getValue('overwritehost', '')<>''){
|
if(OC_Config::getValue('overwritehost', '')<>'') {
|
||||||
return OC_Config::getValue('overwritehost');
|
return OC_Config::getValue('overwritehost');
|
||||||
}
|
}
|
||||||
if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
|
if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
|
||||||
|
@ -43,7 +43,7 @@ class OC_Request {
|
||||||
* Returns the server protocol. It respects reverse proxy servers and load balancers
|
* Returns the server protocol. It respects reverse proxy servers and load balancers
|
||||||
*/
|
*/
|
||||||
public static function serverProtocol() {
|
public static function serverProtocol() {
|
||||||
if(OC_Config::getValue('overwriteprotocol', '')<>''){
|
if(OC_Config::getValue('overwriteprotocol', '')<>'') {
|
||||||
return OC_Config::getValue('overwriteprotocol');
|
return OC_Config::getValue('overwriteprotocol');
|
||||||
}
|
}
|
||||||
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
|
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
|
||||||
|
|
|
@ -7,7 +7,7 @@ $success = true;
|
||||||
$username = $_POST["username"];
|
$username = $_POST["username"];
|
||||||
$group = $_POST["group"];
|
$group = $_POST["group"];
|
||||||
|
|
||||||
if($username == OC_User::getUser() && $group == "admin" && OC_Group::inGroup($username, 'admin')){
|
if($username == OC_User::getUser() && $group == "admin" && OC_Group::inGroup($username, 'admin')) {
|
||||||
$l = OC_L10N::get('core');
|
$l = OC_L10N::get('core');
|
||||||
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
|
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
|
||||||
exit();
|
exit();
|
||||||
|
|
Loading…
Reference in New Issue