sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

preferences store fix

remotes/origin/stable4
Bartek Przybylski 2012-02-04 20:15:55 +07:00
parent f6a27dfa28
commit cfc710e768
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/gallery/ajax/galleryOp.php
Unescape Escape View File

@ -57,7 +57,7 @@ function handleGalleryScanning() {
function handleFilescan($cleanup) {
OC_JSON::checkLoggedIn();
if ($cleanup) OC_Gallery_Album::cleanup();
$root = OC_Appconfig::getValue('gallery', 'root', '').'/';
$root = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'root', '').'/';
$pathlist = OC_Gallery_Scanner::find_paths($root);
sort($pathlist);
OC_JSON::success(array('paths' => $pathlist));
@ -85,11 +85,11 @@ function handleStoreSettings($root, $order) {
return;
}
$current_root = OC_Appconfig::getValue('gallery', 'root', '/');
$current_root = OC_Preferences::getValue(OC_User::getUser(),'gallery', 'root', '/');
$root = trim(rtrim($root, '/'));
$rescan = $current_root==$root?'no':'yes';
OC_Appconfig::setValue('gallery', 'root', $root);
OC_Appconfig::setValue('gallery', 'order', $order);
OC_Preferences::setValue(OC_User::getUser(), 'gallery', 'root', $root);
OC_Preferences::setValue(OC_User::getUser(), 'gallery', 'order', $order);
OC_JSON::success(array('rescan' => $rescan));
}

2
apps/gallery/lib/album.php
Unescape Escape View File

@ -77,7 +77,7 @@ class OC_Gallery_Album {
$sql .= ' AND album_path = ?';
$args[] = $path;
}
$order = OC_Appconfig::getValue('gallery', 'order', 'ASC');
$order = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'order', 'ASC');
$sql .= ' ORDER BY album_name ' . $order;
$stmt = OC_DB::prepare($sql);

2
apps/gallery/lib/hooks_handlers.php
Unescape Escape View File

@ -59,7 +59,7 @@ class OC_Gallery_Hooks_Handlers {
}
public static function pathInRoot($path) {
$root = OC_Appconfig::getValue('gallery', 'root', '/');
$root = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'root', '/');
return substr($path, 0, strlen($path)>strlen($root)?strlen($root):strlen($path)) == $root;
}

2
apps/gallery/lib/scanner.php
Unescape Escape View File

@ -40,7 +40,7 @@ class OC_Gallery_Scanner {
}
public static function createName($name) {
$root = OC_Appconfig::getValue('gallery', 'root', '/');
$root = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'root', '/');
$name = str_replace('/', '.', str_replace(OC::$CONFIG_DATADIRECTORY, '', $name));
if (substr($name, 0, strlen($root)) == str_replace('/','.',$root)) {
$name = substr($name, strlen($root));

2
apps/gallery/templates/index.php
Unescape Escape View File

@ -33,7 +33,7 @@ $l = new OC_L10N('gallery');
<div id="g-dialog-settings" title="<?php echo $l->t('Settings');?>" style="display:none">
<form>
<fieldset><?php $root = OC_Appconfig::getValue('gallery', 'root', '/'); $order = OC_Appconfig::getValue('gallery', 'order', 'ASC');?>
<fieldset><?php $root = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'root', '/'); $order = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'order', 'ASC');?>
<label for="name"><?php echo $l->t('Scanning root');?></label>
<input type="text" name="g-scanning-root" id="g-scanning-root" class="text ui-widget-content ui-corner-all" value="<?php echo $root;?>" /><br/>