Browse Source

Fix "There must be a single space between the closing parenthesis and the opening brace"

remotes/origin/stable5
Bart Visscher 13 years ago
parent
commit
2ef2dc4dda
  1. 2
      apps/files_sharing/public.php
  2. 6
      lib/filecache.php
  3. 4
      lib/request.php
  4. 2
      settings/ajax/togglegroups.php

2
apps/files_sharing/public.php

@ -160,7 +160,7 @@ if ($linkItem) {
exit();
}
}
$basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files'));
$basePath = substr($pathAndUser['path'], strlen('/'.$fileOwner.'/files'));
$path = $basePath;
if (isset($_GET['path'])) {
$path .= $_GET['path'];

6
lib/filecache.php

@ -355,7 +355,7 @@ class OC_FileCache{
if($sizeDiff==0) return;
$item = OC_FileCache_Cached::get($path);
//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;
}
$id = $item['id'];
@ -363,13 +363,13 @@ class OC_FileCache{
$query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `size`=`size`+? WHERE `id`=?');
$query->execute(array($sizeDiff, $id));
$path=dirname($path);
if($path == '' or $path =='/'){
if($path == '' or $path =='/') {
return;
}
$parent = OC_FileCache_Cached::get($path);
$id = $parent['id'];
//stop walking up the filetree if we hit a non-folder
if($parent['mimetype'] !== 'httpd/unix-directory'){
if($parent['mimetype'] !== 'httpd/unix-directory') {
return;
}
}

4
lib/request.php

@ -18,7 +18,7 @@ class OC_Request {
if(OC::$CLI) {
return 'localhost';
}
if(OC_Config::getValue('overwritehost', '')<>''){
if(OC_Config::getValue('overwritehost', '')<>'') {
return OC_Config::getValue('overwritehost');
}
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
*/
public static function serverProtocol() {
if(OC_Config::getValue('overwriteprotocol', '')<>''){
if(OC_Config::getValue('overwriteprotocol', '')<>'') {
return OC_Config::getValue('overwriteprotocol');
}
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {

2
settings/ajax/togglegroups.php

@ -7,7 +7,7 @@ $success = true;
$username = $_POST["username"];
$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');
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
exit();

Loading…
Cancel
Save