diff options
| -rw-r--r-- | apps/user_ldap/user_ldap.php | 10 | ||||
| -rw-r--r-- | lib/private/geo.php | 50 | ||||
| -rw-r--r-- | tests/lib/geo.php | 23 |
3 files changed, 5 insertions, 78 deletions
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index cd8a2dd251c..cc5d5f5226f 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -355,11 +355,11 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn * compared with OC_USER_BACKEND_CREATE_USER etc. */ public function implementsActions($actions) { - return (bool)((OC_USER_BACKEND_CHECK_PASSWORD - | OC_USER_BACKEND_GET_HOME - | OC_USER_BACKEND_GET_DISPLAYNAME - | OC_USER_BACKEND_PROVIDE_AVATAR - | OC_USER_BACKEND_COUNT_USERS) + return (bool)((\OC_User_Backend::CHECK_PASSWORD + | \OC_User_Backend::GET_HOME + | \OC_User_Backend::GET_DISPLAYNAME + | \OC_User_Backend::PROVIDE_AVATAR + | \OC_User_Backend::COUNT_USERS) & $actions); } diff --git a/lib/private/geo.php b/lib/private/geo.php deleted file mode 100644 index cbc5074dc73..00000000000 --- a/lib/private/geo.php +++ /dev/null @@ -1,50 +0,0 @@ -<?php -/** - * @author Christopher Schäpers <kondou@ts.unde.re> - * @author Georg Ehrke <georg@owncloud.com> - * @author Lukas Reschke <lukas@owncloud.com> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * - * @copyright Copyright (c) 2015, ownCloud, Inc. - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ -class OC_Geo{ - /** - * returns the closest timezone to coordinates - * @param float $latitude - * @param float $longitude - * @return mixed Closest timezone - */ - public static function timezone($latitude, $longitude) { - $alltimezones = DateTimeZone::listIdentifiers(); - $variances = array(); - //calculate for all timezones the system know - foreach($alltimezones as $timezone) { - $datetimezoneobj = new DateTimeZone($timezone); - $locationinformations = $datetimezoneobj->getLocation(); - $latitudeoftimezone = $locationinformations['latitude']; - $longitudeoftimezone = $locationinformations['longitude']; - $variances[abs($latitudeoftimezone - $latitude) + abs($longitudeoftimezone - $longitude)] = $timezone; - } - //sort array and return the timezone with the smallest difference - ksort($variances); - reset($variances); - return current($variances); - } -} diff --git a/tests/lib/geo.php b/tests/lib/geo.php deleted file mode 100644 index 0678297b55a..00000000000 --- a/tests/lib/geo.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php -/** - * Copyright (c) 2012 Lukas Reschke <lukas@statuscode.ch> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -class Test_Geo extends \Test\TestCase { - - /** - * @medium - */ - function testTimezone() { - $result = OC_Geo::timezone(3, 3); - $expected = 'Africa/Porto-Novo'; - $this->assertEquals($expected, $result); - - $result = OC_Geo::timezone(-3,-3333); - $expected = 'Pacific/Enderbury'; - $this->assertEquals($expected, $result); - } -} |