From 71671e5b9a497bb0d81216e638f19a48f683ee52 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Apr 2012 17:51:59 -0700 Subject: [PATCH 1/4] fix config storage of booleans --- include/config.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/config.php b/include/config.php index 2cddda0b..4cff3809 100755 --- a/include/config.php +++ b/include/config.php @@ -80,6 +80,7 @@ function set_config($family,$key,$value) { // manage array value $dbvalue = (is_array($value)?serialize($value):$value); + $dbvalue = (is_bool($value) ? intval($value) : $value); if(get_config($family,$key,true) === false) { $a->config[$family][$key] = $value; From 0c7710681c26b15abca809ca078598d301516f70 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Apr 2012 18:49:39 -0700 Subject: [PATCH 2/4] log disabled requests --- include/diaspora.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 9951cf42..37d5990e 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -10,8 +10,10 @@ require_once('include/queue_fn.php'); function diaspora_dispatch_public($msg) { $enabled = intval(get_config('system','diaspora_enabled')); - if(! $enabled) + if(! $enabled) { + logger('mod-diaspora: disabled'); return; + } $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 ", dbesc(NETWORK_DIASPORA), @@ -34,8 +36,10 @@ function diaspora_dispatch($importer,$msg) { $ret = 0; $enabled = intval(get_config('system','diaspora_enabled')); - if(! $enabled) + if(! $enabled) { + logger('mod-diaspora: disabled'); return; + } // php doesn't like dashes in variable names From c4ca21a7627f0f447b944f166fd3d2d4a7552f46 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Apr 2012 19:13:41 -0700 Subject: [PATCH 3/4] move alert box away from nav links --- view/theme/duepuntozero/style.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 38c1fc5b..c30e643c 100755 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2987,7 +2987,10 @@ div.jGrowl div.info { color: #ffffff; padding-left: 58px; } - +#jGrowl.top-right { + top: 15px; + right: 15px; +} .qcomment { border: 1px solid #EEE; padding: 3px; From da0eb2d4c9bfad5eb329e9da7d0443f3f6327095 Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Wed, 4 Apr 2012 23:08:16 -0400 Subject: [PATCH 4/4] correct some filer dialog weirdness caused by introduction of categories --- mod/filer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/filer.php b/mod/filer.php index 3cd1bfe2..c0cca9e6 100755 --- a/mod/filer.php +++ b/mod/filer.php @@ -22,7 +22,8 @@ function filer_content(&$a) { } else { // return filer dialog $filetags = get_pconfig(local_user(),'system','filetags'); - $filetags = explode("][", trim($filetags,"[]")); + $filetags = file_tag_file_to_list($filetags,'file'); + $filetags = explode(",", $filetags); $tpl = get_markup_template("filer_dialog.tpl"); $o = replace_macros($tpl, array( '$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),