From a79072ce478a999b06df38ae324fbcef6d3a76e7 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 9 Mar 2014 13:53:55 -0700 Subject: update cacert.pem , don't hide url link for rmagic --- mod/dirsearch.php | 1 - 1 file changed, 1 deletion(-) (limited to 'mod') diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 1f2ec1108..020d08c12 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -31,7 +31,6 @@ function dirsearch_content(&$a) { $tables = array('name','address','locale','region','postcode','country','gender','marital','sexual','keywords'); - if($_REQUEST['query']) { $advanced = dir_parse_query($_REQUEST['query']); if($advanced) { -- cgit v1.2.3 From 09dde2810cc1f6c8da95013e1b995cf4068d2d46 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 10 Mar 2014 23:45:48 -0700 Subject: failed experiment - revert the directory to 80 results per page until somebody implements endless scroll on the thing. 300 takes far too long to load all the images. --- mod/dirsearch.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 020d08c12..801be6189 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -121,7 +121,7 @@ function dirsearch_content(&$a) { } - $perpage = (($_REQUEST['n']) ? $_REQUEST['n'] : 300); + $perpage = (($_REQUEST['n']) ? $_REQUEST['n'] : 80); $page = (($_REQUEST['p']) ? intval($_REQUEST['p'] - 1) : 0); $startrec = (($page+1) * $perpage) - $perpage; $limit = (($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 0); -- cgit v1.2.3 From 5e41ef921999e1dc4d29101d4d764db967e257ee Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Mar 2014 17:41:56 -0700 Subject: protect filed conversations from expiration - we check the parent to see if it is filed, but one may have filed a comment and that will vanish when the parent expires unless the parent is protected. --- mod/filer.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'mod') diff --git a/mod/filer.php b/mod/filer.php index adc6245e1..3340fc999 100644 --- a/mod/filer.php +++ b/mod/filer.php @@ -19,6 +19,20 @@ function filer_content(&$a) { if($item_id && strlen($term)){ // file item store_item_tag(local_user(),$item_id,TERM_OBJ_POST,TERM_FILE,$term,''); + + // protect the entire conversation from periodic expiration + + $r = q("select parent from item where id = %d and uid = %d limit 1", + intval($item_id), + intval(local_user()) + ); + if($r) { + $x = q("update item set item_flags = ( item_flags | %d ) where id = %d and uid = %d limit 1", + intval(ITEM_RETAINED), + intval($r[0]['parent']), + intval(local_user()) + ); + } } else { $filetags = array(); -- cgit v1.2.3 From 031b888e2c447048b5459e5e8f1a2afd34f695cf Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 12 Mar 2014 17:13:58 +0000 Subject: Stick help in a template --- mod/help.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'mod') diff --git a/mod/help.php b/mod/help.php index aa0ee8ae6..81ecd6ba9 100644 --- a/mod/help.php +++ b/mod/help.php @@ -76,14 +76,18 @@ function help_content(&$a) { $text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text); if($doctype === 'html') - return $text; + $content = $text; if($doctype === 'markdown') - return Markdown($text); + $content = Markdown($text); if($doctype === 'bbcode') { require_once('include/bbcode.php'); - return bbcode($text); + $content = bbcode($text); } + return replace_macros(get_markup_template("help.tpl"), array( + '$content' => $content + )); + } -- cgit v1.2.3 From 74b8a386450e34f4a3f6f1432c2ab82fdb0e85c8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Mar 2014 19:04:20 -0700 Subject: json_return_and_dir is a typo --- mod/post.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/post.php b/mod/post.php index 54d0d8db9..140b3f1e5 100644 --- a/mod/post.php +++ b/mod/post.php @@ -265,7 +265,7 @@ function post_init(&$a) { } else { if($test) { $ret['message'] .= 'auth failure. ' . print_r($_REQUEST,true) . print_r($j,true) . EOL; - json_return_and_dir($ret); + json_return_and_die($ret); } logger('mod_zot: magic-auth failure - not authenticated: ' . $x[0]['xchan_addr']); -- cgit v1.2.3 From 5a8be68900250267aa01923f87cf3978c50421e8 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 13 Mar 2014 02:09:45 +0000 Subject: json_return_and_dir isn't a thing --- mod/post.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/post.php b/mod/post.php index 140b3f1e5..95c984b40 100644 --- a/mod/post.php +++ b/mod/post.php @@ -281,7 +281,7 @@ function post_init(&$a) { if($test) { $ret['message'] .= 'auth failure fallthrough ' . print_r($_REQUEST,true) . print_r($j,true) . EOL; - json_return_and_dir($ret); + json_return_and_die($ret); } if(strstr($desturl,z_root() . '/rmagic')) -- cgit v1.2.3