From 701ae2981df31b277e3f92b56fa47778572366fb Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 12 Sep 2014 01:59:31 -0700 Subject: [PATCH 01/36] doc updates --- doc/html/service__limits_8php.html | 137 +++++++++++++++++++++++++++++ doc/html/service__limits_8php.js | 4 + 2 files changed, 141 insertions(+) create mode 100644 doc/html/service__limits_8php.html create mode 100644 doc/html/service__limits_8php.js diff --git a/doc/html/service__limits_8php.html b/doc/html/service__limits_8php.html new file mode 100644 index 000000000..808e3ca9a --- /dev/null +++ b/doc/html/service__limits_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/service_limits.php File Reference + + + + + + + + + + + + + +
+
+ + + + + + + +
+
The Red Matrix +
+
+
+ + + + + +
+
+ +
+
+
+ +
+ + + + +
+ +
+ +
+
+Functions
+
+
service_limits.php File Reference
+
+
+ + + + +

+Functions

 service_limits_content (&$a)
 
+

Function Documentation

+ +
+
+ + + + + + + + +
service_limits_content (& $a)
+
+ +
+
+
+
+ diff --git a/doc/html/service__limits_8php.js b/doc/html/service__limits_8php.js new file mode 100644 index 000000000..4ab8d3a33 --- /dev/null +++ b/doc/html/service__limits_8php.js @@ -0,0 +1,4 @@ +var service__limits_8php = +[ + [ "service_limits_content", "service__limits_8php.html#a653424aac63c5cd05ba70c3c77bf7f8a", null ] +]; \ No newline at end of file From e0047446964cc038e68df824755af8bc57359ecf Mon Sep 17 00:00:00 2001 From: Jeroen Date: Fri, 12 Sep 2014 14:31:02 +0000 Subject: [PATCH 02/36] Fixed. Thanks to Thomas. --- mod/settings.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index 5038a63c4..a31814bf0 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -589,10 +589,9 @@ function settings_content(&$a) { if((argc() > 1) && (argv(1) === 'featured')) { $settings_addons = ""; - $r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' "); - // FIXME: This is always 0, even if there are plugin settings on this page - // if(! count($r)) - // $settings_addons = t('No feature settings configured'); + $r = q("SELECT * FROM `hook` WHERE `hook` = 'feature_settings' "); + if(! count($r)) + $settings_addons = t('No feature settings configured'); call_hooks('feature_settings', $settings_addons); From e1cb4b28331f6228dd81c1ee5c7753cb5057b77a Mon Sep 17 00:00:00 2001 From: Jeroen Date: Fri, 12 Sep 2014 18:18:46 +0000 Subject: [PATCH 03/36] expert_mode > expert --- mod/webpages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/webpages.php b/mod/webpages.php index 1b906a97f..efaf3c4bf 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -46,7 +46,7 @@ function webpages_content(&$a) { // } - if(feature_enabled($owner,'expert_mode')) { + if(feature_enabled($owner,'expert')) { $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); if(! $mimetype) $mimetype = 'choose'; From 59c537b06dbd905a4cc73b82d509c4cb0854fc05 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Fri, 12 Sep 2014 18:41:35 +0000 Subject: [PATCH 04/36] H1-H6 simplified (less font sizes), rem --- view/theme/redbasic/css/style.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4062c259c..196c1f8b0 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2268,6 +2268,18 @@ blockquote { font-size: 1em; } +h1, h2 { + font-size: 1.15rem; +} + +h3, h4 { + font-size: 0.9rem; +} + +h5, h6 { + font-size: 0.75rem; +} + .dropdown-menu { font-size: $body_font_size; border-radius: $radiuspx; From 11d3ef6176b6a16353e4733657621c98656848b4 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Fri, 12 Sep 2014 18:55:53 +0000 Subject: [PATCH 05/36] This is even better. Adapts better to Red user settings. --- view/theme/redbasic/css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 196c1f8b0..df95e48b8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2273,11 +2273,11 @@ h1, h2 { } h3, h4 { - font-size: 0.9rem; + font-size: $font_size; } h5, h6 { - font-size: 0.75rem; + font-size: $body_font_size; } .dropdown-menu { From bd2139d16addf42b33f5f5cf90516022273bc8b6 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 12 Sep 2014 21:04:43 +0200 Subject: [PATCH 06/36] do not load next page if justifiedGallery() is not ready yet --- mod/photos.php | 4 ++-- view/js/main.js | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index f2df894c0..c11d04192 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -635,7 +635,7 @@ function photos_content(&$a) { ); if(count($r)) { $a->set_pager_total(count($r)); - $a->set_pager_itemspage(60); + $a->set_pager_itemspage(5); } if($_GET['order'] === 'posted') @@ -1168,7 +1168,7 @@ function photos_content(&$a) { ); if(count($r)) { $a->set_pager_total(count($r)); - $a->set_pager_itemspage(60); + $a->set_pager_itemspage(5); } $r = q("SELECT `resource_id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` diff --git a/view/js/main.js b/view/js/main.js index e263fd116..56c60bd6e 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -705,6 +705,7 @@ function updateConvItems(mode,data) { } function justifyPhotos(bParam_page) { + justifiedGalleryActive = true; $('#photo-album-contents-' + bParam_page).justifiedGallery({ lastRow : 'nojustify', captions: true, @@ -718,7 +719,7 @@ function updateConvItems(mode,data) { 'lt640': '', 'lt1024': '' } - }); + }).on('jg.complete', function(e){ justifiedGalleryActive = false; }); } function notify_popup_loader(notifyType) { @@ -1136,7 +1137,7 @@ $(window).scroll(function () { } if($(window).scrollTop() + $(window).height() == $(document).height()) { - if((pageHasMoreContent) && (! loadingPage)) { + if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { $('#more').hide(); $('#no-more').hide(); From 12900129bb8b4cd83d876ff22a2848e6a89acbc8 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 12 Sep 2014 21:06:37 +0200 Subject: [PATCH 07/36] reset testing values back to default --- mod/photos.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index c11d04192..f2df894c0 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -635,7 +635,7 @@ function photos_content(&$a) { ); if(count($r)) { $a->set_pager_total(count($r)); - $a->set_pager_itemspage(5); + $a->set_pager_itemspage(60); } if($_GET['order'] === 'posted') @@ -1168,7 +1168,7 @@ function photos_content(&$a) { ); if(count($r)) { $a->set_pager_total(count($r)); - $a->set_pager_itemspage(5); + $a->set_pager_itemspage(60); } $r = q("SELECT `resource_id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` From d4e7a71d1e146f0dd521a0cc060686801966cb40 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Fri, 12 Sep 2014 21:21:16 +0200 Subject: [PATCH 08/36] Issue #590: Linked conversation titles to source. If a theme wants to have it different, it can always copy this .tpl file to ../theme/tpl/. I didn't commit this directly, because it's a little bit controversial. But I like it! --- view/tpl/conv_item.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index d7ed7d0f4..be7789e6b 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -15,7 +15,7 @@
{{if $item.title}} -

{{$item.title}}

+ {{/if}} {{if $item.lock}}
From 61ce524a33c3195794a24c4ce5820684369c58dd Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 12 Sep 2014 21:32:53 +0200 Subject: [PATCH 09/36] define justifiedGalleryActive in head.tpl to not break other pages autoload --- view/js/main.js | 2 +- view/tpl/head.tpl | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/view/js/main.js b/view/js/main.js index 56c60bd6e..13f1fea8f 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1135,7 +1135,7 @@ $(window).scroll(function () { $('#more').css("top","400"); $('#more').show(); } - + if($(window).scrollTop() + $(window).height() == $(document).height()) { if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { $('#more').hide(); diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 703b08547..9c9e7b970 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -25,6 +25,7 @@ var updateInterval = {{$update_interval}}; var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}}; + var justifiedGalleryActive = false; From 5fd0d6f7d553d79e2362a480ec504d102b299fd0 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 12 Sep 2014 14:23:42 -0700 Subject: [PATCH 10/36] make the xchan diagnostic tool useful --- mod/xchan.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/mod/xchan.php b/mod/xchan.php index 9d4cdcc22..e51cc53cc 100644 --- a/mod/xchan.php +++ b/mod/xchan.php @@ -15,16 +15,28 @@ function xchan_content(&$a) { if(x($_GET,'addr')) { $addr = trim($_GET['addr']); - $r = q("select xchan_name from xchan where xchan_hash like '%s%%'", + $r = q("select * from xchan where xchan_hash like '%s%%'", dbesc($addr) ); if($r) { foreach($r as $rr) - $o .= $rr['xchan_name'] . EOL; + $o .= str_replace("\n","
",print_r($rr,true)) . EOL; } else notice( t('Not found.') . EOL); + + $r = q("select * from hubloc where hubloc_hash like '%s%%'", + dbesc($addr) + ); + + if($r) { + foreach($r as $rr) + $o .= str_replace("\n","
",print_r($rr,true)) . EOL; + + } + + } return $o; } From b1809f5f0c14f15cb3caf74229bb12e3d544c9f9 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 12 Sep 2014 15:10:53 -0700 Subject: [PATCH 11/36] log why this doesn't get executed --- include/notifier.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/notifier.php b/include/notifier.php index 88bb9a0cb..0b5744b29 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -432,6 +432,8 @@ function notifier_run($argv, $argc){ $sql_extra = (($private) ? "" : " or hubloc_url = '" . dbesc(z_root()) . "' "); + logger('notifier: hub choice: ' . intval($relay_to_owner) . ' ' . intval($private) . ' ' . $cmd, LOGGER_DEBUG); + if($relay_to_owner && (! $private) && ($cmd !== 'relay')) { // If sending a followup to the post owner, only send it to one channel clone - to avoid race conditions. From c8508a310fa10d9f3281a4b0a320953d681bbe1c Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 13 Sep 2014 15:23:40 +0100 Subject: [PATCH 12/36] Only use one install file --- doc/Install.md | 111 ------------------------------------------------- doc/install.bb | 106 +--------------------------------------------- 2 files changed, 1 insertion(+), 216 deletions(-) delete mode 100644 doc/Install.md diff --git a/doc/Install.md b/doc/Install.md deleted file mode 100644 index 1ff6e69e7..000000000 --- a/doc/Install.md +++ /dev/null @@ -1,111 +0,0 @@ - -Red Installation -=============== - -Red should run on commodity hosting platforms - such as those used to host Wordpress blogs and Drupal websites. But be aware that Red is more than a simple web application. The kind of functionality offered by Red requires a bit more of the host system than the typical blog. Not every PHP/MySQL hosting provider will be able to support Red. Many will. But **please** review the requirements and confirm these with your hosting provider prior to installation. - -Also if you encounter installation issues, please let us know via the Github issue tracker (https://github.com/friendica/red/issues). Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future. Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues. - -Before you begin: Choose a domain name or subdomain name for your server. Put some thought into this - because changing it is currently not-supported. Things will break, and some of your friends may have difficulty communicating with you. We plan to address this limitation in a future release. - -Decide if you will use SSL and obtain an SSL certificate before software installation. You SHOULD use SSL. If you use SSL, you MUST use a "browser-valid" certificate. You MUST NOT use self-signed certificates! - -Please test your certificate prior to installation. A web tool for testing your certificate is available at "http://www.digicert.com/help/". When visiting your site for the first time, please use the SSL ("https://") URL if SSL is available. This will avoid problems later. The installation routine will not allow you to use a non browser-valid certificate. - -This restriction is incorporated because public posts from you may for example contain references to images on your own hub. If your certificate is not known by the internet browser of users they get a warning message complaining about some security issues. Although these complains are not the real truth - there are no security issues with your encryption! - the users may be confused, nerved or even worse may become scared about Red Matrix having security issues. Use one of the free certification instances! - -1. Requirements - - Apache with mod-rewrite enabled and "Options All" so you can use a -local .htaccess file - - - PHP 5.3 or later - - PHP *command line* access with register_argc_argv set to true in the -php.ini file - - curl, gd, mysql, and openssl extensions - - some form of email server or email gateway such that PHP mail() works - - mcrypt (optional; used for server-to-server message encryption) - - - Mysql 5.x - - - ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks -(Windows) [Note: other options are presented in Section 7 of this document] - - - Installation into a top-level domain or sub-domain (without a -directory/path component in the URL) is preferred. Directory paths will -not be as convenient to use and have not been thoroughly tested. - - - [Dreamhost.com offers all of the necessary hosting features at a -reasonable price. If your hosting provider doesn't allow Unix shell access, -you might have trouble getting everything to work.] - -2. Unpack the Red files into the root of your web server document area. - - - If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file. This makes the software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be - - `git clone https://github.com/friendica/red.git mywebsite` - - - and then you can pick up the latest changes at any time with - - `git pull` - - - make sure folder *store/[data]/smarty3* exists and is writable by webserver - - `mkdir -p "store/\[data\]/smarty3"` - - `chmod 777 "store/\[data\]/smarty3"` - - - For installing addons - - - First you should be **on** your website folder - - `cd mywebsite` - - - Then you should clone the addon repository (separtely) - - `git clone https://github.com/friendica/red-addons.git addon` - - - For keeping the addon tree updated, you should be on you addon tree and issue a git pull - - `cd mywebsite/addon` - - `git pull` - - - If you copy the directory tree to your webserver, make sure - that you also copy .htaccess - as "dot" files are often hidden - and aren't normally copied. - - -3. Create an empty database and note the access details (hostname, username, password, database name). - -4. Visit your website with a web browser and follow the instructions. Please note any error messages and correct these before continuing. - -5. *If* the automated installation fails for any reason, check the following: - - - ".htconfig.php" exists ... If not, edit htconfig.php and change system settings. Rename -to .htconfig.php - - Database is populated. ... If not, import the contents of "database.sql" with phpmyadmin -or mysql command line - -6. At this point visit your website again, and register your personal account. -Registration errors should all be recoverable automatically. -If you get any *critical* failure at this point, it generally indicates the -database was not installed correctly. You might wish to move/rename -.htconfig.php to another name and empty (called 'dropping') the database -tables, so that you can start fresh. - -7. Set up a cron job or scheduled task to run the poller once every 15 -minutes in order to perform background processing. Example: - - `cd /base/directory; /path/to/php include/poller.php` - -Change "/base/directory", and "/path/to/php" as appropriate for your situation. - -If you are using a Linux server, run "crontab -e" and add a line like the -one shown, substituting for your unique paths and settings: - -`*/15 * * * * cd /home/myname/mywebsite; /usr/bin/php include/poller.php` - -You can generally find the location of PHP by executing "which php". If you -have troubles with this section please contact your hosting provider for -assistance. Red will not work correctly if you cannot perform this step. diff --git a/doc/install.bb b/doc/install.bb index 16e3730ee..37fdeeba0 100644 --- a/doc/install.bb +++ b/doc/install.bb @@ -1,105 +1 @@ -[b]Red Installation[/b] - -Red should run on commodity hosting platforms - such as those used to host Wordpress blogs and Drupal websites. But be aware that Red is more than a simple web application. The kind of functionality offered by Red requires a bit more of the host system than the typical blog. Not every PHP/MySQL hosting provider will be able to support Red. Many will. But **please** review the requirements and confirm these with your hosting provider prior to installation. - -Also if you encounter installation issues, please let us know via the Github issue tracker (#^[url=https://github.com/friendica/red/issues]https://github.com/friendica/red/issues[/url]). Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future. Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues. - -Before you begin: Choose a domain name or subdomain name for your server. - -1. Requirements - - Apache with mod-rewrite enabled and "AllowOverride All" so you can use a -local .htaccess file - - - PHP 5.3 or later - - PHP *command line* access with register_argc_argv set to true in the -php.ini file - - curl, gd, mysql, and openssl extensions - - some form of email server or email gateway such that PHP mail() works - - mcrypt - - - Mysql 5.x - - - ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks -(Windows) [Note: other options are presented in Section 7 of this document] - - - Installation into a top-level domain or sub-domain (without a -directory/path component in the URL) is preferred. Directory paths will -not be as convenient to use and have not been thoroughly tested. - - - [Dreamhost.com offers all of the necessary hosting features at a -reasonable price. If your hosting provider doesn't allow Unix shell access, -you might have trouble getting everything to work.] - -2. Unpack the Red files into the root of your web server document area. - - - If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file. This makes the software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be - - `git clone #^[url=https://github.com/friendica/red.git]https://github.com/friendica/red.git[/url] mywebsite` - - - and then you can pick up the latest changes at any time with - - `git pull` - - - make sure folder *store/[data]/smarty3* exists and is writable by webserver - - `mkdir -p "store/\[data\]/smarty3"` - - `chmod 777 "store/\[data\]/smarty3"` - - - For installing addons - - - First you should be **on** your website folder - - `cd mywebsite` - - - Then you should clone the addon repository (separtely) - - `git clone #^[url=https://github.com/friendica/red-addons.git]https://github.com/friendica/red-addons.git[/url] addon` - - - For keeping the addon tree updated, you should be on you addon tree and issue a git pull - - `cd mywebsite/addon` - - `git pull` - - - If you copy the directory tree to your webserver, make sure - that you also copy .htaccess - as "dot" files are often hidden - and aren't normally copied. - - -3. Create an empty database and note the access details (hostname, username, password, database name). - -4. Visit your website with a web browser and follow the instructions. Please note any error messages and correct these before continuing. - -5. *If* the automated installation fails for any reason, check the following: - - - ".htconfig.php" exists ... If not, edit htconfig.php and change system settings. Rename -to .htconfig.php - - Database is populated. ... If not, import the contents of "database.sql" with phpmyadmin -or mysql command line - -6. At this point visit your website again, and register your personal account. -Registration errors should all be recoverable automatically. -If you get any *critical* failure at this point, it generally indicates the -database was not installed correctly. You might wish to move/rename -.htconfig.php to another name and empty (called 'dropping') the database -tables, so that you can start fresh. - -7. Set up a cron job or scheduled task to run the poller once every 15 -minutes in order to perform background processing. Example: - - `cd /base/directory; /path/to/php include/poller.php` - -Change "/base/directory", and "/path/to/php" as appropriate for your situation. - -If you are using a Linux server, run "crontab -e" and add a line like the -one shown, substituting for your unique paths and settings: - -`*/15 * * * * cd /home/myname/mywebsite; /usr/bin/php include/poller.php` - -You can generally find the location of PHP by executing "which php". If you -have troubles with this section please contact your hosting provider for -assistance. Red will not work correctly if you cannot perform this step. - -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include install/INSTALL.txt From a5a501c90fcf33888e4f49f4a1135e70f173997b Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 13 Sep 2014 15:25:05 +0100 Subject: [PATCH 13/36] Here, have a semi-colon --- doc/install.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install.bb b/doc/install.bb index 37fdeeba0..1a35537aa 100644 --- a/doc/install.bb +++ b/doc/install.bb @@ -1 +1 @@ -#include install/INSTALL.txt +#include install/INSTALL.txt; From dfc8430c8a5d1fcfedfc2b818500ae2ffd41515d Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 13 Sep 2014 16:33:20 +0200 Subject: [PATCH 14/36] cleanup after recent changes in mod photos --- .../dist/js/jquery.justifiedGallery.js | 5 +- view/css/mod_photos.css | 49 +------------------ view/theme/redbasic/css/style.css | 13 ----- 3 files changed, 4 insertions(+), 63 deletions(-) diff --git a/library/justifiedGallery/dist/js/jquery.justifiedGallery.js b/library/justifiedGallery/dist/js/jquery.justifiedGallery.js index 2c3eee11b..9b5c66081 100644 --- a/library/justifiedGallery/dist/js/jquery.justifiedGallery.js +++ b/library/justifiedGallery/dist/js/jquery.justifiedGallery.js @@ -444,6 +444,7 @@ } return this.each(function (index, gallery) { + var $gallery = $(gallery); $gallery.addClass('justified-gallery'); @@ -492,14 +493,13 @@ } else if (arg === 'norewind') { // In this case we don't rewind, and analyze all the images } else { - //redmatrix - this makes the gallery jump back to top after new content is loaded context.settings = $.extend({}, context.settings, arg); rewind(context); } checkSettings(context); - context.entries = $gallery.find('> a').toArray(); + context.entries = $gallery.find('> a, > div').toArray(); if (context.entries.length === 0) return; // Randomize @@ -533,6 +533,7 @@ //DEBUG// console.log('listed ' + $image.attr('alt')); imagesToLoad = true; + // Spinner start if (context.spinner.active === false) { context.spinner.active = true; diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index b81145cd5..0c4c25bae 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -1,11 +1,3 @@ - - -.photo-top-photo, .photo-album-photo { - padding: 10px; - max-width: 300px; -} - - .photos-end { clear: both; margin-bottom: 25px; @@ -30,51 +22,11 @@ clear: both; } -.photo-album-image-wrapper { - float: left; - margin-top: 15px; - margin-right: 15px; - margin-left: 15px; -} -.photo-album-image-wrapper .caption { - display: none; - width: 100%; - bottom: 0px; - padding: 0.5em 0.5em 0px 0.5em; - margin: 0px; -} -.photo-album-image-wrapper a:hover .caption { - display:block; -} - #photo-album-end { clear: both; margin-bottom: 25px; } -.photo-top-image-wrapper { - float: left; - margin-top: 15px; - margin-right: 15px; - margin-left: 15px; - margin-bottom: 15px; -} -.photo-top-album-name { - width: 100%; - min-height: 2em; - bottom: 0px; - padding: 0px 3px; - padding-top: 0.5em; -} -#photo-top-end { - clear: both; -} - -#photo-top-links { - margin-bottom: 30px; - margin-left: 30px; -} - #photos-upload-newalbum-div { float: left; width: 175px; @@ -83,6 +35,7 @@ #photos-upload-noshare { margin-bottom: 10px; } + #photos-upload-existing-album-text { float: left; width: 175px; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index df95e48b8..bb11ddbb9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -675,10 +675,6 @@ aside li { margin: auto; } -.photo-top-image-wrapper, .photo-album-image-wrapper { - width: 240px; -} - .photo-top-photo-link, .photo-album-photo-link { display: block; width: 100%; @@ -688,15 +684,6 @@ aside li { overflow: hidden; } -.photo-album-image-wrapper .caption { - background-color: $acpopup_bgcolour; - border-bottom: 2px solid $acpopup_bordercolour; -} - -.photo-top-album-name { - background-color: $acpopup_bgcolour; -} - #photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { color: #8888FF; text-decoration: none; From e8901b2ffe77a98cfe45f7741e684ec3c291f8f9 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 13 Sep 2014 19:45:26 +0200 Subject: [PATCH 15/36] remove this hub from fallback servers --- boot.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 7dd52069f..b8457467e 100755 --- a/boot.php +++ b/boot.php @@ -73,7 +73,6 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://zotid.net', 'https://redmatrix.nl', 'https://whogotzot.com', - 'https://red.mariovavti.com', 'https://red.zottel.red', 'https://red.pixelbits.de' ); @@ -2042,4 +2041,4 @@ function get_directory_realm() { if($x = get_config('system','directory_realm')) return $x; return DIRECTORY_REALM; -} \ No newline at end of file +} From f85aba3a1e4398aed9f2781272001d320b608bbb Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 13 Sep 2014 18:51:51 +0100 Subject: [PATCH 16/36] Doco - some links that got stripped at some point --- doc/main.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/main.bb b/doc/main.bb index 137ea93a8..e0cca3d31 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -49,6 +49,9 @@ Zot is the great new communicaton protocol invented especially for the Red Matri [zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl] [size=large][b]Technical Documentation[/b][/size] +[zrl=[baseurl]/help/Zot---A-High-Level-Overview.md[/zrl]A high level overview of Zot[/zrl] +[zrl=[baseurl]/help/zot]An introduction to Zot/zrl] +[zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl] [zrl=[baseurl]/help/comanche]Comanche Page Descriptions[/zrl] [zrl=[baseurl]/help/Creating-Templates]Creating Comanche Templates[/zrl] [zrl=[baseurl]/help/Widgets]Core Widgets[/zrl] From d84eb8c79a9a5a748dc4583032124a127e8f390b Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 13 Sep 2014 19:27:24 +0100 Subject: [PATCH 17/36] Bring DB doco up to date --- doc/intro_for_developers.bb | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index 086d3c681..2f498e6fb 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -41,46 +41,63 @@ [li]abook - contact table, replaces Friendica 'contact'[/li] [li]account - service provider account[/li] [li]addon - registered plugins[/li] + [li]app - peronal app data[/li] [li]attach - file attachments[/li] [li]auth_codes - OAuth usage[/li] [li]cache - TBD[/li] [li]challenge - old DFRN structure, may re-use or may deprecate[/li] [li]channel - replaces Friendica 'user'[/li] + [li]chat - chat room content[/li] + [li]chatpresence - channel presence information for chat[/li] + [li]chatroom - data for the actual chat room[/li] [li]clients - OAuth usage[/li] [li]config - main configuration storage[/li] + [li]conv - [/li] [li]event - Events[/li] [li]fcontact - friend suggestion stuff[/li] [li]ffinder - friend suggestion stuff[/li] [li]fserver - obsolete[/li] [li]fsuggest - friend suggestion stuff[/li] - [li]gcign - ignored friend suggestions[/li] - [li]gcontact - social graph storage, obsolete[/li] - [li]glink - social graph storage - obsolete[/li] - [li]group - privacy groups[/li] + [li]groups - privacy groups[/li] [li]group_member - privacy groups[/li] [li]hook - plugin hook registry[/li] [li]hubloc - Red location storage, ties a location to an xchan[/li] [li]intro - DFRN introductions, may be obsolete[/li] [li]item - posts[/li] [li]item_id - other identifiers on other services for posts[/li] + [li]likes - likes of 'things'[/li] [li]mail - private messages[/li] [li]manage - may be unused in Red, table of accounts that can "su" each other[/li] + [li]menu - channel menu data[/li] + [li]menu_item - items uses by channel menus[/li] [li]notify - notifications[/li] [li]notify-threads - need to factor this out and use item thread info on notifications[/li] + [li]obj - object data for things (x has y)[/li] [li]outq - Red output queue[/li] [li]pconfig - personal (per channel) configuration storage[/li] [li]photo - photo storage[/li] + [li]poll - data for polls[/li] + [li]poll_elm - data for poll elements[/li] + [li]profdef - custom profile field definitions[/li] + [li]profext - custom profile field data[/li] [li]profile - channel profiles[/li] [li]profile_check - DFRN remote auth use, may be obsolete[/li] - [li]queue - old Friendica queue, obsolete[/li] [li]register - registrations requiring admin approval[/li] [li]session - web session storage[/li] + [li]shares - shared item information[/li] + [li[sign - Diaspora signatures. To be phased out.[/li] [li]site - site table to find directory peers[/li] + [li]source - channel sources data[/li] [li]spam - unfinished[/li] + [li]sys_perms - extensible permissions for the sys channel[/li] [li]term - item taxonomy (categories, tags, etc.) table[/li] [li]tokens - OAuth usage[/li] + [li]updates - directory sync updates[/li] [li]verify - general purpose verification structure[/li] + [li]vote - vote data for polls[/li] [li]xchan - replaces 'gcontact', list of known channels in the universe[/li] + [li]xchat - bookmarked chat rooms[/li] + [li]xconfig - as pconfig but for channels with no local account[/li] [li]xlink - "friends of friends" linkages derived from poco[/li] [li]xprof - if this hub is a directory server, contains basic public profile info of everybody in the network[/li] [li]xtag - if this hub is a directory server, contains tags or interests of everybody in the network[/li] From 969f2530ccbd1586b6286f51159398ce0c88f4ca Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 13 Sep 2014 19:56:30 +0100 Subject: [PATCH 18/36] Doco - kill dupe --- doc/Intro-for-Developers.md | 105 ------------------------------------ 1 file changed, 105 deletions(-) delete mode 100644 doc/Intro-for-Developers.md diff --git a/doc/Intro-for-Developers.md b/doc/Intro-for-Developers.md deleted file mode 100644 index bf74cb7c1..000000000 --- a/doc/Intro-for-Developers.md +++ /dev/null @@ -1,105 +0,0 @@ -File system layout: -=================== - -[addon] optional addons/plugins - -[boot.php] Every process uses this to bootstrap the application structure - -[doc] Help Files - -[images] core required images - -[include] The "model" in MVC - (back-end functions), also contains PHP "executables" for background processing - -[index.php] The front-end controller for web access - -[install] Installation and upgrade files and DB schema - -[js] core required javascript - -[library] Third party modules (must be license compatible) - -[mod] Controller modules based on URL pathname (e.g. http://sitename/foo loads mod/foo.php) - -[spec] protocol specifications - -[util] translation tools, main English string database and other miscellaneous utilities - -[version.inc] contains current version (auto-updated via cron for the master repository and distributed via git) - -[view] theming and language files - - -[view/(css,js,img,php,tpl)] default theme files - -[view/(en,it,es ...)] language strings and resources - -[view/theme/] individual named themes containing (css,js,img,php,tpl) over-rides - - -The Database: -============= - -* abook - contact table, replaces Friendica 'contact' -* account - service provider account -* addon - registered plugins -* attach - file attachments -* auth_codes - OAuth usage -* cache - TBD -* challenge - old DFRN structure, may re-use or may deprecate -* channel - replaces Friendica 'user' -* clients - OAuth usage -* config - main configuration storage -* event - Events -* fcontact - friend suggestion stuff -* ffinder - friend suggestion stuff -* fserver - obsolete -* fsuggest - friend suggestion stuff -* gcign - ignored friend suggestions -* gcontact - social graph storage, obsolete -* glink - social graph storage - obsolete -* group - privacy groups -* group_member - privacy groups -* hook - plugin hook registry -* hubloc - Red location storage, ties a location to an xchan -* intro - DFRN introductions, may be obsolete -* item - posts -* item_id - other identifiers on other services for posts -* mail - private messages -* manage - may be unused in Red, table of accounts that can "su" each other -* notify - notifications -* notify-threads - need to factor this out and use item thread info on notifications -* outq - Red output queue -* pconfig - personal (per channel) configuration storage -* photo - photo storage -* profile - channel profiles -* profile_check - DFRN remote auth use, may be obsolete -* queue - old Friendica queue, obsolete -* register - registrations requiring admin approval -* session - web session storage -* site - site table to find directory peers -* spam - unfinished -* term - item taxonomy (categories, tags, etc.) table -* tokens - OAuth usage -* verify - general purpose verification structure -* xchan - replaces 'gcontact', list of known channels in the universe -* xlink - "friends of friends" linkages derived from poco -* xprof - if this hub is a directory server, contains basic public profile info of everybody in the network -* xtag - if this hub is a directory server, contains tags or interests of everybody in the network - - -How to theme Red - by Olivier Migeot -==================================== - -This is a short documentation on what I found while trying to modify Red's appearance. - -First, you'll need to create a new theme. This is in /view/theme, and I chose to copy 'redbasic' since it's the only available for now. Let's assume I named it . - -Oh, and don't forget to rename the _init function in /php/theme.php to be _init() instead of redbasic_init(). - -At that point, if you need to add javascript or css files, add them to /js or /css, and then "register" them in _init() through head_add_js('file.js') and head_add_css('file.css'). - -Now you'll probably want to alter a template. These can be found in in /view/tpl OR view//tpl. All you should have to do is copy whatever you want to tweak from the first place to your theme's own tpl directory. - - - From 0350b76d851977ccd6eed4278738346f0febbf96 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 13 Sep 2014 16:00:09 -0700 Subject: [PATCH 19/36] some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries. --- include/hubloc.php | 56 ++++++++++++- include/zot.php | 202 ++++++++++++++++++++++++++++++++++++++++++++- mod/post.php | 4 +- version.inc | 2 +- 4 files changed, 258 insertions(+), 6 deletions(-) diff --git a/include/hubloc.php b/include/hubloc.php index 566875ce9..d51e38eae 100644 --- a/include/hubloc.php +++ b/include/hubloc.php @@ -42,4 +42,58 @@ function prune_hub_reinstalls() { } } } -} \ No newline at end of file +} + +function remove_obsolete_hublocs() { + + // Get rid of any hublocs which are ours but aren't valid anymore - + // e.g. they point to a different and perhaps transient URL that we aren't using. + + // I need to stress that this shouldn't happen. fix_system_urls() fixes hublocs + // when it discovers the URL has changed. So it's unclear how we could end up + // with URLs pointing to the old site name. But it happens. This may be an artifact + // of an old bug or maybe a regression in some newer code. In any event, they + // mess up communications and we have to take action if we find any. + + // First make sure we have any hublocs (at all) with this URL and sitekey. + // We don't want to perform this operation while somebody is in the process + // of renaming their hub or installing certs. + + $r = q("select hubloc_id from hubloc where hubloc_url = '%s' and hubloc_sitekey = '%s'", + dbesc(z_root()), + dbesc(get_config('system','pubkey')) + ); + if((! $r) || (! count($r))) + return; + + // Good. We have at least one valid hubloc. + + // Do we have any invalid ones? + + $r = q("select hubloc_id from hubloc where hubloc_sitekey = '%s' and hubloc_url != '%s'", + dbesc(get_config('system','pubkey')), + dbesc(z_root()) + ); + if(! $r) + return; + + logger('remove_obsolete_hublocs: removing ' . count($r) . ' hublocs.'); + + // We've got invalid hublocs. Get rid of them. + + $r = q("delete from hubloc where hubloc_sitekey = '%s' and hubloc_url != '%s'", + dbesc(get_config('system','pubkey')), + dbesc(z_root()) + ); + + // We should probably tell everybody... But we don't have an easy way to do this + // for the entire site. We'd have to do a channel at a time. + // They will find out anyway - it just might take a little while. + + // FIXME we probably also need to check that the sys channel has a valid hubloc + // and re-create it if it doesn't. + +} + + + \ No newline at end of file diff --git a/include/zot.php b/include/zot.php index 644d20ec2..d2b657edb 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1189,7 +1189,8 @@ function zot_fetch($arr) { * we will verify the sender and url in each returned message structure and also verify * that all the messages returned match the site url that we are currently processing. * - * The message types handled here are 'activity' (e.g. posts), 'mail' , 'profile', and 'channel_sync' + * The message types handled here are 'activity' (e.g. posts), 'mail' , 'profile', 'location', + * and 'channel_sync' * * @returns array => array ( [0] => string $channel_hash, [1] => string $delivery_status, [2] => string $address ) * suitable for logging remotely, enumerating the processing results of each message/recipient combination. @@ -1348,7 +1349,7 @@ function zot_import($arr, $sender_url) { } elseif($i['message']['type'] === 'channel_sync') { -// $arr = get_channelsync_elements($i['message']); + // $arr = get_channelsync_elements($i['message']); $arr = $i['message']; @@ -1357,6 +1358,15 @@ function zot_import($arr, $sender_url) { $result = process_channel_sync_delivery($i['notify']['sender'],$arr,$deliveries); } + elseif($i['message']['type'] === 'location') { + $arr = $i['message']; + + logger('Location message received: ' . print_r($arr,true), LOGGER_DATA); + logger('Location messaeg recipients: ' . print_r($deliveries,true), LOGGER_DATA); + + $result = process_location_delivery($i['notify']['sender'],$arr,$deliveries); + } + } if($result){ $return = array_merge($return,$result); @@ -1800,6 +1810,194 @@ function process_profile_delivery($sender,$arr,$deliveries) { import_directory_profile($sender['hash'],$arr,$r[0]['xchan_addr'], UPDATE_FLAGS_UPDATED, 0); } +function process_location_delivery($sender,$arr,$deliveries) { + + // deliveries is irrelevant + logger('process_location_delivery', LOGGER_DEBUG); +// sync_locations($sender,$arr,true); +} + +// We need to merge this code with that in the import_xchan function so as to make it +// easier to maintain changes. + +function sync_locations($sender,$arr,$absolute = false) { + +// fix sender stuff + + if($arr['locations']) { + + $xisting = q("select hubloc_id, hubloc_url, hubloc_sitekey from hubloc where hubloc_hash = '%s'", + dbesc($sender['hash']) + ); + + // See if a primary is specified + + $has_primary = false; + foreach($arr['locations'] as $location) { + if($location['primary']) { + $has_primary = true; + break; + } + } + + foreach($arr['locations'] as $location) { + if(! rsa_verify($location['url'],base64url_decode($location['url_sig']),$sender['key'])) { + logger('import_xchan: Unable to verify site signature for ' . $location['url']); + $ret['message'] .= sprintf( t('Unable to verify site signature for %s'), $location['url']) . EOL; + continue; + } + + // Ensure that they have one primary hub + + if(! $has_primary) + $location['primary'] = true; + + + for($x = 0; $x < count($xisting); $x ++) { + if(($xisting[$x]['hubloc_url'] === $location['url']) && ($xisting[$x]['hubloc_sitekey'] === $location['sitekey'])) { + $xisting[$x]['updated'] = true; + } + } + + if(! $location['sitekey']) { + logger('import_xchan: empty hubloc sitekey. ' . print_r($location,true)); + continue; + } + + // Catch some malformed entries from the past which still exist + + if(strpos($location['address'],'/') !== false) + $location['address'] = substr($location['address'],0,strpos($location['address'],'/')); + + // match as many fields as possible in case anything at all changed. + + $r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' ", + dbesc($sender['hash']), + dbesc($sender['guid']), + dbesc($sender['guid_sig']), + dbesc($location['url']), + dbesc($location['url_sig']), + dbesc($location['host']), + dbesc($location['address']), + dbesc($location['callback']), + dbesc($location['sitekey']) + ); + if($r) { + logger('import_xchan: hub exists: ' . $location['url']); + // update connection timestamp if this is the site we're talking to + if(array_key_exists('site',$arr) && $location['url'] == $arr['site']['url']) { + q("update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d limit 1", + dbesc(datetime_convert()), + dbesc(datetime_convert()), + intval($r[0]['hubloc_id']) + ); + } + if($r[0]['hubloc_status'] & HUBLOC_OFFLINE) { + q("update hubloc set hubloc_status = (hubloc_status ^ %d) where hubloc_id = %d limit 1", + intval(HUBLOC_OFFLINE), + intval($r[0]['hubloc_id']) + ); + if($r[0]['hubloc_flags'] & HUBLOC_FLAGS_ORPHANCHECK) { + q("update hubloc set hubloc_flags = (hubloc_flags ^ %d) where hubloc_id = %d limit 1", + intval(HUBLOC_FLAGS_ORPHANCHECK), + intval($r[0]['hubloc_id']) + ); + } + q("update xchan set xchan_flags = (xchan_flags ^ %d) where (xchan_flags & %d) and xchan_hash = '%s' limit 1", + intval(XCHAN_FLAGS_ORPHAN), + intval(XCHAN_FLAGS_ORPHAN), + dbesc($sender['hash']) + ); + + } + + // Remove pure duplicates + if(count($r) > 1) { + for($h = 1; $h < count($r); $h ++) { + q("delete from hubloc where hubloc_id = %d limit 1", + intval($r[$h]['hubloc_id']) + ); + } + } + + if((($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) && (! $location['primary'])) + || ((! ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY)) && ($location['primary']))) { + $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_id = %d limit 1", + intval(HUBLOC_FLAGS_PRIMARY), + dbesc(datetime_convert()), + intval($r[0]['hubloc_id']) + ); + $what = 'primary_hub '; + $changed = true; + } + if((($r[0]['hubloc_flags'] & HUBLOC_FLAGS_DELETED) && (! $location['deleted'])) + || ((! ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) && ($location['deleted']))) { + $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_id = %d limit 1", + intval(HUBLOC_FLAGS_DELETED), + dbesc(datetime_convert()), + intval($r[0]['hubloc_id']) + ); + $what = 'delete_hub '; + $changed = true; + } + continue; + } + + // new hub claiming to be primary. Make it so. + + if(intval($location['primary'])) { + $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_hash = '%s' and (hubloc_flags & %d )", + intval(HUBLOC_FLAGS_PRIMARY), + dbesc(datetime_convert()), + dbesc($sender['hash']), + intval(HUBLOC_FLAGS_PRIMARY) + ); + } + logger('location_delivery: new hub: ' . $location['url']); + $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_flags, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_updated, hubloc_connected) + values ( '%s','%s','%s','%s', '%s', %d ,'%s','%s','%s','%s','%s','%s','%s')", + dbesc($sender['guid']), + dbesc($sender['guid_sig']), + dbesc($sender['hash']), + dbesc($location['address']), + dbesc('zot'), + intval((intval($location['primary'])) ? HUBLOC_FLAGS_PRIMARY : 0), + dbesc($location['url']), + dbesc($location['url_sig']), + dbesc($location['host']), + dbesc($location['callback']), + dbesc($location['sitekey']), + dbesc(datetime_convert()), + dbesc(datetime_convert()) + ); + $what .= 'newhub '; + $changed = true; + + } + + // get rid of any hubs we have for this channel which weren't reported. + + if($absolute && $xisting) { + foreach($xisting as $x) { + if(! array_key_exists('updated',$x)) { + logger('import_xchan: removing unreferenced hub location ' . $x['hubloc_url']); + $r = q("delete from hubloc where hubloc_id = %d limit 1", + intval($x['hubloc_id']) + ); + $what .= 'removed_hub'; + $changed = true; + } + } + } + } + + $ret['change_message'] = $what; + $ret['changed'] = $changed; + + return $ret; + +} + /* * @function import_directory_profile diff --git a/mod/post.php b/mod/post.php index 3b4f66baf..d62233ca1 100644 --- a/mod/post.php +++ b/mod/post.php @@ -415,8 +415,8 @@ function post_init(&$a) { * } *} * - * Currently defined message types are 'activity', 'mail', 'profile' and 'channel_sync', which each have - * different content schemas. + * Currently defined message types are 'activity', 'mail', 'profile', 'location' and 'channel_sync', + * which each have different content schemas. * * Ping packet: * A ping packet does not require any parameters except the type. It may or may not be encrypted. diff --git a/version.inc b/version.inc index aa1814513..92c44d434 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-12.796 +2014-09-13.797 From c27b60d98107e3949df3e48b9f5886483bf7ce57 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 14 Sep 2014 01:48:54 -0700 Subject: [PATCH 20/36] more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration. --- include/zot.php | 61 +++++++++++++++++++++++++++++++++++++++++-------- mod/zfinger.php | 23 +++---------------- version.inc | 2 +- 3 files changed, 55 insertions(+), 31 deletions(-) diff --git a/include/zot.php b/include/zot.php index d2b657edb..01e9d1064 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1814,7 +1814,14 @@ function process_location_delivery($sender,$arr,$deliveries) { // deliveries is irrelevant logger('process_location_delivery', LOGGER_DEBUG); -// sync_locations($sender,$arr,true); + + $r = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1", + dbesc($sender['hash']) + ); + if($r) + $sender['key'] = $r[0]['xchan_pubkey']; + + sync_locations($sender,$arr,true); } // We need to merge this code with that in the import_xchan function so as to make it @@ -1822,7 +1829,7 @@ function process_location_delivery($sender,$arr,$deliveries) { function sync_locations($sender,$arr,$absolute = false) { -// fix sender stuff + $ret = array(); if($arr['locations']) { @@ -1842,7 +1849,7 @@ function sync_locations($sender,$arr,$absolute = false) { foreach($arr['locations'] as $location) { if(! rsa_verify($location['url'],base64url_decode($location['url_sig']),$sender['key'])) { - logger('import_xchan: Unable to verify site signature for ' . $location['url']); + logger('sync_locations: Unable to verify site signature for ' . $location['url']); $ret['message'] .= sprintf( t('Unable to verify site signature for %s'), $location['url']) . EOL; continue; } @@ -1852,15 +1859,15 @@ function sync_locations($sender,$arr,$absolute = false) { if(! $has_primary) $location['primary'] = true; - for($x = 0; $x < count($xisting); $x ++) { - if(($xisting[$x]['hubloc_url'] === $location['url']) && ($xisting[$x]['hubloc_sitekey'] === $location['sitekey'])) { + if(($xisting[$x]['hubloc_url'] === $location['url']) + && ($xisting[$x]['hubloc_sitekey'] === $location['sitekey'])) { $xisting[$x]['updated'] = true; } } if(! $location['sitekey']) { - logger('import_xchan: empty hubloc sitekey. ' . print_r($location,true)); + logger('sync_locations: empty hubloc sitekey. ' . print_r($location,true)); continue; } @@ -1883,8 +1890,11 @@ function sync_locations($sender,$arr,$absolute = false) { dbesc($location['sitekey']) ); if($r) { - logger('import_xchan: hub exists: ' . $location['url']); + logger('sync_locations: hub exists: ' . $location['url'], LOGGER_DEBUG); + // update connection timestamp if this is the site we're talking to + // This only happens when called from import_xchan + if(array_key_exists('site',$arr) && $location['url'] == $arr['site']['url']) { q("update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d limit 1", dbesc(datetime_convert()), @@ -1892,6 +1902,11 @@ function sync_locations($sender,$arr,$absolute = false) { intval($r[0]['hubloc_id']) ); } + + // if it's marked offline/dead, bring it back + // Should we do this? It's basically saying that the channel knows better than + // the directory server if the site is alive. + if($r[0]['hubloc_status'] & HUBLOC_OFFLINE) { q("update hubloc set hubloc_status = (hubloc_status ^ %d) where hubloc_id = %d limit 1", intval(HUBLOC_OFFLINE), @@ -1908,7 +1923,6 @@ function sync_locations($sender,$arr,$absolute = false) { intval(XCHAN_FLAGS_ORPHAN), dbesc($sender['hash']) ); - } // Remove pure duplicates @@ -1927,7 +1941,7 @@ function sync_locations($sender,$arr,$absolute = false) { dbesc(datetime_convert()), intval($r[0]['hubloc_id']) ); - $what = 'primary_hub '; + $what .= 'primary_hub '; $changed = true; } if((($r[0]['hubloc_flags'] & HUBLOC_FLAGS_DELETED) && (! $location['deleted'])) @@ -1937,7 +1951,7 @@ function sync_locations($sender,$arr,$absolute = false) { dbesc(datetime_convert()), intval($r[0]['hubloc_id']) ); - $what = 'delete_hub '; + $what .= 'delete_hub '; $changed = true; } continue; @@ -1999,6 +2013,33 @@ function sync_locations($sender,$arr,$absolute = false) { } +function zot_encode_locations($channel) { + $ret = array(); + + $x = zot_get_hublocs($channel['channel_hash']); + if($x && count($x)) { + foreach($x as $hub) { + if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) { + $ret[] = array( + 'host' => $hub['hubloc_host'], + 'address' => $hub['hubloc_addr'], + 'primary' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) ? true : false), + 'url' => $hub['hubloc_url'], + 'url_sig' => $hub['hubloc_url_sig'], + 'callback' => $hub['hubloc_callback'], + 'sitekey' => $hub['hubloc_sitekey'], + 'deleted' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_DELETED) ? true : false) + ); + } + } + } + return $ret; +} + + + + + /* * @function import_directory_profile * diff --git a/mod/zfinger.php b/mod/zfinger.php index 1226f74fe..666f141ec 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -208,28 +208,11 @@ function zfinger_init(&$a) { if($permissions['view_profile']) $ret['profile'] = $profile; - // array of (verified) hubs this channel uses - $ret['locations'] = array(); - - $x = zot_get_hublocs($e['channel_hash']); - if($x && count($x)) { - foreach($x as $hub) { - if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) { - $ret['locations'][] = array( - 'host' => $hub['hubloc_host'], - 'address' => $hub['hubloc_addr'], - 'primary' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) ? true : false), - 'url' => $hub['hubloc_url'], - 'url_sig' => $hub['hubloc_url_sig'], - 'callback' => $hub['hubloc_callback'], - 'sitekey' => $hub['hubloc_sitekey'], - 'deleted' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_DELETED) ? true : false) - ); - } - } - } + $x = zot_encode_locations($e); + if($x) + $ret['locations'] = $x; $ret['site'] = array(); $ret['site']['url'] = z_root(); diff --git a/version.inc b/version.inc index 92c44d434..82ede1be5 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-13.797 +2014-09-14.798 From 2728f5a104878ed3237f4d6a19bfbea67ffeecd0 Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 14 Sep 2014 11:57:01 +0200 Subject: [PATCH 21/36] tryout - fetch larger thumbnail if image gets streched over its size --- view/js/main.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/view/js/main.js b/view/js/main.js index 13f1fea8f..fae22eb59 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -712,12 +712,12 @@ function updateConvItems(mode,data) { margins: 3, rowHeight : 150, sizeRangeSuffixes : { - 'lt100': '', - 'lt240': '', - 'lt320': '', - 'lt500': '', - 'lt640': '', - 'lt1024': '' + 'lt100': '-2', + 'lt240': '-2', + 'lt320': '-2', + 'lt500': '-1', + 'lt640': '-1', + 'lt1024': '-0' } }).on('jg.complete', function(e){ justifiedGalleryActive = false; }); } From 254dc0ec988d54972ca856f0bcdf5c5cd0d41ce1 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Sun, 14 Sep 2014 12:39:11 +0000 Subject: [PATCH 22/36] Made link post titles to source optional in display settings. Hopefully I did a right. --- include/ItemObject.php | 1 + mod/settings.php | 8 +++++++- view/tpl/conv_item.tpl | 4 +++- view/tpl/settings_display.tpl | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/ItemObject.php b/include/ItemObject.php index 451e369b0..79fd31c1c 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -250,6 +250,7 @@ class Item extends BaseObject { 'osparkle' => $osparkle, 'sparkle' => $sparkle, 'title' => $item['title'], + 'title_tosource' => get_pconfig(local_user(),'system','title_tosource'), 'ago' => relative_date($item['created']), 'app' => $item['app'], 'str_app' => sprintf( t(' from %s'), $item['app']), diff --git a/mod/settings.php b/mod/settings.php index a31814bf0..f9568feb3 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -136,7 +136,8 @@ function settings_post(&$a) { $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : $a->channel['channel_theme']); $mobile_theme = ((x($_POST,'mobile_theme')) ? notags(trim($_POST['mobile_theme'])) : ''); $user_scalable = ((x($_POST,'user_scalable')) ? intval($_POST['user_scalable']) : 0); - $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0); + $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0); + $title_tosource = ((x($_POST,'title_tosource')) ? intval($_POST['title_tosource']) : 0); $browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0); $browser_update = $browser_update * 1000; if($browser_update < 10000) @@ -156,6 +157,7 @@ function settings_post(&$a) { set_pconfig(local_user(),'system','update_interval', $browser_update); set_pconfig(local_user(),'system','itemspage', $itemspage); set_pconfig(local_user(),'system','no_smilies',$nosmile); + set_pconfig(local_user(),'system','title_tosource',$title_tosource); // set_pconfig(local_user(),'system','chanview_full',$chanview_full); @@ -742,6 +744,9 @@ function settings_content(&$a) { $nosmile = get_pconfig(local_user(),'system','no_smilies'); $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0 + $title_tosource = get_pconfig(local_user(),'system','title_tosource'); + $title_tosource = (($title_tosource===false)? '0': $title_tosource); // default if not set: 0 + $theme_config = ""; if( ($themeconfigfile = get_theme_config_file($theme_selected)) != null){ require_once($themeconfigfile); @@ -762,6 +767,7 @@ function settings_content(&$a) { '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), '$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')), '$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''), + '$title_tosource' => array('title_tosource', t("Link post titles to source"), $title_tosource, ''), '$layout_editor' => t('System Page Layout Editor - (advanced)'), '$theme_config' => $theme_config, '$expert' => feature_enabled(local_user(),'expert'), diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 8607b8ee8..ff69fd379 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -15,7 +15,9 @@
{{if $item.title}} - +
+

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

+
{{/if}} {{if $item.lock}}
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 6eda6a6ec..f10f2e1c2 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -12,7 +12,7 @@ {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} {{include file="field_checkbox.tpl" field=$nosmile}} - +{{include file="field_checkbox.tpl" field=$title_tosource}}
From 9b8066732603bec190f161bb7e891638eb0ae860 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Sun, 14 Sep 2014 13:59:27 +0000 Subject: [PATCH 23/36] Thanks to Thomas other people see now your posts on your channel page also linked to source. If enabled. --- include/ItemObject.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ItemObject.php b/include/ItemObject.php index 79fd31c1c..96abe4df6 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -250,7 +250,7 @@ class Item extends BaseObject { 'osparkle' => $osparkle, 'sparkle' => $sparkle, 'title' => $item['title'], - 'title_tosource' => get_pconfig(local_user(),'system','title_tosource'), + 'title_tosource' => get_pconfig($conv->get_profile_owner(),'system','title_tosource'), 'ago' => relative_date($item['created']), 'app' => $item['app'], 'str_app' => sprintf( t(' from %s'), $item['app']), From 72bce40a9fce3231629fd8cbd25a7c17a27c7595 Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 14 Sep 2014 22:37:03 +0200 Subject: [PATCH 24/36] tryout - some more adjustments --- view/js/main.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/view/js/main.js b/view/js/main.js index fae22eb59..d0fcf0077 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -708,14 +708,12 @@ function updateConvItems(mode,data) { justifiedGalleryActive = true; $('#photo-album-contents-' + bParam_page).justifiedGallery({ lastRow : 'nojustify', - captions: true, margins: 3, - rowHeight : 150, sizeRangeSuffixes : { 'lt100': '-2', 'lt240': '-2', 'lt320': '-2', - 'lt500': '-1', + 'lt500': '-0', 'lt640': '-1', 'lt1024': '-0' } From b5241c610fe3eeaebedebc94e43edb802565123a Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 15 Sep 2014 00:06:51 +0100 Subject: [PATCH 25/36] Deprecate site channel. The sys channel should be doing this. Will fix shortly. --- mod/admin.php | 6 +++--- view/tpl/admin_site.tpl | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 5bb97d158..836b12281 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -239,7 +239,7 @@ function admin_page_site_post(&$a){ $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : ''); $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : ''); $theme_accessibility = ((x($_POST,'theme_accessibility')) ? notags(trim($_POST['theme_accessibility'])) : ''); - $site_channel = ((x($_POST,'site_channel')) ? notags(trim($_POST['site_channel'])) : ''); +// $site_channel = ((x($_POST,'site_channel')) ? notags(trim($_POST['site_channel'])) : ''); $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); @@ -304,7 +304,7 @@ function admin_page_site_post(&$a){ set_config('system','accessibility_theme', $theme_accessibility); } - set_config('system','site_channel', $site_channel); +// set_config('system','site_channel', $site_channel); set_config('system','maximagesize', $maximagesize); set_config('system','register_policy', $register_policy); @@ -426,7 +426,7 @@ function admin_page_site(&$a) { '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile), '$theme_accessibility' => array('theme_accessibility', t("Accessibility system theme"), get_config('system','accessibility_theme'), t("Accessibility theme"), $theme_choices_accessibility), - '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")), +// '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")), '$diaspora_enabled' => array('diaspora_enabled',t('Enable Diaspora Protocol'), get_config('system','diaspora_enabled'), t('Communicate with Diaspora and Friendica - experimental')), '$feed_contacts' => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')), '$maximagesize' => array('maximagesize', t("Maximum image size"), intval(get_config('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 788fef457..56485dff6 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -47,7 +47,6 @@ {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} {{include file="field_select.tpl" field=$theme_accessibility}} - {{include file="field_input.tpl" field=$site_channel}} {{include file="field_checkbox.tpl" field=$no_login_on_homepage}} From 6be6b41a421f86579164288ea2fa7cebb6edd9d4 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 14 Sep 2014 17:07:39 -0700 Subject: [PATCH 26/36] privacy issue - restrictive stream permission setting with a non-targetted post cannot be enforced on remote networks. Restrict these posts to zot network. --- include/items.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index 166303cac..beec65d8a 100755 --- a/include/items.php +++ b/include/items.php @@ -68,13 +68,31 @@ function collect_recipients($item,&$private_envelope) { $private_envelope = false; if(array_key_exists('public_policy',$item) && $item['public_policy'] !== 'self') { - $r = q("select abook_xchan from abook where abook_channel = %d and not (abook_flags & %d) ", + $r = q("select abook_xchan, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d) ", intval($item['uid']), intval(ABOOK_FLAG_SELF|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED) ); if($r) { + + // filter out restrictive public_policy settings from remote networks + // which don't have this concept and will treat them as public. + + $policy = substr($item['public_policy'],0,3); foreach($r as $rr) { - $recipients[] = $rr['abook_xchan']; + switch($policy) { + case 'net': + case 'aut': + case 'sit': + case 'any': + case 'con': + if($rr['xchan_network'] != 'zot') + break; + case 'pub': + case '': + default: + $recipients[] = $rr['abook_xchan']; + break; + } } } } From 6416a61c41d604f88625f583c8b5052eb1b3f512 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 15 Sep 2014 01:38:55 +0100 Subject: [PATCH 27/36] A bit of mod/home refactoring. This is a transient state, so it's still messy, but it'll be much nicer after the move is finished. --- mod/home.php | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/mod/home.php b/mod/home.php index bc352976d..576213e06 100644 --- a/mod/home.php +++ b/mod/home.php @@ -39,10 +39,29 @@ function home_content(&$a) { if(x($_SESSION,'mobile_theme')) unset($_SESSION['mobile_theme']); - $channel_address = get_config("system", "site_channel" ); - if ($channel_address){ - // We can do better, but until we figure out auto-linkification, let's keep things simple + if(get_config('system','projecthome')) { + $o .= file_get_contents('assets/home.html'); + $a->page['template'] = 'full'; + $a->page['title'] = t('Red Matrix - "The Network"'); + return $o; + } + + +// Deprecated + $channel_address = get_config("system", "site_channel" ); + +// See if the sys channel set a homepage + if (! $channel_address) { + $u = get_sys_channel(); + if ($u) { + $u = array($u); + // change to channel_id when below deprecated and skip the $u=... + $channel_address = $u[0]['channel_address']; + } + } + + if ($channel_address){ $page_id = 'home'; @@ -50,11 +69,6 @@ function home_content(&$a) { dbesc($channel_address) ); - if(! $u) { - notice( t('Channel not found.') . EOL); - return; - } - $r = q("select item.* from item left join item_id on item.id = item_id.iid where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and item_restrict = %d limit 1", @@ -63,31 +77,24 @@ function home_content(&$a) { intval(ITEM_WEBPAGE) ); - if(! $r) { - notice( t('Item not found.') . EOL); - return; - } - + if($r) { xchan_query($r); $r = fetch_post_tags($r,true); $a->profile = array('profile_uid' => $u[0]['channel_id']); $o .= prepare_page($r[0]); return $o; + } + } - if(get_config('system','projecthome')) { - $o .= file_get_contents('assets/home.html'); - $a->page['template'] = 'full'; - $a->page['title'] = t('Red Matrix - "The Network"'); - return $o; - } +// Nope, we didn't find an item. Let's see if there's any html if(file_exists('home.html')) { $o .= file_get_contents('home.html'); } else { - // If there's no site channel or home contents configured, fallback to the old behaviour + // If there's nothing special happening, just spit out a login box $sitename = get_config('system','sitename'); if($sitename) From bcc9057d8c06d83c79830f370229a62dc3064d4f Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 14 Sep 2014 18:09:16 -0700 Subject: [PATCH 28/36] pull the plug on the old location sync section of import_xchan - this has now been split off into its own function. Cross fingers because this is core functionality which was tried and true, well tested; and now it's a bit different. Please revert this if the matrix breaks in the next few hours. --- include/zot.php | 180 ++++-------------------------------------------- 1 file changed, 12 insertions(+), 168 deletions(-) diff --git a/include/zot.php b/include/zot.php index 01e9d1064..c204375e1 100644 --- a/include/zot.php +++ b/include/zot.php @@ -661,6 +661,8 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) { } $xchan_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']); + $arr['hash'] = $xchan_hash; + $import_photos = false; if(! rsa_verify($arr['guid'],base64url_decode($arr['guid_sig']),$arr['key'])) { @@ -843,174 +845,16 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) { // what we are missing for true hub independence is for any changes in the primary hub to // get reflected not only in the hublocs, but also to update the URLs and addr in the appropriate xchan - if($arr['locations']) { - $xisting = q("select hubloc_id, hubloc_url, hubloc_sitekey from hubloc where hubloc_hash = '%s'", - dbesc($xchan_hash) - ); - - // See if a primary is specified - - $has_primary = false; - foreach($arr['locations'] as $location) { - if($location['primary']) { - $has_primary = true; - break; - } - } - - foreach($arr['locations'] as $location) { - if(! rsa_verify($location['url'],base64url_decode($location['url_sig']),$arr['key'])) { - logger('import_xchan: Unable to verify site signature for ' . $location['url']); - $ret['message'] .= sprintf( t('Unable to verify site signature for %s'), $location['url']) . EOL; - continue; - } - - // Ensure that they have one primary hub - - if(! $has_primary) - $location['primary'] = true; - - - for($x = 0; $x < count($xisting); $x ++) { - if(($xisting[$x]['hubloc_url'] === $location['url']) && ($xisting[$x]['hubloc_sitekey'] === $location['sitekey'])) { - $xisting[$x]['updated'] = true; - } - } - - if(! $location['sitekey']) { - logger('import_xchan: empty hubloc sitekey. ' . print_r($location,true)); - continue; - } - - // Catch some malformed entries from the past which still exist - - if(strpos($location['address'],'/') !== false) - $location['address'] = substr($location['address'],0,strpos($location['address'],'/')); - - // match as many fields as possible in case anything at all changed. - - $r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' ", - dbesc($xchan_hash), - dbesc($arr['guid']), - dbesc($arr['guid_sig']), - dbesc($location['url']), - dbesc($location['url_sig']), - dbesc($location['host']), - dbesc($location['address']), - dbesc($location['callback']), - dbesc($location['sitekey']) - ); - if($r) { - logger('import_xchan: hub exists: ' . $location['url']); - // update connection timestamp if this is the site we're talking to - if($location['url'] == $arr['site']['url']) { - q("update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d limit 1", - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($r[0]['hubloc_id']) - ); - } - if($r[0]['hubloc_status'] & HUBLOC_OFFLINE) { - q("update hubloc set hubloc_status = (hubloc_status ^ %d) where hubloc_id = %d limit 1", - intval(HUBLOC_OFFLINE), - intval($r[0]['hubloc_id']) - ); - if($r[0]['hubloc_flags'] & HUBLOC_FLAGS_ORPHANCHECK) { - q("update hubloc set hubloc_flags = (hubloc_flags ^ %d) where hubloc_id = %d limit 1", - intval(HUBLOC_FLAGS_ORPHANCHECK), - intval($r[0]['hubloc_id']) - ); - } - q("update xchan set xchan_flags = (xchan_flags ^ %d) where (xchan_flags & %d) and xchan_hash = '%s' limit 1", - intval(XCHAN_FLAGS_ORPHAN), - intval(XCHAN_FLAGS_ORPHAN), - dbesc($xchan_hash) - ); - - } - - // Remove pure duplicates - if(count($r) > 1) { - for($h = 1; $h < count($r); $h ++) { - q("delete from hubloc where hubloc_id = %d limit 1", - intval($r[$h]['hubloc_id']) - ); - } - } - - if((($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) && (! $location['primary'])) - || ((! ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY)) && ($location['primary']))) { - $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_id = %d limit 1", - intval(HUBLOC_FLAGS_PRIMARY), - dbesc(datetime_convert()), - intval($r[0]['hubloc_id']) - ); - $what = 'primary_hub '; - $changed = true; - } - if((($r[0]['hubloc_flags'] & HUBLOC_FLAGS_DELETED) && (! $location['deleted'])) - || ((! ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) && ($location['deleted']))) { - $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_id = %d limit 1", - intval(HUBLOC_FLAGS_DELETED), - dbesc(datetime_convert()), - intval($r[0]['hubloc_id']) - ); - $what = 'delete_hub '; - $changed = true; - } - continue; - } - - // new hub claiming to be primary. Make it so. - - if(intval($location['primary'])) { - $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_hash = '%s' and (hubloc_flags & %d )", - intval(HUBLOC_FLAGS_PRIMARY), - dbesc(datetime_convert()), - dbesc($xchan_hash), - intval(HUBLOC_FLAGS_PRIMARY) - ); - } - logger('import_xchan: new hub: ' . $location['url']); - $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_flags, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_updated, hubloc_connected) - values ( '%s','%s','%s','%s', '%s', %d ,'%s','%s','%s','%s','%s','%s','%s')", - dbesc($arr['guid']), - dbesc($arr['guid_sig']), - dbesc($xchan_hash), - dbesc($location['address']), - dbesc('zot'), - intval((intval($location['primary'])) ? HUBLOC_FLAGS_PRIMARY : 0), - dbesc($location['url']), - dbesc($location['url_sig']), - dbesc($location['host']), - dbesc($location['callback']), - dbesc($location['sitekey']), - dbesc(datetime_convert()), - dbesc(datetime_convert()) - ); - $what .= 'newhub '; - $changed = true; - - } - - // get rid of any hubs we have for this channel which weren't reported. - // This was needed at one time to resolve complicated cross-site inconsistencies, but can cause sync conflict. - // currently disabled. - -// if($xisting) { -// foreach($xisting as $x) { -// if(! array_key_exists('updated',$x)) { -// logger('import_xchan: removing unreferenced hub location ' . $x['hubloc_url']); -// $r = q("delete from hubloc where hubloc_id = %d limit 1", -// intval($x['hubloc_id']) -// ); -// $what .= 'removed_hub'; -// $changed = true; -// } -// } -// } + $s = sync_locations($arr,$arr); + if($s) { + if($s['change_message']) + $what .= $s['change_message']; + if($s['changed']) + $changed = $s['changed']; + if($s['message']) + $ret['message'] .= $s['message']; } // Which entries in the update table are we interested in updating? @@ -1967,7 +1811,7 @@ function sync_locations($sender,$arr,$absolute = false) { intval(HUBLOC_FLAGS_PRIMARY) ); } - logger('location_delivery: new hub: ' . $location['url']); + logger('sync_locations: new hub: ' . $location['url']); $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_flags, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_updated, hubloc_connected) values ( '%s','%s','%s','%s', '%s', %d ,'%s','%s','%s','%s','%s','%s','%s')", dbesc($sender['guid']), @@ -1994,7 +1838,7 @@ function sync_locations($sender,$arr,$absolute = false) { if($absolute && $xisting) { foreach($xisting as $x) { if(! array_key_exists('updated',$x)) { - logger('import_xchan: removing unreferenced hub location ' . $x['hubloc_url']); + logger('sync_locations: removing unreferenced hub location ' . $x['hubloc_url']); $r = q("delete from hubloc where hubloc_id = %d limit 1", intval($x['hubloc_id']) ); From 5042847334838ebadf5205bbbb84f809942cfa66 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 14 Sep 2014 19:04:36 -0700 Subject: [PATCH 29/36] fix diaspora_retraction --- include/diaspora.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 8a3eaf873..33404da74 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1966,19 +1966,16 @@ function diaspora_retraction($importer,$xml) { if($type === 'Person') { require_once('include/Contact.php'); - contact_remove($contact['id']); + contact_remove($importer['channel_id'],$contact['abook_id']); } elseif($type === 'Post') { - $r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1", + $r = q("select * from item where mid = '%s' and uid = %d limit 1", dbesc('guid'), intval($importer['channel_id']) ); if(count($r)) { - if(link_compare($r[0]['author-link'],$contact['url'])) { - q("update item set `deleted` = 1, `changed` = '%s' where `id` = %d", - dbesc(datetime_convert()), - intval($r[0]['id']) - ); + if(link_compare($r[0]['author_xchan'],$contact['xchan_hash'])) { + drop_item($r[0]['id'],false); } } } From b2fe2b067acc126f5138cbfc31a054ab35447498 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 14 Sep 2014 19:17:05 -0700 Subject: [PATCH 30/36] bb2diaspora_itemwallwall not finding author elements - inserting empty bbcode --- include/bb2diaspora.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 9c884926a..d9977d732 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -266,6 +266,10 @@ function bb2dmention_callback($match) { function bb2diaspora_itemwallwall(&$item) { if(($item['mid'] == $item['parent_mid']) && ($item['author_xchan'] != $item['owner_xchan']) && (is_array($item['author']))) { + logger('bb2diaspora_itemwallwall: author: ' . print_r($item['author'],true), LOGGER_DEBUG); + } + + if(($item['mid'] == $item['parent_mid']) && ($item['author_xchan'] != $item['owner_xchan']) && (is_array($item['author'])) && $item['author']['url'] && $item['author']['name'] && $item['author']['photo']['src']) { logger('bb2diaspora_itemwallwall: wall to wall post',LOGGER_DEBUG); // post will come across with the owner's identity. Throw a preamble onto the post to indicate the true author. $item['body'] = "\n\n" From f2b0311f9d0446f4cfbf57143aa58462c7c8f39a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 14 Sep 2014 19:20:16 -0700 Subject: [PATCH 31/36] that won't work... --- include/bb2diaspora.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index d9977d732..846725639 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -296,7 +296,8 @@ function bb2diaspora_itembody($item) { logger('bb2diaspora_itembody: cached '); $newitem = $item; $newitem['body'] = $meta['body']; - bb2diaspora_itemwallwall($newitem); +// this won't work - the post is now in markdown +// bb2diaspora_itemwallwall($newitem); return $newitem['body']; } } From e3783dfdd41e17147f63e9b72f12f66b92a37262 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 15 Sep 2014 03:51:41 +0100 Subject: [PATCH 32/36] Very, very cautiously, let a developer switch to the sys chan, if they're also an admin. --- include/security.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/security.php b/include/security.php index 0f2edc708..98d997288 100644 --- a/include/security.php +++ b/include/security.php @@ -82,6 +82,20 @@ function change_channel($change_channel) { intval(PAGE_REMOVED) ); + // It's not there. Is this an administrator, and is this the sys channel? + if (is_developer()) { + if (! $r) { + if (is_site_admin()) { + $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel_id = %d and ( channel_pageflags & %d) a$ + intval($change_channel), + intval(PAGE_SYSTEM), + intval(PAGE_REMOVED) + ); + } + } + } + + if($r) { $hash = $r[0]['channel_hash']; $_SESSION['uid'] = intval($r[0]['channel_id']); From b6612693b6a9a88c23112e604eee6e91c2778a58 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 15 Sep 2014 03:55:49 +0100 Subject: [PATCH 33/36] Bugger, revert - not only a dodgy cut and paste between terminals, but also pushed to the wrong repo --- include/security.php | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/include/security.php b/include/security.php index 98d997288..0f2edc708 100644 --- a/include/security.php +++ b/include/security.php @@ -82,20 +82,6 @@ function change_channel($change_channel) { intval(PAGE_REMOVED) ); - // It's not there. Is this an administrator, and is this the sys channel? - if (is_developer()) { - if (! $r) { - if (is_site_admin()) { - $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel_id = %d and ( channel_pageflags & %d) a$ - intval($change_channel), - intval(PAGE_SYSTEM), - intval(PAGE_REMOVED) - ); - } - } - } - - if($r) { $hash = $r[0]['channel_hash']; $_SESSION['uid'] = intval($r[0]['channel_id']); From 0dc33900b6799681683fd02f597e95acbd58e960 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 14 Sep 2014 22:19:19 -0700 Subject: [PATCH 34/36] provide a way to sync locations and get rid of bogus hublocs, now implemented --- include/diaspora.php | 6 ++++++ include/hubloc.php | 45 ++++++++++++++++++++++++++++++-------------- include/notifier.php | 27 ++++++++++++++++++++++++++ include/poller.php | 3 +++ include/zot.php | 10 ++++++++-- 5 files changed, 75 insertions(+), 16 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 33404da74..ea3c78bfe 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -142,6 +142,7 @@ function diaspora_process_outbound($arr) { 'cmd' => $cmd, 'expire' => $expire, 'mail' => $mail, + 'location' => $location, 'fsuggest' => $fsuggest, 'normal_mode' => $normal_mode, 'packet_type' => $packet_type, @@ -150,6 +151,10 @@ function diaspora_process_outbound($arr) { */ + if($arr['location']) + return; + + $target_item = $arr['target_item']; if($target_item && array_key_exists('item_flags',$target_item) && ($target_item['item_flags'] & ITEM_OBSCURED)) { @@ -161,6 +166,7 @@ function diaspora_process_outbound($arr) { } + if($arr['env_recips']) { $hashes = array(); diff --git a/include/hubloc.php b/include/hubloc.php index d51e38eae..cdc9de4af 100644 --- a/include/hubloc.php +++ b/include/hubloc.php @@ -46,6 +46,8 @@ function prune_hub_reinstalls() { function remove_obsolete_hublocs() { + logger('remove_obsolete_hublocs',LOGGER_DEBUG); + // Get rid of any hublocs which are ours but aren't valid anymore - // e.g. they point to a different and perhaps transient URL that we aren't using. @@ -66,7 +68,9 @@ function remove_obsolete_hublocs() { if((! $r) || (! count($r))) return; - // Good. We have at least one valid hubloc. + $channels = array(); + + // Good. We have at least one *valid* hubloc. // Do we have any invalid ones? @@ -74,25 +78,38 @@ function remove_obsolete_hublocs() { dbesc(get_config('system','pubkey')), dbesc(z_root()) ); - if(! $r) - return; - - logger('remove_obsolete_hublocs: removing ' . count($r) . ' hublocs.'); - - // We've got invalid hublocs. Get rid of them. - - $r = q("delete from hubloc where hubloc_sitekey = '%s' and hubloc_url != '%s'", + $p = q("select hubloc_id from hubloc where hubloc_sitekey != '%s' and hubloc_url = '%s'", dbesc(get_config('system','pubkey')), dbesc(z_root()) ); + if(is_array($r) && is_array($p)) + $r = array_merge($r,$p); - // We should probably tell everybody... But we don't have an easy way to do this - // for the entire site. We'd have to do a channel at a time. - // They will find out anyway - it just might take a little while. + if(! $r) + return; - // FIXME we probably also need to check that the sys channel has a valid hubloc - // and re-create it if it doesn't. + // We've got invalid hublocs. Get rid of them. + logger('remove_obsolete_hublocs: removing ' . count($r) . ' hublocs.'); + + $interval = ((get_config('system','delivery_interval') !== false) + ? intval(get_config('system','delivery_interval')) : 2 ); + + foreach($r as $rr) { + q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d limit 1", + intval(HUBLOC_FLAGS_DELETED), + intval($rr['hubloc_id']) + ); + + $x = q("select channel_id from channel where channel_hash = '%s' limit 1", + dbesc($rr['hubloc_hash']) + ); + if($x) { +// proc_run('php','include/notifier.php','location',$x[0]['channel_id']); +// if($interval) +// @time_sleep_until(microtime(true) + (float) $interval); + } + } } diff --git a/include/notifier.php b/include/notifier.php index 0b5744b29..ae781bcf8 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -57,6 +57,7 @@ require_once('include/html2plain.php'); * purge_all channel_id * expire channel_id * relay item_id (item was relayed to owner, we will deliver it as owner) + * location channel_id * */ @@ -144,6 +145,7 @@ function notifier_run($argv, $argc){ $mail = false; $fsuggest = false; $top_level = false; + $location = false; $recipients = array(); $url_recipients = array(); $normal_mode = true; @@ -230,6 +232,30 @@ function notifier_run($argv, $argc){ $private = false; $packet_type = 'refresh'; } + elseif($cmd === 'location') { + logger('notifier: location: ' . $item_id); + $s = q("select * from channel where channel_id = %d limit 1", + intval($item_id) + ); + if($s) + $channel = $s[0]; + $uid = $item_id; + $recipients = array(); + $r = q("select abook_xchan from abook where abook_channel = %d", + intval($item_id) + ); + if($r) { + foreach($r as $rr) { + $recipients[] = $rr['abook_xchan']; + } + } + + $encoded_item = array('locations' => zot_encode_locations($channel),'type' => 'location', 'encoding' => 'zot'); + $target_item = array('aid' => $channel['channel_account_id'],'uid' => $channel['channel_id']); + $private = false; + $packet_type = 'location'; + $location = true; + } elseif($cmd === 'purge_all') { logger('notifier: purge_all: ' . $item_id); $s = q("select * from channel where channel_id = %d limit 1", @@ -516,6 +542,7 @@ function notifier_run($argv, $argc){ 'cmd' => $cmd, 'expire' => $expire, 'mail' => $mail, + 'location' => $location, 'fsuggest' => $fsuggest, 'normal_mode' => $normal_mode, 'packet_type' => $packet_type, diff --git a/include/poller.php b/include/poller.php index c90e48d6b..f689059b9 100644 --- a/include/poller.php +++ b/include/poller.php @@ -171,6 +171,9 @@ function poller_run($argv, $argc){ proc_run('php','include/expire.php'); proc_run('php','include/cli_suggest.php'); + require_once('include/hubloc.php'); + remove_obsolete_hublocs(); + /** * End Cron Daily */ diff --git a/include/zot.php b/include/zot.php index c204375e1..f6732037a 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1121,6 +1121,11 @@ function zot_import($arr, $sender_url) { $deliveries = allowed_public_recips($i); + if($i['message'] && array_key_exists('type',$i['message']) && $i['message']['type'] === 'location') { + $sys = get_sys_channel(); + $deliveries = array(array('hash' => $sys['xchan_hash'])); + } + // if the scope is anything but 'public' we're going to store it as private regardless // of the private flag on the post. @@ -1206,7 +1211,7 @@ function zot_import($arr, $sender_url) { $arr = $i['message']; logger('Location message received: ' . print_r($arr,true), LOGGER_DATA); - logger('Location messaeg recipients: ' . print_r($deliveries,true), LOGGER_DATA); + logger('Location message recipients: ' . print_r($deliveries,true), LOGGER_DATA); $result = process_location_delivery($i['notify']['sender'],$arr,$deliveries); } @@ -1665,7 +1670,8 @@ function process_location_delivery($sender,$arr,$deliveries) { if($r) $sender['key'] = $r[0]['xchan_pubkey']; - sync_locations($sender,$arr,true); + $x = sync_locations($sender,$arr,true); + logger('process_location_delivery: results: ' . print_r($x,true), LOGGER_DATA); } // We need to merge this code with that in the import_xchan function so as to make it From ea8a01791e521a9ae4ea211e1b2e152b27a0486c Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 14 Sep 2014 22:43:56 -0700 Subject: [PATCH 35/36] allow the site to designate an admin channel that's visible to the outside world (via siteinfo/json). Otherwise we'll use the default channel of any accounts that have the account admin role. --- boot.php | 3 ++- mod/siteinfo.php | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index b8457467e..339a1f052 100755 --- a/boot.php +++ b/boot.php @@ -216,8 +216,9 @@ define ( 'PAGE_DIRECTORY_CHANNEL', 0x0008 ); // system channel used for director define ( 'PAGE_PREMIUM', 0x0010 ); define ( 'PAGE_ADULT', 0x0020 ); define ( 'PAGE_CENSORED', 0x0040 ); // Site admin has blocked this channel from appearing in casual search results and site feeds - define ( 'PAGE_SYSTEM', 0x1000 ); +define ( 'PAGE_HUBADMIN', 0x2000 ); // set this to indicate a preferred admin channel rather than the + // default channel of any accounts with the admin role. define ( 'PAGE_REMOVED', 0x8000 ); diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 061989413..01355a51d 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -13,7 +13,13 @@ function siteinfo_init(&$a) { if($r) { $admin = array(); foreach($r as $rr) { - $admin[] = array( 'name' => $rr['channel_name'], 'address' => $rr['channel_address'] . '@' . get_app()->get_hostname(), 'channel' => z_root() . '/channel/' . $rr['channel_address']); + if($rr['channel_pageflags'] & PAGE_HUBADMIN) + $admin[] = array( 'name' => $rr['channel_name'], 'address' => $rr['channel_address'] . '@' . get_app()->get_hostname(), 'channel' => z_root() . '/channel/' . $rr['channel_address']); + } + if(! $admin) { + foreach($r as $rr) { + $admin[] = array( 'name' => $rr['channel_name'], 'address' => $rr['channel_address'] . '@' . get_app()->get_hostname(), 'channel' => z_root() . '/channel/' . $rr['channel_address']); + } } } else { From 58aad83e5cb0edaf1ccc543147030e782c5e7ba9 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 15 Sep 2014 09:56:30 +0200 Subject: [PATCH 36/36] this is probably better in most cases --- view/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/js/main.js b/view/js/main.js index d0fcf0077..d6b405258 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -713,7 +713,7 @@ function updateConvItems(mode,data) { 'lt100': '-2', 'lt240': '-2', 'lt320': '-2', - 'lt500': '-0', + 'lt500': '-1', 'lt640': '-1', 'lt1024': '-0' }