From 014a1f01589c0389c60630148a4972840c63faad Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 15 Jan 2018 20:47:32 -0800 Subject: add summary bbcode tag --- include/bbcode.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/bbcode.php b/include/bbcode.php index 775a91f9a..de32bd57a 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -428,6 +428,16 @@ function bb_spoilertag($match) { return ''; } +function bb_summary($match) { + $rnd1 = mt_rand(); + $rnd2 = mt_rand(); + $rnd3 = mt_rand(); + $rnd4 = mt_rand(); + + return $match[1] . '
' . $match[2] . '
'; +} + + function bb_definitionList($match) { // $match[1] is the markup styles for the "terms" in the definition list. // $match[2] is the content between the [dl]...[/dl] tags @@ -1062,6 +1072,11 @@ function bbcode($Text, $options = []) { $Text = preg_replace_callback("/\[code(.*?)\](.*?)\[\/code\]/ism", 'bb_code_options', $Text); } + + if(strpos($Text,'[/summary]') !== false) { + $Text = preg_replace_callback("/^(.*?)\[summary\](.*?)\[\/summary\](.*?)$/ism", 'bb_summary', $Text); + } + // Check for [spoiler] text $endlessloop = 0; while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20)) { -- cgit v1.2.3 From 03f692f24fe543c740e5443223d8084b9ca0c4de Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 15 Jan 2018 21:46:27 -0800 Subject: surface the article feature --- Zotlabs/Lib/Apps.php | 1 + Zotlabs/Module/Articles.php | 3 ++- app/articles.apd | 2 +- include/features.php | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 457b85b62..d2a307fd5 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -221,6 +221,7 @@ class Apps { static public function translate_system_apps(&$arr) { $apps = array( 'Apps' => t('Apps'), + 'Articles' => t('Articles'), 'Cards' => t('Cards'), 'Admin' => t('Site Admin'), 'Report Bug' => t('Report Bug'), diff --git a/Zotlabs/Module/Articles.php b/Zotlabs/Module/Articles.php index 25daca81d..e2e0fed5d 100644 --- a/Zotlabs/Module/Articles.php +++ b/Zotlabs/Module/Articles.php @@ -35,7 +35,7 @@ class Articles extends \Zotlabs\Web\Controller { return; } - nav_set_selected(t('Cards')); + nav_set_selected(t('Articles')); head_add_link([ 'rel' => 'alternate', @@ -102,6 +102,7 @@ class Articles extends \Zotlabs\Web\Controller { 'permissions' => $channel_acl, 'showacl' => (($is_owner) ? true : false), 'visitor' => true, + 'body' => '[summary][/summary]', 'hide_location' => false, 'hide_voting' => false, 'profile_uid' => intval($owner), diff --git a/app/articles.apd b/app/articles.apd index 74e86415b..5a9f17e0f 100644 --- a/app/articles.apd +++ b/app/articles.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 1.2 url: $baseurl/articles/$nick name: Articles requires: local_channel, articles diff --git a/include/features.php b/include/features.php index 69eeed3e8..36eb74a9d 100644 --- a/include/features.php +++ b/include/features.php @@ -126,7 +126,7 @@ function get_features($filtered = true) { feature_level('cards',1), ], -/* reserved, work in progress + [ 'articles', t('Articles'), @@ -135,7 +135,7 @@ function get_features($filtered = true) { get_config('feature_lock','articles'), feature_level('articles',1), ], -*/ + [ 'nav_channel_select', t('Navigation Channel Select'), -- cgit v1.2.3