diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-10-12 09:07:35 +0200 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-10-12 09:07:35 +0200 |
| commit | 44c4c9c5c271a5ad163a089b1dc271d108a59700 (patch) | |
| tree | c1376be525c85ab799f213ed79648d8c478da3d0 /mod | |
| parent | 29faf955f6ce35af747d867133b3cb09e79ba675 (diff) | |
| parent | fd00a24957fdb9413523b19a014658a0cc87b4bf (diff) | |
| download | volse-hubzilla-44c4c9c5c271a5ad163a089b1dc271d108a59700.tar.gz volse-hubzilla-44c4c9c5c271a5ad163a089b1dc271d108a59700.tar.bz2 volse-hubzilla-44c4c9c5c271a5ad163a089b1dc271d108a59700.zip | |
Merge pull request #4 from friendica/master
Fast forward local hub
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/bookmarks.php | 4 | ||||
| -rw-r--r-- | mod/cloud.php | 1 | ||||
| -rw-r--r-- | mod/import.php | 5 | ||||
| -rw-r--r-- | mod/item.php | 2 | ||||
| -rw-r--r-- | mod/oembed.php | 5 | ||||
| -rw-r--r-- | mod/profiles.php | 1 | ||||
| -rw-r--r-- | mod/siteinfo.php | 9 | ||||
| -rw-r--r-- | mod/webpages.php | 6 |
8 files changed, 23 insertions, 10 deletions
diff --git a/mod/bookmarks.php b/mod/bookmarks.php index 9ccc171fe..6b2476a8e 100644 --- a/mod/bookmarks.php +++ b/mod/bookmarks.php @@ -55,6 +55,8 @@ function bookmarks_content(&$a) { $o = profile_tabs($a,true,$channel['channel_address']); + $o .= '<div class="generic-content-wrapper-styled">'; + $o .= '<h3>' . t('My Bookmarks') . '</h3>'; $x = menu_list(local_user(),'',MENU_BOOKMARK); @@ -78,7 +80,7 @@ function bookmarks_content(&$a) { } } - + $o .= '</div>'; return $o; diff --git a/mod/cloud.php b/mod/cloud.php index 28c59872d..149a6da5d 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -138,7 +138,6 @@ function cloud_init(&$a) { require_once('include/RedDAV/RedBrowser.php'); // provide a directory view for the cloud in Red Matrix $browser = new RedDAV\RedBrowser($auth); - $auth->setBrowserPlugin($browser); $server->addPlugin($browser); diff --git a/mod/import.php b/mod/import.php index e5a22a26e..3cf114d66 100644 --- a/mod/import.php +++ b/mod/import.php @@ -378,7 +378,10 @@ function import_post(&$a) { } } + $saved_notification_flags = notifications_off($channel['channel_id']); + if($import_posts && array_key_exists('item',$data) && $data['item']) { + foreach($data['item'] as $i) { $item = get_item_elements($i); @@ -404,6 +407,8 @@ function import_post(&$a) { } + notifications_on($channel['channel_id'],$saved_notification_flags); + if(array_key_exists('item_id',$data) && $data['item_id']) { foreach($data['item_id'] as $i) { $r = q("select id from item where mid = '%s' and uid = %d limit 1", diff --git a/mod/item.php b/mod/item.php index 2364e6abf..ac15e50e8 100644 --- a/mod/item.php +++ b/mod/item.php @@ -979,7 +979,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) { } } // if the tag is already replaced... - elseif(strpos($tag,'[zrl=')) { + elseif((strpos($tag,'[zrl=')) || (strpos($tag,'[url='))) { //...do nothing return $replaced; } diff --git a/mod/oembed.php b/mod/oembed.php index a053a8c98..d4a4424f5 100644 --- a/mod/oembed.php +++ b/mod/oembed.php @@ -19,9 +19,10 @@ function oembed_init(&$a){ else { echo "<html><body>"; - $j = oembed_fetch_url(base64url_decode(argv(1))); + $src = base64url_decode(argv(1)); + $j = oembed_fetch_url($src); echo $j->html; -// logger('mod-oembed ' . $j->html, LOGGER_ALL); +// logger('mod-oembed ' . $h, LOGGER_ALL); echo "</body></html>"; } } diff --git a/mod/profiles.php b/mod/profiles.php index 063e714e7..5d0416e9a 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -766,6 +766,7 @@ logger('extra_fields: ' . print_r($extra_fields,true)); : '<a href="' . $a->get_baseurl(true) . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>') )); } + } return $o; } diff --git a/mod/siteinfo.php b/mod/siteinfo.php index de55c69cf..a58f17c53 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -55,6 +55,7 @@ function siteinfo_init(&$a) { $channels_active_halfyear_stat = intval(get_config('system','channels_active_halfyear_stat')); $channels_active_monthly_stat = intval(get_config('system','channels_active_monthly_stat')); $local_posts_stat = intval(get_config('system','local_posts_stat')); + $hide_in_statistics = intval(get_config('system','hide_in_statistics')); $data = Array( 'version' => RED_VERSION, @@ -74,7 +75,8 @@ function siteinfo_init(&$a) { 'channels_total' => $channels_total_stat, 'channels_active_halfyear' => $channels_active_halfyear_stat, 'channels_active_monthly' => $channels_active_monthly_stat, - 'local_posts' => $local_posts_stat + 'local_posts' => $local_posts_stat, + 'hide_in_statistics' => $hide_in_statistics ); json_return_and_die($data); } @@ -86,8 +88,10 @@ function siteinfo_content(&$a) { if(! get_config('system','hidden_version_siteinfo')) { $version = sprintf( t('Version %s'), RED_VERSION ); - if(@is_dir('.git') && function_exists('shell_exec')) + if(@is_dir('.git') && function_exists('shell_exec')) { $commit = @shell_exec('git log -1 --format="%h"'); + $tag = @shell_exec('git describe --tags --abbrev=0'); + } if(! isset($commit) || strlen($commit) > 16) $commit = ''; } @@ -128,6 +132,7 @@ function siteinfo_content(&$a) { '$title' => t('Red'), '$description' => t('This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites.'), '$version' => $version, + '$tag' => $tag, '$commit' => $commit, '$web_location' => t('Running at web location') . ' ' . z_root(), '$visit' => t('Please visit <a href="http://getzot.com">GetZot.com</a> to learn more about the Red Matrix.'), diff --git a/mod/webpages.php b/mod/webpages.php index efaf3c4bf..a5cfd00e6 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -81,7 +81,6 @@ function webpages_content(&$a) { require_once('include/conversation.php'); $o = profile_tabs($a,true); - $o .= '<h2>' . t('Webpages') . '</h2>'; $x = array( 'webpage' => ITEM_WEBPAGE, @@ -95,7 +94,7 @@ function webpages_content(&$a) { 'mimetype' => $mimetype, 'layout' => $layout, ); - + if($_REQUEST['title']) $x['title'] = $_REQUEST['title']; if($_REQUEST['body']) @@ -105,7 +104,6 @@ function webpages_content(&$a) { $o .= status_editor($a,$x); - // Get a list of webpages. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link. //TODO - this should be replaced with pagelist_widget @@ -128,6 +126,7 @@ function webpages_content(&$a) { $url = z_root() . "/editwebpage/" . $which; // This isn't pretty, but it works. Until I figure out what to do with the UI, it's Good Enough(TM). return $o . replace_macros(get_markup_template("webpagelist.tpl"), array( + '$listtitle' => t('Webpages'), '$baseurl' => $url, '$edit' => t('Edit'), '$pages' => $pages, @@ -142,5 +141,6 @@ function webpages_content(&$a) { )); + $o .= '</div>'; } |