diff options
Diffstat (limited to 'apps/user_ldap/lib')
-rw-r--r-- | apps/user_ldap/lib/Access.php | 48 | ||||
-rw-r--r-- | apps/user_ldap/lib/Command/CheckUser.php | 4 | ||||
-rw-r--r-- | apps/user_ldap/lib/Command/ShowRemnants.php | 4 | ||||
-rw-r--r-- | apps/user_ldap/lib/FilesystemHelper.php | 4 | ||||
-rw-r--r-- | apps/user_ldap/lib/Group_LDAP.php | 4 | ||||
-rw-r--r-- | apps/user_ldap/lib/ILDAPWrapper.php | 2 | ||||
-rw-r--r-- | apps/user_ldap/lib/LogWrapper.php | 2 | ||||
-rw-r--r-- | apps/user_ldap/lib/User/Manager.php | 6 | ||||
-rw-r--r-- | apps/user_ldap/lib/User/OfflineUser.php | 2 | ||||
-rw-r--r-- | apps/user_ldap/lib/User/User.php | 14 | ||||
-rw-r--r-- | apps/user_ldap/lib/User_LDAP.php | 6 | ||||
-rw-r--r-- | apps/user_ldap/lib/User_Proxy.php | 6 |
12 files changed, 51 insertions, 51 deletions
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index ff95d96ebdb..dbc4f5b0448 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -407,8 +407,8 @@ class Access extends LDAPUtility implements IUserTools { } /** - * returns the LDAP DN for the given internal ownCloud name of the group - * @param string $name the ownCloud name in question + * returns the LDAP DN for the given internal Nextcloud name of the group + * @param string $name the Nextcloud name in question * @return string|false LDAP DN on success, otherwise false */ public function groupname2dn($name) { @@ -416,8 +416,8 @@ class Access extends LDAPUtility implements IUserTools { } /** - * returns the LDAP DN for the given internal ownCloud name of the user - * @param string $name the ownCloud name in question + * returns the LDAP DN for the given internal Nextcloud name of the user + * @param string $name the Nextcloud name in question * @return string|false with the LDAP DN on success, otherwise false */ public function username2dn($name) { @@ -433,10 +433,10 @@ class Access extends LDAPUtility implements IUserTools { } /** - * returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure + * returns the internal Nextcloud name for the given LDAP DN of the group, false on DN outside of search DN or failure * @param string $fdn the dn of the group object * @param string $ldapName optional, the display name of the object - * @return string|false with the name to use in ownCloud, false on DN outside of search DN + * @return string|false with the name to use in Nextcloud, false on DN outside of search DN */ public function dn2groupname($fdn, $ldapName = null) { //To avoid bypassing the base DN settings under certain circumstances @@ -489,10 +489,10 @@ class Access extends LDAPUtility implements IUserTools { } /** - * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure + * returns the internal Nextcloud name for the given LDAP DN of the user, false on DN outside of search DN or failure * @param string $dn the dn of the user object * @param string $ldapName optional, the display name of the object - * @return string|false with with the name to use in ownCloud + * @return string|false with with the name to use in Nextcloud */ public function dn2username($fdn, $ldapName = null) { //To avoid bypassing the base DN settings under certain circumstances @@ -506,11 +506,11 @@ class Access extends LDAPUtility implements IUserTools { } /** - * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN + * returns an internal Nextcloud name for the given LDAP DN, false on DN outside of search DN * @param string $dn the dn of the user object * @param string $ldapName optional, the display name of the object * @param bool $isUser optional, whether it is a user object (otherwise group assumed) - * @return string|false with with the name to use in ownCloud + * @return string|false with with the name to use in Nextcloud */ public function dn2ocname($fdn, $ldapName = null, $isUser = true) { if($isUser) { @@ -521,7 +521,7 @@ class Access extends LDAPUtility implements IUserTools { $nameAttribute = $this->connection->ldapGroupDisplayName; } - //let's try to retrieve the ownCloud name from the mappings table + //let's try to retrieve the Nextcloud name from the mappings table $ocName = $mapper->getNameByDN($fdn); if(is_string($ocName)) { return $ocName; @@ -591,7 +591,7 @@ class Access extends LDAPUtility implements IUserTools { /** * gives back the user names as they are used ownClod internally * @param array $ldapUsers as returned by fetchList() - * @return array an array with the user names to use in ownCloud + * @return array an array with the user names to use in Nextcloud * * gives back the user names as they are used ownClod internally */ @@ -602,7 +602,7 @@ class Access extends LDAPUtility implements IUserTools { /** * gives back the group names as they are used ownClod internally * @param array $ldapGroups as returned by fetchList() - * @return array an array with the group names to use in ownCloud + * @return array an array with the group names to use in Nextcloud * * gives back the group names as they are used ownClod internally */ @@ -649,12 +649,12 @@ class Access extends LDAPUtility implements IUserTools { } } } - return $ownCloudNames; + return $NextcloudNames; } /** * caches the user display name - * @param string $ocName the internal ownCloud username + * @param string $ocName the internal Nextcloud username * @param string|false $home the home directory path */ public function cacheUserHome($ocName, $home) { @@ -664,7 +664,7 @@ class Access extends LDAPUtility implements IUserTools { /** * caches a user as existing - * @param string $ocName the internal ownCloud username + * @param string $ocName the internal Nextcloud username */ public function cacheUserExists($ocName) { $this->connection->writeToCache('userExists'.$ocName, true); @@ -672,7 +672,7 @@ class Access extends LDAPUtility implements IUserTools { /** * caches the user display name - * @param string $ocName the internal ownCloud username + * @param string $ocName the internal Nextcloud username * @param string $displayName the display name * @param string $displayName2 the second display name */ @@ -687,9 +687,9 @@ class Access extends LDAPUtility implements IUserTools { } /** - * creates a unique name for internal ownCloud use for users. Don't call it directly. + * creates a unique name for internal Nextcloud use for users. Don't call it directly. * @param string $name the display name of the object - * @return string|false with with the name to use in ownCloud or false if unsuccessful + * @return string|false with with the name to use in Nextcloud or false if unsuccessful * * Instead of using this method directly, call * createAltInternalOwnCloudName($name, true) @@ -709,9 +709,9 @@ class Access extends LDAPUtility implements IUserTools { } /** - * creates a unique name for internal ownCloud use for groups. Don't call it directly. + * creates a unique name for internal Nextcloud use for groups. Don't call it directly. * @param string $name the display name of the object - * @return string|false with with the name to use in ownCloud or false if unsuccessful. + * @return string|false with with the name to use in Nextcloud or false if unsuccessful. * * Instead of using this method directly, call * createAltInternalOwnCloudName($name, false) @@ -747,10 +747,10 @@ class Access extends LDAPUtility implements IUserTools { } /** - * creates a unique name for internal ownCloud use. + * creates a unique name for internal Nextcloud use. * @param string $name the display name of the object * @param boolean $isUser whether name should be created for a user (true) or a group (false) - * @return string|false with with the name to use in ownCloud or false if unsuccessful + * @return string|false with with the name to use in Nextcloud or false if unsuccessful */ private function createAltInternalOwnCloudName($name, $isUser) { $originalTTL = $this->connection->ldapCacheTTL; @@ -1141,7 +1141,7 @@ class Access extends LDAPUtility implements IUserTools { $offset = $savedoffset; // if we're here, probably no connection resource is returned. - // to make ownCloud behave nicely, we simply give back an empty array. + // to make Nextcloud behave nicely, we simply give back an empty array. if(is_null($findings)) { return array(); } diff --git a/apps/user_ldap/lib/Command/CheckUser.php b/apps/user_ldap/lib/Command/CheckUser.php index 236d2e51d0b..af2806e8cc6 100644 --- a/apps/user_ldap/lib/Command/CheckUser.php +++ b/apps/user_ldap/lib/Command/CheckUser.php @@ -69,7 +69,7 @@ class CheckUser extends Command { ->addArgument( 'ocName', InputArgument::REQUIRED, - 'the user name as used in ownCloud' + 'the user name as used in Nextcloud' ) ->addOption( 'force', @@ -102,7 +102,7 @@ class CheckUser extends Command { /** * checks whether a user is actually mapped - * @param string $ocName the username as used in ownCloud + * @param string $ocName the username as used in Nextcloud * @throws \Exception * @return true */ diff --git a/apps/user_ldap/lib/Command/ShowRemnants.php b/apps/user_ldap/lib/Command/ShowRemnants.php index 0e6aea6a5ab..365c8967ee0 100644 --- a/apps/user_ldap/lib/Command/ShowRemnants.php +++ b/apps/user_ldap/lib/Command/ShowRemnants.php @@ -54,7 +54,7 @@ class ShowRemnants extends Command { protected function configure() { $this ->setName('ldap:show-remnants') - ->setDescription('shows which users are not available on LDAP anymore, but have remnants in ownCloud.') + ->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.') ->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.'); } @@ -67,7 +67,7 @@ class ShowRemnants extends Command { /** @var \Symfony\Component\Console\Helper\Table $table */ $table = new Table($output); $table->setHeaders(array( - 'ownCloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login', + 'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login', 'Dir', 'Sharer')); $rows = array(); $resultSet = $this->dui->getUsers(); diff --git a/apps/user_ldap/lib/FilesystemHelper.php b/apps/user_ldap/lib/FilesystemHelper.php index 689fcfeda7e..e5b0a9ecef3 100644 --- a/apps/user_ldap/lib/FilesystemHelper.php +++ b/apps/user_ldap/lib/FilesystemHelper.php @@ -25,7 +25,7 @@ namespace OCA\User_LDAP; /** - * @brief wraps around static ownCloud core methods + * @brief wraps around static Nextcloud core methods */ class FilesystemHelper { @@ -39,7 +39,7 @@ class FilesystemHelper { /** * @brief initializes the filesystem for the given user - * @param string $uid the ownCloud username of the user + * @param string $uid the Nextcloud username of the user */ public function setup($uid) { \OC_Util::setupFS($uid); diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index fb9920d3cc2..f1ea831e485 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -267,7 +267,7 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface { } /** - * translates a primary group ID into an ownCloud internal name + * translates a primary group ID into an Nextcloud internal name * @param string $gid as given by primaryGroupID on AD * @param string $dn a DN that belongs to the same domain as the group * @return string|bool @@ -296,7 +296,7 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface { $dn = $result[0]['dn'][0]; //and now the group name - //NOTE once we have separate ownCloud group IDs and group names we can + //NOTE once we have separate Nextcloud group IDs and group names we can //directly read the display name attribute instead of the DN $name = $this->access->dn2groupname($dn); diff --git a/apps/user_ldap/lib/ILDAPWrapper.php b/apps/user_ldap/lib/ILDAPWrapper.php index e2089fa8a47..4034d0baea4 100644 --- a/apps/user_ldap/lib/ILDAPWrapper.php +++ b/apps/user_ldap/lib/ILDAPWrapper.php @@ -196,7 +196,7 @@ interface ILDAPWrapper { */ public function unbind($link); - //additional required methods in ownCloud + //additional required methods in Nextcloud /** * Checks whether the server supports LDAP diff --git a/apps/user_ldap/lib/LogWrapper.php b/apps/user_ldap/lib/LogWrapper.php index dd05b58666d..af5323565f8 100644 --- a/apps/user_ldap/lib/LogWrapper.php +++ b/apps/user_ldap/lib/LogWrapper.php @@ -25,7 +25,7 @@ namespace OCA\User_LDAP; /** - * @brief wraps around static ownCloud core methods + * @brief wraps around static Nextcloud core methods */ class LogWrapper { protected $app = 'user_ldap'; diff --git a/apps/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php index 1a9138176b0..18430a90cc7 100644 --- a/apps/user_ldap/lib/User/Manager.php +++ b/apps/user_ldap/lib/User/Manager.php @@ -175,7 +175,7 @@ class Manager { /** * Checks whether the specified user is marked as deleted - * @param string $id the ownCloud user name + * @param string $id the Nextcloud user name * @return bool */ public function isDeletedUser($id) { @@ -198,7 +198,7 @@ class Manager { } /** - * @brief returns a User object by it's ownCloud username + * @brief returns a User object by it's Nextcloud username * @param string $id the DN or username of the user * @return \OCA\User_LDAP\User\User|\OCA\User_LDAP\User\OfflineUser|null */ @@ -215,7 +215,7 @@ class Manager { } /** - * @brief returns a User object by it's DN or ownCloud username + * @brief returns a User object by it's DN or Nextcloud username * @param string $id the DN or username of the user * @return \OCA\User_LDAP\User\User|\OCA\User_LDAP\User\OfflineUser|null * @throws \Exception when connection could not be established diff --git a/apps/user_ldap/lib/User/OfflineUser.php b/apps/user_ldap/lib/User/OfflineUser.php index 4ee3bd09911..0e60a29514e 100644 --- a/apps/user_ldap/lib/User/OfflineUser.php +++ b/apps/user_ldap/lib/User/OfflineUser.php @@ -112,7 +112,7 @@ class OfflineUser { } /** - * getter for ownCloud internal name + * getter for Nextcloud internal name * @return string */ public function getOCName() { diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php index 5d4af1fd09c..4419c4983d4 100644 --- a/apps/user_ldap/lib/User/User.php +++ b/apps/user_ldap/lib/User/User.php @@ -251,7 +251,7 @@ class User { } /** - * @brief returns the ownCloud internal username of the user + * @brief returns the Nextcloud internal username of the user * @return string */ public function getUsername() { @@ -429,7 +429,7 @@ class User { } /** - * fetches the email from LDAP and stores it as ownCloud user value + * fetches the email from LDAP and stores it as Nextcloud user value * @param string $valueFromLDAP if known, to save an LDAP read request * @return null */ @@ -462,7 +462,7 @@ class User { * Overall process goes as follow: * 1. fetch the quota from LDAP and check if it's parseable with the "verifyQuotaValue" function * 2. if the value can't be fetched, is empty or not parseable, use the default LDAP quota - * 3. if the default LDAP quota can't be parsed, use the ownCloud's default quota (use 'default') + * 3. if the default LDAP quota can't be parsed, use the Nextcloud's default quota (use 'default') * 4. check if the target user exists and set the quota for the user. * * In order to improve performance and prevent an unwanted extra LDAP call, the $valueFromLDAP @@ -470,10 +470,10 @@ class User { * quota for the user coming from the LDAP server (step 1 of the process) It can be useful to * fetch all the user's attributes in one call and use the fetched values in this function. * The expected value for that parameter is a string describing the quota for the user. Valid - * values are 'none' (unlimited), 'default' (the ownCloud's default quota), '1234' (quota in + * values are 'none' (unlimited), 'default' (the Nextcloud's default quota), '1234' (quota in * bytes), '1234 MB' (quota in MB - check the \OC_Helper::computerFileSize method for more info) * - * fetches the quota from LDAP and stores it as ownCloud user value + * fetches the quota from LDAP and stores it as Nextcloud user value * @param string $valueFromLDAP the quota attribute's value can be passed, * to save the readAttribute request * @return null @@ -541,7 +541,7 @@ class User { } /** - * @brief attempts to get an image from LDAP and sets it as ownCloud avatar + * @brief attempts to get an image from LDAP and sets it as Nextcloud avatar * @return null */ public function updateAvatar() { @@ -558,7 +558,7 @@ class User { } /** - * @brief sets an image as ownCloud avatar + * @brief sets an image as Nextcloud avatar * @return null */ private function setOwnCloudAvatar() { diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php index cfd2450a122..44de3f5da40 100644 --- a/apps/user_ldap/lib/User_LDAP.php +++ b/apps/user_ldap/lib/User_LDAP.php @@ -60,8 +60,8 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn } /** - * checks whether the user is allowed to change his avatar in ownCloud - * @param string $uid the ownCloud user name + * checks whether the user is allowed to change his avatar in Nextcloud + * @param string $uid the Nextcloud user name * @return boolean either the user can or cannot */ public function canChangeAvatar($uid) { @@ -244,7 +244,7 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn /** * checks whether a user is still available on LDAP * - * @param string|\OCA\User_LDAP\User\User $user either the ownCloud user + * @param string|\OCA\User_LDAP\User\User $user either the Nextcloud user * name or an instance of that user * @return bool * @throws \Exception diff --git a/apps/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php index 2cdf401880e..6417841f245 100644 --- a/apps/user_ldap/lib/User_Proxy.php +++ b/apps/user_ldap/lib/User_Proxy.php @@ -163,7 +163,7 @@ class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface, /** * check if a user exists on LDAP - * @param string|\OCA\User_LDAP\User\User $user either the ownCloud user + * @param string|\OCA\User_LDAP\User\User $user either the Nextcloud user * name or an instance of that user * @return boolean */ @@ -225,8 +225,8 @@ class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface, } /** - * checks whether the user is allowed to change his avatar in ownCloud - * @param string $uid the ownCloud user name + * checks whether the user is allowed to change his avatar in Nextcloud + * @param string $uid the Nextcloud user name * @return boolean either the user can or cannot */ public function canChangeAvatar($uid) { |