rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-18 07:52:21 +01:00
Code Issues Releases Activity

clean code

Browse Source
This commit is contained in:
babelouest 2014-04-07 01:17:48 -04:00
parent e81af2fce4
commit 57211530f8
3 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/backend/abstractbackend.php
View File

@ -434,8 +434,7 @@ abstract class AbstractBackend {
*/ */
public function getPreferences($addressBookId) { public function getPreferences($addressBookId) {
$key = $this->combinedKey($addressBookId); $key = 'prefs_' . $this->combinedKey($addressBookId);
$key = 'prefs_' . $key;
$data = \OCP\Config::getUserValue($this->userid, 'contacts', $key, false); $data = \OCP\Config::getUserValue($this->userid, 'contacts', $key, false);
return $data ? json_decode($data, true) : array(); return $data ? json_decode($data, true) : array();
@ -448,8 +447,7 @@ abstract class AbstractBackend {
* @return boolean * @return boolean
*/ */
public function setPreferences($addressbookid, array $params) { public function setPreferences($addressbookid, array $params) {
$key = $this->combinedKey($addressbookid); $key = 'prefs_' . $this->combinedKey($addressbookid);
$key = 'prefs_' . $key;
$data = json_encode($params); $data = json_encode($params);
return $data return $data

29
lib/controller/addressbookcontroller.php
View File

@ -359,34 +359,5 @@ class AddressBookController extends Controller {
return $response->setParams($serialized); return $response->setParams($serialized);
} }
/**
* @NoAdminRequired
* @NoCSRFRequired
*/
public function getLdapConnectors() {
$params = $this->request->urlParams;
//$targetInfo = $this->request->post['target'];
$response = new JSONResponse();
$prefix = "backend_ldap_";
$suffix = "_connector.xml";
$path = __DIR__ . "/../../formats/";
$files = scandir($path);
$formats = array();
foreach ($files as $file) {
if (!strncmp($file, $prefix, strlen($prefix)) && substr($file, - strlen($suffix)) === $suffix) {
if (file_exists($path.$file)) {
$format = simplexml_load_file ( $path.$file );
if ($format) {
if (isset($format['name'])) {
$formatId = substr($file, strlen($prefix), - strlen($suffix));
$formats[$formatId] = array('id' => $formatId, 'name' => (string)$format['name'], 'xml' => $format->asXML());
}
}
}
}
}
return $response->setData($formats);
}
} }

3
lib/controller/backendcontroller.php
View File

@ -25,9 +25,6 @@ class BackendController extends Controller {
* @NoCSRFRequired * @NoCSRFRequired
*/ */
public function getLdapConnectors() { public function getLdapConnectors() {
$params = $this->request->urlParams;
//$targetInfo = $this->request->post['target'];
$response = new JSONResponse(); $response = new JSONResponse();
$prefix = "backend_ldap_"; $prefix = "backend_ldap_";
$suffix = "_connector.xml"; $suffix = "_connector.xml";