harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2018-01-16 08:55:42 +01:00
commit 9aadcb0bd4
5 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Lib/Apps.php
View File

@ -221,6 +221,7 @@ class Apps {
static public function translate_system_apps(&$arr) { static public function translate_system_apps(&$arr) {
$apps = array( $apps = array(
'Apps' => t('Apps'), 'Apps' => t('Apps'),
'Articles' => t('Articles'),
'Cards' => t('Cards'), 'Cards' => t('Cards'),
'Admin' => t('Site Admin'), 'Admin' => t('Site Admin'),
'Report Bug' => t('Report Bug'), 'Report Bug' => t('Report Bug'),

3
Zotlabs/Module/Articles.php
View File

@ -35,7 +35,7 @@ class Articles extends \Zotlabs\Web\Controller {
return; return;
} }
nav_set_selected(t('Cards')); nav_set_selected(t('Articles'));
head_add_link([ head_add_link([
'rel' => 'alternate', 'rel' => 'alternate',
@ -102,6 +102,7 @@ class Articles extends \Zotlabs\Web\Controller {
'permissions' => $channel_acl, 'permissions' => $channel_acl,
'showacl' => (($is_owner) ? true : false), 'showacl' => (($is_owner) ? true : false),
'visitor' => true, 'visitor' => true,
'body' => '[summary][/summary]',
'hide_location' => false, 'hide_location' => false,
'hide_voting' => false, 'hide_voting' => false,
'profile_uid' => intval($owner), 'profile_uid' => intval($owner),

2
app/articles.apd
View File

@ -1,4 +1,4 @@
version: 1.1 version: 1.2
url: $baseurl/articles/$nick url: $baseurl/articles/$nick
name: Articles name: Articles
requires: local_channel, articles requires: local_channel, articles

15
include/bbcode.php
View File

@ -428,6 +428,16 @@ function bb_spoilertag($match) {
return '<div onclick="openClose(\'opendiv-' . $rnd . '\'); return false;" class="fakelink">' . $openclose . '</div><blockquote id="opendiv-' . $rnd . '" style="display: none;">' . $text . '</blockquote>'; return '<div onclick="openClose(\'opendiv-' . $rnd . '\'); return false;" class="fakelink">' . $openclose . '</div><blockquote id="opendiv-' . $rnd . '" style="display: none;">' . $text . '</blockquote>';
} }
function bb_summary($match) {
$rnd1 = mt_rand();
$rnd2 = mt_rand();
$rnd3 = mt_rand();
$rnd4 = mt_rand();
return $match[1] . '<div style="display: block;" id="opendiv-' . $rnd2 . '">' . $match[2] . '</div><div style="display: block;" id="opendiv-' . $rnd3 . '" onclick="openClose(\'opendiv-' . $rnd1 . '\'); openClose(\'opendiv-' . $rnd2 . '\'); openClose(\'opendiv-' . $rnd3 . '\'); openClose(\'opendiv-' . $rnd4 . '\'); return false;" class="fakelink">' . t('View article') . '</div><div style="display: none;" id="opendiv-' . $rnd4 . '" onclick="openClose(\'opendiv-' . $rnd1 . '\'); openClose(\'opendiv-' . $rnd2 . '\'); openClose(\'opendiv-' . $rnd3 . '\'); openClose(\'opendiv-' . $rnd4 . '\'); return false;" class="fakelink">' . t('View summary') . '</div><div id="opendiv-' . $rnd1 . '" style="display: none;">' . $match[3] . '</div>';
}
function bb_definitionList($match) { function bb_definitionList($match) {
// $match[1] is the markup styles for the "terms" in the definition list. // $match[1] is the markup styles for the "terms" in the definition list.
// $match[2] is the content between the [dl]...[/dl] tags // $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); $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 // Check for [spoiler] text
$endlessloop = 0; $endlessloop = 0;
while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20)) { while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20)) {

4
include/features.php
View File

@ -126,7 +126,7 @@ function get_features($filtered = true) {
feature_level('cards',1), feature_level('cards',1),
], ],
/* reserved, work in progress
[ [
'articles', 'articles',
t('Articles'), t('Articles'),
@ -135,7 +135,7 @@ function get_features($filtered = true) {
get_config('feature_lock','articles'), get_config('feature_lock','articles'),
feature_level('articles',1), feature_level('articles',1),
], ],
*/
[ [
'nav_channel_select', 'nav_channel_select',
t('Navigation Channel Select'), t('Navigation Channel Select'),