nextcloud / server

lib/private/BackgroundJob/TimedJob.php

Indentation +20 added lines, -20 removed lines

@@ -32,26 +32,26 @@
  * @package OC\BackgroundJob
  */
 abstract class TimedJob extends Job {
-	protected $interval = 0;
+    protected $interval = 0;
 
-	/**
-	 * set the interval for the job
-	 *
-	 * @param int $interval
-	 */
-	public function setInterval($interval) {
-		$this->interval = $interval;
-	}
+    /**
+     * set the interval for the job
+     *
+     * @param int $interval
+     */
+    public function setInterval($interval) {
+        $this->interval = $interval;
+    }
 
-	/**
-	 * run the job if
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		if ((time() - $this->lastRun) > $this->interval) {
-			parent::execute($jobList, $logger);
-		}
-	}
+    /**
+     * run the job if
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        if ((time() - $this->lastRun) > $this->interval) {
+            parent::execute($jobList, $logger);
+        }
+    }
 }

lib/private/BackgroundJob/QueuedJob.php

Indentation +10 added lines, -10 removed lines

@@ -32,14 +32,14 @@
  * @package OC\BackgroundJob
  */
 abstract class QueuedJob extends Job {
-	/**
-	 * run the job, then remove it from the joblist
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		$jobList->remove($this, $this->argument);
-		parent::execute($jobList, $logger);
-	}
+    /**
+     * run the job, then remove it from the joblist
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        $jobList->remove($this, $this->argument);
+        parent::execute($jobList, $logger);
+    }
 }

lib/private/Group/Manager.php

Spacing +15 added lines, -15 removed lines

@@ -93,20 +93,20 @@ 
 		$this->logger = $logger;
 		$cachedGroups = & $this->cachedGroups;
 		$cachedUserGroups = & $this->cachedUserGroups;
-		$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) {
+		$this->listen('\OC\Group', 'postDelete', function($group) use (&$cachedGroups, &$cachedUserGroups) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
 			unset($cachedGroups[$group->getGID()]);
 			$cachedUserGroups = array();
 		});
-		$this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) {
+		$this->listen('\OC\Group', 'postAddUser', function($group) use (&$cachedUserGroups) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
 			$cachedUserGroups = array();
 		});
-		$this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) {
+		$this->listen('\OC\Group', 'postRemoveUser', function($group) use (&$cachedUserGroups) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
@@ -235,7 +235,7 @@ 
 				if ($aGroup instanceof IGroup) {
 					$groups[$groupId] = $aGroup;
 				} else {
-					$this->logger->debug('Group "' . $groupId . '" was returned by search but not found through direct access', ['app' => 'core']);
+					$this->logger->debug('Group "'.$groupId.'" was returned by search but not found through direct access', ['app' => 'core']);
 				}
 			}
 			if (!is_null($limit) and $limit <= 0) {
@@ -249,7 +249,7 @@ 
 	 * @param IUser|null $user
 	 * @return \OC\Group\Group[]
 	 */
-	public function getUserGroups(IUser $user= null) {
+	public function getUserGroups(IUser $user = null) {
 		if (!$user instanceof IUser) {
 			return [];
 		}
@@ -273,7 +273,7 @@ 
 					if ($aGroup instanceof IGroup) {
 						$groups[$groupId] = $aGroup;
 					} else {
-						$this->logger->debug('User "' . $uid . '" belongs to deleted group: "' . $groupId . '"', ['app' => 'core']);
+						$this->logger->debug('User "'.$uid.'" belongs to deleted group: "'.$groupId.'"', ['app' => 'core']);
 					}
 				}
 			}
@@ -322,32 +322,32 @@ 
 	 */
 	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		$group = $this->get($gid);
-		if(is_null($group)) {
+		if (is_null($group)) {
 			return array();
 		}
 
 		$search = trim($search);
 		$groupUsers = array();
 
-		if(!empty($search)) {
+		if (!empty($search)) {
 			// only user backends have the capability to do a complex search for users
 			$searchOffset = 0;
 			$searchLimit = $limit * 100;
-			if($limit === -1) {
+			if ($limit === -1) {
 				$searchLimit = 500;
 			}
 
 			do {
 				$filteredUsers = $this->userManager->searchDisplayName($search, $searchLimit, $searchOffset);
-				foreach($filteredUsers as $filteredUser) {
-					if($group->inGroup($filteredUser)) {
-						$groupUsers[]= $filteredUser;
+				foreach ($filteredUsers as $filteredUser) {
+					if ($group->inGroup($filteredUser)) {
+						$groupUsers[] = $filteredUser;
 					}
 				}
 				$searchOffset += $searchLimit;
-			} while(count($groupUsers) < $searchLimit+$offset && count($filteredUsers) >= $searchLimit);
+			} while (count($groupUsers) < $searchLimit + $offset && count($filteredUsers) >= $searchLimit);
 
-			if($limit === -1) {
+			if ($limit === -1) {
 				$groupUsers = array_slice($groupUsers, $offset);
 			} else {
 				$groupUsers = array_slice($groupUsers, $offset, $limit);
@@ -357,7 +357,7 @@ 
 		}
 
 		$matchingUsers = array();
-		foreach($groupUsers as $groupUser) {
+		foreach ($groupUsers as $groupUser) {
 			$matchingUsers[$groupUser->getUID()] = $groupUser->getDisplayName();
 		}
 		return $matchingUsers;

Indentation +344 added lines, -344 removed lines

@@ -61,348 +61,348 @@
  * @package OC\Group
  */
 class Manager extends PublicEmitter implements IGroupManager {
-	/**
-	 * @var GroupInterface[] $backends
-	 */
-	private $backends = array();
-
-	/**
-	 * @var \OC\User\Manager $userManager
-	 */
-	private $userManager;
-
-	/**
-	 * @var \OC\Group\Group[]
-	 */
-	private $cachedGroups = array();
-
-	/**
-	 * @var \OC\Group\Group[]
-	 */
-	private $cachedUserGroups = array();
-
-	/** @var \OC\SubAdmin */
-	private $subAdmin = null;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param \OC\User\Manager $userManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(\OC\User\Manager $userManager, ILogger $logger) {
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$cachedGroups = & $this->cachedGroups;
-		$cachedUserGroups = & $this->cachedUserGroups;
-		$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) {
-			/**
-			 * @var \OC\Group\Group $group
-			 */
-			unset($cachedGroups[$group->getGID()]);
-			$cachedUserGroups = array();
-		});
-		$this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) {
-			/**
-			 * @var \OC\Group\Group $group
-			 */
-			$cachedUserGroups = array();
-		});
-		$this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) {
-			/**
-			 * @var \OC\Group\Group $group
-			 */
-			$cachedUserGroups = array();
-		});
-	}
-
-	/**
-	 * Checks whether a given backend is used
-	 *
-	 * @param string $backendClass Full classname including complete namespace
-	 * @return bool
-	 */
-	public function isBackendUsed($backendClass) {
-		$backendClass = strtolower(ltrim($backendClass, '\\'));
-
-		foreach ($this->backends as $backend) {
-			if (strtolower(get_class($backend)) === $backendClass) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param \OCP\GroupInterface $backend
-	 */
-	public function addBackend($backend) {
-		$this->backends[] = $backend;
-		$this->clearCaches();
-	}
-
-	public function clearBackends() {
-		$this->backends = array();
-		$this->clearCaches();
-	}
-
-	/**
-	 * Get the active backends
-	 * @return \OCP\GroupInterface[]
-	 */
-	public function getBackends() {
-		return $this->backends;
-	}
-
-
-	protected function clearCaches() {
-		$this->cachedGroups = array();
-		$this->cachedUserGroups = array();
-	}
-
-	/**
-	 * @param string $gid
-	 * @return \OC\Group\Group
-	 */
-	public function get($gid) {
-		if (isset($this->cachedGroups[$gid])) {
-			return $this->cachedGroups[$gid];
-		}
-		return $this->getGroupObject($gid);
-	}
-
-	/**
-	 * @param string $gid
-	 * @param string $displayName
-	 * @return \OCP\IGroup
-	 */
-	protected function getGroupObject($gid, $displayName = null) {
-		$backends = array();
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC\Group\Backend::GROUP_DETAILS)) {
-				$groupData = $backend->getGroupDetails($gid);
-				if (is_array($groupData) && !empty($groupData)) {
-					// take the display name from the first backend that has a non-null one
-					if (is_null($displayName) && isset($groupData['displayName'])) {
-						$displayName = $groupData['displayName'];
-					}
-					$backends[] = $backend;
-				}
-			} else if ($backend->groupExists($gid)) {
-				$backends[] = $backend;
-			}
-		}
-		if (count($backends) === 0) {
-			return null;
-		}
-		$this->cachedGroups[$gid] = new Group($gid, $backends, $this->userManager, $this, $displayName);
-		return $this->cachedGroups[$gid];
-	}
-
-	/**
-	 * @param string $gid
-	 * @return bool
-	 */
-	public function groupExists($gid) {
-		return $this->get($gid) instanceof IGroup;
-	}
-
-	/**
-	 * @param string $gid
-	 * @return \OC\Group\Group
-	 */
-	public function createGroup($gid) {
-		if ($gid === '' || $gid === null) {
-			return false;
-		} else if ($group = $this->get($gid)) {
-			return $group;
-		} else {
-			$this->emit('\OC\Group', 'preCreate', array($gid));
-			foreach ($this->backends as $backend) {
-				if ($backend->implementsActions(\OC\Group\Backend::CREATE_GROUP)) {
-					$backend->createGroup($gid);
-					$group = $this->getGroupObject($gid);
-					$this->emit('\OC\Group', 'postCreate', array($group));
-					return $group;
-				}
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \OC\Group\Group[]
-	 */
-	public function search($search, $limit = null, $offset = null) {
-		$groups = array();
-		foreach ($this->backends as $backend) {
-			$groupIds = $backend->getGroups($search, $limit, $offset);
-			foreach ($groupIds as $groupId) {
-				$aGroup = $this->get($groupId);
-				if ($aGroup instanceof IGroup) {
-					$groups[$groupId] = $aGroup;
-				} else {
-					$this->logger->debug('Group "' . $groupId . '" was returned by search but not found through direct access', ['app' => 'core']);
-				}
-			}
-			if (!is_null($limit) and $limit <= 0) {
-				return array_values($groups);
-			}
-		}
-		return array_values($groups);
-	}
-
-	/**
-	 * @param IUser|null $user
-	 * @return \OC\Group\Group[]
-	 */
-	public function getUserGroups(IUser $user= null) {
-		if (!$user instanceof IUser) {
-			return [];
-		}
-		return $this->getUserIdGroups($user->getUID());
-	}
-
-	/**
-	 * @param string $uid the user id
-	 * @return \OC\Group\Group[]
-	 */
-	public function getUserIdGroups($uid) {
-		if (isset($this->cachedUserGroups[$uid])) {
-			return $this->cachedUserGroups[$uid];
-		}
-		$groups = array();
-		foreach ($this->backends as $backend) {
-			$groupIds = $backend->getUserGroups($uid);
-			if (is_array($groupIds)) {
-				foreach ($groupIds as $groupId) {
-					$aGroup = $this->get($groupId);
-					if ($aGroup instanceof IGroup) {
-						$groups[$groupId] = $aGroup;
-					} else {
-						$this->logger->debug('User "' . $uid . '" belongs to deleted group: "' . $groupId . '"', ['app' => 'core']);
-					}
-				}
-			}
-		}
-		$this->cachedUserGroups[$uid] = $groups;
-		return $this->cachedUserGroups[$uid];
-	}
-
-	/**
-	 * Checks if a userId is in the admin group
-	 * @param string $userId
-	 * @return bool if admin
-	 */
-	public function isAdmin($userId) {
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC\Group\Backend::IS_ADMIN) && $backend->isAdmin($userId)) {
-				return true;
-			}
-		}
-		return $this->isInGroup($userId, 'admin');
-	}
-
-	/**
-	 * Checks if a userId is in a group
-	 * @param string $userId
-	 * @param string $group
-	 * @return bool if in group
-	 */
-	public function isInGroup($userId, $group) {
-		return array_key_exists($group, $this->getUserIdGroups($userId));
-	}
-
-	/**
-	 * get a list of group ids for a user
-	 * @param IUser $user
-	 * @return array with group ids
-	 */
-	public function getUserGroupIds(IUser $user) {
-		return array_map(function($value) {
-			return (string) $value;
-		}, array_keys($this->getUserGroups($user)));
-	}
-
-	/**
-	 * get an array of groupid and displayName for a user
-	 * @param IUser $user
-	 * @return array ['displayName' => displayname]
-	 */
-	public function getUserGroupNames(IUser $user) {
-		return array_map(function($group) {
-			return array('displayName' => $group->getDisplayName());
-		}, $this->getUserGroups($user));
-	}
-
-	/**
-	 * get a list of all display names in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of display names (value) and user ids (key)
-	 */
-	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		$group = $this->get($gid);
-		if(is_null($group)) {
-			return array();
-		}
-
-		$search = trim($search);
-		$groupUsers = array();
-
-		if(!empty($search)) {
-			// only user backends have the capability to do a complex search for users
-			$searchOffset = 0;
-			$searchLimit = $limit * 100;
-			if($limit === -1) {
-				$searchLimit = 500;
-			}
-
-			do {
-				$filteredUsers = $this->userManager->searchDisplayName($search, $searchLimit, $searchOffset);
-				foreach($filteredUsers as $filteredUser) {
-					if($group->inGroup($filteredUser)) {
-						$groupUsers[]= $filteredUser;
-					}
-				}
-				$searchOffset += $searchLimit;
-			} while(count($groupUsers) < $searchLimit+$offset && count($filteredUsers) >= $searchLimit);
-
-			if($limit === -1) {
-				$groupUsers = array_slice($groupUsers, $offset);
-			} else {
-				$groupUsers = array_slice($groupUsers, $offset, $limit);
-			}
-		} else {
-			$groupUsers = $group->searchUsers('', $limit, $offset);
-		}
-
-		$matchingUsers = array();
-		foreach($groupUsers as $groupUser) {
-			$matchingUsers[$groupUser->getUID()] = $groupUser->getDisplayName();
-		}
-		return $matchingUsers;
-	}
-
-	/**
-	 * @return \OC\SubAdmin
-	 */
-	public function getSubAdmin() {
-		if (!$this->subAdmin) {
-			$this->subAdmin = new \OC\SubAdmin(
-				$this->userManager,
-				$this,
-				\OC::$server->getDatabaseConnection()
-			);
-		}
-
-		return $this->subAdmin;
-	}
+    /**
+     * @var GroupInterface[] $backends
+     */
+    private $backends = array();
+
+    /**
+     * @var \OC\User\Manager $userManager
+     */
+    private $userManager;
+
+    /**
+     * @var \OC\Group\Group[]
+     */
+    private $cachedGroups = array();
+
+    /**
+     * @var \OC\Group\Group[]
+     */
+    private $cachedUserGroups = array();
+
+    /** @var \OC\SubAdmin */
+    private $subAdmin = null;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @param \OC\User\Manager $userManager
+     * @param ILogger $logger
+     */
+    public function __construct(\OC\User\Manager $userManager, ILogger $logger) {
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $cachedGroups = & $this->cachedGroups;
+        $cachedUserGroups = & $this->cachedUserGroups;
+        $this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) {
+            /**
+             * @var \OC\Group\Group $group
+             */
+            unset($cachedGroups[$group->getGID()]);
+            $cachedUserGroups = array();
+        });
+        $this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) {
+            /**
+             * @var \OC\Group\Group $group
+             */
+            $cachedUserGroups = array();
+        });
+        $this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) {
+            /**
+             * @var \OC\Group\Group $group
+             */
+            $cachedUserGroups = array();
+        });
+    }
+
+    /**
+     * Checks whether a given backend is used
+     *
+     * @param string $backendClass Full classname including complete namespace
+     * @return bool
+     */
+    public function isBackendUsed($backendClass) {
+        $backendClass = strtolower(ltrim($backendClass, '\\'));
+
+        foreach ($this->backends as $backend) {
+            if (strtolower(get_class($backend)) === $backendClass) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param \OCP\GroupInterface $backend
+     */
+    public function addBackend($backend) {
+        $this->backends[] = $backend;
+        $this->clearCaches();
+    }
+
+    public function clearBackends() {
+        $this->backends = array();
+        $this->clearCaches();
+    }
+
+    /**
+     * Get the active backends
+     * @return \OCP\GroupInterface[]
+     */
+    public function getBackends() {
+        return $this->backends;
+    }
+
+
+    protected function clearCaches() {
+        $this->cachedGroups = array();
+        $this->cachedUserGroups = array();
+    }
+
+    /**
+     * @param string $gid
+     * @return \OC\Group\Group
+     */
+    public function get($gid) {
+        if (isset($this->cachedGroups[$gid])) {
+            return $this->cachedGroups[$gid];
+        }
+        return $this->getGroupObject($gid);
+    }
+
+    /**
+     * @param string $gid
+     * @param string $displayName
+     * @return \OCP\IGroup
+     */
+    protected function getGroupObject($gid, $displayName = null) {
+        $backends = array();
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(\OC\Group\Backend::GROUP_DETAILS)) {
+                $groupData = $backend->getGroupDetails($gid);
+                if (is_array($groupData) && !empty($groupData)) {
+                    // take the display name from the first backend that has a non-null one
+                    if (is_null($displayName) && isset($groupData['displayName'])) {
+                        $displayName = $groupData['displayName'];
+                    }
+                    $backends[] = $backend;
+                }
+            } else if ($backend->groupExists($gid)) {
+                $backends[] = $backend;
+            }
+        }
+        if (count($backends) === 0) {
+            return null;
+        }
+        $this->cachedGroups[$gid] = new Group($gid, $backends, $this->userManager, $this, $displayName);
+        return $this->cachedGroups[$gid];
+    }
+
+    /**
+     * @param string $gid
+     * @return bool
+     */
+    public function groupExists($gid) {
+        return $this->get($gid) instanceof IGroup;
+    }
+
+    /**
+     * @param string $gid
+     * @return \OC\Group\Group
+     */
+    public function createGroup($gid) {
+        if ($gid === '' || $gid === null) {
+            return false;
+        } else if ($group = $this->get($gid)) {
+            return $group;
+        } else {
+            $this->emit('\OC\Group', 'preCreate', array($gid));
+            foreach ($this->backends as $backend) {
+                if ($backend->implementsActions(\OC\Group\Backend::CREATE_GROUP)) {
+                    $backend->createGroup($gid);
+                    $group = $this->getGroupObject($gid);
+                    $this->emit('\OC\Group', 'postCreate', array($group));
+                    return $group;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return \OC\Group\Group[]
+     */
+    public function search($search, $limit = null, $offset = null) {
+        $groups = array();
+        foreach ($this->backends as $backend) {
+            $groupIds = $backend->getGroups($search, $limit, $offset);
+            foreach ($groupIds as $groupId) {
+                $aGroup = $this->get($groupId);
+                if ($aGroup instanceof IGroup) {
+                    $groups[$groupId] = $aGroup;
+                } else {
+                    $this->logger->debug('Group "' . $groupId . '" was returned by search but not found through direct access', ['app' => 'core']);
+                }
+            }
+            if (!is_null($limit) and $limit <= 0) {
+                return array_values($groups);
+            }
+        }
+        return array_values($groups);
+    }
+
+    /**
+     * @param IUser|null $user
+     * @return \OC\Group\Group[]
+     */
+    public function getUserGroups(IUser $user= null) {
+        if (!$user instanceof IUser) {
+            return [];
+        }
+        return $this->getUserIdGroups($user->getUID());
+    }
+
+    /**
+     * @param string $uid the user id
+     * @return \OC\Group\Group[]
+     */
+    public function getUserIdGroups($uid) {
+        if (isset($this->cachedUserGroups[$uid])) {
+            return $this->cachedUserGroups[$uid];
+        }
+        $groups = array();
+        foreach ($this->backends as $backend) {
+            $groupIds = $backend->getUserGroups($uid);
+            if (is_array($groupIds)) {
+                foreach ($groupIds as $groupId) {
+                    $aGroup = $this->get($groupId);
+                    if ($aGroup instanceof IGroup) {
+                        $groups[$groupId] = $aGroup;
+                    } else {
+                        $this->logger->debug('User "' . $uid . '" belongs to deleted group: "' . $groupId . '"', ['app' => 'core']);
+                    }
+                }
+            }
+        }
+        $this->cachedUserGroups[$uid] = $groups;
+        return $this->cachedUserGroups[$uid];
+    }
+
+    /**
+     * Checks if a userId is in the admin group
+     * @param string $userId
+     * @return bool if admin
+     */
+    public function isAdmin($userId) {
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(\OC\Group\Backend::IS_ADMIN) && $backend->isAdmin($userId)) {
+                return true;
+            }
+        }
+        return $this->isInGroup($userId, 'admin');
+    }
+
+    /**
+     * Checks if a userId is in a group
+     * @param string $userId
+     * @param string $group
+     * @return bool if in group
+     */
+    public function isInGroup($userId, $group) {
+        return array_key_exists($group, $this->getUserIdGroups($userId));
+    }
+
+    /**
+     * get a list of group ids for a user
+     * @param IUser $user
+     * @return array with group ids
+     */
+    public function getUserGroupIds(IUser $user) {
+        return array_map(function($value) {
+            return (string) $value;
+        }, array_keys($this->getUserGroups($user)));
+    }
+
+    /**
+     * get an array of groupid and displayName for a user
+     * @param IUser $user
+     * @return array ['displayName' => displayname]
+     */
+    public function getUserGroupNames(IUser $user) {
+        return array_map(function($group) {
+            return array('displayName' => $group->getDisplayName());
+        }, $this->getUserGroups($user));
+    }
+
+    /**
+     * get a list of all display names in a group
+     * @param string $gid
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of display names (value) and user ids (key)
+     */
+    public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+        $group = $this->get($gid);
+        if(is_null($group)) {
+            return array();
+        }
+
+        $search = trim($search);
+        $groupUsers = array();
+
+        if(!empty($search)) {
+            // only user backends have the capability to do a complex search for users
+            $searchOffset = 0;
+            $searchLimit = $limit * 100;
+            if($limit === -1) {
+                $searchLimit = 500;
+            }
+
+            do {
+                $filteredUsers = $this->userManager->searchDisplayName($search, $searchLimit, $searchOffset);
+                foreach($filteredUsers as $filteredUser) {
+                    if($group->inGroup($filteredUser)) {
+                        $groupUsers[]= $filteredUser;
+                    }
+                }
+                $searchOffset += $searchLimit;
+            } while(count($groupUsers) < $searchLimit+$offset && count($filteredUsers) >= $searchLimit);
+
+            if($limit === -1) {
+                $groupUsers = array_slice($groupUsers, $offset);
+            } else {
+                $groupUsers = array_slice($groupUsers, $offset, $limit);
+            }
+        } else {
+            $groupUsers = $group->searchUsers('', $limit, $offset);
+        }
+
+        $matchingUsers = array();
+        foreach($groupUsers as $groupUser) {
+            $matchingUsers[$groupUser->getUID()] = $groupUser->getDisplayName();
+        }
+        return $matchingUsers;
+    }
+
+    /**
+     * @return \OC\SubAdmin
+     */
+    public function getSubAdmin() {
+        if (!$this->subAdmin) {
+            $this->subAdmin = new \OC\SubAdmin(
+                $this->userManager,
+                $this,
+                \OC::$server->getDatabaseConnection()
+            );
+        }
+
+        return $this->subAdmin;
+    }
 }

lib/private/Files/Storage/Wrapper/Availability.php

Indentation +435 added lines, -435 removed lines

@@ -30,439 +30,439 @@
  * Throws a StorageNotAvailableException for storages with known failures
  */
 class Availability extends Wrapper {
-	const RECHECK_TTL_SEC = 600; // 10 minutes
-
-	public static function shouldRecheck($availability) {
-		if (!$availability['available']) {
-			// trigger a recheck if TTL reached
-			if ((time() - $availability['last_checked']) > self::RECHECK_TTL_SEC) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Only called if availability === false
-	 *
-	 * @return bool
-	 */
-	private function updateAvailability() {
-		// reset availability to false so that multiple requests don't recheck concurrently
-		$this->setAvailability(false);
-		try {
-			$result = $this->test();
-		} catch (\Exception $e) {
-			$result = false;
-		}
-		$this->setAvailability($result);
-		return $result;
-	}
-
-	/**
-	 * @return bool
-	 */
-	private function isAvailable() {
-		$availability = $this->getAvailability();
-		if (self::shouldRecheck($availability)) {
-			return $this->updateAvailability();
-		}
-		return $availability['available'];
-	}
-
-	/**
-	 * @throws \OCP\Files\StorageNotAvailableException
-	 */
-	private function checkAvailability() {
-		if (!$this->isAvailable()) {
-			throw new \OCP\Files\StorageNotAvailableException();
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function mkdir($path) {
-		$this->checkAvailability();
-		try {
-			return parent::mkdir($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function rmdir($path) {
-		$this->checkAvailability();
-		try {
-			return parent::rmdir($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function opendir($path) {
-		$this->checkAvailability();
-		try {
-			return parent::opendir($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function is_dir($path) {
-		$this->checkAvailability();
-		try {
-			return parent::is_dir($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function is_file($path) {
-		$this->checkAvailability();
-		try {
-			return parent::is_file($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function stat($path) {
-		$this->checkAvailability();
-		try {
-			return parent::stat($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function filetype($path) {
-		$this->checkAvailability();
-		try {
-			return parent::filetype($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function filesize($path) {
-		$this->checkAvailability();
-		try {
-			return parent::filesize($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function isCreatable($path) {
-		$this->checkAvailability();
-		try {
-			return parent::isCreatable($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function isReadable($path) {
-		$this->checkAvailability();
-		try {
-			return parent::isReadable($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function isUpdatable($path) {
-		$this->checkAvailability();
-		try {
-			return parent::isUpdatable($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function isDeletable($path) {
-		$this->checkAvailability();
-		try {
-			return parent::isDeletable($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function isSharable($path) {
-		$this->checkAvailability();
-		try {
-			return parent::isSharable($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function getPermissions($path) {
-		$this->checkAvailability();
-		try {
-			return parent::getPermissions($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function file_exists($path) {
-		if ($path === '') {
-			return true;
-		}
-		$this->checkAvailability();
-		try {
-			return parent::file_exists($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function filemtime($path) {
-		$this->checkAvailability();
-		try {
-			return parent::filemtime($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function file_get_contents($path) {
-		$this->checkAvailability();
-		try {
-			return parent::file_get_contents($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function file_put_contents($path, $data) {
-		$this->checkAvailability();
-		try {
-			return parent::file_put_contents($path, $data);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function unlink($path) {
-		$this->checkAvailability();
-		try {
-			return parent::unlink($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function rename($path1, $path2) {
-		$this->checkAvailability();
-		try {
-			return parent::rename($path1, $path2);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function copy($path1, $path2) {
-		$this->checkAvailability();
-		try {
-			return parent::copy($path1, $path2);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function fopen($path, $mode) {
-		$this->checkAvailability();
-		try {
-			return parent::fopen($path, $mode);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function getMimeType($path) {
-		$this->checkAvailability();
-		try {
-			return parent::getMimeType($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function hash($type, $path, $raw = false) {
-		$this->checkAvailability();
-		try {
-			return parent::hash($type, $path, $raw);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function free_space($path) {
-		$this->checkAvailability();
-		try {
-			return parent::free_space($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function search($query) {
-		$this->checkAvailability();
-		try {
-			return parent::search($query);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function touch($path, $mtime = null) {
-		$this->checkAvailability();
-		try {
-			return parent::touch($path, $mtime);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function getLocalFile($path) {
-		$this->checkAvailability();
-		try {
-			return parent::getLocalFile($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function hasUpdated($path, $time) {
-		$this->checkAvailability();
-		try {
-			return parent::hasUpdated($path, $time);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function getOwner($path) {
-		try {
-			return parent::getOwner($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function getETag($path) {
-		$this->checkAvailability();
-		try {
-			return parent::getETag($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function getDirectDownload($path) {
-		$this->checkAvailability();
-		try {
-			return parent::getDirectDownload($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		$this->checkAvailability();
-		try {
-			return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		$this->checkAvailability();
-		try {
-			return parent::moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function getMetaData($path) {
-		$this->checkAvailability();
-		try {
-			return parent::getMetaData($path);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$this->setAvailability(false);
-			throw $e;
-		}
-	}
+    const RECHECK_TTL_SEC = 600; // 10 minutes
+
+    public static function shouldRecheck($availability) {
+        if (!$availability['available']) {
+            // trigger a recheck if TTL reached
+            if ((time() - $availability['last_checked']) > self::RECHECK_TTL_SEC) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Only called if availability === false
+     *
+     * @return bool
+     */
+    private function updateAvailability() {
+        // reset availability to false so that multiple requests don't recheck concurrently
+        $this->setAvailability(false);
+        try {
+            $result = $this->test();
+        } catch (\Exception $e) {
+            $result = false;
+        }
+        $this->setAvailability($result);
+        return $result;
+    }
+
+    /**
+     * @return bool
+     */
+    private function isAvailable() {
+        $availability = $this->getAvailability();
+        if (self::shouldRecheck($availability)) {
+            return $this->updateAvailability();
+        }
+        return $availability['available'];
+    }
+
+    /**
+     * @throws \OCP\Files\StorageNotAvailableException
+     */
+    private function checkAvailability() {
+        if (!$this->isAvailable()) {
+            throw new \OCP\Files\StorageNotAvailableException();
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function mkdir($path) {
+        $this->checkAvailability();
+        try {
+            return parent::mkdir($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function rmdir($path) {
+        $this->checkAvailability();
+        try {
+            return parent::rmdir($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function opendir($path) {
+        $this->checkAvailability();
+        try {
+            return parent::opendir($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function is_dir($path) {
+        $this->checkAvailability();
+        try {
+            return parent::is_dir($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function is_file($path) {
+        $this->checkAvailability();
+        try {
+            return parent::is_file($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function stat($path) {
+        $this->checkAvailability();
+        try {
+            return parent::stat($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function filetype($path) {
+        $this->checkAvailability();
+        try {
+            return parent::filetype($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function filesize($path) {
+        $this->checkAvailability();
+        try {
+            return parent::filesize($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function isCreatable($path) {
+        $this->checkAvailability();
+        try {
+            return parent::isCreatable($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function isReadable($path) {
+        $this->checkAvailability();
+        try {
+            return parent::isReadable($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function isUpdatable($path) {
+        $this->checkAvailability();
+        try {
+            return parent::isUpdatable($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function isDeletable($path) {
+        $this->checkAvailability();
+        try {
+            return parent::isDeletable($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function isSharable($path) {
+        $this->checkAvailability();
+        try {
+            return parent::isSharable($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function getPermissions($path) {
+        $this->checkAvailability();
+        try {
+            return parent::getPermissions($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function file_exists($path) {
+        if ($path === '') {
+            return true;
+        }
+        $this->checkAvailability();
+        try {
+            return parent::file_exists($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function filemtime($path) {
+        $this->checkAvailability();
+        try {
+            return parent::filemtime($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function file_get_contents($path) {
+        $this->checkAvailability();
+        try {
+            return parent::file_get_contents($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function file_put_contents($path, $data) {
+        $this->checkAvailability();
+        try {
+            return parent::file_put_contents($path, $data);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function unlink($path) {
+        $this->checkAvailability();
+        try {
+            return parent::unlink($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function rename($path1, $path2) {
+        $this->checkAvailability();
+        try {
+            return parent::rename($path1, $path2);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function copy($path1, $path2) {
+        $this->checkAvailability();
+        try {
+            return parent::copy($path1, $path2);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function fopen($path, $mode) {
+        $this->checkAvailability();
+        try {
+            return parent::fopen($path, $mode);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function getMimeType($path) {
+        $this->checkAvailability();
+        try {
+            return parent::getMimeType($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function hash($type, $path, $raw = false) {
+        $this->checkAvailability();
+        try {
+            return parent::hash($type, $path, $raw);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function free_space($path) {
+        $this->checkAvailability();
+        try {
+            return parent::free_space($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function search($query) {
+        $this->checkAvailability();
+        try {
+            return parent::search($query);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function touch($path, $mtime = null) {
+        $this->checkAvailability();
+        try {
+            return parent::touch($path, $mtime);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function getLocalFile($path) {
+        $this->checkAvailability();
+        try {
+            return parent::getLocalFile($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function hasUpdated($path, $time) {
+        $this->checkAvailability();
+        try {
+            return parent::hasUpdated($path, $time);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function getOwner($path) {
+        try {
+            return parent::getOwner($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function getETag($path) {
+        $this->checkAvailability();
+        try {
+            return parent::getETag($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function getDirectDownload($path) {
+        $this->checkAvailability();
+        try {
+            return parent::getDirectDownload($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+        $this->checkAvailability();
+        try {
+            return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+        $this->checkAvailability();
+        try {
+            return parent::moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function getMetaData($path) {
+        $this->checkAvailability();
+        try {
+            return parent::getMetaData($path);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $this->setAvailability(false);
+            throw $e;
+        }
+    }
 }

lib/public/IDateTimeFormatter.php

Indentation +104 added lines, -104 removed lines

@@ -30,114 +30,114 @@
  * @since 8.0.0
  */
 interface IDateTimeFormatter {
-	/**
-	 * Formats the date of the given timestamp
-	 *
-	 * @param int|\DateTime		$timestamp
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
-	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
-	 * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
-	 * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
-	 * 				The exact format is dependent on the language
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
-	 * @param \OCP\IL10N|null	$l			The locale to use
-	 * @return string Formatted date string
-	 * @since 8.0.0
-	 */
-	public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
+    /**
+     * Formats the date of the given timestamp
+     *
+     * @param int|\DateTime		$timestamp
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
+     * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
+     * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
+     * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
+     * 				The exact format is dependent on the language
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
+     * @param \OCP\IL10N|null	$l			The locale to use
+     * @return string Formatted date string
+     * @since 8.0.0
+     */
+    public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
 
-	/**
-	 * Formats the date of the given timestamp
-	 *
-	 * @param int|\DateTime		$timestamp
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
-	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
-	 * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
-	 * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
-	 * 				The exact format is dependent on the language
-	 * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
-	 * @param \OCP\IL10N|null	$l			The locale to use
-	 * @return string Formatted relative date string
-	 * @since 8.0.0
-	 */
-	public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
+    /**
+     * Formats the date of the given timestamp
+     *
+     * @param int|\DateTime		$timestamp
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
+     * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
+     * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
+     * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
+     * 				The exact format is dependent on the language
+     * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
+     * @param \OCP\IL10N|null	$l			The locale to use
+     * @return string Formatted relative date string
+     * @since 8.0.0
+     */
+    public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
 
-	/**
-	 * Gives the relative date of the timestamp
-	 * Only works for past dates
-	 *
-	 * @param int|\DateTime	$timestamp
-	 * @param int|\DateTime|null	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
-	 * @param \OCP\IL10N|null		$l			The locale to use
-	 * @return string	Dates returned are:
-	 * 				<  1 month	=> Today, Yesterday, n days ago
-	 * 				< 13 month	=> last month, n months ago
-	 * 				>= 13 month	=> last year, n years ago
-	 * @since 8.0.0
-	 */
-	public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null);
+    /**
+     * Gives the relative date of the timestamp
+     * Only works for past dates
+     *
+     * @param int|\DateTime	$timestamp
+     * @param int|\DateTime|null	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
+     * @param \OCP\IL10N|null		$l			The locale to use
+     * @return string	Dates returned are:
+     * 				<  1 month	=> Today, Yesterday, n days ago
+     * 				< 13 month	=> last month, n months ago
+     * 				>= 13 month	=> last year, n years ago
+     * @since 8.0.0
+     */
+    public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null);
 
-	/**
-	 * Formats the time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'h:mm:ss a zzzz'	=> '11:42:13 AM GMT+0:00'
-	 * 				long:	e.g. 'h:mm:ss a z'		=> '11:42:13 AM GMT'
-	 * 				medium:	e.g. 'h:mm:ss a'		=> '11:42:13 AM'
-	 * 				short:	e.g. 'h:mm a'			=> '11:42 AM'
-	 * 				The exact format is dependent on the language
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
-	 * @param \OCP\IL10N|null		$l			The locale to use
-	 * @return string Formatted time string
-	 * @since 8.0.0
-	 */
-	public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
+    /**
+     * Formats the time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'h:mm:ss a zzzz'	=> '11:42:13 AM GMT+0:00'
+     * 				long:	e.g. 'h:mm:ss a z'		=> '11:42:13 AM GMT'
+     * 				medium:	e.g. 'h:mm:ss a'		=> '11:42:13 AM'
+     * 				short:	e.g. 'h:mm a'			=> '11:42 AM'
+     * 				The exact format is dependent on the language
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
+     * @param \OCP\IL10N|null		$l			The locale to use
+     * @return string Formatted time string
+     * @since 8.0.0
+     */
+    public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
 
-	/**
-	 * Gives the relative past time of the timestamp
-	 *
-	 * @param int|\DateTime	$timestamp
-	 * @param int|\DateTime|null	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
-	 * @param \OCP\IL10N|null		$l			The locale to use
-	 * @return string	Dates returned are:
-	 * 				< 60 sec	=> seconds ago
-	 * 				<  1 hour	=> n minutes ago
-	 * 				<  1 day	=> n hours ago
-	 * 				<  1 month	=> Yesterday, n days ago
-	 * 				< 13 month	=> last month, n months ago
-	 * 				>= 13 month	=> last year, n years ago
-	 * @since 8.0.0
-	 */
-	public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null);
+    /**
+     * Gives the relative past time of the timestamp
+     *
+     * @param int|\DateTime	$timestamp
+     * @param int|\DateTime|null	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
+     * @param \OCP\IL10N|null		$l			The locale to use
+     * @return string	Dates returned are:
+     * 				< 60 sec	=> seconds ago
+     * 				<  1 hour	=> n minutes ago
+     * 				<  1 day	=> n hours ago
+     * 				<  1 month	=> Yesterday, n days ago
+     * 				< 13 month	=> last month, n months ago
+     * 				>= 13 month	=> last year, n years ago
+     * @since 8.0.0
+     */
+    public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null);
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp
-	 * @param string	$formatDate		See formatDate() for description
-	 * @param string	$formatTime		See formatTime() for description
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
-	 * @param \OCP\IL10N|null		$l			The locale to use
-	 * @return string Formatted date and time string
-	 * @since 8.0.0
-	 */
-	public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp
+     * @param string	$formatDate		See formatDate() for description
+     * @param string	$formatTime		See formatTime() for description
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
+     * @param \OCP\IL10N|null		$l			The locale to use
+     * @return string Formatted date and time string
+     * @since 8.0.0
+     */
+    public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp
-	 * @param string	$formatDate		See formatDate() for description
-	 * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
-	 * @param string	$formatTime		See formatTime() for description
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
-	 * @param \OCP\IL10N|null		$l			The locale to use
-	 * @return string Formatted relative date and time string
-	 * @since 8.0.0
-	 */
-	public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp
+     * @param string	$formatDate		See formatDate() for description
+     * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+     * @param string	$formatTime		See formatTime() for description
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
+     * @param \OCP\IL10N|null		$l			The locale to use
+     * @return string Formatted relative date and time string
+     * @since 8.0.0
+     */
+    public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
 }

lib/public/Search/PagedProvider.php

Indentation +32 added lines, -32 removed lines

@@ -30,39 +30,39 @@
  */
 abstract class PagedProvider extends Provider {
 
-	/**
-	 * show all results
-	 * @since 8.0.0
-	 */
-	const SIZE_ALL = 0;
+    /**
+     * show all results
+     * @since 8.0.0
+     */
+    const SIZE_ALL = 0;
 
-	/**
-	 * Constructor
-	 * @param array $options
-	 * @since 8.0.0
-	 */
-	public function __construct($options) {
-		parent::__construct($options);
-	}
+    /**
+     * Constructor
+     * @param array $options
+     * @since 8.0.0
+     */
+    public function __construct($options) {
+        parent::__construct($options);
+    }
 
-	/**
-	 * Search for $query
-	 * @param string $query
-	 * @return array An array of OCP\Search\Result's
-	 * @since 8.0.0
-	 */
-	public function search($query) {
-		// old apps might assume they get all results, so we use SIZE_ALL
-		return $this->searchPaged($query, 1, self::SIZE_ALL);
-	}
+    /**
+     * Search for $query
+     * @param string $query
+     * @return array An array of OCP\Search\Result's
+     * @since 8.0.0
+     */
+    public function search($query) {
+        // old apps might assume they get all results, so we use SIZE_ALL
+        return $this->searchPaged($query, 1, self::SIZE_ALL);
+    }
 
-	/**
-	 * Search for $query
-	 * @param string $query
-	 * @param int $page pages start at page 1
-	 * @param int $size 0 = SIZE_ALL
-	 * @return array An array of OCP\Search\Result's
-	 * @since 8.0.0
-	 */
-	abstract public function searchPaged($query, $page, $size);
+    /**
+     * Search for $query
+     * @param string $query
+     * @param int $page pages start at page 1
+     * @param int $size 0 = SIZE_ALL
+     * @return array An array of OCP\Search\Result's
+     * @since 8.0.0
+     */
+    abstract public function searchPaged($query, $page, $size);
 }

lib/public/Share/Exceptions/GenericShareException.php

Indentation +13 added lines, -13 removed lines

@@ -31,18 +31,18 @@
  */
 class GenericShareException extends HintException {
 
-	/**
-	 * @param string $message
-	 * @param string $hint
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 * @since 9.0.0
-	 */
-	public function __construct($message = '', $hint = '', $code = 0, \Exception $previous = null) {
-		if (empty($message)) {
-			$message = 'There was an error retrieving the share. Maybe the link is wrong, it was unshared, or it was deleted.';
-		}
-		parent::__construct($message, $hint, $code, $previous);
-	}
+    /**
+     * @param string $message
+     * @param string $hint
+     * @param int $code
+     * @param \Exception|null $previous
+     * @since 9.0.0
+     */
+    public function __construct($message = '', $hint = '', $code = 0, \Exception $previous = null) {
+        if (empty($message)) {
+            $message = 'There was an error retrieving the share. Maybe the link is wrong, it was unshared, or it was deleted.';
+        }
+        parent::__construct($message, $hint, $code, $previous);
+    }
 
 }

lib/public/BackgroundJob/IJob.php

Indentation +46 added lines, -46 removed lines

@@ -32,56 +32,56 @@
  * @since 7.0.0
  */
 interface IJob {
-	/**
-	 * Run the background job with the registered argument
-	 *
-	 * @param \OCP\BackgroundJob\IJobList $jobList The job list that manages the state of this job
-	 * @param ILogger|null $logger
-	 * @since 7.0.0
-	 */
-	public function execute($jobList, ILogger $logger = null);
+    /**
+     * Run the background job with the registered argument
+     *
+     * @param \OCP\BackgroundJob\IJobList $jobList The job list that manages the state of this job
+     * @param ILogger|null $logger
+     * @since 7.0.0
+     */
+    public function execute($jobList, ILogger $logger = null);
 
-	/**
-	 * @param int $id
-	 * @since 7.0.0
-	 */
-	public function setId($id);
+    /**
+     * @param int $id
+     * @since 7.0.0
+     */
+    public function setId($id);
 
-	/**
-	 * @param int $lastRun
-	 * @since 7.0.0
-	 */
-	public function setLastRun($lastRun);
+    /**
+     * @param int $lastRun
+     * @since 7.0.0
+     */
+    public function setLastRun($lastRun);
 
-	/**
-	 * @param mixed $argument
-	 * @since 7.0.0
-	 */
-	public function setArgument($argument);
+    /**
+     * @param mixed $argument
+     * @since 7.0.0
+     */
+    public function setArgument($argument);
 
-	/**
-	 * Get the id of the background job
-	 * This id is determined by the job list when a job is added to the list
-	 *
-	 * @return int
-	 * @since 7.0.0
-	 */
-	public function getId();
+    /**
+     * Get the id of the background job
+     * This id is determined by the job list when a job is added to the list
+     *
+     * @return int
+     * @since 7.0.0
+     */
+    public function getId();
 
-	/**
-	 * Get the last time this job was run as unix timestamp
-	 *
-	 * @return int
-	 * @since 7.0.0
-	 */
-	public function getLastRun();
+    /**
+     * Get the last time this job was run as unix timestamp
+     *
+     * @return int
+     * @since 7.0.0
+     */
+    public function getLastRun();
 
-	/**
-	 * Get the argument associated with the background job
-	 * This is the argument that will be passed to the background job
-	 *
-	 * @return mixed
-	 * @since 7.0.0
-	 */
-	public function getArgument();
+    /**
+     * Get the argument associated with the background job
+     * This is the argument that will be passed to the background job
+     *
+     * @return mixed
+     * @since 7.0.0
+     */
+    public function getArgument();
 }

lib/public/Encryption/Exceptions/GenericEncryptionException.php

Indentation +13 added lines, -13 removed lines

@@ -35,18 +35,18 @@
  */
 class GenericEncryptionException extends HintException {
 
-	/**
-	 * @param string $message
-	 * @param string $hint
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 * @since 8.1.0
-	 */
-	public function __construct($message = '', $hint = '', $code = 0, \Exception $previous = null) {
-		if (empty($message)) {
-			$message = 'Unspecified encryption exception';
-		}
-		parent::__construct($message, $hint, $code, $previous);
-	}
+    /**
+     * @param string $message
+     * @param string $hint
+     * @param int $code
+     * @param \Exception|null $previous
+     * @since 8.1.0
+     */
+    public function __construct($message = '', $hint = '', $code = 0, \Exception $previous = null) {
+        if (empty($message)) {
+            $message = 'Unspecified encryption exception';
+        }
+        parent::__construct($message, $hint, $code, $previous);
+    }
 
 }