From 701ae2981df31b277e3f92b56fa47778572366fb Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 12 Sep 2014 01:59:31 -0700 Subject: [PATCH 01/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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/94] 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 e3b967f475e8933567ba7d80dacb6d496224fe55 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 15 Sep 2014 03:59:04 +0100 Subject: [PATCH 34/94] Very, very cautiously let a developer switch to the sys chan if they're also an administrator. --- include/security.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/security.php b/include/security.php index 0f2edc708..e83cc7061 100644 --- a/include/security.php +++ b/include/security.php @@ -82,6 +82,19 @@ 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) and not (channel_pageflags & %d ) limit 1", + 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 35/94] 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 36/94] 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 37/94] 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' } From 5ab85b076bcab9f64903b74facce9466259fed15 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 15 Sep 2014 10:39:38 +0200 Subject: [PATCH 38/94] heading font-size should not be tied to font-size for posts and comments --- 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 bb11ddbb9..7c203d475 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2260,11 +2260,11 @@ h1, h2 { } h3, h4 { - font-size: $font_size; + font-size: 1rem; } h5, h6 { - font-size: $body_font_size; + font-size: 0.75rem; } .dropdown-menu { From 5188e1999721ba63fb7e88782af08d0b0e780dc9 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 15 Sep 2014 01:40:22 -0700 Subject: [PATCH 39/94] rev update --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index 82ede1be5..c3d994d3e 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-14.798 +2014-09-15.799 From eaf3bd3326a657662321df791280b41293f54ef2 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Mon, 15 Sep 2014 15:35:40 +0000 Subject: [PATCH 40/94] See comments on commit 5ab85b0. Also fixed some bb typo's in docu index. --- doc/main.bb | 4 ++-- view/theme/redbasic/css/style.css | 24 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/doc/main.bb b/doc/main.bb index e0cca3d31..9baeeebda 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -49,8 +49,8 @@ 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---A-High-Level-Overview]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] diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7c203d475..380d6d49c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2060,11 +2060,11 @@ img.mail-list-sender-photo { .wall-item-ago { color: #777; - font-size: 0.8em; + font-size: 0.833em; } .wall-item-ago i { - font-size: 0.8em; + font-size: 0.833em; } .wall-item-content { @@ -2082,7 +2082,7 @@ img.mail-list-sender-photo { } .comment-icon { - font-size: 0.8em; + font-size: 0.833em; color: $toolicon_colour; } @@ -2256,15 +2256,27 @@ blockquote { } h1, h2 { - font-size: 1.15rem; + font-size: 1.583em; } h3, h4 { - font-size: 1rem; + font-size: 1.334em; } h5, h6 { - font-size: 0.75rem; + font-size: 0.75rem; +} + +.wall-item-content h1, .wall-item-content h2 { + font-size: 1.319em; +} + +.wall-item-title { + font-size: $font_size; +} + +.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 { + font-size: 1.112em; } .dropdown-menu { From 5ea6f27792f378fe21306ce8caef6b86911c3f6f Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 15 Sep 2014 13:37:57 -0700 Subject: [PATCH 41/94] final piece of the mrjive delivery puzzle, and now we've got most all the tools to implement mod_hubman --- include/notifier.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index ae781bcf8..3f34d6133 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -455,8 +455,8 @@ function notifier_run($argv, $argc){ // for public posts always include our own hub - - $sql_extra = (($private) ? "" : " or hubloc_url = '" . dbesc(z_root()) . "' "); +// this shouldn't be needed any more. collect_recipients should take care of it. +// $sql_extra = (($private) ? "" : " or hubloc_url = '" . dbesc(z_root()) . "' "); logger('notifier: hub choice: ' . intval($relay_to_owner) . ' ' . intval($private) . ' ' . $cmd, LOGGER_DEBUG); @@ -478,7 +478,9 @@ function notifier_run($argv, $argc){ } else { $r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc - where hubloc_hash in (" . implode(',',$recipients) . ") $sql_extra group by hubloc_sitekey"); + where hubloc_hash in (" . implode(',',$recipients) . ") and not (hubloc_flags & %d) group by hubloc_sitekey", + intval(HUBLOC_FLAGS_DELETED) + ); } if(! $r) { @@ -493,6 +495,7 @@ function notifier_run($argv, $argc){ foreach($hubs as $hub) { // don't try to deliver to deleted hublocs - and inexplicably SQL "distinct" and "group by" // both return records with duplicate keys in rare circumstances +// FIXME this is probably redundant now. if((! ($hub['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) && (! in_array($hub['hubloc_sitekey'],$keys))) { $hublist[] = $hub['hubloc_host']; $keys[] = $hub['hubloc_sitekey']; From d2a4b34c98534940c12a2a5f093c7a2f7485b93c Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 16 Sep 2014 00:55:41 +0100 Subject: [PATCH 42/94] Trivial typo - concatenated string that should be. Doesn't really deserve it's own commit, but if I don't fix it now, nobody will notice for another18 months. --- doc/intro_for_developers.bb | 2 +- view/theme/redbasic/php/style.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index 2f498e6fb..4fb8ed3a9 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -52,7 +52,7 @@ [li]chatroom - data for the actual chat room[/li] [li]clients - OAuth usage[/li] [li]config - main configuration storage[/li] - [li]conv - [/li] + [li]conv - Diaspora private messages[/li] [li]event - Events[/li] [li]fcontact - friend suggestion stuff[/li] [li]ffinder - friend suggestion stuff[/li] diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index dbe7c306d..cd91fcee7 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -64,7 +64,7 @@ if(! $a->install) { // should leave it for admins to define for themselves. if (! $schema) { if(file_exists('view/theme/redbasic/schema/default.php')) { - $schemefile = 'view/theme/redbasic/schema/' . 'default.php'; + $schemefile = 'view/theme/redbasic/schema/default.php'; require_once ($schemefile); } } From bbc9e4427e76761b0607ce2c1a1f5cc7f499b52f Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 15 Sep 2014 17:17:00 -0700 Subject: [PATCH 43/94] honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped. --- include/account.php | 23 +++++++++++++++++++++++ include/zot.php | 40 ++++++++++++++++++++++++++++++++++++---- mod/import.php | 29 ++++++++++++++++++++++++++++- 3 files changed, 87 insertions(+), 5 deletions(-) diff --git a/include/account.php b/include/account.php index a3d6ef025..df484e608 100644 --- a/include/account.php +++ b/include/account.php @@ -616,6 +616,29 @@ function service_class_fetch($uid,$property) { return((array_key_exists($property,$arr)) ? $arr[$property] : false); } +// like service_class_fetch but queries by account rather than channel + +function account_service_class_fetch($aid,$property) { + + $r = q("select account_service_class as service_class from account where account_id = %d limit 1", + intval($aid) + ); + if($r !== false && count($r)) { + $service_class = $r[0]['service_class']; + } + + if(! x($service_class)) + return false; // everything is allowed + + $arr = get_config('service_class',$service_class); + + if(! is_array($arr) || (! count($arr))) + return false; + + return((array_key_exists($property,$arr)) ? $arr[$property] : false); +} + + function upgrade_link($bbcode = false) { $l = get_config('service_class','upgrade_link'); if(! $l) diff --git a/include/zot.php b/include/zot.php index f6732037a..add44e288 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2336,7 +2336,7 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { function process_channel_sync_delivery($sender,$arr,$deliveries) { // FIXME - this will sync red structures (channel, pconfig and abook). Eventually we need to make this application agnostic. -// TODO: missing group membership changes + $result = array(); @@ -2352,6 +2352,10 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) { $channel = $r[0]; + $max_friends = service_class_fetch($channel['channel_id'],'total_channels'); + $max_feeds = account_service_class_fetch($channel['channel_account_id'],'total_feeds'); + + if($channel['channel_hash'] != $sender['hash']) { logger('process_channel_sync_delivery: possible forgery. Sender ' . $sender['hash'] . ' is not ' . $channel['channel_hash']); $result[] = array($d['hash'],'channel mismatch',$channel['channel_name'],''); @@ -2385,6 +2389,19 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) { if(array_key_exists('abook',$arr) && is_array($arr['abook']) && count($arr['abook'])) { + $total_friends = 0; + $total_feeds = 0; + + $r = q("select abook_id, abook_flags from abook where abook_channel = %d", + intval($channel['channel_id']) + ); + if($r) { + // don't count yourself + $total_friends = ((count($r) > 0) ? $count($r) - 1 : 0); + foreach($r as $rr) + if($rr['abook_flags'] & ABOOK_FLAG_FEED) + $total_feeds ++; + } $disallowed = array('abook_id','abook_account','abook_channel'); @@ -2395,14 +2412,18 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) { logger('process_channel_sync_delivery: removing abook entry for ' . $abook['abook_xchan']); require_once('include/Contact.php'); - $r = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d and not ( abook_flags & %d ) limit 1", + $r = q("select abook_id, abook_flags from abook where abook_xchan = '%s' and abook_channel = %d and not ( abook_flags & %d ) limit 1", dbesc($abook['abook_xchan']), intval($channel['channel_id']), intval(ABOOK_FLAG_SELF) ); - if($r) + if($r) { contact_remove($channel['channel_id'],$r[0]['abook_id']); - + if($total_friends) + $total_friends --; + if($r[0]['abook_flags'] & ABOOK_FLAG_FEED) + $total_feeds --; + } continue; } @@ -2449,10 +2470,21 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) { // make sure we have an abook entry for this xchan on this system if(! $r) { + if($max_friends !== false && $total_friends > $max_friends) { + logger('process_channel_sync_delivery: total_channels service class limit exceeded'); + continue; + } + if($max_feeds !== false && ($clean['abook_flags'] & ABOOK_FLAG_FEED) && $total_feeds > $max_feeds) { + logger('process_channel_sync_delivery: total_feeds service class limit exceeded'); + continue; + } q("insert into abook ( abook_xchan, abook_channel ) values ('%s', %d ) ", dbesc($clean['abook_xchan']), intval($channel['channel_id']) ); + $total_friends ++; + if($clean['abook_flags'] & ABOOK_FLAG_FEED) + $total_feeds ++; } if(count($clean)) { diff --git a/mod/import.php b/mod/import.php index 7452bcdc9..22eb688ab 100644 --- a/mod/import.php +++ b/mod/import.php @@ -9,10 +9,25 @@ require_once('include/identity.php'); function import_post(&$a) { - if(! get_account_id()) { + $account_id = get_account_id(); + if(! $account_id) return; + + $max_identities = account_service_class_fetch($account_id,'total_identities'); + $max_friends = account_service_class_fetch($account_id,'total_channels'); + $max_feeds = account_service_class_fetch($account_id,'total_feeds'); + + if($max_identities !== false) { + $r = q("select channel_id from channel where channel_account_id = %d", + intval($account_id) + ); + if($r && count($r) > $max_identities) { + notice( sprintf( t('Your service plan only allows %d channels.'), $max_identities) . EOL); + return; + } } + $data = null; $seize = ((x($_REQUEST,'make_primary')) ? intval($_REQUEST['make_primary']) : 0); @@ -276,10 +291,18 @@ function import_post(&$a) { // FIXME - ensure we have an xchan if somebody is trying to pull a fast one + $friends = 0; + $feeds = 0; + // import contacts $abooks = $data['abook']; if($abooks) { foreach($abooks as $abook) { + if($max_friends !== false && $friends > $max_friends) + continue; + if($max_feeds !== false && ($abook['abook_flags'] & ABOOK_FLAG_FEED) && $feeds > $max_feeds) + continue; + unset($abook['abook_id']); $abook['abook_account'] = get_account_id(); $abook['abook_channel'] = $channel['channel_id']; @@ -289,6 +312,10 @@ function import_post(&$a) { . "`) VALUES ('" . implode("', '", array_values($abook)) . "')" ); + + $friends ++; + if($abook['abook_flags'] & ABOOK_FLAG_FEED) + $feeds ++; } } From 56c1c5cd88dd3686bf39686fd6f76c84714604b3 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 15 Sep 2014 17:43:40 -0700 Subject: [PATCH 44/94] couple of edits to make this more current --- doc/intro_for_developers.bb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index 4fb8ed3a9..b44095d3d 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -16,14 +16,10 @@ [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. #^[url=http://sitename/foo]http://sitename/foo[/url] 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) @@ -44,8 +40,7 @@ [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]cache - OEmbed cache[/li] [li]channel - replaces Friendica 'user'[/li] [li]chat - chat room content[/li] [li]chatpresence - channel presence information for chat[/li] @@ -62,7 +57,6 @@ [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] From 171719a774f9dc1ea81d11f15b121222bd30a898 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 15 Sep 2014 17:59:47 -0700 Subject: [PATCH 45/94] additions and edits to the faq --- doc/faq_users.bb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/faq_users.bb b/doc/faq_users.bb index 1a864f64a..aac4a114c 100644 --- a/doc/faq_users.bb +++ b/doc/faq_users.bb @@ -2,13 +2,16 @@ [ul] [*][b]I am able to edit a post's text after I saved it, but is there a way to change the permissions?[/b] -Short anser: No, there isn't. This has got some resons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Red Matrix servers or to those you intended it to go. Just like you cannot reclaim a few after you have sold them off to some people, you cannot change permissions to Red Matrix posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. -If a posting is public this is even harder, as the Red Matrix is a global network and there is no way to follow a post, let alone reclaim it reliably. -Once you have sent out an email there too is no way to take it back. So think wisely and keep alert when posting. :) -[*][b]I downloaded my channel and uploaded it to another site but there is no content, no posts, no photos. What is wrong???[/b] -To be honest: Nothing. That's the way it is right now. Technically it is surely possible to take at least your own posts and maybe even files with you, but this has simply put not implemented yet. When creating this feature we thought that keeping all your contacts was more important. Once we find someone willing to implement this, it will be done. :) +Short anser: No, there isn't. There are reasons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Red Matrix servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to Red Matrix posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. +If a posting is public this is even harder, as the Red Matrix is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post. +[*][b]I downloaded my channel and imported it (cloned my identity) to another site but there is no content, no posts, no photos. What is wrong???[/b] +To be honest: Nothing. That's the way it is right now. Technically it is surely possible to take at least your own posts and maybe even files with you, but this has simply put not implemented yet. When creating this feature we thought that keeping all your contacts was more important. Your friends have already seen your old content. Once we find someone willing to implement this, it will be done. :) [*][b]I can't see private resources[/b] You have probably disabled third party cookies. You need to enable them for remote authentication to work. +[*][b]There are a lot of foreign language posts. Let's auto-translate them.[/b] +There are also a lot of [b]private[/b] foreign language posts and auto-translation services would require us to transmit these private messages to the translation service; and we don't know what they will do with them on their servers. Actually we do know thanks to Edward Snowden. Our best bet is a project called [b][i]Apertium[/i][/b] which is an open source translator we can install locally. It is currently missing German translations - which are the most requested translation in the matrix. Once again, this will be implemented when we find somebody who really wants to make it happen. [/ul] + + Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] From 5f9c326ad7b7ba4a4c84ff2582898414f76267ca Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 15 Sep 2014 21:31:32 -0700 Subject: [PATCH 46/94] channel export with items --- include/identity.php | 36 +++++++++++++++++++++++++++++++++++- include/widgets.php | 10 +++++----- mod/import.php | 6 ++++++ mod/uexport.php | 2 +- 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/include/identity.php b/include/identity.php index d8f59e56c..1078ff082 100644 --- a/include/identity.php +++ b/include/identity.php @@ -396,7 +396,7 @@ function set_default_login_identity($account_id,$channel_id,$force = true) { * */ -function identity_basic_export($channel_id) { +function identity_basic_export($channel_id, $items = false) { /* * Red basic channel export @@ -468,8 +468,42 @@ function identity_basic_export($channel_id) { $ret['photo'] = array('type' => $r[0]['type'], 'data' => base64url_encode($r[0]['data'])); } + if(! $items) + return $ret; + + $r = q("select * from item_id where uid = %d", + intval($channel_id) + ); + + if($r) + $ret['item_id'] = $r; + + $key = get_config('system','prvkey'); + + // warning: this may run into memory limits on smaller systems + + $r = q("select * from item where (item_flags & %d) and not (item_restrict & %d) and uid = %d", + intval(ITEM_WALL), + intval(ITEM_DELETED), + intval($channel_id) + ); + if($r) { + for($x = 0; $x < count($r); $x ++) { + if($r[$x]['diaspora_meta']) + $r[$x]['diaspora_meta'] = crypto_unencapsulate(json_decode($r[$x]['diaspora_meta'],true),$key); + if($r[$x]['item_flags'] & ITEM_OBSCURED) { + $r[$x]['item_flags'] = $r[$x]['item_flags'] ^ ITEM_OBSCURED; + if($r[$x]['title']) + $r[$x]['title'] = crypto_unencapsulate(json_decode($r[$x]['title'],true),$key); + if($r[$x]['body']) + $r[$x]['body'] = crypto_unencapsulate(json_decode($r[$x]['body'],true),$key); + } + } + $ret['item'] = $r; + } return $ret; + } diff --git a/include/widgets.php b/include/widgets.php index 1aa018fb6..f1c9ceada 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -481,11 +481,11 @@ function widget_settings_menu($arr) { 'selected' => '' ), -// array( -// 'label' => t('Export account'), -// 'url' => $a->get_baseurl(true) . '/uexport/complete', -// 'selected' => '' -// ), + array( + 'label' => t('Export content'), + 'url' => $a->get_baseurl(true) . '/uexport/complete', + 'selected' => '' + ), array( 'label' => t('Automatic Permissions (Advanced)'), diff --git a/mod/import.php b/mod/import.php index 22eb688ab..0663a8b57 100644 --- a/mod/import.php +++ b/mod/import.php @@ -376,6 +376,12 @@ function import_post(&$a) { } } +//FIXME just a note here for when folks want to import content - be very careful to unset ITEM_ORIGIN on all imported content. Or you could end up with a nasty routing loop when somebody tries to reply to one of those posts. + + + + + // FIXME - ensure we have a self entry if somebody is trying to pull a fast one if($seize) { diff --git a/mod/uexport.php b/mod/uexport.php index f3a2ce67c..6304115c8 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -18,7 +18,7 @@ function uexport_init(&$a) { } if(argc() > 1 && argv(1) === 'complete') { - echo json_encode('not yet implemented'); + echo json_encode(identity_basic_export(local_user(),true)); killme(); } From 6c0133be1f945215ae5b21c4e6da0fda2817a0a3 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 15 Sep 2014 22:23:07 -0700 Subject: [PATCH 47/94] change platform name to redmatrix (lowercase, one word) for use in meta tags and stuff, move yet another oauth1 library to library instead of having it in plugins where we'll end up with a white screen if we re-use it in another plugin; which I plan to do. --- boot.php | 2 +- library/oauth/LICENSE | 37 + library/oauth/LICENSE.txt | 36 + library/oauth/http.php | 2092 ++++++++++++++++++++++++ library/oauth/oauth_client.php | 2176 +++++++++++++++++++++++++ library/oauth/oauth_client_class.html | 607 +++++++ 6 files changed, 4949 insertions(+), 1 deletion(-) create mode 100644 library/oauth/LICENSE create mode 100644 library/oauth/LICENSE.txt create mode 100644 library/oauth/http.php create mode 100644 library/oauth/oauth_client.php create mode 100644 library/oauth/oauth_client_class.html diff --git a/boot.php b/boot.php index 339a1f052..5118038d3 100755 --- a/boot.php +++ b/boot.php @@ -44,7 +44,7 @@ require_once('include/Contact.php'); require_once('include/account.php'); -define ( 'RED_PLATFORM', 'Red Matrix' ); +define ( 'RED_PLATFORM', 'redmatrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); diff --git a/library/oauth/LICENSE b/library/oauth/LICENSE new file mode 100644 index 000000000..7078ba251 --- /dev/null +++ b/library/oauth/LICENSE @@ -0,0 +1,37 @@ +PHP OAuth API - Access API authorized by the users +using the OAuth protocol + +This LICENSE is in the BSD license style. + +License Version Control: +@(#) $Id: LICENSE,v 1.2 2013/02/11 05:17:53 mlemos Exp $ + +Copyright (c) 2012-2013, Manuel Lemos +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + Neither the name of Manuel Lemos nor the names of his contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/library/oauth/LICENSE.txt b/library/oauth/LICENSE.txt new file mode 100644 index 000000000..29e83e173 --- /dev/null +++ b/library/oauth/LICENSE.txt @@ -0,0 +1,36 @@ +HTTP client PHP class + +This LICENSE is in the BSD license style. + +License Version Control: +@(#) $Id: LICENSE.txt,v 1.1 2006/04/17 19:44:04 mlemos Exp $ + +Copyright (c) 1999 - 2006, Manuel Lemos +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + Neither the name of Manuel Lemos nor the names of his contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/library/oauth/http.php b/library/oauth/http.php new file mode 100644 index 000000000..cb336fcfa --- /dev/null +++ b/library/oauth/http.php @@ -0,0 +1,2092 @@ +"01", + "Feb"=>"02", + "Mar"=>"03", + "Apr"=>"04", + "May"=>"05", + "Jun"=>"06", + "Jul"=>"07", + "Aug"=>"08", + "Sep"=>"09", + "Oct"=>"10", + "Nov"=>"11", + "Dec"=>"12"); + var $session=''; + var $connection_close=0; + var $force_close = 0; + var $connected_host = ''; + var $connected_port = -1; + var $connected_ssl = 0; + + /* Private methods - DO NOT CALL */ + + Function Tokenize($string,$separator="") + { + if(!strcmp($separator,"")) + { + $separator=$string; + $string=$this->next_token; + } + for($character=0;$characternext_token=substr($string,$found+1); + return(substr($string,0,$found)); + } + else + { + $this->next_token=""; + return($string); + } + } + + Function CookieEncode($value, $name) + { + return($name ? str_replace("=", "%25", $value) : str_replace(";", "%3B", $value)); + } + + Function SetError($error, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR) + { + $this->error_code = $error_code; + return($this->error=$error); + } + + Function SetPHPError($error, &$php_error_message, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR) + { + if(IsSet($php_error_message) + && strlen($php_error_message)) + $error.=": ".$php_error_message; + return($this->SetError($error, $error_code)); + } + + Function SetDataAccessError($error,$check_connection=0) + { + $this->error=$error; + $this->error_code = HTTP_CLIENT_ERROR_COMMUNICATION_FAILURE; + if(!$this->use_curl + && function_exists("socket_get_status")) + { + $status=socket_get_status($this->connection); + if($status["timed_out"]) + $this->error.=": data access time out"; + elseif($status["eof"]) + { + if($check_connection) + $this->error=""; + else + $this->error.=": the server disconnected"; + } + } + } + + Function OutputDebug($message) + { + if($this->log_debug) + error_log($message); + else + { + $message.="\n"; + if($this->html_debug) + $message=str_replace("\n","
\n",HtmlEntities($message)); + echo $message; + flush(); + } + } + + Function GetLine() + { + for($line="";;) + { + if($this->use_curl) + { + $eol=strpos($this->response,"\n",$this->read_response); + $data=($eol ? substr($this->response,$this->read_response,$eol+1-$this->read_response) : ""); + $this->read_response+=strlen($data); + } + else + { + if(feof($this->connection)) + { + $this->SetDataAccessError("reached the end of data while reading from the HTTP server connection"); + return(0); + } + $data=fgets($this->connection,100); + } + if(GetType($data)!="string" + || strlen($data)==0) + { + $this->SetDataAccessError("it was not possible to read line from the HTTP server"); + return(0); + } + $line.=$data; + $length=strlen($line); + if($length + && !strcmp(substr($line,$length-1,1),"\n")) + { + $length-=(($length>=2 && !strcmp(substr($line,$length-2,1),"\r")) ? 2 : 1); + $line=substr($line,0,$length); + if($this->debug) + $this->OutputDebug("S $line"); + return($line); + } + } + } + + Function PutLine($line) + { + if($this->debug) + $this->OutputDebug("C $line"); + if(!fputs($this->connection,$line."\r\n")) + { + $this->SetDataAccessError("it was not possible to send a line to the HTTP server"); + return(0); + } + return(1); + } + + Function PutData($data) + { + if(strlen($data)) + { + if($this->debug) + $this->OutputDebug('C '.$data); + if(!fputs($this->connection,$data)) + { + $this->SetDataAccessError("it was not possible to send data to the HTTP server"); + return(0); + } + } + return(1); + } + + Function FlushData() + { + if(!fflush($this->connection)) + { + $this->SetDataAccessError("it was not possible to send data to the HTTP server"); + return(0); + } + return(1); + } + + Function ReadChunkSize() + { + if($this->remaining_chunk==0) + { + $debug=$this->debug; + if(!$this->debug_response_body) + $this->debug=0; + $line=$this->GetLine(); + $this->debug=$debug; + if(GetType($line)!="string") + return($this->SetError("could not read chunk start: ".$this->error, $this->error_code)); + $this->remaining_chunk=hexdec($line); + if($this->remaining_chunk == 0) + { + if(!$this->debug_response_body) + $this->debug=0; + $line=$this->GetLine(); + $this->debug=$debug; + if(GetType($line)!="string") + return($this->SetError("could not read chunk end: ".$this->error, $this->error_code)); + } + } + return(""); + } + + Function ReadBytes($length) + { + if($this->use_curl) + { + $bytes=substr($this->response,$this->read_response,min($length,strlen($this->response)-$this->read_response)); + $this->read_response+=strlen($bytes); + if($this->debug + && $this->debug_response_body + && strlen($bytes)) + $this->OutputDebug("S ".$bytes); + } + else + { + if($this->chunked) + { + for($bytes="",$remaining=$length;$remaining;) + { + if(strlen($this->ReadChunkSize())) + return(""); + if($this->remaining_chunk==0) + { + $this->last_chunk_read=1; + break; + } + $ask=min($this->remaining_chunk,$remaining); + $chunk=@fread($this->connection,$ask); + $read=strlen($chunk); + if($read==0) + { + $this->SetDataAccessError("it was not possible to read data chunk from the HTTP server"); + return(""); + } + if($this->debug + && $this->debug_response_body) + $this->OutputDebug("S ".$chunk); + $bytes.=$chunk; + $this->remaining_chunk-=$read; + $remaining-=$read; + if($this->remaining_chunk==0) + { + if(feof($this->connection)) + return($this->SetError("reached the end of data while reading the end of data chunk mark from the HTTP server", HTTP_CLIENT_ERROR_PROTOCOL_FAILURE)); + $data=@fread($this->connection,2); + if(strcmp($data,"\r\n")) + { + $this->SetDataAccessError("it was not possible to read end of data chunk from the HTTP server"); + return(""); + } + } + } + } + else + { + $bytes=@fread($this->connection,$length); + if(strlen($bytes)) + { + if($this->debug + && $this->debug_response_body) + $this->OutputDebug("S ".$bytes); + } + else + $this->SetDataAccessError("it was not possible to read data from the HTTP server", $this->connection_close); + } + } + return($bytes); + } + + Function EndOfInput() + { + if($this->use_curl) + return($this->read_response>=strlen($this->response)); + if($this->chunked) + return($this->last_chunk_read); + if($this->content_length_set) + return($this->content_length <= $this->read_length); + return(feof($this->connection)); + } + + Function Resolve($domain, &$ip, $server_type) + { + if(preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/',$domain)) + $ip=$domain; + else + { + if($this->debug) + $this->OutputDebug('Resolving '.$server_type.' server domain "'.$domain.'"...'); + if(!strcmp($ip=@gethostbyname($domain),$domain)) + $ip=""; + } + if(strlen($ip)==0 + || (strlen($this->exclude_address) + && !strcmp(@gethostbyname($this->exclude_address),$ip))) + return($this->SetError("could not resolve the host domain \"".$domain."\"", HTTP_CLIENT_ERROR_INVALID_SERVER_ADDRESS)); + return(''); + } + + Function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP') + { + $domain=$host_name; + $port = $host_port; + if(strlen($error = $this->Resolve($domain, $ip, $server_type))) + return($error); + if(strlen($this->socks_host_name)) + { + switch($this->socks_version) + { + case '4': + $version = 4; + break; + case '5': + $version = 5; + break; + default: + return('it was not specified a supported SOCKS protocol version'); + break; + } + $host_ip = $ip; + $port = $this->socks_host_port; + $host_server_type = $server_type; + $server_type = 'SOCKS'; + if(strlen($error = $this->Resolve($this->socks_host_name, $ip, $server_type))) + return($error); + } + if($this->debug) + $this->OutputDebug('Connecting to '.$server_type.' server IP '.$ip.' port '.$port.'...'); + if($ssl) + $ip="ssl://".$host_name; + if(($this->connection=($this->timeout ? @fsockopen($ip, $port, $errno, $error, $this->timeout) : @fsockopen($ip, $port, $errno)))==0) + { + $error_code = HTTP_CLIENT_ERROR_CANNOT_CONNECT; + switch($errno) + { + case -3: + return($this->SetError("socket could not be created", $error_code)); + case -4: + return($this->SetError("dns lookup on hostname \"".$host_name."\" failed", $error_code)); + case -5: + return($this->SetError("connection refused or timed out", $error_code)); + case -6: + return($this->SetError("fdopen() call failed", $error_code)); + case -7: + return($this->SetError("setvbuf() call failed", $error_code)); + default: + return($this->SetPHPError($errno." could not connect to the host \"".$host_name."\"",$php_errormsg, $error_code)); + } + } + else + { + if($this->data_timeout + && function_exists("socket_set_timeout")) + socket_set_timeout($this->connection,$this->data_timeout,0); + if(strlen($this->socks_host_name)) + { + if($this->debug) + $this->OutputDebug('Connected to the SOCKS server '.$this->socks_host_name); + $send_error = 'it was not possible to send data to the SOCKS server'; + $receive_error = 'it was not possible to receive data from the SOCKS server'; + switch($version) + { + case 4: + $command = 1; + $user = ''; + if(!fputs($this->connection, chr($version).chr($command).pack('nN', $host_port, ip2long($host_ip)).$user.Chr(0))) + $error = $this->SetDataAccessError($send_error); + else + { + $response = fgets($this->connection, 9); + if(strlen($response) != 8) + $error = $this->SetDataAccessError($receive_error); + else + { + $socks_errors = array( + "\x5a"=>'', + "\x5b"=>'request rejected', + "\x5c"=>'request failed because client is not running identd (or not reachable from the server)', + "\x5d"=>'request failed because client\'s identd could not confirm the user ID string in the request', + ); + $error_code = $response[1]; + $error = (IsSet($socks_errors[$error_code]) ? $socks_errors[$error_code] : 'unknown'); + if(strlen($error)) + $error = 'SOCKS error: '.$error; + } + } + break; + case 5: + if($this->debug) + $this->OutputDebug('Negotiating the authentication method ...'); + $methods = 1; + $method = 0; + if(!fputs($this->connection, chr($version).chr($methods).chr($method))) + $error = $this->SetDataAccessError($send_error); + else + { + $response = fgets($this->connection, 3); + if(strlen($response) != 2) + $error = $this->SetDataAccessError($receive_error); + elseif(Ord($response[1]) != $method) + $error = 'the SOCKS server requires an authentication method that is not yet supported'; + else + { + if($this->debug) + $this->OutputDebug('Connecting to '.$host_server_type.' server IP '.$host_ip.' port '.$host_port.'...'); + $command = 1; + $address_type = 1; + if(!fputs($this->connection, chr($version).chr($command)."\x00".chr($address_type).pack('Nn', ip2long($host_ip), $host_port))) + $error = $this->SetDataAccessError($send_error); + else + { + $response = fgets($this->connection, 11); + if(strlen($response) != 10) + $error = $this->SetDataAccessError($receive_error); + else + { + $socks_errors = array( + "\x00"=>'', + "\x01"=>'general SOCKS server failure', + "\x02"=>'connection not allowed by ruleset', + "\x03"=>'Network unreachable', + "\x04"=>'Host unreachable', + "\x05"=>'Connection refused', + "\x06"=>'TTL expired', + "\x07"=>'Command not supported', + "\x08"=>'Address type not supported' + ); + $error_code = $response[1]; + $error = (IsSet($socks_errors[$error_code]) ? $socks_errors[$error_code] : 'unknown'); + if(strlen($error)) + $error = 'SOCKS error: '.$error; + } + } + } + } + break; + default: + $error = 'support for SOCKS protocol version '.$this->socks_version.' is not yet implemented'; + break; + } + if(strlen($error)) + { + fclose($this->connection); + return($error); + } + } + if($this->debug) + $this->OutputDebug("Connected to $host_name"); + if(strlen($this->proxy_host_name) + && !strcmp(strtolower($this->protocol), 'https')) + { + if(function_exists('stream_socket_enable_crypto') + && in_array('ssl', stream_get_transports())) + $this->state = "ConnectedToProxy"; + else + { + $this->OutputDebug("It is not possible to start SSL after connecting to the proxy server. If the proxy refuses to forward the SSL request, you may need to upgrade to PHP 5.1 or later with OpenSSL support enabled."); + $this->state="Connected"; + } + } + else + $this->state="Connected"; + return(""); + } + } + + Function Disconnect() + { + if($this->debug) + $this->OutputDebug("Disconnected from ".$this->connected_host); + if($this->use_curl) + { + curl_close($this->connection); + $this->response=""; + } + else + fclose($this->connection); + $this->state="Disconnected"; + return(""); + } + + /* Public methods */ + + Function GetRequestArguments($url, &$arguments) + { + $this->error = ''; + $this->error_code = HTTP_CLIENT_ERROR_NO_ERROR; + $arguments=array(); + $url = str_replace(' ', '%20', $url); + $parameters=@parse_url($url); + if(!$parameters) + return($this->SetError("it was not specified a valid URL", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + if(!IsSet($parameters["scheme"])) + return($this->SetError("it was not specified the protocol type argument", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + switch(strtolower($parameters["scheme"])) + { + case "http": + case "https": + $arguments["Protocol"]=$parameters["scheme"]; + break; + default: + return($parameters["scheme"]." connection scheme is not yet supported"); + } + if(!IsSet($parameters["host"])) + return($this->SetError("it was not specified the connection host argument", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + $arguments["HostName"]=$parameters["host"]; + $arguments["Headers"]=array("Host"=>$parameters["host"].(IsSet($parameters["port"]) ? ":".$parameters["port"] : "")); + if(IsSet($parameters["user"])) + { + $arguments["AuthUser"]=UrlDecode($parameters["user"]); + if(!IsSet($parameters["pass"])) + $arguments["AuthPassword"]=""; + } + if(IsSet($parameters["pass"])) + { + if(!IsSet($parameters["user"])) + $arguments["AuthUser"]=""; + $arguments["AuthPassword"]=UrlDecode($parameters["pass"]); + } + if(IsSet($parameters["port"])) + { + if(strcmp($parameters["port"],strval(intval($parameters["port"])))) + return($this->SetError("it was not specified a valid connection host argument", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + $arguments["HostPort"]=intval($parameters["port"]); + } + else + $arguments["HostPort"]=0; + $arguments["RequestURI"]=(IsSet($parameters["path"]) ? $parameters["path"] : "/").(IsSet($parameters["query"]) ? "?".$parameters["query"] : ""); + if(strlen($this->user_agent)) + $arguments["Headers"]["User-Agent"]=$this->user_agent; + if(strlen($this->accept)) + $arguments["Headers"]["Accept"]=$this->accept; + return(""); + } + + Function Open($arguments) + { + if(strlen($this->error)) + return($this->error); + $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR; + if(IsSet($arguments["HostName"])) + $this->host_name=$arguments["HostName"]; + if(IsSet($arguments["HostPort"])) + $this->host_port=$arguments["HostPort"]; + if(IsSet($arguments["ProxyHostName"])) + $this->proxy_host_name=$arguments["ProxyHostName"]; + if(IsSet($arguments["ProxyHostPort"])) + $this->proxy_host_port=$arguments["ProxyHostPort"]; + if(IsSet($arguments["SOCKSHostName"])) + $this->socks_host_name=$arguments["SOCKSHostName"]; + if(IsSet($arguments["SOCKSHostPort"])) + $this->socks_host_port=$arguments["SOCKSHostPort"]; + if(IsSet($arguments["SOCKSVersion"])) + $this->socks_version=$arguments["SOCKSVersion"]; + if(IsSet($arguments["Protocol"])) + $this->protocol=$arguments["Protocol"]; + switch(strtolower($this->protocol)) + { + case "http": + $default_port=80; + break; + case "https": + $default_port=443; + break; + default: + return($this->SetError("it was not specified a valid connection protocol", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + } + if(strlen($this->proxy_host_name)==0) + { + if(strlen($this->host_name)==0) + return($this->SetError("it was not specified a valid hostname", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + $host_name=$this->host_name; + $host_port=($this->host_port ? $this->host_port : $default_port); + $server_type = 'HTTP'; + } + else + { + $host_name=$this->proxy_host_name; + $host_port=$this->proxy_host_port; + $server_type = 'HTTP proxy'; + } + $ssl=(strtolower($this->protocol)=="https" && strlen($this->proxy_host_name)==0); + if($ssl + && strlen($this->socks_host_name)) + return($this->SetError('establishing SSL connections via a SOCKS server is not yet supported', HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + $this->use_curl=($ssl && $this->prefer_curl && function_exists("curl_init")); + switch($this->state) + { + case 'Connected': + if(!strcmp($host_name, $this->connected_host) + && intval($host_port) == $this->connected_port + && intval($ssl) == $this->connected_ssl) + { + if($this->debug) + $this->OutputDebug("Reusing connection to ".$this->connected_host); + return(''); + } + if(strlen($error = $this->Disconnect())) + return($error); + case "Disconnected": + break; + default: + return("1 already connected"); + } + if($this->debug) + $this->OutputDebug("Connecting to ".$this->host_name); + if($this->use_curl) + { + $error=(($this->connection=curl_init($this->protocol."://".$this->host_name.($host_port==$default_port ? "" : ":".strval($host_port))."/")) ? "" : "Could not initialize a CURL session"); + if(strlen($error)==0) + { + if(IsSet($arguments["SSLCertificateFile"])) + curl_setopt($this->connection,CURLOPT_SSLCERT,$arguments["SSLCertificateFile"]); + if(IsSet($arguments["SSLCertificatePassword"])) + curl_setopt($this->connection,CURLOPT_SSLCERTPASSWD,$arguments["SSLCertificatePassword"]); + if(IsSet($arguments["SSLKeyFile"])) + curl_setopt($this->connection,CURLOPT_SSLKEY,$arguments["SSLKeyFile"]); + if(IsSet($arguments["SSLKeyPassword"])) + curl_setopt($this->connection,CURLOPT_SSLKEYPASSWD,$arguments["SSLKeyPassword"]); + } + $this->state="Connected"; + } + else + { + $error=""; + if(strlen($this->proxy_host_name) + && (IsSet($arguments["SSLCertificateFile"]) + || IsSet($arguments["SSLCertificateFile"]))) + $error="establishing SSL connections using certificates or private keys via non-SSL proxies is not supported"; + else + { + if($ssl) + { + if(IsSet($arguments["SSLCertificateFile"])) + $error="establishing SSL connections using certificates is only supported when the cURL extension is enabled"; + elseif(IsSet($arguments["SSLKeyFile"])) + $error="establishing SSL connections using a private key is only supported when the cURL extension is enabled"; + else + { + $version=explode(".",function_exists("phpversion") ? phpversion() : "3.0.7"); + $php_version=intval($version[0])*1000000+intval($version[1])*1000+intval($version[2]); + if($php_version<4003000) + $error="establishing SSL connections requires at least PHP version 4.3.0 or having the cURL extension enabled"; + elseif(!function_exists("extension_loaded") + || !extension_loaded("openssl")) + $error="establishing SSL connections requires the OpenSSL extension enabled"; + } + } + if(strlen($error)==0) + { + $error=$this->Connect($host_name, $host_port, $ssl, $server_type); + $error_code = $this->error_code; + } + } + } + if(strlen($error)) + return($this->SetError($error, $error_code)); + $this->session=md5(uniqid("")); + $this->connected_host = $host_name; + $this->connected_port = intval($host_port); + $this->connected_ssl = intval($ssl); + return(""); + } + + Function Close($force = 0) + { + if($this->state=="Disconnected") + return("1 already disconnected"); + if(!$this->force_close + && $this->keep_alive + && !$force + && $this->state == 'ResponseReceived') + { + if($this->debug) + $this->OutputDebug('Keeping the connection alive to '.$this->connected_host); + $this->state = 'Connected'; + return(''); + } + return($this->Disconnect()); + } + + Function PickCookies(&$cookies,$secure) + { + if(IsSet($this->cookies[$secure])) + { + $now=gmdate("Y-m-d H-i-s"); + for($domain=0,Reset($this->cookies[$secure]);$domaincookies[$secure]);Next($this->cookies[$secure]),$domain++) + { + $domain_pattern=Key($this->cookies[$secure]); + $match=strlen($this->request_host)-strlen($domain_pattern); + if($match>=0 + && !strcmp($domain_pattern,substr($this->request_host,$match)) + && ($match==0 + || $domain_pattern[0]=="." + || $this->request_host[$match-1]==".")) + { + for(Reset($this->cookies[$secure][$domain_pattern]),$path_part=0;$path_partcookies[$secure][$domain_pattern]);Next($this->cookies[$secure][$domain_pattern]),$path_part++) + { + $path=Key($this->cookies[$secure][$domain_pattern]); + if(strlen($this->request_uri)>=strlen($path) + && substr($this->request_uri,0,strlen($path))==$path) + { + for(Reset($this->cookies[$secure][$domain_pattern][$path]),$cookie=0;$cookiecookies[$secure][$domain_pattern][$path]);Next($this->cookies[$secure][$domain_pattern][$path]),$cookie++) + { + $cookie_name=Key($this->cookies[$secure][$domain_pattern][$path]); + $expires=$this->cookies[$secure][$domain_pattern][$path][$cookie_name]["expires"]; + if($expires=="" + || strcmp($now,$expires)<0) + $cookies[$cookie_name]=$this->cookies[$secure][$domain_pattern][$path][$cookie_name]; + } + } + } + } + } + } + } + + Function GetFileDefinition($file, &$definition) + { + $name=""; + if(IsSet($file["FileName"])) + $name=basename($file["FileName"]); + if(IsSet($file["Name"])) + $name=$file["Name"]; + if(strlen($name)==0) + return("it was not specified the file part name"); + if(IsSet($file["Content-Type"])) + { + $content_type=$file["Content-Type"]; + $type=$this->Tokenize(strtolower($content_type),"/"); + $sub_type=$this->Tokenize(""); + switch($type) + { + case "text": + case "image": + case "audio": + case "video": + case "application": + case "message": + break; + case "automatic": + switch($sub_type) + { + case "name": + switch(GetType($dot=strrpos($name,"."))=="integer" ? strtolower(substr($name,$dot)) : "") + { + case ".xls": + $content_type="application/excel"; + break; + case ".hqx": + $content_type="application/macbinhex40"; + break; + case ".doc": + case ".dot": + case ".wrd": + $content_type="application/msword"; + break; + case ".pdf": + $content_type="application/pdf"; + break; + case ".pgp": + $content_type="application/pgp"; + break; + case ".ps": + case ".eps": + case ".ai": + $content_type="application/postscript"; + break; + case ".ppt": + $content_type="application/powerpoint"; + break; + case ".rtf": + $content_type="application/rtf"; + break; + case ".tgz": + case ".gtar": + $content_type="application/x-gtar"; + break; + case ".gz": + $content_type="application/x-gzip"; + break; + case ".php": + case ".php3": + $content_type="application/x-httpd-php"; + break; + case ".js": + $content_type="application/x-javascript"; + break; + case ".ppd": + case ".psd": + $content_type="application/x-photoshop"; + break; + case ".swf": + case ".swc": + case ".rf": + $content_type="application/x-shockwave-flash"; + break; + case ".tar": + $content_type="application/x-tar"; + break; + case ".zip": + $content_type="application/zip"; + break; + case ".mid": + case ".midi": + case ".kar": + $content_type="audio/midi"; + break; + case ".mp2": + case ".mp3": + case ".mpga": + $content_type="audio/mpeg"; + break; + case ".ra": + $content_type="audio/x-realaudio"; + break; + case ".wav": + $content_type="audio/wav"; + break; + case ".bmp": + $content_type="image/bitmap"; + break; + case ".gif": + $content_type="image/gif"; + break; + case ".iff": + $content_type="image/iff"; + break; + case ".jb2": + $content_type="image/jb2"; + break; + case ".jpg": + case ".jpe": + case ".jpeg": + $content_type="image/jpeg"; + break; + case ".jpx": + $content_type="image/jpx"; + break; + case ".png": + $content_type="image/png"; + break; + case ".tif": + case ".tiff": + $content_type="image/tiff"; + break; + case ".wbmp": + $content_type="image/vnd.wap.wbmp"; + break; + case ".xbm": + $content_type="image/xbm"; + break; + case ".css": + $content_type="text/css"; + break; + case ".txt": + $content_type="text/plain"; + break; + case ".htm": + case ".html": + $content_type="text/html"; + break; + case ".xml": + $content_type="text/xml"; + break; + case ".mpg": + case ".mpe": + case ".mpeg": + $content_type="video/mpeg"; + break; + case ".qt": + case ".mov": + $content_type="video/quicktime"; + break; + case ".avi": + $content_type="video/x-ms-video"; + break; + case ".eml": + $content_type="message/rfc822"; + break; + default: + $content_type="application/octet-stream"; + break; + } + break; + default: + return($content_type." is not a supported automatic content type detection method"); + } + break; + default: + return($content_type." is not a supported file content type"); + } + } + else + $content_type="application/octet-stream"; + $definition=array( + "Content-Type"=>$content_type, + "NAME"=>$name + ); + if(IsSet($file["FileName"])) + { + if(GetType($length=@filesize($file["FileName"]))!="integer") + { + $error="it was not possible to determine the length of the file ".$file["FileName"]; + if(IsSet($php_errormsg) + && strlen($php_errormsg)) + $error.=": ".$php_errormsg; + if(!file_exists($file["FileName"])) + $error="it was not possible to access the file ".$file["FileName"]; + return($error); + } + $definition["FILENAME"]=$file["FileName"]; + $definition["Content-Length"]=$length; + } + elseif(IsSet($file["Data"])) + $definition["Content-Length"]=strlen($definition["DATA"]=$file["Data"]); + else + return("it was not specified a valid file name"); + return(""); + } + + Function ConnectFromProxy($arguments, &$headers) + { + if(!$this->PutLine('CONNECT '.$this->host_name.':'.($this->host_port ? $this->host_port : 443).' HTTP/1.0') + || (strlen($this->user_agent) + && !$this->PutLine('User-Agent: '.$this->user_agent)) + || (strlen($this->accept) + && !$this->PutLine('Accept: '.$this->accept)) + || (IsSet($arguments['Headers']['Proxy-Authorization']) + && !$this->PutLine('Proxy-Authorization: '.$arguments['Headers']['Proxy-Authorization'])) + || !$this->PutLine('')) + { + $this->Disconnect(); + return($this->error); + } + $this->state = "ConnectSent"; + if(strlen($error=$this->ReadReplyHeadersResponse($headers))) + return($error); + $proxy_authorization=""; + while(!strcmp($this->response_status, "100")) + { + $this->state="ConnectSent"; + if(strlen($error=$this->ReadReplyHeadersResponse($headers))) + return($error); + } + switch($this->response_status) + { + case "200": + if(!@stream_socket_enable_crypto($this->connection, 1, STREAM_CRYPTO_METHOD_SSLv23_CLIENT)) + { + $this->SetPHPError('it was not possible to start a SSL encrypted connection via this proxy', $php_errormsg, HTTP_CLIENT_ERROR_COMMUNICATION_FAILURE); + $this->Disconnect(); + return($this->error); + } + $this->state = "Connected"; + break; + case "407": + if(strlen($error=$this->Authenticate($headers, -1, $proxy_authorization, $this->proxy_request_user, $this->proxy_request_password, $this->proxy_request_realm, $this->proxy_request_workstation))) + return($error); + break; + default: + return($this->SetError("unable to send request via proxy", HTTP_CLIENT_ERROR_PROTOCOL_FAILURE)); + } + return(""); + } + + Function SendRequest($arguments) + { + if(strlen($this->error)) + return($this->error); + if(IsSet($arguments["ProxyUser"])) + $this->proxy_request_user=$arguments["ProxyUser"]; + elseif(IsSet($this->proxy_user)) + $this->proxy_request_user=$this->proxy_user; + if(IsSet($arguments["ProxyPassword"])) + $this->proxy_request_password=$arguments["ProxyPassword"]; + elseif(IsSet($this->proxy_password)) + $this->proxy_request_password=$this->proxy_password; + if(IsSet($arguments["ProxyRealm"])) + $this->proxy_request_realm=$arguments["ProxyRealm"]; + elseif(IsSet($this->proxy_realm)) + $this->proxy_request_realm=$this->proxy_realm; + if(IsSet($arguments["ProxyWorkstation"])) + $this->proxy_request_workstation=$arguments["ProxyWorkstation"]; + elseif(IsSet($this->proxy_workstation)) + $this->proxy_request_workstation=$this->proxy_workstation; + switch($this->state) + { + case "Disconnected": + return($this->SetError("connection was not yet established", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + case "Connected": + $connect = 0; + break; + case "ConnectedToProxy": + if(strlen($error = $this->ConnectFromProxy($arguments, $headers))) + return($error); + $connect = 1; + break; + default: + return($this->SetError("can not send request in the current connection state", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + } + if(IsSet($arguments["RequestMethod"])) + $this->request_method=$arguments["RequestMethod"]; + if(IsSet($arguments["User-Agent"])) + $this->user_agent=$arguments["User-Agent"]; + if(!IsSet($arguments["Headers"]["User-Agent"]) + && strlen($this->user_agent)) + $arguments["Headers"]["User-Agent"]=$this->user_agent; + if(IsSet($arguments["KeepAlive"])) + $this->keep_alive=intval($arguments["KeepAlive"]); + if(!IsSet($arguments["Headers"]["Connection"]) + && $this->keep_alive) + $arguments["Headers"]["Connection"]='Keep-Alive'; + if(IsSet($arguments["Accept"])) + $this->user_agent=$arguments["Accept"]; + if(!IsSet($arguments["Headers"]["Accept"]) + && strlen($this->accept)) + $arguments["Headers"]["Accept"]=$this->accept; + if(strlen($this->request_method)==0) + return($this->SetError("it was not specified a valid request method", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + if(IsSet($arguments["RequestURI"])) + $this->request_uri=$arguments["RequestURI"]; + if(strlen($this->request_uri)==0 + || substr($this->request_uri,0,1)!="/") + return($this->SetError("it was not specified a valid request URI", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + $this->request_arguments=$arguments; + $this->request_headers=(IsSet($arguments["Headers"]) ? $arguments["Headers"] : array()); + $body_length=0; + $this->request_body=""; + $get_body=1; + if($this->request_method=="POST" + || $this->request_method=="PUT") + { + if(IsSet($arguments['StreamRequest'])) + { + $get_body = 0; + $this->request_headers["Transfer-Encoding"]="chunked"; + } + elseif(IsSet($arguments["PostFiles"]) + || ($this->force_multipart_form_post + && IsSet($arguments["PostValues"]))) + { + $boundary="--".md5(uniqid(time())); + $this->request_headers["Content-Type"]="multipart/form-data; boundary=".$boundary.(IsSet($arguments["CharSet"]) ? "; charset=".$arguments["CharSet"] : ""); + $post_parts=array(); + if(IsSet($arguments["PostValues"])) + { + $values=$arguments["PostValues"]; + if(GetType($values)!="array") + return($this->SetError("it was not specified a valid POST method values array", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + for(Reset($values),$value=0;$value$headers,"DATA"=>$data); + $body_length+=strlen($headers)+strlen($data)+strlen("\r\n"); + } + } + $body_length+=strlen("--".$boundary."--\r\n"); + $files=(IsSet($arguments["PostFiles"]) ? $arguments["PostFiles"] : array()); + Reset($files); + $end=(GetType($input=Key($files))!="string"); + for(;!$end;) + { + if(strlen($error=$this->GetFileDefinition($files[$input],$definition))) + return("3 ".$error); + $headers="--".$boundary."\r\nContent-Disposition: form-data; name=\"".$input."\"; filename=\"".$definition["NAME"]."\"\r\nContent-Type: ".$definition["Content-Type"]."\r\n\r\n"; + $part=count($post_parts); + $post_parts[$part]=array("HEADERS"=>$headers); + if(IsSet($definition["FILENAME"])) + { + $post_parts[$part]["FILENAME"]=$definition["FILENAME"]; + $data=""; + } + else + $data=$definition["DATA"]; + $post_parts[$part]["DATA"]=$data; + $body_length+=strlen($headers)+$definition["Content-Length"]+strlen("\r\n"); + Next($files); + $end=(GetType($input=Key($files))!="string"); + } + $get_body=0; + } + elseif(IsSet($arguments["PostValues"])) + { + $values=$arguments["PostValues"]; + if(GetType($values)!="array") + return($this->SetError("it was not specified a valid POST method values array", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + for(Reset($values),$value=0;$value0) + $this->request_body.="&"; + $this->request_body.=UrlEncode($k)."=".UrlEncode($values[$k][$v]); + } + } + else + { + if($value>0) + $this->request_body.="&"; + $this->request_body.=UrlEncode($k)."=".UrlEncode($values[$k]); + } + } + $this->request_headers["Content-Type"]="application/x-www-form-urlencoded".(IsSet($arguments["CharSet"]) ? "; charset=".$arguments["CharSet"] : ""); + $get_body=0; + } + } + if($get_body + && (IsSet($arguments["Body"]) + || IsSet($arguments["BodyStream"]))) + { + if(IsSet($arguments["Body"])) + $this->request_body=$arguments["Body"]; + else + { + $stream=$arguments["BodyStream"]; + $this->request_body=""; + for($part=0; $partrequest_body.=$stream[$part]["Data"]; + elseif(IsSet($stream[$part]["File"])) + { + if(!($file=@fopen($stream[$part]["File"],"rb"))) + return($this->SetPHPError("could not open upload file ".$stream[$part]["File"], $php_errormsg, HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE)); + while(!feof($file)) + { + if(GetType($block=@fread($file,$this->file_buffer_length))!="string") + { + $error=$this->SetPHPError("could not read body stream file ".$stream[$part]["File"], $php_errormsg, HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE); + fclose($file); + return($error); + } + $this->request_body.=$block; + } + fclose($file); + } + else + return("5 it was not specified a valid file or data body stream element at position ".$part); + } + } + if(!IsSet($this->request_headers["Content-Type"])) + $this->request_headers["Content-Type"]="application/octet-stream".(IsSet($arguments["CharSet"]) ? "; charset=".$arguments["CharSet"] : ""); + } + if(IsSet($arguments["AuthUser"])) + $this->request_user=$arguments["AuthUser"]; + elseif(IsSet($this->user)) + $this->request_user=$this->user; + if(IsSet($arguments["AuthPassword"])) + $this->request_password=$arguments["AuthPassword"]; + elseif(IsSet($this->password)) + $this->request_password=$this->password; + if(IsSet($arguments["AuthRealm"])) + $this->request_realm=$arguments["AuthRealm"]; + elseif(IsSet($this->realm)) + $this->request_realm=$this->realm; + if(IsSet($arguments["AuthWorkstation"])) + $this->request_workstation=$arguments["AuthWorkstation"]; + elseif(IsSet($this->workstation)) + $this->request_workstation=$this->workstation; + if(strlen($this->proxy_host_name)==0 + || $connect) + $request_uri=$this->request_uri; + else + { + switch(strtolower($this->protocol)) + { + case "http": + $default_port=80; + break; + case "https": + $default_port=443; + break; + } + $request_uri=strtolower($this->protocol)."://".$this->host_name.(($this->host_port==0 || $this->host_port==$default_port) ? "" : ":".$this->host_port).$this->request_uri; + } + if($this->use_curl) + { + $version=(GetType($v=curl_version())=="array" ? (IsSet($v["version"]) ? $v["version"] : "0.0.0") : (preg_match("/^libcurl\\/([0-9]+\\.[0-9]+\\.[0-9]+)/",$v,$m) ? $m[1] : "0.0.0")); + $curl_version=100000*intval($this->Tokenize($version,"."))+1000*intval($this->Tokenize("."))+intval($this->Tokenize("")); + $protocol_version=($curl_version<713002 ? "1.0" : $this->protocol_version); + } + else + $protocol_version=$this->protocol_version; + $this->request=$this->request_method." ".$request_uri." HTTP/".$protocol_version; + if($body_length + || ($body_length=strlen($this->request_body)) + || !strcmp($this->request_method, 'POST')) + $this->request_headers["Content-Length"]=$body_length; + for($headers=array(),$host_set=0,Reset($this->request_headers),$header=0;$headerrequest_headers);Next($this->request_headers),$header++) + { + $header_name=Key($this->request_headers); + $header_value=$this->request_headers[$header_name]; + if(GetType($header_value)=="array") + { + for(Reset($header_value),$value=0;$valuerequest_headers))=="host") + { + $this->request_host=strtolower($header_value); + $host_set=1; + } + } + if(!$host_set) + { + $headers[]="Host: ".$this->host_name; + $this->request_host=strtolower($this->host_name); + } + if(count($this->cookies)) + { + $cookies=array(); + $this->PickCookies($cookies,0); + if(strtolower($this->protocol)=="https") + $this->PickCookies($cookies,1); + if(count($cookies)) + { + $h=count($headers); + $headers[$h]="Cookie:"; + for(Reset($cookies),$cookie=0;$cookieuse_curl) + { + if(IsSet($arguments['StreamRequest'])) + return($this->SetError("Streaming request data is not supported when using Curl", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + if($body_length + && strlen($this->request_body)==0) + { + for($request_body="",$success=1,$part=0;$partSetPHPError("could not open upload file ".$post_parts[$part]["FILENAME"], $php_errormsg, HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE); + $success=0; + break; + } + while(!feof($file)) + { + if(GetType($block=@fread($file,$this->file_buffer_length))!="string") + { + $this->SetPHPError("could not read upload file", $php_errormsg, HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE); + $success=0; + break; + } + $request_body.=$block; + } + fclose($file); + if(!$success) + break; + } + $request_body.="\r\n"; + } + $request_body.="--".$boundary."--\r\n"; + } + else + $request_body=$this->request_body; + curl_setopt($this->connection,CURLOPT_HEADER,1); + curl_setopt($this->connection,CURLOPT_RETURNTRANSFER,1); + if($this->timeout) + curl_setopt($this->connection,CURLOPT_TIMEOUT,$this->timeout); + curl_setopt($this->connection,CURLOPT_SSL_VERIFYPEER,0); + curl_setopt($this->connection,CURLOPT_SSL_VERIFYHOST,0); + $request=$this->request."\r\n".implode("\r\n",$headers)."\r\n\r\n".$request_body; + curl_setopt($this->connection,CURLOPT_CUSTOMREQUEST,$request); + if($this->debug) + $this->OutputDebug("C ".$request); + if(!($success=(strlen($this->response=curl_exec($this->connection))!=0))) + { + $error=curl_error($this->connection); + $this->SetError("Could not execute the request".(strlen($error) ? ": ".$error : ""), HTTP_CLIENT_ERROR_PROTOCOL_FAILURE); + } + } + else + { + if(($success=$this->PutLine($this->request))) + { + for($header=0;$headerPutLine($headers[$header])) + break; + } + if($success + && ($success=$this->PutLine(""))) + { + if(IsSet($arguments['StreamRequest'])) + $next_state = "SendingRequestBody"; + elseif($body_length) + { + if(strlen($this->request_body)) + $success=$this->PutData($this->request_body); + else + { + for($part=0;$partPutData($post_parts[$part]["HEADERS"])) + || !($success=$this->PutData($post_parts[$part]["DATA"]))) + break; + if(IsSet($post_parts[$part]["FILENAME"])) + { + if(!($file=@fopen($post_parts[$part]["FILENAME"],"rb"))) + { + $this->SetPHPError("could not open upload file ".$post_parts[$part]["FILENAME"], $php_errormsg, HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE); + $success=0; + break; + } + while(!feof($file)) + { + if(GetType($block=@fread($file,$this->file_buffer_length))!="string") + { + $this->SetPHPError("could not read upload file", $php_errormsg, HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE); + $success=0; + break; + } + if(!($success=$this->PutData($block))) + break; + } + fclose($file); + if(!$success) + break; + } + if(!($success=$this->PutLine(""))) + break; + } + if($success) + $success=$this->PutLine("--".$boundary."--"); + } + if($success) + $sucess=$this->FlushData(); + } + } + } + } + if(!$success) + return($this->SetError("could not send the HTTP request: ".$this->error, $this->error_code)); + $this->state=$next_state; + return(""); + } + + Function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0) + { + if(strlen($this->error)) + return($this->error); + if(strlen($name)==0) + return($this->SetError("it was not specified a valid cookie name", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + if(strlen($path)==0 + || strcmp($path[0],"/")) + return($this->SetError($path." is not a valid path for setting cookie ".$name, HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + if($domain=="" + || !strpos($domain,".",$domain[0]=="." ? 1 : 0)) + return($this->SetError($domain." is not a valid domain for setting cookie ".$name, HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + $domain=strtolower($domain); + if(!strcmp($domain[0],".")) + $domain=substr($domain,1); + if(!$verbatim) + { + $name=$this->CookieEncode($name,1); + $value=$this->CookieEncode($value,0); + } + $secure=intval($secure); + $this->cookies[$secure][$domain][$path][$name]=array( + "name"=>$name, + "value"=>$value, + "domain"=>$domain, + "path"=>$path, + "expires"=>$expires, + "secure"=>$secure + ); + return(""); + } + + Function SendRequestBody($data, $end_of_data) + { + if(strlen($this->error)) + return($this->error); + switch($this->state) + { + case "Disconnected": + return($this->SetError("connection was not yet established", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + case "Connected": + case "ConnectedToProxy": + return($this->SetError("request was not sent", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + case "SendingRequestBody": + break; + case "RequestSent": + return($this->SetError("request body was already sent", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + default: + return($this->SetError("can not send the request body in the current connection state", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + } + $length = strlen($data); + if($length) + { + $size = dechex($length)."\r\n"; + if(!$this->PutData($size) + || !$this->PutData($data)) + return($this->error); + } + if($end_of_data) + { + $size = "0\r\n"; + if(!$this->PutData($size)) + return($this->error); + $this->state = "RequestSent"; + } + return(""); + } + + Function ReadReplyHeadersResponse(&$headers) + { + $headers=array(); + if(strlen($this->error)) + return($this->error); + switch($this->state) + { + case "Disconnected": + return($this->SetError("connection was not yet established", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + case "Connected": + return($this->SetError("request was not sent", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + case "ConnectedToProxy": + return($this->SetError("connection from the remote server from the proxy was not yet established", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + case "SendingRequestBody": + return($this->SetError("request body data was not completely sent", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + case "ConnectSent": + $connect = 1; + break; + case "RequestSent": + $connect = 0; + break; + default: + return($this->SetError("can not get request headers in the current connection state", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + } + $this->content_length=$this->read_length=$this->read_response=$this->remaining_chunk=0; + $this->content_length_set=$this->chunked=$this->last_chunk_read=$chunked=0; + $this->force_close = $this->connection_close=0; + for($this->response_status="";;) + { + $line=$this->GetLine(); + if(GetType($line)!="string") + return($this->SetError("could not read request reply: ".$this->error, $this->error_code)); + if(strlen($this->response_status)==0) + { + if(!preg_match($match="/^http\\/[0-9]+\\.[0-9]+[ \t]+([0-9]+)[ \t]*(.*)\$/i",$line,$matches)) + return($this->SetError("it was received an unexpected HTTP response status", HTTP_CLIENT_ERROR_PROTOCOL_FAILURE)); + $this->response_status=$matches[1]; + $this->response_message=$matches[2]; + } + if($line=="") + { + if(strlen($this->response_status)==0) + return($this->SetError("it was not received HTTP response status", HTTP_CLIENT_ERROR_PROTOCOL_FAILURE)); + $this->state=($connect ? "GotConnectHeaders" : "GotReplyHeaders"); + break; + } + $header_name=strtolower($this->Tokenize($line,":")); + $header_value=Trim(Chop($this->Tokenize("\r\n"))); + if(IsSet($headers[$header_name])) + { + if(GetType($headers[$header_name])=="string") + $headers[$header_name]=array($headers[$header_name]); + $headers[$header_name][]=$header_value; + } + else + $headers[$header_name]=$header_value; + if(!$connect) + { + switch($header_name) + { + case "content-length": + $this->content_length=intval($headers[$header_name]); + $this->content_length_set=1; + break; + case "transfer-encoding": + $encoding=$this->Tokenize($header_value,"; \t"); + if(!$this->use_curl + && !strcmp($encoding,"chunked")) + $chunked=1; + break; + case "set-cookie": + if($this->support_cookies) + { + if(GetType($headers[$header_name])=="array") + $cookie_headers=$headers[$header_name]; + else + $cookie_headers=array($headers[$header_name]); + for($cookie=0;$cookieTokenize($cookie_headers[$cookie],"=")); + $cookie_value=$this->Tokenize(";"); + $domain=$this->request_host; + $path="/"; + $expires=""; + $secure=0; + while(($name = strtolower(trim(UrlDecode($this->Tokenize("=")))))!="") + { + $value=UrlDecode($this->Tokenize(";")); + switch($name) + { + case "domain": + $domain=$value; + break; + case "path": + $path=$value; + break; + case "expires": + if(preg_match("/^((Mon|Monday|Tue|Tuesday|Wed|Wednesday|Thu|Thursday|Fri|Friday|Sat|Saturday|Sun|Sunday), )?([0-9]{2})\\-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\-([0-9]{2,4}) ([0-9]{2})\\:([0-9]{2})\\:([0-9]{2}) GMT\$/",$value,$matches)) + { + $year=intval($matches[5]); + if($year<1900) + $year+=($year<70 ? 2000 : 1900); + $expires="$year-".$this->months[$matches[4]]."-".$matches[3]." ".$matches[6].":".$matches[7].":".$matches[8]; + } + break; + case "secure": + $secure=1; + break; + } + } + if(strlen($this->SetCookie($cookie_name, $cookie_value, $expires, $path , $domain, $secure, 1))) + $this->error=""; + } + } + break; + case "connection": + $this->force_close = $this->connection_close=!strcmp(strtolower($header_value),"close"); + break; + } + } + } + $this->chunked=$chunked; + if($this->content_length_set) + $this->connection_close=0; + return(""); + } + + Function Redirect(&$headers) + { + if($this->follow_redirect) + { + if(!IsSet($headers["location"]) + || (GetType($headers["location"])!="array" + && strlen($location=$headers["location"])==0) + || (GetType($headers["location"])=="array" + && strlen($location=$headers["location"][0])==0)) + return($this->SetError("it was received a redirect without location URL", HTTP_CLIENT_ERROR_PROTOCOL_FAILURE)); + if(strcmp($location[0],"/")) + { + if(!($location_arguments=@parse_url($location))) + return($this->SetError("the server did not return a valid redirection location URL", HTTP_CLIENT_ERROR_PROTOCOL_FAILURE)); + if(!IsSet($location_arguments["scheme"])) + $location=((GetType($end=strrpos($this->request_uri,"/"))=="integer" && $end>1) ? substr($this->request_uri,0,$end) : "")."/".$location; + } + if(!strcmp($location[0],"/")) + $location=$this->protocol."://".$this->host_name.($this->host_port ? ":".$this->host_port : "").$location; + $error=$this->GetRequestArguments($location,$arguments); + if(strlen($error)) + return($this->SetError("could not process redirect url: ".$error, HTTP_CLIENT_ERROR_PROTOCOL_FAILURE)); + $arguments["RequestMethod"]="GET"; + if(strlen($error=$this->Close())==0 + && strlen($error=$this->Open($arguments))==0 + && strlen($error=$this->SendRequest($arguments))==0) + { + $this->redirection_level++; + if($this->redirection_level>$this->redirection_limit) + { + $error="it was exceeded the limit of request redirections"; + $this->error_code = HTTP_CLIENT_ERROR_PROTOCOL_FAILURE; + } + else + $error=$this->ReadReplyHeaders($headers); + $this->redirection_level--; + } + if(strlen($error)) + return($this->SetError($error, $this->error_code)); + } + return(""); + } + + Function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation) + { + if($proxy) + { + $authenticate_header="proxy-authenticate"; + $authorization_header="Proxy-Authorization"; + $authenticate_status="407"; + $authentication_mechanism=$this->proxy_authentication_mechanism; + } + else + { + $authenticate_header="www-authenticate"; + $authorization_header="Authorization"; + $authenticate_status="401"; + $authentication_mechanism=$this->authentication_mechanism; + } + if(IsSet($headers[$authenticate_header]) + && $this->sasl_authenticate) + { + if(function_exists("class_exists") + && !class_exists("sasl_client_class")) + return($this->SetError("the SASL client class needs to be loaded to be able to authenticate".($proxy ? " with the proxy server" : "")." and access this site", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + if(GetType($headers[$authenticate_header])=="array") + $authenticate=$headers[$authenticate_header]; + else + $authenticate=array($headers[$authenticate_header]); + for($response="", $mechanisms=array(),$m=0;$mTokenize($authenticate[$m]," "); + $response=$this->Tokenize(""); + if(strlen($authentication_mechanism)) + { + if(!strcmp($authentication_mechanism,$mechanism)) + { + $mechanisms[]=$mechanism; + break; + } + } + else + $mechanisms[]=$mechanism; + } + $sasl=new sasl_client_class; + if(IsSet($user)) + $sasl->SetCredential("user",$user); + if(IsSet($password)) + $sasl->SetCredential("password",$password); + if(IsSet($realm)) + $sasl->SetCredential("realm",$realm); + if(IsSet($workstation)) + $sasl->SetCredential("workstation",$workstation); + $sasl->SetCredential("uri",$this->request_uri); + $sasl->SetCredential("method",$this->request_method); + $sasl->SetCredential("session",$this->session); + do + { + $status=$sasl->Start($mechanisms,$message,$interactions); + } + while($status==SASL_INTERACT); + switch($status) + { + case SASL_CONTINUE: + break; + case SASL_NOMECH: + return($this->SetError(($proxy ? "proxy " : "")."authentication error: ".(strlen($authentication_mechanism) ? "authentication mechanism ".$authentication_mechanism." may not be used: " : "").$sasl->error, HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + default: + return($this->SetError("Could not start the SASL ".($proxy ? "proxy " : "")."authentication client: ".$sasl->error, HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + } + if($proxy >= 0) + { + for(;;) + { + if(strlen($error=$this->ReadReplyBody($body,$this->file_buffer_length))) + return($error); + if(strlen($body)==0) + break; + } + } + $authorization_value=$sasl->mechanism.(IsSet($message) ? " ".($sasl->encode_response ? base64_encode($message) : $message) : ""); + $request_arguments=$this->request_arguments; + $arguments=$request_arguments; + $arguments["Headers"][$authorization_header]=$authorization_value; + if(!$proxy + && strlen($proxy_authorization)) + $arguments["Headers"]["Proxy-Authorization"]=$proxy_authorization; + if(strlen($error=$this->Close()) + || strlen($error=$this->Open($arguments))) + return($this->SetError($error, $this->error_code)); + $authenticated=0; + if(IsSet($message)) + { + if($proxy < 0) + { + if(strlen($error=$this->ConnectFromProxy($arguments, $headers))) + return($this->SetError($error, $this->error_code)); + } + else + { + if(strlen($error=$this->SendRequest($arguments)) + || strlen($error=$this->ReadReplyHeadersResponse($headers))) + return($this->SetError($error, $this->error_code)); + } + if(!IsSet($headers[$authenticate_header])) + $authenticate=array(); + elseif(GetType($headers[$authenticate_header])=="array") + $authenticate=$headers[$authenticate_header]; + else + $authenticate=array($headers[$authenticate_header]); + for($mechanism=0;$mechanismTokenize($authenticate[$mechanism]," "),$sasl->mechanism)) + { + $response=$this->Tokenize(""); + break; + } + } + switch($this->response_status) + { + case $authenticate_status: + break; + case "301": + case "302": + case "303": + case "307": + if($proxy >= 0) + return($this->Redirect($headers)); + default: + if(intval($this->response_status/100)==2) + { + if($proxy) + $proxy_authorization=$authorization_value; + $authenticated=1; + break; + } + if($proxy + && !strcmp($this->response_status,"401")) + { + $proxy_authorization=$authorization_value; + $authenticated=1; + break; + } + return($this->SetError(($proxy ? "proxy " : "")."authentication error: ".$this->response_status." ".$this->response_message, HTTP_CLIENT_ERROR_PROTOCOL_FAILURE)); + } + } + for(;!$authenticated;) + { + do + { + $status=$sasl->Step($response,$message,$interactions); + } + while($status==SASL_INTERACT); + switch($status) + { + case SASL_CONTINUE: + $authorization_value=$sasl->mechanism.(IsSet($message) ? " ".($sasl->encode_response ? base64_encode($message) : $message) : ""); + $arguments=$request_arguments; + $arguments["Headers"][$authorization_header]=$authorization_value; + if(!$proxy + && strlen($proxy_authorization)) + $arguments["Headers"]["Proxy-Authorization"]=$proxy_authorization; + if($proxy < 0) + { + if(strlen($error=$this->ConnectFromProxy($arguments, $headers))) + return($this->SetError($error, $this->error_code)); + } + else + { + if(strlen($error=$this->SendRequest($arguments)) + || strlen($error=$this->ReadReplyHeadersResponse($headers))) + return($this->SetError($error, $this->error_code)); + } + switch($this->response_status) + { + case $authenticate_status: + if(GetType($headers[$authenticate_header])=="array") + $authenticate=$headers[$authenticate_header]; + else + $authenticate=array($headers[$authenticate_header]); + for($response="",$mechanism=0;$mechanismTokenize($authenticate[$mechanism]," "),$sasl->mechanism)) + { + $response=$this->Tokenize(""); + break; + } + } + if($proxy >= 0) + { + for(;;) + { + if(strlen($error=$this->ReadReplyBody($body,$this->file_buffer_length))) + return($error); + if(strlen($body)==0) + break; + } + } + $this->state="Connected"; + break; + case "301": + case "302": + case "303": + case "307": + if($proxy >= 0) + return($this->Redirect($headers)); + default: + if(intval($this->response_status/100)==2) + { + if($proxy) + $proxy_authorization=$authorization_value; + $authenticated=1; + break; + } + if($proxy + && !strcmp($this->response_status,"401")) + { + $proxy_authorization=$authorization_value; + $authenticated=1; + break; + } + return($this->SetError(($proxy ? "proxy " : "")."authentication error: ".$this->response_status." ".$this->response_message)); + } + break; + default: + return($this->SetError("Could not process the SASL ".($proxy ? "proxy " : "")."authentication step: ".$sasl->error, HTTP_CLIENT_ERROR_PROTOCOL_FAILURE)); + } + } + } + return(""); + } + + Function ReadReplyHeaders(&$headers) + { + if(strlen($error=$this->ReadReplyHeadersResponse($headers))) + return($error); + $proxy_authorization=""; + while(!strcmp($this->response_status, "100")) + { + $this->state="RequestSent"; + if(strlen($error=$this->ReadReplyHeadersResponse($headers))) + return($error); + } + switch($this->response_status) + { + case "301": + case "302": + case "303": + case "307": + if(strlen($error=$this->Redirect($headers))) + return($error); + break; + case "407": + if(strlen($error=$this->Authenticate($headers, 1, $proxy_authorization, $this->proxy_request_user, $this->proxy_request_password, $this->proxy_request_realm, $this->proxy_request_workstation))) + return($error); + if(strcmp($this->response_status,"401")) + return(""); + case "401": + return($this->Authenticate($headers, 0, $proxy_authorization, $this->request_user, $this->request_password, $this->request_realm, $this->request_workstation)); + } + return(""); + } + + Function ReadReplyBody(&$body,$length) + { + $body=""; + if(strlen($this->error)) + return($this->error); + switch($this->state) + { + case "Disconnected": + return($this->SetError("connection was not yet established", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + case "Connected": + case "ConnectedToProxy": + return($this->SetError("request was not sent", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + case "RequestSent": + if(($error=$this->ReadReplyHeaders($headers))!="") + return($error); + break; + case "GotReplyHeaders": + break; + case 'ResponseReceived': + $body = ''; + return(''); + default: + return($this->SetError("can not get request headers in the current connection state", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + } + if($this->content_length_set) + $length=min($this->content_length-$this->read_length,$length); + $body = ''; + if($length>0) + { + if(!$this->EndOfInput() + && ($body=$this->ReadBytes($length))=="") + { + if(strlen($this->error)) + return($this->SetError("could not get the request reply body: ".$this->error, $this->error_code)); + } + $this->read_length+=strlen($body); + if($this->EndOfInput()) + $this->state = 'ResponseReceived'; + } + return(""); + } + + Function ReadWholeReplyBody(&$body) + { + $body = ''; + for(;;) + { + if(strlen($error = $this->ReadReplyBody($block, $this->file_buffer_length))) + return($error); + if(strlen($block) == 0) + return(''); + $body .= $block; + } + } + + Function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0) + { + $now=gmdate("Y-m-d H-i-s"); + $cookies=array(); + for($secure_cookies=0,Reset($this->cookies);$secure_cookiescookies);Next($this->cookies),$secure_cookies++) + { + $secure=Key($this->cookies); + if(!$secure_only + || $secure) + { + for($cookie_domain=0,Reset($this->cookies[$secure]);$cookie_domaincookies[$secure]);Next($this->cookies[$secure]),$cookie_domain++) + { + $domain_pattern=Key($this->cookies[$secure]); + $match=strlen($domain)-strlen($domain_pattern); + if(strlen($domain)==0 + || ($match>=0 + && !strcmp($domain_pattern,substr($domain,$match)) + && ($match==0 + || $domain_pattern[0]=="." + || $domain[$match-1]=="."))) + { + for(Reset($this->cookies[$secure][$domain_pattern]),$path_part=0;$path_partcookies[$secure][$domain_pattern]);Next($this->cookies[$secure][$domain_pattern]),$path_part++) + { + $path=Key($this->cookies[$secure][$domain_pattern]); + for(Reset($this->cookies[$secure][$domain_pattern][$path]),$cookie=0;$cookiecookies[$secure][$domain_pattern][$path]);Next($this->cookies[$secure][$domain_pattern][$path]),$cookie++) + { + $cookie_name=Key($this->cookies[$secure][$domain_pattern][$path]); + $expires=$this->cookies[$secure][$domain_pattern][$path][$cookie_name]["expires"]; + if((!$persistent_only + && strlen($expires)==0) + || (strlen($expires) + && strcmp($now,$expires)<0)) + $cookies[$secure][$domain_pattern][$path][$cookie_name]=$this->cookies[$secure][$domain_pattern][$path][$cookie_name]; + } + } + } + } + } + } + } + + Function SavePersistentCookies(&$cookies, $domain='', $secure_only=0) + { + $this->SaveCookies($cookies, $domain, $secure_only, 1); + } + + Function GetPersistentCookies(&$cookies, $domain='', $secure_only=0) + { + $this->SavePersistentCookies($cookies, $domain, $secure_only); + } + + Function RestoreCookies($cookies, $clear=1) + { + $new_cookies=($clear ? array() : $this->cookies); + for($secure_cookies=0, Reset($cookies); $secure_cookiesSetError("invalid cookie secure value type (".serialize($secure).")", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + for($cookie_domain=0,Reset($cookies[$secure]);$cookie_domainSetError("invalid cookie domain value type (".serialize($domain_pattern).")", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + for(Reset($cookies[$secure][$domain_pattern]),$path_part=0;$path_partSetError("invalid cookie path value type (".serialize($path).")", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + for(Reset($cookies[$secure][$domain_pattern][$path]),$cookie=0;$cookieSetError("invalid cookie expiry value type (".serialize($expires).")", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); + $new_cookies[$secure][$domain_pattern][$path][$cookie_name]=array( + "name"=>$cookie_name, + "value"=>$value, + "domain"=>$domain_pattern, + "path"=>$path, + "expires"=>$expires, + "secure"=>$secure + ); + } + } + } + } + $this->cookies=$new_cookies; + return(""); + } +}; + +?> \ No newline at end of file diff --git a/library/oauth/oauth_client.php b/library/oauth/oauth_client.php new file mode 100644 index 000000000..5047e0e9b --- /dev/null +++ b/library/oauth/oauth_client.php @@ -0,0 +1,2176 @@ + + + + net.manuellemos.oauth + + @(#) $Id: oauth_client.php,v 1.58 2013/04/11 09:33:16 mlemos Exp $ + Copyright © (C) Manuel Lemos 2012 + OAuth client + Manuel Lemos + mlemos-at-acm.org + + + en + This class serves two main purposes: + 1) Implement the OAuth protocol to retrieve a token from a server to + authorize the access to an API on behalf of the current + user. + 2) Perform calls to a Web services API using a token previously + obtained using this class or a token provided some other way by the + Web services provider. + Regardless of your purposes, you always need to start calling + the class Initialize function after + initializing setup variables. After you are done with the class, + always call the Finalize function at + the end. + This class supports either OAuth protocol versions 1.0, 1.0a and + 2.0. It abstracts the differences between these protocol versions, + so the class usage is the same independently of the OAuth + version of the server. + The class also provides built-in support to several popular OAuth + servers, so you do not have to manually configure all the details to + access those servers. Just set the + server variable to configure the class + to access one of the built-in supported servers. + If you need to access one type of server that is not yet directly + supported by the class, you need to configure it explicitly setting + the variables: oauth_version, + url_parameters, + authorization_header, + request_token_url, + dialog_url, + offline_dialog_url, + append_state_to_redirect_uri and + access_token_url. + Before proceeding to the actual OAuth authorization process, you + need to have registered your application with the OAuth server. The + registration provides you values to set the variables + client_id and + client_secret. + You also need to set the variables + redirect_uri and + scope before calling the + Process function to make the class + perform the necessary interactions with the OAuth + server. + The OAuth protocol involves multiple steps that include redirection + to the OAuth server. There it asks permission to the current user to + grant your application access to APIs on his/her behalf. When there + is a redirection, the class will set the + exit variable to + 1. Then your script should exit + immediately without outputting anything. + When the OAuth access token is successfully obtained, the following + variables are set by the class with the obtained values: + access_token, + access_token_secret, + access_token_expiry, + access_token_type. You may want to + store these values to use them later when calling the server + APIs. + If there was a problem during OAuth authorization process, check the + variable authorization_error to + determine the reason. + Once you get the access token, you can call the server APIs using + the CallAPI function. Check the + access_token_error variable to + determine if there was an error when trying to to call the + API. + If for some reason the user has revoked the access to your + application, you need to ask the user to authorize your application + again. First you may need to call the function + ResetAccessToken to reset the value of + the access token that may be cached in session variables. + + +{/metadocument} +*/ + +class oauth_client_class +{ +/* +{metadocument} + + error + STRING + + + Store the message that is returned when an error + occurs. + Check this variable to understand what happened when a call to + any of the class functions has failed. + This class uses cumulative error handling. This means that if one + class functions that may fail is called and this variable was + already set to an error message due to a failure in a previous call + to the same or other function, the function will also fail and does + not do anything. + This allows programs using this class to safely call several + functions that may fail and only check the failure condition after + the last function call. + Just set this variable to an empty string to clear the error + condition. + + +{/metadocument} +*/ + var $error = ''; + +/* +{metadocument} + + debug + BOOLEAN + 0 + + Control whether debug output is enabled + Set this variable to 1 if you + need to check what is going on during calls to the class. When + enabled, the debug output goes either to the variable + debug_output and the PHP error log. + + +{/metadocument} +*/ + var $debug = false; + +/* +{metadocument} + + debug_http + BOOLEAN + 0 + + Control whether the dialog with the remote Web server + should also be logged. + Set this variable to 1 if you + want to inspect the data exchange with the OAuth server. + + +{/metadocument} +*/ + var $debug_http = false; + +/* +{metadocument} + + exit + BOOLEAN + 0 + + Determine if the current script should be exited. + Check this variable after calling the + Process function and exit your script + immediately if the variable is set to + 1. + + +{/metadocument} +*/ + var $exit = false; + +/* +{metadocument} + + debug_output + STRING + + + Capture the debug output generated by the class + Inspect this variable if you need to see what happened during + the class function calls. + + +{/metadocument} +*/ + var $debug_output = ''; + +/* +{metadocument} + + debug_prefix + STRING + OAuth client: + + Mark the lines of the debug output to identify actions + performed by this class. + Change this variable if you prefer the debug output lines to + be prefixed with a different text. + + +{/metadocument} +*/ + var $debug_prefix = 'OAuth client: '; + +/* +{metadocument} + + server + STRING + + + Identify the type of OAuth server to access. + The class provides built-in support to several types of OAuth + servers. This means that the class can automatically initialize + several configuration variables just by setting this server + variable. + Currently it supports the following servers: + Bitbucket, + Box, + Dropbox, + Eventful, + Facebook, + Fitbit, + Flickr, + Foursquare, + github, + Google, + Instagram, + LinkedIn, + Microsoft, + Scoop.it, + StockTwits, + Tumblr, + Twitter, + XING and + Yahoo. Please contact the author if you + would like to ask to add built-in support for other types of OAuth + servers. + If you want to access other types of OAuth servers that are not + yet supported, set this variable to an empty string and configure + other variables with values specific to those servers. + + +{/metadocument} +*/ + var $server = ''; + +/* +{metadocument} + + request_token_url + STRING + + + URL of the OAuth server to request the initial token for + OAuth 1.0 and 1.0a servers. + Set this variable to the OAuth request token URL when you are + not accessing one of the built-in supported OAuth + servers. + For OAuth 1.0 and 1.0a servers, the request token URL can have + certain marks that will act as template placeholders which will be + replaced with given values before requesting the authorization + token. Currently it supports the following placeholder + marks: + {SCOPE} - scope of the requested permissions to the granted by the + OAuth server with the user permissions + + +{/metadocument} +*/ + var $request_token_url = ''; + +/* +{metadocument} + + dialog_url + STRING + + + URL of the OAuth server to redirect the browser so the user + can grant access to your application. + Set this variable to the OAuth request token URL when you are + not accessing one of the built-in supported OAuth servers. + For certain servers, the dialog URL can have certain marks that + will act as template placeholders which will be replaced with + values defined before redirecting the users browser. Currently it + supports the following placeholder marks: + {REDIRECT_URI} - URL to redirect when returning from the OAuth + server authorization page + {CLIENT_ID} - client application identifier registered at the + server + {SCOPE} - scope of the requested permissions to the granted by the + OAuth server with the user permissions + {STATE} - identifier of the OAuth session state + + +{/metadocument} +*/ + var $dialog_url = ''; + +/* +{metadocument} + + offline_dialog_url + STRING + + + URL of the OAuth server to redirect the browser so the user + can grant access to your application when offline access is + requested. + Set this variable to the OAuth request token URL when you are + not accessing one of the built-in supported OAuth servers and the + OAuth server supports offline access. + It should have the same format as the + dialog_url variable. + + +{/metadocument} +*/ + var $offline_dialog_url = ''; + +/* +{metadocument} + + append_state_to_redirect_uri + STRING + + + Pass the OAuth session state in a variable with a different + name to work around implementation bugs of certain OAuth + servers + Set this variable when you are not accessing one of the + built-in supported OAuth servers if the OAuth server has a bug + that makes it not pass back the OAuth state identifier in a + request variable named state. + + +{/metadocument} +*/ + var $append_state_to_redirect_uri = ''; + +/* +{metadocument} + + access_token_url + STRING + + + OAuth server URL that will return the access token + URL. + Set this variable to the OAuth access token URL when you are + not accessing one of the built-in supported OAuth servers. + + +{/metadocument} +*/ + var $access_token_url = ''; + + +/* +{metadocument} + + oauth_version + STRING + 2.0 + + Version of the protocol version supported by the OAuth + server. + Set this variable to the OAuth server protocol version when + you are not accessing one of the built-in supported OAuth + servers. + + +{/metadocument} +*/ + var $oauth_version = '2.0'; + +/* +{metadocument} + + url_parameters + BOOLEAN + 0 + + Determine if the API call parameters should be moved to the + call URL. + Set this variable to 1 if the + API you need to call requires that the call parameters always be + passed via the API URL. + + +{/metadocument} +*/ + var $url_parameters = false; + +/* +{metadocument} + + authorization_header + BOOLEAN + 1 + + Determine if the OAuth parameters should be passed via HTTP + Authorization request header. + Set this variable to 1 if the + OAuth server requires that the OAuth parameters be passed using + the HTTP Authorization instead of the request URI parameters. + + +{/metadocument} +*/ + var $authorization_header = true; + +/* +{metadocument} + + token_request_method + STRING + GET + + Define the HTTP method that should be used to request + tokens from the server. + Set this variable to POST if the + OAuth server does not support requesting tokens using the HTTP GET + method. + + +{/metadocument} +*/ + var $token_request_method = 'GET'; + +/* +{metadocument} + + signature_method + STRING + HMAC-SHA1 + + Define the method to generate the signature for API request + parameters values. + Currently it supports PLAINTEXT + and HMAC-SHA1. + + +{/metadocument} +*/ + var $signature_method = 'HMAC-SHA1'; + +/* +{metadocument} + + redirect_uri + STRING + + + URL of the current script page that is calling this + class + Set this variable to the current script page URL before + proceeding the the OAuth authorization process. + + +{/metadocument} +*/ + var $redirect_uri = ''; + +/* +{metadocument} + + client_id + STRING + + + Identifier of your application registered with the OAuth + server + Set this variable to the application identifier that is + provided by the OAuth server when you register the + application. + + +{/metadocument} +*/ + var $client_id = ''; + +/* +{metadocument} + + client_secret + STRING + + + Secret value assigned to your application when it is + registered with the OAuth server. + Set this variable to the application secret that is provided + by the OAuth server when you register the application. + + +{/metadocument} +*/ + var $client_secret = ''; + +/* +{metadocument} + + scope + STRING + + + Permissions that your application needs to call the OAuth + server APIs + Check the documentation of the APIs that your application + needs to call to set this variable with the identifiers of the + permissions that the user needs to grant to your application. + + +{/metadocument} +*/ + var $scope = ''; + +/* +{metadocument} + + offline + BOOLEAN + 0 + + Specify whether it will be necessary to call the API when + the user is not present and the server supports renewing expired + access tokens using refresh tokens. + Set this variable to 1 if the + server supports renewing expired tokens automatically when the + user is not present. + + +{/metadocument} +*/ + var $offline = false; + +/* +{metadocument} + + access_token + STRING + + + Access token obtained from the OAuth server + Check this variable to get the obtained access token upon + successful OAuth authorization. + + +{/metadocument} +*/ + var $access_token = ''; + +/* +{metadocument} + + access_token_secret + STRING + + + Access token secret obtained from the OAuth server + If the OAuth protocol version is 1.0 or 1.0a, check this + variable to get the obtained access token secret upon successful + OAuth authorization. + + +{/metadocument} +*/ + var $access_token_secret = ''; + +/* +{metadocument} + + access_token_expiry + STRING + + + Timestamp of the expiry of the access token obtained from + the OAuth server. + Check this variable to get the obtained access token expiry + time upon successful OAuth authorization. If this variable is + empty, that means no expiry time was set. + + +{/metadocument} +*/ + var $access_token_expiry = ''; + +/* +{metadocument} + + access_token_type + STRING + + + Type of access token obtained from the OAuth server. + Check this variable to get the obtained access token type + upon successful OAuth authorization. + + +{/metadocument} +*/ + var $access_token_type = ''; + +/* +{metadocument} + + refresh_token + STRING + + + Refresh token obtained from the OAuth server + Check this variable to get the obtained refresh token upon + successful OAuth authorization. + + +{/metadocument} +*/ + var $refresh_token = ''; + +/* +{metadocument} + + access_token_error + STRING + + + Error message returned when a call to the API fails. + Check this variable to determine if there was an error while + calling the Web services API when using the + CallAPI function. + + +{/metadocument} +*/ + var $access_token_error = ''; + +/* +{metadocument} + + authorization_error + STRING + + + Error message returned when it was not possible to obtain + an OAuth access token + Check this variable to determine if there was an error while + trying to obtain the OAuth access token. + + +{/metadocument} +*/ + var $authorization_error = ''; + +/* +{metadocument} + + response_status + INTEGER + 0 + + HTTP response status returned by the server when calling an + API + Check this variable after calling the + CallAPI function if the API calls and you + need to process the error depending the response status. + 200 means no error. + 0 means the server response was not + retrieved. + + +{/metadocument} +*/ + var $response_status = 0; + + var $oauth_user_agent = 'PHP-OAuth-API (http://www.phpclasses.org/oauth-api $Revision: 1.58 $)'; + var $session_started = false; + + Function SetError($error) + { + $this->error = $error; + if($this->debug) + $this->OutputDebug('Error: '.$error); + return(false); + } + + Function SetPHPError($error, &$php_error_message) + { + if(IsSet($php_error_message) + && strlen($php_error_message)) + $error.=": ".$php_error_message; + return($this->SetError($error)); + } + + Function OutputDebug($message) + { + if($this->debug) + { + $message = $this->debug_prefix.$message; + $this->debug_output .= $message."\n";; + error_log($message); + } + return(true); + } + + Function GetRequestTokenURL(&$request_token_url) + { + $request_token_url = $this->request_token_url; + return(true); + } + + Function GetDialogURL(&$url, $redirect_uri = '', $state = '') + { + $url = (($this->offline && strlen($this->offline_dialog_url)) ? $this->offline_dialog_url : $this->dialog_url); + if(strlen($url) === 0) + return $this->SetError('the dialog URL '.($this->offline ? 'for offline access ' : '').'is not defined for this server'); + $url = str_replace( + '{REDIRECT_URI}', UrlEncode($redirect_uri), str_replace( + '{STATE}', UrlEncode($state), str_replace( + '{CLIENT_ID}', UrlEncode($this->client_id), str_replace( + '{SCOPE}', UrlEncode($this->scope), + $url)))); + return(true); + } + + Function GetAccessTokenURL(&$access_token_url) + { + $access_token_url = $this->access_token_url; + return(true); + } + + Function GetStoredState(&$state) + { + if(!$this->session_started) + { + if(!function_exists('session_start')) + return $this->SetError('Session variables are not accessible in this PHP environment'); + } + if(IsSet($_SESSION['OAUTH_STATE'])) + $state = $_SESSION['OAUTH_STATE']; + else + $state = $_SESSION['OAUTH_STATE'] = time().'-'.substr(md5(rand().time()), 0, 6); + return(true); + } + + Function GetRequestState(&$state) + { + $check = (strlen($this->append_state_to_redirect_uri) ? $this->append_state_to_redirect_uri : 'state'); + $state = (IsSet($_GET[$check]) ? $_GET[$check] : null); + return(true); + } + + Function GetRequestCode(&$code) + { + $code = (IsSet($_GET['code']) ? $_GET['code'] : null); + return(true); + } + + Function GetRequestError(&$error) + { + $error = (IsSet($_GET['error']) ? $_GET['error'] : null); + return(true); + } + + Function GetRequestDenied(&$denied) + { + $denied = (IsSet($_GET['denied']) ? $_GET['denied'] : null); + return(true); + } + + Function GetRequestToken(&$token, &$verifier) + { + $token = (IsSet($_GET['oauth_token']) ? $_GET['oauth_token'] : null); + $verifier = (IsSet($_GET['oauth_verifier']) ? $_GET['oauth_verifier'] : null); + return(true); + } + + Function GetRedirectURI(&$redirect_uri) + { + if(strlen($this->redirect_uri)) + $redirect_uri = $this->redirect_uri; + else + $redirect_uri = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; + return true; + } + +/* +{metadocument} + + StoreAccessToken + BOOLEAN + + Store the values of the access token when it is succefully + retrieved from the OAuth server. + This function is meant to be only be called from inside the + class. By default it stores access tokens in a session variable + named OAUTH_ACCESS_TOKEN. + Actual implementations should create a sub-class and override this + function to make the access token values be stored in other types + of containers, like for instance databases. + This function should return + 1 if the access token was stored + successfully. + + + access_token + HASH + + Associative array with properties of the access token. + The array may have set the following + properties: + value: string value of the access + token + authorized: boolean value that + determines if the access token was obtained + successfully + expiry: (optional) timestamp in ISO + format relative to UTC time zone of the access token expiry + time + type: (optional) type of OAuth token + that may determine how it should be used when sending API call + requests. + refresh: (optional) token that some + servers may set to allowing refreshing access tokens when they + expire. + + + +{/metadocument} +*/ + Function StoreAccessToken($access_token) + { + if(!$this->session_started) + { + if(!function_exists('session_start')) + return $this->SetError('Session variables are not accessible in this PHP environment'); + } + $_SESSION['OAUTH_ACCESS_TOKEN'][$this->access_token_url] = $access_token; + return true; + } +/* +{metadocument} + + +{/metadocument} +*/ + +/* +{metadocument} + + GetAccessToken + BOOLEAN + + Retrieve the OAuth access token if it was already + previously stored by the + StoreAccessToken function. + This function is meant to be only be called from inside the + class. By default it retrieves access tokens stored in a session + variable named + OAUTH_ACCESS_TOKEN. + Actual implementations should create a sub-class and override this + function to retrieve the access token values from other types of + containers, like for instance databases. + This function should return + 1 if the access token was retrieved + successfully. + + + access_token + STRING + + + Return the properties of the access token in an + associative array. If the access token was not yet stored, it + returns an empty array. Otherwise, the properties it may return + are the same that may be passed to the + StoreAccessToken. + + + +{/metadocument} +*/ + Function GetAccessToken(&$access_token) + { + if(!$this->session_started) + { + if(!function_exists('session_start')) + return $this->SetError('Session variables are not accessible in this PHP environment'); + if(!session_start()) + return($this->SetPHPError('it was not possible to start the PHP session', $php_error_message)); + $this->session_started = true; + } + if(IsSet($_SESSION['OAUTH_ACCESS_TOKEN'][$this->access_token_url])) + $access_token = $_SESSION['OAUTH_ACCESS_TOKEN'][$this->access_token_url]; + else + $access_token = array(); + return true; + } +/* +{metadocument} + + +{/metadocument} +*/ + +/* +{metadocument} + + ResetAccessToken + BOOLEAN + + Reset the access token to a state back when the user has + not yet authorized the access to the OAuth server API. + Call this function if for some reason the token to access + the API was revoked and you need to ask the user to authorize + the access again. + By default the class stores and retrieves access tokens in a + session variable named + OAUTH_ACCESS_TOKEN. + This function must be called when the user is accessing your site + pages, so it can reset the information stored in session variables + that cache the state of a previously retrieved access + token. + Actual implementations should create a sub-class and override this + function to reset the access token state when it is stored in + other types of containers, like for instance databases. + This function should return + 1 if the access token was resetted + successfully. + + +{/metadocument} +*/ + Function ResetAccessToken() + { + if($this->debug) + $this->OutputDebug('Resetting the access token status for OAuth server located at '.$this->access_token_url); + if(!$this->session_started) + { + if(!function_exists('session_start')) + return $this->SetError('Session variables are not accessible in this PHP environment'); + if(!session_start()) + return($this->SetPHPError('it was not possible to start the PHP session', $php_error_message)); + } + $this->session_started = true; + if(IsSet($_SESSION['OAUTH_ACCESS_TOKEN'][$this->access_token_url])) + Unset($_SESSION['OAUTH_ACCESS_TOKEN'][$this->access_token_url]); + return true; + } +/* +{metadocument} + + +{/metadocument} +*/ + + Function Encode($value) + { + return(is_array($value) ? $this->EncodeArray($value) : str_replace('%7E', '~', str_replace('+',' ', RawURLEncode($value)))); + } + + Function EncodeArray($array) + { + foreach($array as $key => $value) + $array[$key] = $this->Encode($value); + return $array; + } + + Function HMAC($function, $data, $key) + { + switch($function) + { + case 'sha1': + $pack = 'H40'; + break; + default: + if($this->debug) + $this->OutputDebug($function.' is not a supported an HMAC hash type'); + return(''); + } + if(strlen($key) > 64) + $key = pack($pack, $function($key)); + if(strlen($key) < 64) + $key = str_pad($key, 64, "\0"); + return(pack($pack, $function((str_repeat("\x5c", 64) ^ $key).pack($pack, $function((str_repeat("\x36", 64) ^ $key).$data))))); + } + + Function SendAPIRequest($url, $method, $parameters, $oauth, $options, &$response) + { + $this->response_status = 0; + $http = new http_class; + $http->debug = ($this->debug && $this->debug_http); + $http->log_debug = true; + $http->sasl_authenticate = 0; + $http->user_agent = $this->oauth_user_agent; + $http->redirection_limit = (IsSet($options['FollowRedirection']) ? intval($options['FollowRedirection']) : 0); + $http->follow_redirect = ($http->redirection_limit != 0); + if($this->debug) + $this->OutputDebug('Accessing the '.$options['Resource'].' at '.$url); + $post_files = array(); + $method = strtoupper($method); + $authorization = ''; + $type = (IsSet($options['RequestContentType']) ? strtolower(trim(strtok($options['RequestContentType'], ';'))) : 'application/x-www-form-urlencoded'); + if(IsSet($oauth)) + { + $values = array( + 'oauth_consumer_key'=>$this->client_id, + 'oauth_nonce'=>md5(uniqid(rand(), true)), + 'oauth_signature_method'=>$this->signature_method, + 'oauth_timestamp'=>time(), + 'oauth_version'=>'1.0', + ); + $files = (IsSet($options['Files']) ? $options['Files'] : array()); + if(count($files)) + { + foreach($files as $name => $value) + { + if(!IsSet($parameters[$name])) + return($this->SetError('it was specified an file parameters named '.$name)); + $file = array(); + switch(IsSet($value['Type']) ? $value['Type'] : 'FileName') + { + case 'FileName': + $file['FileName'] = $parameters[$name]; + break; + case 'Data': + $file['Data'] = $parameters[$name]; + break; + default: + return($this->SetError($value['Type'].' is not a valid type for file '.$name)); + } + $file['ContentType'] = (IsSet($value['Content-Type']) ? $value['Content-Type'] : 'automatic/name'); + $post_files[$name] = $file; + } + UnSet($parameters[$name]); + if($method !== 'POST') + { + $this->OutputDebug('For uploading files the method should be POST not '.$method); + $method = 'POST'; + } + if($type !== 'multipart/form-data') + { + if(IsSet($options['RequestContentType'])) + return($this->SetError('the request content type for uploading files should be multipart/form-data')); + $type = 'multipart/form-data'; + } + $value_parameters = array(); + } + else + { + if($this->url_parameters + && $type === 'application/x-www-form-urlencoded' + && count($parameters)) + { + $first = (strpos($url, '?') === false); + foreach($parameters as $parameter => $value) + { + $url .= ($first ? '?' : '&').UrlEncode($parameter).'='.UrlEncode($value); + $first = false; + } + $parameters = array(); + } + $value_parameters = ($type !== 'application/x-www-form-urlencoded' ? array() : $parameters); + } + $values = array_merge($values, $oauth, $value_parameters); + $key = $this->Encode($this->client_secret).'&'.$this->Encode($this->access_token_secret); + switch($this->signature_method) + { + case 'PLAINTEXT': + $values['oauth_signature'] = $key; + break; + case 'HMAC-SHA1': + $uri = strtok($url, '?'); + $sign = $method.'&'.$this->Encode($uri).'&'; + $first = true; + $sign_values = $values; + $u = parse_url($url); + if(IsSet($u['query'])) + { + parse_str($u['query'], $q); + foreach($q as $parameter => $value) + $sign_values[$parameter] = $value; + } + KSort($sign_values); + foreach($sign_values as $parameter => $value) + { + $sign .= $this->Encode(($first ? '' : '&').$parameter.'='.$this->Encode($value)); + $first = false; + } + $values['oauth_signature'] = base64_encode($this->HMAC('sha1', $sign, $key)); + break; + default: + return $this->SetError($this->signature_method.' signature method is not yet supported'); + } + if($this->authorization_header) + { + $authorization = 'OAuth'; + $first = true; + foreach($values as $parameter => $value) + { + $authorization .= ($first ? ' ' : ',').$parameter.'="'.$this->Encode($value).'"'; + $first = false; + } + } + else + { + if($method === 'GET' + || (IsSet($options['PostValuesInURI']) + && $options['PostValuesInURI'])) + { + $first = (strcspn($url, '?') == strlen($url)); + foreach($values as $parameter => $value) + { + $url .= ($first ? '?' : '&').$parameter.'='.$this->Encode($value); + $first = false; + } + $post_values = array(); + } + else + $post_values = $values; + } + } + if(strlen($error = $http->GetRequestArguments($url, $arguments))) + return($this->SetError('it was not possible to open the '.$options['Resource'].' URL: '.$error)); + if(strlen($error = $http->Open($arguments))) + return($this->SetError('it was not possible to open the '.$options['Resource'].' URL: '.$error)); + if(count($post_files)) + $arguments['PostFiles'] = $post_files; + $arguments['RequestMethod'] = $method; + switch($type) + { + case 'application/x-www-form-urlencoded': + case 'multipart/form-data': + if(IsSet($options['RequestBody'])) + return($this->SetError('the request body is defined automatically from the parameters')); + $arguments['PostValues'] = $parameters; + break; + case 'application/json': + $arguments['Headers']['Content-Type'] = $options['RequestContentType']; + if(!IsSet($options['RequestBody'])) + { + $arguments['Body'] = json_encode($parameters); + break; + } + default: + if(!IsSet($options['RequestBody'])) + return($this->SetError('it was not specified the body value of the of the API call request')); + $arguments['Headers']['Content-Type'] = $options['RequestContentType']; + $arguments['Body'] = $options['RequestBody']; + break; + } + $arguments['Headers']['Accept'] = (IsSet($options['Accept']) ? $options['Accept'] : '*/*'); + if(strlen($authorization)) + $arguments['Headers']['Authorization'] = $authorization; + if(strlen($error = $http->SendRequest($arguments)) + || strlen($error = $http->ReadReplyHeaders($headers))) + { + $http->Close(); + return($this->SetError('it was not possible to retrieve the '.$options['Resource'].': '.$error)); + } + $error = $http->ReadWholeReplyBody($data); + $http->Close(); + if(strlen($error)) + { + return($this->SetError('it was not possible to access the '.$options['Resource'].': '.$error)); + } + $this->response_status = intval($http->response_status); + $content_type = (IsSet($options['ResponseContentType']) ? $options['ResponseContentType'] : (IsSet($headers['content-type']) ? strtolower(trim(strtok($headers['content-type'], ';'))) : 'unspecified')); + switch($content_type) + { + case 'text/javascript': + case 'application/json': + if(!function_exists('json_decode')) + return($this->SetError('the JSON extension is not available in this PHP setup')); + $object = json_decode($data); + switch(GetType($object)) + { + case 'object': + if(!IsSet($options['ConvertObjects']) + || !$options['ConvertObjects']) + $response = $object; + else + { + $response = array(); + foreach($object as $property => $value) + $response[$property] = $value; + } + break; + case 'array': + $response = $object; + break; + default: + if(!IsSet($object)) + return($this->SetError('it was not returned a valid JSON definition of the '.$options['Resource'].' values')); + $response = $object; + break; + } + break; + case 'application/x-www-form-urlencoded': + case 'text/plain': + case 'text/html': + parse_str($data, $response); + break; + default: + $response = $data; + break; + } + if($this->response_status >= 200 + && $this->response_status < 300) + $this->access_token_error = ''; + else + { + $this->access_token_error = 'it was not possible to access the '.$options['Resource'].': it was returned an unexpected response status '.$http->response_status.' Response: '.$data; + if($this->debug) + $this->OutputDebug('Could not retrieve the OAuth access. Error: '.$this->access_token_error); + if(IsSet($options['FailOnAccessError']) + && $options['FailOnAccessError']) + { + $this->error = $this->access_token_error; + return false; + } + } + return true; + } + + Function ProcessToken($code, $refresh) + { + if($refresh) + { + $values = array( + 'client_id'=>$this->client_id, + 'client_secret'=>$this->client_secret, + 'refresh_token'=>$this->refresh_token, + 'grant_type'=>'refresh_token' + ); + } + else + { + if(!$this->GetRedirectURI($redirect_uri)) + return false; + $values = array( + 'code'=>$code, + 'client_id'=>$this->client_id, + 'client_secret'=>$this->client_secret, + 'redirect_uri'=>$redirect_uri, + 'grant_type'=>'authorization_code' + ); + } + if(!$this->GetAccessTokenURL($url)) + return false; + if(!$this->SendAPIRequest($url, 'POST', $values, null, array('Resource'=>'OAuth '.($refresh ? 'refresh' : 'access').' token', 'ConvertObjects'=>true), $response)) + return false; + if(strlen($this->access_token_error)) + { + $this->authorization_error = $this->access_token_error; + return true; + } + if(!IsSet($response['access_token'])) + { + if(IsSet($response['error'])) + { + $this->authorization_error = 'it was not possible to retrieve the access token: it was returned the error: '.$response['error']; + return true; + } + return($this->SetError('OAuth server did not return the access token')); + } + $access_token = array( + 'value'=>$this->access_token = $response['access_token'], + 'authorized'=>true + ); + if($this->debug) + $this->OutputDebug('Access token: '.$this->access_token); + if(IsSet($response['expires']) + || IsSet($response['expires_in'])) + { + $expires = (IsSet($response['expires']) ? $response['expires'] : $response['expires_in']); + if(strval($expires) !== strval(intval($expires)) + || $expires <= 0) + return($this->SetError('OAuth server did not return a supported type of access token expiry time')); + $this->access_token_expiry = gmstrftime('%Y-%m-%d %H:%M:%S', time() + $expires); + if($this->debug) + $this->OutputDebug('Access token expiry: '.$this->access_token_expiry.' UTC'); + $access_token['expiry'] = $this->access_token_expiry; + } + else + $this->access_token_expiry = ''; + if(IsSet($response['token_type'])) + { + $this->access_token_type = $response['token_type']; + if($this->debug) + $this->OutputDebug('Access token type: '.$this->access_token_type); + $access_token['type'] = $this->access_token_type; + } + else + $this->access_token_type = ''; + if($refresh) + $response['refresh_token'] = $this->refresh_token; + elseif(IsSet($response['refresh_token'])) + { + $this->refresh_token = $response['refresh_token']; + if($this->debug) + $this->OutputDebug('Refresh token: '.$this->refresh_token); + $access_token['refresh'] = $this->refresh_token; + } + else + $this->refresh_token = ''; + if(!$this->StoreAccessToken($access_token)) + return false; + return true; + } + + Function RetrieveToken(&$valid) + { + $valid = false; + if(!$this->GetAccessToken($access_token)) + return false; + if(IsSet($access_token['value'])) + { + $this->access_token_expiry = ''; + if(IsSet($access_token['expiry']) + && strcmp($this->access_token_expiry = $access_token['expiry'], gmstrftime('%Y-%m-%d %H:%M:%S')) < 0) + { + $this->access_token = ''; + if($this->debug) + $this->OutputDebug('The OAuth access token expired in '.$this->access_token_expiry); + } + else + { + $this->access_token = $access_token['value']; + if(IsSet($access_token['type'])) + $this->access_token_type = $access_token['type']; + else + $this->access_token_type = ''; + if($this->debug) + $this->OutputDebug('The OAuth access token '.$this->access_token.' is valid'); + if(strlen($this->access_token_type) + && $this->debug) + $this->OutputDebug('The OAuth access token is of type '.$this->access_token_type); + if(IsSet($access_token['refresh'])) + $this->refresh_token = $access_token['refresh']; + else + $this->refresh_token = ''; + $valid = true; + } + } + return true; + } +/* +{metadocument} + + CallAPI + BOOLEAN + + Send a HTTP request to the Web services API using a + previously obtained authorization token via OAuth. + This function can be used to call an API after having + previously obtained an access token through the OAuth protocol + using the Process function, or by + directly setting the variables + access_token, as well as + access_token_secret in case of using + OAuth 1.0 or 1.0a services. + This function returns 1 if + the call was done successfully. + + + url + STRING + + URL of the API where the HTTP request will be sent. + + + + method + STRING + + HTTP method that will be used to send the request. It can + be GET, + POST, + DELETE, PUT, + etc.. + + + + parameters + HASH + + Associative array with the names and values of the API + call request parameters. + + + + options + HASH + + Associative array with additional options to configure + the request. Currently it supports the following + options: + 2Legged: boolean option that + determines if the API request should be 2 legged. The default + value is 0. + Accept: content type value of the + Accept HTTP header to be sent in the API call HTTP request. + Some APIs require that a certain value be sent to specify + which version of the API is being called. The default value is + */*. + ConvertObjects: boolean option that + determines if objects should be converted into arrays when the + response is returned in JSON format. The default value is + 0. + FailOnAccessError: boolean option + that determines if this functions should fail when the server + response status is not between 200 and 299. The default value + is 0. + Files: associative array with + details of the parameters that must be passed as file uploads. + The array indexes must have the same name of the parameters + to be sent as files. The respective array entry values must + also be associative arrays with the parameters for each file. + Currently it supports the following parameters: + - Type - defines how the parameter value should be + treated. It can be 'FileName' if the parameter value is + is the name of a local file to be uploaded. It may also be + 'Data' if the parameter value is the actual data of + the file to be uploaded. + - Default: 'FileName' + - ContentType - MIME value of the content type of the + file. It can be 'automatic/name' if the content type + should be determine from the file name extension. + - Default: 'automatic/name' + PostValuesInURI: boolean option to + determine that a POST request should pass the request values + in the URI. The default value is + 0. + FollowRedirection: limit number of + times that HTTP response redirects will be followed. If it is + set to 0, redirection responses + fail in error. The default value is + 0. + RequestBody: request body data of a + custom type. The RequestContentType + option must be specified, so the + RequestBody option is considered. + RequestContentType: content type that + should be used to send the request values. It can be either + application/x-www-form-urlencoded + for sending values like from Web forms, or + application/json for sending the + values encoded in JSON format. Other types are accepted if the + RequestBody option is specified. + The default value is + application/x-www-form-urlencoded. + RequestBody: request body data of a + custom type. The RequestContentType + option must be specified, so the + RequestBody option is considered. + Resource: string with a label that + will be used in the error messages and debug log entries to + identify what operation the request is performing. The default + value is API call. + ResponseContentType: content type + that should be considered when decoding the API request + response. This overrides the Content-Type header + returned by the server. If the content type is + application/x-www-form-urlencoded + the function will parse the data returning an array of + key-value pairs. If the content type is + application/json the response will + be decode as a JSON-encoded data type. Other content type + values will make the function return the original response + value as it was returned from the server. The default value + for this option is to use what the server returned in the + Content-Type header. + + + + response + STRING + + + Return the value of the API response. If the value is + JSON encoded, this function will decode it and return the value + converted to respective types. If the value is form encoded, + this function will decode the response and return it as an + array. Otherwise, the class will return the value as a + string. + + + +{/metadocument} +*/ + Function CallAPI($url, $method, $parameters, $options, &$response) + { + if(!IsSet($options['Resource'])) + $options['Resource'] = 'API call'; + if(!IsSet($options['ConvertObjects'])) + $options['ConvertObjects'] = false; + if(strlen($this->access_token) === 0) + { + if(!$this->RetrieveToken($valid)) + return false; + if(!$valid) + return $this->SetError('the access token is not set to a valid value'); + } + switch(intval($this->oauth_version)) + { + case 1: + $oauth = array( + 'oauth_token'=>((IsSet($options['2Legged']) && $options['2Legged']) ? '' : $this->access_token) + ); + break; + + case 2: + if(strlen($this->access_token_expiry) + && strcmp($this->access_token_expiry, gmstrftime('%Y-%m-%d %H:%M:%S')) <= 0) + { + if(strlen($this->refresh_token) === 0) + return($this->SetError('the access token expired and no refresh token is available')); + if($this->debug) + { + $this->OutputDebug('The access token expired on '.$this->access_token_expiry); + $this->OutputDebug('Refreshing the access token'); + } + if(!$this->ProcessToken(null, true)) + return false; + } + $oauth = null; + $url .= (strcspn($url, '?') < strlen($url) ? '&' : '?').'access_token='.UrlEncode($this->access_token); + break; + + default: + return($this->SetError($this->oauth_version.' is not a supported version of the OAuth protocol')); + } + return($this->SendAPIRequest($url, $method, $parameters, $oauth, $options, $response)); + } +/* +{metadocument} + + +{/metadocument} +*/ + +/* +{metadocument} + + Initialize + BOOLEAN + + Initialize the class variables and internal state. It must + be called before calling other class functions. + Set the server variable before + calling this function to let it initialize the class variables to + work with the specified server type. Alternatively, you can set + other class variables manually to make it work with servers that + are not yet built-in supported. + This function returns 1 if + it was able to successfully initialize the class for the specified + server type. + + +{/metadocument} +*/ + Function Initialize() + { + if(strlen($this->server) === 0) + return true; + $this->request_token_url = ''; + $this->append_state_to_redirect_uri = ''; + $this->authorization_header = true; + $this->url_parameters = false; + $this->token_request_method = 'GET'; + $this->signature_method = 'HMAC-SHA1'; + switch($this->server) + { + case 'Bitbucket': + $this->oauth_version = '1.0a'; + $this->request_token_url = 'https://bitbucket.org/!api/1.0/oauth/request_token'; + $this->dialog_url = 'https://bitbucket.org/!api/1.0/oauth/authenticate'; + $this->access_token_url = 'https://bitbucket.org/!api/1.0/oauth/access_token'; + $this->url_parameters = true; + break; + + case 'Box': + $this->oauth_version = '2.0'; + $this->dialog_url = 'https://www.box.com/api/oauth2/authorize?response_type=code&client_id={CLIENT_ID}&redirect_uri={REDIRECT_URI}&state={STATE}'; + $this->offline_dialog_url = 'https://www.box.com/api/oauth2/authorize?response_type=code&client_id={CLIENT_ID}&redirect_uri={REDIRECT_URI}&state={STATE}&access_type=offline&approval_prompt=force'; + $this->access_token_url = 'https://www.box.com/api/oauth2/token'; + break; + + case 'Dropbox': + $this->oauth_version = '1.0'; + $this->request_token_url = 'https://api.dropbox.com/1/oauth/request_token'; + $this->dialog_url = 'https://www.dropbox.com/1/oauth/authorize'; + $this->access_token_url = 'https://api.dropbox.com/1/oauth/access_token'; + $this->authorization_header = false; + break; + + case 'Eventful': + $this->oauth_version = '1.0a'; + $this->request_token_url = 'http://eventful.com/oauth/request_token'; + $this->dialog_url = 'http://eventful.com/oauth/authorize'; + $this->access_token_url = 'http://eventful.com/oauth/access_token'; + $this->authorization_header = false; + $this->url_parameters = true; + $this->token_request_method = 'POST'; + break; + + case 'Evernote': + $this->oauth_version = '1.0a'; + $this->request_token_url = 'https://sandbox.evernote.com/oauth'; + $this->dialog_url = 'https://sandbox.evernote.com/OAuth.action'; + $this->access_token_url = 'https://sandbox.evernote.com/oauth'; + $this->url_parameters = true; + $this->authorization_header = false; + break; + + case 'Facebook': + $this->oauth_version = '2.0'; + $this->dialog_url = 'https://www.facebook.com/dialog/oauth?client_id={CLIENT_ID}&redirect_uri={REDIRECT_URI}&scope={SCOPE}&state={STATE}'; + $this->access_token_url = 'https://graph.facebook.com/oauth/access_token'; + break; + + case 'Fitbit': + $this->oauth_version = '1.0a'; + $this->request_token_url = 'http://api.fitbit.com/oauth/request_token'; + $this->dialog_url = 'http://api.fitbit.com/oauth/authorize'; + $this->access_token_url = 'http://api.fitbit.com/oauth/access_token'; + break; + + case 'Flickr': + $this->oauth_version = '1.0a'; + $this->request_token_url = 'http://www.flickr.com/services/oauth/request_token'; + $this->dialog_url = 'http://www.flickr.com/services/oauth/authorize?perms={SCOPE}'; + $this->access_token_url = 'http://www.flickr.com/services/oauth/access_token'; + $this->authorization_header = false; + break; + + case 'Foursquare': + $this->oauth_version = '2.0'; + $this->dialog_url = 'https://foursquare.com/oauth2/authorize?client_id={CLIENT_ID}&scope={SCOPE}&response_type=code&redirect_uri={REDIRECT_URI}&state={STATE}'; + $this->access_token_url = 'https://foursquare.com/oauth2/access_token'; + break; + + case 'github': + $this->oauth_version = '2.0'; + $this->dialog_url = 'https://github.com/login/oauth/authorize?client_id={CLIENT_ID}&redirect_uri={REDIRECT_URI}&scope={SCOPE}&state={STATE}'; + $this->access_token_url = 'https://github.com/login/oauth/access_token'; + break; + + case 'Google': + $this->oauth_version = '2.0'; + $this->dialog_url = 'https://accounts.google.com/o/oauth2/auth?response_type=code&client_id={CLIENT_ID}&redirect_uri={REDIRECT_URI}&scope={SCOPE}&state={STATE}'; + $this->offline_dialog_url = 'https://accounts.google.com/o/oauth2/auth?response_type=code&client_id={CLIENT_ID}&redirect_uri={REDIRECT_URI}&scope={SCOPE}&state={STATE}&access_type=offline&approval_prompt=force'; + $this->access_token_url = 'https://accounts.google.com/o/oauth2/token'; + break; + + case 'Instagram': + $this->oauth_version = '2.0'; + $this->dialog_url ='https://api.instagram.com/oauth/authorize/?client_id={CLIENT_ID}&redirect_uri={REDIRECT_URI}&scope={SCOPE}&response_type=code&state={STATE}'; + $this->access_token_url = 'https://api.instagram.com/oauth/access_token'; + break; + + case 'LinkedIn': + $this->oauth_version = '1.0a'; + $this->request_token_url = 'https://api.linkedin.com/uas/oauth/requestToken?scope={SCOPE}'; + $this->dialog_url = 'https://api.linkedin.com/uas/oauth/authenticate'; + $this->access_token_url = 'https://api.linkedin.com/uas/oauth/accessToken'; + $this->url_parameters = true; + break; + + case 'Microsoft': + $this->oauth_version = '2.0'; + $this->dialog_url = 'https://login.live.com/oauth20_authorize.srf?client_id={CLIENT_ID}&scope={SCOPE}&response_type=code&redirect_uri={REDIRECT_URI}&state={STATE}'; + $this->access_token_url = 'https://login.live.com/oauth20_token.srf'; + break; + + case 'RightSignature': + $this->oauth_version = '1.0a'; + $this->request_token_url = 'https://rightsignature.com/oauth/request_token'; + $this->dialog_url = 'https://rightsignature.com/oauth/authorize'; + $this->access_token_url = 'https://rightsignature.com/oauth/access_token'; + $this->authorization_header = false; + break; + + case 'Scoop.it': + $this->oauth_version = '1.0a'; + $this->request_token_url = 'https://www.scoop.it/oauth/request'; + $this->dialog_url = 'https://www.scoop.it/oauth/authorize'; + $this->access_token_url = 'https://www.scoop.it/oauth/access'; + $this->authorization_header = false; + break; + + case 'StockTwits': + $this->oauth_version = '2.0'; + $this->dialog_url = 'https://api.stocktwits.com/api/2/oauth/authorize?client_id={CLIENT_ID}&response_type=code&redirect_uri={REDIRECT_URI}&scope={SCOPE}&state={STATE}'; + $this->access_token_url = 'https://api.stocktwits.com/api/2/oauth/token'; + break; + + case 'Tumblr': + $this->oauth_version = '1.0a'; + $this->request_token_url = 'http://www.tumblr.com/oauth/request_token'; + $this->dialog_url = 'http://www.tumblr.com/oauth/authorize'; + $this->access_token_url = 'http://www.tumblr.com/oauth/access_token'; + break; + + case 'Twitter': + $this->oauth_version = '1.0a'; + $this->request_token_url = 'https://api.twitter.com/oauth/request_token'; + $this->dialog_url = 'https://api.twitter.com/oauth/authenticate'; + $this->access_token_url = 'https://api.twitter.com/oauth/access_token'; + $this->url_parameters = true; + break; + + case 'XING': + $this->oauth_version = '1.0a'; + $this->request_token_url = 'https://api.xing.com/v1/request_token'; + $this->dialog_url = 'https://api.xing.com/v1/authorize'; + $this->access_token_url = 'https://api.xing.com/v1/access_token'; + $this->authorization_header = false; + break; + + case 'Yahoo': + $this->oauth_version = '1.0a'; + $this->request_token_url = 'https://api.login.yahoo.com/oauth/v2/get_request_token'; + $this->dialog_url = 'https://api.login.yahoo.com/oauth/v2/request_auth'; + $this->access_token_url = 'https://api.login.yahoo.com/oauth/v2/get_token'; + $this->authorization_header = false; + break; + + default: + return($this->SetError($this->server.' is not yet a supported type of OAuth server. Please contact the author Manuel Lemos to request adding built-in support to this type of OAuth server.')); + } + return(true); + } +/* +{metadocument} + + +{/metadocument} +*/ + +/* +{metadocument} + + Process + BOOLEAN + + Process the OAuth protocol interaction with the OAuth + server. + Call this function when you need to retrieve the OAuth access + token. Check the access_token to + determine if the access token was obtained successfully. + This function returns 1 if + the OAuth protocol was processed without errors. + + +{/metadocument} +*/ + Function Process() + { + switch(intval($this->oauth_version)) + { + case 1: + $one_a = ($this->oauth_version === '1.0a'); + if($this->debug) + $this->OutputDebug('Checking the OAuth token authorization state'); + if(!$this->GetAccessToken($access_token)) + return false; + if(IsSet($access_token['authorized']) + && IsSet($access_token['value'])) + { + $expired = (IsSet($access_token['expiry']) && strcmp($access_token['expiry'], gmstrftime('%Y-%m-%d %H:%M:%S')) <= 0); + if(!$access_token['authorized'] + || $expired) + { + if($this->debug) + { + if($expired) + $this->OutputDebug('The OAuth token expired on '.$access_token['expiry'].'UTC'); + else + $this->OutputDebug('The OAuth token is not yet authorized'); + $this->OutputDebug('Checking the OAuth token and verifier'); + } + if(!$this->GetRequestToken($token, $verifier)) + return false; + if(!IsSet($token) + || ($one_a + && !IsSet($verifier))) + { + if(!$this->GetRequestDenied($denied)) + return false; + if(IsSet($denied) + && $denied === $access_token['value']) + { + if($this->debug) + $this->OutputDebug('The authorization request was denied'); + $this->authorization_error = 'the request was denied'; + return true; + } + else + { + if($this->debug) + $this->OutputDebug('Reset the OAuth token state because token and verifier are not both set'); + $access_token = array(); + } + } + elseif($token !== $access_token['value']) + { + if($this->debug) + $this->OutputDebug('Reset the OAuth token state because token does not match what as previously retrieved'); + $access_token = array(); + } + else + { + if(!$this->GetAccessTokenURL($url)) + return false; + $oauth = array( + 'oauth_token'=>$token, + ); + if($one_a) + $oauth['oauth_verifier'] = $verifier; + $this->access_token_secret = $access_token['secret']; + $options = array('Resource'=>'OAuth access token'); + $method = strtoupper($this->token_request_method); + switch($method) + { + case 'GET': + break; + case 'POST': + $options['PostValuesInURI'] = true; + break; + default: + $this->error = $method.' is not a supported method to request tokens'; + break; + } + if(!$this->SendAPIRequest($url, $method, array(), $oauth, $options, $response)) + return false; + if(strlen($this->access_token_error)) + { + $this->authorization_error = $this->access_token_error; + return true; + } + if(!IsSet($response['oauth_token']) + || !IsSet($response['oauth_token_secret'])) + { + $this->authorization_error= 'it was not returned the access token and secret'; + return true; + } + $access_token = array( + 'value'=>$response['oauth_token'], + 'secret'=>$response['oauth_token_secret'], + 'authorized'=>true + ); + if(IsSet($response['oauth_expires_in'])) + { + $expires = $response['oauth_expires_in']; + if(strval($expires) !== strval(intval($expires)) + || $expires <= 0) + return($this->SetError('OAuth server did not return a supported type of access token expiry time')); + $this->access_token_expiry = gmstrftime('%Y-%m-%d %H:%M:%S', time() + $expires); + if($this->debug) + $this->OutputDebug('Access token expiry: '.$this->access_token_expiry.' UTC'); + $access_token['expiry'] = $this->access_token_expiry; + } + else + $this->access_token_expiry = ''; + + if(!$this->StoreAccessToken($access_token)) + return false; + if($this->debug) + $this->OutputDebug('The OAuth token was authorized'); + } + } + elseif($this->debug) + $this->OutputDebug('The OAuth token was already authorized'); + if(IsSet($access_token['authorized']) + && $access_token['authorized']) + { + $this->access_token = $access_token['value']; + $this->access_token_secret = $access_token['secret']; + return true; + } + } + else + { + if($this->debug) + $this->OutputDebug('The OAuth access token is not set'); + $access_token = array(); + } + if(!IsSet($access_token['authorized'])) + { + if($this->debug) + $this->OutputDebug('Requesting the unauthorized OAuth token'); + if(!$this->GetRequestTokenURL($url)) + return false; + $url = str_replace('{SCOPE}', UrlEncode($this->scope), $url); + if(!$this->GetRedirectURI($redirect_uri)) + return false; + $oauth = array( + 'oauth_callback'=>$redirect_uri, + ); + $options = array('Resource'=>'OAuth request token'); + $method = strtoupper($this->token_request_method); + switch($method) + { + case 'GET': + break; + case 'POST': + $options['PostValuesInURI'] = true; + break; + default: + $this->error = $method.' is not a supported method to request tokens'; + break; + } + if(!$this->SendAPIRequest($url, $method, array(), $oauth, $options, $response)) + return false; + if(strlen($this->access_token_error)) + { + $this->authorization_error = $this->access_token_error; + return true; + } + if(!IsSet($response['oauth_token']) + || !IsSet($response['oauth_token_secret'])) + { + $this->authorization_error = 'it was not returned the requested token'; + return true; + } + $access_token = array( + 'value'=>$response['oauth_token'], + 'secret'=>$response['oauth_token_secret'], + 'authorized'=>false + ); + if(!$this->StoreAccessToken($access_token)) + return false; + } + if(!$this->GetDialogURL($url)) + return false; + $url .= (strpos($url, '?') === false ? '?' : '&').'oauth_token='.$access_token['value']; + if(!$one_a) + { + if(!$this->GetRedirectURI($redirect_uri)) + return false; + $url .= '&oauth_callback='.UrlEncode($redirect_uri); + } + if($this->debug) + $this->OutputDebug('Redirecting to OAuth authorize page '.$url); + Header('HTTP/1.0 302 OAuth Redirection'); + Header('Location: '.$url); + $this->exit = true; + return true; + + case 2: + if($this->debug) + $this->OutputDebug('Checking if OAuth access token was already retrieved from '.$this->access_token_url); + if(!$this->RetrieveToken($valid)) + return false; + if($valid) + return true; + if($this->debug) + $this->OutputDebug('Checking the authentication state in URI '.$_SERVER['REQUEST_URI']); + if(!$this->GetStoredState($stored_state)) + return false; + if(strlen($stored_state) == 0) + return($this->SetError('it was not set the OAuth state')); + if(!$this->GetRequestState($state)) + return false; + if($state === $stored_state) + { + if($this->debug) + $this->OutputDebug('Checking the authentication code'); + if(!$this->GetRequestCode($code)) + return false; + if(strlen($code) == 0) + { + if(!$this->GetRequestError($this->authorization_error)) + return false; + if(IsSet($this->authorization_error)) + { + if($this->debug) + $this->OutputDebug('Authorization failed with error code '.$this->authorization_error); + switch($this->authorization_error) + { + case 'invalid_request': + case 'unauthorized_client': + case 'access_denied': + case 'unsupported_response_type': + case 'invalid_scope': + case 'server_error': + case 'temporarily_unavailable': + case 'user_denied': + return true; + default: + return($this->SetError('it was returned an unknown OAuth error code')); + } + } + return($this->SetError('it was not returned the OAuth dialog code')); + } + if(!$this->ProcessToken($code, false)) + return false; + } + else + { + if(!$this->GetRedirectURI($redirect_uri)) + return false; + if(strlen($this->append_state_to_redirect_uri)) + $redirect_uri .= (strpos($redirect_uri, '?') === false ? '?' : '&').$this->append_state_to_redirect_uri.'='.$stored_state; + if(!$this->GetDialogURL($url, $redirect_uri, $stored_state)) + return false; + if(strlen($url) == 0) + return($this->SetError('it was not set the OAuth dialog URL')); + if($this->debug) + $this->OutputDebug('Redirecting to OAuth Dialog '.$url); + Header('HTTP/1.0 302 OAuth Redirection'); + Header('Location: '.$url); + $this->exit = true; + } + break; + + default: + return($this->SetError($this->oauth_version.' is not a supported version of the OAuth protocol')); + } + return(true); + } +/* +{metadocument} + + +{/metadocument} +*/ + +/* +{metadocument} + + Finalize + BOOLEAN + + Cleanup any resources that may have been used during the + OAuth protocol processing or execution of API calls. + Always call this function as the last step after calling the + functions Process or + CallAPI. + This function returns 1 if + the function cleaned up any resources successfully. + + + success + BOOLEAN + + Pass the last success state returned by the class or any + external code processing the class function results. + + + +{/metadocument} +*/ + Function Finalize($success) + { + return($success); + } +/* +{metadocument} + + +{/metadocument} +*/ + +/* +{metadocument} + + Output + VOID + + Display the results of the OAuth protocol processing. + Only call this function if you are debugging the OAuth + authorization process and you need to view what was its + results. + + +{/metadocument} +*/ + Function Output() + { + if(strlen($this->authorization_error) + || strlen($this->access_token_error) + || strlen($this->access_token)) + { +?> + + + +OAuth client result + + +

OAuth client result

+authorization_error)) + { +?> +

It was not possible to authorize the application.debug) + { +?> +
Authorization error: authorization_error); + } +?>

+access_token_error)) + { +?> +

It was not possible to use the application access token. +debug) + { +?> +
Error: access_token_error); + } +?>

+access_token)) + { +?> +

The application authorization was obtained successfully. +debug) + { +?> +
Access token: access_token); + if(IsSet($this->access_token_secret)) + { +?> +
Access token secret: access_token_secret); + } + } +?>

+access_token_expiry)) + { +?> +

Access token expiry: access_token_expiry; ?> UTC

+ + + + + +{/metadocument} +*/ + +}; + +/* + +{metadocument} + +{/metadocument} + +*/ + +?> \ No newline at end of file diff --git a/library/oauth/oauth_client_class.html b/library/oauth/oauth_client_class.html new file mode 100644 index 000000000..690730a7e --- /dev/null +++ b/library/oauth/oauth_client_class.html @@ -0,0 +1,607 @@ + + + +Class: OAuth client + + +

Class: OAuth client

+
+ +
+
    +

  • Summary

    • +
      +

      Name

      +

      OAuth client

      +

      Author

      +

      Manuel Lemos (mlemos-at-acm.org)

      +

      Copyright

      +

      Copyright © (C) Manuel Lemos 2012

      +

      Version

      +

      @(#) $Id: oauth_client.php,v 1.58 2013/04/11 09:33:16 mlemos Exp $

      +

      Purpose

      +

      This class serves two main purposes:

      +

      1) Implement the OAuth protocol to retrieve a token from a server to authorize the access to an API on behalf of the current user.

      +

      2) Perform calls to a Web services API using a token previously obtained using this class or a token provided some other way by the Web services provider.

      +

      Usage

      +

      Regardless of your purposes, you always need to start calling the class Initialize function after initializing setup variables. After you are done with the class, always call the Finalize function at the end.

      +

      This class supports either OAuth protocol versions 1.0, 1.0a and 2.0. It abstracts the differences between these protocol versions, so the class usage is the same independently of the OAuth version of the server.

      +

      The class also provides built-in support to several popular OAuth servers, so you do not have to manually configure all the details to access those servers. Just set the server variable to configure the class to access one of the built-in supported servers.

      +

      If you need to access one type of server that is not yet directly supported by the class, you need to configure it explicitly setting the variables: oauth_version, url_parameters, authorization_header, request_token_url, dialog_url, offline_dialog_url, append_state_to_redirect_uri and access_token_url.

      +

      Before proceeding to the actual OAuth authorization process, you need to have registered your application with the OAuth server. The registration provides you values to set the variables client_id and client_secret.

      +

      You also need to set the variables redirect_uri and scope before calling the Process function to make the class perform the necessary interactions with the OAuth server.

      +

      The OAuth protocol involves multiple steps that include redirection to the OAuth server. There it asks permission to the current user to grant your application access to APIs on his/her behalf. When there is a redirection, the class will set the exit variable to 1. Then your script should exit immediately without outputting anything.

      +

      When the OAuth access token is successfully obtained, the following variables are set by the class with the obtained values: access_token, access_token_secret, access_token_expiry, access_token_type. You may want to store these values to use them later when calling the server APIs.

      +

      If there was a problem during OAuth authorization process, check the variable authorization_error to determine the reason.

      +

      Once you get the access token, you can call the server APIs using the CallAPI function. Check the access_token_error variable to determine if there was an error when trying to to call the API.

      +

      If for some reason the user has revoked the access to your application, you need to ask the user to authorize your application again. First you may need to call the function ResetAccessToken to reset the value of the access token that may be cached in session variables.

      +

      Table of contents

      +
    +
+
+
    +

  • Variables

    • +
      +
    • error

      • +
    • debug

      • +
    • debug_http

      • +
    • exit

      • +
    • debug_output

      • +
    • debug_prefix

      • +
    • server

      • +
    • request_token_url

      • +
    • dialog_url

      • +
    • offline_dialog_url

      • +
    • append_state_to_redirect_uri

      • +
    • access_token_url

      • +
    • oauth_version

      • +
    • url_parameters

      • +
    • authorization_header

      • +
    • token_request_method

      • +
    • signature_method

      • +
    • redirect_uri

      • +
    • client_id

      • +
    • client_secret

      • +
    • scope

      • +
    • offline

      • +
    • access_token

      • +
    • access_token_secret

      • +
    • access_token_expiry

      • +
    • access_token_type

      • +
    • refresh_token

      • +
    • access_token_error

      • +
    • authorization_error

      • +
    • response_status

      • +

      Table of contents

      +

    • error

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Store the message that is returned when an error occurs.

      +

      Usage

      +

      Check this variable to understand what happened when a call to any of the class functions has failed.

      +

      This class uses cumulative error handling. This means that if one class functions that may fail is called and this variable was already set to an error message due to a failure in a previous call to the same or other function, the function will also fail and does not do anything.

      +

      This allows programs using this class to safely call several functions that may fail and only check the failure condition after the last function call.

      +

      Just set this variable to an empty string to clear the error condition.

      +

      Variables

      +

    • debug

      • +

      Type

      +

      bool

      +

      Default value

      +

      0

      +

      Purpose

      +

      Control whether debug output is enabled

      +

      Usage

      +

      Set this variable to 1 if you need to check what is going on during calls to the class. When enabled, the debug output goes either to the variable debug_output and the PHP error log.

      +

      Variables

      +

    • debug_http

      • +

      Type

      +

      bool

      +

      Default value

      +

      0

      +

      Purpose

      +

      Control whether the dialog with the remote Web server should also be logged.

      +

      Usage

      +

      Set this variable to 1 if you want to inspect the data exchange with the OAuth server.

      +

      Variables

      +

    • exit

      • +

      Type

      +

      bool

      +

      Default value

      +

      0

      +

      Purpose

      +

      Determine if the current script should be exited.

      +

      Usage

      +

      Check this variable after calling the Process function and exit your script immediately if the variable is set to 1.

      +

      Variables

      +

    • debug_output

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Capture the debug output generated by the class

      +

      Usage

      +

      Inspect this variable if you need to see what happened during the class function calls.

      +

      Variables

      +

    • debug_prefix

      • +

      Type

      +

      string

      +

      Default value

      +

      'OAuth client: '

      +

      Purpose

      +

      Mark the lines of the debug output to identify actions performed by this class.

      +

      Usage

      +

      Change this variable if you prefer the debug output lines to be prefixed with a different text.

      +

      Variables

      +

    • server

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Identify the type of OAuth server to access.

      +

      Usage

      +

      The class provides built-in support to several types of OAuth servers. This means that the class can automatically initialize several configuration variables just by setting this server variable.

      +

      Currently it supports the following servers: 'Bitbucket', 'Box', 'Dropbox', 'Eventful', 'Facebook', 'Fitbit', 'Flickr', 'Foursquare', 'github', 'Google', 'Instagram', 'LinkedIn', 'Microsoft', 'Scoop.it', 'StockTwits', 'Tumblr', 'Twitter', 'XING' and 'Yahoo'. Please contact the author if you would like to ask to add built-in support for other types of OAuth servers.

      +

      If you want to access other types of OAuth servers that are not yet supported, set this variable to an empty string and configure other variables with values specific to those servers.

      +

      Variables

      +

    • request_token_url

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      URL of the OAuth server to request the initial token for OAuth 1.0 and 1.0a servers.

      +

      Usage

      +

      Set this variable to the OAuth request token URL when you are not accessing one of the built-in supported OAuth servers.

      +

      For OAuth 1.0 and 1.0a servers, the request token URL can have certain marks that will act as template placeholders which will be replaced with given values before requesting the authorization token. Currently it supports the following placeholder marks:

      +

      {SCOPE} - scope of the requested permissions to the granted by the OAuth server with the user permissions

      +

      Variables

      +

    • dialog_url

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      URL of the OAuth server to redirect the browser so the user can grant access to your application.

      +

      Usage

      +

      Set this variable to the OAuth request token URL when you are not accessing one of the built-in supported OAuth servers.

      +

      For certain servers, the dialog URL can have certain marks that will act as template placeholders which will be replaced with values defined before redirecting the users browser. Currently it supports the following placeholder marks:

      +

      {REDIRECT_URI} - URL to redirect when returning from the OAuth server authorization page

      +

      {CLIENT_ID} - client application identifier registered at the server

      +

      {SCOPE} - scope of the requested permissions to the granted by the OAuth server with the user permissions

      +

      {STATE} - identifier of the OAuth session state

      +

      Variables

      +

    • offline_dialog_url

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      URL of the OAuth server to redirect the browser so the user can grant access to your application when offline access is requested.

      +

      Usage

      +

      Set this variable to the OAuth request token URL when you are not accessing one of the built-in supported OAuth servers and the OAuth server supports offline access.

      +

      It should have the same format as the dialog_url variable.

      +

      Variables

      +

    • append_state_to_redirect_uri

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Pass the OAuth session state in a variable with a different name to work around implementation bugs of certain OAuth servers

      +

      Usage

      +

      Set this variable when you are not accessing one of the built-in supported OAuth servers if the OAuth server has a bug that makes it not pass back the OAuth state identifier in a request variable named state.

      +

      Variables

      +

    • access_token_url

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      OAuth server URL that will return the access token URL.

      +

      Usage

      +

      Set this variable to the OAuth access token URL when you are not accessing one of the built-in supported OAuth servers.

      +

      Variables

      +

    • oauth_version

      • +

      Type

      +

      string

      +

      Default value

      +

      '2.0'

      +

      Purpose

      +

      Version of the protocol version supported by the OAuth server.

      +

      Usage

      +

      Set this variable to the OAuth server protocol version when you are not accessing one of the built-in supported OAuth servers.

      +

      Variables

      +

    • url_parameters

      • +

      Type

      +

      bool

      +

      Default value

      +

      0

      +

      Purpose

      +

      Determine if the API call parameters should be moved to the call URL.

      +

      Usage

      +

      Set this variable to 1 if the API you need to call requires that the call parameters always be passed via the API URL.

      +

      Variables

      +

    • authorization_header

      • +

      Type

      +

      bool

      +

      Default value

      +

      1

      +

      Purpose

      +

      Determine if the OAuth parameters should be passed via HTTP Authorization request header.

      +

      Usage

      +

      Set this variable to 1 if the OAuth server requires that the OAuth parameters be passed using the HTTP Authorization instead of the request URI parameters.

      +

      Variables

      +

    • token_request_method

      • +

      Type

      +

      string

      +

      Default value

      +

      'GET'

      +

      Purpose

      +

      Define the HTTP method that should be used to request tokens from the server.

      +

      Usage

      +

      Set this variable to 'POST' if the OAuth server does not support requesting tokens using the HTTP GET method.

      +

      Variables

      +

    • signature_method

      • +

      Type

      +

      string

      +

      Default value

      +

      'HMAC-SHA1'

      +

      Purpose

      +

      Define the method to generate the signature for API request parameters values.

      +

      Usage

      +

      Currently it supports 'PLAINTEXT' and 'HMAC-SHA1'.

      +

      Variables

      +

    • redirect_uri

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      URL of the current script page that is calling this class

      +

      Usage

      +

      Set this variable to the current script page URL before proceeding the the OAuth authorization process.

      +

      Variables

      +

    • client_id

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Identifier of your application registered with the OAuth server

      +

      Usage

      +

      Set this variable to the application identifier that is provided by the OAuth server when you register the application.

      +

      Variables

      +

    • client_secret

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Secret value assigned to your application when it is registered with the OAuth server.

      +

      Usage

      +

      Set this variable to the application secret that is provided by the OAuth server when you register the application.

      +

      Variables

      +

    • scope

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Permissions that your application needs to call the OAuth server APIs

      +

      Usage

      +

      Check the documentation of the APIs that your application needs to call to set this variable with the identifiers of the permissions that the user needs to grant to your application.

      +

      Variables

      +

    • offline

      • +

      Type

      +

      bool

      +

      Default value

      +

      0

      +

      Purpose

      +

      Specify whether it will be necessary to call the API when the user is not present and the server supports renewing expired access tokens using refresh tokens.

      +

      Usage

      +

      Set this variable to 1 if the server supports renewing expired tokens automatically when the user is not present.

      +

      Variables

      +

    • access_token

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Access token obtained from the OAuth server

      +

      Usage

      +

      Check this variable to get the obtained access token upon successful OAuth authorization.

      +

      Variables

      +

    • access_token_secret

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Access token secret obtained from the OAuth server

      +

      Usage

      +

      If the OAuth protocol version is 1.0 or 1.0a, check this variable to get the obtained access token secret upon successful OAuth authorization.

      +

      Variables

      +

    • access_token_expiry

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Timestamp of the expiry of the access token obtained from the OAuth server.

      +

      Usage

      +

      Check this variable to get the obtained access token expiry time upon successful OAuth authorization. If this variable is empty, that means no expiry time was set.

      +

      Variables

      +

    • access_token_type

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Type of access token obtained from the OAuth server.

      +

      Usage

      +

      Check this variable to get the obtained access token type upon successful OAuth authorization.

      +

      Variables

      +

    • refresh_token

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Refresh token obtained from the OAuth server

      +

      Usage

      +

      Check this variable to get the obtained refresh token upon successful OAuth authorization.

      +

      Variables

      +

    • access_token_error

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Error message returned when a call to the API fails.

      +

      Usage

      +

      Check this variable to determine if there was an error while calling the Web services API when using the CallAPI function.

      +

      Variables

      +

    • authorization_error

      • +

      Type

      +

      string

      +

      Default value

      +

      ''

      +

      Purpose

      +

      Error message returned when it was not possible to obtain an OAuth access token

      +

      Usage

      +

      Check this variable to determine if there was an error while trying to obtain the OAuth access token.

      +

      Variables

      +

    • response_status

      • +

      Type

      +

      int

      +

      Default value

      +

      0

      +

      Purpose

      +

      HTTP response status returned by the server when calling an API

      +

      Usage

      +

      Check this variable after calling the CallAPI function if the API calls and you need to process the error depending the response status. 200 means no error. 0 means the server response was not retrieved.

      +

      Variables

      +

      Table of contents

      +
    +
+
+
    +

  • Functions

    • +
      +
    • StoreAccessToken

      • +
    • GetAccessToken

      • +
    • ResetAccessToken

      • +
    • CallAPI

      • +
    • Initialize

      • +
    • Process

      • +
    • Finalize

      • +
    • Output

      • +

      Table of contents

      +

    • StoreAccessToken

      • +

      Synopsis

      +

      bool StoreAccessToken(

      +)

      +

      Purpose

      +

      Store the values of the access token when it is succefully retrieved from the OAuth server.

      +

      Usage

      +

      This function is meant to be only be called from inside the class. By default it stores access tokens in a session variable named 'OAUTH_ACCESS_TOKEN'.

      +

      Actual implementations should create a sub-class and override this function to make the access token values be stored in other types of containers, like for instance databases.

      +

      Arguments

      +
        +

        access_token - Associative array with properties of the access token. The array may have set the following properties:

        +

        'value': string value of the access token

        +

        'authorized': boolean value that determines if the access token was obtained successfully

        +

        'expiry': (optional) timestamp in ISO format relative to UTC time zone of the access token expiry time

        +

        'type': (optional) type of OAuth token that may determine how it should be used when sending API call requests.

        +

        'refresh': (optional) token that some servers may set to allowing refreshing access tokens when they expire.

        +
      +

      Return value

      +

      This function should return 1 if the access token was stored successfully.

      +

      Functions

      +

    • GetAccessToken

      • +

      Synopsis

      +

      bool GetAccessToken(

      +)

      +

      Purpose

      +

      Retrieve the OAuth access token if it was already previously stored by the StoreAccessToken function.

      +

      Usage

      +

      This function is meant to be only be called from inside the class. By default it retrieves access tokens stored in a session variable named 'OAUTH_ACCESS_TOKEN'.

      +

      Actual implementations should create a sub-class and override this function to retrieve the access token values from other types of containers, like for instance databases.

      +

      Arguments

      +
        +

        access_token - Return the properties of the access token in an associative array. If the access token was not yet stored, it returns an empty array. Otherwise, the properties it may return are the same that may be passed to the StoreAccessToken.

        +
      +

      Return value

      +

      This function should return 1 if the access token was retrieved successfully.

      +

      Functions

      +

    • ResetAccessToken

      • +

      Synopsis

      +

      bool ResetAccessToken()

      +

      Purpose

      +

      Reset the access token to a state back when the user has not yet authorized the access to the OAuth server API.

      +

      Usage

      +

      Call this function if for some reason the token to access the API was revoked and you need to ask the user to authorize the access again.

      +

      By default the class stores and retrieves access tokens in a session variable named 'OAUTH_ACCESS_TOKEN'.

      +

      This function must be called when the user is accessing your site pages, so it can reset the information stored in session variables that cache the state of a previously retrieved access token.

      +

      Actual implementations should create a sub-class and override this function to reset the access token state when it is stored in other types of containers, like for instance databases.

      +

      Return value

      +

      This function should return 1 if the access token was resetted successfully.

      +

      Functions

      +

    • CallAPI

      • +

      Synopsis

      +

      bool CallAPI(

      +)

      +

      Purpose

      +

      Send a HTTP request to the Web services API using a previously obtained authorization token via OAuth.

      +

      Usage

      +

      This function can be used to call an API after having previously obtained an access token through the OAuth protocol using the Process function, or by directly setting the variables access_token, as well as access_token_secret in case of using OAuth 1.0 or 1.0a services.

      +

      Arguments

      +
        +

        url - URL of the API where the HTTP request will be sent.

        +

        method - HTTP method that will be used to send the request. It can be 'GET', 'POST', 'DELETE', 'PUT', etc..

        +

        parameters - Associative array with the names and values of the API call request parameters.

        +

        options - Associative array with additional options to configure the request. Currently it supports the following options:

        +

        '2Legged': boolean option that determines if the API request should be 2 legged. The default value is 0.

        +

        'Accept': content type value of the Accept HTTP header to be sent in the API call HTTP request. Some APIs require that a certain value be sent to specify which version of the API is being called. The default value is '*/*'.

        +

        'ConvertObjects': boolean option that determines if objects should be converted into arrays when the response is returned in JSON format. The default value is 0.

        +

        'FailOnAccessError': boolean option that determines if this functions should fail when the server response status is not between 200 and 299. The default value is 0.

        +

        'Files': associative array with details of the parameters that must be passed as file uploads. The array indexes must have the same name of the parameters to be sent as files. The respective array entry values must also be associative arrays with the parameters for each file. Currently it supports the following parameters:

        +

        - Type - defines how the parameter value should be treated. It can be 'FileName' if the parameter value is is the name of a local file to be uploaded. It may also be 'Data' if the parameter value is the actual data of the file to be uploaded.

        +

        - Default: 'FileName'

        +

        - ContentType - MIME value of the content type of the file. It can be 'automatic/name' if the content type should be determine from the file name extension.

        +

        - Default: 'automatic/name'

        +

        'PostValuesInURI': boolean option to determine that a POST request should pass the request values in the URI. The default value is 0.

        +

        'FollowRedirection': limit number of times that HTTP response redirects will be followed. If it is set to 0, redirection responses fail in error. The default value is 0.

        +

        'RequestBody': request body data of a custom type. The 'RequestContentType' option must be specified, so the 'RequestBody' option is considered.

        +

        'RequestContentType': content type that should be used to send the request values. It can be either 'application/x-www-form-urlencoded' for sending values like from Web forms, or 'application/json' for sending the values encoded in JSON format. Other types are accepted if the 'RequestBody' option is specified. The default value is 'application/x-www-form-urlencoded'.

        +

        'RequestBody': request body data of a custom type. The 'RequestContentType' option must be specified, so the 'RequestBody' option is considered.

        +

        'Resource': string with a label that will be used in the error messages and debug log entries to identify what operation the request is performing. The default value is 'API call'.

        +

        'ResponseContentType': content type that should be considered when decoding the API request response. This overrides the Content-Type header returned by the server. If the content type is 'application/x-www-form-urlencoded' the function will parse the data returning an array of key-value pairs. If the content type is 'application/json' the response will be decode as a JSON-encoded data type. Other content type values will make the function return the original response value as it was returned from the server. The default value for this option is to use what the server returned in the Content-Type header.

        +

        response - Return the value of the API response. If the value is JSON encoded, this function will decode it and return the value converted to respective types. If the value is form encoded, this function will decode the response and return it as an array. Otherwise, the class will return the value as a string.

        +
      +

      Return value

      +

      This function returns 1 if the call was done successfully.

      +

      Functions

      +

    • Initialize

      • +

      Synopsis

      +

      bool Initialize()

      +

      Purpose

      +

      Initialize the class variables and internal state. It must be called before calling other class functions.

      +

      Usage

      +

      Set the server variable before calling this function to let it initialize the class variables to work with the specified server type. Alternatively, you can set other class variables manually to make it work with servers that are not yet built-in supported.

      +

      Return value

      +

      This function returns 1 if it was able to successfully initialize the class for the specified server type.

      +

      Functions

      +

    • Process

      • +

      Synopsis

      +

      bool Process()

      +

      Purpose

      +

      Process the OAuth protocol interaction with the OAuth server.

      +

      Usage

      +

      Call this function when you need to retrieve the OAuth access token. Check the access_token to determine if the access token was obtained successfully.

      +

      Return value

      +

      This function returns 1 if the OAuth protocol was processed without errors.

      +

      Functions

      +

    • Finalize

      • +

      Synopsis

      +

      bool Finalize(

      +)

      +

      Purpose

      +

      Cleanup any resources that may have been used during the OAuth protocol processing or execution of API calls.

      +

      Usage

      +

      Always call this function as the last step after calling the functions Process or CallAPI.

      +

      Arguments

      +
        +

        success - Pass the last success state returned by the class or any external code processing the class function results.

        +
      +

      Return value

      +

      This function returns 1 if the function cleaned up any resources successfully.

      +

      Functions

      +

    • Output

      • +

      Synopsis

      +

      Output()

      +

      Purpose

      +

      Display the results of the OAuth protocol processing.

      +

      Usage

      +

      Only call this function if you are debugging the OAuth authorization process and you need to view what was its results.

      +

      Functions

      +

      Table of contents

      +
    +
+ +
+
Manuel Lemos (mlemos-at-acm.org)
+ + From 4d91b6e6d243eacb12faffb4d4ce2a3eec85f820 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 15 Sep 2014 22:53:33 -0700 Subject: [PATCH 48/94] fat finger - must have been here a while --- mod/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index 836b12281..9a35a8de8 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -768,7 +768,7 @@ function admin_page_channels_post(&$a){ ); proc_run('php','include/directory.php',$uid,'nopush'); } - notice( sprintf( tt("%s channel censored/uncensored", "%s channelss censored/uncensored", count($channels)), count($channels)) ); + notice( sprintf( tt("%s channel censored/uncensored", "%s channels censored/uncensored", count($channels)), count($channels)) ); } if (x($_POST,'page_channels_delete')){ require_once("include/Contact.php"); From b2f2424b5272f7c58343fe810f303b55f1b7bf5e Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 15 Sep 2014 23:11:08 -0700 Subject: [PATCH 49/94] push individual block to directory --- mod/admin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/admin.php b/mod/admin.php index 9a35a8de8..68ce6fe85 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -814,6 +814,7 @@ function admin_page_channels(&$a){ intval(PAGE_CENSORED), intval( $uid ) ); + proc_run('php','include/directory.php',$uid,'nopush'); notice( sprintf( (($channel[0]['channel_pageflags'] & PAGE_CENSORED) ? t("Channel '%s' uncensored"): t("Channel '%s' censored")) , $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')' ) . EOL); }; break; From a1b66f56f0981a0853f180a458c401a80dda28ce Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 16 Sep 2014 03:33:48 -0700 Subject: [PATCH 50/94] use the more portable encoded_item format for exported items - but with added attributes so we can use it as a reasonably complete item backup. The encoded_item format gives us extended author and owner information in case we need to probe them to bring the entry back. It also contains taxonomy entries. Importing and/or recovering will best be accomplished in chunks. It could take some time and some memory to chew through this. --- include/identity.php | 18 ++++++------------ include/items.php | 28 +++++++++++++++++++++++++--- version.inc | 2 +- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/include/identity.php b/include/identity.php index 1078ff082..2039738e0 100644 --- a/include/identity.php +++ b/include/identity.php @@ -489,18 +489,12 @@ function identity_basic_export($channel_id, $items = false) { intval($channel_id) ); if($r) { - for($x = 0; $x < count($r); $x ++) { - if($r[$x]['diaspora_meta']) - $r[$x]['diaspora_meta'] = crypto_unencapsulate(json_decode($r[$x]['diaspora_meta'],true),$key); - if($r[$x]['item_flags'] & ITEM_OBSCURED) { - $r[$x]['item_flags'] = $r[$x]['item_flags'] ^ ITEM_OBSCURED; - if($r[$x]['title']) - $r[$x]['title'] = crypto_unencapsulate(json_decode($r[$x]['title'],true),$key); - if($r[$x]['body']) - $r[$x]['body'] = crypto_unencapsulate(json_decode($r[$x]['body'],true),$key); - } - } - $ret['item'] = $r; + $ret['item'] = array(); + xchan_query($r); + $r = fetch_post_tags($r,true); + foreach($r as $rr) + $ret['item'][] = encode_item($rr,true); + } return $ret; diff --git a/include/items.php b/include/items.php index beec65d8a..1fa833eb2 100755 --- a/include/items.php +++ b/include/items.php @@ -1007,8 +1007,7 @@ function import_author_unknown($x) { } - -function encode_item($item) { +function encode_item($item,$mirror = false) { $x = array(); $x['type'] = 'activity'; $x['encoding'] = 'zot'; @@ -1030,14 +1029,37 @@ function encode_item($item) { $c_scope = map_scope($comment_scope); + $key = get_config('system','prvkey'); + if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) { - $key = get_config('system','prvkey'); if($item['title']) $item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key); if($item['body']) $item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key); } + // If we're trying to backup an item so that it's recoverable or for export/imprt, + // add all the attributes we need to recover it + + if($mirror) { + $x['id'] = $item['id']; + $x['parent'] = $item['parent']; + $x['uid'] = $item['uid']; + $x['allow_cid'] = $item['allow_cid']; + $x['allow_gid'] = $item['allow_gid']; + $x['deny_cid'] = $item['deny_cid']; + $x['deny_gid'] = $item['deny_gid']; + $x['revision'] = $item['revision']; + $x['layout_mid'] = $item['layout_mid']; + $x['postopts'] = $item['postopts']; + $x['resource_id'] = $item['resource_id']; + $x['resource_type'] = $item['resource_type']; + $x['item_restrict'] = $item['item_restrict']; + $x['item_flags'] = $item['item_flags']; + $x['diaspora_meta'] = crypto_unencapsulate(json_decode($item['diaspora_meta'],true),$key); + $x['attach'] = $item['attach']; + } + $x['message_id'] = $item['mid']; $x['message_top'] = $item['parent_mid']; diff --git a/version.inc b/version.inc index c3d994d3e..973190772 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-15.799 +2014-09-16.800 From 6a82ccecd08e84dff0f4e3198693823d7019c6d2 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 16 Sep 2014 05:14:06 -0700 Subject: [PATCH 51/94] when importing channels - use the new location notification message to tell your original site where it sits in terms of primary. --- mod/import.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/mod/import.php b/mod/import.php index 0663a8b57..2fbb71fc4 100644 --- a/mod/import.php +++ b/mod/import.php @@ -379,21 +379,17 @@ function import_post(&$a) { //FIXME just a note here for when folks want to import content - be very careful to unset ITEM_ORIGIN on all imported content. Or you could end up with a nasty routing loop when somebody tries to reply to one of those posts. - - - // FIXME - ensure we have a self entry if somebody is trying to pull a fast one - if($seize) { - // notify old server that it is no longer primary. - - } + // send out refresh requests + // notify old server that it may no longer be primary. + + proc_run('php','include/notifier.php','location',$channel['channel_id']); // This will indirectly perform a refresh_all *and* update the directory proc_run('php', 'include/directory.php', $channel['channel_id']); - // send out refresh requests notice( t('Import completed.') . EOL); @@ -401,7 +397,6 @@ function import_post(&$a) { goaway(z_root() . '/network' ); - } From b5bb2230ebd9648e30c79efed6ffe672a2ae19bf Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 16 Sep 2014 14:18:03 +0200 Subject: [PATCH 52/94] this still has less issues --- view/js/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/js/main.js b/view/js/main.js index d6b405258..2e297c9d6 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1114,7 +1114,7 @@ $(window).scroll(function () { $('#more').show(); } - if($(window).scrollTop() + $(window).height() == $(document).height()) { + if($(window).scrollTop() + $(window).height() > $(document).height() - 100) { if((pageHasMoreContent) && (! loadingPage)) { $('#more').hide(); $('#no-more').hide(); @@ -1134,7 +1134,7 @@ $(window).scroll(function () { $('#more').show(); } - if($(window).scrollTop() + $(window).height() == $(document).height()) { + if($(window).scrollTop() + $(window).height() > $(document).height() - 100) { if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { $('#more').hide(); $('#no-more').hide(); From 5bdfc2f64780abd36d889dc0bbe52026b768631b Mon Sep 17 00:00:00 2001 From: Alexandre Hannud Abdo Date: Tue, 16 Sep 2014 18:56:34 -0300 Subject: [PATCH 53/94] Fix name attribute of button elements so jquery '.submit()' doesn't break According to "Additional notes" in: http://api.jquery.com/submit/ Not fixing buttons created with 'input' tags. --- view/tpl/comment_item.tpl | 2 +- view/tpl/jot.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 351cc8e14..e68314797 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -58,7 +58,7 @@ {{/if}} - +
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index c4fdba0f5..c51dc02a5 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -85,7 +85,7 @@ {{/if}} - +
From c4608d4c827881b0f0fa5e2031de3fbd5b0568d7 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 16 Sep 2014 19:07:19 -0700 Subject: [PATCH 54/94] just mark dead hubloc deleted - don't remove them. This could cause problems. Also clean up fetch_url/post_url header option --- include/network.php | 15 ++++----------- include/photos.php | 1 + include/zot.php | 6 ++++-- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/include/network.php b/include/network.php index 0191f203d..e84ea91f4 100644 --- a/include/network.php +++ b/include/network.php @@ -38,6 +38,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { return false; @curl_setopt($ch, CURLOPT_HEADER, true); + @curl_setopt($ch, CURLINFO_HEADER_OUT, true); @curl_setopt($ch, CURLOPT_CAINFO, get_capath()); @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); @curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); @@ -47,11 +48,8 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { if($ciphers) @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); - if (x($opts,'accept_content')){ - @curl_setopt($ch,CURLOPT_HTTPHEADER, array ( - "Accept: " . $opts['accept_content'] - )); - } + if(x($opts,'headers')) + @curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']); if(x($opts,'timeout') && intval($opts['timeout'])) { @curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']); @@ -166,6 +164,7 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) { return ret; @curl_setopt($ch, CURLOPT_HEADER, true); + @curl_setopt($ch, CURLINFO_HEADER_OUT, true); @curl_setopt($ch, CURLOPT_CAINFO, get_capath()); @curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); @curl_setopt($ch, CURLOPT_POST,1); @@ -176,12 +175,6 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) { if($ciphers) @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); - - if (x($opts,'accept_content')){ - @curl_setopt($ch,CURLOPT_HTTPHEADER, array ( - "Accept: " . $opts['accept_content'] - )); - } if(x($opts,'headers')) @curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']); diff --git a/include/photos.php b/include/photos.php index 06a99457a..badbbd791 100644 --- a/include/photos.php +++ b/include/photos.php @@ -266,6 +266,7 @@ function photo_upload($channel, $observer, $args) { proc_run('php', "include/notifier.php", 'wall-new', $item_id); $ret['success'] = true; + $ret['item'] = $arr; $ret['body'] = $arr['body']; $ret['resource_id'] = $photo_hash; $ret['photoitem_id'] = $item_id; diff --git a/include/zot.php b/include/zot.php index add44e288..b7ffe14e4 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1844,8 +1844,10 @@ function sync_locations($sender,$arr,$absolute = false) { if($absolute && $xisting) { foreach($xisting as $x) { if(! array_key_exists('updated',$x)) { - logger('sync_locations: removing unreferenced hub location ' . $x['hubloc_url']); - $r = q("delete from hubloc where hubloc_id = %d limit 1", + logger('sync_locations: deleting unreferenced hub location ' . $x['hubloc_url']); + $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($x['hubloc_id']) ); $what .= 'removed_hub'; From 53d0e855dfaeccfebd55d0b3c91cf040b2e317a4 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 16 Sep 2014 20:46:44 -0700 Subject: [PATCH 55/94] z_post_url_json() added to easily deal with JSON post APIs; without getting content-type unknown warnings/errors. Also added a debug option to z_get|post_url so you could track and log some of these nasty little buggers. --- include/network.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/network.php b/include/network.php index e84ea91f4..7286f0b12 100644 --- a/include/network.php +++ b/include/network.php @@ -124,6 +124,10 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { } $ret['body'] = substr($s,strlen($header)); $ret['header'] = $header; + + if(x($opts,'debug')) { + $ret['debug'] = $curl_info; + } @curl_close($ch); return($ret); @@ -251,11 +255,24 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) { $ret['body'] = substr($s,strlen($header)); $ret['header'] = $header; + + if(x($opts,'debug')) { + $ret['debug'] = $curl_info; + } + + curl_close($ch); return($ret); } +function z_post_url_json($url,$params,$redirects = 0, $opts = array()) { + + $opts = array_merge($opts,array('headers' => array('Content-Type: application/json'))); + return z_post_url($url,json_encode($params),$redirects,$opts); + +} + function json_return_and_die($x) { header("content-type: application/json"); From 19e8d10b7a877618c9a2b97bf6be9fb2e80a4ea4 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 16 Sep 2014 21:08:34 -0700 Subject: [PATCH 56/94] still some old Friendica database queries in diaspora_signed_retraction --- include/diaspora.php | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index ea3c78bfe..3b6321643 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2043,35 +2043,33 @@ function diaspora_signed_retraction($importer,$xml,$msg) { } if($type === 'StatusMessage' || $type === 'Comment' || $type === 'Like') { - $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, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' where `id` = %d", - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($r[0]['id']) - ); + if($r) { + if($r[0]['author_xchan'] == $contact['xchan_hash']) { + + drop_item($r[0]['id'],false, DROPITEM_PHASE1); // Now check if the retraction needs to be relayed by us // // The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always // return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent. // The only item with `parent` and `id` as the parent id is the parent item. - $p = q("select origin from item where parent = %d and id = %d limit 1", + $p = q("select item_flags from item where parent = %d and id = %d limit 1", $r[0]['parent'], $r[0]['parent'] ); - if(count($p)) { - if(($p[0]['origin']) && (! $parent_author_signature)) { - q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", - $r[0]['id'], - dbesc($signed_data), - dbesc($sig), - dbesc($diaspora_handle) - ); + if($p) { + if(($p[0]['item_flags'] & ITEM_ORIGIN) && (! $parent_author_signature)) { +// FIXME so we can relay this +// q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", +// $r[0]['id'], +// dbesc($signed_data), +// dbesc($sig), +// dbesc($diaspora_handle) +// ); // the existence of parent_author_signature would have meant the parent_author or owner // is already relaying. From 0090cbf84b6679a72ac164dfb86a701ed0faa601 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 16 Sep 2014 22:26:52 -0700 Subject: [PATCH 57/94] that's why bb2diaspora_itemwallwall() wasn't doing its thang. --- include/bb2diaspora.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 846725639..e60f72add 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -269,12 +269,12 @@ function bb2diaspora_itemwallwall(&$item) { 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']) { + if(($item['mid'] == $item['parent_mid']) && ($item['author_xchan'] != $item['owner_xchan']) && (is_array($item['author'])) && $item['author']['xchan_url'] && $item['author']['xchan_name'] && $item['author']['xchan_photo_m']) { 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" - . '[img]' . $item['author']['photo']['src'] . '[/img]' - . '[url=' . $item['author']['url'] . ']' . $item['author']['name'] . '[/url]' . "\n\n" + . '[img]' . $item['author']['xchan_photo_m'] . '[/img]' + . '[url=' . $item['author']['xchan_url'] . ']' . $item['author']['xchan_name'] . '[/url]' . "\n\n" . $item['body']; } } From cd790447782c0a7deba56209afc2e6352e004743 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 16 Sep 2014 23:12:50 -0700 Subject: [PATCH 58/94] no sense maintaining 2 to-do files. I think the one I'm removing is referenced online somewhere - which is why it wasn't done earlier. Can't find it, so just note that somebody will complain and we'll have to edit the pointer someday. --- doc/To-Do-Code.md | 60 ----------------------------------------------- doc/To-Do.md | 23 ------------------ 2 files changed, 83 deletions(-) delete mode 100644 doc/To-Do-Code.md delete mode 100644 doc/To-Do.md diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md deleted file mode 100644 index bdbbc6cdf..000000000 --- a/doc/To-Do-Code.md +++ /dev/null @@ -1,60 +0,0 @@ -Project Code To-Do List -======================= - -We need much more than this, but here are areas where developers can help. Please edit this page when items are finished. Another place for developers to start is with the issues list. - -* Documentation - see [Red Documentation Project To-Do List](help/To-Do) - -* Finish the anti-spam bayesian engine - -* Integrate the "open site" list with the register page - -* implement oembed provider interface - -* implement openid server interface - -* Write more webpage layouts - -* Write more webpage widgets - -* (Advanced) create a UI for building Comanche pages - -* External post connectors - create standard interface - -* External post connectors, add popular services - -* templatise and translate the Web interface to webDAV - -* Extend WebDAV to provide desktop access to photo albums - -* service classes - provide a pluggable subscription payment gateway for premium accounts - -* service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels. - -* Events module - fix permissions on events, and provide JS translation support for the calendar overview; integrate with calDAV - -* Events module - event followups and RSVP - - -* Uploads - integrate https://github.com/blueimp/jQuery-File-Upload - -* App taxonomy - -* replace the tinymce visual editor and/or make the visual editor pluggable and responsive to different output formats. We probably want library/bbedit for bbcode. This needs a fair bit of work to catch up with our "enhanced bbcode", but start with images, links, bold and highlight and work from there. - -* Photos module - turn photos into normal conversations and fix tagging - -* Provide RSS feed support which look like channels (in matrix only - copyright issues) - -* Create mobile clients for the top platforms - which involves extending the API so that we can do stuff far beyond the current crop of Twitter/Statusnet clients. Ditto for mobile themes. We can probably use something like the Friendica Android app as a base to start from. - -* Implement owned and exchangeable "things". - -* Family Account creation - using service classes (an account holder can create a certain number of sub-accounts which are all tied to their subscription - if the subscription lapses they all go away). - -* Put mod_admin under Comanche - -In many cases some of the work has already been started and code exists so that you needn't start from scratch. Please contact one of the developer channels like Channel One (one@zothub.com) before embarking and we can tell you what we already have and provide some insights on how we envision these features fitting together. - - - \ No newline at end of file diff --git a/doc/To-Do.md b/doc/To-Do.md deleted file mode 100644 index 76b78b6ac..000000000 --- a/doc/To-Do.md +++ /dev/null @@ -1,23 +0,0 @@ -Documentation we need to write -============================== - - -* Database schema detailed descriptions - -* Complete plugin hook documentation - -* API documentation - -* Function and code documentation (doxygen) - -* New Member guide - -* "Extra Feature" reference, description of each - -* Detailed Personal Settings Documentation - -* Administration Guide (post-install) - -* Administration Guide (pre-install) - - From 401409357238183702c1628a02ccef6cf0394d72 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Sep 2014 17:59:46 -0700 Subject: [PATCH 59/94] implement permission roles - the backend should be done except for maybe a couple of small tweaks. Now we just need to define the rest of the roles and create a chooser for them. Adam started on this some time back but I don't know where that has gone. --- doc/to_do_code.bb | 16 +++++++++++ include/follow.php | 13 +++++++++ include/identity.php | 61 +++++++++++++++++++++++++++++++++++------ include/permissions.php | 11 +++++--- mod/connedit.php | 22 +++++++++++++++ version.inc | 2 +- view/js/mod_connedit.js | 13 +++++++-- 7 files changed, 122 insertions(+), 16 deletions(-) diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb index 91997a284..0005b4be3 100644 --- a/doc/to_do_code.bb +++ b/doc/to_do_code.bb @@ -4,6 +4,8 @@ We need much more than this, but here are areas where developers can help. Pleas [li]Documentation - see Red Documentation Project To-Do List[/li] +[li]Include TOS link in registration/verification email[/li] + [li]Finish the anti-spam bayesian engine[/li] [li]If DAV folders exist, add an option to the Settings page to set a default folder for attachment uploads.[/li] @@ -38,8 +40,22 @@ We need much more than this, but here are areas where developers can help. Pleas [li]Uploads - integrate #^[url=https://github.com/blueimp/jQuery-File-Upload]https://github.com/blueimp/jQuery-File-Upload[/url][/li] +[li]Import/export - include items, events, things, etc.[/li] + +[li]Import channel from Diaspora/Friendica[/li] + +[li]MediaGoblin photo "crosspost" connector[/li] + +[li]Create management page/UI for extensible profile fields[/li] + +[li]Create interface to include/exclude and re-order standard profile fields[/li] + +[li]Provide a mechanism to share page design elements in posts (just like apps)[/li] + [li]App taxonomy[/li] +[li]Customisable App collection pages[/li] + [li]replace the tinymce visual editor and/or make the visual editor pluggable and responsive to different output formats. We probably want library/bbedit for bbcode. This needs a fair bit of work to catch up with our "enhanced bbcode", but start with images, links, bold and highlight and work from there.[/li] [li]Photos module - turn photos into normal conversations and fix tagging[/li] diff --git a/include/follow.php b/include/follow.php index 18a9e66ea..3c1fcd890 100644 --- a/include/follow.php +++ b/include/follow.php @@ -63,6 +63,13 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $my_perms = PERMS_W_STREAM|PERMS_W_MAIL; + $role = get_pconfig($uid,'system','permissions_role'); + if($role) { + $x = get_role_perms($role); + if($x['perms_follow']) + $my_perms = $x['perms_follow']; + } + logger('follow: ' . $url . ' ' . print_r($j,true), LOGGER_DEBUG); @@ -153,6 +160,12 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $xchan_hash = $r[0]['xchan_hash']; $their_perms = 0; $my_perms = PERMS_W_STREAM|PERMS_W_MAIL; + $role = get_pconfig($uid,'system','permissions_role'); + if($role) { + $x = get_role_perms($role); + if($x['perms_follow']) + $my_perms = $x['perms_follow']; + } } } diff --git a/include/identity.php b/include/identity.php index 2039738e0..38e96ab71 100644 --- a/include/identity.php +++ b/include/identity.php @@ -215,13 +215,31 @@ function create_identity($arr) { if(array_key_exists('primary', $arr)) $primary = intval($arr['primary']); + $perms_sql = ''; - $defperms = site_default_perms(); - $global_perms = get_perms(); - foreach($defperms as $p => $v) { - $perms_keys .= ', ' . $global_perms[$p][0]; - $perms_vals .= ', ' . intval($v); + $role_permissions = null; + + if(array_key_exists('permissions_role',$arr) && $arr['permissions_role']) { + $role_permissions = get_role_perms($arr['permissions_role']); + if($role_permissions) { + foreach($role_permissions as $p => $v) { + if(strpos($p,'channel_') !== false) { + $perms_keys .= ', ' . $global_perms[$p][0]; + $perms_vals .= ', ' . intval($v); + } + if($p === 'directory_publish') + $publish = intval($v); + } + } + } + else { + $defperms = site_default_perms(); + $global_perms = get_perms(); + foreach($defperms as $p => $v) { + $perms_keys .= ', ' . $global_perms[$p][0]; + $perms_vals .= ', ' . intval($v); + } } $expire = get_config('system', 'default_expire_days'); @@ -322,25 +340,52 @@ function create_identity($arr) { dbesc($a->get_baseurl() . "/photo/profile/m/{$newuid}") ); - $r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_closeness, abook_created, abook_updated, abook_flags ) - values ( %d, %d, '%s', %d, '%s', '%s', %d ) ", + $myperms = 0; + if($role_permissions) { + $myperms = ((array_key_exists('perms_auto',$role_permissions) && $role_permissions['perms_auto']) ? intval($role_permissions['perms_accept']) : 0); + } + + $r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_closeness, abook_created, abook_updated, abook_flags, abook_my_perms ) + values ( %d, %d, '%s', %d, '%s', '%s', %d, %d ) ", intval($ret['channel']['channel_account_id']), intval($newuid), dbesc($hash), intval(0), dbesc(datetime_convert()), dbesc(datetime_convert()), - intval(ABOOK_FLAG_SELF) + intval(ABOOK_FLAG_SELF), + intval($myperms) ); if(intval($ret['channel']['channel_account_id'])) { + // Save our permissions role so we can perhaps call it up and modify it later. + + if($role_permissions) + set_pconfig($newuid,'system','permissions_role',$arr['permissions_role']); + // Create a group with no members. This allows somebody to use it // right away as a default group for new contacts. require_once('include/group.php'); group_add($newuid, t('Friends')); + // if our role_permissions indicate that we're using a default collection ACL, add it. + + if(is_array($role_permissions) && $role_permissions['default_collection']) { + $r = q("select hash from groups where uid = %d and name = '%s' limit 1", + intval($newuid), + dbesc( t('Friends') ) + ); + if($r) { + q("update channel set channel_allow_gid = '%s' where channel_id = %d limit 1", + dbesc('<' . $r[0]['hash'] . '>'), + intval($newuid) + ); + } + } + + call_hooks('register_account', $newuid); proc_run('php','include/directory.php', $ret['channel']['channel_id']); diff --git a/include/permissions.php b/include/permissions.php index 8e4676f51..70c682cfc 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -419,11 +419,12 @@ function site_default_perms() { * * Given a string for the channel role ('social','forum', etc) * return an array of all permission fields pre-filled for this role. - * This includes the channel permission scope indicators as well as - * perms_auto: The permissions to apply automatically on receipt of a connection request + * This includes the channel permission scope indicators (anything beginning with 'channel_') as well as + * perms_auto: true or false to create auto-permissions for this channel * perms_follow: The permissions to apply when initiating a connection request to another channel * perms_accept: The permissions to apply when accepting a connection request from another channel (not automatic) - * + * default_collection: true or false to make the default ACL include the channel's default collection + * directory_publish: true or false to publish this channel in the directory * Any attributes may be extended (new roles defined) and modified (specific permissions altered) by plugins * */ @@ -436,7 +437,9 @@ function get_role_perms($role) { switch($role) { case 'social': - $ret['perms_auto'] = 0; + $ret['perms_auto'] = false; + $ret['default_collection'] = false; + $ret['directory_publish'] = true; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; diff --git a/mod/connedit.php b/mod/connedit.php index b2de42343..7ad719738 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -255,6 +255,28 @@ function connedit_content(&$a) { return login(); } + $my_perms = 0; + $role = get_pconfig(local_user(),'system','permissions_role'); + if($role) { + $x = get_role_perms($role); + if($x['perms_accept']) + $my_perms = $x['perms_accept']; + } + if($my_perms) { + $o .= "\n"; + } + if(argc() == 3) { $contact_id = intval(argv(1)); diff --git a/version.inc b/version.inc index 973190772..1213afd33 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-16.800 +2014-09-17.801 diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js index 6231dbd0c..fabf24e95 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -6,11 +6,18 @@ function abook_perms_msg() { } $(document).ready(function() { - if(typeof(after_following) !== 'undefined' && after_following) - connectFullShare(); + if(typeof(after_following) !== 'undefined' && after_following) { + if(typeof(connectDefaultShare) !== 'undefined') + connectDefaultShare(); + else + connectFullShare(); + } $('#id_pending').click(function() { - connectFullShare(); + if(typeof(connectDefaultShare) !== 'undefined') + connectDefaultShare(); + else + connectFullShare(); }); $('.abook-edit-me').click(function() { From 618b93d42e54e0ecefb69d6e1acf24429d39785e Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Sep 2014 19:08:15 -0700 Subject: [PATCH 60/94] let the xchan diagnostic accept a webbie --- mod/xchan.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mod/xchan.php b/mod/xchan.php index e51cc53cc..a4dc70550 100644 --- a/mod/xchan.php +++ b/mod/xchan.php @@ -7,7 +7,7 @@ function xchan_content(&$a) { $o .= '

Xchan Lookup

'; $o .= '
'; - $o .= 'Lookup xchan beginning with: '; + $o .= 'Lookup xchan beginning with (or webbie): '; $o .= '
'; $o .= '

'; @@ -15,28 +15,28 @@ function xchan_content(&$a) { if(x($_GET,'addr')) { $addr = trim($_GET['addr']); - $r = q("select * from xchan where xchan_hash like '%s%%'", + $r = q("select * from xchan where xchan_hash like '%s%%' or xchan_addr = '%s' group by xchan_hash", + dbesc($addr), dbesc($addr) ); if($r) { - foreach($r as $rr) + foreach($r as $rr) { $o .= str_replace("\n","
",print_r($rr,true)) . EOL; + + $s = q("select * from hubloc where hubloc_hash like '%s'", + dbesc($r[0]['xchan_hash']) + ); + + if($s) { + foreach($s as $rr) + $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 02fa970569dfd190ffa390b556a67fe51e95121a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Sep 2014 19:14:23 -0700 Subject: [PATCH 61/94] make the output a bit more readable --- mod/xchan.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/xchan.php b/mod/xchan.php index a4dc70550..714603f6e 100644 --- a/mod/xchan.php +++ b/mod/xchan.php @@ -22,7 +22,7 @@ function xchan_content(&$a) { if($r) { foreach($r as $rr) { - $o .= str_replace("\n","
",print_r($rr,true)) . EOL; + $o .= str_replace(array("\n"," "),array("
"," "),print_r($rr,true)) . EOL; $s = q("select * from hubloc where hubloc_hash like '%s'", dbesc($r[0]['xchan_hash']) @@ -30,7 +30,7 @@ function xchan_content(&$a) { if($s) { foreach($s as $rr) - $o .= str_replace("\n","
",print_r($rr,true)) . EOL; + $o .= str_replace(array("\n"," "),array("
"," "),print_r($rr,true)) . EOL; } } } From eca420ec96912ad573354953297564c9f9ad2c32 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Sep 2014 19:46:55 -0700 Subject: [PATCH 62/94] defined several permission roles - these will probably require some review and adjustment. social social_restricted social_private forum forum_restricted forum_private feed feed_restricted soapbox --- include/permissions.php | 245 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) diff --git a/include/permissions.php b/include/permissions.php index 70c682cfc..0e213a208 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -465,6 +465,251 @@ function get_role_perms($role) { $ret['channel_w_like'] = PERMS_NETWORK; break; + + + case 'social_restricted': + $ret['perms_auto'] = false; + $ret['default_collection'] = true; + $ret['directory_publish'] = true; + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; + $ret['channel_r_stream'] = PERMS_PUBLIC; + $ret['channel_r_profile'] = PERMS_PUBLIC; + $ret['channel_r_photos'] = PERMS_PUBLIC; + $ret['channel_r_abook'] = PERMS_PUBLIC; + $ret['channel_w_stream'] = PERMS_CONTACTS; + $ret['channel_w_wall'] = PERMS_CONTACTS; + $ret['channel_w_tagwall'] = PERMS_SPECIFIC; + $ret['channel_w_comment'] = PERMS_CONTACTS; + $ret['channel_w_mail'] = PERMS_CONTACTS; + $ret['channel_w_photos'] = 0; + $ret['channel_w_chat'] = PERMS_CONTACTS; + $ret['channel_a_delegate'] = 0; + $ret['channel_r_storage'] = PERMS_PUBLIC; + $ret['channel_r_pages'] = PERMS_PUBLIC; + $ret['channel_w_pages'] = 0; + $ret['channel_a_republish'] = PERMS_SPECIFIC; + $ret['channel_w_like'] = PERMS_CONTACTS; + + break; + + + case 'social_private': + $ret['perms_auto'] = false; + $ret['default_collection'] = true; + $ret['directory_publish'] = false; + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; + $ret['channel_r_stream'] = PERMS_PUBLIC; + $ret['channel_r_profile'] = PERMS_PUBLIC; + $ret['channel_r_photos'] = PERMS_PUBLIC; + $ret['channel_r_abook'] = PERMS_CONTACTS; + $ret['channel_w_stream'] = PERMS_CONTACTS; + $ret['channel_w_wall'] = PERMS_CONTACTS; + $ret['channel_w_tagwall'] = PERMS_SPECIFIC; + $ret['channel_w_comment'] = PERMS_CONTACTS; + $ret['channel_w_mail'] = PERMS_SPECIFIC; + $ret['channel_w_photos'] = 0; + $ret['channel_w_chat'] = PERMS_SPECIFIC; + $ret['channel_a_delegate'] = 0; + $ret['channel_r_storage'] = PERMS_PUBLIC; + $ret['channel_r_pages'] = PERMS_PUBLIC; + $ret['channel_w_pages'] = 0; + $ret['channel_a_republish'] = PERMS_SPECIFIC; + $ret['channel_w_like'] = PERMS_CONTACTS; + + break; + + case 'forum_public': + $ret['perms_auto'] = true; + $ret['default_collection'] = false; + $ret['directory_publish'] = true; + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; + $ret['channel_r_stream'] = PERMS_PUBLIC; + $ret['channel_r_profile'] = PERMS_PUBLIC; + $ret['channel_r_photos'] = PERMS_PUBLIC; + $ret['channel_r_abook'] = PERMS_PUBLIC; + $ret['channel_w_stream'] = PERMS_CONTACTS; + $ret['channel_w_wall'] = PERMS_CONTACTS; + $ret['channel_w_tagwall'] = PERMS_CONTACTS; + $ret['channel_w_comment'] = PERMS_CONTACTS; + $ret['channel_w_mail'] = PERMS_CONTACTS; + $ret['channel_w_photos'] = 0; + $ret['channel_w_chat'] = PERMS_CONTACTS; + $ret['channel_a_delegate'] = 0; + $ret['channel_r_storage'] = PERMS_PUBLIC; + $ret['channel_r_pages'] = PERMS_PUBLIC; + $ret['channel_w_pages'] = 0; + $ret['channel_a_republish'] = PERMS_SPECIFIC; + $ret['channel_w_like'] = PERMS_NETWORK; + + break; + + case 'forum_restricted': + $ret['perms_auto'] = false; + $ret['default_collection'] = true; + $ret['directory_publish'] = true; + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE|PERMS_W_TAGWALL; + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE|PERMS_W_TAGWALL; + $ret['channel_r_stream'] = PERMS_PUBLIC; + $ret['channel_r_profile'] = PERMS_PUBLIC; + $ret['channel_r_photos'] = PERMS_PUBLIC; + $ret['channel_r_abook'] = PERMS_PUBLIC; + $ret['channel_w_stream'] = PERMS_CONTACTS; + $ret['channel_w_wall'] = PERMS_CONTACTS; + $ret['channel_w_tagwall'] = PERMS_SPECIFIC; + $ret['channel_w_comment'] = PERMS_CONTACTS; + $ret['channel_w_mail'] = PERMS_CONTACTS; + $ret['channel_w_photos'] = 0; + $ret['channel_w_chat'] = PERMS_CONTACTS; + $ret['channel_a_delegate'] = 0; + $ret['channel_r_storage'] = PERMS_PUBLIC; + $ret['channel_r_pages'] = PERMS_PUBLIC; + $ret['channel_w_pages'] = 0; + $ret['channel_a_republish'] = PERMS_SPECIFIC; + $ret['channel_w_like'] = PERMS_CONTACTS; + + break; + + + case 'forum_private': + $ret['perms_auto'] = false; + $ret['default_collection'] = true; + $ret['directory_publish'] = false; + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; + $ret['channel_r_stream'] = PERMS_PUBLIC; + $ret['channel_r_profile'] = PERMS_CONTACTS; + $ret['channel_r_photos'] = PERMS_CONTACTS; + $ret['channel_r_abook'] = PERMS_CONTACTS; + $ret['channel_w_stream'] = PERMS_CONTACTS; + $ret['channel_w_wall'] = PERMS_CONTACTS; + $ret['channel_w_tagwall'] = 0; + $ret['channel_w_comment'] = PERMS_CONTACTS; + $ret['channel_w_mail'] = PERMS_SPECIFIC; + $ret['channel_w_photos'] = 0; + $ret['channel_w_chat'] = PERMS_SPECIFIC; + $ret['channel_a_delegate'] = 0; + $ret['channel_r_storage'] = PERMS_CONTACTS; + $ret['channel_r_pages'] = PERMS_CONTACTS; + $ret['channel_w_pages'] = 0; + $ret['channel_a_republish'] = PERMS_SPECIFIC; + $ret['channel_w_like'] = PERMS_CONTACTS; + + break; + + case 'feed': + $ret['perms_auto'] = true; + $ret['default_collection'] = false; + $ret['directory_publish'] = true; + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; + $ret['channel_r_stream'] = PERMS_PUBLIC; + $ret['channel_r_profile'] = PERMS_PUBLIC; + $ret['channel_r_photos'] = PERMS_PUBLIC; + $ret['channel_r_abook'] = PERMS_PUBLIC; + $ret['channel_w_stream'] = PERMS_CONTACTS; + $ret['channel_w_wall'] = PERMS_CONTACTS; + $ret['channel_w_tagwall'] = PERMS_SPECIFIC; + $ret['channel_w_comment'] = PERMS_CONTACTS; + $ret['channel_w_mail'] = PERMS_CONTACTS; + $ret['channel_w_photos'] = 0; + $ret['channel_w_chat'] = PERMS_CONTACTS; + $ret['channel_a_delegate'] = 0; + $ret['channel_r_storage'] = PERMS_PUBLIC; + $ret['channel_r_pages'] = PERMS_PUBLIC; + $ret['channel_w_pages'] = 0; + $ret['channel_a_republish'] = PERMS_NETWORK; + $ret['channel_w_like'] = PERMS_NETWORK; + + break; + + case 'feed_restricted': + + $ret['perms_auto'] = false; + $ret['default_collection'] = true; + $ret['directory_publish'] = false; + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; + $ret['channel_r_stream'] = PERMS_PUBLIC; + $ret['channel_r_profile'] = PERMS_PUBLIC; + $ret['channel_r_photos'] = PERMS_PUBLIC; + $ret['channel_r_abook'] = PERMS_PUBLIC; + $ret['channel_w_stream'] = PERMS_CONTACTS; + $ret['channel_w_wall'] = PERMS_CONTACTS; + $ret['channel_w_tagwall'] = PERMS_SPECIFIC; + $ret['channel_w_comment'] = PERMS_CONTACTS; + $ret['channel_w_mail'] = PERMS_CONTACTS; + $ret['channel_w_photos'] = 0; + $ret['channel_w_chat'] = PERMS_CONTACTS; + $ret['channel_a_delegate'] = 0; + $ret['channel_r_storage'] = PERMS_PUBLIC; + $ret['channel_r_pages'] = PERMS_PUBLIC; + $ret['channel_w_pages'] = 0; + $ret['channel_a_republish'] = PERMS_SPECIFIC; + $ret['channel_w_like'] = PERMS_NETWORK; + + break; + + case 'soapbox': + $ret['perms_auto'] = true; + $ret['default_collection'] = false; + $ret['directory_publish'] = true; + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; + $ret['channel_r_stream'] = PERMS_PUBLIC; + $ret['channel_r_profile'] = PERMS_PUBLIC; + $ret['channel_r_photos'] = PERMS_PUBLIC; + $ret['channel_r_abook'] = PERMS_PUBLIC; + $ret['channel_w_stream'] = 0; + $ret['channel_w_wall'] = 0; + $ret['channel_w_tagwall'] = 0; + $ret['channel_w_comment'] = 0; + $ret['channel_w_mail'] = 0; + $ret['channel_w_photos'] = 0; + $ret['channel_w_chat'] = 0; + $ret['channel_a_delegate'] = 0; + $ret['channel_r_storage'] = PERMS_PUBLIC; + $ret['channel_r_pages'] = PERMS_PUBLIC; + $ret['channel_w_pages'] = 0; + $ret['channel_a_republish'] = PERMS_SPECIFIC; + $ret['channel_w_like'] = PERMS_NETWORK; + + break; + + default: + break; } From 51d9f0d97a186e32aeacc42e3b2d2001d04b5dd2 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Sep 2014 21:16:15 -0700 Subject: [PATCH 63/94] channel permission roles --- include/identity.php | 10 +++++----- include/permissions.php | 27 ++++++++++++++++++++++++++- mod/new_channel.php | 7 ++++++- view/css/mod_new_channel.css | 4 ++-- view/tpl/new_channel.tpl | 7 +++++++ 5 files changed, 46 insertions(+), 9 deletions(-) diff --git a/include/identity.php b/include/identity.php index 38e96ab71..ead785543 100644 --- a/include/identity.php +++ b/include/identity.php @@ -219,13 +219,15 @@ function create_identity($arr) { $perms_sql = ''; $role_permissions = null; + $global_perms = get_perms(); if(array_key_exists('permissions_role',$arr) && $arr['permissions_role']) { $role_permissions = get_role_perms($arr['permissions_role']); + if($role_permissions) { foreach($role_permissions as $p => $v) { if(strpos($p,'channel_') !== false) { - $perms_keys .= ', ' . $global_perms[$p][0]; + $perms_keys .= ', ' . $p; $perms_vals .= ', ' . intval($v); } if($p === 'directory_publish') @@ -235,16 +237,16 @@ function create_identity($arr) { } else { $defperms = site_default_perms(); - $global_perms = get_perms(); foreach($defperms as $p => $v) { $perms_keys .= ', ' . $global_perms[$p][0]; $perms_vals .= ', ' . intval($v); } } + $expire = get_config('system', 'default_expire_days'); $expire = (($expire===false)? '0': $expire); - + $r = q("insert into channel ( channel_account_id, channel_primary, channel_name, channel_address, channel_guid, channel_guid_sig, channel_hash, channel_prvkey, channel_pubkey, channel_pageflags, channel_expire_days $perms_keys ) @@ -264,8 +266,6 @@ function create_identity($arr) { ); - - $r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1", intval($arr['account_id']), diff --git a/include/permissions.php b/include/permissions.php index 0e213a208..932ae897b 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -528,7 +528,7 @@ function get_role_perms($role) { break; - case 'forum_public': + case 'forum': $ret['perms_auto'] = true; $ret['default_collection'] = false; $ret['directory_publish'] = true; @@ -719,3 +719,28 @@ function get_role_perms($role) { } +function role_selector($current) { + $roles = array( + 'social' => array( t('Social Networking'), + array('social' => t('Mostly Public'), 'social_restricted' => t('Restricted'), 'social_private' => t('Private'))), + 'forum' => array( t('Community Forum'), + array('forum' => t('Mostly Public'), 'forum_restricted' => t('Restricted'), 'forum_private' => t('Private'))), + 'feed' => array( t('Feed Republish'), + array('feed' => t('Mostly Public'), 'feed_restricted' => t('Restricted'))), + 'soapbox' => array( t('Celebrity/Soapbox'), + array('soapbox' => t('Mostly Public'))), + 'other' => array( t('Other'), + array('custom' => t('Custom/Expert Mode')))); + $o = ''; + return $o; +} + diff --git a/mod/new_channel.php b/mod/new_channel.php index eafef2c08..e70c64f23 100644 --- a/mod/new_channel.php +++ b/mod/new_channel.php @@ -1,6 +1,8 @@ t('Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others.'), '$label_import' => t('Or import an existing channel from another location'), '$name' => $name, + '$label_role' => t('Channel Type'), + '$help_role' => t('Please choose a channel role (such as social networking or community forum) and privacy requirements so we can select the best permissions for you'), + '$role_select' => role_selector(($privacy_role) ? $privacy_role : 'social'), '$nickname' => $nickname, '$submit' => t('Create') )); diff --git a/view/css/mod_new_channel.css b/view/css/mod_new_channel.css index 3b9c80953..2af0fbb2d 100644 --- a/view/css/mod_new_channel.css +++ b/view/css/mod_new_channel.css @@ -1,13 +1,13 @@ h2 { margin-left: 15%; - margin-top: 15%; + margin-top: 5%; } #newchannel-form { font-size: 1.4em; margin-left: 15%; - margin-top: 5%; + margin-top: 20px; width: 50%; } diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index 261f965da..b6562f707 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -4,6 +4,13 @@
{{$desc}}
+
{{$help_role}}
+ + + {{$role_select}} +
+ + From 22aa5aca14cce46727e15bd061cb6900a21b46b8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Sep 2014 21:27:02 -0700 Subject: [PATCH 64/94] add a spinner or two to the new channel page so folks have a clue that we're doing something in the background - trying to complete the nick field for them (and then check it before they submit). --- view/js/mod_new_channel.js | 4 ++++ view/tpl/new_channel.tpl | 2 ++ 2 files changed, 6 insertions(+) diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js index a3c1dd05c..882da940e 100644 --- a/view/js/mod_new_channel.js +++ b/view/js/mod_new_channel.js @@ -1,16 +1,20 @@ $(document).ready(function() { $("#newchannel-name").blur(function() { + $("#name-spinner").spin('small'); var zreg_name = $("#newchannel-name").val(); $.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) { $("#newchannel-nickname").val(data); zFormError("#newchannel-name-feedback",data.error); + $("#name-spinner").spin(false); }); }); $("#newchannel-nickname").blur(function() { + $("#nick-spinner").spin('small'); var zreg_nick = $("#newchannel-nickname").val(); $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) { $("#newchannel-nickname").val(data); zFormError("#newchannel-nickname-feedback",data.error); + $("#nick-spinner").spin(false); }); }); diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index b6562f707..b28810236 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -13,6 +13,7 @@ +
@@ -20,6 +21,7 @@ +
From c6062d7872e832c06ebc55fd249d1dacf0e264d1 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Sep 2014 21:52:30 -0700 Subject: [PATCH 65/94] usability tweaks --- include/identity.php | 8 ++++++-- include/permissions.php | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/identity.php b/include/identity.php index ead785543..50c5d13b9 100644 --- a/include/identity.php +++ b/include/identity.php @@ -361,14 +361,18 @@ function create_identity($arr) { // Save our permissions role so we can perhaps call it up and modify it later. - if($role_permissions) + if($role_permissions) { set_pconfig($newuid,'system','permissions_role',$arr['permissions_role']); + if(array_key_exists('online',$role_permissions)) + set_pconfig('system','hide_presence',1-intval($role_permissions['online'])); + } - // Create a group with no members. This allows somebody to use it + // Create a group with yourself as a member. This allows somebody to use it // right away as a default group for new contacts. require_once('include/group.php'); group_add($newuid, t('Friends')); + group_add_member($newuid,t('Friends'),$ret['channel']['channel_hash']); // if our role_permissions indicate that we're using a default collection ACL, add it. diff --git a/include/permissions.php b/include/permissions.php index 932ae897b..e25052f95 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -440,6 +440,7 @@ function get_role_perms($role) { $ret['perms_auto'] = false; $ret['default_collection'] = false; $ret['directory_publish'] = true; + $ret['online'] = true; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; @@ -471,6 +472,7 @@ function get_role_perms($role) { $ret['perms_auto'] = false; $ret['default_collection'] = true; $ret['directory_publish'] = true; + $ret['online'] = true; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; @@ -502,6 +504,7 @@ function get_role_perms($role) { $ret['perms_auto'] = false; $ret['default_collection'] = true; $ret['directory_publish'] = false; + $ret['online'] = false; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; @@ -532,6 +535,7 @@ function get_role_perms($role) { $ret['perms_auto'] = true; $ret['default_collection'] = false; $ret['directory_publish'] = true; + $ret['online'] = false; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; @@ -562,6 +566,7 @@ function get_role_perms($role) { $ret['perms_auto'] = false; $ret['default_collection'] = true; $ret['directory_publish'] = true; + $ret['online'] = false; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE|PERMS_W_TAGWALL; @@ -593,6 +598,7 @@ function get_role_perms($role) { $ret['perms_auto'] = false; $ret['default_collection'] = true; $ret['directory_publish'] = false; + $ret['online'] = false; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; @@ -623,6 +629,7 @@ function get_role_perms($role) { $ret['perms_auto'] = true; $ret['default_collection'] = false; $ret['directory_publish'] = true; + $ret['online'] = false; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; @@ -654,6 +661,7 @@ function get_role_perms($role) { $ret['perms_auto'] = false; $ret['default_collection'] = true; $ret['directory_publish'] = false; + $ret['online'] = false; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; @@ -684,6 +692,7 @@ function get_role_perms($role) { $ret['perms_auto'] = true; $ret['default_collection'] = false; $ret['directory_publish'] = true; + $ret['online'] = false; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK From 71672083450a8d5923c1839a1c766033203b3771 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Sep 2014 22:30:25 -0700 Subject: [PATCH 66/94] forgot this one... --- doc/to_do_code.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb index 0005b4be3..fe213baf3 100644 --- a/doc/to_do_code.bb +++ b/doc/to_do_code.bb @@ -14,6 +14,8 @@ We need much more than this, but here are areas where developers can help. Pleas [li]implement oembed provider interface[/li] +[li]refactor the oembed client interface so that we can safely sandbox remote content[/li] + [li]implement openid server interface[/li] [li]Write more webpage layouts[/li] From 8eb21cceb3a8274d8727073d03b8093f467ec852 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Sep 2014 22:53:38 -0700 Subject: [PATCH 67/94] use 24-hour clock for non-American dates --- view/en-gb/strings.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/en-gb/strings.php b/view/en-gb/strings.php index abf14f43a..358c90d36 100644 --- a/view/en-gb/strings.php +++ b/view/en-gb/strings.php @@ -27,3 +27,5 @@ $a->strings["Do you want to authorize this application to access your posts and $a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "If your certificate is not recognised, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."; $a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."; $a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralized communication and information tool."] = "You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."; +$a->strings["l F d, Y \\@ g:i A"] = "l j F, Y \\@ G:i"; +$a->strings["D, d M Y - g:i A"] = "D, d M Y - G:i"]; From 0deb592cb5a6562f36a2f52025a71d3a20fcae42 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Sep 2014 22:55:27 -0700 Subject: [PATCH 68/94] typo --- view/en-gb/strings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/en-gb/strings.php b/view/en-gb/strings.php index 358c90d36..a95915844 100644 --- a/view/en-gb/strings.php +++ b/view/en-gb/strings.php @@ -28,4 +28,4 @@ $a->strings["If your certificate is not recognized, members of other sites (who $a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."; $a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralized communication and information tool."] = "You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."; $a->strings["l F d, Y \\@ g:i A"] = "l j F, Y \\@ G:i"; -$a->strings["D, d M Y - g:i A"] = "D, d M Y - G:i"]; +$a->strings["D, d M Y - g:i A"] = "D, d M Y - G:i"; From 0b47fb9a91b58147e616ea75a23dea0d431c40f8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Sep 2014 22:59:56 -0700 Subject: [PATCH 69/94] keep the language consistent --- mod/new_channel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/new_channel.php b/mod/new_channel.php index e70c64f23..8329f0ec3 100644 --- a/mod/new_channel.php +++ b/mod/new_channel.php @@ -116,7 +116,7 @@ function new_channel_content(&$a) { '$label_import' => t('Or import an existing channel from another location'), '$name' => $name, '$label_role' => t('Channel Type'), - '$help_role' => t('Please choose a channel role (such as social networking or community forum) and privacy requirements so we can select the best permissions for you'), + '$help_role' => t('Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you'), '$role_select' => role_selector(($privacy_role) ? $privacy_role : 'social'), '$nickname' => $nickname, '$submit' => t('Create') From 65441b95bbf84f8f88445b6352995c9c89beb1f4 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 18 Sep 2014 17:07:47 +0100 Subject: [PATCH 70/94] Doco - permissions needs some work, but this is a relative whopper. --- doc/permissions.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/permissions.bb b/doc/permissions.bb index 8a071a3f5..c893ed84f 100644 --- a/doc/permissions.bb +++ b/doc/permissions.bb @@ -66,7 +66,7 @@ This permission determines who can write to your wall when clicking through to y [i]Can comment on my posts.[/i] -This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public pages" permission +This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public stream and posts" permission [i]Can send me private mail messages.[/i] From fc93ee89a9d30d15a9dde4638f018303739f8d9d Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 18 Sep 2014 18:09:54 +0100 Subject: [PATCH 71/94] If a short ping causes lots of issues, and anyone who has been here a while tends to have a longer ping, we should probably have a longer ping --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 5118038d3..d412e82e4 100755 --- a/boot.php +++ b/boot.php @@ -982,9 +982,9 @@ class App { if ($user_scalable === false) $user_scalable = 1; - $interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000); + $interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 80000); if($interval < 10000) - $interval = 40000; + $interval = 80000; if(! x($this->page,'title')) $this->page['title'] = $this->config['system']['sitename']; From 5c8f5e2aa3afdf6608a7e95bea4a7c44e8b6e38b Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 18 Sep 2014 18:14:52 +0100 Subject: [PATCH 72/94] Catch the settings too --- mod/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/settings.php b/mod/settings.php index f9568feb3..37606985e 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -736,7 +736,7 @@ function settings_content(&$a) { $user_scalable = (($user_scalable===false)? '1': $user_scalable); // default if not set: 1 $browser_update = intval(get_pconfig(local_user(), 'system','update_interval')); - $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds + $browser_update = (($browser_update == 0) ? 80 : $browser_update / 1000); // default if not set: 40 seconds $itemspage = intval(get_pconfig(local_user(), 'system','itemspage')); $itemspage = (($itemspage > 0 && $itemspage < 101) ? $itemspage : 20); // default if not set: 20 items From d4759a5883e6776a2022b204b1af84e454de7f67 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 18 Sep 2014 16:32:05 -0700 Subject: [PATCH 73/94] repeated content collapse on update from display page under rare conditions (when the conversation hasn't changed) --- mod/display.php | 2 ++ mod/settings.php | 6 ++++++ version.inc | 2 +- view/tpl/settings.tpl | 1 - 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mod/display.php b/mod/display.php index c389eb976..be06c1e82 100644 --- a/mod/display.php +++ b/mod/display.php @@ -85,6 +85,8 @@ function display_content(&$a, $update = 0, $load = false) { $target_item = $r[0]; } + $r = null; + if($target_item['item_restrict'] & ITEM_WEBPAGE) { $x = q("select * from channel where channel_id = %d limit 1", intval($target_item['uid']) diff --git a/mod/settings.php b/mod/settings.php index f9568feb3..81596a27e 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -935,6 +935,10 @@ function settings_content(&$a) { } } + + $permissions_role = get_pconfig(local_user(),'system','permissions_role'); + $permissions_set = (($permissions_role && $permissions_role != 'custom') ? true : false); + $o .= replace_macros($stpl,array( '$ptitle' => t('Channel Settings'), @@ -955,6 +959,8 @@ function settings_content(&$a) { '$adult' => array('adult', t('Adult Content'), $adult_flag, t('This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)')), '$h_prv' => t('Security and Privacy Settings'), + '$permissions_set' => $permissions_set, + '$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'), '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online')), diff --git a/version.inc b/version.inc index 1213afd33..d75eabb40 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-17.801 +2014-09-18.802 diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 443e63696..4dba1f23e 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -24,7 +24,6 @@ {{include file="field_checkbox.tpl" field=$hide_presence}} -

{{$lbl_pmacro}}

  • {{$pmacro2}}
    • From 3191432c402f0675e5d9075e70cd4064c28b98c7 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 18 Sep 2014 16:46:17 -0700 Subject: [PATCH 74/94] add stylish_select library to provide a way to clean up and theme all the ugly select boxes --- library/stylish_select/index.html | 314 +++++++++++ .../stylish_select/jquery.stylish-select.js | 492 ++++++++++++++++++ library/stylish_select/select-bg.png | Bin 0 -> 2438 bytes library/stylish_select/stylish-select.css | 121 +++++ 4 files changed, 927 insertions(+) create mode 100644 library/stylish_select/index.html create mode 100644 library/stylish_select/jquery.stylish-select.js create mode 100755 library/stylish_select/select-bg.png create mode 100755 library/stylish_select/stylish-select.css diff --git a/library/stylish_select/index.html b/library/stylish_select/index.html new file mode 100644 index 000000000..b711c09f6 --- /dev/null +++ b/library/stylish_select/index.html @@ -0,0 +1,314 @@ + + + + jQuery Stylish Select 0.4.9 plugin examples + + + + + + + + + + + + +
    +

    Stylish Select 0.4.9

    +

    A cross-browser, accessible alternative to the standard form element which can be fully customised with CSS

    +

    Stylish Select attempts to replicate the functionality of the browser default select box as closely as possible with support for keyboard navigation, and intelligent positioning.

    +

    Stylish Select aims to have a minimal code footprint and weighs in at just over 3KB when minified.

    + Get latest source code from GitHub +

    Usage

    +

    First, include the stylesheet, jQuery and the stylish select .js file in your html head tag.

    +

    The plugin can be used to replace any select with the following:

    + 
    +$(document).ready(function(){
+$('#my-dropdown').sSelect();
+});
+
    +
    +

    Simplest example, option selected by default

    +

    You can use the alphabetical and arrow keys to navigate the list as you would a browser default select.

    + +
    +
    +

    Change event

    +

    Stylish Select alters the original select on the page, so you can access it's change event:

    + 
    +//change event
+$('#my-dropdownChange').sSelect().change(function(){alert('changed')});
+
    + +
    +
    +

    Grouped options

    +

    Stylish Select supports optgroups and also optgroups and options together.

    + +
    +
    +

    Getting/setting the value

    + 
    +//set value
+$('#setVal').click(function(){
+$('#my-dropdown5').getSetSSValue(4);
+});
+
+//get value
+$('#getVal').click(function(){
+alert('The value is: '+$('#my-dropdown5').getSetSSValue());
+});
+
    +

    Set value to 4

    +

    Get value

    + +
    +
    +

    Add new options to Stylish Select

    + 
    +//add options to select and update
+$('#addOptions').click(function(){
+$('#my-dropdown6').append('<option value="newOpt">New Option</option>').resetSS();
+});
+
    +

    If you add or remove options from the initial select element on the page, be sure to call the .resetSS() method on the select to update the Stylish Select replacement.

    + +

    Add new options to select and update

    + +
    +
    +

    Max-height for large lists

    + 
    +$('#my-dropdown').sSelect({ddMaxHeight: '300px'});
+
    + +
    +
    +

    Intelligent positioning

    +

    Stylish Select will always remain visible on the page.

    + +
    +
    +

    Disabled Select

    + +
    +
    +

    Disabled Options

    + +
    +
    +

    Disabled Grouped options

    + +
    +
    + + \ No newline at end of file diff --git a/library/stylish_select/jquery.stylish-select.js b/library/stylish_select/jquery.stylish-select.js new file mode 100644 index 000000000..61a38ca8d --- /dev/null +++ b/library/stylish_select/jquery.stylish-select.js @@ -0,0 +1,492 @@ +/** +* Stylish Select 0.4.9 - jQuery plugin to replace a select drop down box with a stylable unordered list +* http://github.com/scottdarby/Stylish-Select +* +* Requires: jQuery 1.3 or newer +* +* Contributions from Justin Beasley: http://www.harvest.org/ +* Anatoly Ressin: http://www.artazor.lv/ Wilfred Hughes: https://github.com/Wilfred +* Grigory Zarubin: https://github.com/Craigy- +* +* Dual licensed under the MIT and GPL licenses. +*/ +(function($){ + //add class to html tag + $('html').addClass('stylish-select'); + + //Cross-browser implementation of indexOf from MDN: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf + if (!Array.prototype.indexOf){ + Array.prototype.indexOf = function(searchElement /*, fromIndex */){ + if (this === void 0 || this === null) + throw new TypeError(); + + var t = Object(this); + var len = t.length >>> 0; + if (len === 0) + return -1; + + var n = 0; + if (arguments.length > 0){ + n = Number(arguments[1]); + if (n !== n) // shortcut for verifying if it's NaN + n = 0; + else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) + n = (n > 0 || -1) * Math.floor(Math.abs(n)); + } + + if (n >= len) + return -1; + + var k = n >= 0 + ? n + : Math.max(len - Math.abs(n), 0); + + for (; k < len; k++){ + if (k in t && t[k] === searchElement) + return k; + } + return -1; + }; + } + + //utility methods + $.fn.extend({ + getSetSSValue: function(value){ + if (value){ + //set value and trigger change event + $(this).val(value).change(); + return this; + } else { + return $(this).find(':selected').val(); + } + }, + //added by Justin Beasley + resetSS: function(){ + var oldOpts = $(this).data('ssOpts'); + $this = $(this); + $this.next().remove(); + //unbind all events and redraw + $this.unbind('.sSelect').sSelect(oldOpts); + } + }); + + $.fn.sSelect = function(options){ + return this.each(function(){ + var defaults = { + defaultText: 'Please select', + animationSpeed: 0, //set speed of dropdown + ddMaxHeight: '', //set css max-height value of dropdown + containerClass: '' //additional classes for container div + }; + + //initial variables + var opts = $.extend(defaults, options), + $input = $(this), + $containerDivText = $('
    '), + $containerDiv = $('
    '), + $containerDivWrapper = $(''), + $newUl = $('
      '), + currentIndex = -1, + prevIndex = -1, + keys = [], + prevKey = false, + prevented = false, + $newLi; + + //added by Justin Beasley + $(this).data('ssOpts',options); + + if( $(this).next('.newListSelected').length ) { + return; + } + + //build new list + $containerDiv.insertAfter($input); + $containerDiv.attr("tabindex", $input.attr("tabindex") || "0"); + $containerDivText.prependTo($containerDiv); + $newUl.appendTo($containerDiv); + $newUl.wrap($containerDivWrapper); + $containerDivWrapper = $newUl.parent(); + $input.hide(); + + if($input.is(':disabled')){ + return; + } + + //added by Justin Beasley (used for lists initialized while hidden) + $containerDivText.data('ssReRender',!$containerDivText.is(':visible')); + + //add one item to list + function addItem(item, container) { + var option = $(item).text(), + key = $(item).val(), + isDisabled = $(item).is(':disabled'); + + if (!isDisabled && !$(item).parents().is(':disabled')) { + //add first letter of each word to array + keys.push(option.charAt(0).toLowerCase()); + } + container.append($('
    • '+option+'
      • ').data({ + 'key' : key, + 'selected' : $(item).is(':selected') + })); + } + + $input.children().each(function(){ + if ($(this).is('option')){ + addItem(this, $newUl); + } else { + var optionTitle = $(this).attr('label'), + $optGroup = $('
    • '+optionTitle+'
      • '), + $optGroupList = $('
        '); + + $optGroup.appendTo($newUl); + $optGroupList.appendTo($optGroup); + + $(this).children().each(function(){ + addItem(this, $optGroupList); + }); + } + }); + + //cache list items object + $newLi = $newUl.find('li a:not(.newListItemDisabled)').not(function(){ + return $(this).parents().hasClass('newListOptionDisabled'); + }); + + //get selected item from new list (because it doesn't contain disabled options) + $newLi.each(function(i){ + if ($(this).parent().data('selected')){ + opts.defaultText = $(this).html(); + currentIndex = prevIndex = i; + } + }); + + //get heights of new elements for use later + var newUlHeight = $newUl.height(), + containerHeight = $containerDiv.height(), + newLiLength = $newLi.length; + + //check if a value is selected + if (currentIndex != -1){ + navigateList(currentIndex); + } else { + //set placeholder text + $containerDivText.text(opts.defaultText); + } + + //decide if to place the new list above or below the drop-down + function newUlPos(){ + var containerPosY = $containerDiv.offset().top, + docHeight = $(window).height(), + scrollTop = $(window).scrollTop(); + + //if height of list is greater then max height, set list height to max height value + if (newUlHeight > parseInt(opts.ddMaxHeight)){ + newUlHeight = parseInt(opts.ddMaxHeight); + } + + containerPosY = containerPosY-scrollTop; + if (containerPosY+newUlHeight >= docHeight){ + $newUl.css({ + height: newUlHeight + }); + $containerDivWrapper.css({ + top: '-'+newUlHeight+'px', + height: newUlHeight + }); + $input.onTop = true; + } else { + $newUl.css({ + height: newUlHeight + }); + $containerDivWrapper.css({ + top: containerHeight+'px', + height: newUlHeight + }); + $input.onTop = false; + } + } + + //run function on page load + newUlPos(); + + //run function on browser window resize + $(window).bind('resize.sSelect scroll.sSelect', newUlPos); + + //positioning + function positionFix(){ + $containerDiv.css('position','relative'); + } + + function positionHideFix(){ + $containerDiv.css( + { + position: 'static' + }); + } + + $containerDivText.bind('click.sSelect',function(event){ + event.stopPropagation(); + + //added by Justin Beasley + if($(this).data('ssReRender')){ + newUlHeight = $newUl.height('').height(); + $containerDivWrapper.height(''); + containerHeight = $containerDiv.height(); + $(this).data('ssReRender',false); + newUlPos(); + } + + //hide all menus apart from this one + $('.SSContainerDivWrapper') + .not($(this).next()) + .hide() + .parent() + .css('position', 'static') + .removeClass('newListSelFocus'); + + //show/hide this menu + $containerDivWrapper.toggle(); + positionFix(); + + //scroll list to selected item + if(currentIndex == -1) currentIndex = 0; + try { + $newLi.eq(currentIndex).focus(); + } catch(ex) {} + }); + + function closeDropDown(fireChange, resetText){ + if(fireChange == true){ + prevIndex = currentIndex; + $input.change(); + } + + if(resetText == true){ + currentIndex = prevIndex; + navigateList(currentIndex); + } + + $containerDivWrapper.hide(); + positionHideFix(); + } + + $newLi.bind('click.sSelect',function(e){ + var $clickedLi = $(e.target); + + //update counter + currentIndex = $newLi.index($clickedLi); + + //remove all hilites, then add hilite to selected item + prevented = true; + navigateList(currentIndex, true); + closeDropDown(); + }); + + $newLi.bind('mouseenter.sSelect', + function(e){ + var $hoveredLi = $(e.target); + $hoveredLi.addClass('newListHover'); + }).bind('mouseleave.sSelect', + function(e){ + var $hoveredLi = $(e.target); + $hoveredLi.removeClass('newListHover'); + }); + + function navigateList(currentIndex, fireChange){ + if(currentIndex == -1){ + $containerDivText.text(opts.defaultText); + $newLi.removeClass('hiLite'); + } else { + $newLi.removeClass('hiLite') + .eq(currentIndex) + .addClass('hiLite'); + + var text = $newLi.eq(currentIndex).text(), + val = $newLi.eq(currentIndex).parent().data('key'); + + try { + $input.val(val); + } catch(ex) { + // handle ie6 exception + $input[0].selectedIndex = currentIndex; + } + + $containerDivText.text(text); + + //only fire change event if specified + if(fireChange == true){ + prevIndex = currentIndex; + $input.change(); + } + + if ($containerDivWrapper.is(':visible')){ + try { + $newLi.eq(currentIndex).focus(); + } catch(ex) {} + } + } + } + + $input.bind('change.sSelect',function(event){ + var $targetInput = $(event.target); + //stop change function from firing + if (prevented == true){ + prevented = false; + return false; + } + var $currentOpt = $targetInput.find(':selected'); + currentIndex = $targetInput.find('option').index($currentOpt); + navigateList(currentIndex); + }); + + //handle up and down keys + function keyPress(element){ + //when keys are pressed + $(element).unbind('keydown.sSelect').bind('keydown.sSelect',function(e){ + var keycode = e.which; + + //prevent change function from firing + prevented = true; + + switch(keycode){ + case 40: //down + case 39: //right + incrementList(); + return false; + break; + case 38: //up + case 37: //left + decrementList(); + return false; + break; + case 33: //page up + case 36: //home + gotoFirst(); + return false; + break; + case 34: //page down + case 35: //end + gotoLast(); + return false; + break; + case 13: //enter + case 27: //esc + closeDropDown(true); + return false; + break; + case 9: //tab + closeDropDown(true); + nextFormElement(); + return false; + break; + } + + //check for keyboard shortcuts + keyPressed = String.fromCharCode(keycode).toLowerCase(); + + var currentKeyIndex = keys.indexOf(keyPressed); + + if (typeof currentKeyIndex != 'undefined'){ //if key code found in array + ++currentIndex; + currentIndex = keys.indexOf(keyPressed, currentIndex); //search array from current index + + if (currentIndex == -1 || currentIndex == null || prevKey != keyPressed){ + // if no entry was found or new key pressed search from start of array + currentIndex = keys.indexOf(keyPressed); + } + + navigateList(currentIndex); + //store last key pressed + prevKey = keyPressed; + return false; + } + }); + } + + function incrementList(){ + if (currentIndex < (newLiLength-1)){ + ++currentIndex; + navigateList(currentIndex); + } + } + + function decrementList(){ + if (currentIndex > 0){ + --currentIndex; + navigateList(currentIndex); + } + } + + function gotoFirst(){ + currentIndex = 0; + navigateList(currentIndex); + } + + function gotoLast(){ + currentIndex = newLiLength-1; + navigateList(currentIndex); + } + + $containerDiv.bind('click.sSelect',function(e){ + e.stopPropagation(); + keyPress(this); + }); + + $containerDiv.bind('focus.sSelect',function(){ + $(this).addClass('newListSelFocus'); + keyPress(this); + }); + + $containerDiv.bind('blur.sSelect',function(){ + $(this).removeClass('newListSelFocus'); + }); + + //hide list on blur + $(document).bind('click.sSelect',function(){ + $containerDiv.removeClass('newListSelFocus'); + if ($containerDivWrapper.is(':visible')){ + closeDropDown(false, true); + } else { + closeDropDown(false); + } + }); + + //select next form element in document + function nextFormElement() { + var fields = $('body').find('button,input,textarea,select'), + index = fields.index($input); + if (index > -1 && (index + 1) < fields.length) { + fields.eq(index + 1).focus(); + } + return false; + } + // handle focus on original select element + $input.focus(function(){ + $input.next().focus(); + }); + + //add classes on hover + $containerDivText.bind('mouseenter.sSelect', + function(e){ + var $hoveredTxt = $(e.target); + $hoveredTxt.parent().addClass('newListSelHover'); + }).bind('mouseleave.sSelect', + function(e){ + var $hoveredTxt = $(e.target); + $hoveredTxt.parent().removeClass('newListSelHover'); + }); + + //reset left property and hide + $containerDivWrapper.css({ + left: '0', + display: 'none', + visibility: 'visible' + }); + + }); + + }; + +})(jQuery); \ No newline at end of file diff --git a/library/stylish_select/select-bg.png b/library/stylish_select/select-bg.png new file mode 100755 index 0000000000000000000000000000000000000000..151eda726894b8cc21f051b7371e8fe209748969 GIT binary patch literal 2438 zcmV;133>L3P)vcmx_KVYS|=8yC9klt({PS z0wJP-K~gSa)x?U_f>3Gs&_Yo|G*}o5w4=}#GL>=3g(L*q@!iMX^Pbqw%}(r$Z~p(J zM?S}XUw^RVzn{!v1Q8^eSUuaZ)`T(Dn(H$jYi{KgTYWJNfPOFIsyRX z7N_5TpB`PkN*4bA%N)`aV`K42y}u?RLt`%OhEqNw3#yLIg1aAouv&n{U#rFP!tQ;J%AAVR~S5Sr}O)s|ZQJMh&GDYg^ zqm^7mEqm>?X~+KSgAeF3XGV#VEm4+wCd>DwKp@Z+3zWXU4sE>%<9qc=c*(A&N(YMvjWajK<5-@bK_i4)Xi`njj%N0szc}Z|dtQ8X8&k z346WTTG4bu6lNic$TEc`>910Kef>{ELqq4?Za4XSK24C29RUEc#eeS}T|06_yT07i zM4^F!v|~j!Bu?`CIphTkx?0bixvOoT_4oI09N>wM9zB8}0RU#qrN%}Yym5p6eeht~ ztVnAq!r^0$@rffLPUp+wGfj-@>gqbXySw-I_4U!<;2?Q9#R_q{B}z7k5&$4mRF8*F zR##Ij6q+PLV_S&~v$nW7lXxu?DTg~Yt17;WCXS>3vI>kF!?9^|a(RZ*^q^J)n} z5@*)Xau$HxC8(;}g0skMB%+M^8BG)-QJM{lb)sd1aGIllMYxozp@7`(l`sZ%nKM-8#?1h}@- zi^XhN?uR=F0J%$;bwHF`k@$T^?jUBf8VZL=CmyN}g~Ai{Mky&76{A#Nbl}L5+9eAY z?#OpIDr`0z<(bW+?jVFkYyfhR0!7h!7bVIxT_$Ck&!<;?K1-;-f4LfqEw6v}**{Tf z>4v6HKAGAbWc%*j`m#B5_AFemV0~dh0nHLZG{{Oq&T?jS;l=9QP9EH5psEh#Q0hv@t${L+LFu?S&nAAsEE zvABcKNJBN(_3PF3&p-cN>y;~$-9hG*lr(TwR9iZGHfdQ=Vq2ffGq{5Q0J0^WJBXD- za|gL~Yxx^1SB`fF*?;KJ3eJW$6%`ha`lXF=kOcsM$01A!cM#ExUvmff@yAzwS5-CY z4)P19a~p@=5pT*bqbWZCU>c%|LMm5JnW7&aCMgg|x`T+Fxj-bMQ$3y$caY|mmXf7Q zmekC$+eh3%kPQIy3S*?2W*zJ3W z5ddHsr2c;TC09`ut5;7u_R7J7bcHjcM9G#Y%Vd!;`TaV*s=gz!2(2)gOjsiV0A$Uj z=4J}ITvLwm_Vv-#0|zFH8BOI50wDqbWP!@rPUnXoPC4en&YcvS&K)Egg*ylU;Q!;s z#~+jX&YhH>^>%jBoiD$fa(-%e5HwN)0Ax!fLhTI=sk5TS#%80JA)l}-;tUDd5da`t0^Qwo{n#<>`bujn zg&#glU)hay2bnjo>u_7!h&#x@;NZqVp6GJBNBq+uNC1EtaC!fJdU*3DT|0U-ZB~?U z2k~?G#FN+#$EZ8V8*A5g_Vo7df6(7g4_TB%|Lah^WP>OH05T;yJWQuvW^I|q9VF3| zUw-n*&kwY!`;!7RQHZpr{CussgDhNlv!$bB zvOCBhH*QpSHaCyBgM`DciuEIVyvw8J4k8|kM9WzKa+ah!NW7%V+8socW(jwYrAs?@ zeeuOOcaU+N9ye{+AjYpb^wCFW-EMb7zQeIdQIw=0=^;h{ Date: Thu, 18 Sep 2014 17:06:15 -0700 Subject: [PATCH 75/94] add stylish_select to new_channel page - but comment out until we can theme it. It needs a bit of theming to even work correctly. --- view/js/mod_new_channel.js | 1 + view/php/theme_init.php | 1 + 2 files changed, 2 insertions(+) diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js index 882da940e..492267ff9 100644 --- a/view/js/mod_new_channel.js +++ b/view/js/mod_new_channel.js @@ -1,4 +1,5 @@ $(document).ready(function() { +// $("#privacy-role-select").sSelect(); $("#newchannel-name").blur(function() { $("#name-spinner").spin('small'); var zreg_name = $("#newchannel-name").val(); diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 36504ec54..ce576805a 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -33,6 +33,7 @@ head_add_js('library/cryptojs/components/core-min.js'); head_add_js('library/cryptojs/rollups/aes.js'); head_add_js('library/cryptojs/rollups/rabbit.js'); head_add_js('library/cryptojs/rollups/tripledes.js'); +head_add_js('library/stylish_select/jquery.stylish-select.js'); head_add_js('acl.js'); head_add_js('webtoolkit.base64.js'); head_add_js('main.js'); From 083b5da967d52780d0ff2f9e3a01484c45eed38d Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 19 Sep 2014 02:22:12 -0700 Subject: [PATCH 76/94] doc updates --- doc/html/account_8php.html | 32 +- doc/html/account_8php.js | 1 + doc/html/apw_2php_2style_8php.html | 2 +- doc/html/boot_8php.html | 77 ++- doc/html/boot_8php.js | 1 + doc/html/crypto_8php.html | 4 +- doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 4 +- doc/html/extract_8php.html | 4 +- doc/html/globals_0x61.html | 3 + doc/html/globals_0x65.html | 2 +- doc/html/globals_0x69.html | 2 +- doc/html/globals_0x70.html | 6 + doc/html/globals_0x72.html | 6 + doc/html/globals_0x73.html | 3 + doc/html/globals_0x7a.html | 6 + doc/html/globals_func_0x61.html | 3 + doc/html/globals_func_0x65.html | 2 +- doc/html/globals_func_0x69.html | 2 +- doc/html/globals_func_0x70.html | 3 + doc/html/globals_func_0x72.html | 6 + doc/html/globals_func_0x73.html | 3 + doc/html/globals_func_0x7a.html | 6 + doc/html/globals_vars_0x70.html | 3 + doc/html/hubloc_8php.html | 19 + doc/html/hubloc_8php.js | 3 +- doc/html/identity_8php.html | 20 +- doc/html/identity_8php.js | 2 +- doc/html/include_2config_8php.html | 6 +- doc/html/include_2group_8php.html | 2 +- doc/html/include_2network_8php.html | 42 +- doc/html/include_2network_8php.js | 3 +- doc/html/items_8php.html | 34 +- doc/html/items_8php.js | 2 +- doc/html/language_8php.html | 2 +- doc/html/navtree.js | 18 +- doc/html/navtreeindex0.js | 94 +-- doc/html/navtreeindex1.js | 108 ++-- doc/html/navtreeindex2.js | 6 +- doc/html/navtreeindex3.js | 6 +- doc/html/navtreeindex4.js | 6 +- doc/html/navtreeindex5.js | 12 +- doc/html/navtreeindex6.js | 14 +- doc/html/navtreeindex7.js | 14 +- doc/html/navtreeindex8.js | 12 +- doc/html/navtreeindex9.js | 42 +- doc/html/permissions_8php.html | 25 +- doc/html/permissions_8php.js | 1 + doc/html/php2po_8php.html | 2 +- doc/html/php_2theme__init_8php.html | 2 +- doc/html/post_8php.html | 2 +- doc/html/search/all_61.js | 3 +- doc/html/search/all_65.js | 2 +- doc/html/search/all_69.js | 2 +- doc/html/search/all_70.js | 2 + doc/html/search/all_72.js | 2 + doc/html/search/all_73.js | 3 +- doc/html/search/all_7a.js | 2 + doc/html/search/functions_61.js | 1 + doc/html/search/functions_65.js | 2 +- doc/html/search/functions_69.js | 2 +- doc/html/search/functions_70.js | 1 + doc/html/search/functions_72.js | 2 + doc/html/search/functions_73.js | 1 + doc/html/search/functions_7a.js | 2 + doc/html/search/variables_70.js | 1 + doc/html/text_8php.html | 14 +- doc/html/zot_8php.html | 96 ++- doc/html/zot_8php.js | 3 + util/messages.po | 939 +++++++++++++++------------- 70 files changed, 1066 insertions(+), 696 deletions(-) diff --git a/doc/html/account_8php.html b/doc/html/account_8php.html index 76f2d1b0a..a29dc8c1d 100644 --- a/doc/html/account_8php.html +++ b/doc/html/account_8php.html @@ -142,6 +142,8 @@ Functions    service_class_fetch ($uid, $property)   + account_service_class_fetch ($aid, $property) +   upgrade_link ($bbcode=false)    upgrade_message ($bbcode=false) @@ -150,6 +152,34 @@ Functions  

        Function Documentation

        + +
        +
        + + + + + + + + + + + + + + + + + + +
        account_service_class_fetch ( $aid,
         $property 
        )
        +
        + +

        Referenced by import_post(), and process_channel_sync_delivery().

        + +
        +
        @@ -380,7 +410,7 @@ Functions
        -

        Referenced by attach_store(), chatroom_create(), chatroom_enter(), RedDirectory\createFile(), RedBrowser\generateDirectoryIndex(), RedDirectory\getQuotaInfo(), manage_content(), photo_upload(), photos_content(), poller_run(), RedFile\put(), and widget_follow().

        +

        Referenced by attach_store(), chatroom_create(), chatroom_enter(), RedDirectory\createFile(), RedBrowser\generateDirectoryIndex(), RedDirectory\getQuotaInfo(), manage_content(), photo_upload(), photos_content(), poller_run(), process_channel_sync_delivery(), RedFile\put(), and widget_follow().

        diff --git a/doc/html/account_8php.js b/doc/html/account_8php.js index fa7ce6657..9434797b1 100644 --- a/doc/html/account_8php.js +++ b/doc/html/account_8php.js @@ -1,5 +1,6 @@ var account_8php = [ + [ "account_service_class_fetch", "account_8php.html#a4328c40ee4b3d68630cf1ebb7b9d4d89", null ], [ "account_total", "account_8php.html#a43e3042b2723d76915a030bac3c668b6", null ], [ "check_account_admin", "account_8php.html#a917d74aad0baf3e0c4b51cf1051e654f", null ], [ "check_account_email", "account_8php.html#ae052bd5558847bd38e89c213561a9771", null ], diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html index c7627b086..e619cc028 100644 --- a/doc/html/apw_2php_2style_8php.html +++ b/doc/html/apw_2php_2style_8php.html @@ -260,7 +260,7 @@ Variables
      -

      Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_channels(), admin_page_themes(), advanced_profile(), aes_encapsulate(), api_group_members(), api_login(), app_decode(), app_install(), app_list(), app_render(), app_store(), app_update(), apps_content(), argv(), array_sanitise(), attach_change_permissions(), attach_delete(), attach_store(), autoname(), bb_parse_crypt(), bbcode(), block_content(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), change_channel(), channel_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_item_source(), check_list_permissions(), check_webbie(), RedDirectory\childExists(), cloud_init(), common_init(), construct_page(), consume_feed(), conversation(), RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), diaspora_comment(), diaspora_like(), diaspora_mention_callback(), diaspora_reshare(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), email_header_encode(), encode_item(), encode_mail(), event_store_item(), events_post(), expand_groups(), expire_run(), externals_run(), feature_enabled(), fetch_post_tags(), fetch_xrd_links(), filer_content(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), get_all_perms(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_mentions(), get_online_status(), get_profile_elements(), get_profile_fields_advanced(), get_profile_fields_basic(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getQuotaInfo(), gprobe_run(), handle_feed(), hcard_init(), hostxrd_init(), ids_to_querystr(), import_author_diaspora(), import_author_rss(), import_author_unknown(), import_author_xchan(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_content(), invite_post(), item_post(), item_remove_cid(), items_fetch(), json_decode_plus(), json_return_and_die(), layouts_content(), legal_webbie(), FKOAuth1\loginUser(), magic_init(), mail_post(), manage_content(), mark_orphan_hubsxchans(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), mimetype_select(), nav(), navbar_complete(), netgrowth_content(), network_content(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), parse_app_description(), parse_xml_string(), pdledit_content(), pemtome(), perm_is_allowed(), photos_list_photos(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), print_template(), private_messages_list(), proc_run(), process_channel_sync_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), prune_hub_reinstalls(), public_recips(), pubrsatome(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), remote_online_status(), remove_community_tag(), rpost_content(), photo_driver\save(), scrape_feed(), scrape_vcard(), search_ac_init(), send_status_notifications(), service_limits_content(), share_init(), share_unshield(), site_default_perms(), smilies(), sources_content(), sslify_init(), photo_driver\store(), store_diaspora_comment_sig(), string_splitter(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), thing_content(), timesel(), toggle_theme(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedBasicAuth\validateUserPass(), webpages_content(), what_next(), widget_affinity(), widget_bookmarkedchats(), widget_suggestedchats(), widget_suggestions(), xchan_query(), xmlify(), zfinger_init(), zot_build_packet(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

      +

      Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_channels(), admin_page_themes(), advanced_profile(), aes_encapsulate(), api_group_members(), api_login(), app_decode(), app_install(), app_list(), app_render(), app_store(), app_update(), apps_content(), argv(), array_sanitise(), attach_change_permissions(), attach_delete(), attach_store(), autoname(), bb_parse_crypt(), bbcode(), block_content(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), change_channel(), channel_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_item_source(), check_list_permissions(), check_webbie(), RedDirectory\childExists(), cloud_init(), common_init(), connedit_content(), construct_page(), consume_feed(), conversation(), RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), diaspora_comment(), diaspora_like(), diaspora_mention_callback(), diaspora_reshare(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), email_header_encode(), encode_item(), encode_mail(), event_store_item(), events_post(), expand_groups(), expire_run(), externals_run(), feature_enabled(), fetch_post_tags(), fetch_xrd_links(), filer_content(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), get_all_perms(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_mentions(), get_online_status(), get_profile_elements(), get_profile_fields_advanced(), get_profile_fields_basic(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getQuotaInfo(), gprobe_run(), handle_feed(), hcard_init(), hostxrd_init(), ids_to_querystr(), import_author_diaspora(), import_author_rss(), import_author_unknown(), import_author_xchan(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_content(), invite_post(), item_post(), item_remove_cid(), items_fetch(), json_decode_plus(), json_return_and_die(), layouts_content(), legal_webbie(), FKOAuth1\loginUser(), magic_init(), mail_post(), manage_content(), mark_orphan_hubsxchans(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), mimetype_select(), nav(), navbar_complete(), netgrowth_content(), network_content(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), parse_app_description(), parse_xml_string(), pdledit_content(), pemtome(), perm_is_allowed(), photos_list_photos(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), print_template(), private_messages_list(), proc_run(), process_channel_sync_delivery(), process_location_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), prune_hub_reinstalls(), public_recips(), pubrsatome(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), remote_online_status(), remove_community_tag(), remove_obsolete_hublocs(), rpost_content(), photo_driver\save(), scrape_feed(), scrape_vcard(), search_ac_init(), send_status_notifications(), service_limits_content(), share_init(), share_unshield(), site_default_perms(), smilies(), sources_content(), sslify_init(), photo_driver\store(), store_diaspora_comment_sig(), string_splitter(), stringify_array_elms(), sync_directories(), sync_locations(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), thing_content(), timesel(), toggle_theme(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedBasicAuth\validateUserPass(), webpages_content(), what_next(), widget_affinity(), widget_bookmarkedchats(), widget_suggestedchats(), widget_suggestions(), xchan_query(), xmlify(), zfinger_init(), zot_build_packet(), zot_encode_locations(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

      diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 6eb9a204f..31212972a 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -202,7 +202,7 @@ Functions - + @@ -310,6 +310,8 @@ Variables + + @@ -1184,7 +1186,7 @@ Variables

      Variables

      const RED_PLATFORM 'Red Matrix'
      const RED_PLATFORM 'redmatrix'
       
      const RED_VERSION trim(file_get_contents('version.inc')) . 'R'
       
       
      const PAGE_SYSTEM 0x1000
       
      const PAGE_HUBADMIN 0x2000
       
      const PAGE_REMOVED 0x8000
       
      const PHOTO_NORMAL 0x0000
      -

      Referenced by achievements_content().

      +

      Referenced by achievements_content(), and change_channel().

      @@ -1201,7 +1203,7 @@ Variables
      -

      Referenced by admin_content(), admin_post(), app_render(), check_account_admin(), findpeople_widget(), invite_content(), invite_post(), nav(), parse_app_description(), ping_init(), register_post(), regmod_content(), and thing_init().

      +

      Referenced by admin_content(), admin_post(), app_render(), change_channel(), check_account_admin(), findpeople_widget(), invite_content(), invite_post(), nav(), parse_app_description(), ping_init(), register_post(), regmod_content(), and thing_init().

      @@ -1322,7 +1324,7 @@ Variables
      -

      Referenced by account_remove(), achievements_content(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_hubloc(), admin_page_plugins(), admin_page_profs(), admin_page_themes(), admin_page_users(), admin_page_users_post(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), channel_content(), channel_init(), chat_content(), chat_init(), chatroom_enter(), check_form_security_token_redirectOnErr(), common_content(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_content(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), service_limits_content(), settings_post(), sources_content(), sources_post(), subthread_content(), suggest_content(), thing_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

      +

      Referenced by account_remove(), achievements_content(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_hubloc(), admin_page_plugins(), admin_page_profs(), admin_page_themes(), admin_page_users(), admin_page_users_post(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), channel_content(), channel_init(), chat_content(), chat_init(), chatroom_enter(), check_form_security_token_redirectOnErr(), common_content(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), import_content(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), service_limits_content(), settings_post(), sources_content(), sources_post(), subthread_content(), suggest_content(), thing_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

      @@ -1378,7 +1380,7 @@ Variables

      e.g.: proc_run("ls","-la","/tmp");

      $cmd and string args are surrounded with ""

      -

      Referenced by admin_page_channels_post(), build_sync_packet(), channel_remove(), connect_post(), connections_post(), connedit_content(), connedit_post(), create_identity(), diaspora_comment(), diaspora_like(), diaspora_signed_retraction(), diaspora_transmit(), directory_run(), drop_item(), drop_items(), events_post(), fix_system_urls(), follow_init(), fsuggest_post(), import_post(), item_post(), like_content(), mail_content(), mood_init(), new_contact(), notifier_run(), photo_upload(), photos_post(), poller_run(), post_activity_item(), process_delivery(), profile_activity(), profile_photo_post(), profiles_post(), send_message(), settings_post(), start_delivery_chain(), tag_deliver(), tagger_content(), zid_init(), and zot_refresh().

      +

      Referenced by admin_page_channels(), admin_page_channels_post(), build_sync_packet(), channel_remove(), connect_post(), connections_post(), connedit_content(), connedit_post(), create_identity(), diaspora_comment(), diaspora_like(), diaspora_signed_retraction(), diaspora_transmit(), directory_run(), drop_item(), drop_items(), events_post(), fix_system_urls(), follow_init(), fsuggest_post(), import_post(), item_post(), like_content(), mail_content(), mood_init(), new_contact(), notifier_run(), photo_upload(), photos_post(), poller_run(), post_activity_item(), process_delivery(), profile_activity(), profile_photo_post(), profiles_post(), send_message(), settings_post(), start_delivery_chain(), tag_deliver(), tagger_content(), zid_init(), and zot_refresh().

      @@ -1456,7 +1458,7 @@ Variables
      -

      Referenced by FriendicaSmarty\__construct(), App\__construct(), acl_init(), admin_page_channels_post(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_themes(), admin_page_users_post(), api_content(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_format_messages(), api_get_user(), api_login(), api_post(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_user(), app_store(), app_update(), attach_store(), authenticate_success(), bbcode(), bbtoevent(), best_link_url(), bookmark_add(), App\build_pagehead(), channel_content(), chatsvc_content(), check_form_security_token(), cloud_init(), connections_content(), connections_post(), connedit_content(), construct_page(), consume_feed(), conversation(), create_account(), create_identity(), current_theme(), current_theme_url(), del_pconfig(), del_xconfig(), delegate_content(), detect_language(), diaspora_asphoto(), diaspora_conversation(), diaspora_message(), directory_content(), dirprofile_init(), dirsearch_content(), discover_by_url(), display_content(), encode_rel_links(), event_addtocal(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), get_atom_elements(), get_browser_language(), get_item_elements(), get_my_address(), get_my_url(), get_plink(), get_public_feed(), Item\get_template_data(), group_add(), group_rmv(), group_side(), home_content(), import_post(), import_xchan(), info(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), load_contact_links(), local_user(), lostpass_content(), magic_init(), mail_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), notice(), oexchange_content(), openid_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), post_activity_item(), post_init(), printable(), probe_content(), proc_run(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_post(), rbmark_content(), rbmark_post(), red_item_new(), ref_session_read(), register_content(), register_post(), App\register_template_engine(), regmod_content(), remote_user(), removeaccount_post(), removeme_post(), rpost_content(), scrape_feed(), script_path(), search_ac_init(), search_content(), search_init(), service_class_allows(), service_class_fetch(), App\set_baseurl(), settings_post(), setup_content(), setup_init(), suggest_init(), t(), tagrm_post(), App\template_engine(), tt(), validate_channelname(), wall_upload_post(), webfinger_content(), wfinger_init(), widget_affinity(), widget_categories(), widget_filer(), widget_savedsearch(), widget_tagcloud(), xchan_content(), z_fetch_url(), z_post_url(), and zfinger_init().

      +

      Referenced by FriendicaSmarty\__construct(), App\__construct(), account_service_class_fetch(), acl_init(), admin_page_channels_post(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_themes(), admin_page_users_post(), api_content(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_format_messages(), api_get_user(), api_login(), api_post(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_user(), app_store(), app_update(), attach_store(), authenticate_success(), bbcode(), bbtoevent(), best_link_url(), bookmark_add(), App\build_pagehead(), channel_content(), chatsvc_content(), check_form_security_token(), cloud_init(), connections_content(), connections_post(), connedit_content(), construct_page(), consume_feed(), conversation(), create_account(), create_identity(), current_theme(), current_theme_url(), del_pconfig(), del_xconfig(), delegate_content(), detect_language(), diaspora_asphoto(), diaspora_conversation(), diaspora_message(), directory_content(), dirprofile_init(), dirsearch_content(), discover_by_url(), display_content(), encode_rel_links(), event_addtocal(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), get_atom_elements(), get_browser_language(), get_item_elements(), get_my_address(), get_my_url(), get_plink(), get_public_feed(), Item\get_template_data(), group_add(), group_rmv(), group_side(), home_content(), import_post(), import_xchan(), info(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), load_contact_links(), local_user(), lostpass_content(), magic_init(), mail_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), notice(), oexchange_content(), openid_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), post_activity_item(), post_init(), printable(), probe_content(), proc_run(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_post(), rbmark_content(), rbmark_post(), red_item_new(), ref_session_read(), register_content(), register_post(), App\register_template_engine(), regmod_content(), remote_user(), removeaccount_post(), removeme_post(), rpost_content(), scrape_feed(), script_path(), search_ac_init(), search_content(), search_init(), service_class_allows(), service_class_fetch(), App\set_baseurl(), settings_post(), setup_content(), setup_init(), suggest_init(), t(), tagrm_post(), App\template_engine(), tt(), validate_channelname(), wall_upload_post(), webfinger_content(), wfinger_init(), widget_affinity(), widget_categories(), widget_filer(), widget_savedsearch(), widget_tagcloud(), xchan_content(), z_fetch_url(), z_post_url(), and zfinger_init().

      @@ -1490,7 +1492,7 @@ Variables
      -

      Referenced by admin_content(), admin_page_profs(), admin_page_profs_post(), allowed_public_recips(), app_render(), app_store(), app_update(), appman_post(), authenticate_success(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chat_content(), chat_post(), chatsvc_content(), check_config(), connect_post(), connections_content(), connections_post(), conversation(), create_identity(), deliver_run(), diaspora_comment(), diaspora_like(), diaspora_post(), diaspora_request(), diaspora_reshare(), directory_content(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), event_store_item(), externals_run(), filestorage_content(), find_upstream_directory(), follow_init(), format_categories(), format_filer(), get_parent_cloudpath(), RedBrowser\getAssetUrl(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), like_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), openid_content(), pagelist_widget(), parse_app_description(), pdledit_post(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_create_item(), photos_list_photos(), poll_content(), post_activity_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sslify(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), toggle_safesearch_init(), update_suggestions(), user_allow(), vcard_from_xchan(), verify_email_address(), webpages_content(), wfinger_init(), widget_archive(), widget_chatroom_list(), widget_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_new_uid(), and zot_refresh().

      +

      Referenced by admin_content(), admin_page_profs(), admin_page_profs_post(), allowed_public_recips(), app_render(), app_store(), app_update(), appman_post(), authenticate_success(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chat_content(), chat_post(), chatsvc_content(), check_config(), connect_post(), connections_content(), connections_post(), conversation(), create_identity(), deliver_run(), diaspora_comment(), diaspora_like(), diaspora_post(), diaspora_request(), diaspora_reshare(), directory_content(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), event_store_item(), externals_run(), filestorage_content(), find_upstream_directory(), follow_init(), format_categories(), format_filer(), get_parent_cloudpath(), RedBrowser\getAssetUrl(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), like_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), openid_content(), pagelist_widget(), parse_app_description(), pdledit_post(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_create_item(), photos_list_photos(), poll_content(), post_activity_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), rbmark_content(), rbmark_post(), register_post(), remove_obsolete_hublocs(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sslify(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), toggle_safesearch_init(), update_suggestions(), user_allow(), vcard_from_xchan(), verify_email_address(), webpages_content(), wfinger_init(), widget_archive(), widget_chatroom_list(), widget_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_new_uid(), and zot_refresh().

      @@ -1509,7 +1511,6 @@ Variables
      'https://zotid.net',
      'https://redmatrix.nl',
      'https://whogotzot.com',
      -
      'https://red.mariovavti.com',
      'https://red.zottel.red',
      'https://red.pixelbits.de'
      )
      @@ -1556,7 +1557,7 @@ Variables
      -

      Referenced by check_item_source(), new_contact(), onepoll_run(), and poller_run().

      +

      Referenced by check_item_source(), import_post(), new_contact(), onepoll_run(), poller_run(), and process_channel_sync_delivery().

      @@ -2307,7 +2308,7 @@ Variables
      -

      Referenced by api_statusnet_config(), check_config(), identity_basic_export(), and zfinger_init().

      +

      Referenced by api_statusnet_config(), check_config(), identity_basic_export(), and zfinger_init().

      @@ -2432,7 +2433,7 @@ Variables
      -

      Referenced by delete_imported_item(), delete_item_lowlevel(), and item_content().

      +

      Referenced by delete_imported_item(), delete_item_lowlevel(), diaspora_signed_retraction(), and item_content().

      @@ -2460,7 +2461,7 @@ Variables
      -

      Referenced by account_remove(), achievements_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_profs(), admin_page_site_post(), admin_page_users(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), bookmarks_init(), channel_content(), channel_init(), chat_content(), chat_init(), chatroom_enter(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_htaccess(), check_keys(), check_php(), check_smarty3(), check_store(), common_content(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), format_like(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_post(), import_xchan(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), load_database(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), pdledit_post(), photos_content(), photos_post(), poke_content(), post_init(), post_post(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), service_limits_content(), settings_post(), setup_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagrm_post(), thing_content(), thing_init(), user_allow(), user_approve(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

      +

      Referenced by account_remove(), achievements_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_profs(), admin_page_site_post(), admin_page_users(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), bookmarks_init(), channel_content(), channel_init(), chat_content(), chat_init(), chatroom_enter(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_htaccess(), check_keys(), check_php(), check_smarty3(), check_store(), common_content(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), format_like(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), load_database(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), pdledit_post(), photos_content(), photos_post(), poke_content(), post_init(), post_post(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), service_limits_content(), settings_post(), setup_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), tagrm_post(), thing_content(), thing_init(), user_allow(), user_approve(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

      @@ -2513,7 +2514,7 @@ Variables
      -

      Referenced by channel_remove(), import_xchan(), notifier_run(), post_post(), remove_all_xchan_resources(), zfinger_init(), and zot_get_hublocs().

      +

      Referenced by channel_remove(), notifier_run(), post_post(), remove_all_xchan_resources(), remove_obsolete_hublocs(), sync_locations(), zot_encode_locations(), and zot_get_hublocs().

      @@ -2527,7 +2528,7 @@ Variables
      -

      Referenced by import_xchan(), mark_orphan_hubsxchans(), and post_post().

      +

      Referenced by mark_orphan_hubsxchans(), post_post(), and sync_locations().

      @@ -2541,7 +2542,7 @@ Variables
      -

      Referenced by create_identity(), discover_by_webbie(), import_author_zot(), import_post(), import_xchan(), rconnect_url(), xchan_mail_query(), xchan_query(), zfinger_init(), zot_finger(), and zot_refresh().

      +

      Referenced by create_identity(), discover_by_webbie(), import_author_zot(), import_post(), rconnect_url(), sync_locations(), xchan_mail_query(), xchan_query(), zot_encode_locations(), zot_finger(), and zot_refresh().

      @@ -2555,7 +2556,7 @@ Variables
      -

      Referenced by zfinger_init().

      +

      Referenced by zot_encode_locations().

      @@ -2581,7 +2582,7 @@ Variables
      -

      Referenced by import_xchan(), mark_orphan_hubsxchans(), and post_post().

      +

      Referenced by mark_orphan_hubsxchans(), post_post(), and sync_locations().

      @@ -2687,7 +2688,7 @@ Variables
      -

      Referenced by consume_feed(), delete_imported_item(), delete_item_lowlevel(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_relay(), drop_item(), encode_item_flags(), expire_run(), get_item_elements(), item_check_service_class(), item_store(), like_content(), notifier_run(), photos_post(), poller_run(), and process_delivery().

      +

      Referenced by consume_feed(), delete_imported_item(), delete_item_lowlevel(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_relay(), drop_item(), encode_item_flags(), expire_run(), get_item_elements(), identity_basic_export(), item_check_service_class(), item_store(), like_content(), notifier_run(), photos_post(), poller_run(), and process_delivery().

      @@ -2743,7 +2744,7 @@ Variables
      -

      Referenced by Conversation\add_thread(), encode_item(), item_store(), and start_delivery_chain().

      +

      Referenced by Conversation\add_thread(), encode_item(), item_store(), and start_delivery_chain().

      @@ -2785,7 +2786,7 @@ Variables
      -

      Referenced by bb2diaspora_itembody(), diaspora_process_outbound(), editpost_content(), editwebpage_content(), encode_item(), get_item_elements(), item_post(), item_store(), item_store_update(), localize_item(), notification(), post_activity_item(), start_delivery_chain(), store_diaspora_comment_sig(), tag_deliver(), unobscure(), and viewsrc_content().

      +

      Referenced by bb2diaspora_itembody(), diaspora_process_outbound(), editpost_content(), editwebpage_content(), encode_item(), get_item_elements(), item_post(), item_store(), item_store_update(), localize_item(), notification(), post_activity_item(), start_delivery_chain(), store_diaspora_comment_sig(), tag_deliver(), unobscure(), and viewsrc_content().

      @@ -2800,7 +2801,7 @@ Variables

      Item Flags

      -

      Referenced by connedit_post(), diaspora_comment(), diaspora_like(), event_store_item(), externals_run(), item_post(), like_content(), mood_init(), notifier_run(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), profile_activity(), start_delivery_chain(), subthread_content(), tag_deliver(), tagger_content(), and thing_init().

      +

      Referenced by connedit_post(), diaspora_comment(), diaspora_like(), diaspora_signed_retraction(), event_store_item(), externals_run(), item_post(), like_content(), mood_init(), notifier_run(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), profile_activity(), start_delivery_chain(), subthread_content(), tag_deliver(), tagger_content(), and thing_init().

      @@ -2991,7 +2992,7 @@ Variables
      -

      Referenced by api_get_user(), channel_content(), connedit_post(), drop_item(), event_store_item(), events_content(), externals_run(), first_post_date(), item_expire(), item_post(), item_store(), items_fetch(), like_content(), manage_content(), mood_init(), notification(), notifier_run(), photo_upload(), photos_create_item(), ping_init(), poke_init(), post_activity_item(), process_delivery(), profile_activity(), start_delivery_chain(), subthread_content(), tag_deliver(), tagger_content(), thing_init(), widget_tagcloud_wall(), and zot_feed().

      +

      Referenced by api_get_user(), channel_content(), connedit_post(), drop_item(), event_store_item(), events_content(), externals_run(), first_post_date(), identity_basic_export(), item_expire(), item_post(), item_store(), items_fetch(), like_content(), manage_content(), mood_init(), notification(), notifier_run(), photo_upload(), photos_create_item(), ping_init(), poke_init(), post_activity_item(), process_delivery(), profile_activity(), start_delivery_chain(), subthread_content(), tag_deliver(), tagger_content(), thing_init(), widget_tagcloud_wall(), and zot_feed().

      @@ -3077,7 +3078,7 @@ Variables
      -

      Referenced by RedDirectory\__construct(), RedFile\__construct(), admin_page_logs(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), consume_feed(), RedDirectory\createFile(), deliver_run(), detect_language(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), dirprofile_init(), discover_by_url(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), import_xchan(), item_post(), item_store(), item_store_update(), RedDirectory\log(), RedBasicAuth\log(), magic_init(), mail_post(), mail_store(), mini_group_select(), new_contact(), notifier_run(), old_webfinger(), onepoll_run(), openid_content(), parse_xml_string(), photos_post(), ping_init(), poco_load(), post_post(), public_recips(), receive_post(), RedChannelList(), RedCollectionData(), RedDirectory\setName(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), update_feed_item(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

      +

      Referenced by RedDirectory\__construct(), RedFile\__construct(), admin_page_logs(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), consume_feed(), RedDirectory\createFile(), deliver_run(), detect_language(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), dirprofile_init(), discover_by_url(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), import_xchan(), item_post(), item_store(), item_store_update(), RedDirectory\log(), RedBasicAuth\log(), magic_init(), mail_post(), mail_store(), mini_group_select(), new_contact(), notifier_run(), old_webfinger(), onepoll_run(), openid_content(), parse_xml_string(), photos_post(), ping_init(), poco_load(), post_post(), process_location_delivery(), public_recips(), receive_post(), RedChannelList(), RedCollectionData(), RedDirectory\setName(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), update_feed_item(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

      @@ -3091,7 +3092,7 @@ Variables
      -

      Referenced by Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), bb2diaspora_itemwallwall(), bookmark_add(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_handle_from_contact(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_reshare(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), expire_run(), externals_run(), fetch_lrdd_template(), fix_private_photos(), RedFile\get(), get_diaspora_key(), get_language_name(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), group_content(), guess_image_type(), import_author_rss(), import_author_unknown(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), FKOAuth1\loginUser(), magic_init(), mail_store(), mood_init(), new_contact(), notes_init(), notification(), notifier_run(), onepoll_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_profile_delivery(), profile_load(), RedFile\put(), queue_run(), receive_post(), RedFileData(), Item\remove_child(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), RedFile\setName(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), tag_deliver(), unload_plugin(), z_fetch_url(), z_post_url(), zot_feed(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().

      +

      Referenced by Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), bb2diaspora_itemwallwall(), bookmark_add(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_handle_from_contact(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_reshare(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), expire_run(), externals_run(), fetch_lrdd_template(), fix_private_photos(), RedFile\get(), get_diaspora_key(), get_language_name(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), group_content(), guess_image_type(), import_author_rss(), import_author_unknown(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), FKOAuth1\loginUser(), magic_init(), mail_store(), mood_init(), new_contact(), notes_init(), notification(), notifier_run(), onepoll_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_location_delivery(), process_profile_delivery(), profile_load(), RedFile\put(), queue_run(), receive_post(), RedFileData(), Item\remove_child(), remove_obsolete_hublocs(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), RedFile\setName(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), sync_locations(), tag_deliver(), unload_plugin(), z_fetch_url(), z_post_url(), zot_feed(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().

      @@ -3865,7 +3866,7 @@ Variables
      -

      Referenced by advanced_profile(), comments_are_now_closed(), conversation(), create_account(), diaspora_request(), downgrade_accounts(), encode_item(), events_post(), externals_run(), feed_init(), get_item_elements(), get_mail_elements(), get_public_feed(), Item\get_template_data(), import_post(), item_post(), item_store(), item_store_update(), mail_post(), mail_store(), onepoll_run(), poller_run(), profiles_content(), profiles_post(), relative_date(), removeaccount_post(), removeme_post(), sync_directories(), zot_feed(), and zot_refresh().

      +

      Referenced by advanced_profile(), comments_are_now_closed(), conversation(), create_account(), diaspora_request(), downgrade_accounts(), encode_item(), events_post(), externals_run(), feed_init(), get_item_elements(), get_mail_elements(), get_public_feed(), Item\get_template_data(), import_post(), item_post(), item_store(), item_store_update(), mail_post(), mail_store(), onepoll_run(), poller_run(), profiles_content(), profiles_post(), relative_date(), removeaccount_post(), removeme_post(), sync_directories(), zot_feed(), and zot_refresh().

      @@ -3945,6 +3946,20 @@ Variables

      Referenced by RedChannelList(), and zfinger_init().

      + + + +
      +
      + + + + +
      const PAGE_HUBADMIN 0x2000
      +
      + +

      Referenced by siteinfo_init().

      +
      @@ -4000,7 +4015,7 @@ Variables
      -

      Referenced by create_identity(), create_sys_channel(), get_sys_channel(), is_sys_channel(), stream_perms_api_uids(), and zfinger_init().

      +

      Referenced by change_channel(), create_identity(), create_sys_channel(), get_sys_channel(), is_sys_channel(), stream_perms_api_uids(), and zfinger_init().

      @@ -4337,7 +4352,7 @@ Variables
      -

      Referenced by acl_init(), get_perms(), and item_post().

      +

      Referenced by acl_init(), get_perms(), get_role_perms(), and item_post().

      @@ -4485,7 +4500,7 @@ Variables
      - +
      const RED_PLATFORM 'Red Matrix'const RED_PLATFORM 'redmatrix'
      @@ -4494,7 +4509,7 @@ Variables

      This allows any individual website to participate in a matrix of linked sites and people and media sharing which is far greater than the reach of an individual site.

      If you are reading the source code and come across a function or code block which is not documented, but you have a good idea what it does, please add some descriptive comments and push it to the main project. Even if your description isn't perfect, it gives us a base which we can build on and correct - so that eventually everything is fully documented.

      -

      Referenced by api_statusnet_config(), App\build_pagehead(), get_feed_for(), identity_basic_export(), parse_url_content(), siteinfo_init(), and zfinger_init().

      +

      Referenced by api_statusnet_config(), App\build_pagehead(), get_feed_for(), identity_basic_export(), parse_url_content(), siteinfo_init(), and zfinger_init().

      @@ -4508,7 +4523,7 @@ Variables
      -

      Referenced by admin_page_summary(), api_friendica_version(), api_statusnet_config(), App\build_pagehead(), get_feed_for(), identity_basic_export(), siteinfo_content(), siteinfo_init(), and zfinger_init().

      +

      Referenced by admin_page_summary(), api_friendica_version(), api_statusnet_config(), App\build_pagehead(), get_feed_for(), identity_basic_export(), siteinfo_content(), siteinfo_init(), and zfinger_init().

      @@ -4973,7 +4988,7 @@ Variables
      -

      Referenced by connections_content(), contact_block(), dirsearch_content(), import_xchan(), manage_content(), mark_orphan_hubsxchans(), ping_init(), post_post(), and viewconnections_content().

      +

      Referenced by connections_content(), contact_block(), dirsearch_content(), manage_content(), mark_orphan_hubsxchans(), ping_init(), post_post(), sync_locations(), and viewconnections_content().

      diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 117dd519a..0652dbcfe 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -219,6 +219,7 @@ var boot_8php = [ "PAGE_CENSORED", "boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214", null ], [ "PAGE_DIRECTORY_CHANNEL", "boot_8php.html#a5b8484922918946d041e5e0515dbe718", null ], [ "PAGE_HIDDEN", "boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640", null ], + [ "PAGE_HUBADMIN", "boot_8php.html#afbb21ecccac9819aa65397e816868a5f", null ], [ "PAGE_NORMAL", "boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3", null ], [ "PAGE_PREMIUM", "boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8", null ], [ "PAGE_REMOVED", "boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6", null ], diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index 47ff1598c..dabecb861 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -344,7 +344,7 @@ Functions
      -

      Referenced by bb2diaspora_itembody(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_relay(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), mail_post(), new_contact(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), probe_content(), start_delivery_chain(), store_diaspora_comment_sig(), tag_deliver(), unobscure(), viewsrc_content(), zot_import(), and zot_refresh().

      +

      Referenced by bb2diaspora_itembody(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_relay(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), mail_post(), new_contact(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), probe_content(), start_delivery_chain(), store_diaspora_comment_sig(), tag_deliver(), unobscure(), viewsrc_content(), zot_import(), and zot_refresh().

      @@ -778,7 +778,7 @@ Functions
      -

      Referenced by diaspora_comment(), diaspora_conversation(), diaspora_decode(), diaspora_like(), diaspora_message(), diaspora_signed_retraction(), get_item_elements(), import_site(), import_xchan(), post_init(), post_post(), zfinger_init(), and zot_register_hub().

      +

      Referenced by diaspora_comment(), diaspora_conversation(), diaspora_decode(), diaspora_like(), diaspora_message(), diaspora_signed_retraction(), get_item_elements(), import_site(), import_xchan(), post_init(), post_post(), sync_locations(), zfinger_init(), and zot_register_hub().

      diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 7862216a3..a255c828a 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -336,7 +336,7 @@ Functions
      -

      Referenced by abook_toggle_flag(), account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_delete(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chat_message(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_post(), Cache\clear(), comments_are_now_closed(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_message(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_status(), diaspora_signed_retraction(), diaspora_transmit(), directory_run(), dirsearch_content(), discover_by_url(), discover_by_webbie(), dlogger(), dob(), editpost_content(), ev_compare(), event_store_event(), events_content(), events_post(), externals_run(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_author_rss(), import_author_unknown(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), list_post_dates(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), manage_content(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), openid_content(), pagelist_widget(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), prune_hub_reinstalls(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), removeaccount_post(), removeme_post(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), tag_deliver(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), verify_email_address(), webpages_content(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

      +

      Referenced by abook_toggle_flag(), account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_delete(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chat_message(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_post(), Cache\clear(), comments_are_now_closed(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_message(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_status(), diaspora_transmit(), directory_run(), dirsearch_content(), discover_by_url(), discover_by_webbie(), dlogger(), dob(), editpost_content(), ev_compare(), event_store_event(), events_content(), events_post(), externals_run(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_author_rss(), import_author_unknown(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), list_post_dates(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), manage_content(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), openid_content(), pagelist_widget(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), prune_hub_reinstalls(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), removeaccount_post(), removeme_post(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), sync_locations(), tag_deliver(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), verify_email_address(), webpages_content(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

      diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index bbe4c7f11..7f3d1da9b 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
      -

      Referenced by abook_toggle_flag(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_page_profs_post(), admin_page_users(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_mentions(), api_user(), api_users_show(), app_destroy(), app_installed(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), bb2dmention_callback(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_upstream_directory(), check_webbie(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), RedDirectory\createFile(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_handle_from_contact(), diaspora_like(), diaspora_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_relay(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_query_build(), directory_run(), dirsearch_content(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), import_author_diaspora(), import_author_rss(), import_author_unknown(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), item_add_cid(), item_message_id(), item_permissions_sql(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layouts_content(), like_content(), list_public_sites(), load_config(), load_plugin(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), menu_list(), msearch_post(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poll_post(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_photo_set_profile_perms(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_permissions_sql(), public_recips(), RedFile\put(), queue_run(), rconnect_url(), receive_post(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), sitelist_init(), sources_content(), sources_post(), start_delivery_chain(), photo_driver\store(), store_diaspora_comment_sig(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_item(), widget_savedsearch(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

      +

      Referenced by abook_toggle_flag(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_page_profs_post(), admin_page_users(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_mentions(), api_user(), api_users_show(), app_destroy(), app_installed(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), bb2dmention_callback(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_upstream_directory(), check_webbie(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), RedDirectory\createFile(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_handle_from_contact(), diaspora_like(), diaspora_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_relay(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_query_build(), directory_run(), dirsearch_content(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), import_author_diaspora(), import_author_rss(), import_author_unknown(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), item_add_cid(), item_message_id(), item_permissions_sql(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layouts_content(), like_content(), list_public_sites(), load_config(), load_plugin(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), menu_list(), msearch_post(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poll_post(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_location_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_photo_set_profile_perms(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_permissions_sql(), public_recips(), RedFile\put(), queue_run(), rconnect_url(), receive_post(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_obsolete_hublocs(), remove_queue_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), sitelist_init(), sources_content(), sources_post(), start_delivery_chain(), photo_driver\store(), store_diaspora_comment_sig(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), sync_locations(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_item(), widget_savedsearch(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

      @@ -318,7 +318,7 @@ Functions

      This will happen occasionally trying to store the session data after abnormal program termination

      -

      Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_profs(), admin_page_profs_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), advanced_profile(), all_friends(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_group(), api_group_members(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_user(), api_users_show(), app_destroy(), app_installed(), app_list(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), bb2dmention_callback(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_upstream_directory(), check_webbie(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_handle_from_contact(), diaspora_like(), diaspora_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), expand_groups(), expire_run(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), identity_basic_export(), identity_check_service_class(), identity_selector(), import_author_diaspora(), import_author_rss(), import_author_unknown(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), is_sys_channel(), item_add_cid(), item_check_service_class(), item_content(), item_expire(), item_message_id(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_content(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), nav(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), pagelist_widget(), pdl_selector(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poke_content(), poke_init(), poll_content(), poll_post(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), receive_post(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), retain_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), start_delivery_chain(), photo_driver\store(), store_diaspora_comment_sig(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_filer(), widget_follow(), widget_item(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

      +

      Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_service_class_fetch(), account_total(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_profs(), admin_page_profs_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), advanced_profile(), all_friends(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_group(), api_group_members(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_user(), api_users_show(), app_destroy(), app_installed(), app_list(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), bb2dmention_callback(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_upstream_directory(), check_webbie(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_handle_from_contact(), diaspora_like(), diaspora_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), expand_groups(), expire_run(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), identity_basic_export(), identity_check_service_class(), identity_selector(), import_author_diaspora(), import_author_rss(), import_author_unknown(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), is_sys_channel(), item_add_cid(), item_check_service_class(), item_content(), item_expire(), item_message_id(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_content(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), nav(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), pagelist_widget(), pdl_selector(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poke_content(), poke_init(), poll_content(), poll_post(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_location_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), receive_post(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_obsolete_hublocs(), remove_queue_item(), retain_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), start_delivery_chain(), photo_driver\store(), store_diaspora_comment_sig(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), sync_locations(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_filer(), widget_follow(), widget_item(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

      diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index b1fc981f7..a851a9790 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
      -

      Referenced by _well_known_init(), activity_sanitise(), api_rss_extra(), api_statuses_user_timeline(), app_store(), app_update(), appman_post(), array_sanitise(), attach_mkdir(), attach_store(), bookmark_add(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatsvc_post(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connect_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), diaspora_like(), diaspora_process_outbound(), directory_content(), discover_by_url(), discover_by_webbie(), drop_item(), event_store_event(), event_store_item(), externals_run(), feature_enabled(), fetch_xrd_links(), filter_insecure(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_cloudpath(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_unknown(), import_author_xchan(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profiles_content(), redbasic_form(), register_page_template(), register_post(), remove_community_tag(), replace_macros(), rmagic_post(), photo_driver\save(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), theme_content(), thing_init(), translate_system_apps(), validate_channelname(), verify_email_address(), wfinger_init(), widget_affinity(), widget_archive(), widget_clock(), widget_item(), widget_photo(), widget_suggestions(), widget_tagcloud_wall(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

      +

      Referenced by _well_known_init(), account_service_class_fetch(), activity_sanitise(), api_rss_extra(), api_statuses_user_timeline(), app_store(), app_update(), appman_post(), array_sanitise(), attach_mkdir(), attach_store(), bookmark_add(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatsvc_post(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connect_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), diaspora_like(), diaspora_process_outbound(), directory_content(), discover_by_url(), discover_by_webbie(), drop_item(), event_store_event(), event_store_item(), externals_run(), feature_enabled(), fetch_xrd_links(), filter_insecure(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_cloudpath(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_unknown(), import_author_xchan(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_location_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profiles_content(), redbasic_form(), register_page_template(), register_post(), remove_community_tag(), replace_macros(), rmagic_post(), photo_driver\save(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), sync_locations(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), theme_content(), thing_init(), translate_system_apps(), validate_channelname(), verify_email_address(), wfinger_init(), widget_affinity(), widget_archive(), widget_clock(), widget_item(), widget_photo(), widget_suggestions(), widget_tagcloud_wall(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

      @@ -160,7 +160,7 @@ Variables
      -

      Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), app_decode(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), bookmarks_init(), chanlink_hash(), chanlink_url(), comanche_parser(), comanche_region(), comanche_webpage(), construct_page(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_is_blacklisted(), diaspora_ol(), diaspora_ul(), dir_parse_query(), dir_query_build(), event_store_item(), expand_acl(), extra_query_args(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_categories(), format_filer(), format_hashtags(), format_mentions(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_language_name(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_content(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), searchbox(), siteinfo_content(), smilies(), sslify(), string_splitter(), strip_zids(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), theme_attachments(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger_rfc7033(), x(), z_fetch_url(), z_input_filter(), z_post_url(), zfinger_init(), and zid().

      +

      Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), app_decode(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), bookmarks_init(), chanlink_hash(), chanlink_url(), comanche_parser(), comanche_region(), comanche_webpage(), construct_page(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_is_blacklisted(), diaspora_ol(), diaspora_ul(), dir_parse_query(), dir_query_build(), event_store_item(), expand_acl(), extra_query_args(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_categories(), format_filer(), format_hashtags(), format_mentions(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_language_name(), get_markup_template(), get_tags(), html2bb_video(), import_xchan(), info(), is_a_date_arg(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_content(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), searchbox(), siteinfo_content(), smilies(), sslify(), string_splitter(), strip_zids(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), theme_attachments(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger_rfc7033(), x(), xchan_content(), z_fetch_url(), z_input_filter(), z_post_url(), zfinger_init(), and zid().

      diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html index 50c4063df..f789f92bb 100644 --- a/doc/html/globals_0x61.html +++ b/doc/html/globals_0x61.html @@ -225,6 +225,9 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
    • ACCOUNT_ROLE_SYSTEM : boot.php
      • +
    • account_service_class_fetch() +: account.php +
    • account_total() : account.php
      • diff --git a/doc/html/globals_0x65.html b/doc/html/globals_0x65.html index f5fcb73ed..42498664d 100644 --- a/doc/html/globals_0x65.html +++ b/doc/html/globals_0x65.html @@ -169,7 +169,7 @@ $(document).ready(function(){initNavTree('globals_0x65.html','');}); : network.php
    • encode_item() -: items.php +: items.php
    • encode_item_flags() : items.php diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index 4c67d125c..55fd808ee 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -145,7 +145,7 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});

      - i -

      • identity_basic_export() -: identity.php +: identity.php
      • identity_check_service_class() : identity.php diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index 97abc9796..78d88cc98 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -168,6 +168,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
      • PAGE_HIDDEN : boot.php
        • +
      • PAGE_HUBADMIN +: boot.php +
      • page_init() : page.php
        • @@ -576,6 +579,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
      • process_delivery() : zot.php
        • +
      • process_location_delivery() +: zot.php +
      • process_mail_delivery() : zot.php
        • diff --git a/doc/html/globals_0x72.html b/doc/html/globals_0x72.html index 59d754eb8..fb860ab29 100644 --- a/doc/html/globals_0x72.html +++ b/doc/html/globals_0x72.html @@ -291,6 +291,9 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});
      • remove_community_tag() : zot.php
        • +
      • remove_obsolete_hublocs() +: hubloc.php +
      • remove_queue_item() : queue_fn.php
        • @@ -333,6 +336,9 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});
      • rmagic_post() : rmagic.php
        • +
      • role_selector() +: permissions.php +
      • rpost_callback() : bbcode.php
        • diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html index ca96c5bc3..014205a9e 100644 --- a/doc/html/globals_0x73.html +++ b/doc/html/globals_0x73.html @@ -366,6 +366,9 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
      • sync_directories() : dir_fns.php
        • +
      • sync_locations() +: zot.php +
      • system_down() : system_unavailable.php
        • diff --git a/doc/html/globals_0x7a.html b/doc/html/globals_0x7a.html index 96043b279..f69270ec7 100644 --- a/doc/html/globals_0x7a.html +++ b/doc/html/globals_0x7a.html @@ -162,6 +162,9 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');});
      • z_post_url() : network.php
        • +
      • z_post_url_json() +: network.php +
      • z_readdir() : attach.php
        • @@ -192,6 +195,9 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');});
      • zot_build_packet() : zot.php
        • +
      • zot_encode_locations() +: zot.php +
      • zot_feed() : items.php
        • diff --git a/doc/html/globals_func_0x61.html b/doc/html/globals_func_0x61.html index 5a1e49fad..ee7ca7aa7 100644 --- a/doc/html/globals_func_0x61.html +++ b/doc/html/globals_func_0x61.html @@ -158,6 +158,9 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');});
      • account_remove() : Contact.php
        • +
      • account_service_class_fetch() +: account.php +
      • account_total() : account.php
        • diff --git a/doc/html/globals_func_0x65.html b/doc/html/globals_func_0x65.html index 1bac29965..d52e7eb3c 100644 --- a/doc/html/globals_func_0x65.html +++ b/doc/html/globals_func_0x65.html @@ -162,7 +162,7 @@ $(document).ready(function(){initNavTree('globals_func_0x65.html','');}); : network.php
      • encode_item() -: items.php +: items.php
      • encode_item_flags() : items.php diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html index 03f74fa40..a4a665432 100644 --- a/doc/html/globals_func_0x69.html +++ b/doc/html/globals_func_0x69.html @@ -144,7 +144,7 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});

        - i -

        • identity_basic_export() -: identity.php +: identity.php
        • identity_check_service_class() : identity.php diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html index dc9c4c03d..7d55c379d 100644 --- a/doc/html/globals_func_0x70.html +++ b/doc/html/globals_func_0x70.html @@ -431,6 +431,9 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
        • process_delivery() : zot.php
          • +
        • process_location_delivery() +: zot.php +
        • process_mail_delivery() : zot.php
          • diff --git a/doc/html/globals_func_0x72.html b/doc/html/globals_func_0x72.html index df84835d5..bd2e05805 100644 --- a/doc/html/globals_func_0x72.html +++ b/doc/html/globals_func_0x72.html @@ -269,6 +269,9 @@ $(document).ready(function(){initNavTree('globals_func_0x72.html','');});
        • remove_community_tag() : zot.php
          • +
        • remove_obsolete_hublocs() +: hubloc.php +
        • remove_queue_item() : queue_fn.php
          • @@ -308,6 +311,9 @@ $(document).ready(function(){initNavTree('globals_func_0x72.html','');});
        • rmagic_post() : rmagic.php
          • +
        • role_selector() +: permissions.php +
        • rpost_callback() : bbcode.php
          • diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html index 063f8e2fe..e7a91598d 100644 --- a/doc/html/globals_func_0x73.html +++ b/doc/html/globals_func_0x73.html @@ -353,6 +353,9 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
        • sync_directories() : dir_fns.php
          • +
        • sync_locations() +: zot.php +
        • system_down() : system_unavailable.php
          • diff --git a/doc/html/globals_func_0x7a.html b/doc/html/globals_func_0x7a.html index 6b484536f..d55be5649 100644 --- a/doc/html/globals_func_0x7a.html +++ b/doc/html/globals_func_0x7a.html @@ -161,6 +161,9 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');});
        • z_post_url() : network.php
          • +
        • z_post_url_json() +: network.php +
        • z_readdir() : attach.php
          • @@ -188,6 +191,9 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');});
        • zot_build_packet() : zot.php
          • +
        • zot_encode_locations() +: zot.php +
        • zot_feed() : items.php
          • diff --git a/doc/html/globals_vars_0x70.html b/doc/html/globals_vars_0x70.html index 093dbc365..ceedc1719 100644 --- a/doc/html/globals_vars_0x70.html +++ b/doc/html/globals_vars_0x70.html @@ -160,6 +160,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x70.html','');});
        • PAGE_HIDDEN : boot.php
          • +
        • PAGE_HUBADMIN +: boot.php +
        • PAGE_NORMAL : boot.php
          • diff --git a/doc/html/hubloc_8php.html b/doc/html/hubloc_8php.html index 12b2bf7f3..64d5e920f 100644 --- a/doc/html/hubloc_8php.html +++ b/doc/html/hubloc_8php.html @@ -116,6 +116,8 @@ Functions    prune_hub_reinstalls ()   + remove_obsolete_hublocs () + 

          Function Documentation

          @@ -151,6 +153,23 @@ Functions

          Referenced by poller_run().

          + + + +
          +
          + + + + + + + +
          remove_obsolete_hublocs ()
          +
          + +

          Referenced by poller_run().

          +
          diff --git a/doc/html/hubloc_8php.js b/doc/html/hubloc_8php.js index d025f7c76..3b2e4bb1e 100644 --- a/doc/html/hubloc_8php.js +++ b/doc/html/hubloc_8php.js @@ -1,5 +1,6 @@ var hubloc_8php = [ [ "is_matrix_url", "hubloc_8php.html#aebd244b4616ded022cbbee5e82926951", null ], - [ "prune_hub_reinstalls", "hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002", null ] + [ "prune_hub_reinstalls", "hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002", null ], + [ "remove_obsolete_hublocs", "hubloc_8php.html#a84c79b7be352f62d12fe4fa2c80fc6ea", null ] ]; \ No newline at end of file diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index 5474c3758..e4d17864d 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -128,8 +128,8 @@ Functions    set_default_login_identity ($account_id, $channel_id, $force=true)   - identity_basic_export ($channel_id) -  + identity_basic_export ($channel_id, $items=false) +   profile_load (&$a, $nickname, $profile= '')    profile_create_sidebar (&$a, $connect=true) @@ -430,7 +430,7 @@ Functions
          -

          Referenced by Conversation\add_thread(), check_config(), create_sys_channel(), display_content(), expire_run(), externals_run(), get_theme_uid(), like_content(), network_content(), notifier_run(), search_content(), subthread_content(), and zotfeed_init().

          +

          Referenced by Conversation\add_thread(), check_config(), create_sys_channel(), display_content(), expire_run(), externals_run(), get_theme_uid(), home_content(), like_content(), network_content(), notifier_run(), search_content(), subthread_content(), zot_import(), and zotfeed_init().

          @@ -449,7 +449,7 @@ Functions - +
          @@ -457,8 +457,18 @@ Functions - + + + + + + + + + + +
          identity_basic_export (  $channel_id)$channel_id,
           $items = false 
          )
          diff --git a/doc/html/identity_8php.js b/doc/html/identity_8php.js index e28d89abb..f683df553 100644 --- a/doc/html/identity_8php.js +++ b/doc/html/identity_8php.js @@ -15,7 +15,7 @@ var identity_8php = [ "get_profile_fields_basic", "identity_8php.html#a4ff59df0f0a668a06a8411f87496aa21", null ], [ "get_sys_channel", "identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51", null ], [ "get_theme_uid", "identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3", null ], - [ "identity_basic_export", "identity_8php.html#a3570a4eb77332b292d394c4132cb8f03", null ], + [ "identity_basic_export", "identity_8php.html#afaedbc8e2d2a70ec8b006162baac5249", null ], [ "identity_check_service_class", "identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633", null ], [ "identity_selector", "identity_8php.html#a2ab5172eabd375869060c9ad68323f5c", null ], [ "is_foreigner", "identity_8php.html#ae2b140df652a55ca11bb6a99005fce35", null ], diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 18c3fe263..904e0eccd 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -258,7 +258,7 @@ Functions
          -

          Referenced by account_verify_password(), acl_init(), admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), bb2diaspora_itembody(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), check_upstream_directory(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedDirectory\createFile(), detect_language(), diaspora_comment(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_relay(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), downgrade_accounts(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), externals_run(), feature_enabled(), feed_init(), filter_insecure(), find_upstream_directory(), findpeople_widget(), get_all_perms(), Item\get_comment_box(), get_default_profile_photo(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_max_import_size(), get_online_status(), get_profile_fields_advanced(), get_profile_fields_basic(), RedDirectory\getChild(), RedDirectory\getChildren(), group_content(), home_content(), home_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), is_public_profile(), item_post(), item_store(), item_store_update(), photo_imagick\load(), localize_item(), logger(), login(), lostpass_content(), lostpass_post(), mark_orphan_hubsxchans(), nav(), navbar_complete(), network_content(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_contact(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_activity_item(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), receive_post(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), service_limits_content(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), siteinfo_init(), smilies(), start_delivery_chain(), store_diaspora_comment_sig(), tag_deliver(), theme_admin(), unobscure(), update_modtime(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), verify_email_address(), viewconnections_content(), viewconnections_init(), viewsrc_content(), widget_fullprofile(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

          +

          Referenced by account_service_class_fetch(), account_verify_password(), acl_init(), admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), bb2diaspora_itembody(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), check_upstream_directory(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedDirectory\createFile(), detect_language(), diaspora_comment(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_relay(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), downgrade_accounts(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), externals_run(), feature_enabled(), feed_init(), filter_insecure(), find_upstream_directory(), findpeople_widget(), get_all_perms(), Item\get_comment_box(), get_default_profile_photo(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_max_import_size(), get_online_status(), get_profile_fields_advanced(), get_profile_fields_basic(), RedDirectory\getChild(), RedDirectory\getChildren(), group_content(), home_content(), home_init(), identity_basic_export(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), is_public_profile(), item_post(), item_store(), item_store_update(), photo_imagick\load(), localize_item(), logger(), login(), lostpass_content(), lostpass_post(), mark_orphan_hubsxchans(), nav(), navbar_complete(), network_content(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_contact(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_activity_item(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), receive_post(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), remove_obsolete_hublocs(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), service_limits_content(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), siteinfo_init(), smilies(), start_delivery_chain(), store_diaspora_comment_sig(), tag_deliver(), theme_admin(), unobscure(), update_modtime(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), verify_email_address(), viewconnections_content(), viewconnections_init(), viewsrc_content(), widget_fullprofile(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

          @@ -326,7 +326,7 @@ Functions
          -

          Referenced by Conversation\__construct(), acl_init(), bb2diaspora_itembody(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_post(), construct_page(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), fix_attached_file_permissions(), fix_attached_photo_permissions(), Item\get_comment_box(), get_online_status(), get_theme_uid(), group_content(), home_init(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), mail_content(), message_content(), network_content(), notification(), pdledit_content(), post_post(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), rpost_content(), search_content(), set_pconfig(), smilies(), tag_deliver(), theme_content(), webpages_content(), and widget_notes().

          +

          Referenced by Conversation\__construct(), acl_init(), bb2diaspora_itembody(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), fix_attached_file_permissions(), fix_attached_photo_permissions(), Item\get_comment_box(), get_online_status(), Item\get_template_data(), get_theme_uid(), group_content(), home_init(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), mail_content(), message_content(), network_content(), new_contact(), notification(), pdledit_content(), post_post(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), rpost_content(), search_content(), set_pconfig(), smilies(), tag_deliver(), theme_content(), webpages_content(), and widget_notes().

          @@ -510,7 +510,7 @@ Functions
          -

          Referenced by connect_post(), invite_post(), notes_init(), pdledit_post(), process_channel_sync_delivery(), register_post(), settings_post(), and theme_post().

          +

          Referenced by connect_post(), create_identity(), invite_post(), notes_init(), pdledit_post(), process_channel_sync_delivery(), register_post(), settings_post(), and theme_post().

          diff --git a/doc/html/include_2group_8php.html b/doc/html/include_2group_8php.html index dfba8fafe..86f931911 100644 --- a/doc/html/include_2group_8php.html +++ b/doc/html/include_2group_8php.html @@ -226,7 +226,7 @@ Functions
          -

          Referenced by connections_post(), connedit_post(), contactgroup_content(), diaspora_request(), group_content(), and new_contact().

          +

          Referenced by connections_post(), connedit_post(), contactgroup_content(), create_identity(), diaspora_request(), group_content(), and new_contact().

          diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 3a4f936bb..54b370806 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -118,6 +118,8 @@ Functions    z_post_url ($url, $params, $redirects=0, $opts=array())   + z_post_url_json ($url, $params, $redirects=0, $opts=array()) +   json_return_and_die ($x)    xml_status ($st, $message= '') @@ -796,7 +798,45 @@ Functions
          Returns
          array 'return_code' => HTTP return code or 0 if timeout or failure 'success' => boolean true (if HTTP 2xx result) or false 'header' => HTTP headers 'body' => fetched content
          -

          Referenced by deliver_run(), oexchange_content(), queue_run(), share_init(), zot_finger(), zot_refresh(), and zot_zot().

          +

          Referenced by deliver_run(), oexchange_content(), queue_run(), share_init(), z_post_url_json(), zot_finger(), zot_refresh(), and zot_zot().

          + + + + +
          +
          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          z_post_url_json ( $url,
           $params,
           $redirects = 0,
           $opts = array() 
          )
          +
          diff --git a/doc/html/include_2network_8php.js b/doc/html/include_2network_8php.js index 95d48dbd8..4e4382941 100644 --- a/doc/html/include_2network_8php.js +++ b/doc/html/include_2network_8php.js @@ -24,5 +24,6 @@ var include_2network_8php = [ "xml2array", "include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff", null ], [ "xml_status", "include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6", null ], [ "z_fetch_url", "include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37", null ], - [ "z_post_url", "include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc", null ] + [ "z_post_url", "include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc", null ], + [ "z_post_url_json", "include_2network_8php.html#a984708e60d531b31b2d1f88b5f408f7b", null ] ]; \ No newline at end of file diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index c92c0e8d2..8801f8983 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -158,8 +158,8 @@ Functions    import_author_unknown ($x)   - encode_item ($item) -  + encode_item ($item, $mirror=false) +   map_scope ($scope, $strip=false)    translate_scope ($scope) @@ -757,7 +757,7 @@ Functions
          -

          Referenced by api_statuses_destroy(), consume_feed(), contact_remove(), delete_imported_item(), drop_items(), expire_run(), item_content(), item_expire(), like_content(), photos_post(), poller_run(), and remove_all_xchan_resources().

          +

          Referenced by api_statuses_destroy(), consume_feed(), contact_remove(), delete_imported_item(), diaspora_retraction(), diaspora_signed_retraction(), drop_items(), expire_run(), item_content(), item_expire(), like_content(), photos_post(), poller_run(), and remove_all_xchan_resources().

          @@ -779,7 +779,7 @@ Functions - +
          @@ -787,13 +787,23 @@ Functions - + + + + + + + + + + +
          encode_item (  $item)$item,
           $mirror = false 
          )
          -

          Referenced by notifier_run(), and zot_feed().

          +

          Referenced by identity_basic_export(), notifier_run(), and zot_feed().

          @@ -811,7 +821,7 @@ Functions
          -

          Referenced by encode_item().

          +

          Referenced by encode_item().

          @@ -829,7 +839,7 @@ Functions
          -

          Referenced by encode_item().

          +

          Referenced by encode_item().

          @@ -847,7 +857,7 @@ Functions
          -

          Referenced by encode_item(), and encode_mail().

          +

          Referenced by encode_item(), and encode_mail().

          @@ -929,7 +939,7 @@ Functions
          -

          Referenced by block_content(), bookmarks_init(), channel_content(), display_content(), editpost_content(), event_store_item(), events_content(), home_content(), item_expire(), items_fetch(), network_content(), notifier_run(), page_content(), search_content(), tag_deliver(), widget_item(), and zot_feed().

          +

          Referenced by block_content(), bookmarks_init(), channel_content(), display_content(), editpost_content(), event_store_item(), events_content(), home_content(), identity_basic_export(), item_expire(), items_fetch(), network_content(), notifier_run(), page_content(), search_content(), tag_deliver(), widget_item(), and zot_feed().

          @@ -1311,7 +1321,7 @@ Functions
          -

          Referenced by import_author_xchan().

          +

          Referenced by consume_feed(), and import_author_xchan().

          @@ -1649,7 +1659,7 @@ Functions
          -

          Referenced by encode_item(), item_post(), post_activity_item(), profiles_content(), and start_delivery_chain().

          +

          Referenced by encode_item(), item_post(), post_activity_item(), profiles_content(), and start_delivery_chain().

          diff --git a/doc/html/items_8php.js b/doc/html/items_8php.js index cd00efec2..7b326cce6 100644 --- a/doc/html/items_8php.js +++ b/doc/html/items_8php.js @@ -18,7 +18,7 @@ var items_8php = [ "delete_item_lowlevel", "items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb", null ], [ "drop_item", "items_8php.html#a555762e1022a4b8e3c3abd32e7812408", null ], [ "drop_items", "items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55", null ], - [ "encode_item", "items_8php.html#a82955cc578f0fa600acec84475026194", null ], + [ "encode_item", "items_8php.html#a56b0f5d2cb36eb8f4bfca84813884f86", null ], [ "encode_item_flags", "items_8php.html#a5f690fc2484abec07840b4f9dd525bd9", null ], [ "encode_item_terms", "items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a", null ], [ "encode_item_xchan", "items_8php.html#a566c601726697e044e75284af7fb6f17", null ], diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 1f836abfb..52ab5d5c8 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -372,7 +372,7 @@ Functions
          Returns
          translated string if exsists, otherwise s
          -

          Referenced by account_remove(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_profs(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_post(), advanced_profile(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), app_render(), app_store(), app_update(), appman_content(), appman_post(), apps_content(), apw_form(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), bb2diaspora_itembody(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatsvc_content(), check_account_email(), check_account_invite(), check_config(), check_form_security_std_err_msg(), check_funcs(), check_htaccess(), check_htconfig(), check_keys(), check_php(), check_smarty3(), check_store(), cloud_init(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_poll_interval(), conversation(), create_account(), create_identity(), datesel_format(), day_translate(), delegate_content(), design_tools(), diaspora_like(), dir_safe_mode(), dir_sort_links(), dir_tagblock(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store_item(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_init(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), Item\get_template_data(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), home_content(), RedBrowser\htmlActionsPanel(), identity_check_service_class(), import_author_rss(), import_author_unknown(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), invite_content(), invite_post(), item_check_service_class(), item_content(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), layout_select(), layouts_content(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), marital_selector_min(), match_content(), menu_content(), menu_post(), menu_render(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), openid_content(), page_content(), pagelist_widget(), paginate(), pdl_selector(), pdledit_content(), pdledit_post(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), poll_content(), populate_acl(), post_activity_item(), post_init(), probe_content(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), rbmark_content(), rbmark_post(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_content(), rmagic_post(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), service_limits_content(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), thing_content(), thing_init(), timezone_cmp(), translate_scope(), translate_system_apps(), update_birthdays(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_approve(), user_deny(), validate_channelname(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), wall_upload_post(), webpages_content(), what_next(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), widget_tagcloud(), writepages_widget(), xchan_content(), z_readdir(), and zfinger_init().

          +

          Referenced by account_remove(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_profs(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_post(), advanced_profile(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), app_render(), app_store(), app_update(), appman_content(), appman_post(), apps_content(), apw_form(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), bb2diaspora_itembody(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatsvc_content(), check_account_email(), check_account_invite(), check_config(), check_form_security_std_err_msg(), check_funcs(), check_htaccess(), check_htconfig(), check_keys(), check_php(), check_smarty3(), check_store(), cloud_init(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_poll_interval(), conversation(), create_account(), create_identity(), datesel_format(), day_translate(), delegate_content(), design_tools(), diaspora_like(), dir_safe_mode(), dir_sort_links(), dir_tagblock(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store_item(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_init(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), Item\get_template_data(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), home_content(), RedBrowser\htmlActionsPanel(), identity_check_service_class(), import_author_rss(), import_author_unknown(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), invite_content(), invite_post(), item_check_service_class(), item_content(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), layout_select(), layouts_content(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), marital_selector_min(), match_content(), menu_content(), menu_post(), menu_render(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), openid_content(), page_content(), pagelist_widget(), paginate(), pdl_selector(), pdledit_content(), pdledit_post(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), poll_content(), populate_acl(), post_activity_item(), post_init(), probe_content(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), rbmark_content(), rbmark_post(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_content(), rmagic_post(), role_selector(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), service_limits_content(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), thing_content(), thing_init(), timezone_cmp(), translate_scope(), translate_system_apps(), update_birthdays(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_approve(), user_deny(), validate_channelname(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), wall_upload_post(), webpages_content(), what_next(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), widget_tagcloud(), writepages_widget(), xchan_content(), z_readdir(), and zfinger_init().

          diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 897e32837..b64df983c 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -37,15 +37,15 @@ var NAVTREE = var NAVTREEINDEX = [ "BS-Default_8php.html", -"boot_8php.html#a5b8484922918946d041e5e0515dbe718", -"classApp.html#a604d659d6977a99de42a160343e5289a", -"classdba__mysql.html#a1887338627ce0e28786839363014bd0b", -"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13", -"html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2", -"index.html", -"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a", -"socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9", -"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8" +"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa", +"classApp.html#a5cfc098c061b7d765add58fd2ca97445", +"classdba__driver.html#afc95ffa103a3290581b537670cde5311", +"dir__fns_8php.html", +"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7", +"include_2probe_8php.html#a950a200372393f706851103cd3fffcba", +"pages.html", +"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6", +"widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 2e98d345d..3b9ebf7eb 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -25,24 +25,25 @@ var NAVTREEINDEX0 = "__well__known_8php.html":[6,0,1,0], "__well__known_8php.html#a6ebfa937a2024f0b5dab53f0ac90fed0":[6,0,1,0,0], "account_8php.html":[6,0,0,2], -"account_8php.html#a014de2d5d5c9785de5bf547a485822fa":[6,0,0,2,7], -"account_8php.html#a030cec6793b909c439c0336ba39b1571":[6,0,0,2,9], -"account_8php.html#a0d183a3cb4c67a0f5e906811df7a1fc9":[6,0,0,2,6], -"account_8php.html#a141fe579c351c78209d425473f978eb5":[6,0,0,2,5], -"account_8php.html#a144b4891022567668375b58ea61cfff0":[6,0,0,2,4], -"account_8php.html#a43e3042b2723d76915a030bac3c668b6":[6,0,0,2,0], -"account_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[6,0,0,2,12], -"account_8php.html#a754d7f53b3abc557b753c057dc4e021d":[6,0,0,2,11], -"account_8php.html#a901657dd078e070516cf97285e0bada7":[6,0,0,2,13], -"account_8php.html#a905b54e10704b283ac64680a8abc0971":[6,0,0,2,10], -"account_8php.html#a917d74aad0baf3e0c4b51cf1051e654f":[6,0,0,2,1], -"account_8php.html#aa9c29c497c17d8f9344dce8631ad8761":[6,0,0,2,8], -"account_8php.html#aaff7720423417a4333697894ffd9ddeb":[6,0,0,2,3], -"account_8php.html#ac1653efba62493b9d87513e1b6c04c83":[6,0,0,2,16], -"account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1":[6,0,0,2,14], -"account_8php.html#acd6b8d2124ba5ea4f4794d2c58ae8bf5":[6,0,0,2,17], -"account_8php.html#ad07be417ac7eda939768804106ddea3d":[6,0,0,2,15], -"account_8php.html#ae052bd5558847bd38e89c213561a9771":[6,0,0,2,2], +"account_8php.html#a014de2d5d5c9785de5bf547a485822fa":[6,0,0,2,8], +"account_8php.html#a030cec6793b909c439c0336ba39b1571":[6,0,0,2,10], +"account_8php.html#a0d183a3cb4c67a0f5e906811df7a1fc9":[6,0,0,2,7], +"account_8php.html#a141fe579c351c78209d425473f978eb5":[6,0,0,2,6], +"account_8php.html#a144b4891022567668375b58ea61cfff0":[6,0,0,2,5], +"account_8php.html#a4328c40ee4b3d68630cf1ebb7b9d4d89":[6,0,0,2,0], +"account_8php.html#a43e3042b2723d76915a030bac3c668b6":[6,0,0,2,1], +"account_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[6,0,0,2,13], +"account_8php.html#a754d7f53b3abc557b753c057dc4e021d":[6,0,0,2,12], +"account_8php.html#a901657dd078e070516cf97285e0bada7":[6,0,0,2,14], +"account_8php.html#a905b54e10704b283ac64680a8abc0971":[6,0,0,2,11], +"account_8php.html#a917d74aad0baf3e0c4b51cf1051e654f":[6,0,0,2,2], +"account_8php.html#aa9c29c497c17d8f9344dce8631ad8761":[6,0,0,2,9], +"account_8php.html#aaff7720423417a4333697894ffd9ddeb":[6,0,0,2,4], +"account_8php.html#ac1653efba62493b9d87513e1b6c04c83":[6,0,0,2,17], +"account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1":[6,0,0,2,15], +"account_8php.html#acd6b8d2124ba5ea4f4794d2c58ae8bf5":[6,0,0,2,18], +"account_8php.html#ad07be417ac7eda939768804106ddea3d":[6,0,0,2,16], +"account_8php.html#ae052bd5558847bd38e89c213561a9771":[6,0,0,2,3], "achievements_8php.html":[6,0,1,1], "achievements_8php.html#a35ae04ada0e227d19671f289a32fb30e":[6,0,1,1,0], "acl_8php.html":[6,0,1,2], @@ -149,27 +150,27 @@ var NAVTREEINDEX0 = "boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[6,0,4,144], "boot_8php.html#a01353c9abebc3544ea080ac161729632":[6,0,4,38], "boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[6,0,4,158], -"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[6,0,4,262], +"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[6,0,4,263], "boot_8php.html#a028380b2902a86ba32198f6d3b5d10bb":[6,0,4,137], "boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[6,0,4,57], "boot_8php.html#a03d19251c245587de7ed959300b87bdf":[6,0,4,177], "boot_8php.html#a0450389f24c632906fbc24347700a543":[6,0,4,48], "boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[6,0,4,110], "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[6,0,4,1], -"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[6,0,4,219], +"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[6,0,4,220], "boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[6,0,4,72], "boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[6,0,4,181], -"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[6,0,4,282], -"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[6,0,4,278], -"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[6,0,4,281], +"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[6,0,4,283], +"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[6,0,4,279], +"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[6,0,4,282], "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[6,0,4,22], "boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[6,0,4,64], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[6,0,4,15], "boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[6,0,4,82], "boot_8php.html#a107d53f96acf5319905a34b1870db09a":[6,0,4,41], -"boot_8php.html#a115faf8797718c3165498abbd6895843":[6,0,4,267], +"boot_8php.html#a115faf8797718c3165498abbd6895843":[6,0,4,268], "boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81":[6,0,4,139], -"boot_8php.html#a1200c1f968ff3d52ef878de5fc5c30c1":[6,0,4,266], +"boot_8php.html#a1200c1f968ff3d52ef878de5fc5c30c1":[6,0,4,267], "boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[6,0,4,86], "boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[6,0,4,83], "boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[6,0,4,208], @@ -178,76 +179,75 @@ var NAVTREEINDEX0 = "boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[6,0,4,153], "boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[6,0,4,180], "boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[6,0,4,147], -"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[6,0,4,290], -"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[6,0,4,256], -"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[6,0,4,292], +"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[6,0,4,291], +"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[6,0,4,257], +"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[6,0,4,293], "boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[6,0,4,184], "boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[6,0,4,81], -"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[6,0,4,234], +"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[6,0,4,235], "boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[6,0,4,112], "boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[6,0,4,164], -"boot_8php.html#a205d013103997adfa72953d2f20c01e1":[6,0,4,228], +"boot_8php.html#a205d013103997adfa72953d2f20c01e1":[6,0,4,229], "boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[6,0,4,201], -"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[6,0,4,258], +"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[6,0,4,259], "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[6,0,4,42], "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[6,0,4,21], "boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[6,0,4,105], "boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[6,0,4,97], -"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[6,0,4,270], +"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[6,0,4,271], "boot_8php.html#a285732e7889fa7f333cbe431111e1029":[6,0,4,204], "boot_8php.html#a29528a2544373cc19a378f350040c6a1":[6,0,4,88], "boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[6,0,4,138], -"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[6,0,4,232], +"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[6,0,4,233], "boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[6,0,4,113], -"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[6,0,4,254], +"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[6,0,4,255], "boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[6,0,4,200], "boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[6,0,4,134], "boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[6,0,4,73], "boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[6,0,4,78], "boot_8php.html#a329400dcb29897cdaae3020109272285":[6,0,4,17], -"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[6,0,4,239], +"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[6,0,4,240], "boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[6,0,4,151], "boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[6,0,4,45], "boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[6,0,4,127], "boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[6,0,4,166], "boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214":[6,0,4,216], -"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[6,0,4,296], +"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[6,0,4,297], "boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[6,0,4,189], "boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[6,0,4,116], "boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[6,0,4,121], -"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[6,0,4,295], +"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[6,0,4,296], "boot_8php.html#a3d48dffd9dc73a187263c3002cdf00c0":[6,0,4,186], -"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[6,0,4,230], +"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[6,0,4,231], "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[6,0,4,12], "boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[6,0,4,65], "boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[6,0,4,95], "boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[6,0,4,55], "boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[6,0,4,140], -"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[6,0,4,223], +"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[6,0,4,224], "boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[6,0,4,199], "boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[6,0,4,94], "boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[6,0,4,174], "boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[6,0,4,161], "boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[6,0,4,76], "boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[6,0,4,167], -"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[6,0,4,279], +"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[6,0,4,280], "boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[6,0,4,187], "boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[6,0,4,111], -"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[6,0,4,248], +"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[6,0,4,249], "boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[6,0,4,185], "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[6,0,4,6], -"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[6,0,4,221], +"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[6,0,4,222], "boot_8php.html#a4f507a5996dbb3da148add0339a40d5a":[6,0,4,61], -"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[6,0,4,244], +"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[6,0,4,245], "boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[6,0,4,211], "boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[6,0,4,165], "boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[6,0,4,43], "boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[6,0,4,87], "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[6,0,4,35], "boot_8php.html#a56fd673eaa7014150297ce1162502db5":[6,0,4,203], -"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[6,0,4,243], -"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[6,0,4,293], +"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[6,0,4,244], +"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[6,0,4,294], "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[6,0,4,20], -"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[6,0,4,66], -"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[6,0,4,193] +"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[6,0,4,66] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index 412a7d63a..355a7dc52 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,5 +1,6 @@ var NAVTREEINDEX1 = { +"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[6,0,4,193], "boot_8php.html#a5b8484922918946d041e5e0515dbe718":[6,0,4,217], "boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[6,0,4,84], "boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[6,0,4,172], @@ -9,34 +10,34 @@ var NAVTREEINDEX1 = "boot_8php.html#a6252d8eca67c689d9035ec6da544cf46":[6,0,4,25], "boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[6,0,4,80], "boot_8php.html#a639f079bf28f7bbb2769fee651d76dd8":[6,0,4,109], -"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[6,0,4,275], +"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[6,0,4,276], "boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[6,0,4,178], "boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[6,0,4,149], "boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[6,0,4,152], "boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[6,0,4,47], "boot_8php.html#a6969947145a139ec374ce098224d8e81":[6,0,4,155], -"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[6,0,4,260], -"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[6,0,4,247], -"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[6,0,4,241], +"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[6,0,4,261], +"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[6,0,4,248], +"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[6,0,4,242], "boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[6,0,4,106], "boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[6,0,4,98], "boot_8php.html#a6cd1b4081630b2bf7be38836cd9f410c":[6,0,4,212], -"boot_8php.html#a6df1102664f64b274810db85197c2755":[6,0,4,227], +"boot_8php.html#a6df1102664f64b274810db85197c2755":[6,0,4,228], "boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[6,0,4,136], -"boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[6,0,4,222], +"boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[6,0,4,223], "boot_8php.html#a7037bcbca223395c06bc67f65024de7a":[6,0,4,107], -"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[6,0,4,259], +"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[6,0,4,260], "boot_8php.html#a718a801b0be6cbaef5e519516da12721":[6,0,4,171], "boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[6,0,4,29], "boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[6,0,4,194], "boot_8php.html#a749144d8dd9c1366596a0213c277d050":[6,0,4,142], "boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[6,0,4,77], "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[6,0,4,2], -"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[6,0,4,283], +"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[6,0,4,284], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[6,0,4,4], "boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[6,0,4,79], "boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[6,0,4,92], -"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[6,0,4,250], +"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[6,0,4,251], "boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[6,0,4,122], "boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[6,0,4,70], "boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[6,0,4,141], @@ -53,36 +54,36 @@ var NAVTREEINDEX1 = "boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[6,0,4,56], "boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[6,0,4,119], "boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[6,0,4,60], -"boot_8php.html#a852d4036a3bed66af1534d014c4ecde2":[6,0,4,225], +"boot_8php.html#a852d4036a3bed66af1534d014c4ecde2":[6,0,4,226], "boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[6,0,4,132], "boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[6,0,4,124], -"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[6,0,4,274], -"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[6,0,4,273], +"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[6,0,4,275], +"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[6,0,4,274], "boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[6,0,4,192], "boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[6,0,4,16], "boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[6,0,4,103], -"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[6,0,4,245], +"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[6,0,4,246], "boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[6,0,4,135], "boot_8php.html#a8da836617174eed9fc2ac8054125354b":[6,0,4,129], -"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[6,0,4,252], -"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[6,0,4,291], +"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[6,0,4,253], +"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[6,0,4,292], "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[6,0,4,32], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[6,0,4,11], "boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[6,0,4,156], "boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[6,0,4,133], "boot_8php.html#a949116d9a295b214293006c060ca4848":[6,0,4,131], -"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[6,0,4,286], -"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[6,0,4,257], +"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[6,0,4,287], +"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[6,0,4,258], "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[6,0,4,18], "boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[6,0,4,206], -"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[6,0,4,246], +"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[6,0,4,247], "boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[6,0,4,51], "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[6,0,4,5], -"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[6,0,4,237], +"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[6,0,4,238], "boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[6,0,4,207], -"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[6,0,4,289], -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[6,0,4,276], -"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[6,0,4,236], +"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[6,0,4,290], +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[6,0,4,277], +"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[6,0,4,237], "boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[6,0,4,195], "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[6,0,4,26], "boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[6,0,4,215], @@ -93,41 +94,41 @@ var NAVTREEINDEX1 = "boot_8php.html#aa589421267f0c2f0d643f727792cce35":[6,0,4,118], "boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[6,0,4,91], "boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[6,0,4,100], -"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[6,0,4,242], +"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[6,0,4,243], "boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[6,0,4,146], -"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[6,0,4,224], +"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[6,0,4,225], "boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[6,0,4,71], "boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[6,0,4,198], "boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[6,0,4,123], -"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[6,0,4,226], +"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[6,0,4,227], "boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[6,0,4,34], -"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[6,0,4,220], -"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[6,0,4,249], +"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[6,0,4,221], +"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[6,0,4,250], "boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[6,0,4,191], -"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[6,0,4,231], +"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[6,0,4,232], "boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[6,0,4,117], "boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[6,0,4,148], "boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[6,0,4,58], "boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[6,0,4,209], "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[6,0,4,7], "boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[6,0,4,102], -"boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d":[6,0,4,285], +"boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d":[6,0,4,286], "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[6,0,4,39], -"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[6,0,4,253], +"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[6,0,4,254], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[6,0,4,3], -"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[6,0,4,280], +"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[6,0,4,281], "boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[6,0,4,69], "boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[6,0,4,120], "boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[6,0,4,101], "boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[6,0,4,130], "boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[6,0,4,24], "boot_8php.html#ac195fc9003298923ea81f144388e24b1":[6,0,4,176], -"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[6,0,4,251], +"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[6,0,4,252], "boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[6,0,4,99], "boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08":[6,0,4,27], "boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[6,0,4,37], "boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[6,0,4,59], -"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[6,0,4,287], +"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[6,0,4,288], "boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[6,0,4,126], "boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[6,0,4,128], "boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[6,0,4,205], @@ -135,9 +136,9 @@ var NAVTREEINDEX1 = "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[6,0,4,13], "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[6,0,4,8], "boot_8php.html#acca19aae62e1a6951a856b945de20d67":[6,0,4,179], -"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[6,0,4,288], -"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[6,0,4,238], -"boot_8php.html#ace6d70ac290397ddd40e561fd0831858":[6,0,4,272], +"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[6,0,4,289], +"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[6,0,4,239], +"boot_8php.html#ace6d70ac290397ddd40e561fd0831858":[6,0,4,273], "boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[6,0,4,213], "boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[6,0,4,68], "boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[6,0,4,159], @@ -146,26 +147,26 @@ var NAVTREEINDEX1 = "boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[6,0,4,75], "boot_8php.html#ad34c1547020a305915bcc39707744690":[6,0,4,90], "boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[6,0,4,30], -"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[6,0,4,233], -"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[6,0,4,261], -"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[6,0,4,255], +"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[6,0,4,234], +"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[6,0,4,262], +"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[6,0,4,256], "boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[6,0,4,96], "boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[6,0,4,143], -"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[6,0,4,264], +"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[6,0,4,265], "boot_8php.html#add517a0958ac684792c62142a3877f81":[6,0,4,40], "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[6,0,4,23], "boot_8php.html#ae0d9527117cd87dcba11986047ae336e":[6,0,4,44], "boot_8php.html#ae0da3ca0f54d75d22c71e007331f8d06":[6,0,4,108], -"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[6,0,4,271], +"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[6,0,4,272], "boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[6,0,4,188], "boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[6,0,4,162], "boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[6,0,4,196], -"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[6,0,4,284], +"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[6,0,4,285], "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[6,0,4,28], -"boot_8php.html#aead84fa27d7516b855220fe004964a45":[6,0,4,277], +"boot_8php.html#aead84fa27d7516b855220fe004964a45":[6,0,4,278], "boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[6,0,4,53], -"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[6,0,4,235], -"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[6,0,4,265], +"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[6,0,4,236], +"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[6,0,4,266], "boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[6,0,4,170], "boot_8php.html#aedfb9501ed408278667995524e0d15cf":[6,0,4,104], "boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[6,0,4,182], @@ -173,25 +174,26 @@ var NAVTREEINDEX1 = "boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[6,0,4,145], "boot_8php.html#aefe573c3c7b0d37fbff264bbae79d673":[6,0,4,115], "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[6,0,4,31], -"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[6,0,4,268], +"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[6,0,4,269], "boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[6,0,4,190], "boot_8php.html#af3a4271630aabd8be592213f925d6a36":[6,0,4,63], "boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[6,0,4,54], -"boot_8php.html#af3ff14985bffbd951a6ea356b7ec3007":[6,0,4,240], +"boot_8php.html#af3ff14985bffbd951a6ea356b7ec3007":[6,0,4,241], "boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[6,0,4,150], "boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[6,0,4,210], "boot_8php.html#af6b3de425e5849c73370a484c44607a3":[6,0,4,168], "boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[6,0,4,93], -"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[6,0,4,263], +"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[6,0,4,264], "boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[6,0,4,202], "boot_8php.html#afaf93b7026f784b113b4f8921745891e":[6,0,4,183], -"boot_8php.html#afb97615e985a013799839b68b99018d7":[6,0,4,269], +"boot_8php.html#afb97615e985a013799839b68b99018d7":[6,0,4,270], "boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[6,0,4,50], +"boot_8php.html#afbb21ecccac9819aa65397e816868a5f":[6,0,4,219], "boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[6,0,4,85], "boot_8php.html#afe63ae69ba55299f813766e54df06ede":[6,0,4,154], "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[6,0,4,14], -"boot_8php.html#afef254290febac854c85fc698d9483a6":[6,0,4,294], -"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[6,0,4,229], +"boot_8php.html#afef254290febac854c85fc698d9483a6":[6,0,4,295], +"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[6,0,4,230], "boxy_8php.html":[6,0,3,1,3,1,0], "cache_8php.html":[6,0,0,13], "channel_8php.html":[6,0,1,12], @@ -247,7 +249,5 @@ var NAVTREEINDEX1 = "classApp.html#a57d041fcc003d08c127dfa99a02bc192":[5,0,5,74], "classApp.html#a58ac598544892ff7c32890291b72635e":[5,0,5,62], "classApp.html#a59dd4b665c70e7dbd80682c014ff7145":[5,0,5,63], -"classApp.html#a5c63eabdc7fdd8b6e3348980ec16a3ad":[5,0,5,3], -"classApp.html#a5cfc098c061b7d765add58fd2ca97445":[5,0,5,39], -"classApp.html#a5f64620473a9727a48ebe9cf6f335a98":[5,0,5,80] +"classApp.html#a5c63eabdc7fdd8b6e3348980ec16a3ad":[5,0,5,3] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index c8faf28b0..6eadeeb5a 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,7 @@ var NAVTREEINDEX2 = { +"classApp.html#a5cfc098c061b7d765add58fd2ca97445":[5,0,5,39], +"classApp.html#a5f64620473a9727a48ebe9cf6f335a98":[5,0,5,80], "classApp.html#a604d659d6977a99de42a160343e5289a":[5,0,5,4], "classApp.html#a61ca6e3af82071ea25ff2fd5dbcddae2":[5,0,5,45], "classApp.html#a622eace13f8fc9f4b5672a68e2bc4396":[5,0,5,7], @@ -247,7 +249,5 @@ var NAVTREEINDEX2 = "classdba__driver.html#adcc1f8955120fec0708bce39202d0422":[5,0,9,4], "classdba__driver.html#ae533e62a240a793f17aef5ab4ef10edc":[5,0,9,3], "classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186":[5,0,9,0], -"classdba__driver.html#af48e2afeded5285766bf92e22123ed03":[5,0,9,10], -"classdba__driver.html#afc95ffa103a3290581b537670cde5311":[5,0,9,5], -"classdba__mysql.html":[5,0,10] +"classdba__driver.html#af48e2afeded5285766bf92e22123ed03":[5,0,9,10] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 576b54f4d..e9f164942 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,7 @@ var NAVTREEINDEX3 = { +"classdba__driver.html#afc95ffa103a3290581b537670cde5311":[5,0,9,5], +"classdba__mysql.html":[5,0,10], "classdba__mysql.html#a1887338627ce0e28786839363014bd0b":[5,0,10,1], "classdba__mysql.html#a850586714ef897bd25f643c89b4ef76e":[5,0,10,0], "classdba__mysql.html#a99a7691ea6cb1300031fb6549379066e":[5,0,10,2], @@ -247,7 +249,5 @@ var NAVTREEINDEX3 = "dir_887fdc94312ba7b057b6bfe7fdd27ea5.html":[6,0,3,1,2,0], "dir_8e58ba5e98ac07e59ee15ca7486c9950.html":[6,0,3,1,2], "dir_922c77e958c99a98db92d38a3a349bf2.html":[6,0,3,1,1], -"dir_92d6b429199666aa3765c8a934db5e14.html":[6,0,3,1,1,1], -"dir__fns_8php.html":[6,0,0,30], -"dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16":[6,0,0,30,0] +"dir_92d6b429199666aa3765c8a934db5e14.html":[6,0,3,1,1,1] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 85869813f..46df00c1e 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,7 @@ var NAVTREEINDEX4 = { +"dir__fns_8php.html":[6,0,0,30], +"dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16":[6,0,0,30,0], "dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[6,0,0,30,6], "dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[6,0,0,30,3], "dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[6,0,0,30,5], @@ -247,7 +249,5 @@ var NAVTREEINDEX4 = "home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[6,0,1,42,1], "hostxrd_8php.html":[6,0,1,43], "hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[6,0,1,43,0], -"html2bbcode_8php.html":[6,0,0,40], -"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[6,0,0,40,3], -"html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[6,0,0,40,1] +"html2bbcode_8php.html":[6,0,0,40] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index ced28e342..b65641bde 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,7 @@ var NAVTREEINDEX5 = { +"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[6,0,0,40,3], +"html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[6,0,0,40,1], "html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[6,0,0,40,0], "html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[6,0,0,40,2], "html2plain_8php.html":[6,0,0,41], @@ -8,6 +10,7 @@ var NAVTREEINDEX5 = "html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[6,0,0,41,2], "html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[6,0,0,41,1], "hubloc_8php.html":[6,0,0,42], +"hubloc_8php.html#a84c79b7be352f62d12fe4fa2c80fc6ea":[6,0,0,42,2], "hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002":[6,0,0,42,1], "hubloc_8php.html#aebd244b4616ded022cbbee5e82926951":[6,0,0,42,0], "identity_8php.html":[6,0,0,43], @@ -16,7 +19,6 @@ var NAVTREEINDEX5 = "identity_8php.html#a2ab5172eabd375869060c9ad68323f5c":[6,0,0,43,17], "identity_8php.html#a332df795f684788002f5a6424abacfd7":[6,0,0,43,10], "identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[6,0,0,43,2], -"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[6,0,0,43,15], "identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[6,0,0,43,24], "identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[6,0,0,43,23], "identity_8php.html#a47d6f53216f23a3484061793bef29854":[6,0,0,43,25], @@ -41,6 +43,7 @@ var NAVTREEINDEX5 = "identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[6,0,0,43,18], "identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[6,0,0,43,7], "identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[6,0,0,43,27], +"identity_8php.html#afaedbc8e2d2a70ec8b006162baac5249":[6,0,0,43,15], "import_8php.html":[6,0,1,44], "import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[6,0,1,44,1], "import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[6,0,1,44,0], @@ -211,6 +214,7 @@ var NAVTREEINDEX5 = "include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[6,0,0,51,18], "include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[6,0,0,51,8], "include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[6,0,0,51,24], +"include_2network_8php.html#a984708e60d531b31b2d1f88b5f408f7b":[6,0,0,51,25], "include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[6,0,0,51,21], "include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[6,0,0,51,22], "include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[6,0,0,51,23], @@ -245,9 +249,5 @@ var NAVTREEINDEX5 = "include_2probe_8php.html#a2b4ac769508f7cfc17fee130279b9cb7":[6,0,0,63,4], "include_2probe_8php.html#a2daa857942aceca01f956016dbbd139c":[6,0,0,63,1], "include_2probe_8php.html#a3c02c7a23e8335a79c3c0f5331d11a85":[6,0,0,63,8], -"include_2probe_8php.html#a471851151d8cd7fbb79703e9522eeea8":[6,0,0,63,0], -"include_2probe_8php.html#a950a200372393f706851103cd3fffcba":[6,0,0,63,6], -"include_2probe_8php.html#a9b5eca1e01e52b3e65d64db0c92181e0":[6,0,0,63,2], -"include_2probe_8php.html#aa748dc73a6686c13826b1ee9d16c800d":[6,0,0,63,7], -"include_2probe_8php.html#ab19a52326b27607a0fb8191cc75ba481":[6,0,0,63,5] +"include_2probe_8php.html#a471851151d8cd7fbb79703e9522eeea8":[6,0,0,63,0] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 11ad3cffe..385b734a4 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,5 +1,9 @@ var NAVTREEINDEX6 = { +"include_2probe_8php.html#a950a200372393f706851103cd3fffcba":[6,0,0,63,6], +"include_2probe_8php.html#a9b5eca1e01e52b3e65d64db0c92181e0":[6,0,0,63,2], +"include_2probe_8php.html#aa748dc73a6686c13826b1ee9d16c800d":[6,0,0,63,7], +"include_2probe_8php.html#ab19a52326b27607a0fb8191cc75ba481":[6,0,0,63,5], "index.html":[], "interfaceITemplateEngine.html":[5,0,18], "interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[5,0,18,1], @@ -39,6 +43,7 @@ var NAVTREEINDEX6 = "items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[6,0,0,46,32], "items_8php.html#a555762e1022a4b8e3c3abd32e7812408":[6,0,0,46,16], "items_8php.html#a566c601726697e044e75284af7fb6f17":[6,0,0,46,21], +"items_8php.html#a56b0f5d2cb36eb8f4bfca84813884f86":[6,0,0,46,18], "items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[6,0,0,46,14], "items_8php.html#a5e5be7bf1f8257dec0b2647e60a3f3f1":[6,0,0,46,29], "items_8php.html#a5ed782ff5b9cf050bec931e06de12c00":[6,0,0,46,46], @@ -53,7 +58,6 @@ var NAVTREEINDEX6 = "items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[6,0,0,46,52], "items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a":[6,0,0,46,60], "items_8php.html#a81565acf729e629e588d823308448e3c":[6,0,0,46,1], -"items_8php.html#a82955cc578f0fa600acec84475026194":[6,0,0,46,18], "items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[6,0,0,46,57], "items_8php.html#a8675e62674de6fb7c42e4a408c7116cc":[6,0,0,46,53], "items_8php.html#a87ac9e359591721a824ecd23bbb56296":[6,0,0,46,6], @@ -191,8 +195,8 @@ var NAVTREEINDEX6 = "mytheme_2php_2style_8php.html":[6,0,3,1,2,0,1], "mytheme_2php_2theme_8php.html":[6,0,3,1,2,0,2], "mytheme_2php_2theme_8php.html#a6ce5df8ece6acc09c1fddaccbeb244e8":[6,0,3,1,2,0,2,0], -"namespaceFriendica.html":[5,0,1], "namespaceFriendica.html":[4,0,1], +"namespaceFriendica.html":[5,0,1], "namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[5,0,0], "namespacefriendica-to-smarty-tpl.html":[5,0,2], @@ -245,9 +249,5 @@ var NAVTREEINDEX6 = "page_8php.html#a91a5f649f68406149108bded1dc90b22":[6,0,1,74,0], "page__widgets_8php.html":[6,0,0,58], "page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[6,0,0,58,1], -"page__widgets_8php.html#a39d547771c5f12a17c097436c82f0fa2":[6,0,0,58,0], -"pages.html":[], -"parse__url_8php.html":[6,0,1,75], -"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[6,0,1,75,2], -"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[6,0,1,75,3] +"page__widgets_8php.html#a39d547771c5f12a17c097436c82f0fa2":[6,0,0,58,0] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 1a884a6e9..eeb03ac95 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,5 +1,9 @@ var NAVTREEINDEX7 = { +"pages.html":[], +"parse__url_8php.html":[6,0,1,75], +"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[6,0,1,75,2], +"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[6,0,1,75,3], "parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[6,0,1,75,1], "parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[6,0,1,75,0], "passion_8php.html":[6,0,3,1,0,2,6], @@ -10,9 +14,10 @@ var NAVTREEINDEX7 = "permissions_8php.html":[6,0,0,59], "permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[6,0,0,59,2], "permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[6,0,0,59,0], +"permissions_8php.html#a50e8099ea8a4d7ed68b2a0a7ea9aa724":[6,0,0,59,5], "permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[6,0,0,59,4], "permissions_8php.html#a9b5f5120566a3699a98efc5ccb0c59fe":[6,0,0,59,3], -"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[6,0,0,59,5], +"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[6,0,0,59,6], "permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[6,0,0,59,1], "photo_8php.html":[6,0,1,77], "photo_8php.html#a582779d24882b0d31ee909a91d70a448":[6,0,1,77,0], @@ -244,10 +249,5 @@ var NAVTREEINDEX7 = "smilies_8php.html":[6,0,1,111], "smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[6,0,1,111,0], "socgraph_8php.html":[6,0,0,72], -"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[6,0,0,72,0], -"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[6,0,0,72,6], -"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[6,0,0,72,7], -"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[6,0,0,72,8], -"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[6,0,0,72,1], -"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[6,0,0,72,4] +"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[6,0,0,72,0] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js index dc97278e7..1b150671a 100644 --- a/doc/html/navtreeindex8.js +++ b/doc/html/navtreeindex8.js @@ -1,5 +1,10 @@ var NAVTREEINDEX8 = { +"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[6,0,0,72,6], +"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[6,0,0,72,7], +"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[6,0,0,72,8], +"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[6,0,0,72,1], +"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[6,0,0,72,4], "socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[6,0,0,72,2], "socgraph_8php.html#af175807406d94407a5e11742a3287746":[6,0,0,72,5], "socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[6,0,0,72,3], @@ -244,10 +249,5 @@ var NAVTREEINDEX8 = "widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013":[6,0,0,78,18], "widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[6,0,0,78,19], "widgets_8php.html#a47c72aac42058ea086c9ef8651c259da":[6,0,0,78,5], -"widgets_8php.html#a50b1410238100c8a94c06b0aa63ee3b8":[6,0,0,78,25], -"widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[6,0,0,78,12], -"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[6,0,0,78,27], -"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[6,0,0,78,21], -"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[6,0,0,78,15], -"widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[6,0,0,78,2] +"widgets_8php.html#a50b1410238100c8a94c06b0aa63ee3b8":[6,0,0,78,25] }; diff --git a/doc/html/navtreeindex9.js b/doc/html/navtreeindex9.js index e8220de35..61a92b259 100644 --- a/doc/html/navtreeindex9.js +++ b/doc/html/navtreeindex9.js @@ -1,5 +1,10 @@ var NAVTREEINDEX9 = { +"widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[6,0,0,78,12], +"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[6,0,0,78,27], +"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[6,0,0,78,21], +"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[6,0,0,78,15], +"widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[6,0,0,78,2], "widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[6,0,0,78,23], "widgets_8php.html#a95c06bc9be133e89768746302d2ac395":[6,0,0,78,10], "widgets_8php.html#a999ba893cac7600d3d3b4e7e14cf8c20":[6,0,0,78,20], @@ -24,35 +29,38 @@ var NAVTREEINDEX9 = "zfinger_8php.html":[6,0,1,139], "zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[6,0,1,139,0], "zot_8php.html":[6,0,0,79], -"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[6,0,0,79,14], +"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[6,0,0,79,15], "zot_8php.html#a0fc2211c5309d9f925ecc4115e3fdb75":[6,0,0,79,9], "zot_8php.html#a20750dd2c36961013fd382fb34e1366c":[6,0,0,79,6], "zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[6,0,0,79,7], -"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[6,0,0,79,16], -"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[6,0,0,79,18], +"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[6,0,0,79,18], +"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[6,0,0,79,20], "zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[6,0,0,79,5], "zot_8php.html#a4d9e6ca295e443b740d9960c304b3474":[6,0,0,79,11], "zot_8php.html#a528e97ca5d69c3b7f35c5d954afde315":[6,0,0,79,8], -"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[6,0,0,79,22], -"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[6,0,0,79,27], -"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[6,0,0,79,19], +"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[6,0,0,79,25], +"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[6,0,0,79,30], +"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[6,0,0,79,22], "zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[6,0,0,79,0], -"zot_8php.html#a7ac30ff51274bf0b6d3eade37972145c":[6,0,0,79,26], +"zot_8php.html#a7ac30ff51274bf0b6d3eade37972145c":[6,0,0,79,29], "zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[6,0,0,79,3], -"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[6,0,0,79,25], -"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[6,0,0,79,20], -"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[6,0,0,79,13], -"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[6,0,0,79,12], +"zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988":[6,0,0,79,12], +"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[6,0,0,79,28], +"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[6,0,0,79,23], +"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[6,0,0,79,14], +"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[6,0,0,79,13], "zot_8php.html#aa97b33b619dd7132a9274f852af6ceb5":[6,0,0,79,1], -"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[6,0,0,79,15], -"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[6,0,0,79,24], -"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[6,0,0,79,17], -"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[6,0,0,79,28], +"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[6,0,0,79,16], +"zot_8php.html#ab15c04e7e5f44edf45ec50dd7d183254":[6,0,0,79,17], +"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[6,0,0,79,27], +"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[6,0,0,79,19], +"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[6,0,0,79,31], "zot_8php.html#ac301c67864917c35922257950ae0f95c":[6,0,0,79,10], "zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d":[6,0,0,79,4], "zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[6,0,0,79,2], -"zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[6,0,0,79,21], -"zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[6,0,0,79,23], +"zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca":[6,0,0,79,21], +"zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[6,0,0,79,24], +"zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[6,0,0,79,26], "zotfeed_8php.html":[6,0,1,140], "zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[6,0,1,140,0], "zping_8php.html":[6,0,1,141], diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index f4baf95c3..ef35b882f 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -124,6 +124,8 @@ Functions    get_role_perms ($role)   + role_selector ($current) + 

          Function Documentation

          @@ -236,11 +238,12 @@ Functions

          get_role_perms($role)

          Parameters
          - +
          string$roleGiven a string for the channel role ('social','forum', etc) return an array of all permission fields pre-filled for this role. This includes the channel permission scope indicators as well as perms_auto: The permissions to apply automatically on receipt of a connection request perms_follow: The permissions to apply when initiating a connection request to another channel perms_accept: The permissions to apply when accepting a connection request from another channel (not automatic)
          string$roleGiven a string for the channel role ('social','forum', etc) return an array of all permission fields pre-filled for this role. This includes the channel permission scope indicators (anything beginning with 'channel_') as well as perms_auto: true or false to create auto-permissions for this channel perms_follow: The permissions to apply when initiating a connection request to another channel perms_accept: The permissions to apply when accepting a connection request from another channel (not automatic) default_collection: true or false to make the default ACL include the channel's default collection directory_publish: true or false to publish this channel in the directory Any attributes may be extended (new roles defined) and modified (specific permissions altered) by plugins
          -

          Any attributes may be extended (new roles defined) and modified (specific permissions altered) by plugins

          + +

          Referenced by connedit_content(), create_identity(), and new_contact().

          @@ -276,6 +279,24 @@ Functions

          Referenced by Conversation\add_thread(), advanced_profile(), api_statuses_home_timeline(), api_statuses_repeat(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), attach_store(), block_content(), chat_content(), chatsvc_init(), check_list_permissions(), common_content(), common_friends_visitor_widget(), contact_block(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), diaspora_asphoto(), diaspora_comment(), diaspora_like(), diaspora_photo(), diaspora_post(), diaspora_reshare(), display_content(), editblock_content(), get_feed_for(), RedDirectory\getChild(), RedDirectory\getChildren(), item_post(), like_content(), local_dir_update(), photo_init(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), poco_init(), post_activity_item(), post_post(), process_delivery(), process_mail_delivery(), profile_content(), profile_load(), profile_sidebar(), RedChannelList(), search_content(), Conversation\set_mode(), RedBrowser\set_writeable(), RedDirectory\setName(), RedFile\setName(), subthread_content(), tag_deliver(), tgroup_check(), update_birthdays(), viewconnections_content(), widget_archive(), widget_categories(), widget_item(), widget_photo_albums(), widget_tagcloud_wall(), z_readdir(), and zot_feed().

          + + + +
          +
          + + + + + + + + +
          role_selector ( $current)
          +
          + +

          Referenced by new_channel_content().

          +
          diff --git a/doc/html/permissions_8php.js b/doc/html/permissions_8php.js index df2e58f84..22580253a 100644 --- a/doc/html/permissions_8php.js +++ b/doc/html/permissions_8php.js @@ -5,5 +5,6 @@ var permissions_8php = [ "get_perms", "permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972", null ], [ "get_role_perms", "permissions_8php.html#a9b5f5120566a3699a98efc5ccb0c59fe", null ], [ "perm_is_allowed", "permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835", null ], + [ "role_selector", "permissions_8php.html#a50e8099ea8a4d7ed68b2a0a7ea9aa724", null ], [ "site_default_perms", "permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d", null ] ]; \ No newline at end of file diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html index 847c081d6..da7b77c6b 100644 --- a/doc/html/php2po_8php.html +++ b/doc/html/php2po_8php.html @@ -168,7 +168,7 @@ Variables
          -

          Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), app_render(), bb_sanitize_style(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), dirprofile_init(), dirsearch_content(), extra_query_args(), RedBrowser\generateDirectoryIndex(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), local_dir_update(), mail_post(), mood_content(), netgrowth_content(), new_contact(), FKOAuthDataStore\new_request_token(), obj_verb_selector(), openid_content(), parse_app_description(), photos_albums_list(), po2php_run(), poco_init(), poke_content(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), profile_load(), requestdata(), settings_post(), sslify_init(), startup(), tt(), RedBrowser\userReadableSize(), vote_post(), x(), zfinger_init(), and zot_refresh().

          +

          Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), app_render(), bb_sanitize_style(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), dirprofile_init(), dirsearch_content(), extra_query_args(), RedBrowser\generateDirectoryIndex(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), local_dir_update(), mail_post(), mood_content(), netgrowth_content(), new_contact(), FKOAuthDataStore\new_request_token(), obj_verb_selector(), openid_content(), parse_app_description(), photos_albums_list(), po2php_run(), poco_init(), poke_content(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), profile_load(), requestdata(), role_selector(), settings_post(), sslify_init(), startup(), tt(), RedBrowser\userReadableSize(), vote_post(), x(), zfinger_init(), and zot_refresh().

          diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index 4e0755d37..12809438e 100644 --- a/doc/html/php_2theme__init_8php.html +++ b/doc/html/php_2theme__init_8php.html @@ -127,7 +127,7 @@ Variables

          Those who require this feature will know what to do with it. Those who don't, won't. Eventually this functionality needs to be provided by a module such that permissions can be enforced. At the moment it's more of a proof of concept; but sufficient for our immediate needs.

          -

          Referenced by admin_page_channels(), api_call(), api_user(), appman_content(), attach_mkdir(), attach_store(), bbcode(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), channel_content(), channel_init(), channel_remove(), chat_content(), chat_init(), chat_post(), chatroom_create(), chatroom_destroy(), cloud_init(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), conversation(), design_tools(), diaspora_msg_build(), diaspora_pubmsg_build(), directory_run(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), events_content(), events_post(), feed_init(), filestorage_content(), filestorage_post(), fix_attached_file_permissions(), get_feed_for(), get_public_feed(), handle_feed(), handle_tag(), hcard_init(), home_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), mitem_content(), mitem_post(), mood_init(), nav(), network_content(), network_init(), new_contact(), notifier_run(), parse_app_description(), photo_upload(), photos_albums_list(), photos_content(), photos_create_item(), photos_list_photos(), ping_init(), poke_init(), post_activity_item(), post_to_red_delete_comment(), post_to_red_delete_post(), post_to_red_displayAdminContent(), post_to_red_post(), probe_content(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), profile_init(), profile_photo_init(), profile_photo_post(), profiles_content(), profiles_post(), profperm_init(), rbmark_content(), rbmark_post(), rpost_content(), send_message(), settings_post(), sources_post(), start_delivery_chain(), store_diaspora_comment_sig(), tagger_content(), thing_content(), thing_init(), uexport_init(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_settings_menu(), zot_build_packet(), zot_finger(), and zot_refresh().

          +

          Referenced by admin_page_channels(), api_call(), api_user(), appman_content(), attach_mkdir(), attach_store(), bbcode(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), channel_content(), channel_init(), channel_remove(), chat_content(), chat_init(), chat_post(), chatroom_create(), chatroom_destroy(), cloud_init(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), conversation(), design_tools(), diaspora_msg_build(), diaspora_pubmsg_build(), directory_run(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), events_content(), events_post(), feed_init(), filestorage_content(), filestorage_post(), fix_attached_file_permissions(), get_feed_for(), get_public_feed(), handle_feed(), handle_tag(), hcard_init(), home_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), mitem_content(), mitem_post(), mood_init(), nav(), network_content(), network_init(), new_contact(), notifier_run(), parse_app_description(), photo_upload(), photos_albums_list(), photos_content(), photos_create_item(), photos_list_photos(), ping_init(), poke_init(), post_activity_item(), post_to_red_delete_comment(), post_to_red_delete_post(), post_to_red_displayAdminContent(), post_to_red_post(), probe_content(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), profile_init(), profile_photo_init(), profile_photo_post(), profiles_content(), profiles_post(), profperm_init(), rbmark_content(), rbmark_post(), rpost_content(), send_message(), settings_post(), sources_post(), start_delivery_chain(), store_diaspora_comment_sig(), tagger_content(), thing_content(), thing_init(), uexport_init(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_settings_menu(), zot_build_packet(), zot_encode_locations(), zot_finger(), and zot_refresh().

          diff --git a/doc/html/post_8php.html b/doc/html/post_8php.html index 0c0745a3a..ece06c97c 100644 --- a/doc/html/post_8php.html +++ b/doc/html/post_8php.html @@ -172,7 +172,7 @@ Functions

          If verification is successful, a json structure is returned containing a success indicator and an array of type 'pickup'. Each pickup element contains the original notify request and a message field whose contents are dependent on the message type

          This JSON array is AES encapsulated using the site public key of the site that sent the initial zot pickup packet. Using the above example, this would be example.com.

          { "success":1, "pickup":{ "notify":{ "type":"notify", "sender":{ "guid":"kgVFf_...", "guid_sig":"PT9-TApz...", "url":"http:\/\/z.podunk.edu", "url_sig":"T8Bp7j5D..." }, "callback":"\/post", "version":1, "secret":"1eaa661..." }, "message":{ "type":"activity", "message_id":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu", "message_top":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu", "message_parent":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu", "created":"2012-11-20 04:04:16", "edited":"2012-11-20 04:04:16", "title":"", "body":"Hi Nickordo", "app":"", "verb":"post", "object_type":"", "target_type":"", "permalink":"", "location":"", "longlat":"", "owner":{ "name":"Indigo", "address":"indigo@podunk.edu", "url":"http:\/\/podunk.edu", "photo":{ "mimetype":"image\/jpeg", "src":"http:\/\/podunk.edu\/photo\/profile\/m\/5" }, "guid":"kgVFf_...", "guid_sig":"PT9-TAp...", }, "author":{ "name":"Indigo", "address":"indigo@podunk.edu", "url":"http:\/\/podunk.edu", "photo":{ "mimetype":"image\/jpeg", "src":"http:\/\/podunk.edu\/photo\/profile\/m\/5" }, "guid":"kgVFf_...", "guid_sig":"PT9-TAp..." } } } }

          -

          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.

          { "type": "ping" }

          On receipt of a ping packet a ping response will be returned:

          diff --git a/doc/html/search/all_61.js b/doc/html/search/all_61.js index ee8cddbaa..cae31ee43 100644 --- a/doc/html/search/all_61.js +++ b/doc/html/search/all_61.js @@ -28,6 +28,7 @@ var searchData= ['account_5frole_5fallowcode',['ACCOUNT_ROLE_ALLOWCODE',['../boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688',1,'boot.php']]], ['account_5frole_5fdeveloper',['ACCOUNT_ROLE_DEVELOPER',['../boot_8php.html#a4f507a5996dbb3da148add0339a40d5a',1,'boot.php']]], ['account_5frole_5fsystem',['ACCOUNT_ROLE_SYSTEM',['../boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b',1,'boot.php']]], + ['account_5fservice_5fclass_5ffetch',['account_service_class_fetch',['../account_8php.html#a4328c40ee4b3d68630cf1ebb7b9d4d89',1,'account.php']]], ['account_5ftotal',['account_total',['../account_8php.html#a43e3042b2723d76915a030bac3c668b6',1,'account.php']]], ['account_5funverified',['ACCOUNT_UNVERIFIED',['../boot_8php.html#af3a4271630aabd8be592213f925d6a36',1,'boot.php']]], ['account_5fverify_5fpassword',['account_verify_password',['../auth_8php.html#a07bae0e623e2daa9ee2cd5a8aa294dee',1,'auth.php']]], @@ -184,8 +185,8 @@ var searchData= ['atom_5fauthor',['atom_author',['../items_8php.html#a016dd86c827d08db89061ea81d15c6cb',1,'items.php']]], ['atom_5fentry',['atom_entry',['../items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6',1,'items.php']]], ['atom_5ftime',['ATOM_TIME',['../boot_8php.html#ad34c1547020a305915bcc39707744690',1,'boot.php']]], - ['attach_2ephp',['attach.php',['../mod_2attach_8php.html',1,'']]], ['attach_2ephp',['attach.php',['../include_2attach_8php.html',1,'']]], + ['attach_2ephp',['attach.php',['../mod_2attach_8php.html',1,'']]], ['attach_5fby_5fhash',['attach_by_hash',['../include_2attach_8php.html#a0d07c5b83d3d54e186f752e571847b36',1,'attach.php']]], ['attach_5fby_5fhash_5fnodata',['attach_by_hash_nodata',['../include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932',1,'attach.php']]], ['attach_5fchange_5fpermissions',['attach_change_permissions',['../include_2attach_8php.html#a5c0875eafb8c0f8a0620ff7a875a2221',1,'attach.php']]], diff --git a/doc/html/search/all_65.js b/doc/html/search/all_65.js index cd786c2a1..113500fbd 100644 --- a/doc/html/search/all_65.js +++ b/doc/html/search/all_65.js @@ -11,7 +11,7 @@ var searchData= ['else',['else',['../auth_8php.html#a0950af7c2888ca1d4743fe5d0bff9ae5',1,'else(): auth.php'],['../fpostit_8php.html#a501b5ca82f287509fc691c88524064c1',1,'else(): fpostit.php'],['../tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c',1,'else(): tpldebug.php'],['../redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459',1,'else(): style.php']]], ['email_5fheader_5fencode',['email_header_encode',['../include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b',1,'network.php']]], ['email_5fsend',['email_send',['../include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0',1,'network.php']]], - ['encode_5fitem',['encode_item',['../items_8php.html#a82955cc578f0fa600acec84475026194',1,'items.php']]], + ['encode_5fitem',['encode_item',['../items_8php.html#a56b0f5d2cb36eb8f4bfca84813884f86',1,'items.php']]], ['encode_5fitem_5fflags',['encode_item_flags',['../items_8php.html#a5f690fc2484abec07840b4f9dd525bd9',1,'items.php']]], ['encode_5fitem_5fterms',['encode_item_terms',['../items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a',1,'items.php']]], ['encode_5fitem_5fxchan',['encode_item_xchan',['../items_8php.html#a566c601726697e044e75284af7fb6f17',1,'items.php']]], diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js index 8f48fe648..2182f4f74 100644 --- a/doc/html/search/all_69.js +++ b/doc/html/search/all_69.js @@ -1,7 +1,7 @@ var searchData= [ ['identity_2ephp',['identity.php',['../identity_8php.html',1,'']]], - ['identity_5fbasic_5fexport',['identity_basic_export',['../identity_8php.html#a3570a4eb77332b292d394c4132cb8f03',1,'identity.php']]], + ['identity_5fbasic_5fexport',['identity_basic_export',['../identity_8php.html#afaedbc8e2d2a70ec8b006162baac5249',1,'identity.php']]], ['identity_5fcheck_5fservice_5fclass',['identity_check_service_class',['../identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633',1,'identity.php']]], ['identity_5fselector',['identity_selector',['../identity_8php.html#a2ab5172eabd375869060c9ad68323f5c',1,'identity.php']]], ['ids_5fto_5fquerystr',['ids_to_querystr',['../text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a',1,'text.php']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index ccd965d62..3326395cb 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -9,6 +9,7 @@ var searchData= ['page_5fcontent',['page_content',['../page_8php.html#a91a5f649f68406149108bded1dc90b22',1,'page.php']]], ['page_5fdirectory_5fchannel',['PAGE_DIRECTORY_CHANNEL',['../boot_8php.html#a5b8484922918946d041e5e0515dbe718',1,'boot.php']]], ['page_5fhidden',['PAGE_HIDDEN',['../boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640',1,'boot.php']]], + ['page_5fhubadmin',['PAGE_HUBADMIN',['../boot_8php.html#afbb21ecccac9819aa65397e816868a5f',1,'boot.php']]], ['page_5finit',['page_init',['../page_8php.html#a4d89800c0366a239191b1692c09635cf',1,'page.php']]], ['page_5fnormal',['PAGE_NORMAL',['../boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3',1,'boot.php']]], ['page_5fpremium',['PAGE_PREMIUM',['../boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8',1,'boot.php']]], @@ -178,6 +179,7 @@ var searchData= ['proc_5frun',['proc_run',['../boot_8php.html#ab346a2ece14993861f3e4206befa94f0',1,'boot.php']]], ['process_5fchannel_5fsync_5fdelivery',['process_channel_sync_delivery',['../zot_8php.html#ac301c67864917c35922257950ae0f95c',1,'zot.php']]], ['process_5fdelivery',['process_delivery',['../zot_8php.html#a4d9e6ca295e443b740d9960c304b3474',1,'zot.php']]], + ['process_5flocation_5fdelivery',['process_location_delivery',['../zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988',1,'zot.php']]], ['process_5fmail_5fdelivery',['process_mail_delivery',['../zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc',1,'zot.php']]], ['process_5fprofile_5fdelivery',['process_profile_delivery',['../zot_8php.html#a9a57b40669351c9791126b925cb7ef3b',1,'zot.php']]], ['profile_2ephp',['profile.php',['../profile_8php.html',1,'']]], diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js index dcee0cdf4..c8e873a4a 100644 --- a/doc/html/search/all_72.js +++ b/doc/html/search/all_72.js @@ -67,6 +67,7 @@ var searchData= ['remove_5fall_5fxchan_5fresources',['remove_all_xchan_resources',['../Contact_8php.html#acc12cda999c88c4d6185cca967c15125',1,'Contact.php']]], ['remove_5fchild',['remove_child',['../classItem.html#a2ce70ef63f9f4d86a09c351678806925',1,'Item']]], ['remove_5fcommunity_5ftag',['remove_community_tag',['../zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10',1,'zot.php']]], + ['remove_5fobsolete_5fhublocs',['remove_obsolete_hublocs',['../hubloc_8php.html#a84c79b7be352f62d12fe4fa2c80fc6ea',1,'hubloc.php']]], ['remove_5fparent',['remove_parent',['../classItem.html#aa452b5bcd8dea12119b09212c615cb41',1,'Item']]], ['remove_5fqueue_5fitem',['remove_queue_item',['../queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24',1,'queue_fn.php']]], ['removeaccount_2ephp',['removeaccount.php',['../removeaccount_8php.html',1,'']]], @@ -86,6 +87,7 @@ var searchData= ['rmagic_5fcontent',['rmagic_content',['../rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef',1,'rmagic.php']]], ['rmagic_5finit',['rmagic_init',['../rmagic_8php.html#a95455edd43f1bff39446a57388cdde16',1,'rmagic.php']]], ['rmagic_5fpost',['rmagic_post',['../rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f',1,'rmagic.php']]], + ['role_5fselector',['role_selector',['../permissions_8php.html#a50e8099ea8a4d7ed68b2a0a7ea9aa724',1,'permissions.php']]], ['rotate',['rotate',['../classphoto__driver.html#a2f2b6337cf9aa0688d10b422123f0eec',1,'photo_driver\rotate()'],['../classphoto__gd.html#a77f87730b11093b76980c541159df37d',1,'photo_gd\rotate()'],['../classphoto__imagick.html#a9df5738a4a18e76dd304c440e96f045f',1,'photo_imagick\rotate()']]], ['rpost_2ephp',['rpost.php',['../rpost_8php.html',1,'']]], ['rpost_5fcallback',['rpost_callback',['../bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7',1,'bbcode.php']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index 618135149..4164c7049 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -119,8 +119,8 @@ var searchData= ['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]], ['strip_5fzids',['strip_zids',['../text_8php.html#a2f2585385530cb935a6325c809d84a4d',1,'text.php']]], ['stripdcode_5fbr_5fcb',['stripdcode_br_cb',['../bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93',1,'bb2diaspora.php']]], - ['style_2ephp',['style.php',['../mytheme_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../mytheme_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]], ['subthread_5fcontent',['subthread_content',['../subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3',1,'subthread.php']]], @@ -130,6 +130,7 @@ var searchData= ['suggestion_5fquery',['suggestion_query',['../socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329',1,'socgraph.php']]], ['supportedtypes',['supportedTypes',['../classphoto__driver.html#a6eee8e36eaf9339f4faf80ddd43162da',1,'photo_driver\supportedTypes()'],['../classphoto__gd.html#a16f3dd7d3559f715aa2fe3f7880836dd',1,'photo_gd\supportedTypes()'],['../classphoto__imagick.html#a27596faca6108d9d563674d1b654a0b7',1,'photo_imagick\supportedTypes()']]], ['sync_5fdirectories',['sync_directories',['../dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6',1,'dir_fns.php']]], + ['sync_5flocations',['sync_locations',['../zot_8php.html#ab15c04e7e5f44edf45ec50dd7d183254',1,'zot.php']]], ['system_5fdown',['system_down',['../system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa',1,'system_unavailable.php']]], ['system_5funavailable',['system_unavailable',['../boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0',1,'boot.php']]], ['system_5funavailable_2ephp',['system_unavailable.php',['../system__unavailable_8php.html',1,'']]] diff --git a/doc/html/search/all_7a.js b/doc/html/search/all_7a.js index b003d4edf..aa2d970a3 100644 --- a/doc/html/search/all_7a.js +++ b/doc/html/search/all_7a.js @@ -6,6 +6,7 @@ var searchData= ['z_5fmime_5fcontent_5ftype',['z_mime_content_type',['../include_2attach_8php.html#a6fdd92775f31c07d2863e16e0026018a',1,'attach.php']]], ['z_5fpath',['z_path',['../boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda',1,'boot.php']]], ['z_5fpost_5furl',['z_post_url',['../include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc',1,'network.php']]], + ['z_5fpost_5furl_5fjson',['z_post_url_json',['../include_2network_8php.html#a984708e60d531b31b2d1f88b5f408f7b',1,'network.php']]], ['z_5freaddir',['z_readdir',['../include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909',1,'attach.php']]], ['z_5froot',['z_root',['../boot_8php.html#add517a0958ac684792c62142a3877f81',1,'boot.php']]], ['zcurl_5ftimeout',['ZCURL_TIMEOUT',['../boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af',1,'boot.php']]], @@ -18,6 +19,7 @@ var searchData= ['zidify_5flinks',['zidify_links',['../text_8php.html#a29988052f3944111def3b6aaf2c7a8f6',1,'text.php']]], ['zot_2ephp',['zot.php',['../zot_8php.html',1,'']]], ['zot_5fbuild_5fpacket',['zot_build_packet',['../zot_8php.html#a3862b3161b2c8557dc1a95020179bd81',1,'zot.php']]], + ['zot_5fencode_5flocations',['zot_encode_locations',['../zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca',1,'zot.php']]], ['zot_5ffeed',['zot_feed',['../items_8php.html#a004e89d86b0f29b2c4da20108ecc4091',1,'items.php']]], ['zot_5ffetch',['zot_fetch',['../zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea',1,'zot.php']]], ['zot_5ffinger',['zot_finger',['../zot_8php.html#a95528377d7303131958c9f0b7158fdce',1,'zot.php']]], diff --git a/doc/html/search/functions_61.js b/doc/html/search/functions_61.js index 44a348e35..98d2f8ec2 100644 --- a/doc/html/search/functions_61.js +++ b/doc/html/search/functions_61.js @@ -5,6 +5,7 @@ var searchData= ['abook_5ftoggle_5fflag',['abook_toggle_flag',['../Contact_8php.html#a024919623a830e8703ac4f23496dd66c',1,'Contact.php']]], ['absurl',['absurl',['../boot_8php.html#a081307d681d7d04f17b9ced2076e7c85',1,'boot.php']]], ['account_5fremove',['account_remove',['../Contact_8php.html#a5101d7eca5d6f387e5555f03fe249e33',1,'Contact.php']]], + ['account_5fservice_5fclass_5ffetch',['account_service_class_fetch',['../account_8php.html#a4328c40ee4b3d68630cf1ebb7b9d4d89',1,'account.php']]], ['account_5ftotal',['account_total',['../account_8php.html#a43e3042b2723d76915a030bac3c668b6',1,'account.php']]], ['account_5fverify_5fpassword',['account_verify_password',['../auth_8php.html#a07bae0e623e2daa9ee2cd5a8aa294dee',1,'auth.php']]], ['achievements_5fcontent',['achievements_content',['../achievements_8php.html#a35ae04ada0e227d19671f289a32fb30e',1,'achievements.php']]], diff --git a/doc/html/search/functions_65.js b/doc/html/search/functions_65.js index 2b298917b..fdeeb2099 100644 --- a/doc/html/search/functions_65.js +++ b/doc/html/search/functions_65.js @@ -6,7 +6,7 @@ var searchData= ['editwebpage_5fcontent',['editwebpage_content',['../editwebpage_8php.html#a375e945255fad79a71036528f7480650',1,'editwebpage.php']]], ['email_5fheader_5fencode',['email_header_encode',['../include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b',1,'network.php']]], ['email_5fsend',['email_send',['../include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0',1,'network.php']]], - ['encode_5fitem',['encode_item',['../items_8php.html#a82955cc578f0fa600acec84475026194',1,'items.php']]], + ['encode_5fitem',['encode_item',['../items_8php.html#a56b0f5d2cb36eb8f4bfca84813884f86',1,'items.php']]], ['encode_5fitem_5fflags',['encode_item_flags',['../items_8php.html#a5f690fc2484abec07840b4f9dd525bd9',1,'items.php']]], ['encode_5fitem_5fterms',['encode_item_terms',['../items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a',1,'items.php']]], ['encode_5fitem_5fxchan',['encode_item_xchan',['../items_8php.html#a566c601726697e044e75284af7fb6f17',1,'items.php']]], diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js index 62816c41e..8586cf0da 100644 --- a/doc/html/search/functions_69.js +++ b/doc/html/search/functions_69.js @@ -1,6 +1,6 @@ var searchData= [ - ['identity_5fbasic_5fexport',['identity_basic_export',['../identity_8php.html#a3570a4eb77332b292d394c4132cb8f03',1,'identity.php']]], + ['identity_5fbasic_5fexport',['identity_basic_export',['../identity_8php.html#afaedbc8e2d2a70ec8b006162baac5249',1,'identity.php']]], ['identity_5fcheck_5fservice_5fclass',['identity_check_service_class',['../identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633',1,'identity.php']]], ['identity_5fselector',['identity_selector',['../identity_8php.html#a2ab5172eabd375869060c9ad68323f5c',1,'identity.php']]], ['ids_5fto_5fquerystr',['ids_to_querystr',['../text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a',1,'text.php']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index 9fb807cb9..2b9e57bff 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -97,6 +97,7 @@ var searchData= ['proc_5frun',['proc_run',['../boot_8php.html#ab346a2ece14993861f3e4206befa94f0',1,'boot.php']]], ['process_5fchannel_5fsync_5fdelivery',['process_channel_sync_delivery',['../zot_8php.html#ac301c67864917c35922257950ae0f95c',1,'zot.php']]], ['process_5fdelivery',['process_delivery',['../zot_8php.html#a4d9e6ca295e443b740d9960c304b3474',1,'zot.php']]], + ['process_5flocation_5fdelivery',['process_location_delivery',['../zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988',1,'zot.php']]], ['process_5fmail_5fdelivery',['process_mail_delivery',['../zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc',1,'zot.php']]], ['process_5fprofile_5fdelivery',['process_profile_delivery',['../zot_8php.html#a9a57b40669351c9791126b925cb7ef3b',1,'zot.php']]], ['profile_5factivity',['profile_activity',['../activities_8php.html#a80134e807719b3c54aba971958d2e132',1,'activities.php']]], diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js index 1a4dfc7e2..732627bac 100644 --- a/doc/html/search/functions_72.js +++ b/doc/html/search/functions_72.js @@ -44,6 +44,7 @@ var searchData= ['remove_5fall_5fxchan_5fresources',['remove_all_xchan_resources',['../Contact_8php.html#acc12cda999c88c4d6185cca967c15125',1,'Contact.php']]], ['remove_5fchild',['remove_child',['../classItem.html#a2ce70ef63f9f4d86a09c351678806925',1,'Item']]], ['remove_5fcommunity_5ftag',['remove_community_tag',['../zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10',1,'zot.php']]], + ['remove_5fobsolete_5fhublocs',['remove_obsolete_hublocs',['../hubloc_8php.html#a84c79b7be352f62d12fe4fa2c80fc6ea',1,'hubloc.php']]], ['remove_5fparent',['remove_parent',['../classItem.html#aa452b5bcd8dea12119b09212c615cb41',1,'Item']]], ['remove_5fqueue_5fitem',['remove_queue_item',['../queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24',1,'queue_fn.php']]], ['removeaccount_5fcontent',['removeaccount_content',['../removeaccount_8php.html#a516e7380b9e5796054aa8245f3509695',1,'removeaccount.php']]], @@ -59,6 +60,7 @@ var searchData= ['rmagic_5fcontent',['rmagic_content',['../rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef',1,'rmagic.php']]], ['rmagic_5finit',['rmagic_init',['../rmagic_8php.html#a95455edd43f1bff39446a57388cdde16',1,'rmagic.php']]], ['rmagic_5fpost',['rmagic_post',['../rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f',1,'rmagic.php']]], + ['role_5fselector',['role_selector',['../permissions_8php.html#a50e8099ea8a4d7ed68b2a0a7ea9aa724',1,'permissions.php']]], ['rotate',['rotate',['../classphoto__driver.html#a2f2b6337cf9aa0688d10b422123f0eec',1,'photo_driver\rotate()'],['../classphoto__gd.html#a77f87730b11093b76980c541159df37d',1,'photo_gd\rotate()'],['../classphoto__imagick.html#a9df5738a4a18e76dd304c440e96f045f',1,'photo_imagick\rotate()']]], ['rpost_5fcallback',['rpost_callback',['../bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7',1,'bbcode.php']]], ['rpost_5fcontent',['rpost_content',['../rpost_8php.html#a8190354d789000806d9879aea276728f',1,'rpost.php']]], diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index 35d300498..ad8ed8579 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -104,6 +104,7 @@ var searchData= ['suggestion_5fquery',['suggestion_query',['../socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329',1,'socgraph.php']]], ['supportedtypes',['supportedTypes',['../classphoto__driver.html#a6eee8e36eaf9339f4faf80ddd43162da',1,'photo_driver\supportedTypes()'],['../classphoto__gd.html#a16f3dd7d3559f715aa2fe3f7880836dd',1,'photo_gd\supportedTypes()'],['../classphoto__imagick.html#a27596faca6108d9d563674d1b654a0b7',1,'photo_imagick\supportedTypes()']]], ['sync_5fdirectories',['sync_directories',['../dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6',1,'dir_fns.php']]], + ['sync_5flocations',['sync_locations',['../zot_8php.html#ab15c04e7e5f44edf45ec50dd7d183254',1,'zot.php']]], ['system_5fdown',['system_down',['../system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa',1,'system_unavailable.php']]], ['system_5funavailable',['system_unavailable',['../boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0',1,'boot.php']]] ]; diff --git a/doc/html/search/functions_7a.js b/doc/html/search/functions_7a.js index 13a4cefe7..8378a6a00 100644 --- a/doc/html/search/functions_7a.js +++ b/doc/html/search/functions_7a.js @@ -6,6 +6,7 @@ var searchData= ['z_5fmime_5fcontent_5ftype',['z_mime_content_type',['../include_2attach_8php.html#a6fdd92775f31c07d2863e16e0026018a',1,'attach.php']]], ['z_5fpath',['z_path',['../boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda',1,'boot.php']]], ['z_5fpost_5furl',['z_post_url',['../include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc',1,'network.php']]], + ['z_5fpost_5furl_5fjson',['z_post_url_json',['../include_2network_8php.html#a984708e60d531b31b2d1f88b5f408f7b',1,'network.php']]], ['z_5freaddir',['z_readdir',['../include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909',1,'attach.php']]], ['z_5froot',['z_root',['../boot_8php.html#add517a0958ac684792c62142a3877f81',1,'boot.php']]], ['zfinger_5finit',['zfinger_init',['../zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0',1,'zfinger.php']]], @@ -15,6 +16,7 @@ var searchData= ['zidify_5fimg_5fcallback',['zidify_img_callback',['../text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4',1,'text.php']]], ['zidify_5flinks',['zidify_links',['../text_8php.html#a29988052f3944111def3b6aaf2c7a8f6',1,'text.php']]], ['zot_5fbuild_5fpacket',['zot_build_packet',['../zot_8php.html#a3862b3161b2c8557dc1a95020179bd81',1,'zot.php']]], + ['zot_5fencode_5flocations',['zot_encode_locations',['../zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca',1,'zot.php']]], ['zot_5ffeed',['zot_feed',['../items_8php.html#a004e89d86b0f29b2c4da20108ecc4091',1,'items.php']]], ['zot_5ffetch',['zot_fetch',['../zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea',1,'zot.php']]], ['zot_5ffinger',['zot_finger',['../zot_8php.html#a95528377d7303131958c9f0b7158fdce',1,'zot.php']]], diff --git a/doc/html/search/variables_70.js b/doc/html/search/variables_70.js index 2505bac30..818649a0b 100644 --- a/doc/html/search/variables_70.js +++ b/doc/html/search/variables_70.js @@ -7,6 +7,7 @@ var searchData= ['page_5fcensored',['PAGE_CENSORED',['../boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214',1,'boot.php']]], ['page_5fdirectory_5fchannel',['PAGE_DIRECTORY_CHANNEL',['../boot_8php.html#a5b8484922918946d041e5e0515dbe718',1,'boot.php']]], ['page_5fhidden',['PAGE_HIDDEN',['../boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640',1,'boot.php']]], + ['page_5fhubadmin',['PAGE_HUBADMIN',['../boot_8php.html#afbb21ecccac9819aa65397e816868a5f',1,'boot.php']]], ['page_5fnormal',['PAGE_NORMAL',['../boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3',1,'boot.php']]], ['page_5fpremium',['PAGE_PREMIUM',['../boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8',1,'boot.php']]], ['page_5fremoved',['PAGE_REMOVED',['../boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6',1,'boot.php']]], diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index fb8c0bd7c..b440aae4c 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -461,7 +461,7 @@ Variables
          -

          Referenced by aes_unencapsulate(), consume_feed(), contactgroup_content(), diaspora_decode(), get_atom_elements(), get_item_elements(), group_content(), import_post(), import_site(), import_xchan(), oembed_init(), pemtome(), post_init(), post_post(), pubrsatome(), share_unshield(), smile_unshield(), zfinger_init(), and zot_register_hub().

          +

          Referenced by aes_unencapsulate(), consume_feed(), contactgroup_content(), diaspora_decode(), get_atom_elements(), get_item_elements(), group_content(), import_post(), import_site(), import_xchan(), oembed_init(), pemtome(), post_init(), post_post(), pubrsatome(), share_unshield(), smile_unshield(), sync_locations(), zfinger_init(), and zot_register_hub().

          @@ -489,7 +489,7 @@ Variables
          -

          Referenced by aes_encapsulate(), consume_feed(), create_identity(), diaspora_decode(), diaspora_msg_build(), diaspora_pubmsg_build(), fix_system_urls(), get_atom_elements(), group_content(), group_side(), identity_basic_export(), import_post(), item_post(), item_store(), item_store_update(), magic_init(), make_xchan_hash(), oembed_iframe(), post_activity_item(), post_post(), random_string(), salmon_key(), share_shield(), smile_shield(), zfinger_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

          +

          Referenced by aes_encapsulate(), consume_feed(), create_identity(), diaspora_decode(), diaspora_msg_build(), diaspora_pubmsg_build(), fix_system_urls(), get_atom_elements(), group_content(), group_side(), identity_basic_export(), import_post(), item_post(), item_store(), item_store_update(), magic_init(), make_xchan_hash(), oembed_iframe(), post_activity_item(), post_post(), random_string(), salmon_key(), share_shield(), smile_shield(), zfinger_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

          @@ -1198,7 +1198,7 @@ Variables
          -

          Referenced by editpost_content(), editwebpage_content(), encode_item(), encode_mail(), localize_item(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), remove_community_tag(), tag_deliver(), theme_attachments(), and unobscure().

          +

          Referenced by editpost_content(), editwebpage_content(), encode_item(), encode_mail(), localize_item(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), remove_community_tag(), tag_deliver(), theme_attachments(), and unobscure().

          @@ -1291,7 +1291,7 @@ Variables

          Compare two URLs to see if they are the same, but ignore slight but hopefully insignificant differences such as if one is https and the other isn't, or if one is www.something and the other isn't - and also ignore case differences.

          Return true if the URLs match, otherwise false.

          -

          Referenced by consume_feed(), diaspora_retraction(), diaspora_signed_retraction(), tag_deliver(), tgroup_check(), and zid().

          +

          Referenced by consume_feed(), diaspora_retraction(), tag_deliver(), tgroup_check(), and zid().

          @@ -1339,7 +1339,7 @@ Variables
          -

          Referenced by RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_oauth_request_token(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), attach_mkdir(), avatar_img(), base64url_decode(), bb2diaspora_itembody(), bb2diaspora_itemwallwall(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), chat_post(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedFile\delete(), delete_imported_item(), deliver_run(), detect_language(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_handle_from_contact(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), directory_content(), directory_run(), dirprofile_init(), discover_by_url(), discover_by_webbie(), downgrade_accounts(), email_send(), encode_item(), expire_run(), externals_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), find_diaspora_person_by_handle(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_diaspora_key(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), group_content(), guess_image_type(), http_status_exit(), import_author_rss(), import_author_unknown(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), localize_item(), RedDirectory\log(), RedBasicAuth\log(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_post(), mail_store(), menu_edit(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notes_init(), notification(), notifier_run(), old_webfinger(), onedirsync_run(), onepoll_run(), openid_content(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), rbmark_post(), receive_post(), red_item_new(), RedChannelList(), RedCollectionData(), RedFileData(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_queue_item(), scale_external_images(), scrape_feed(), scrape_vcard(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedDirectory\setName(), RedFile\setName(), start_delivery_chain(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_feed_item(), update_imported_item(), update_queue_time(), RedBasicAuth\validateUserPass(), verify_email_address(), xml2array(), xml_status(), z_fetch_url(), z_post_url(), zfinger_init(), zid_init(), zot_build_packet(), zot_feed(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

          +

          Referenced by RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_oauth_request_token(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), attach_mkdir(), avatar_img(), base64url_decode(), bb2diaspora_itembody(), bb2diaspora_itemwallwall(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), chat_post(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedFile\delete(), delete_imported_item(), deliver_run(), detect_language(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_handle_from_contact(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), directory_content(), directory_run(), dirprofile_init(), discover_by_url(), discover_by_webbie(), downgrade_accounts(), email_send(), encode_item(), expire_run(), externals_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), find_diaspora_person_by_handle(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_diaspora_key(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), group_content(), guess_image_type(), http_status_exit(), import_author_rss(), import_author_unknown(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), localize_item(), RedDirectory\log(), RedBasicAuth\log(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_post(), mail_store(), menu_edit(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notes_init(), notification(), notifier_run(), old_webfinger(), onedirsync_run(), onepoll_run(), openid_content(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_location_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), rbmark_post(), receive_post(), red_item_new(), RedChannelList(), RedCollectionData(), RedFileData(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_obsolete_hublocs(), remove_queue_item(), scale_external_images(), scrape_feed(), scrape_vcard(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedDirectory\setName(), RedFile\setName(), start_delivery_chain(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), sync_locations(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_feed_item(), update_imported_item(), update_queue_time(), RedBasicAuth\validateUserPass(), verify_email_address(), xml2array(), xml_status(), z_fetch_url(), z_post_url(), zfinger_init(), zid_init(), zot_build_packet(), zot_feed(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

          @@ -2058,7 +2058,7 @@ Variables
          -

          Referenced by expand_groups(), get_things(), identity_basic_export(), lockview_content(), notifier_run(), tagadelic(), and zot_import().

          +

          Referenced by expand_groups(), get_things(), identity_basic_export(), lockview_content(), notifier_run(), tagadelic(), and zot_import().

          @@ -2256,7 +2256,7 @@ Variables
          -

          Referenced by api_format_items(), api_statuses_home_timeline(), api_statuses_public_timeline(), api_statuses_show(), block_content(), channel_content(), display_content(), event_store_item(), events_content(), home_content(), item_post(), items_fetch(), network_content(), notification(), notifier_run(), page_content(), ping_init(), search_content(), share_init(), widget_item(), and zot_feed().

          +

          Referenced by api_format_items(), api_statuses_home_timeline(), api_statuses_public_timeline(), api_statuses_show(), block_content(), channel_content(), display_content(), event_store_item(), events_content(), home_content(), identity_basic_export(), item_post(), items_fetch(), network_content(), notification(), notifier_run(), page_content(), ping_init(), search_content(), share_init(), widget_item(), and zot_feed().

          diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index e62ee94f8..5bfa11b54 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -154,6 +154,12 @@ Functions    process_profile_delivery ($sender, $arr, $deliveries)   + process_location_delivery ($sender, $arr, $deliveries) +  + sync_locations ($sender, $arr, $absolute=false) +  + zot_encode_locations ($channel) +   import_directory_profile ($hash, $profile, $addr, $ud_flags=UPDATE_FLAGS_UPDATED, $suppress_update=0)    import_directory_keywords ($hash, $keywords) @@ -549,6 +555,40 @@ Functions

          Referenced by externals_run(), onepoll_run(), and zot_import().

          + + + +
          +
          + + + + + + + + + + + + + + + + + + + + + + + + +
          process_location_delivery ( $sender,
           $arr,
           $deliveries 
          )
          +
          + +

          Referenced by zot_import().

          +
          @@ -669,6 +709,40 @@ Functions

          Referenced by process_delivery().

          + + + +
          +
          + + + + + + + + + + + + + + + + + + + + + + + + +
          sync_locations ( $sender,
           $arr,
           $absolute = false 
          )
          +
          + +

          Referenced by import_xchan(), and process_location_delivery().

          +
          @@ -801,6 +875,24 @@ Functions

          Referenced by admin_page_hubloc_post(), build_sync_packet(), directory_run(), notifier_run(), post_init(), and zping_content().

          + + + +
          +
          + + + + + + + + +
          zot_encode_locations ( $channel)
          +
          + +

          Referenced by notifier_run(), and zfinger_init().

          +
          @@ -900,7 +992,7 @@ which will be processed and delivered before this function ultimately returns.

          Only search for active hublocs - e.g. those that haven't been marked deleted

          -

          Referenced by process_channel_sync_delivery(), and zfinger_init().

          +

          Referenced by process_channel_sync_delivery(), and zot_encode_locations().

          @@ -963,7 +1055,7 @@ which will be processed and delivered before this function ultimately returns. -

          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.

          Referenced by deliver_run(), and zot_fetch().

          diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js index 897063ee0..2b888daf0 100644 --- a/doc/html/zot_8php.js +++ b/doc/html/zot_8php.js @@ -12,13 +12,16 @@ var zot_8php = [ "make_xchan_hash", "zot_8php.html#a0fc2211c5309d9f925ecc4115e3fdb75", null ], [ "process_channel_sync_delivery", "zot_8php.html#ac301c67864917c35922257950ae0f95c", null ], [ "process_delivery", "zot_8php.html#a4d9e6ca295e443b740d9960c304b3474", null ], + [ "process_location_delivery", "zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988", null ], [ "process_mail_delivery", "zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc", null ], [ "process_profile_delivery", "zot_8php.html#a9a57b40669351c9791126b925cb7ef3b", null ], [ "public_recips", "zot_8php.html#a083aec6c900d244e1bfc1406f9461465", null ], [ "remove_community_tag", "zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10", null ], + [ "sync_locations", "zot_8php.html#ab15c04e7e5f44edf45ec50dd7d183254", null ], [ "update_imported_item", "zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df", null ], [ "update_modtime", "zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd", null ], [ "zot_build_packet", "zot_8php.html#a3862b3161b2c8557dc1a95020179bd81", null ], + [ "zot_encode_locations", "zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca", null ], [ "zot_fetch", "zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea", null ], [ "zot_finger", "zot_8php.html#a95528377d7303131958c9f0b7158fdce", null ], [ "zot_get_hublocs", "zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7", null ], diff --git a/util/messages.po b/util/messages.po index 1b7e1f452..c9933c877 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-09-12.796\n" +"Project-Id-Version: 2014-09-19.803\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-12 00:03-0700\n" +"POT-Creation-Date: 2014-09-19 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ msgstr "" msgid "Profile Photos" msgstr "" -#: ../../include/network.php:580 +#: ../../include/network.php:590 msgid "view full size" msgstr "" @@ -77,8 +77,8 @@ msgid "Matrix" msgstr "" #: ../../include/apps.php:129 ../../include/nav.php:211 -#: ../../include/widgets.php:521 ../../mod/admin.php:950 -#: ../../mod/admin.php:1155 +#: ../../include/widgets.php:521 ../../mod/admin.php:951 +#: ../../mod/admin.php:1156 msgid "Settings" msgstr "" @@ -97,8 +97,8 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../include/apps.php:133 ../../include/identity.php:986 -#: ../../include/identity.php:1104 ../../mod/profperm.php:112 +#: ../../include/apps.php:133 ../../include/identity.php:1063 +#: ../../include/identity.php:1181 ../../mod/profperm.php:112 msgid "Profile" msgstr "" @@ -177,7 +177,7 @@ msgid "Profile Photo" msgstr "" #: ../../include/apps.php:239 ../../mod/settings.php:79 -#: ../../mod/settings.php:543 +#: ../../mod/settings.php:545 msgid "Update" msgstr "" @@ -192,7 +192,7 @@ msgstr "" #: ../../include/apps.php:246 ../../include/page_widgets.php:8 #: ../../include/page_widgets.php:36 ../../include/reddav.php:1289 #: ../../include/menu.php:42 ../../include/ItemObject.php:100 -#: ../../mod/settings.php:579 ../../mod/blocks.php:99 +#: ../../mod/settings.php:581 ../../mod/blocks.php:99 #: ../../mod/connections.php:381 ../../mod/connections.php:394 #: ../../mod/connections.php:413 ../../mod/editblock.php:111 #: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 @@ -203,14 +203,14 @@ msgstr "" #: ../../include/apps.php:247 ../../include/reddav.php:1290 #: ../../include/conversation.php:648 ../../include/ItemObject.php:112 -#: ../../mod/settings.php:580 ../../mod/connedit.php:440 +#: ../../mod/settings.php:582 ../../mod/connedit.php:462 #: ../../mod/photos.php:1082 ../../mod/group.php:176 ../../mod/admin.php:730 -#: ../../mod/admin.php:860 ../../mod/thing.php:236 +#: ../../mod/admin.php:861 ../../mod/thing.php:236 msgid "Delete" msgstr "" #: ../../include/apps.php:328 ../../include/apps.php:379 -#: ../../include/reddav.php:1202 ../../mod/connedit.php:476 +#: ../../include/reddav.php:1202 ../../mod/connedit.php:498 msgid "Unknown" msgstr "" @@ -224,7 +224,7 @@ msgid "View" msgstr "" #: ../../include/page_widgets.php:40 ../../include/conversation.php:1109 -#: ../../include/ItemObject.php:597 ../../mod/editblock.php:141 +#: ../../include/ItemObject.php:598 ../../mod/editblock.php:141 #: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 #: ../../mod/editwebpage.php:174 ../../mod/photos.php:1033 #: ../../mod/webpages.php:136 @@ -251,7 +251,7 @@ msgstr "" msgid "Edited" msgstr "" -#: ../../include/security.php:307 +#: ../../include/security.php:320 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." @@ -261,11 +261,11 @@ msgstr "" msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:668 +#: ../../include/zot.php:670 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:865 +#: ../../include/zot.php:1703 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -275,9 +275,9 @@ msgstr "" #: ../../include/attach.php:243 ../../include/attach.php:283 #: ../../include/attach.php:297 ../../include/attach.php:322 #: ../../include/attach.php:513 ../../include/attach.php:585 -#: ../../include/chat.php:116 ../../include/items.php:3910 +#: ../../include/chat.php:116 ../../include/items.php:3950 #: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:30 -#: ../../mod/settings.php:494 ../../mod/poke.php:128 ../../mod/api.php:26 +#: ../../mod/settings.php:496 ../../mod/poke.php:128 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 #: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72 #: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276 @@ -303,7 +303,7 @@ msgstr "" #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 #: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6 #: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 -#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 +#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 #: ../../mod/notifications.php:66 ../../mod/appman.php:66 #: ../../mod/service_limits.php:7 ../../index.php:186 ../../index.php:361 msgid "Permission denied." @@ -326,11 +326,11 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:339 ../../include/conversation.php:1533 +#: ../../include/photos.php:340 ../../include/conversation.php:1533 msgid "Photo Albums" msgstr "" -#: ../../include/photos.php:343 ../../mod/photos.php:697 +#: ../../include/photos.php:344 ../../mod/photos.php:697 #: ../../mod/photos.php:1244 msgid "Upload New Photos" msgstr "" @@ -353,7 +353,7 @@ msgstr "" msgid "Permissions" msgstr "" -#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:294 +#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:295 msgid "Close" msgstr "" @@ -459,7 +459,7 @@ msgid "Your posts and conversations" msgstr "" #: ../../include/nav.php:98 ../../include/conversation.php:957 -#: ../../mod/connedit.php:393 ../../mod/connedit.php:507 +#: ../../mod/connedit.php:415 ../../mod/connedit.php:529 msgid "View Profile" msgstr "" @@ -475,7 +475,7 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:102 ../../include/identity.php:730 +#: ../../include/nav.php:102 ../../include/identity.php:807 msgid "Edit Profile" msgstr "" @@ -691,8 +691,8 @@ msgstr "" #: ../../include/text.php:823 ../../include/text.php:837 #: ../../include/widgets.php:193 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1338 -#: ../../mod/admin.php:1359 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1339 +#: ../../mod/admin.php:1360 msgid "Save" msgstr "" @@ -944,7 +944,7 @@ msgstr "" msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1741 ../../include/diaspora.php:1882 +#: ../../include/text.php:1741 ../../include/diaspora.php:1888 #: ../../include/conversation.php:120 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 msgid "photo" @@ -955,7 +955,7 @@ msgstr "" msgid "event" msgstr "" -#: ../../include/text.php:1747 ../../include/diaspora.php:1882 +#: ../../include/text.php:1747 ../../include/diaspora.php:1888 #: ../../include/conversation.php:148 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 msgid "status" @@ -1030,7 +1030,7 @@ msgstr "" msgid "dislikes" msgstr "" -#: ../../include/taxonomy.php:338 ../../include/identity.php:1012 +#: ../../include/taxonomy.php:338 ../../include/identity.php:1089 #: ../../include/ItemObject.php:138 msgctxt "noun" msgid "Like" @@ -1184,20 +1184,20 @@ msgstr[1] "" msgid "show more" msgstr "" -#: ../../include/event.php:11 ../../include/bb2diaspora.php:420 +#: ../../include/event.php:11 ../../include/bb2diaspora.php:425 msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:426 +#: ../../include/event.php:20 ../../include/bb2diaspora.php:431 msgid "Starts:" msgstr "" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:434 +#: ../../include/event.php:30 ../../include/bb2diaspora.php:439 msgid "Finishes:" msgstr "" -#: ../../include/event.php:40 ../../include/bb2diaspora.php:442 -#: ../../include/identity.php:757 ../../mod/directory.php:156 +#: ../../include/event.php:40 ../../include/bb2diaspora.php:447 +#: ../../include/identity.php:834 ../../mod/directory.php:156 #: ../../mod/dirprofile.php:105 ../../mod/events.php:579 msgid "Location:" msgstr "" @@ -1271,19 +1271,19 @@ msgstr "" msgid "Account verified. Please login." msgstr "" -#: ../../include/account.php:624 ../../include/account.php:626 +#: ../../include/account.php:647 ../../include/account.php:649 msgid "Click here to upgrade." msgstr "" -#: ../../include/account.php:632 +#: ../../include/account.php:655 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/account.php:637 +#: ../../include/account.php:660 msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/diaspora.php:1911 ../../include/conversation.php:164 +#: ../../include/diaspora.php:1917 ../../include/conversation.php:164 #: ../../mod/like.php:331 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -1400,7 +1400,7 @@ msgstr "" msgid "Safe Mode" msgstr "" -#: ../../include/bb2diaspora.php:341 +#: ../../include/bb2diaspora.php:346 msgid "Attachments:" msgstr "" @@ -1637,8 +1637,8 @@ msgstr "" msgid "%1$s used of %2$s (%3$s%)" msgstr "" -#: ../../include/reddav.php:1284 ../../mod/settings.php:519 -#: ../../mod/settings.php:545 ../../mod/admin.php:865 +#: ../../include/reddav.php:1284 ../../mod/settings.php:521 +#: ../../mod/settings.php:547 ../../mod/admin.php:866 msgid "Name" msgstr "" @@ -1663,7 +1663,7 @@ msgid "Create new folder" msgstr "" #: ../../include/reddav.php:1345 ../../mod/mitem.php:142 ../../mod/menu.php:84 -#: ../../mod/new_channel.php:117 +#: ../../mod/new_channel.php:122 msgid "Create" msgstr "" @@ -1726,17 +1726,17 @@ msgstr "" msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:706 ../../include/ItemObject.php:255 +#: ../../include/conversation.php:706 ../../include/ItemObject.php:256 #, php-format msgid " from %s" msgstr "" -#: ../../include/conversation.php:709 ../../include/ItemObject.php:258 +#: ../../include/conversation.php:709 ../../include/ItemObject.php:259 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/conversation.php:710 ../../include/ItemObject.php:259 +#: ../../include/conversation.php:710 ../../include/ItemObject.php:260 #, php-format msgid "Expires: %s" msgstr "" @@ -1746,7 +1746,7 @@ msgid "View in context" msgstr "" #: ../../include/conversation.php:727 ../../include/conversation.php:1148 -#: ../../include/ItemObject.php:299 ../../mod/editblock.php:120 +#: ../../include/ItemObject.php:300 ../../mod/editblock.php:120 #: ../../mod/editlayout.php:115 ../../mod/editpost.php:121 #: ../../mod/editwebpage.php:152 ../../mod/photos.php:1013 #: ../../mod/mail.php:231 ../../mod/mail.php:346 @@ -1785,7 +1785,7 @@ msgstr "" msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:960 ../../include/identity.php:706 +#: ../../include/conversation.php:960 ../../include/identity.php:783 #: ../../include/widgets.php:135 ../../include/widgets.php:175 #: ../../include/Contact.php:107 ../../mod/directory.php:183 #: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 @@ -1999,7 +1999,7 @@ msgstr "" msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1174 ../../include/ItemObject.php:600 +#: ../../include/conversation.php:1174 ../../include/ItemObject.php:601 #: ../../mod/editpost.php:148 ../../mod/mail.php:237 ../../mod/mail.php:351 msgid "Encrypt text" msgstr "" @@ -2009,8 +2009,8 @@ msgstr "" msgid "OK" msgstr "" -#: ../../include/conversation.php:1177 ../../mod/settings.php:518 -#: ../../mod/settings.php:544 ../../mod/editpost.php:151 +#: ../../include/conversation.php:1177 ../../mod/settings.php:520 +#: ../../mod/settings.php:546 ../../mod/editpost.php:151 #: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 #: ../../mod/events.php:566 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 msgid "Cancel" @@ -2073,7 +2073,7 @@ msgstr "" msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1509 ../../mod/admin.php:864 +#: ../../include/conversation.php:1509 ../../mod/admin.php:865 msgid "Channel" msgstr "" @@ -2355,27 +2355,27 @@ msgstr "" msgid "Channel location missing." msgstr "" -#: ../../include/follow.php:70 +#: ../../include/follow.php:77 msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/follow.php:87 +#: ../../include/follow.php:94 msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:123 ../../include/follow.php:186 +#: ../../include/follow.php:130 ../../include/follow.php:199 msgid "Protocol disabled." msgstr "" -#: ../../include/follow.php:160 +#: ../../include/follow.php:173 msgid "Channel discovery failed." msgstr "" -#: ../../include/follow.php:176 +#: ../../include/follow.php:189 msgid "local account not found." msgstr "" -#: ../../include/follow.php:203 +#: ../../include/follow.php:216 msgid "Cannot connect to yourself." msgstr "" @@ -2399,75 +2399,75 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../include/items.php:357 ../../mod/profperm.php:23 +#: ../../include/items.php:375 ../../mod/profperm.php:23 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 #: ../../index.php:360 msgid "Permission denied" msgstr "" -#: ../../include/items.php:922 ../../include/items.php:967 +#: ../../include/items.php:940 ../../include/items.php:985 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1099 +#: ../../include/items.php:1139 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1101 +#: ../../include/items.php:1141 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1103 +#: ../../include/items.php:1143 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1105 +#: ../../include/items.php:1145 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1107 +#: ../../include/items.php:1147 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1109 +#: ../../include/items.php:1149 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1111 +#: ../../include/items.php:1151 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1113 +#: ../../include/items.php:1153 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:3848 ../../mod/home.php:67 ../../mod/display.php:32 +#: ../../include/items.php:3888 ../../mod/display.php:32 #: ../../mod/filestorage.php:18 ../../mod/admin.php:168 -#: ../../mod/admin.php:895 ../../mod/admin.php:1098 ../../mod/thing.php:78 +#: ../../mod/admin.php:896 ../../mod/admin.php:1099 ../../mod/thing.php:78 #: ../../mod/viewsrc.php:18 msgid "Item not found." msgstr "" -#: ../../include/items.php:4281 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4321 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4296 +#: ../../include/items.php:4336 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4303 +#: ../../include/items.php:4343 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4314 +#: ../../include/items.php:4354 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4317 +#: ../../include/items.php:4357 msgid "Connection not found." msgstr "" @@ -2539,214 +2539,215 @@ msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/identity.php:258 +#: ../../include/identity.php:276 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/identity.php:317 +#: ../../include/identity.php:335 msgid "Default Profile" msgstr "" -#: ../../include/identity.php:342 ../../include/widgets.php:407 -#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:473 +#: ../../include/identity.php:374 ../../include/identity.php:375 +#: ../../include/identity.php:382 ../../include/widgets.php:407 +#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:495 msgid "Friends" msgstr "" -#: ../../include/identity.php:509 +#: ../../include/identity.php:586 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:557 ../../mod/achievements.php:11 +#: ../../include/identity.php:634 ../../mod/achievements.php:11 #: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 #: ../../mod/filestorage.php:40 ../../mod/layouts.php:8 #: ../../mod/webpages.php:8 ../../mod/hcard.php:8 msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:720 ../../mod/profiles.php:750 +#: ../../include/identity.php:797 ../../mod/profiles.php:750 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:726 +#: ../../include/identity.php:803 msgid "Profiles" msgstr "" -#: ../../include/identity.php:726 +#: ../../include/identity.php:803 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:727 ../../mod/profiles.php:751 +#: ../../include/identity.php:804 ../../mod/profiles.php:751 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:741 ../../mod/profiles.php:762 +#: ../../include/identity.php:818 ../../mod/profiles.php:762 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:744 +#: ../../include/identity.php:821 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:745 ../../mod/profiles.php:645 +#: ../../include/identity.php:822 ../../mod/profiles.php:645 #: ../../mod/profiles.php:766 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:759 ../../include/identity.php:996 +#: ../../include/identity.php:836 ../../include/identity.php:1073 #: ../../mod/directory.php:158 msgid "Gender:" msgstr "" -#: ../../include/identity.php:760 ../../include/identity.php:1040 +#: ../../include/identity.php:837 ../../include/identity.php:1117 #: ../../mod/directory.php:160 msgid "Status:" msgstr "" -#: ../../include/identity.php:761 ../../include/identity.php:1051 +#: ../../include/identity.php:838 ../../include/identity.php:1128 #: ../../mod/directory.php:162 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:762 ../../mod/dirprofile.php:151 +#: ../../include/identity.php:839 ../../mod/dirprofile.php:151 msgid "Online Now" msgstr "" -#: ../../include/identity.php:840 ../../include/identity.php:920 +#: ../../include/identity.php:917 ../../include/identity.php:997 #: ../../mod/ping.php:298 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:841 ../../include/identity.php:921 +#: ../../include/identity.php:918 ../../include/identity.php:998 msgid "F d" msgstr "" -#: ../../include/identity.php:886 ../../include/identity.php:961 +#: ../../include/identity.php:963 ../../include/identity.php:1038 #: ../../mod/ping.php:320 msgid "[today]" msgstr "" -#: ../../include/identity.php:898 +#: ../../include/identity.php:975 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:899 +#: ../../include/identity.php:976 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:954 +#: ../../include/identity.php:1031 msgid "[No description]" msgstr "" -#: ../../include/identity.php:972 +#: ../../include/identity.php:1049 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:973 +#: ../../include/identity.php:1050 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:994 ../../mod/settings.php:943 +#: ../../include/identity.php:1071 ../../mod/settings.php:953 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1001 +#: ../../include/identity.php:1078 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1025 +#: ../../include/identity.php:1102 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1026 +#: ../../include/identity.php:1103 msgid "j F" msgstr "" -#: ../../include/identity.php:1033 +#: ../../include/identity.php:1110 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1037 +#: ../../include/identity.php:1114 msgid "Age:" msgstr "" -#: ../../include/identity.php:1046 +#: ../../include/identity.php:1123 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1049 ../../mod/profiles.php:667 +#: ../../include/identity.php:1126 ../../mod/profiles.php:667 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1053 ../../mod/profiles.php:669 +#: ../../include/identity.php:1130 ../../mod/profiles.php:669 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1055 +#: ../../include/identity.php:1132 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1057 ../../mod/profiles.php:670 +#: ../../include/identity.php:1134 ../../mod/profiles.php:670 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1059 +#: ../../include/identity.php:1136 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1061 ../../mod/directory.php:164 +#: ../../include/identity.php:1138 ../../mod/directory.php:164 msgid "About:" msgstr "" -#: ../../include/identity.php:1063 +#: ../../include/identity.php:1140 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1065 ../../mod/profiles.php:673 +#: ../../include/identity.php:1142 ../../mod/profiles.php:673 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1067 ../../mod/profiles.php:674 +#: ../../include/identity.php:1144 ../../mod/profiles.php:674 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1070 +#: ../../include/identity.php:1147 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1072 +#: ../../include/identity.php:1149 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1074 +#: ../../include/identity.php:1151 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1076 +#: ../../include/identity.php:1153 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1078 +#: ../../include/identity.php:1155 msgid "Television:" msgstr "" -#: ../../include/identity.php:1080 +#: ../../include/identity.php:1157 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1082 +#: ../../include/identity.php:1159 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1084 +#: ../../include/identity.php:1161 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1086 +#: ../../include/identity.php:1163 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1106 +#: ../../include/identity.php:1183 msgid "Like this thing" msgstr "" @@ -2854,11 +2855,11 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../../include/widgets.php:405 ../../mod/connedit.php:470 +#: ../../include/widgets.php:405 ../../mod/connedit.php:492 msgid "Me" msgstr "" -#: ../../include/widgets.php:406 ../../mod/connedit.php:472 +#: ../../include/widgets.php:406 ../../mod/connedit.php:494 msgid "Best Friends" msgstr "" @@ -2866,11 +2867,11 @@ msgstr "" msgid "Co-workers" msgstr "" -#: ../../include/widgets.php:409 ../../mod/connedit.php:474 +#: ../../include/widgets.php:409 ../../mod/connedit.php:496 msgid "Former Friends" msgstr "" -#: ../../include/widgets.php:410 ../../mod/connedit.php:475 +#: ../../include/widgets.php:410 ../../mod/connedit.php:497 msgid "Acquaintances" msgstr "" @@ -2906,6 +2907,10 @@ msgstr "" msgid "Export channel" msgstr "" +#: ../../include/widgets.php:485 +msgid "Export content" +msgstr "" + #: ../../include/widgets.php:491 msgid "Automatic Permissions (Advanced)" msgstr "" @@ -3002,60 +3007,60 @@ msgstr "" msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:279 +#: ../../include/ItemObject.php:280 msgid "Save Bookmarks" msgstr "" -#: ../../include/ItemObject.php:280 +#: ../../include/ItemObject.php:281 msgid "Add to Calendar" msgstr "" -#: ../../include/ItemObject.php:288 -msgctxt "noun" -msgid "Likes" -msgstr "" - #: ../../include/ItemObject.php:289 msgctxt "noun" +msgid "Likes" +msgstr "" + +#: ../../include/ItemObject.php:290 +msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../include/ItemObject.php:320 +#: ../../include/ItemObject.php:321 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:321 ../../include/js_strings.php:7 +#: ../../include/ItemObject.php:322 ../../include/js_strings.php:7 msgid "[+] show all" msgstr "" -#: ../../include/ItemObject.php:585 ../../mod/photos.php:1029 +#: ../../include/ItemObject.php:586 ../../mod/photos.php:1029 #: ../../mod/photos.php:1116 msgid "This is you" msgstr "" -#: ../../include/ItemObject.php:587 ../../include/js_strings.php:6 +#: ../../include/ItemObject.php:588 ../../include/js_strings.php:6 #: ../../mod/photos.php:1031 ../../mod/photos.php:1118 msgid "Comment" msgstr "" -#: ../../include/ItemObject.php:588 ../../mod/mood.php:135 -#: ../../mod/settings.php:517 ../../mod/settings.php:629 -#: ../../mod/settings.php:658 ../../mod/settings.php:682 -#: ../../mod/settings.php:755 ../../mod/settings.php:935 +#: ../../include/ItemObject.php:589 ../../mod/mood.php:135 +#: ../../mod/settings.php:519 ../../mod/settings.php:631 +#: ../../mod/settings.php:660 ../../mod/settings.php:684 +#: ../../mod/settings.php:760 ../../mod/settings.php:945 #: ../../mod/poke.php:166 ../../mod/profiles.php:643 ../../mod/chat.php:177 -#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:518 +#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:540 #: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58 #: ../../mod/photos.php:563 ../../mod/photos.php:674 ../../mod/photos.php:992 #: ../../mod/photos.php:1032 ../../mod/photos.php:1119 #: ../../mod/sources.php:104 ../../mod/sources.php:138 #: ../../mod/events.php:586 ../../mod/filestorage.php:137 #: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414 -#: ../../mod/admin.php:723 ../../mod/admin.php:858 ../../mod/admin.php:991 -#: ../../mod/admin.php:1190 ../../mod/admin.php:1277 ../../mod/thing.php:286 -#: ../../mod/thing.php:329 ../../mod/import.php:394 ../../mod/invite.php:142 +#: ../../mod/admin.php:723 ../../mod/admin.php:859 ../../mod/admin.php:992 +#: ../../mod/admin.php:1191 ../../mod/admin.php:1278 ../../mod/thing.php:286 +#: ../../mod/thing.php:329 ../../mod/import.php:422 ../../mod/invite.php:142 #: ../../mod/mail.php:345 ../../mod/appman.php:99 ../../mod/poll.php:68 #: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/blogga/php/config.php:67 @@ -3064,35 +3069,35 @@ msgstr "" msgid "Submit" msgstr "" -#: ../../include/ItemObject.php:589 +#: ../../include/ItemObject.php:590 msgid "Bold" msgstr "" -#: ../../include/ItemObject.php:590 +#: ../../include/ItemObject.php:591 msgid "Italic" msgstr "" -#: ../../include/ItemObject.php:591 +#: ../../include/ItemObject.php:592 msgid "Underline" msgstr "" -#: ../../include/ItemObject.php:592 +#: ../../include/ItemObject.php:593 msgid "Quote" msgstr "" -#: ../../include/ItemObject.php:593 +#: ../../include/ItemObject.php:594 msgid "Code" msgstr "" -#: ../../include/ItemObject.php:594 +#: ../../include/ItemObject.php:595 msgid "Image" msgstr "" -#: ../../include/ItemObject.php:595 +#: ../../include/ItemObject.php:596 msgid "Link" msgstr "" -#: ../../include/ItemObject.php:596 +#: ../../include/ItemObject.php:597 msgid "Video" msgstr "" @@ -3279,7 +3284,7 @@ msgstr "" #: ../../include/profile_selectors.php:6 #: ../../include/profile_selectors.php:23 #: ../../include/profile_selectors.php:61 -#: ../../include/profile_selectors.php:97 +#: ../../include/profile_selectors.php:97 ../../include/permissions.php:741 msgid "Other" msgstr "" @@ -3569,6 +3574,40 @@ msgstr "" msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" +#: ../../include/permissions.php:733 +msgid "Social Networking" +msgstr "" + +#: ../../include/permissions.php:734 ../../include/permissions.php:736 +#: ../../include/permissions.php:738 ../../include/permissions.php:740 +msgid "Mostly Public" +msgstr "" + +#: ../../include/permissions.php:734 ../../include/permissions.php:736 +#: ../../include/permissions.php:738 +msgid "Restricted" +msgstr "" + +#: ../../include/permissions.php:734 ../../include/permissions.php:736 +msgid "Private" +msgstr "" + +#: ../../include/permissions.php:735 +msgid "Community Forum" +msgstr "" + +#: ../../include/permissions.php:737 +msgid "Feed Republish" +msgstr "" + +#: ../../include/permissions.php:739 +msgid "Celebrity/Soapbox" +msgstr "" + +#: ../../include/permissions.php:742 +msgid "Custom/Expert Mode" +msgstr "" + #: ../../mod/mood.php:132 msgid "Set your current mood and tell your friends" msgstr "" @@ -3594,7 +3633,7 @@ msgid "Unable to add menu element." msgstr "" #: ../../mod/mitem.php:78 ../../mod/dirprofile.php:175 ../../mod/menu.php:120 -#: ../../mod/xchan.php:27 +#: ../../mod/xchan.php:38 msgid "Not found." msgstr "" @@ -3642,7 +3681,7 @@ msgstr "" msgid "Menu Item Permissions" msgstr "" -#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:968 +#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:980 msgid "(click to open/close)" msgstr "" @@ -3718,454 +3757,462 @@ msgstr "" msgid "Key and Secret are required" msgstr "" -#: ../../mod/settings.php:196 +#: ../../mod/settings.php:198 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/settings.php:200 +#: ../../mod/settings.php:202 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/settings.php:214 +#: ../../mod/settings.php:216 msgid "Password changed." msgstr "" -#: ../../mod/settings.php:216 +#: ../../mod/settings.php:218 msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:230 +#: ../../mod/settings.php:232 msgid "Not valid email." msgstr "" -#: ../../mod/settings.php:233 +#: ../../mod/settings.php:235 msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../mod/settings.php:242 +#: ../../mod/settings.php:244 msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/settings.php:445 +#: ../../mod/settings.php:447 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:516 ../../mod/settings.php:542 -#: ../../mod/settings.php:578 +#: ../../mod/settings.php:518 ../../mod/settings.php:544 +#: ../../mod/settings.php:580 msgid "Add application" msgstr "" -#: ../../mod/settings.php:519 +#: ../../mod/settings.php:521 msgid "Name of application" msgstr "" -#: ../../mod/settings.php:520 ../../mod/settings.php:546 +#: ../../mod/settings.php:522 ../../mod/settings.php:548 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:520 ../../mod/settings.php:521 +#: ../../mod/settings.php:522 ../../mod/settings.php:523 msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../mod/settings.php:521 ../../mod/settings.php:547 +#: ../../mod/settings.php:523 ../../mod/settings.php:549 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:522 ../../mod/settings.php:548 +#: ../../mod/settings.php:524 ../../mod/settings.php:550 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:522 +#: ../../mod/settings.php:524 msgid "" "Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../mod/settings.php:523 ../../mod/settings.php:549 +#: ../../mod/settings.php:525 ../../mod/settings.php:551 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:523 +#: ../../mod/settings.php:525 msgid "Optional" msgstr "" -#: ../../mod/settings.php:534 +#: ../../mod/settings.php:536 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:577 +#: ../../mod/settings.php:579 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:581 +#: ../../mod/settings.php:583 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:582 +#: ../../mod/settings.php:584 msgid "No name" msgstr "" -#: ../../mod/settings.php:583 +#: ../../mod/settings.php:585 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:594 +#: ../../mod/settings.php:596 msgid "No feature settings configured" msgstr "" -#: ../../mod/settings.php:602 +#: ../../mod/settings.php:604 msgid "Feature Settings" msgstr "" -#: ../../mod/settings.php:625 +#: ../../mod/settings.php:627 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:626 +#: ../../mod/settings.php:628 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:627 +#: ../../mod/settings.php:629 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:628 +#: ../../mod/settings.php:630 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:628 +#: ../../mod/settings.php:630 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:630 ../../mod/settings.php:944 +#: ../../mod/settings.php:632 ../../mod/settings.php:954 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:631 ../../mod/removeaccount.php:61 +#: ../../mod/settings.php:633 ../../mod/removeaccount.php:61 msgid "Remove Account" msgstr "" -#: ../../mod/settings.php:632 +#: ../../mod/settings.php:634 msgid "Remove this account from this server including all its channels" msgstr "" -#: ../../mod/settings.php:633 ../../mod/settings.php:1007 +#: ../../mod/settings.php:635 ../../mod/settings.php:1019 msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/settings.php:649 +#: ../../mod/settings.php:651 msgid "Off" msgstr "" -#: ../../mod/settings.php:649 +#: ../../mod/settings.php:651 msgid "On" msgstr "" -#: ../../mod/settings.php:656 +#: ../../mod/settings.php:658 msgid "Additional Features" msgstr "" -#: ../../mod/settings.php:681 +#: ../../mod/settings.php:683 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:711 ../../mod/admin.php:362 +#: ../../mod/settings.php:713 ../../mod/admin.php:362 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:720 +#: ../../mod/settings.php:722 #, php-format msgid "%s - (Experimental)" msgstr "" -#: ../../mod/settings.php:753 +#: ../../mod/settings.php:758 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:764 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:765 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:766 msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:767 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:767 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:763 +#: ../../mod/settings.php:768 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/settings.php:763 +#: ../../mod/settings.php:768 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:769 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:765 +#: ../../mod/settings.php:770 +msgid "Link post titles to source" +msgstr "" + +#: ../../mod/settings.php:771 msgid "System Page Layout Editor - (advanced)" msgstr "" -#: ../../mod/settings.php:801 +#: ../../mod/settings.php:807 msgid "Nobody except yourself" msgstr "" -#: ../../mod/settings.php:802 +#: ../../mod/settings.php:808 msgid "Only those you specifically allow" msgstr "" -#: ../../mod/settings.php:803 +#: ../../mod/settings.php:809 msgid "Approved connections" msgstr "" -#: ../../mod/settings.php:804 +#: ../../mod/settings.php:810 msgid "Any connections" msgstr "" -#: ../../mod/settings.php:805 +#: ../../mod/settings.php:811 msgid "Anybody on this website" msgstr "" -#: ../../mod/settings.php:806 +#: ../../mod/settings.php:812 msgid "Anybody in this network" msgstr "" -#: ../../mod/settings.php:807 +#: ../../mod/settings.php:813 msgid "Anybody authenticated" msgstr "" -#: ../../mod/settings.php:808 +#: ../../mod/settings.php:814 msgid "Anybody on the internet" msgstr "" -#: ../../mod/settings.php:885 +#: ../../mod/settings.php:891 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/settings.php:885 ../../mod/settings.php:890 -#: ../../mod/settings.php:961 ../../mod/api.php:106 ../../mod/profiles.php:602 +#: ../../mod/settings.php:891 ../../mod/settings.php:896 +#: ../../mod/settings.php:973 ../../mod/api.php:106 ../../mod/profiles.php:602 #: ../../mod/admin.php:392 msgid "No" msgstr "" -#: ../../mod/settings.php:885 ../../mod/settings.php:890 -#: ../../mod/settings.php:961 ../../mod/api.php:105 ../../mod/profiles.php:601 +#: ../../mod/settings.php:891 ../../mod/settings.php:896 +#: ../../mod/settings.php:973 ../../mod/api.php:105 ../../mod/profiles.php:601 #: ../../mod/admin.php:394 msgid "Yes" msgstr "" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:896 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:894 ../../mod/profile_photo.php:365 +#: ../../mod/settings.php:900 ../../mod/profile_photo.php:365 msgid "or" msgstr "" -#: ../../mod/settings.php:899 +#: ../../mod/settings.php:905 msgid "Your channel address is" msgstr "" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:943 msgid "Channel Settings" msgstr "" -#: ../../mod/settings.php:942 +#: ../../mod/settings.php:952 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:945 +#: ../../mod/settings.php:955 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:946 +#: ../../mod/settings.php:956 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:946 +#: ../../mod/settings.php:956 msgid "Geographical location to display on your posts" msgstr "" -#: ../../mod/settings.php:947 +#: ../../mod/settings.php:957 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:959 msgid "Adult Content" msgstr "" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:959 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../mod/settings.php:951 +#: ../../mod/settings.php:961 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:963 +msgid "Your permissions are already configured. Click to view/adjust" +msgstr "" + +#: ../../mod/settings.php:965 msgid "Hide my online presence" msgstr "" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:965 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:967 msgid "Simple Privacy Settings:" msgstr "" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:968 msgid "" "Very Public - extremely permissive (should be used with caution)" msgstr "" -#: ../../mod/settings.php:957 +#: ../../mod/settings.php:969 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "" -#: ../../mod/settings.php:958 +#: ../../mod/settings.php:970 msgid "Private - default private, never open or public" msgstr "" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:971 msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/settings.php:961 +#: ../../mod/settings.php:973 msgid "Allow others to tag your posts" msgstr "" -#: ../../mod/settings.php:961 +#: ../../mod/settings.php:973 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../mod/settings.php:963 +#: ../../mod/settings.php:975 msgid "Advanced Privacy Settings" msgstr "" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:977 msgid "Expire other channel content after this many days" msgstr "" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:977 msgid "0 or blank prevents expiration" msgstr "" -#: ../../mod/settings.php:966 +#: ../../mod/settings.php:978 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:966 +#: ../../mod/settings.php:978 msgid "May reduce spam activity" msgstr "" -#: ../../mod/settings.php:967 +#: ../../mod/settings.php:979 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:991 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:991 msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:994 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:995 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:996 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:997 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:986 +#: ../../mod/settings.php:998 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:987 +#: ../../mod/settings.php:999 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:1000 msgid "You receive a connection request" msgstr "" -#: ../../mod/settings.php:989 +#: ../../mod/settings.php:1001 msgid "Your connections are confirmed" msgstr "" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1002 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1003 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:1004 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:1005 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:994 +#: ../../mod/settings.php:1006 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:995 +#: ../../mod/settings.php:1007 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:1010 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:999 +#: ../../mod/settings.php:1011 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../mod/settings.php:1002 +#: ../../mod/settings.php:1014 msgid "" "Please enable expert mode (in Settings > " "Additional features) to adjust!" msgstr "" -#: ../../mod/settings.php:1003 +#: ../../mod/settings.php:1015 msgid "Miscellaneous Settings" msgstr "" -#: ../../mod/settings.php:1005 +#: ../../mod/settings.php:1017 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../mod/settings.php:1006 +#: ../../mod/settings.php:1018 msgid "Remove this channel" msgstr "" @@ -4231,12 +4278,11 @@ msgstr "" msgid "Invalid item." msgstr "" -#: ../../mod/block.php:39 ../../mod/page.php:47 ../../mod/home.php:54 -#: ../../mod/wall_upload.php:28 +#: ../../mod/block.php:39 ../../mod/page.php:47 ../../mod/wall_upload.php:28 msgid "Channel not found." msgstr "" -#: ../../mod/block.php:75 ../../mod/page.php:83 ../../mod/display.php:100 +#: ../../mod/block.php:75 ../../mod/page.php:83 ../../mod/display.php:102 #: ../../mod/help.php:72 ../../index.php:236 msgid "Page not found." msgstr "" @@ -4390,7 +4436,7 @@ msgstr "" msgid "Interests" msgstr "" -#: ../../mod/profiles.php:433 ../../mod/admin.php:865 +#: ../../mod/profiles.php:433 ../../mod/admin.php:866 msgid "Address" msgstr "" @@ -5036,310 +5082,310 @@ msgstr "" msgid "is now connected to" msgstr "" -#: ../../mod/connedit.php:274 +#: ../../mod/connedit.php:296 msgid "Could not access address book record." msgstr "" -#: ../../mod/connedit.php:288 +#: ../../mod/connedit.php:310 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connedit.php:295 +#: ../../mod/connedit.php:317 msgid "Channel has been unblocked" msgstr "" -#: ../../mod/connedit.php:296 +#: ../../mod/connedit.php:318 msgid "Channel has been blocked" msgstr "" -#: ../../mod/connedit.php:300 ../../mod/connedit.php:312 -#: ../../mod/connedit.php:324 ../../mod/connedit.php:336 -#: ../../mod/connedit.php:352 +#: ../../mod/connedit.php:322 ../../mod/connedit.php:334 +#: ../../mod/connedit.php:346 ../../mod/connedit.php:358 +#: ../../mod/connedit.php:374 msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/connedit.php:307 +#: ../../mod/connedit.php:329 msgid "Channel has been unignored" msgstr "" -#: ../../mod/connedit.php:308 +#: ../../mod/connedit.php:330 msgid "Channel has been ignored" msgstr "" -#: ../../mod/connedit.php:319 +#: ../../mod/connedit.php:341 msgid "Channel has been unarchived" msgstr "" -#: ../../mod/connedit.php:320 +#: ../../mod/connedit.php:342 msgid "Channel has been archived" msgstr "" -#: ../../mod/connedit.php:331 +#: ../../mod/connedit.php:353 msgid "Channel has been unhidden" msgstr "" -#: ../../mod/connedit.php:332 +#: ../../mod/connedit.php:354 msgid "Channel has been hidden" msgstr "" -#: ../../mod/connedit.php:347 +#: ../../mod/connedit.php:369 msgid "Channel has been approved" msgstr "" -#: ../../mod/connedit.php:348 +#: ../../mod/connedit.php:370 msgid "Channel has been unapproved" msgstr "" -#: ../../mod/connedit.php:376 +#: ../../mod/connedit.php:398 msgid "Connection has been removed." msgstr "" -#: ../../mod/connedit.php:396 +#: ../../mod/connedit.php:418 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connedit.php:400 +#: ../../mod/connedit.php:422 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connedit.php:403 +#: ../../mod/connedit.php:425 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connedit.php:407 +#: ../../mod/connedit.php:429 msgid "Recent Activity" msgstr "" -#: ../../mod/connedit.php:410 +#: ../../mod/connedit.php:432 msgid "View recent posts and comments" msgstr "" -#: ../../mod/connedit.php:414 ../../mod/connedit.php:557 +#: ../../mod/connedit.php:436 ../../mod/connedit.php:579 #: ../../mod/admin.php:732 msgid "Unblock" msgstr "" -#: ../../mod/connedit.php:414 ../../mod/connedit.php:557 +#: ../../mod/connedit.php:436 ../../mod/connedit.php:579 #: ../../mod/admin.php:731 msgid "Block" msgstr "" -#: ../../mod/connedit.php:417 +#: ../../mod/connedit.php:439 msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/connedit.php:421 ../../mod/connedit.php:558 +#: ../../mod/connedit.php:443 ../../mod/connedit.php:580 msgid "Unignore" msgstr "" -#: ../../mod/connedit.php:421 ../../mod/connedit.php:558 +#: ../../mod/connedit.php:443 ../../mod/connedit.php:580 #: ../../mod/notifications.php:51 msgid "Ignore" msgstr "" -#: ../../mod/connedit.php:424 +#: ../../mod/connedit.php:446 msgid "Ignore or Unignore this connection" msgstr "" -#: ../../mod/connedit.php:427 +#: ../../mod/connedit.php:449 msgid "Unarchive" msgstr "" -#: ../../mod/connedit.php:427 +#: ../../mod/connedit.php:449 msgid "Archive" msgstr "" -#: ../../mod/connedit.php:430 +#: ../../mod/connedit.php:452 msgid "Archive or Unarchive this connection" msgstr "" -#: ../../mod/connedit.php:433 +#: ../../mod/connedit.php:455 msgid "Unhide" msgstr "" -#: ../../mod/connedit.php:433 +#: ../../mod/connedit.php:455 msgid "Hide" msgstr "" -#: ../../mod/connedit.php:436 +#: ../../mod/connedit.php:458 msgid "Hide or Unhide this connection" msgstr "" -#: ../../mod/connedit.php:443 +#: ../../mod/connedit.php:465 msgid "Delete this connection" msgstr "" -#: ../../mod/connedit.php:486 ../../mod/connedit.php:515 +#: ../../mod/connedit.php:508 ../../mod/connedit.php:537 msgid "Approve this connection" msgstr "" -#: ../../mod/connedit.php:486 +#: ../../mod/connedit.php:508 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connedit.php:502 +#: ../../mod/connedit.php:524 msgid "Automatic Permissions Settings" msgstr "" -#: ../../mod/connedit.php:502 +#: ../../mod/connedit.php:524 #, php-format msgid "Connections: settings for %s" msgstr "" -#: ../../mod/connedit.php:506 +#: ../../mod/connedit.php:528 msgid "" "When receiving a channel introduction, any permissions provided here will be " "applied to the new connection automatically and the introduction approved. " "Leave this page if you do not wish to use this feature." msgstr "" -#: ../../mod/connedit.php:508 +#: ../../mod/connedit.php:530 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connedit.php:514 +#: ../../mod/connedit.php:536 msgid "inherited" msgstr "" -#: ../../mod/connedit.php:516 +#: ../../mod/connedit.php:538 msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/connedit.php:517 +#: ../../mod/connedit.php:539 msgid "" "This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/connedit.php:519 +#: ../../mod/connedit.php:541 msgid "Profile Visibility" msgstr "" -#: ../../mod/connedit.php:520 +#: ../../mod/connedit.php:542 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/connedit.php:521 +#: ../../mod/connedit.php:543 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connedit.php:522 +#: ../../mod/connedit.php:544 msgid "Edit contact notes" msgstr "" -#: ../../mod/connedit.php:524 +#: ../../mod/connedit.php:546 msgid "Their Settings" msgstr "" -#: ../../mod/connedit.php:525 +#: ../../mod/connedit.php:547 msgid "My Settings" msgstr "" -#: ../../mod/connedit.php:527 +#: ../../mod/connedit.php:549 msgid "Clear/Disable Automatic Permissions" msgstr "" -#: ../../mod/connedit.php:528 +#: ../../mod/connedit.php:550 msgid "Forum Members" msgstr "" -#: ../../mod/connedit.php:529 +#: ../../mod/connedit.php:551 msgid "Soapbox" msgstr "" -#: ../../mod/connedit.php:530 +#: ../../mod/connedit.php:552 msgid "Full Sharing (typical social network permissions)" msgstr "" -#: ../../mod/connedit.php:531 +#: ../../mod/connedit.php:553 msgid "Cautious Sharing " msgstr "" -#: ../../mod/connedit.php:532 +#: ../../mod/connedit.php:554 msgid "Follow Only" msgstr "" -#: ../../mod/connedit.php:533 +#: ../../mod/connedit.php:555 msgid "Individual Permissions" msgstr "" -#: ../../mod/connedit.php:534 +#: ../../mod/connedit.php:556 msgid "" "Some permissions may be inherited from your channel privacy settings, which have higher priority than individual " "settings. Changing those inherited settings on this page will have no effect." msgstr "" -#: ../../mod/connedit.php:535 +#: ../../mod/connedit.php:557 msgid "Advanced Permissions" msgstr "" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:558 msgid "Simple Permissions (select one and submit)" msgstr "" -#: ../../mod/connedit.php:540 +#: ../../mod/connedit.php:562 #, php-format msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connedit.php:541 +#: ../../mod/connedit.php:563 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connedit.php:542 +#: ../../mod/connedit.php:564 msgid "Ignore contact" msgstr "" -#: ../../mod/connedit.php:543 +#: ../../mod/connedit.php:565 msgid "Repair URL settings" msgstr "" -#: ../../mod/connedit.php:544 +#: ../../mod/connedit.php:566 msgid "View conversations" msgstr "" -#: ../../mod/connedit.php:546 +#: ../../mod/connedit.php:568 msgid "Delete contact" msgstr "" -#: ../../mod/connedit.php:549 +#: ../../mod/connedit.php:571 msgid "Last update:" msgstr "" -#: ../../mod/connedit.php:551 +#: ../../mod/connedit.php:573 msgid "Update public posts" msgstr "" -#: ../../mod/connedit.php:553 +#: ../../mod/connedit.php:575 msgid "Update now" msgstr "" -#: ../../mod/connedit.php:559 +#: ../../mod/connedit.php:581 msgid "Currently blocked" msgstr "" -#: ../../mod/connedit.php:560 +#: ../../mod/connedit.php:582 msgid "Currently ignored" msgstr "" -#: ../../mod/connedit.php:561 +#: ../../mod/connedit.php:583 msgid "Currently archived" msgstr "" -#: ../../mod/connedit.php:562 +#: ../../mod/connedit.php:584 msgid "Currently pending" msgstr "" -#: ../../mod/connedit.php:563 +#: ../../mod/connedit.php:585 msgid "Hide this contact from others" msgstr "" -#: ../../mod/connedit.php:563 +#: ../../mod/connedit.php:585 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" @@ -5437,15 +5483,6 @@ msgstr "" msgid "This site is not a directory server" msgstr "" -#: ../../mod/home.php:81 -msgid "Red Matrix - "The Network"" -msgstr "" - -#: ../../mod/home.php:94 -#, php-format -msgid "Welcome to %s" -msgstr "" - #: ../../mod/setup.php:162 msgid "Red Matrix Server - Setup" msgstr "" @@ -5912,49 +5949,49 @@ msgstr "" msgid "Delete Webpage" msgstr "" -#: ../../mod/siteinfo.php:70 +#: ../../mod/siteinfo.php:76 #, php-format msgid "Version %s" msgstr "" -#: ../../mod/siteinfo.php:89 +#: ../../mod/siteinfo.php:95 msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/siteinfo.php:102 +#: ../../mod/siteinfo.php:108 msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/siteinfo.php:110 +#: ../../mod/siteinfo.php:116 msgid "Red" msgstr "" -#: ../../mod/siteinfo.php:111 +#: ../../mod/siteinfo.php:117 msgid "" "This is a hub of the Red Matrix - a global cooperative network of " "decentralized privacy enhanced websites." msgstr "" -#: ../../mod/siteinfo.php:114 +#: ../../mod/siteinfo.php:120 msgid "Running at web location" msgstr "" -#: ../../mod/siteinfo.php:115 +#: ../../mod/siteinfo.php:121 msgid "" "Please visit GetZot.com to learn more " "about the Red Matrix." msgstr "" -#: ../../mod/siteinfo.php:116 +#: ../../mod/siteinfo.php:122 msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/siteinfo.php:119 +#: ../../mod/siteinfo.php:125 msgid "" "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" msgstr "" -#: ../../mod/siteinfo.php:121 +#: ../../mod/siteinfo.php:127 msgid "Site Administrators" msgstr "" @@ -6128,7 +6165,7 @@ msgid "Leave blank to import all public content" msgstr "" #: ../../mod/sources.php:103 ../../mod/sources.php:137 -#: ../../mod/new_channel.php:110 +#: ../../mod/new_channel.php:112 msgid "Channel Name" msgstr "" @@ -6379,15 +6416,15 @@ msgstr "" msgid "Accounts" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:857 +#: ../../mod/admin.php:99 ../../mod/admin.php:858 msgid "Channels" msgstr "" -#: ../../mod/admin.php:100 ../../mod/admin.php:948 ../../mod/admin.php:990 +#: ../../mod/admin.php:100 ../../mod/admin.php:949 ../../mod/admin.php:991 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:101 ../../mod/admin.php:1153 ../../mod/admin.php:1189 +#: ../../mod/admin.php:101 ../../mod/admin.php:1154 ../../mod/admin.php:1190 msgid "Themes" msgstr "" @@ -6403,7 +6440,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1276 +#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1277 msgid "Logs" msgstr "" @@ -6420,9 +6457,9 @@ msgid "Message queues" msgstr "" #: ../../mod/admin.php:211 ../../mod/admin.php:412 ../../mod/admin.php:514 -#: ../../mod/admin.php:721 ../../mod/admin.php:856 ../../mod/admin.php:947 -#: ../../mod/admin.php:989 ../../mod/admin.php:1152 ../../mod/admin.php:1188 -#: ../../mod/admin.php:1275 +#: ../../mod/admin.php:721 ../../mod/admin.php:857 ../../mod/admin.php:948 +#: ../../mod/admin.php:990 ../../mod/admin.php:1153 ../../mod/admin.php:1189 +#: ../../mod/admin.php:1276 msgid "Administration" msgstr "" @@ -6530,14 +6567,6 @@ msgstr "" msgid "Accessibility theme" msgstr "" -#: ../../mod/admin.php:429 -msgid "Channel to use for this website's static pages" -msgstr "" - -#: ../../mod/admin.php:429 -msgid "Site Channel" -msgstr "" - #: ../../mod/admin.php:430 msgid "Enable Diaspora Protocol" msgstr "" @@ -6799,7 +6828,7 @@ msgstr "" msgid "Users" msgstr "" -#: ../../mod/admin.php:724 ../../mod/admin.php:859 +#: ../../mod/admin.php:724 ../../mod/admin.php:860 msgid "select all" msgstr "" @@ -6854,7 +6883,7 @@ msgstr "" #: ../../mod/admin.php:771 #, php-format msgid "%s channel censored/uncensored" -msgid_plural "%s channelss censored/uncensored" +msgid_plural "%s channels censored/uncensored" msgstr[0] "" msgstr[1] "" @@ -6874,148 +6903,148 @@ msgstr "" msgid "Channel '%s' deleted" msgstr "" -#: ../../mod/admin.php:818 +#: ../../mod/admin.php:819 #, php-format msgid "Channel '%s' uncensored" msgstr "" -#: ../../mod/admin.php:818 +#: ../../mod/admin.php:819 #, php-format msgid "Channel '%s' censored" msgstr "" -#: ../../mod/admin.php:861 +#: ../../mod/admin.php:862 msgid "Censor" msgstr "" -#: ../../mod/admin.php:862 +#: ../../mod/admin.php:863 msgid "Uncensor" msgstr "" -#: ../../mod/admin.php:865 +#: ../../mod/admin.php:866 msgid "UID" msgstr "" -#: ../../mod/admin.php:867 +#: ../../mod/admin.php:868 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:868 +#: ../../mod/admin.php:869 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:907 +#: ../../mod/admin.php:908 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:911 +#: ../../mod/admin.php:912 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:921 ../../mod/admin.php:1123 +#: ../../mod/admin.php:922 ../../mod/admin.php:1124 msgid "Disable" msgstr "" -#: ../../mod/admin.php:923 ../../mod/admin.php:1125 +#: ../../mod/admin.php:924 ../../mod/admin.php:1126 msgid "Enable" msgstr "" -#: ../../mod/admin.php:949 ../../mod/admin.php:1154 +#: ../../mod/admin.php:950 ../../mod/admin.php:1155 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:957 ../../mod/admin.php:1164 +#: ../../mod/admin.php:958 ../../mod/admin.php:1165 msgid "Author: " msgstr "" -#: ../../mod/admin.php:958 ../../mod/admin.php:1165 +#: ../../mod/admin.php:959 ../../mod/admin.php:1166 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:1087 +#: ../../mod/admin.php:1088 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:1146 +#: ../../mod/admin.php:1147 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1194 +#: ../../mod/admin.php:1195 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1195 +#: ../../mod/admin.php:1196 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1222 +#: ../../mod/admin.php:1223 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1278 +#: ../../mod/admin.php:1279 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1284 +#: ../../mod/admin.php:1285 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1285 +#: ../../mod/admin.php:1286 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1285 +#: ../../mod/admin.php:1286 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1286 +#: ../../mod/admin.php:1287 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1333 +#: ../../mod/admin.php:1334 msgid "New Profile Field" msgstr "" -#: ../../mod/admin.php:1334 ../../mod/admin.php:1355 +#: ../../mod/admin.php:1335 ../../mod/admin.php:1356 msgid "Field nickname" msgstr "" -#: ../../mod/admin.php:1334 ../../mod/admin.php:1355 +#: ../../mod/admin.php:1335 ../../mod/admin.php:1356 msgid "System name of field" msgstr "" -#: ../../mod/admin.php:1335 ../../mod/admin.php:1356 +#: ../../mod/admin.php:1336 ../../mod/admin.php:1357 msgid "Input type" msgstr "" -#: ../../mod/admin.php:1336 ../../mod/admin.php:1357 +#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 msgid "Field Name" msgstr "" -#: ../../mod/admin.php:1336 ../../mod/admin.php:1357 +#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 msgid "Label on profile pages" msgstr "" -#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 +#: ../../mod/admin.php:1338 ../../mod/admin.php:1359 msgid "Help text" msgstr "" -#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 +#: ../../mod/admin.php:1338 ../../mod/admin.php:1359 msgid "Additional info (optional)" msgstr "" -#: ../../mod/admin.php:1348 +#: ../../mod/admin.php:1349 msgid "Field definition not found" msgstr "" -#: ../../mod/admin.php:1354 +#: ../../mod/admin.php:1355 msgid "Edit Profile Field" msgstr "" @@ -7076,44 +7105,49 @@ msgstr "" msgid "Add Thing to your Profile" msgstr "" -#: ../../mod/import.php:36 +#: ../../mod/import.php:25 +#, php-format +msgid "Your service plan only allows %d channels." +msgstr "" + +#: ../../mod/import.php:51 msgid "Nothing to import." msgstr "" -#: ../../mod/import.php:58 +#: ../../mod/import.php:73 msgid "Unable to download data from old server" msgstr "" -#: ../../mod/import.php:64 +#: ../../mod/import.php:79 msgid "Imported file is empty." msgstr "" -#: ../../mod/import.php:88 +#: ../../mod/import.php:103 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/import.php:106 +#: ../../mod/import.php:121 msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/import.php:116 +#: ../../mod/import.php:131 msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:365 +#: ../../mod/import.php:394 msgid "Import completed." msgstr "" -#: ../../mod/import.php:378 +#: ../../mod/import.php:406 msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/import.php:383 +#: ../../mod/import.php:411 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:384 +#: ../../mod/import.php:412 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " @@ -7121,27 +7155,27 @@ msgid "" "imported. Importation of content is not yet available." msgstr "" -#: ../../mod/import.php:385 +#: ../../mod/import.php:413 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:386 +#: ../../mod/import.php:414 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:387 +#: ../../mod/import.php:415 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:388 +#: ../../mod/import.php:416 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:389 +#: ../../mod/import.php:417 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:390 +#: ../../mod/import.php:418 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be " @@ -7149,7 +7183,7 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:391 +#: ../../mod/import.php:419 msgid "Make this hub my primary location" msgstr "" @@ -7624,11 +7658,11 @@ msgstr "" msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/new_channel.php:107 +#: ../../mod/new_channel.php:109 msgid "Add a Channel" msgstr "" -#: ../../mod/new_channel.php:108 +#: ../../mod/new_channel.php:110 msgid "" "A channel is your own collection of related web pages. A channel can be used " "to hold social network profiles, blogs, conversation groups and forums, " @@ -7636,27 +7670,46 @@ msgid "" "service provider allows." msgstr "" -#: ../../mod/new_channel.php:111 +#: ../../mod/new_channel.php:113 msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\" " msgstr "" -#: ../../mod/new_channel.php:112 +#: ../../mod/new_channel.php:114 msgid "Choose a short nickname" msgstr "" -#: ../../mod/new_channel.php:113 +#: ../../mod/new_channel.php:115 msgid "" "Your nickname will be used to create an easily remembered channel address " "(like an email address) which you can share with others." msgstr "" -#: ../../mod/new_channel.php:114 +#: ../../mod/new_channel.php:116 msgid "" "Or import an existing channel from another location" msgstr "" +#: ../../mod/new_channel.php:118 +msgid "Channel Type" +msgstr "" + +#: ../../mod/new_channel.php:119 +msgid "" +"Please choose a channel type (such as social networking or community forum) " +"and privacy requirements so we can select the best permissions for you" +msgstr "" + +#: ../../mod/home.php:46 +msgid "Red Matrix - "The Network"" +msgstr "" + +#: ../../mod/home.php:101 +#, php-format +msgid "Welcome to %s" +msgstr "" + #: ../../mod/notifications.php:26 msgid "Invalid request identifier." msgstr "" From 87a6f257691e68ebf0364476493ff19c9f220297 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 19 Sep 2014 02:22:24 -0700 Subject: [PATCH 77/94] try to sort out walltowall translation for diaspora recipients --- include/diaspora.php | 8 +-- include/items.php | 12 +--- include/onepoll.php | 2 +- mod/item.php | 4 +- mod/receive.php | 2 +- version.inc | 2 +- view/css/mod_new_channel.css | 121 +++++++++++++++++++++++++++++++++++ 7 files changed, 133 insertions(+), 18 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 3b6321643..b0943b7ec 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -58,7 +58,7 @@ function diaspora_dispatch($importer,$msg,$attempt=1) { $xmlbase = $parsed_xml->post; - logger('diaspora_dispatch: ' . print_r($xmlbase,true), LOGGER_DEBUG); + logger('diaspora_dispatch: ' . print_r($xmlbase,true), LOGGER_DATA); if($xmlbase->request) { @@ -545,7 +545,7 @@ function diaspora_decode($importer,$xml) { * */ - logger('decrypted: ' . $decrypted, LOGGER_DEBUG); + logger('decrypted: ' . $decrypted, LOGGER_DATA); $idom = parse_xml_string($decrypted,false); $inner_iv = base64_decode($idom->iv); @@ -912,7 +912,7 @@ function diaspora_post($importer,$xml,$msg) { function diaspora_reshare($importer,$xml,$msg) { - logger('diaspora_reshare: init: ' . print_r($xml,true)); + logger('diaspora_reshare: init: ' . print_r($xml,true), LOGGER_DATA); $a = get_app(); $guid = notags(unxmlify($xml->guid)); @@ -955,7 +955,7 @@ function diaspora_reshare($importer,$xml,$msg) { logger('diaspora_reshare: unable to fetch source url ' . $source_url); return; } - logger('diaspora_reshare: source: ' . $x['body']); + logger('diaspora_reshare: source: ' . $x['body'], LOGGER_DATA); $source_xml = parse_xml_string($x['body'],false); diff --git a/include/items.php b/include/items.php index 1fa833eb2..840c92982 100755 --- a/include/items.php +++ b/include/items.php @@ -2469,19 +2469,11 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id) return; } - $body = $datarray['body']; - if(array_key_exists('item_flags',$datarray) && ($datarray['item_flags'] & ITEM_OBSCURED)) { - $key = get_config('system','prvkey'); - if($datarray['body']) - $body = crypto_unencapsulate(json_decode($datarray['body'],true),$key); - } + require_once('include/bb2diaspora.php'); + $signed_body = bb2diaspora_itembody($datarray); logger('mod_item: storing diaspora comment signature',LOGGER_DEBUG); - require_once('include/bb2diaspora.php'); - - $signed_body = html_entity_decode(bb2diaspora($body)); - $diaspora_handle = $channel['channel_address'] . '@' . get_app()->get_hostname(); $signed_text = $datarray['mid'] . ';' . $parent_item['mid'] . ';' . $signed_body . ';' . $diaspora_handle; diff --git a/include/onepoll.php b/include/onepoll.php index 1f28852e9..98d52db93 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -135,7 +135,7 @@ function onepoll_run($argv, $argc){ foreach($j['messages'] as $message) { $results = process_delivery(array('hash' => $contact['xchan_hash']), get_item_elements($message), array(array('hash' => $importer['xchan_hash'])), false); - logger('onepoll: feed_update: process_delivery: ' . print_r($results,true)); + logger('onepoll: feed_update: process_delivery: ' . print_r($results,true), LOGGER_DATA); $total ++; } logger("onepoll: $total messages processed"); diff --git a/mod/item.php b/mod/item.php index 23d39a62c..7f25b35b8 100644 --- a/mod/item.php +++ b/mod/item.php @@ -854,7 +854,9 @@ function item_post(&$a) { if($parent) { // Store the comment signature information in case we need to relay to Diaspora //FIXME - store_diaspora_comment_sig($datarray,$channel,$parent_item, $post_id); + $ditem = $datarray; + $ditem['author'] = $observer; + store_diaspora_comment_sig($ditem,$channel,$parent_item, $post_id); } update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid); diff --git a/mod/receive.php b/mod/receive.php index 2a68019e0..4071b169b 100644 --- a/mod/receive.php +++ b/mod/receive.php @@ -58,7 +58,7 @@ function receive_post(&$a) { logger('mod-diaspora: decoded', LOGGER_DEBUG); - logger('mod-diaspora: decoded msg: ' . print_r($msg,true), LOGGER_DEBUG); + logger('mod-diaspora: decoded msg: ' . print_r($msg,true), LOGGER_DATA); if(! is_array($msg)) http_status_exit(500); diff --git a/version.inc b/version.inc index d75eabb40..61b92795e 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-18.802 +2014-09-19.803 diff --git a/view/css/mod_new_channel.css b/view/css/mod_new_channel.css index 2af0fbb2d..fcef128e3 100644 --- a/view/css/mod_new_channel.css +++ b/view/css/mod_new_channel.css @@ -38,3 +38,124 @@ h2 { margin-bottom: 20px; } +/** +* Stylish Select 0.4.9 - $ plugin to replace a select drop down box with a stylable unordered list +* http://github.com/scottdarby/Stylish-Select/ +* +* Copyright (c) 2009 Scott Darby +* +* Requires: jQuery 1.3 or newer +* +* Dual licensed under the MIT and GPL licenses. +*/ + +/** +* Hide lists on page load +---------------------------------------------------------*/ + +#privacy-role-select .SSContainerDivWrapper { + left:-9999px; +} + +/* +* Red example +---------------------------------------------------------*/ +#privacy-role-select .SSContainerDivWrapper { + margin:0; + padding:0; + width:290px; + position:absolute; + top:22px; + left:0; + z-index:2; +} + +#privacy-role-select ul.newList { + margin:0; + padding:0; + list-style:none; + color:#000; + background:#fff; + border:1px solid #ccc; + overflow:auto; +} + +#privacy-role-select ul.newList * { + margin:0; + padding:0; +} + + +#privacy-role-select ul.newList a { + color: #000; + text-decoration:none; + display:block; + padding:3px 8px; +} + +#privacy-role-select .newListSelected { + width:285px; + color:#000; + height:19px; + padding:3px 0 0 6px; + float:left; + background:url(select-bg.png) no-repeat; +} + +#privacy-role-select ul.newList li a:focus { + -moz-outline-style: none; +} + +#privacy-role-select .selectedTxt { + width:258px; + overflow:hidden; + height:16px; + padding:0 23px 0 0; +} + +#privacy-role-select .hiLite { + background:#650101!important; + color:#fff!important; +} + +#privacy-role-select .newListHover { + background:#ccc!important; + color:#000!important; + cursor:default; +} + +#privacy-role-select .newListDisabled { + opacity: 0.6; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; + filter: alpha(opacity=60); +} + +#privacy-role-select .newListItemDisabled { + opacity: 0.6; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; + filter: alpha(opacity=60); +} + +#privacy-role-select .newListOptionDisabled { + opacity: 0.6; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; + filter: alpha(opacity=60); +} + +#privacy-role-select .newListSelHover, +#privacy-role-select .newListSelFocus { + background-position:0 -22px; + cursor:default; +} + +#privacy-role-select .newListOptionTitle { + font-weight:bold; +} + +#privacy-role-select .newListOptionTitle ul { + margin:3px 0 0; +} + +#privacy-role-select .newListOptionTitle li { + font-weight:normal; +} \ No newline at end of file From eedc0e50c13f3232b4693f50da39ff340675125c Mon Sep 17 00:00:00 2001 From: Jeroen Date: Fri, 19 Sep 2014 15:54:19 +0000 Subject: [PATCH 78/94] update nl --- view/nl/messages.po | 1507 +++++++++++++++++++++++-------------------- view/nl/strings.php | 77 ++- 2 files changed, 838 insertions(+), 746 deletions(-) diff --git a/view/nl/messages.po b/view/nl/messages.po index 829f7a9c7..006307ca3 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-05 00:03-0700\n" -"PO-Revision-Date: 2014-09-10 14:02+0000\n" +"POT-Creation-Date: 2014-09-19 00:03-0700\n" +"PO-Revision-Date: 2014-09-19 15:51+0000\n" "Last-Translator: jeroenpraat \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden" msgid "Profile Photos" msgstr "Profielfoto's" -#: ../../include/network.php:557 +#: ../../include/network.php:590 msgid "view full size" msgstr "volledige grootte tonen" @@ -65,7 +65,7 @@ msgstr "Bladwijzers" msgid "Address Book" msgstr "Connecties" -#: ../../include/apps.php:126 ../../include/nav.php:119 ../../boot.php:1494 +#: ../../include/apps.php:126 ../../include/nav.php:119 ../../boot.php:1496 msgid "Login" msgstr "Inloggen" @@ -79,8 +79,8 @@ msgid "Matrix" msgstr "Matrix" #: ../../include/apps.php:129 ../../include/nav.php:211 -#: ../../include/widgets.php:521 ../../mod/admin.php:948 -#: ../../mod/admin.php:1153 +#: ../../include/widgets.php:521 ../../mod/admin.php:951 +#: ../../mod/admin.php:1156 msgid "Settings" msgstr "Instellingen" @@ -91,7 +91,7 @@ msgid "Files" msgstr "Bestanden" #: ../../include/apps.php:131 ../../include/nav.php:115 -#: ../../include/conversation.php:1572 ../../mod/webpages.php:79 +#: ../../include/conversation.php:1572 ../../mod/webpages.php:84 msgid "Webpages" msgstr "Webpagina's" @@ -99,8 +99,8 @@ msgstr "Webpagina's" msgid "Channel Home" msgstr "Tijdlijn kanaal" -#: ../../include/apps.php:133 ../../include/identity.php:986 -#: ../../include/identity.php:1104 ../../mod/profperm.php:112 +#: ../../include/apps.php:133 ../../include/identity.php:1063 +#: ../../include/identity.php:1181 ../../mod/profperm.php:112 msgid "Profile" msgstr "Profiel" @@ -110,7 +110,7 @@ msgid "Photos" msgstr "Foto's" #: ../../include/apps.php:135 ../../include/nav.php:205 -#: ../../mod/events.php:411 +#: ../../mod/events.php:436 msgid "Events" msgstr "Gebeurtenissen" @@ -179,7 +179,7 @@ msgid "Profile Photo" msgstr "Profielfoto" #: ../../include/apps.php:239 ../../mod/settings.php:79 -#: ../../mod/settings.php:543 +#: ../../mod/settings.php:545 msgid "Update" msgstr "Bijwerken" @@ -194,24 +194,25 @@ msgstr "Aanschaffen" #: ../../include/apps.php:246 ../../include/page_widgets.php:8 #: ../../include/page_widgets.php:36 ../../include/reddav.php:1289 #: ../../include/menu.php:42 ../../include/ItemObject.php:100 -#: ../../mod/settings.php:579 ../../mod/blocks.php:99 -#: ../../mod/connections.php:396 ../../mod/editblock.php:111 +#: ../../mod/settings.php:581 ../../mod/blocks.php:99 +#: ../../mod/connections.php:381 ../../mod/connections.php:394 +#: ../../mod/connections.php:413 ../../mod/editblock.php:111 #: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 #: ../../mod/editwebpage.php:143 ../../mod/thing.php:235 -#: ../../mod/layouts.php:121 ../../mod/menu.php:59 ../../mod/webpages.php:127 +#: ../../mod/layouts.php:121 ../../mod/menu.php:59 ../../mod/webpages.php:132 msgid "Edit" msgstr "Bewerken" #: ../../include/apps.php:247 ../../include/reddav.php:1290 #: ../../include/conversation.php:648 ../../include/ItemObject.php:112 -#: ../../mod/settings.php:580 ../../mod/connedit.php:440 -#: ../../mod/photos.php:1052 ../../mod/group.php:176 ../../mod/admin.php:728 -#: ../../mod/admin.php:858 ../../mod/thing.php:236 +#: ../../mod/settings.php:582 ../../mod/connedit.php:462 +#: ../../mod/photos.php:1082 ../../mod/group.php:176 ../../mod/admin.php:730 +#: ../../mod/admin.php:861 ../../mod/thing.php:236 msgid "Delete" msgstr "Verwijderen" #: ../../include/apps.php:328 ../../include/apps.php:379 -#: ../../include/reddav.php:1202 ../../mod/connedit.php:476 +#: ../../include/reddav.php:1202 ../../mod/connedit.php:498 msgid "Unknown" msgstr "Onbekend" @@ -220,39 +221,39 @@ msgid "New Page" msgstr "Nieuwe pagina" #: ../../include/page_widgets.php:39 ../../mod/blocks.php:102 -#: ../../mod/layouts.php:125 ../../mod/webpages.php:130 +#: ../../mod/layouts.php:125 ../../mod/webpages.php:135 msgid "View" msgstr "Weergeven" #: ../../include/page_widgets.php:40 ../../include/conversation.php:1109 -#: ../../include/ItemObject.php:597 ../../mod/editblock.php:141 +#: ../../include/ItemObject.php:598 ../../mod/editblock.php:141 #: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 -#: ../../mod/editwebpage.php:174 ../../mod/photos.php:1003 -#: ../../mod/webpages.php:131 +#: ../../mod/editwebpage.php:174 ../../mod/photos.php:1033 +#: ../../mod/webpages.php:136 msgid "Preview" msgstr "Voorvertoning" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:132 +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:137 msgid "Actions" msgstr "Acties" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:133 +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:138 msgid "Page Link" msgstr "Paginalink" -#: ../../include/page_widgets.php:43 ../../mod/webpages.php:134 +#: ../../include/page_widgets.php:43 ../../mod/webpages.php:139 msgid "Title" msgstr "Titel" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:135 +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:140 msgid "Created" msgstr "Aangemaakt" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:136 +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:141 msgid "Edited" msgstr "Bewerkt" -#: ../../include/security.php:301 +#: ../../include/security.php:320 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." @@ -262,11 +263,11 @@ msgstr "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het msgid "Invalid data packet" msgstr "Datapakket ongeldig" -#: ../../include/zot.php:668 +#: ../../include/zot.php:670 msgid "Unable to verify channel signature" msgstr "Kanaal-kenmerk (channel signature) kon niet worden geverifieerd. " -#: ../../include/zot.php:865 +#: ../../include/zot.php:1703 #, php-format msgid "Unable to verify site signature for %s" msgstr "Hub-kenmerk (site signature) voor %s kon niet worden geverifieerd" @@ -276,9 +277,9 @@ msgstr "Hub-kenmerk (site signature) voor %s kon niet worden geverifieerd" #: ../../include/attach.php:243 ../../include/attach.php:283 #: ../../include/attach.php:297 ../../include/attach.php:322 #: ../../include/attach.php:513 ../../include/attach.php:585 -#: ../../include/chat.php:116 ../../include/items.php:3826 +#: ../../include/chat.php:116 ../../include/items.php:3950 #: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:30 -#: ../../mod/settings.php:494 ../../mod/poke.php:128 ../../mod/api.php:26 +#: ../../mod/settings.php:496 ../../mod/poke.php:128 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 #: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72 #: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276 @@ -293,7 +294,7 @@ msgstr "Hub-kenmerk (site signature) voor %s kon niet worden geverifieerd" #: ../../mod/pdledit.php:21 ../../mod/editlayout.php:48 #: ../../mod/editpost.php:13 ../../mod/editwebpage.php:44 #: ../../mod/editwebpage.php:83 ../../mod/photos.php:68 -#: ../../mod/photos.php:526 ../../mod/sources.php:66 ../../mod/events.php:175 +#: ../../mod/photos.php:526 ../../mod/sources.php:66 ../../mod/events.php:200 #: ../../mod/filestorage.php:10 ../../mod/filestorage.php:59 #: ../../mod/filestorage.php:75 ../../mod/filestorage.php:98 #: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 @@ -304,9 +305,9 @@ msgstr "Hub-kenmerk (site signature) voor %s kon niet worden geverifieerd" #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 #: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6 #: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 -#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 -#: ../../mod/notifications.php:66 ../../mod/appman.php:66 ../../index.php:186 -#: ../../index.php:361 +#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 +#: ../../mod/notifications.php:66 ../../mod/appman.php:66 +#: ../../mod/service_limits.php:7 ../../index.php:186 ../../index.php:361 msgid "Permission denied." msgstr "Toegang geweigerd" @@ -327,12 +328,12 @@ msgstr "Afbeelding kan niet verwerkt worden" msgid "Photo storage failed." msgstr "Foto kan niet worden opgeslagen" -#: ../../include/photos.php:339 ../../include/conversation.php:1533 +#: ../../include/photos.php:340 ../../include/conversation.php:1533 msgid "Photo Albums" msgstr "Fotoalbums" -#: ../../include/photos.php:343 ../../mod/photos.php:697 -#: ../../mod/photos.php:1199 +#: ../../include/photos.php:344 ../../mod/photos.php:697 +#: ../../mod/photos.php:1244 msgid "Upload New Photos" msgstr "Nieuwe foto's uploaden" @@ -349,12 +350,12 @@ msgid "Don't show" msgstr "Niet tonen" #: ../../include/acl_selectors.php:248 ../../mod/chat.php:209 -#: ../../mod/photos.php:604 ../../mod/photos.php:958 +#: ../../mod/photos.php:604 ../../mod/photos.php:988 #: ../../mod/filestorage.php:128 msgid "Permissions" -msgstr "Privacy-rechten" +msgstr "Permissies" -#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:294 +#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:295 msgid "Close" msgstr "Sluiten" @@ -381,7 +382,7 @@ msgstr "Bezoek het %2$s van %1$s" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd." -#: ../../include/api.php:1036 +#: ../../include/api.php:1069 msgid "Public Timeline" msgstr "Openbare tijdlijn" @@ -443,29 +444,7 @@ msgstr "directory aanmaken (mkdir) mislukt." msgid "database storage failed." msgstr "opslag in database mislukt." -#: ../../include/bb2diaspora.php:298 -msgid "Attachments:" -msgstr "Bijlagen:" - -#: ../../include/bb2diaspora.php:377 ../../include/event.php:11 -msgid "l F d, Y \\@ g:i A" -msgstr "l d F Y \\@ G:i" - -#: ../../include/bb2diaspora.php:383 ../../include/event.php:20 -msgid "Starts:" -msgstr "Start:" - -#: ../../include/bb2diaspora.php:391 ../../include/event.php:30 -msgid "Finishes:" -msgstr "Einde:" - -#: ../../include/bb2diaspora.php:399 ../../include/event.php:40 -#: ../../include/identity.php:757 ../../mod/directory.php:156 -#: ../../mod/dirprofile.php:105 ../../mod/events.php:528 -msgid "Location:" -msgstr "Plaats:" - -#: ../../include/nav.php:94 ../../include/nav.php:121 ../../boot.php:1493 +#: ../../include/nav.php:94 ../../include/nav.php:121 ../../boot.php:1495 msgid "Logout" msgstr "Uitloggen" @@ -482,7 +461,7 @@ msgid "Your posts and conversations" msgstr "Jouw berichten en conversaties" #: ../../include/nav.php:98 ../../include/conversation.php:957 -#: ../../mod/connedit.php:393 ../../mod/connedit.php:507 +#: ../../mod/connedit.php:415 ../../mod/connedit.php:529 msgid "View Profile" msgstr "Profiel weergeven" @@ -498,7 +477,7 @@ msgstr "Bewerk profielen" msgid "Manage/Edit profiles" msgstr "Beheer/wijzig profielen" -#: ../../include/nav.php:102 ../../include/identity.php:730 +#: ../../include/nav.php:102 ../../include/identity.php:807 msgid "Edit Profile" msgstr "Profiel bewerken" @@ -543,7 +522,7 @@ msgstr "Klik om jezelf te authenticeren via jouw eigen RedMatrix-hub" msgid "Home Page" msgstr "Homepage" -#: ../../include/nav.php:159 ../../mod/register.php:220 ../../boot.php:1470 +#: ../../include/nav.php:159 ../../mod/register.php:220 ../../boot.php:1472 msgid "Register" msgstr "Registreren " @@ -588,7 +567,7 @@ msgstr "Tijdlijn kanaal" msgid "Mark all channel notifications seen" msgstr "Alle kanaalnotificaties als gelezen markeren" -#: ../../include/nav.php:190 ../../mod/connections.php:389 +#: ../../include/nav.php:190 ../../mod/connections.php:406 msgid "Connections" msgstr "Connecties" @@ -714,8 +693,8 @@ msgstr "Connecties weergeven" #: ../../include/text.php:823 ../../include/text.php:837 #: ../../include/widgets.php:193 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1336 -#: ../../mod/admin.php:1357 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1339 +#: ../../mod/admin.php:1360 msgid "Save" msgstr "Opslaan" @@ -851,165 +830,165 @@ msgstr "ontspannen" msgid "surprised" msgstr "verrast" -#: ../../include/text.php:1100 +#: ../../include/text.php:1101 msgid "Monday" msgstr "maandag" -#: ../../include/text.php:1100 +#: ../../include/text.php:1101 msgid "Tuesday" msgstr "dinsdag" -#: ../../include/text.php:1100 +#: ../../include/text.php:1101 msgid "Wednesday" msgstr "woensdag" -#: ../../include/text.php:1100 +#: ../../include/text.php:1101 msgid "Thursday" msgstr "donderdag" -#: ../../include/text.php:1100 +#: ../../include/text.php:1101 msgid "Friday" msgstr "vrijdag" -#: ../../include/text.php:1100 +#: ../../include/text.php:1101 msgid "Saturday" msgstr "zaterdag" -#: ../../include/text.php:1100 +#: ../../include/text.php:1101 msgid "Sunday" msgstr "zondag" -#: ../../include/text.php:1104 +#: ../../include/text.php:1105 msgid "January" msgstr "januari" -#: ../../include/text.php:1104 +#: ../../include/text.php:1105 msgid "February" msgstr "februari" -#: ../../include/text.php:1104 +#: ../../include/text.php:1105 msgid "March" msgstr "maart" -#: ../../include/text.php:1104 +#: ../../include/text.php:1105 msgid "April" msgstr "april" -#: ../../include/text.php:1104 +#: ../../include/text.php:1105 msgid "May" msgstr "mei" -#: ../../include/text.php:1104 +#: ../../include/text.php:1105 msgid "June" msgstr "juni" -#: ../../include/text.php:1104 +#: ../../include/text.php:1105 msgid "July" msgstr "juli" -#: ../../include/text.php:1104 +#: ../../include/text.php:1105 msgid "August" msgstr "augustus" -#: ../../include/text.php:1104 +#: ../../include/text.php:1105 msgid "September" msgstr "september" -#: ../../include/text.php:1104 +#: ../../include/text.php:1105 msgid "October" msgstr "oktober" -#: ../../include/text.php:1104 +#: ../../include/text.php:1105 msgid "November" msgstr "november" -#: ../../include/text.php:1104 +#: ../../include/text.php:1105 msgid "December" msgstr "december" -#: ../../include/text.php:1182 +#: ../../include/text.php:1183 msgid "unknown.???" msgstr "onbekend.???" -#: ../../include/text.php:1183 +#: ../../include/text.php:1184 msgid "bytes" msgstr "bytes" -#: ../../include/text.php:1218 +#: ../../include/text.php:1219 msgid "remove category" msgstr "categorie verwijderen" -#: ../../include/text.php:1288 +#: ../../include/text.php:1289 msgid "remove from file" msgstr "uit map verwijderen" -#: ../../include/text.php:1353 ../../include/text.php:1365 +#: ../../include/text.php:1354 ../../include/text.php:1366 msgid "Click to open/close" msgstr "Klik om te openen of te sluiten" -#: ../../include/text.php:1520 ../../mod/events.php:389 +#: ../../include/text.php:1521 ../../mod/events.php:414 msgid "Link to Source" msgstr "Originele locatie" -#: ../../include/text.php:1539 +#: ../../include/text.php:1540 msgid "Select a page layout: " msgstr "Kies een paginalayout: " -#: ../../include/text.php:1542 ../../include/text.php:1607 +#: ../../include/text.php:1543 ../../include/text.php:1608 msgid "default" msgstr "standaard" -#: ../../include/text.php:1578 +#: ../../include/text.php:1579 msgid "Page content type: " msgstr "Opmaakcode pagina" -#: ../../include/text.php:1619 +#: ../../include/text.php:1620 msgid "Select an alternate language" msgstr "Kies een andere taal" -#: ../../include/text.php:1740 ../../include/diaspora.php:1860 +#: ../../include/text.php:1741 ../../include/diaspora.php:1888 #: ../../include/conversation.php:120 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 msgid "photo" msgstr "foto" -#: ../../include/text.php:1743 ../../include/conversation.php:123 +#: ../../include/text.php:1744 ../../include/conversation.php:123 #: ../../mod/tagger.php:49 msgid "event" msgstr "gebeurtenis" -#: ../../include/text.php:1746 ../../include/diaspora.php:1860 +#: ../../include/text.php:1747 ../../include/diaspora.php:1888 #: ../../include/conversation.php:148 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 msgid "status" msgstr "bericht" -#: ../../include/text.php:1748 ../../include/conversation.php:150 +#: ../../include/text.php:1749 ../../include/conversation.php:150 #: ../../mod/tagger.php:55 msgid "comment" msgstr "reactie" -#: ../../include/text.php:1753 +#: ../../include/text.php:1754 msgid "activity" msgstr "activiteit" -#: ../../include/text.php:2017 +#: ../../include/text.php:2018 msgid "Design" msgstr "Ontwerp" -#: ../../include/text.php:2019 +#: ../../include/text.php:2020 msgid "Blocks" msgstr "Blokken" -#: ../../include/text.php:2020 +#: ../../include/text.php:2021 msgid "Menus" msgstr "Menu's" -#: ../../include/text.php:2021 +#: ../../include/text.php:2022 msgid "Layouts" msgstr "Layouts" -#: ../../include/text.php:2022 +#: ../../include/text.php:2023 msgid "Pages" msgstr "Pagina's" @@ -1053,7 +1032,7 @@ msgstr "vind dit niet leuk" msgid "dislikes" msgstr "vindt dit niet leuk" -#: ../../include/taxonomy.php:338 ../../include/identity.php:1012 +#: ../../include/taxonomy.php:338 ../../include/identity.php:1089 #: ../../include/ItemObject.php:138 msgctxt "noun" msgid "Like" @@ -1101,8 +1080,8 @@ msgstr "OStatus" msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/contact_selectors.php:79 ../../mod/admin.php:724 -#: ../../mod/admin.php:733 ../../boot.php:1496 +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:726 +#: ../../mod/admin.php:735 ../../boot.php:1498 msgid "Email" msgstr "E-mail" @@ -1137,7 +1116,7 @@ msgid_plural "%d invitations available" msgstr[0] "%d uitnodiging beschikbaar" msgstr[1] "%d uitnodigingen beschikbaar" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:417 +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:418 msgid "Advanced" msgstr "Geavanceerd" @@ -1157,7 +1136,7 @@ msgstr "Verbinden/volgen" msgid "Examples: Robert Morgenstein, Fishing" msgstr "Voorbeeld: Robert Morgenstein, vissen" -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:395 +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:412 #: ../../mod/directory.php:222 ../../mod/directory.php:227 msgid "Find" msgstr "Vinden" @@ -1207,6 +1186,24 @@ msgstr[1] "%d gemeenschappelijke connecties" msgid "show more" msgstr "meer connecties weergeven" +#: ../../include/event.php:11 ../../include/bb2diaspora.php:425 +msgid "l F d, Y \\@ g:i A" +msgstr "l d F Y \\@ G:i" + +#: ../../include/event.php:20 ../../include/bb2diaspora.php:431 +msgid "Starts:" +msgstr "Start:" + +#: ../../include/event.php:30 ../../include/bb2diaspora.php:439 +msgid "Finishes:" +msgstr "Einde:" + +#: ../../include/event.php:40 ../../include/bb2diaspora.php:447 +#: ../../include/identity.php:834 ../../mod/directory.php:156 +#: ../../mod/dirprofile.php:105 ../../mod/events.php:579 +msgid "Location:" +msgstr "Plaats:" + #: ../../include/event.php:326 msgid "This event has been added to your calendar." msgstr "Dit evenement is aan jouw agenda toegevoegd." @@ -1276,19 +1273,19 @@ msgstr "Registratie ingetrokken voor %s" msgid "Account verified. Please login." msgstr "Account is geverifieerd. Je kan inloggen." -#: ../../include/account.php:623 ../../include/account.php:625 +#: ../../include/account.php:647 ../../include/account.php:649 msgid "Click here to upgrade." msgstr "Klik hier om te upgraden." -#: ../../include/account.php:631 +#: ../../include/account.php:655 msgid "This action exceeds the limits set by your subscription plan." msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden." -#: ../../include/account.php:636 +#: ../../include/account.php:660 msgid "This action is not available under your subscription plan." msgstr "Deze handeling is niet mogelijk met jouw abonnement." -#: ../../include/diaspora.php:1876 ../../include/conversation.php:164 +#: ../../include/diaspora.php:1917 ../../include/conversation.php:164 #: ../../mod/like.php:331 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -1405,6 +1402,10 @@ msgstr "Veilig zoeken uitschakelen" msgid "Safe Mode" msgstr "Veilig zoeken" +#: ../../include/bb2diaspora.php:346 +msgid "Attachments:" +msgstr "Bijlagen:" + #: ../../include/enotify.php:41 msgid "Red Matrix Notification" msgstr "RedMatrix-notificatie" @@ -1639,8 +1640,8 @@ msgstr "%1$s gebruikt" msgid "%1$s used of %2$s (%3$s%)" msgstr "%1$s van %2$s gebruikt (%3$s%)" -#: ../../include/reddav.php:1284 ../../mod/settings.php:519 -#: ../../mod/settings.php:545 ../../mod/admin.php:863 +#: ../../include/reddav.php:1284 ../../mod/settings.php:521 +#: ../../mod/settings.php:547 ../../mod/admin.php:866 msgid "Name" msgstr "Naam" @@ -1665,7 +1666,7 @@ msgid "Create new folder" msgstr "Nieuwe map aanmaken" #: ../../include/reddav.php:1345 ../../mod/mitem.php:142 ../../mod/menu.php:84 -#: ../../mod/new_channel.php:117 +#: ../../mod/new_channel.php:122 msgid "Create" msgstr "Aanmaken" @@ -1707,7 +1708,7 @@ msgid "Select" msgstr "Kies" #: ../../include/conversation.php:655 ../../include/ItemObject.php:89 -#: ../../mod/photos.php:850 +#: ../../mod/photos.php:880 msgid "Private Message" msgstr "Privébericht" @@ -1728,17 +1729,17 @@ msgstr "Categorieën:" msgid "Filed under:" msgstr "Bewaard onder:" -#: ../../include/conversation.php:706 ../../include/ItemObject.php:255 +#: ../../include/conversation.php:706 ../../include/ItemObject.php:256 #, php-format msgid " from %s" msgstr " van %s" -#: ../../include/conversation.php:709 ../../include/ItemObject.php:258 +#: ../../include/conversation.php:709 ../../include/ItemObject.php:259 #, php-format msgid "last edited: %s" msgstr "laatst bewerkt: %s" -#: ../../include/conversation.php:710 ../../include/ItemObject.php:259 +#: ../../include/conversation.php:710 ../../include/ItemObject.php:260 #, php-format msgid "Expires: %s" msgstr "Verloopt: %s" @@ -1748,9 +1749,9 @@ msgid "View in context" msgstr "In context bekijken" #: ../../include/conversation.php:727 ../../include/conversation.php:1148 -#: ../../include/ItemObject.php:299 ../../mod/editblock.php:120 +#: ../../include/ItemObject.php:300 ../../mod/editblock.php:120 #: ../../mod/editlayout.php:115 ../../mod/editpost.php:121 -#: ../../mod/editwebpage.php:152 ../../mod/photos.php:983 +#: ../../mod/editwebpage.php:152 ../../mod/photos.php:1013 #: ../../mod/mail.php:231 ../../mod/mail.php:346 msgid "Please wait" msgstr "Even wachten" @@ -1787,7 +1788,7 @@ msgstr "Foto's weergeven" msgid "Matrix Activity" msgstr "Activiteit in de RedMatrix" -#: ../../include/conversation.php:960 ../../include/identity.php:706 +#: ../../include/conversation.php:960 ../../include/identity.php:783 #: ../../include/widgets.php:135 ../../include/widgets.php:175 #: ../../include/Contact.php:107 ../../mod/directory.php:183 #: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 @@ -1882,7 +1883,7 @@ msgstr "Waar bevind je je op dit moment?" msgid "Expires YYYY-MM-DD HH:MM" msgstr "Verloopt op DD-MM-YYYY om HH:MM" -#: ../../include/conversation.php:1123 ../../mod/photos.php:982 +#: ../../include/conversation.php:1123 ../../mod/photos.php:1012 #: ../../mod/layouts.php:122 msgid "Share" msgstr "Delen" @@ -1969,7 +1970,7 @@ msgstr "Titel instellen" #: ../../include/conversation.php:1147 ../../mod/editblock.php:135 #: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 -#: ../../mod/editwebpage.php:169 +#: ../../mod/editwebpage.php:169 ../../mod/events.php:560 msgid "Categories (comma-separated list)" msgstr "Categorieën (door komma's gescheiden lijst)" @@ -1977,11 +1978,11 @@ msgstr "Categorieën (door komma's gescheiden lijst)" #: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 #: ../../mod/editwebpage.php:153 msgid "Permission settings" -msgstr "Privacy-rechten" +msgstr "Permissies" #: ../../include/conversation.php:1150 msgid "permissions" -msgstr "privacy-rechten" +msgstr "permissies" #: ../../include/conversation.php:1157 ../../mod/editblock.php:129 #: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 @@ -2001,20 +2002,20 @@ msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be" msgid "Set expiration date" msgstr "Verloopdatum instellen" -#: ../../include/conversation.php:1174 ../../include/ItemObject.php:600 +#: ../../include/conversation.php:1174 ../../include/ItemObject.php:601 #: ../../mod/editpost.php:148 ../../mod/mail.php:237 ../../mod/mail.php:351 msgid "Encrypt text" msgstr "Tekst versleutelen" #: ../../include/conversation.php:1176 ../../mod/editpost.php:150 -#: ../../mod/events.php:516 +#: ../../mod/events.php:567 msgid "OK" msgstr "OK" -#: ../../include/conversation.php:1177 ../../mod/settings.php:518 -#: ../../mod/settings.php:544 ../../mod/editpost.php:151 +#: ../../include/conversation.php:1177 ../../mod/settings.php:520 +#: ../../mod/settings.php:546 ../../mod/editpost.php:151 #: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 -#: ../../mod/events.php:515 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 +#: ../../mod/events.php:566 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 msgid "Cancel" msgstr "Annuleren" @@ -2075,7 +2076,7 @@ msgstr "Spam" msgid "Posts flagged as SPAM" msgstr "Berichten gemarkeerd als SPAM" -#: ../../include/conversation.php:1509 ../../mod/admin.php:862 +#: ../../include/conversation.php:1509 ../../mod/admin.php:865 msgid "Channel" msgstr "Kanaal" @@ -2357,27 +2358,27 @@ msgstr "Kanaal is op deze hub geblokkeerd." msgid "Channel location missing." msgstr "Ontbrekende kanaallocatie." -#: ../../include/follow.php:70 +#: ../../include/follow.php:77 msgid "Response from remote channel was incomplete." msgstr "Antwoord van het kanaal op afstand was niet volledig." -#: ../../include/follow.php:87 +#: ../../include/follow.php:94 msgid "Channel was deleted and no longer exists." msgstr "Kanaal is verwijderd en bestaat niet meer." -#: ../../include/follow.php:123 ../../include/follow.php:186 +#: ../../include/follow.php:130 ../../include/follow.php:199 msgid "Protocol disabled." msgstr "Protocol uitgeschakeld." -#: ../../include/follow.php:160 +#: ../../include/follow.php:173 msgid "Channel discovery failed." msgstr "Kanaal ontdekken mislukt." -#: ../../include/follow.php:176 +#: ../../include/follow.php:189 msgid "local account not found." msgstr "lokale account niet gevonden." -#: ../../include/follow.php:203 +#: ../../include/follow.php:216 msgid "Cannot connect to yourself." msgstr "Kan niet met jezelf verbinden" @@ -2401,75 +2402,75 @@ msgstr "Chatkanaal niet gevonden" msgid "Room is full" msgstr "Chatkanaal is vol" -#: ../../include/items.php:357 ../../mod/profperm.php:23 +#: ../../include/items.php:375 ../../mod/profperm.php:23 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 #: ../../index.php:360 msgid "Permission denied" msgstr "Toegang geweigerd" -#: ../../include/items.php:918 +#: ../../include/items.php:940 ../../include/items.php:985 msgid "(Unknown)" msgstr "(Onbekend)" -#: ../../include/items.php:1050 +#: ../../include/items.php:1139 msgid "Visible to anybody on the internet." msgstr "Voor iedereen op het internet zichtbaar." -#: ../../include/items.php:1052 +#: ../../include/items.php:1141 msgid "Visible to you only." msgstr "Alleen voor jou zichtbaar." -#: ../../include/items.php:1054 +#: ../../include/items.php:1143 msgid "Visible to anybody in this network." msgstr "Voor iedereen in dit netwerk zichtbaar." -#: ../../include/items.php:1056 +#: ../../include/items.php:1145 msgid "Visible to anybody authenticated." msgstr "Voor iedereen die geauthenticeerd is zichtbaar." -#: ../../include/items.php:1058 +#: ../../include/items.php:1147 #, php-format msgid "Visible to anybody on %s." msgstr "Voor iedereen op %s zichtbaar." -#: ../../include/items.php:1060 +#: ../../include/items.php:1149 msgid "Visible to all connections." msgstr "Voor alle connecties zichtbaar." -#: ../../include/items.php:1062 +#: ../../include/items.php:1151 msgid "Visible to approved connections." msgstr "Voor alle goedgekeurde connecties zichtbaar." -#: ../../include/items.php:1064 +#: ../../include/items.php:1153 msgid "Visible to specific connections." msgstr "Voor specifieke connecties zichtbaar." -#: ../../include/items.php:3764 ../../mod/home.php:67 ../../mod/display.php:32 +#: ../../include/items.php:3888 ../../mod/display.php:32 #: ../../mod/filestorage.php:18 ../../mod/admin.php:168 -#: ../../mod/admin.php:893 ../../mod/admin.php:1096 ../../mod/thing.php:78 +#: ../../mod/admin.php:896 ../../mod/admin.php:1099 ../../mod/thing.php:78 #: ../../mod/viewsrc.php:18 msgid "Item not found." msgstr "Item niet gevonden." -#: ../../include/items.php:4197 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4321 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "Collectie niet gevonden." -#: ../../include/items.php:4212 +#: ../../include/items.php:4336 msgid "Collection is empty." msgstr "Collectie is leeg" -#: ../../include/items.php:4219 +#: ../../include/items.php:4343 #, php-format msgid "Collection: %s" msgstr "Collectie: %s" -#: ../../include/items.php:4230 +#: ../../include/items.php:4354 #, php-format msgid "Connection: %s" msgstr "Connectie: %s" -#: ../../include/items.php:4233 +#: ../../include/items.php:4357 msgid "Connection not found." msgstr "Connectie niet gevonden." @@ -2484,7 +2485,7 @@ msgstr "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande item msgid "Default privacy group for new contacts" msgstr "Standaard privacy-collectie voor nieuwe kanalen" -#: ../../include/group.php:253 ../../mod/admin.php:733 +#: ../../include/group.php:253 ../../mod/admin.php:735 msgid "All Channels" msgstr "Alle kanalen" @@ -2492,23 +2493,23 @@ msgstr "Alle kanalen" msgid "edit" msgstr "bewerken" -#: ../../include/group.php:296 +#: ../../include/group.php:297 msgid "Collections" msgstr "Collecties" -#: ../../include/group.php:297 +#: ../../include/group.php:298 msgid "Edit collection" msgstr "Collectie bewerken" -#: ../../include/group.php:298 +#: ../../include/group.php:299 msgid "Create a new collection" msgstr "Nieuwe collectie aanmaken" -#: ../../include/group.php:299 +#: ../../include/group.php:300 msgid "Channels not in any collection" msgstr "Kanalen die zich in geen enkele collectie bevinden" -#: ../../include/group.php:301 ../../include/widgets.php:273 +#: ../../include/group.php:302 ../../include/widgets.php:273 msgid "add" msgstr "toevoegen" @@ -2541,214 +2542,215 @@ msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik." -#: ../../include/identity.php:258 +#: ../../include/identity.php:276 msgid "Unable to retrieve created identity" msgstr "Niet in staat om aangemaakte identiteit te vinden" -#: ../../include/identity.php:317 +#: ../../include/identity.php:335 msgid "Default Profile" msgstr "Standaardprofiel" -#: ../../include/identity.php:342 ../../include/widgets.php:407 -#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:473 +#: ../../include/identity.php:374 ../../include/identity.php:375 +#: ../../include/identity.php:382 ../../include/widgets.php:407 +#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:495 msgid "Friends" msgstr "Vrienden" -#: ../../include/identity.php:509 +#: ../../include/identity.php:586 msgid "Requested channel is not available." msgstr "Opgevraagd kanaal is niet beschikbaar." -#: ../../include/identity.php:557 ../../mod/achievements.php:11 +#: ../../include/identity.php:634 ../../mod/achievements.php:11 #: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 #: ../../mod/filestorage.php:40 ../../mod/layouts.php:8 #: ../../mod/webpages.php:8 ../../mod/hcard.php:8 msgid "Requested profile is not available." msgstr "Opgevraagd profiel is niet beschikbaar" -#: ../../include/identity.php:720 ../../mod/profiles.php:750 +#: ../../include/identity.php:797 ../../mod/profiles.php:750 msgid "Change profile photo" msgstr "Profielfoto veranderen" -#: ../../include/identity.php:726 +#: ../../include/identity.php:803 msgid "Profiles" msgstr "Profielen" -#: ../../include/identity.php:726 +#: ../../include/identity.php:803 msgid "Manage/edit profiles" msgstr "Profielen beheren/bewerken" -#: ../../include/identity.php:727 ../../mod/profiles.php:751 +#: ../../include/identity.php:804 ../../mod/profiles.php:751 msgid "Create New Profile" msgstr "Nieuw profiel aanmaken" -#: ../../include/identity.php:741 ../../mod/profiles.php:762 +#: ../../include/identity.php:818 ../../mod/profiles.php:762 msgid "Profile Image" msgstr "Profielfoto" -#: ../../include/identity.php:744 +#: ../../include/identity.php:821 msgid "visible to everybody" msgstr "Voor iedereen zichtbaar" -#: ../../include/identity.php:745 ../../mod/profiles.php:645 +#: ../../include/identity.php:822 ../../mod/profiles.php:645 #: ../../mod/profiles.php:766 msgid "Edit visibility" msgstr "Zichtbaarheid bewerken" -#: ../../include/identity.php:759 ../../include/identity.php:996 +#: ../../include/identity.php:836 ../../include/identity.php:1073 #: ../../mod/directory.php:158 msgid "Gender:" msgstr "Geslacht:" -#: ../../include/identity.php:760 ../../include/identity.php:1040 +#: ../../include/identity.php:837 ../../include/identity.php:1117 #: ../../mod/directory.php:160 msgid "Status:" msgstr "Status:" -#: ../../include/identity.php:761 ../../include/identity.php:1051 +#: ../../include/identity.php:838 ../../include/identity.php:1128 #: ../../mod/directory.php:162 msgid "Homepage:" msgstr "Homepagina:" -#: ../../include/identity.php:762 ../../mod/dirprofile.php:151 +#: ../../include/identity.php:839 ../../mod/dirprofile.php:151 msgid "Online Now" msgstr "Nu online" -#: ../../include/identity.php:840 ../../include/identity.php:920 +#: ../../include/identity.php:917 ../../include/identity.php:997 #: ../../mod/ping.php:298 msgid "g A l F d" msgstr "G:i, l d F" -#: ../../include/identity.php:841 ../../include/identity.php:921 +#: ../../include/identity.php:918 ../../include/identity.php:998 msgid "F d" msgstr "d F" -#: ../../include/identity.php:886 ../../include/identity.php:961 +#: ../../include/identity.php:963 ../../include/identity.php:1038 #: ../../mod/ping.php:320 msgid "[today]" msgstr "[vandaag]" -#: ../../include/identity.php:898 +#: ../../include/identity.php:975 msgid "Birthday Reminders" msgstr "Verjaardagsherinneringen" -#: ../../include/identity.php:899 +#: ../../include/identity.php:976 msgid "Birthdays this week:" msgstr "Verjaardagen deze week:" -#: ../../include/identity.php:954 +#: ../../include/identity.php:1031 msgid "[No description]" msgstr "[Geen omschrijving]" -#: ../../include/identity.php:972 +#: ../../include/identity.php:1049 msgid "Event Reminders" msgstr "Herinneringen voor gebeurtenissen" -#: ../../include/identity.php:973 +#: ../../include/identity.php:1050 msgid "Events this week:" msgstr "Gebeurtenissen deze week:" -#: ../../include/identity.php:994 ../../mod/settings.php:943 +#: ../../include/identity.php:1071 ../../mod/settings.php:953 msgid "Full Name:" msgstr "Volledige naam:" -#: ../../include/identity.php:1001 +#: ../../include/identity.php:1078 msgid "Like this channel" msgstr "Vind dit kanaal leuk" -#: ../../include/identity.php:1025 +#: ../../include/identity.php:1102 msgid "j F, Y" msgstr "F j Y" -#: ../../include/identity.php:1026 +#: ../../include/identity.php:1103 msgid "j F" msgstr "F j" -#: ../../include/identity.php:1033 +#: ../../include/identity.php:1110 msgid "Birthday:" msgstr "Geboortedatum:" -#: ../../include/identity.php:1037 +#: ../../include/identity.php:1114 msgid "Age:" msgstr "Leeftijd:" -#: ../../include/identity.php:1046 +#: ../../include/identity.php:1123 #, php-format msgid "for %1$d %2$s" msgstr "voor %1$d %2$s" -#: ../../include/identity.php:1049 ../../mod/profiles.php:667 +#: ../../include/identity.php:1126 ../../mod/profiles.php:667 msgid "Sexual Preference:" msgstr "Seksuele voorkeur:" -#: ../../include/identity.php:1053 ../../mod/profiles.php:669 +#: ../../include/identity.php:1130 ../../mod/profiles.php:669 msgid "Hometown:" msgstr "Oorspronkelijk uit:" -#: ../../include/identity.php:1055 +#: ../../include/identity.php:1132 msgid "Tags:" msgstr "Trefwoorden:" -#: ../../include/identity.php:1057 ../../mod/profiles.php:670 +#: ../../include/identity.php:1134 ../../mod/profiles.php:670 msgid "Political Views:" msgstr "Politieke overtuigingen:" -#: ../../include/identity.php:1059 +#: ../../include/identity.php:1136 msgid "Religion:" msgstr "Religie:" -#: ../../include/identity.php:1061 ../../mod/directory.php:164 +#: ../../include/identity.php:1138 ../../mod/directory.php:164 msgid "About:" msgstr "Over:" -#: ../../include/identity.php:1063 +#: ../../include/identity.php:1140 msgid "Hobbies/Interests:" msgstr "Hobby's/interesses:" -#: ../../include/identity.php:1065 ../../mod/profiles.php:673 +#: ../../include/identity.php:1142 ../../mod/profiles.php:673 msgid "Likes:" msgstr "Houdt van:" -#: ../../include/identity.php:1067 ../../mod/profiles.php:674 +#: ../../include/identity.php:1144 ../../mod/profiles.php:674 msgid "Dislikes:" msgstr "Houdt niet van:" -#: ../../include/identity.php:1070 +#: ../../include/identity.php:1147 msgid "Contact information and Social Networks:" msgstr "Contactinformatie en sociale netwerken:" -#: ../../include/identity.php:1072 +#: ../../include/identity.php:1149 msgid "My other channels:" msgstr "Mijn andere kanalen" -#: ../../include/identity.php:1074 +#: ../../include/identity.php:1151 msgid "Musical interests:" msgstr "Muzikale interesses:" -#: ../../include/identity.php:1076 +#: ../../include/identity.php:1153 msgid "Books, literature:" msgstr "Boeken, literatuur:" -#: ../../include/identity.php:1078 +#: ../../include/identity.php:1155 msgid "Television:" msgstr "Televisie:" -#: ../../include/identity.php:1080 +#: ../../include/identity.php:1157 msgid "Film/dance/culture/entertainment:" msgstr "Films/dansen/cultuur/vermaak:" -#: ../../include/identity.php:1082 +#: ../../include/identity.php:1159 msgid "Love/Romance:" msgstr "Liefde/romantiek:" -#: ../../include/identity.php:1084 +#: ../../include/identity.php:1161 msgid "Work/employment:" msgstr "Werk/beroep:" -#: ../../include/identity.php:1086 +#: ../../include/identity.php:1163 msgid "School/education:" msgstr "School/opleiding:" -#: ../../include/identity.php:1106 +#: ../../include/identity.php:1183 msgid "Like this thing" msgstr "Vind dit ding leuk" @@ -2856,11 +2858,11 @@ msgstr "Archieven" msgid "Refresh" msgstr "Vernieuwen" -#: ../../include/widgets.php:405 ../../mod/connedit.php:470 +#: ../../include/widgets.php:405 ../../mod/connedit.php:492 msgid "Me" msgstr "Ik" -#: ../../include/widgets.php:406 ../../mod/connedit.php:472 +#: ../../include/widgets.php:406 ../../mod/connedit.php:494 msgid "Best Friends" msgstr "Goede vrienden" @@ -2868,11 +2870,11 @@ msgstr "Goede vrienden" msgid "Co-workers" msgstr "Collega's" -#: ../../include/widgets.php:409 ../../mod/connedit.php:474 +#: ../../include/widgets.php:409 ../../mod/connedit.php:496 msgid "Former Friends" msgstr "Oude vrienden" -#: ../../include/widgets.php:410 ../../mod/connedit.php:475 +#: ../../include/widgets.php:410 ../../mod/connedit.php:497 msgid "Acquaintances" msgstr "Kennissen" @@ -2908,9 +2910,13 @@ msgstr "Verbonden applicaties" msgid "Export channel" msgstr "Kanaal exporteren" +#: ../../include/widgets.php:485 +msgid "Export content" +msgstr "Exporteer gegevens" + #: ../../include/widgets.php:491 msgid "Automatic Permissions (Advanced)" -msgstr "Automatische privacy-rechten (geavanceerd)" +msgstr "Automatische permissies (geavanceerd)" #: ../../include/widgets.php:501 msgid "Premium Channel Settings" @@ -2967,11 +2973,11 @@ msgstr "met ster" msgid "Add Tag" msgstr "Label toevoegen" -#: ../../include/ItemObject.php:212 ../../mod/photos.php:980 +#: ../../include/ItemObject.php:212 ../../mod/photos.php:1010 msgid "I like this (toggle)" msgstr "Vind ik leuk" -#: ../../include/ItemObject.php:213 ../../mod/photos.php:981 +#: ../../include/ItemObject.php:213 ../../mod/photos.php:1011 msgid "I don't like this (toggle)" msgstr "Vind ik niet leuk" @@ -3004,60 +3010,60 @@ msgstr "Kanaal-naar-kanaal" msgid "via Wall-To-Wall:" msgstr "via kanaal-naar-kanaal" -#: ../../include/ItemObject.php:279 +#: ../../include/ItemObject.php:280 msgid "Save Bookmarks" msgstr "Bladwijzers opslaan" -#: ../../include/ItemObject.php:280 +#: ../../include/ItemObject.php:281 msgid "Add to Calendar" msgstr "Aan agenda toevoegen" -#: ../../include/ItemObject.php:288 +#: ../../include/ItemObject.php:289 msgctxt "noun" msgid "Likes" msgstr "vinden dit leuk" -#: ../../include/ItemObject.php:289 +#: ../../include/ItemObject.php:290 msgctxt "noun" msgid "Dislikes" msgstr "vinden dit niet leuk" -#: ../../include/ItemObject.php:320 +#: ../../include/ItemObject.php:321 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d reactie" msgstr[1] "%d reacties weergeven" -#: ../../include/ItemObject.php:321 ../../include/js_strings.php:7 +#: ../../include/ItemObject.php:322 ../../include/js_strings.php:7 msgid "[+] show all" msgstr "[+] alle" -#: ../../include/ItemObject.php:585 ../../mod/photos.php:999 -#: ../../mod/photos.php:1086 +#: ../../include/ItemObject.php:586 ../../mod/photos.php:1029 +#: ../../mod/photos.php:1116 msgid "This is you" msgstr "Dit ben jij" -#: ../../include/ItemObject.php:587 ../../include/js_strings.php:6 -#: ../../mod/photos.php:1001 ../../mod/photos.php:1088 +#: ../../include/ItemObject.php:588 ../../include/js_strings.php:6 +#: ../../mod/photos.php:1031 ../../mod/photos.php:1118 msgid "Comment" msgstr "Reactie" -#: ../../include/ItemObject.php:588 ../../mod/mood.php:135 -#: ../../mod/settings.php:517 ../../mod/settings.php:629 -#: ../../mod/settings.php:658 ../../mod/settings.php:682 -#: ../../mod/settings.php:755 ../../mod/settings.php:935 +#: ../../include/ItemObject.php:589 ../../mod/mood.php:135 +#: ../../mod/settings.php:519 ../../mod/settings.php:631 +#: ../../mod/settings.php:660 ../../mod/settings.php:684 +#: ../../mod/settings.php:760 ../../mod/settings.php:945 #: ../../mod/poke.php:166 ../../mod/profiles.php:643 ../../mod/chat.php:177 -#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:518 +#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:540 #: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58 -#: ../../mod/photos.php:563 ../../mod/photos.php:674 ../../mod/photos.php:962 -#: ../../mod/photos.php:1002 ../../mod/photos.php:1089 +#: ../../mod/photos.php:563 ../../mod/photos.php:674 ../../mod/photos.php:992 +#: ../../mod/photos.php:1032 ../../mod/photos.php:1119 #: ../../mod/sources.php:104 ../../mod/sources.php:138 -#: ../../mod/events.php:535 ../../mod/filestorage.php:137 -#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:413 -#: ../../mod/admin.php:721 ../../mod/admin.php:856 ../../mod/admin.php:989 -#: ../../mod/admin.php:1188 ../../mod/admin.php:1275 ../../mod/thing.php:286 -#: ../../mod/thing.php:329 ../../mod/import.php:394 ../../mod/invite.php:142 +#: ../../mod/events.php:586 ../../mod/filestorage.php:137 +#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414 +#: ../../mod/admin.php:723 ../../mod/admin.php:859 ../../mod/admin.php:992 +#: ../../mod/admin.php:1191 ../../mod/admin.php:1278 ../../mod/thing.php:286 +#: ../../mod/thing.php:329 ../../mod/import.php:422 ../../mod/invite.php:142 #: ../../mod/mail.php:345 ../../mod/appman.php:99 ../../mod/poll.php:68 #: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/blogga/php/config.php:67 @@ -3066,35 +3072,35 @@ msgstr "Reactie" msgid "Submit" msgstr "Opslaan" -#: ../../include/ItemObject.php:589 +#: ../../include/ItemObject.php:590 msgid "Bold" msgstr "Vet" -#: ../../include/ItemObject.php:590 +#: ../../include/ItemObject.php:591 msgid "Italic" msgstr "Cursief" -#: ../../include/ItemObject.php:591 +#: ../../include/ItemObject.php:592 msgid "Underline" msgstr "Onderstrepen" -#: ../../include/ItemObject.php:592 +#: ../../include/ItemObject.php:593 msgid "Quote" msgstr "Citeren" -#: ../../include/ItemObject.php:593 +#: ../../include/ItemObject.php:594 msgid "Code" msgstr "Broncode" -#: ../../include/ItemObject.php:594 +#: ../../include/ItemObject.php:595 msgid "Image" msgstr "Afbeelding" -#: ../../include/ItemObject.php:595 +#: ../../include/ItemObject.php:596 msgid "Link" msgstr "Link" -#: ../../include/ItemObject.php:596 +#: ../../include/ItemObject.php:597 msgid "Video" msgstr "Video" @@ -3136,7 +3142,7 @@ msgstr "Wachtwoordhint" #: ../../include/js_strings.php:16 msgid "Notice: Permissions have changed but have not yet been submitted." -msgstr "Mededeling: de privacy-rechten zijn veranderd, maar zijn nog niet opgeslagen." +msgstr "Mededeling: de permissies zijn veranderd, maar zijn nog niet opgeslagen." #: ../../include/js_strings.php:17 msgid "close all" @@ -3223,7 +3229,7 @@ msgstr "Nieuw venster" msgid "Open the selected location in a different window or browser tab" msgstr "Open de geselecteerde locatie in een ander venster of tab" -#: ../../include/Contact.php:211 ../../mod/admin.php:647 +#: ../../include/Contact.php:211 ../../mod/admin.php:649 #, php-format msgid "User '%s' deleted" msgstr "Account '%s' verwijderd" @@ -3281,7 +3287,7 @@ msgstr "Niet gespecificeerd" #: ../../include/profile_selectors.php:6 #: ../../include/profile_selectors.php:23 #: ../../include/profile_selectors.php:61 -#: ../../include/profile_selectors.php:97 +#: ../../include/profile_selectors.php:97 ../../include/permissions.php:741 msgid "Other" msgstr "Anders" @@ -3471,15 +3477,15 @@ msgstr "Maakt mij niks uit" msgid "Ask me" msgstr "Vraag het me" -#: ../../include/auth.php:90 +#: ../../include/auth.php:103 msgid "Logged out." msgstr "Uitgelogd." -#: ../../include/auth.php:236 +#: ../../include/auth.php:249 msgid "Failed authentication" msgstr "Mislukte authenticatie" -#: ../../include/auth.php:251 ../../mod/openid.php:188 +#: ../../include/auth.php:264 ../../mod/openid.php:188 msgid "Login failed." msgstr "Inloggen mislukt." @@ -3572,6 +3578,40 @@ msgid "" "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet." +#: ../../include/permissions.php:733 +msgid "Social Networking" +msgstr "Sociaal netwerk" + +#: ../../include/permissions.php:734 ../../include/permissions.php:736 +#: ../../include/permissions.php:738 ../../include/permissions.php:740 +msgid "Mostly Public" +msgstr "Grotendeels voor iedereen zichtbaar" + +#: ../../include/permissions.php:734 ../../include/permissions.php:736 +#: ../../include/permissions.php:738 +msgid "Restricted" +msgstr "Beperkt zichtbaar" + +#: ../../include/permissions.php:734 ../../include/permissions.php:736 +msgid "Private" +msgstr "Privé" + +#: ../../include/permissions.php:735 +msgid "Community Forum" +msgstr "Groepsforum" + +#: ../../include/permissions.php:737 +msgid "Feed Republish" +msgstr "Feed herpubliceren" + +#: ../../include/permissions.php:739 +msgid "Celebrity/Soapbox" +msgstr "Beroemdheid/alleen volgen" + +#: ../../include/permissions.php:742 +msgid "Custom/Expert Mode" +msgstr "Aangepaste /expertmodus" + #: ../../mod/mood.php:132 msgid "Set your current mood and tell your friends" msgstr "Noteer je huidige stemming en toon het aan je connecties" @@ -3597,7 +3637,7 @@ msgid "Unable to add menu element." msgstr "Menu-onderdeel kan niet worden toegevoegd." #: ../../mod/mitem.php:78 ../../mod/dirprofile.php:175 ../../mod/menu.php:120 -#: ../../mod/xchan.php:27 +#: ../../mod/xchan.php:38 msgid "Not found." msgstr "Niet gevonden." @@ -3643,9 +3683,9 @@ msgstr "Nieuw menu-element" #: ../../mod/mitem.php:133 ../../mod/mitem.php:176 msgid "Menu Item Permissions" -msgstr "Privacy-rechten menu-item" +msgstr "Permissies menu-item" -#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:968 +#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:980 msgid "(click to open/close)" msgstr "(klik om te openen/sluiten)" @@ -3721,455 +3761,463 @@ msgstr "Naam is vereist" msgid "Key and Secret are required" msgstr "Key en secret zijn vereist" -#: ../../mod/settings.php:196 +#: ../../mod/settings.php:198 msgid "Passwords do not match. Password unchanged." msgstr "Wachtwoorden komen niet overeen. Wachtwoord onveranderd." -#: ../../mod/settings.php:200 +#: ../../mod/settings.php:202 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd." -#: ../../mod/settings.php:214 +#: ../../mod/settings.php:216 msgid "Password changed." msgstr "Wachtwoord veranderd." -#: ../../mod/settings.php:216 +#: ../../mod/settings.php:218 msgid "Password update failed. Please try again." msgstr "Bijwerken wachtwoord mislukt. Probeer opnieuw." -#: ../../mod/settings.php:230 +#: ../../mod/settings.php:232 msgid "Not valid email." msgstr "Geen geldig e-mailadres." -#: ../../mod/settings.php:233 +#: ../../mod/settings.php:235 msgid "Protected email address. Cannot change to that email." msgstr "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken." -#: ../../mod/settings.php:242 +#: ../../mod/settings.php:244 msgid "System failure storing new email. Please try again." msgstr "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer." -#: ../../mod/settings.php:445 +#: ../../mod/settings.php:447 msgid "Settings updated." msgstr "Instellingen bijgewerkt." -#: ../../mod/settings.php:516 ../../mod/settings.php:542 -#: ../../mod/settings.php:578 +#: ../../mod/settings.php:518 ../../mod/settings.php:544 +#: ../../mod/settings.php:580 msgid "Add application" msgstr "Applicatie toevoegen" -#: ../../mod/settings.php:519 +#: ../../mod/settings.php:521 msgid "Name of application" msgstr "Naam van applicatie" -#: ../../mod/settings.php:520 ../../mod/settings.php:546 +#: ../../mod/settings.php:522 ../../mod/settings.php:548 msgid "Consumer Key" msgstr "Consumer key" -#: ../../mod/settings.php:520 ../../mod/settings.php:521 +#: ../../mod/settings.php:522 ../../mod/settings.php:523 msgid "Automatically generated - change if desired. Max length 20" msgstr "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20" -#: ../../mod/settings.php:521 ../../mod/settings.php:547 +#: ../../mod/settings.php:523 ../../mod/settings.php:549 msgid "Consumer Secret" msgstr "Consumer secret" -#: ../../mod/settings.php:522 ../../mod/settings.php:548 +#: ../../mod/settings.php:524 ../../mod/settings.php:550 msgid "Redirect" msgstr "Redirect/doorverwijzing" -#: ../../mod/settings.php:522 +#: ../../mod/settings.php:524 msgid "" "Redirect URI - leave blank unless your application specifically requires " "this" msgstr "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist" -#: ../../mod/settings.php:523 ../../mod/settings.php:549 +#: ../../mod/settings.php:525 ../../mod/settings.php:551 msgid "Icon url" msgstr "URL van pictogram" -#: ../../mod/settings.php:523 +#: ../../mod/settings.php:525 msgid "Optional" msgstr "Optioneel" -#: ../../mod/settings.php:534 +#: ../../mod/settings.php:536 msgid "You can't edit this application." msgstr "Je kan deze applicatie niet bewerken" -#: ../../mod/settings.php:577 +#: ../../mod/settings.php:579 msgid "Connected Apps" msgstr "Verbonden applicaties" -#: ../../mod/settings.php:581 +#: ../../mod/settings.php:583 msgid "Client key starts with" msgstr "Client key begint met" -#: ../../mod/settings.php:582 +#: ../../mod/settings.php:584 msgid "No name" msgstr "Geen naam" -#: ../../mod/settings.php:583 +#: ../../mod/settings.php:585 msgid "Remove authorization" msgstr "Autorisatie verwijderen" -#: ../../mod/settings.php:594 +#: ../../mod/settings.php:596 msgid "No feature settings configured" msgstr "Geen plugin-instellingen ingesteld" -#: ../../mod/settings.php:602 +#: ../../mod/settings.php:604 msgid "Feature Settings" msgstr "Plugin-instellingen" -#: ../../mod/settings.php:625 +#: ../../mod/settings.php:627 msgid "Account Settings" msgstr "Account-instellingen" -#: ../../mod/settings.php:626 +#: ../../mod/settings.php:628 msgid "Password Settings" msgstr "Wachtwoord-instellingen" -#: ../../mod/settings.php:627 +#: ../../mod/settings.php:629 msgid "New Password:" msgstr "Nieuw wachtwoord:" -#: ../../mod/settings.php:628 +#: ../../mod/settings.php:630 msgid "Confirm:" msgstr "Bevestigen:" -#: ../../mod/settings.php:628 +#: ../../mod/settings.php:630 msgid "Leave password fields blank unless changing" msgstr "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen" -#: ../../mod/settings.php:630 ../../mod/settings.php:944 +#: ../../mod/settings.php:632 ../../mod/settings.php:954 msgid "Email Address:" msgstr "E-mailadres:" -#: ../../mod/settings.php:631 ../../mod/removeaccount.php:61 +#: ../../mod/settings.php:633 ../../mod/removeaccount.php:61 msgid "Remove Account" msgstr "Account verwijderen" -#: ../../mod/settings.php:632 +#: ../../mod/settings.php:634 msgid "Remove this account from this server including all its channels" msgstr "Dit account en al zijn kanalen van deze RedMatrix-hub verwijderen" -#: ../../mod/settings.php:633 ../../mod/settings.php:1007 +#: ../../mod/settings.php:635 ../../mod/settings.php:1019 msgid "Warning: This action is permanent and cannot be reversed." msgstr "Waarschuwing: Deze handeling is van permanente aard en kan niet meer worden teruggedraaid." -#: ../../mod/settings.php:649 +#: ../../mod/settings.php:651 msgid "Off" msgstr "Uit" -#: ../../mod/settings.php:649 +#: ../../mod/settings.php:651 msgid "On" msgstr "Aan" -#: ../../mod/settings.php:656 +#: ../../mod/settings.php:658 msgid "Additional Features" msgstr "Extra functies" -#: ../../mod/settings.php:681 +#: ../../mod/settings.php:683 msgid "Connector Settings" msgstr "Instellingen externe koppelingen" -#: ../../mod/settings.php:711 ../../mod/admin.php:361 +#: ../../mod/settings.php:713 ../../mod/admin.php:362 msgid "No special theme for mobile devices" msgstr "Geen speciaal thema voor mobiele apparaten" -#: ../../mod/settings.php:720 +#: ../../mod/settings.php:722 #, php-format msgid "%s - (Experimental)" msgstr "%s - (experimenteel)" -#: ../../mod/settings.php:753 +#: ../../mod/settings.php:758 msgid "Display Settings" msgstr "Weergave-instellingen" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:764 msgid "Display Theme:" msgstr "Gebruik thema:" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:765 msgid "Mobile Theme:" msgstr "Mobiel thema:" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:766 msgid "Enable user zoom on mobile devices" msgstr "Inzoomen op smartphones en tablets toestaan" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:767 msgid "Update browser every xx seconds" msgstr "Ververs de webbrowser om de zoveel seconde" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:767 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimaal 10 seconde, geen maximum" -#: ../../mod/settings.php:763 +#: ../../mod/settings.php:768 msgid "Maximum number of conversations to load at any time:" msgstr "Maximaal aantal conversaties die per keer geladen worden:" -#: ../../mod/settings.php:763 +#: ../../mod/settings.php:768 msgid "Maximum of 100 items" msgstr "Maximaal 100 conversaties" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:769 msgid "Don't show emoticons" msgstr "Geen emoticons weergeven" -#: ../../mod/settings.php:765 +#: ../../mod/settings.php:770 +msgid "Link post titles to source" +msgstr "Berichtkoppen naar originele locatie linken" + +#: ../../mod/settings.php:771 msgid "System Page Layout Editor - (advanced)" msgstr "Lay-out bewerken van systeempagina's (geavanceerd)" -#: ../../mod/settings.php:801 +#: ../../mod/settings.php:807 msgid "Nobody except yourself" msgstr "Niemand, behalve jezelf" -#: ../../mod/settings.php:802 +#: ../../mod/settings.php:808 msgid "Only those you specifically allow" msgstr "Alleen connecties met uitdrukkelijke toestemming" -#: ../../mod/settings.php:803 +#: ../../mod/settings.php:809 msgid "Approved connections" msgstr "Geaccepteerde connecties" -#: ../../mod/settings.php:804 +#: ../../mod/settings.php:810 msgid "Any connections" msgstr "Alle connecties" -#: ../../mod/settings.php:805 +#: ../../mod/settings.php:811 msgid "Anybody on this website" msgstr "Iedereen op deze hub" -#: ../../mod/settings.php:806 +#: ../../mod/settings.php:812 msgid "Anybody in this network" msgstr "Iedereen in dit netwerk" -#: ../../mod/settings.php:807 +#: ../../mod/settings.php:813 msgid "Anybody authenticated" msgstr "Geauthenticeerd" -#: ../../mod/settings.php:808 +#: ../../mod/settings.php:814 msgid "Anybody on the internet" msgstr "Iedereen op het internet" -#: ../../mod/settings.php:885 +#: ../../mod/settings.php:891 msgid "Publish your default profile in the network directory" msgstr "Publiceer je standaardprofiel in de kanalengids" -#: ../../mod/settings.php:885 ../../mod/settings.php:890 -#: ../../mod/settings.php:961 ../../mod/api.php:106 ../../mod/profiles.php:602 -#: ../../mod/admin.php:391 +#: ../../mod/settings.php:891 ../../mod/settings.php:896 +#: ../../mod/settings.php:973 ../../mod/api.php:106 ../../mod/profiles.php:602 +#: ../../mod/admin.php:392 msgid "No" msgstr "Nee" -#: ../../mod/settings.php:885 ../../mod/settings.php:890 -#: ../../mod/settings.php:961 ../../mod/api.php:105 ../../mod/profiles.php:601 -#: ../../mod/admin.php:393 +#: ../../mod/settings.php:891 ../../mod/settings.php:896 +#: ../../mod/settings.php:973 ../../mod/api.php:105 ../../mod/profiles.php:601 +#: ../../mod/admin.php:394 msgid "Yes" msgstr "Ja" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:896 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen" -#: ../../mod/settings.php:894 ../../mod/profile_photo.php:365 +#: ../../mod/settings.php:900 ../../mod/profile_photo.php:365 msgid "or" msgstr "of" -#: ../../mod/settings.php:899 +#: ../../mod/settings.php:905 msgid "Your channel address is" msgstr "Jouw kanaaladres is" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:943 msgid "Channel Settings" msgstr "Kanaal-instellingen" -#: ../../mod/settings.php:942 +#: ../../mod/settings.php:952 msgid "Basic Settings" msgstr "Basis-instellingen" -#: ../../mod/settings.php:945 +#: ../../mod/settings.php:955 msgid "Your Timezone:" msgstr "Jouw tijdzone:" -#: ../../mod/settings.php:946 +#: ../../mod/settings.php:956 msgid "Default Post Location:" msgstr "Standaardlocatie bericht:" -#: ../../mod/settings.php:946 +#: ../../mod/settings.php:956 msgid "Geographical location to display on your posts" msgstr "Geografische locatie die bij het bericht moet worden vermeld" -#: ../../mod/settings.php:947 +#: ../../mod/settings.php:957 msgid "Use Browser Location:" msgstr "Locatie van webbrowser gebruiken:" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:959 msgid "Adult Content" msgstr "Inhoud voor volwassenen" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:959 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassen. (Gebruik de hashtag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)" -#: ../../mod/settings.php:951 +#: ../../mod/settings.php:961 msgid "Security and Privacy Settings" msgstr "Veiligheids- privacy-instellingen" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:963 +msgid "Your permissions are already configured. Click to view/adjust" +msgstr "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen." + +#: ../../mod/settings.php:965 msgid "Hide my online presence" msgstr "Verberg mijn aanwezigheid" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:965 msgid "Prevents displaying in your profile that you are online" msgstr "Voorkomt dat op je kanaal te zien valt dat je momenteel op de RedMatrix aanwezig bent" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:967 msgid "Simple Privacy Settings:" msgstr "Eenvoudige privacy-instellingen:" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:968 msgid "" "Very Public - extremely permissive (should be used with caution)" msgstr "Zeer openbaar (kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)" -#: ../../mod/settings.php:957 +#: ../../mod/settings.php:969 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "Normaal (standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)" -#: ../../mod/settings.php:958 +#: ../../mod/settings.php:970 msgid "Private - default private, never open or public" msgstr "Privé (standaard privé en nooit openbaar)" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:971 msgid "Blocked - default blocked to/from everybody" msgstr "Geblokkeerd (standaard geblokkeerd naar/van iedereen)" -#: ../../mod/settings.php:961 +#: ../../mod/settings.php:973 msgid "Allow others to tag your posts" msgstr "Anderen toestaan om je berichten te labelen" -#: ../../mod/settings.php:961 +#: ../../mod/settings.php:973 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren" -#: ../../mod/settings.php:963 +#: ../../mod/settings.php:975 msgid "Advanced Privacy Settings" msgstr "Geavanceerde privacy-instellingen" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:977 msgid "Expire other channel content after this many days" msgstr "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:977 msgid "0 or blank prevents expiration" msgstr "0 of leeg voorkomt het verlopen" -#: ../../mod/settings.php:966 +#: ../../mod/settings.php:978 msgid "Maximum Friend Requests/Day:" msgstr "Maximum aantal connectieverzoeken per dag:" -#: ../../mod/settings.php:966 +#: ../../mod/settings.php:978 msgid "May reduce spam activity" msgstr "Kan eventuele spam verminderen" -#: ../../mod/settings.php:967 -msgid "Default Post Permissions" -msgstr "Standaard privacy-rechten voor nieuwe berichten" - #: ../../mod/settings.php:979 +msgid "Default Post Permissions" +msgstr "Standaard permissies voor nieuwe berichten" + +#: ../../mod/settings.php:991 msgid "Maximum private messages per day from unknown people:" msgstr "Maximum aantal privé-berichten per dag van onbekende personen:" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:991 msgid "Useful to reduce spamming" msgstr "Kan eventuele spam verminderen" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:994 msgid "Notification Settings" msgstr "Notificatie-instellingen" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:995 msgid "By default post a status message when:" msgstr "Plaats automatisch een statusbericht wanneer:" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:996 msgid "accepting a friend request" msgstr "Een connectieverzoek wordt geaccepteerd" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:997 msgid "joining a forum/community" msgstr "Je lid wordt van een groep/forum" -#: ../../mod/settings.php:986 +#: ../../mod/settings.php:998 msgid "making an interesting profile change" msgstr "Er sprake is van een interessante profielwijziging" -#: ../../mod/settings.php:987 +#: ../../mod/settings.php:999 msgid "Send a notification email when:" msgstr "Verzend een notificatie per e-mail wanneer:" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:1000 msgid "You receive a connection request" msgstr "Je een connectieverzoek ontvangt" -#: ../../mod/settings.php:989 +#: ../../mod/settings.php:1001 msgid "Your connections are confirmed" msgstr "Jouw connecties zijn bevestigd" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1002 msgid "Someone writes on your profile wall" msgstr "Iemand iets op jouw kanaal heeft geschreven" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1003 msgid "Someone writes a followup comment" msgstr "Iemand een reactie schrijft" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:1004 msgid "You receive a private message" msgstr "Je een privé-bericht ontvangt" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:1005 msgid "You receive a friend suggestion" msgstr "Je een kanaalvoorstel ontvangt" -#: ../../mod/settings.php:994 +#: ../../mod/settings.php:1006 msgid "You are tagged in a post" msgstr "Je expliciet in een bericht bent genoemd" -#: ../../mod/settings.php:995 +#: ../../mod/settings.php:1007 msgid "You are poked/prodded/etc. in a post" msgstr "Je bent in een bericht aangestoten/gepord/etc." -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:1010 msgid "Advanced Account/Page Type Settings" msgstr "Instellingen geavanceerd account/paginatype" -#: ../../mod/settings.php:999 +#: ../../mod/settings.php:1011 msgid "Change the behaviour of this account for special situations" msgstr "Verander het gedrag van dit account voor speciale situaties" -#: ../../mod/settings.php:1002 +#: ../../mod/settings.php:1014 msgid "" "Please enable expert mode (in Settings > " "Additional features) to adjust!" msgstr "Schakel de expertmodus in (in Instellingen > Extra functies) om aan te kunnen passen!" -#: ../../mod/settings.php:1003 +#: ../../mod/settings.php:1015 msgid "Miscellaneous Settings" msgstr "Diverse instellingen" -#: ../../mod/settings.php:1005 +#: ../../mod/settings.php:1017 msgid "Personal menu to display in your channel pages" msgstr "Persoonlijk menu om op je kanaalpagina's weer te geven" -#: ../../mod/settings.php:1006 +#: ../../mod/settings.php:1018 msgid "Remove this channel" msgstr "Verwijder dit kanaal" @@ -4235,12 +4283,11 @@ msgstr "Ophalen URL gaf een foutmelding terug: %1$s" msgid "Invalid item." msgstr "Ongeldig item." -#: ../../mod/block.php:39 ../../mod/page.php:47 ../../mod/home.php:54 -#: ../../mod/wall_upload.php:28 +#: ../../mod/block.php:39 ../../mod/page.php:47 ../../mod/wall_upload.php:28 msgid "Channel not found." msgstr "Kanaal niet gevonden." -#: ../../mod/block.php:75 ../../mod/page.php:83 ../../mod/display.php:100 +#: ../../mod/block.php:75 ../../mod/page.php:83 ../../mod/display.php:102 #: ../../mod/help.php:72 ../../index.php:236 msgid "Page not found." msgstr "Pagina niet gevonden." @@ -4394,7 +4441,7 @@ msgstr "Homepage" msgid "Interests" msgstr "Interesses" -#: ../../mod/profiles.php:433 ../../mod/admin.php:863 +#: ../../mod/profiles.php:433 ../../mod/admin.php:866 msgid "Address" msgstr "Kanaaladres" @@ -4647,7 +4694,7 @@ msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken." #: ../../mod/channel.php:86 msgid "Insufficient permissions. Request redirected to profile page." -msgstr "Onvoldoende privacy-rechten. Doorgestuurd naar profielpagina." +msgstr "Onvoldoende permissies. Doorgestuurd naar profielpagina." #: ../../mod/rbmark.php:88 msgid "Select a bookmark folder" @@ -4761,7 +4808,7 @@ msgstr "Ik accepteer de %s van deze RedMatrix-hub" msgid "I am over 13 years of age and accept the %s for this website" msgstr "Ik accepteer de %s van deze RedMatrix-hub" -#: ../../mod/register.php:203 ../../mod/admin.php:414 +#: ../../mod/register.php:203 ../../mod/admin.php:415 msgid "Registration" msgstr "Registratie" @@ -5022,14 +5069,14 @@ msgid "%1$s [%2$s]" msgstr "%1$s [%2$s]" #: ../../mod/connections.php:372 -msgid "Edit contact" +msgid "Edit connection" msgstr "Connectie bewerken" -#: ../../mod/connections.php:393 +#: ../../mod/connections.php:410 msgid "Search your connections" msgstr "Doorzoek jouw connecties" -#: ../../mod/connections.php:394 +#: ../../mod/connections.php:411 msgid "Finding: " msgstr "Zoeken naar: " @@ -5041,311 +5088,311 @@ msgstr "Bericht bewerken" msgid "is now connected to" msgstr "is nu verbonden met" -#: ../../mod/connedit.php:274 +#: ../../mod/connedit.php:296 msgid "Could not access address book record." msgstr "Kon geen toegang krijgen tot de record van de connectie." -#: ../../mod/connedit.php:288 +#: ../../mod/connedit.php:310 msgid "Refresh failed - channel is currently unavailable." msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar" -#: ../../mod/connedit.php:295 +#: ../../mod/connedit.php:317 msgid "Channel has been unblocked" msgstr "Kanaal is gedeblokkeerd" -#: ../../mod/connedit.php:296 +#: ../../mod/connedit.php:318 msgid "Channel has been blocked" msgstr "Kanaal is geblokkeerd" -#: ../../mod/connedit.php:300 ../../mod/connedit.php:312 -#: ../../mod/connedit.php:324 ../../mod/connedit.php:336 -#: ../../mod/connedit.php:352 +#: ../../mod/connedit.php:322 ../../mod/connedit.php:334 +#: ../../mod/connedit.php:346 ../../mod/connedit.php:358 +#: ../../mod/connedit.php:374 msgid "Unable to set address book parameters." msgstr "Niet in staat om de parameters van connecties in te stellen." -#: ../../mod/connedit.php:307 +#: ../../mod/connedit.php:329 msgid "Channel has been unignored" msgstr "Kanaal wordt niet meer genegeerd" -#: ../../mod/connedit.php:308 +#: ../../mod/connedit.php:330 msgid "Channel has been ignored" msgstr "Kanaal wordt genegeerd" -#: ../../mod/connedit.php:319 +#: ../../mod/connedit.php:341 msgid "Channel has been unarchived" msgstr "Kanaal is niet meer gearchiveerd" -#: ../../mod/connedit.php:320 +#: ../../mod/connedit.php:342 msgid "Channel has been archived" msgstr "Kanaal is gearchiveerd" -#: ../../mod/connedit.php:331 +#: ../../mod/connedit.php:353 msgid "Channel has been unhidden" msgstr "Kanaal is niet meer verborgen" -#: ../../mod/connedit.php:332 +#: ../../mod/connedit.php:354 msgid "Channel has been hidden" msgstr "Kanaal is verborgen" -#: ../../mod/connedit.php:347 +#: ../../mod/connedit.php:369 msgid "Channel has been approved" msgstr "Connectie/kanaal is geaccepteerd" -#: ../../mod/connedit.php:348 +#: ../../mod/connedit.php:370 msgid "Channel has been unapproved" msgstr "Connectie/kanaal is afgewezen" -#: ../../mod/connedit.php:376 +#: ../../mod/connedit.php:398 msgid "Connection has been removed." msgstr "Connectie is verwijderd" -#: ../../mod/connedit.php:396 +#: ../../mod/connedit.php:418 #, php-format msgid "View %s's profile" msgstr "Profiel van %s weergeven" -#: ../../mod/connedit.php:400 +#: ../../mod/connedit.php:422 msgid "Refresh Permissions" -msgstr "Privacy-rechten vernieuwen" +msgstr "Permissies vernieuwen" -#: ../../mod/connedit.php:403 +#: ../../mod/connedit.php:425 msgid "Fetch updated permissions" -msgstr "Aangepaste privacy-rechten ophalen" +msgstr "Aangepaste permissies ophalen" -#: ../../mod/connedit.php:407 +#: ../../mod/connedit.php:429 msgid "Recent Activity" msgstr "Recente activiteit" -#: ../../mod/connedit.php:410 +#: ../../mod/connedit.php:432 msgid "View recent posts and comments" msgstr "Recente berichten en reacties weergeven" -#: ../../mod/connedit.php:414 ../../mod/connedit.php:557 -#: ../../mod/admin.php:730 +#: ../../mod/connedit.php:436 ../../mod/connedit.php:579 +#: ../../mod/admin.php:732 msgid "Unblock" msgstr "Deblokkeren" -#: ../../mod/connedit.php:414 ../../mod/connedit.php:557 -#: ../../mod/admin.php:729 +#: ../../mod/connedit.php:436 ../../mod/connedit.php:579 +#: ../../mod/admin.php:731 msgid "Block" msgstr "Blokkeren" -#: ../../mod/connedit.php:417 +#: ../../mod/connedit.php:439 msgid "Block or Unblock this connection" msgstr "Deze connectie blokkeren of deblokkeren" -#: ../../mod/connedit.php:421 ../../mod/connedit.php:558 +#: ../../mod/connedit.php:443 ../../mod/connedit.php:580 msgid "Unignore" msgstr "Niet meer negeren" -#: ../../mod/connedit.php:421 ../../mod/connedit.php:558 +#: ../../mod/connedit.php:443 ../../mod/connedit.php:580 #: ../../mod/notifications.php:51 msgid "Ignore" msgstr "Negeren" -#: ../../mod/connedit.php:424 +#: ../../mod/connedit.php:446 msgid "Ignore or Unignore this connection" msgstr "Deze connectie negeren of niet meer negeren" -#: ../../mod/connedit.php:427 +#: ../../mod/connedit.php:449 msgid "Unarchive" msgstr "Niet meer archiveren" -#: ../../mod/connedit.php:427 +#: ../../mod/connedit.php:449 msgid "Archive" msgstr "Archiveren" -#: ../../mod/connedit.php:430 +#: ../../mod/connedit.php:452 msgid "Archive or Unarchive this connection" msgstr "Deze connectie archiveren of niet meer archiveren" -#: ../../mod/connedit.php:433 +#: ../../mod/connedit.php:455 msgid "Unhide" msgstr "Niet meer verbergen" -#: ../../mod/connedit.php:433 +#: ../../mod/connedit.php:455 msgid "Hide" msgstr "Verbergen" -#: ../../mod/connedit.php:436 +#: ../../mod/connedit.php:458 msgid "Hide or Unhide this connection" msgstr "Deze connectie verbergen of niet meer verbergen" -#: ../../mod/connedit.php:443 +#: ../../mod/connedit.php:465 msgid "Delete this connection" msgstr "Deze connectie verwijderen" -#: ../../mod/connedit.php:486 ../../mod/connedit.php:515 +#: ../../mod/connedit.php:508 ../../mod/connedit.php:537 msgid "Approve this connection" msgstr "Deze connectie accepteren" -#: ../../mod/connedit.php:486 +#: ../../mod/connedit.php:508 msgid "Accept connection to allow communication" msgstr "Keur deze connectie goed om communicatie toe te staan" -#: ../../mod/connedit.php:502 +#: ../../mod/connedit.php:524 msgid "Automatic Permissions Settings" -msgstr "Automatische privacy-rechten" +msgstr "Automatische permissies" -#: ../../mod/connedit.php:502 +#: ../../mod/connedit.php:524 #, php-format msgid "Connections: settings for %s" msgstr "Connecties: instellingen voor %s" -#: ../../mod/connedit.php:506 +#: ../../mod/connedit.php:528 msgid "" "When receiving a channel introduction, any permissions provided here will be" " applied to the new connection automatically and the introduction approved. " "Leave this page if you do not wish to use this feature." -msgstr "Wanneer je een connectieverzoek voor een kanaal ontvangt, zullen alle privacy-rechten hier automatisch op de nieuwe connectie worden toegepast en het connectieverzoek worden geaccepteerd. Verlaat deze pagina wanneer je geen gebruik wil maken van deze functie." +msgstr "Wanneer je een connectieverzoek voor een kanaal ontvangt, zullen alle permissies hier automatisch op de nieuwe connectie worden toegepast en het connectieverzoek worden geaccepteerd. Verlaat deze pagina wanneer je geen gebruik wil maken van deze functie." -#: ../../mod/connedit.php:508 +#: ../../mod/connedit.php:530 msgid "Slide to adjust your degree of friendship" msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag" -#: ../../mod/connedit.php:514 +#: ../../mod/connedit.php:536 msgid "inherited" msgstr "geërfd" -#: ../../mod/connedit.php:516 +#: ../../mod/connedit.php:538 msgid "Connection has no individual permissions!" -msgstr "Connectie heeft geen individuele privacy-rechten!" +msgstr "Connectie heeft geen individuele permissies!" -#: ../../mod/connedit.php:517 +#: ../../mod/connedit.php:539 msgid "" "This may be appropriate based on your privacy " "settings, though you may wish to review the \"Advanced Permissions\"." msgstr "Dit is mogelijk voldoende, wanneer er naar jouw privacy-instellingen wordt gekeken. Hoewel je wellicht de geavanceerde rechten wil nagaan." -#: ../../mod/connedit.php:519 +#: ../../mod/connedit.php:541 msgid "Profile Visibility" msgstr "Zichtbaarheid profiel" -#: ../../mod/connedit.php:520 +#: ../../mod/connedit.php:542 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken." -#: ../../mod/connedit.php:521 +#: ../../mod/connedit.php:543 msgid "Contact Information / Notes" msgstr "Informatie/aantekeningen over connectie" -#: ../../mod/connedit.php:522 +#: ../../mod/connedit.php:544 msgid "Edit contact notes" msgstr "Bewerk aantekeningen over contact" -#: ../../mod/connedit.php:524 +#: ../../mod/connedit.php:546 msgid "Their Settings" msgstr "Hun instellingen" -#: ../../mod/connedit.php:525 +#: ../../mod/connedit.php:547 msgid "My Settings" msgstr "Mijn instellingen" -#: ../../mod/connedit.php:527 +#: ../../mod/connedit.php:549 msgid "Clear/Disable Automatic Permissions" -msgstr "Verwijderen/uitschakelen automatische privacy-rechten" +msgstr "Verwijderen/uitschakelen automatische permissies" -#: ../../mod/connedit.php:528 +#: ../../mod/connedit.php:550 msgid "Forum Members" msgstr "Forum/groepsleden" -#: ../../mod/connedit.php:529 +#: ../../mod/connedit.php:551 msgid "Soapbox" msgstr "Zeepkist" -#: ../../mod/connedit.php:530 +#: ../../mod/connedit.php:552 msgid "Full Sharing (typical social network permissions)" msgstr "Voluit delen (vergelijkbaar met die van sociale netwerken)" -#: ../../mod/connedit.php:531 +#: ../../mod/connedit.php:553 msgid "Cautious Sharing " msgstr "Voorzichtig delen" -#: ../../mod/connedit.php:532 +#: ../../mod/connedit.php:554 msgid "Follow Only" msgstr "Alleen volgen" -#: ../../mod/connedit.php:533 +#: ../../mod/connedit.php:555 msgid "Individual Permissions" -msgstr "Individuele privacy-rechten" +msgstr "Individuele permissies" -#: ../../mod/connedit.php:534 +#: ../../mod/connedit.php:556 msgid "" "Some permissions may be inherited from your channel privacy settings, which have higher priority than " "individual settings. Changing those inherited settings on this page will " "have no effect." -msgstr "Sommige privacy-rechten kunnen worden overgeërfd van de privacy-instellingen van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect." +msgstr "Sommige permissies kunnen worden overgeërfd van de privacy-instellingen van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect." -#: ../../mod/connedit.php:535 +#: ../../mod/connedit.php:557 msgid "Advanced Permissions" -msgstr "Geavanceerde privacy-rechten" +msgstr "Geavanceerde permissies" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:558 msgid "Simple Permissions (select one and submit)" -msgstr "Eenvoudige privacy-rechten (selecteer er één en opslaan)" +msgstr "Eenvoudige permissies (selecteer er één en opslaan)" -#: ../../mod/connedit.php:540 +#: ../../mod/connedit.php:562 #, php-format msgid "Visit %s's profile - %s" msgstr "Profiel van %s bezoeken - %s" -#: ../../mod/connedit.php:541 +#: ../../mod/connedit.php:563 msgid "Block/Unblock contact" msgstr "Connectie blokkeren/deblokkeren" -#: ../../mod/connedit.php:542 +#: ../../mod/connedit.php:564 msgid "Ignore contact" msgstr "Connectie negeren" -#: ../../mod/connedit.php:543 +#: ../../mod/connedit.php:565 msgid "Repair URL settings" msgstr "URL-instellingen repareren" -#: ../../mod/connedit.php:544 +#: ../../mod/connedit.php:566 msgid "View conversations" msgstr "Conversaties weergeven" -#: ../../mod/connedit.php:546 +#: ../../mod/connedit.php:568 msgid "Delete contact" msgstr "Connectie verwijderen" -#: ../../mod/connedit.php:549 +#: ../../mod/connedit.php:571 msgid "Last update:" msgstr "Laatste wijziging:" -#: ../../mod/connedit.php:551 +#: ../../mod/connedit.php:573 msgid "Update public posts" msgstr "Openbare berichten updaten" -#: ../../mod/connedit.php:553 +#: ../../mod/connedit.php:575 msgid "Update now" msgstr "Nu updaten" -#: ../../mod/connedit.php:559 +#: ../../mod/connedit.php:581 msgid "Currently blocked" msgstr "Momenteel geblokkeerd" -#: ../../mod/connedit.php:560 +#: ../../mod/connedit.php:582 msgid "Currently ignored" msgstr "Momenteel genegeerd" -#: ../../mod/connedit.php:561 +#: ../../mod/connedit.php:583 msgid "Currently archived" msgstr "Momenteel gearchiveerd" -#: ../../mod/connedit.php:562 +#: ../../mod/connedit.php:584 msgid "Currently pending" msgstr "Moeten nog geaccepteerd of afgewezen worden" -#: ../../mod/connedit.php:563 +#: ../../mod/connedit.php:585 msgid "Hide this contact from others" msgstr "Verberg deze connectie voor anderen" -#: ../../mod/connedit.php:563 +#: ../../mod/connedit.php:585 msgid "" "Replies/likes to your public posts may still be visible" msgstr "Reacties/vind-ik-leuks op jouw openbare berichten kunnen zichtbaar blijven" @@ -5377,7 +5424,7 @@ msgstr "Bestaande gevolmachtigde accountbeheerders" msgid "Potential Delegates" msgstr "Gevolmachtigde personen waaraan mogelijk het accountbeheer kan worden uitbesteed." -#: ../../mod/delegate.php:130 ../../mod/photos.php:912 ../../mod/tagrm.php:93 +#: ../../mod/delegate.php:130 ../../mod/photos.php:942 ../../mod/tagrm.php:93 msgid "Remove" msgstr "Verwijderen" @@ -5403,7 +5450,15 @@ msgstr "Geslacht:" msgid "Finding:" msgstr "Gezocht naar:" -#: ../../mod/directory.php:244 +#: ../../mod/directory.php:228 +msgid "next page" +msgstr "volgende pagina" + +#: ../../mod/directory.php:228 +msgid "previous page" +msgstr "vorige pagina" + +#: ../../mod/directory.php:245 msgid "No entries (some entries may be hidden)." msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)." @@ -5435,15 +5490,6 @@ msgstr "Trefwoorden: " msgid "This site is not a directory server" msgstr "Deze hub is geen kanalengidshub (directoryserver)" -#: ../../mod/home.php:81 -msgid "Red Matrix - "The Network"" -msgstr "RedMatrix - "The Network"" - -#: ../../mod/home.php:94 -#, php-format -msgid "Welcome to %s" -msgstr "Welkom op %s" - #: ../../mod/setup.php:162 msgid "Red Matrix Server - Setup" msgstr "RedMatrix Server - Setup" @@ -5480,7 +5526,7 @@ msgstr "Please see the file \"install/INSTALL.txt\"." msgid "System check" msgstr "System check" -#: ../../mod/setup.php:261 ../../mod/events.php:414 +#: ../../mod/setup.php:261 ../../mod/events.php:439 msgid "Next" msgstr "Volgende" @@ -5912,50 +5958,50 @@ msgstr "Webpagina verwijderen?" msgid "Delete Webpage" msgstr "Webpagina verwijderen" -#: ../../mod/siteinfo.php:57 +#: ../../mod/siteinfo.php:76 #, php-format msgid "Version %s" msgstr "Versie %s" -#: ../../mod/siteinfo.php:76 +#: ../../mod/siteinfo.php:95 msgid "Installed plugins/addons/apps:" msgstr "Ingeschakelde plug-ins/add-ons/apps:" -#: ../../mod/siteinfo.php:89 +#: ../../mod/siteinfo.php:108 msgid "No installed plugins/addons/apps" msgstr "Geen ingeschakelde plug-ins/add-ons/apps" -#: ../../mod/siteinfo.php:97 +#: ../../mod/siteinfo.php:116 msgid "Red" msgstr "Red" -#: ../../mod/siteinfo.php:98 +#: ../../mod/siteinfo.php:117 msgid "" "This is a hub of the Red Matrix - a global cooperative network of " "decentralized privacy enhanced websites." msgstr "Dit is een hub van de RedMatrix - een wereldwijd coöperatief netwerk van gedecentraliseerde websites met verbeterde privacy." -#: ../../mod/siteinfo.php:101 +#: ../../mod/siteinfo.php:120 msgid "Running at web location" msgstr "Draaiend op weblocatie" -#: ../../mod/siteinfo.php:102 +#: ../../mod/siteinfo.php:121 msgid "" "Please visit GetZot.com to learn more " "about the Red Matrix." msgstr "Bezoek RedMatrix.me om meer te leren over de RedMatrix." -#: ../../mod/siteinfo.php:103 +#: ../../mod/siteinfo.php:122 msgid "Bug reports and issues: please visit" msgstr "Bugrapporten en andere kwesties: bezoek" -#: ../../mod/siteinfo.php:106 +#: ../../mod/siteinfo.php:125 msgid "" "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot " "com" msgstr "Voorstellen, lofbetuigingen, enz. - e-mail \"redmatrix\" at librelist - dot com" -#: ../../mod/siteinfo.php:108 +#: ../../mod/siteinfo.php:127 msgid "Site Administrators" msgstr "Hubbeheerders" @@ -5971,7 +6017,7 @@ msgstr "Album niet gevonden." msgid "Delete Album" msgstr "Verwijder album" -#: ../../mod/photos.php:159 ../../mod/photos.php:963 +#: ../../mod/photos.php:159 ../../mod/photos.php:993 msgid "Delete Photo" msgstr "Verwijder foto" @@ -6013,8 +6059,8 @@ msgstr "Plaats geen bericht voor deze upload." msgid "Album name could not be decoded" msgstr "Albumnaam kon niet gedecodeerd worden" -#: ../../mod/photos.php:659 ../../mod/photos.php:681 ../../mod/photos.php:1135 -#: ../../mod/photos.php:1150 +#: ../../mod/photos.php:659 ../../mod/photos.php:681 ../../mod/photos.php:1165 +#: ../../mod/photos.php:1180 msgid "Contact Photos" msgstr "Connectiefoto's" @@ -6030,64 +6076,64 @@ msgstr "Nieuwste eerst weergeven" msgid "Show Oldest First" msgstr "Oudste eerst weergeven" -#: ../../mod/photos.php:736 ../../mod/photos.php:1182 +#: ../../mod/photos.php:742 ../../mod/photos.php:1212 msgid "View Photo" msgstr "Foto weergeven" -#: ../../mod/photos.php:782 +#: ../../mod/photos.php:812 msgid "Permission denied. Access to this item may be restricted." msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt." -#: ../../mod/photos.php:784 +#: ../../mod/photos.php:814 msgid "Photo not available" msgstr "Foto niet aanwezig" -#: ../../mod/photos.php:844 +#: ../../mod/photos.php:874 msgid "Use as profile photo" msgstr "Als profielfoto gebruiken" -#: ../../mod/photos.php:868 +#: ../../mod/photos.php:898 msgid "View Full Size" msgstr "Volledige grootte weergeven" -#: ../../mod/photos.php:946 +#: ../../mod/photos.php:976 msgid "Edit photo" msgstr "Foto bewerken" -#: ../../mod/photos.php:948 +#: ../../mod/photos.php:978 msgid "Rotate CW (right)" msgstr "Draai met de klok mee (naar rechts)" -#: ../../mod/photos.php:949 +#: ../../mod/photos.php:979 msgid "Rotate CCW (left)" msgstr "Draai tegen de klok in (naar links)" -#: ../../mod/photos.php:952 +#: ../../mod/photos.php:982 msgid "New album name" msgstr "Nieuwe albumnaam" -#: ../../mod/photos.php:955 +#: ../../mod/photos.php:985 msgid "Caption" msgstr "Bijschrift" -#: ../../mod/photos.php:957 +#: ../../mod/photos.php:987 msgid "Add a Tag" msgstr "Label toevoegen" -#: ../../mod/photos.php:960 +#: ../../mod/photos.php:990 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@example.com, #Friesland, #camping" -#: ../../mod/photos.php:1113 +#: ../../mod/photos.php:1143 msgid "In This Photo:" msgstr "Op deze foto:" -#: ../../mod/photos.php:1188 +#: ../../mod/photos.php:1218 msgid "View Album" msgstr "Album weergeven" -#: ../../mod/photos.php:1197 +#: ../../mod/photos.php:1242 msgid "Recent Photos" msgstr "Recente foto's" @@ -6130,7 +6176,7 @@ msgid "Leave blank to import all public content" msgstr "Laat leeg om alle openbare inhoud te importeren" #: ../../mod/sources.php:103 ../../mod/sources.php:137 -#: ../../mod/new_channel.php:110 +#: ../../mod/new_channel.php:112 msgid "Channel Name" msgstr "Kanaalnaam" @@ -6158,77 +6204,77 @@ msgstr "Verwijderen bron mislukt." msgid "- select -" msgstr "- kies map -" -#: ../../mod/events.php:87 +#: ../../mod/events.php:91 msgid "Event title and start time are required." msgstr "Titel en begintijd van gebeurtenis zijn vereist." -#: ../../mod/events.php:101 +#: ../../mod/events.php:105 msgid "Event not found." msgstr "Gebeurtenis niet gevonden" -#: ../../mod/events.php:344 +#: ../../mod/events.php:369 msgid "l, F j" msgstr "l j F" -#: ../../mod/events.php:366 +#: ../../mod/events.php:391 msgid "Edit event" msgstr "Gebeurtenis bewerken" -#: ../../mod/events.php:412 +#: ../../mod/events.php:437 msgid "Create New Event" msgstr "Nieuwe gebeurtenis aanmaken" -#: ../../mod/events.php:413 +#: ../../mod/events.php:438 msgid "Previous" msgstr "Vorige" -#: ../../mod/events.php:487 +#: ../../mod/events.php:536 msgid "hour:minute" msgstr "uur:minuut" -#: ../../mod/events.php:507 +#: ../../mod/events.php:556 msgid "Event details" msgstr "Details van gebeurtenis" -#: ../../mod/events.php:508 +#: ../../mod/events.php:557 #, php-format msgid "Format is %s %s." msgstr "Volgorde is %s %s." -#: ../../mod/events.php:509 +#: ../../mod/events.php:558 msgid "Starting date and Title are required." msgstr "Begintijd en titel zijn vereist." -#: ../../mod/events.php:511 +#: ../../mod/events.php:562 msgid "Event Starts:" msgstr "Begin gebeurtenis:" -#: ../../mod/events.php:511 ../../mod/events.php:530 ../../mod/appman.php:91 +#: ../../mod/events.php:562 ../../mod/events.php:581 ../../mod/appman.php:91 #: ../../mod/appman.php:92 msgid "Required" msgstr "Vereist" -#: ../../mod/events.php:519 +#: ../../mod/events.php:570 msgid "Finish date/time is not known or not relevant" msgstr "Einddatum/-tijd is niet bekend of niet relevant" -#: ../../mod/events.php:521 +#: ../../mod/events.php:572 msgid "Event Finishes:" msgstr "Einde gebeurtenis:" -#: ../../mod/events.php:524 +#: ../../mod/events.php:575 msgid "Adjust for viewer timezone" msgstr "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt" -#: ../../mod/events.php:526 +#: ../../mod/events.php:577 msgid "Description:" msgstr "Omschrijving:" -#: ../../mod/events.php:530 +#: ../../mod/events.php:581 msgid "Title:" msgstr "Titel:" -#: ../../mod/events.php:532 +#: ../../mod/events.php:583 msgid "Share this event" msgstr "Deel deze gebeurtenis" @@ -6373,7 +6419,7 @@ msgstr "Kies een label om te verwijderen" msgid "Theme settings updated." msgstr "Thema-instellingen bijgewerkt." -#: ../../mod/admin.php:97 ../../mod/admin.php:412 +#: ../../mod/admin.php:97 ../../mod/admin.php:413 msgid "Site" msgstr "Hub-instellingen" @@ -6381,19 +6427,19 @@ msgstr "Hub-instellingen" msgid "Accounts" msgstr "Accounts" -#: ../../mod/admin.php:99 ../../mod/admin.php:855 +#: ../../mod/admin.php:99 ../../mod/admin.php:858 msgid "Channels" msgstr "Kanalen" -#: ../../mod/admin.php:100 ../../mod/admin.php:946 ../../mod/admin.php:988 +#: ../../mod/admin.php:100 ../../mod/admin.php:949 ../../mod/admin.php:991 msgid "Plugins" msgstr "Plug-ins" -#: ../../mod/admin.php:101 ../../mod/admin.php:1151 ../../mod/admin.php:1187 +#: ../../mod/admin.php:101 ../../mod/admin.php:1154 ../../mod/admin.php:1190 msgid "Themes" msgstr "Thema's" -#: ../../mod/admin.php:102 ../../mod/admin.php:513 +#: ../../mod/admin.php:102 ../../mod/admin.php:515 msgid "Server" msgstr "Hubbeheer" @@ -6405,7 +6451,7 @@ msgstr "Profielconfiguratie" msgid "DB updates" msgstr "Database-updates" -#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1274 +#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1277 msgid "Logs" msgstr "Logboeken" @@ -6421,10 +6467,10 @@ msgstr "Accountregistraties die op goedkeuring wachten" msgid "Message queues" msgstr "Berichtenwachtrij" -#: ../../mod/admin.php:211 ../../mod/admin.php:411 ../../mod/admin.php:512 -#: ../../mod/admin.php:719 ../../mod/admin.php:854 ../../mod/admin.php:945 -#: ../../mod/admin.php:987 ../../mod/admin.php:1150 ../../mod/admin.php:1186 -#: ../../mod/admin.php:1273 +#: ../../mod/admin.php:211 ../../mod/admin.php:412 ../../mod/admin.php:514 +#: ../../mod/admin.php:721 ../../mod/admin.php:857 ../../mod/admin.php:948 +#: ../../mod/admin.php:990 ../../mod/admin.php:1153 ../../mod/admin.php:1189 +#: ../../mod/admin.php:1276 msgid "Administration" msgstr "Beheer" @@ -6436,7 +6482,7 @@ msgstr "Samenvatting" msgid "Registered users" msgstr "Geregistreerde gebruikers" -#: ../../mod/admin.php:216 ../../mod/admin.php:516 +#: ../../mod/admin.php:216 ../../mod/admin.php:518 msgid "Pending registrations" msgstr "Accounts die op goedkeuring wachten" @@ -6444,571 +6490,572 @@ msgstr "Accounts die op goedkeuring wachten" msgid "Version" msgstr "Versie" -#: ../../mod/admin.php:219 ../../mod/admin.php:517 +#: ../../mod/admin.php:219 ../../mod/admin.php:519 msgid "Active plugins" msgstr "Ingeschakelde plug-ins" -#: ../../mod/admin.php:332 +#: ../../mod/admin.php:333 msgid "Site settings updated." msgstr "Hub-instellingen bijgewerkt." -#: ../../mod/admin.php:363 +#: ../../mod/admin.php:364 msgid "No special theme for accessibility" msgstr "Geen speciaal thema voor universele toegang" -#: ../../mod/admin.php:392 +#: ../../mod/admin.php:393 msgid "Yes - with approval" msgstr "Ja - met goedkeuring" -#: ../../mod/admin.php:398 +#: ../../mod/admin.php:399 msgid "My site is not a public server" msgstr "Mijn RedMatrix-hub is niet openbaar" -#: ../../mod/admin.php:399 +#: ../../mod/admin.php:400 msgid "My site has paid access only" msgstr "Mijn RedMatrix-hub kent alleen betaalde toegang" -#: ../../mod/admin.php:400 +#: ../../mod/admin.php:401 msgid "My site has free access only" msgstr "Mijn RedMatrix-hub kent alleen gratis toegang" -#: ../../mod/admin.php:401 +#: ../../mod/admin.php:402 msgid "My site offers free accounts with optional paid upgrades" msgstr "Mijn RedMatrix-hub biedt gratis accounts aan met betaalde uitbreidingen als optie" -#: ../../mod/admin.php:415 +#: ../../mod/admin.php:416 msgid "File upload" msgstr "Bestand uploaden" -#: ../../mod/admin.php:416 +#: ../../mod/admin.php:417 msgid "Policies" msgstr "Beleid" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:422 msgid "Site name" msgstr "Naam van deze RedMatrix-hub" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:423 msgid "Banner/Logo" msgstr "Banner/logo" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:424 msgid "Administrator Information" msgstr "Informatie over de beheerder van deze hub" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:424 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden." -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:425 msgid "System language" msgstr "Standaardtaal" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:426 msgid "System theme" msgstr "Standaardthema" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:426 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Standaardthema voor RedMatrix-hub (kan door gebruiker veranderd worden) - verander thema-instellingen" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:427 msgid "Mobile system theme" msgstr "Standaardthema voor mobiel" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:427 msgid "Theme for mobile devices" msgstr "Thema voor mobiele apparaten" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:428 msgid "Accessibility system theme" msgstr "Standaardthema voor universele toegang" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:428 msgid "Accessibility theme" msgstr "Thema voor universele toegang" -#: ../../mod/admin.php:428 -msgid "Channel to use for this website's static pages" -msgstr "Kanaal die op deze hub als statische pagina op de homepage gebruikt moet worden" - -#: ../../mod/admin.php:428 -msgid "Site Channel" -msgstr "Kanaal op deze RedMatrix-hub" - -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:430 msgid "Enable Diaspora Protocol" msgstr "Diaspora-protocol inschakelen" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:430 msgid "Communicate with Diaspora and Friendica - experimental" msgstr "Communiceer met Diaspora en Friendica (experimenteel)" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:431 msgid "Allow Feeds as Connections" msgstr "Sta feeds toe als connecties" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:431 msgid "(Heavy system resource usage)" msgstr "(sterk negatieve invloed op systeembronnen hub)" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:432 msgid "Maximum image size" msgstr "Maximale grootte van afbeeldingen" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:432 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend." -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:433 msgid "Does this site allow new member registration?" msgstr "Staat deze hub registratie van nieuwe accounts toe?" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:434 msgid "Which best describes the types of account offered by this hub?" msgstr "Wat voor soort accounts biedt deze RedMatrix-hub aan? Kies wat het meest in de buurt komt." -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:435 msgid "Register text" msgstr "Registratietekst" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:435 msgid "Will be displayed prominently on the registration page." msgstr "Wordt prominent op de registratiepagina getoond." -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:436 msgid "Accounts abandoned after x days" msgstr "Accounts als verlaten beschouwen na zoveel aantal dagen:" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:436 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet." -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:437 msgid "Allowed friend domains" msgstr "Toegestane domeinen" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:437 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze RedMatrix-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:438 msgid "Allowed email domains" msgstr "Toegestane e-maildomeinen" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:438 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "Door komma's gescheiden lijst met e-maildomeinen die op deze hub mogen registeren. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:439 msgid "Block public" msgstr "Openbare toegang blokkeren" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:439 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor ingelogde gebruikers." -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:440 +msgid "Verify Email Addresses" +msgstr "E-mailadres verifieren" + +#: ../../mod/admin.php:440 +msgid "" +"Check to verify email addresses used in account registration (recommended)." +msgstr "Inschakelen om e-mailadressen te verifiëren die tijdens de accountregistratie worden gebruikt (aanbevolen)." + +#: ../../mod/admin.php:441 msgid "Force publish" msgstr "Dwing kanaalvermelding af" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:441 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld." -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:442 msgid "Disable discovery tab" msgstr "Ontdekkingstab" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:442 msgid "" "Remove the tab in the network view with public content pulled from sources " "chosen for this site." msgstr "Verwijder de tab in de matrix-weergave waarin zich een selectie aan openbare berichten bevindt, die automatisch voor deze hub zijn uitgekozen." -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:443 msgid "No login on Homepage" msgstr "Geen inlogformulier op de homepage" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:443 msgid "" "Check to hide the login form from your sites homepage when visitors arrive " "who are not logged in (e.g. when you put the content of the homepage in via " "the site channel)." msgstr "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde gebruikers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze RedMatrix-hub als homepage gebruikt)" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:445 msgid "Proxy user" msgstr "Proxy-gebruiker" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:446 msgid "Proxy URL" msgstr "Proxy-URL" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:447 msgid "Network timeout" msgstr "Netwerktimeout" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:447 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:448 msgid "Delivery interval" msgstr "Afleveringsinterval" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:448 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers." -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:449 msgid "Poll interval" msgstr "Poll-interval" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:449 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken." -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:450 msgid "Maximum Load Average" msgstr "Maximaal gemiddelde systeembelasting" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:450 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50." -#: ../../mod/admin.php:504 +#: ../../mod/admin.php:506 msgid "No server found" msgstr "Geen hub gevonden" -#: ../../mod/admin.php:511 ../../mod/admin.php:733 +#: ../../mod/admin.php:513 ../../mod/admin.php:735 msgid "ID" msgstr "ID" -#: ../../mod/admin.php:511 +#: ../../mod/admin.php:513 msgid "for channel" msgstr "voor kanaal" -#: ../../mod/admin.php:511 +#: ../../mod/admin.php:513 msgid "on server" msgstr "op hub" -#: ../../mod/admin.php:511 +#: ../../mod/admin.php:513 msgid "Status" msgstr "Status" -#: ../../mod/admin.php:532 +#: ../../mod/admin.php:534 msgid "Update has been marked successful" msgstr "Update is als succesvol gemarkeerd" -#: ../../mod/admin.php:542 +#: ../../mod/admin.php:544 #, php-format msgid "Executing %s failed. Check system logs." msgstr "Uitvoeren van %s is mislukt. Controleer systeemlogboek." -#: ../../mod/admin.php:545 +#: ../../mod/admin.php:547 #, php-format msgid "Update %s was successfully applied." msgstr "Update %s was geslaagd." -#: ../../mod/admin.php:549 +#: ../../mod/admin.php:551 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is." -#: ../../mod/admin.php:552 +#: ../../mod/admin.php:554 #, php-format msgid "Update function %s could not be found." msgstr "Update-functie %s kon niet gevonden worden." -#: ../../mod/admin.php:567 +#: ../../mod/admin.php:569 msgid "No failed updates." msgstr "Geen mislukte updates." -#: ../../mod/admin.php:571 +#: ../../mod/admin.php:573 msgid "Failed Updates" msgstr "Mislukte updates" -#: ../../mod/admin.php:573 +#: ../../mod/admin.php:575 msgid "Mark success (if update was manually applied)" msgstr "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)" -#: ../../mod/admin.php:574 +#: ../../mod/admin.php:576 msgid "Attempt to execute this update step automatically" msgstr "Poging om deze stap van de update automatisch uit te voeren." -#: ../../mod/admin.php:600 +#: ../../mod/admin.php:602 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "%s account geblokkeerd/gedeblokkeerd" msgstr[1] "%s accounts geblokkeerd/gedeblokkeerd" -#: ../../mod/admin.php:607 +#: ../../mod/admin.php:609 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s account verwijderd" msgstr[1] "%s accounts verwijderd" -#: ../../mod/admin.php:636 +#: ../../mod/admin.php:638 msgid "Account not found" msgstr "Account niet gevonden" -#: ../../mod/admin.php:656 +#: ../../mod/admin.php:658 #, php-format msgid "User '%s' unblocked" msgstr "Account '%s' gedeblokkeerd" -#: ../../mod/admin.php:656 +#: ../../mod/admin.php:658 #, php-format msgid "User '%s' blocked" msgstr "Gebruiker '%s' geblokkeerd" -#: ../../mod/admin.php:720 ../../mod/admin.php:732 +#: ../../mod/admin.php:722 ../../mod/admin.php:734 msgid "Users" msgstr "Accounts" -#: ../../mod/admin.php:722 ../../mod/admin.php:857 +#: ../../mod/admin.php:724 ../../mod/admin.php:860 msgid "select all" msgstr "alles selecteren" -#: ../../mod/admin.php:723 +#: ../../mod/admin.php:725 msgid "User registrations waiting for confirm" msgstr "Accounts die op goedkeuring wachten" -#: ../../mod/admin.php:724 +#: ../../mod/admin.php:726 msgid "Request date" msgstr "Tijd/datum verzoek" -#: ../../mod/admin.php:725 +#: ../../mod/admin.php:727 msgid "No registrations." msgstr "Geen verzoeken." -#: ../../mod/admin.php:726 +#: ../../mod/admin.php:728 msgid "Approve" msgstr "Goedkeuren" -#: ../../mod/admin.php:727 +#: ../../mod/admin.php:729 msgid "Deny" msgstr "Afkeuren" -#: ../../mod/admin.php:733 +#: ../../mod/admin.php:735 msgid "Register date" msgstr "Geregistreerd" -#: ../../mod/admin.php:733 +#: ../../mod/admin.php:735 msgid "Last login" msgstr "Laatste keer ingelogd" -#: ../../mod/admin.php:733 +#: ../../mod/admin.php:735 msgid "Expires" msgstr "Verloopt" -#: ../../mod/admin.php:733 +#: ../../mod/admin.php:735 msgid "Service Class" msgstr "Abonnementen" -#: ../../mod/admin.php:735 +#: ../../mod/admin.php:737 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?" -#: ../../mod/admin.php:736 +#: ../../mod/admin.php:738 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../mod/admin.php:769 +#: ../../mod/admin.php:771 #, php-format msgid "%s channel censored/uncensored" -msgid_plural "%s channelss censored/uncensored" -msgstr[0] "%s kanalen gecensureerd/ongecensureerd" -msgstr[1] "%s kanaal gecensureerd/ongecensureerd" +msgid_plural "%s channels censored/uncensored" +msgstr[0] "%s kanaal gecensureerd/ongecensureerd" +msgstr[1] "%s kanalen gecensureerd/ongecensureerd" -#: ../../mod/admin.php:776 +#: ../../mod/admin.php:778 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "%s kanaal verwijderd" msgstr[1] "%s kanalen verwijderd" -#: ../../mod/admin.php:795 +#: ../../mod/admin.php:797 msgid "Channel not found" msgstr "Kanaal niet gevonden" -#: ../../mod/admin.php:806 +#: ../../mod/admin.php:808 #, php-format msgid "Channel '%s' deleted" msgstr "Kanaal '%s' verwijderd" -#: ../../mod/admin.php:816 +#: ../../mod/admin.php:819 #, php-format msgid "Channel '%s' uncensored" msgstr "Kanaal '%s' ongecensureerd" -#: ../../mod/admin.php:816 +#: ../../mod/admin.php:819 #, php-format msgid "Channel '%s' censored" msgstr "Kanaal '%s' gecensureerd" -#: ../../mod/admin.php:859 +#: ../../mod/admin.php:862 msgid "Censor" msgstr "Censureren" -#: ../../mod/admin.php:860 +#: ../../mod/admin.php:863 msgid "Uncensor" msgstr "Niet censureren" -#: ../../mod/admin.php:863 +#: ../../mod/admin.php:866 msgid "UID" msgstr "UID" -#: ../../mod/admin.php:865 +#: ../../mod/admin.php:868 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../mod/admin.php:866 +#: ../../mod/admin.php:869 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../mod/admin.php:905 +#: ../../mod/admin.php:908 #, php-format msgid "Plugin %s disabled." msgstr "Plug-in %s uitgeschakeld." -#: ../../mod/admin.php:909 +#: ../../mod/admin.php:912 #, php-format msgid "Plugin %s enabled." msgstr "Plug-in %s ingeschakeld" -#: ../../mod/admin.php:919 ../../mod/admin.php:1121 +#: ../../mod/admin.php:922 ../../mod/admin.php:1124 msgid "Disable" msgstr "Uitschakelen" -#: ../../mod/admin.php:921 ../../mod/admin.php:1123 +#: ../../mod/admin.php:924 ../../mod/admin.php:1126 msgid "Enable" msgstr "Inschakelen" -#: ../../mod/admin.php:947 ../../mod/admin.php:1152 +#: ../../mod/admin.php:950 ../../mod/admin.php:1155 msgid "Toggle" msgstr "Omschakelen" -#: ../../mod/admin.php:955 ../../mod/admin.php:1162 +#: ../../mod/admin.php:958 ../../mod/admin.php:1165 msgid "Author: " msgstr "Auteur: " -#: ../../mod/admin.php:956 ../../mod/admin.php:1163 +#: ../../mod/admin.php:959 ../../mod/admin.php:1166 msgid "Maintainer: " msgstr "Beheerder: " -#: ../../mod/admin.php:1085 +#: ../../mod/admin.php:1088 msgid "No themes found." msgstr "Geen thema's gevonden" -#: ../../mod/admin.php:1144 +#: ../../mod/admin.php:1147 msgid "Screenshot" msgstr "Schermafdruk" -#: ../../mod/admin.php:1192 +#: ../../mod/admin.php:1195 msgid "[Experimental]" msgstr "[Experimenteel]" -#: ../../mod/admin.php:1193 +#: ../../mod/admin.php:1196 msgid "[Unsupported]" msgstr "[Niet ondersteund]" -#: ../../mod/admin.php:1220 +#: ../../mod/admin.php:1223 msgid "Log settings updated." msgstr "Logboek-instellingen bijgewerkt." -#: ../../mod/admin.php:1276 +#: ../../mod/admin.php:1279 msgid "Clear" msgstr "Leegmaken" -#: ../../mod/admin.php:1282 +#: ../../mod/admin.php:1285 msgid "Debugging" msgstr "Debuggen" -#: ../../mod/admin.php:1283 +#: ../../mod/admin.php:1286 msgid "Log file" msgstr "Logbestand" -#: ../../mod/admin.php:1283 +#: ../../mod/admin.php:1286 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je RedMatrix-installatie." -#: ../../mod/admin.php:1284 +#: ../../mod/admin.php:1287 msgid "Log level" msgstr "Logniveau" -#: ../../mod/admin.php:1331 +#: ../../mod/admin.php:1334 msgid "New Profile Field" msgstr "Nieuw profielveld" -#: ../../mod/admin.php:1332 ../../mod/admin.php:1353 +#: ../../mod/admin.php:1335 ../../mod/admin.php:1356 msgid "Field nickname" msgstr "Bijnaam voor veld" -#: ../../mod/admin.php:1332 ../../mod/admin.php:1353 +#: ../../mod/admin.php:1335 ../../mod/admin.php:1356 msgid "System name of field" msgstr "Systeemnaam voor veld" -#: ../../mod/admin.php:1333 ../../mod/admin.php:1354 +#: ../../mod/admin.php:1336 ../../mod/admin.php:1357 msgid "Input type" msgstr "Invoertype" -#: ../../mod/admin.php:1334 ../../mod/admin.php:1355 +#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 msgid "Field Name" msgstr "Veldnaam" -#: ../../mod/admin.php:1334 ../../mod/admin.php:1355 +#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 msgid "Label on profile pages" msgstr "Tekstlabel voor op profielpagina's" -#: ../../mod/admin.php:1335 ../../mod/admin.php:1356 +#: ../../mod/admin.php:1338 ../../mod/admin.php:1359 msgid "Help text" msgstr "Helptekst" -#: ../../mod/admin.php:1335 ../../mod/admin.php:1356 +#: ../../mod/admin.php:1338 ../../mod/admin.php:1359 msgid "Additional info (optional)" msgstr "Extra informatie (optioneel)" -#: ../../mod/admin.php:1346 +#: ../../mod/admin.php:1349 msgid "Field definition not found" msgstr "Velddefinitie niet gevonden" -#: ../../mod/admin.php:1352 +#: ../../mod/admin.php:1355 msgid "Edit Profile Field" msgstr "Profielveld bewerken" @@ -7069,44 +7116,49 @@ msgstr "URL van foto van ding (optioneel)" msgid "Add Thing to your Profile" msgstr "Ding aan je profiel toevoegen" -#: ../../mod/import.php:36 +#: ../../mod/import.php:25 +#, php-format +msgid "Your service plan only allows %d channels." +msgstr "Jouw abonnement staat maar %d kanalen toe." + +#: ../../mod/import.php:51 msgid "Nothing to import." msgstr "Niets gevonden om te importeren" -#: ../../mod/import.php:58 +#: ../../mod/import.php:73 msgid "Unable to download data from old server" msgstr "Niet in staat om gegevens van de oude hub te downloaden" -#: ../../mod/import.php:64 +#: ../../mod/import.php:79 msgid "Imported file is empty." msgstr "Geïmporteerde bestand is leeg" -#: ../../mod/import.php:88 +#: ../../mod/import.php:103 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt." -#: ../../mod/import.php:106 +#: ../../mod/import.php:121 msgid "Channel clone failed. Import failed." msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt." -#: ../../mod/import.php:116 +#: ../../mod/import.php:131 msgid "Cloned channel not found. Import failed." msgstr "Gekloond kanaal niet gevonden. Importeren mislukt." -#: ../../mod/import.php:365 +#: ../../mod/import.php:394 msgid "Import completed." msgstr "Import voltooid." -#: ../../mod/import.php:378 +#: ../../mod/import.php:406 msgid "You must be logged in to use this feature." msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken." -#: ../../mod/import.php:383 +#: ../../mod/import.php:411 msgid "Import Channel" msgstr "Kanaal importeren" -#: ../../mod/import.php:384 +#: ../../mod/import.php:412 msgid "" "Use this form to import an existing channel from a different server/hub. You" " may retrieve the channel identity from the old server/hub via the network " @@ -7114,27 +7166,27 @@ msgid "" "be imported. Importation of content is not yet available." msgstr "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken. Alleen de identiteit en de connecties zullen geïmporteerd worden. Het importeren van inhoud is nog niet beschikbaar." -#: ../../mod/import.php:385 +#: ../../mod/import.php:413 msgid "File to Upload" msgstr "Bestand om te uploaden" -#: ../../mod/import.php:386 +#: ../../mod/import.php:414 msgid "Or provide the old server/hub details" msgstr "Of vul de gegevens van de oude hub in" -#: ../../mod/import.php:387 +#: ../../mod/import.php:415 msgid "Your old identity address (xyz@example.com)" msgstr "Jouw oude kanaaladres (xyz@example.com)" -#: ../../mod/import.php:388 +#: ../../mod/import.php:416 msgid "Your old login email address" msgstr "Het e-mailadres van je oude account" -#: ../../mod/import.php:389 +#: ../../mod/import.php:417 msgid "Your old login password" msgstr "Wachtwoord van jouw oude account" -#: ../../mod/import.php:390 +#: ../../mod/import.php:418 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be" @@ -7142,7 +7194,7 @@ msgid "" "primary location for files, photos, and media." msgstr "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen." -#: ../../mod/import.php:391 +#: ../../mod/import.php:419 msgid "Make this hub my primary location" msgstr "Stel deze hub als mijn primaire locatie in" @@ -7337,7 +7389,7 @@ msgid "" "Password reset failed." msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt." -#: ../../mod/lostpass.php:85 ../../boot.php:1504 +#: ../../mod/lostpass.php:85 ../../boot.php:1506 msgid "Password Reset" msgstr "Wachtwoord vergeten?" @@ -7617,11 +7669,11 @@ msgstr "Geen berichten" msgid "D, d M Y - g:i A" msgstr "D, j M Y - G:i" -#: ../../mod/new_channel.php:107 +#: ../../mod/new_channel.php:109 msgid "Add a Channel" msgstr "Kanaal toevoegen" -#: ../../mod/new_channel.php:108 +#: ../../mod/new_channel.php:110 msgid "" "A channel is your own collection of related web pages. A channel can be used" " to hold social network profiles, blogs, conversation groups and forums, " @@ -7629,24 +7681,43 @@ msgid "" "service provider allows." msgstr "Een kanaal is jouw eigen verzameling gerelateerde webpagina's. Een kanaal kan gebruikt worden voor een sociaal netwerk, weblog, discussiegroep of forum, een pagina over een beroemdheid, en voor veel meer. Je kan net zoveel kanalen aanmaken als dat de eigenaar/beheerder van jouw hub toestaat." -#: ../../mod/new_channel.php:111 +#: ../../mod/new_channel.php:113 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" " msgstr "Voorbeelden: \"Bruce Springsteen\", \"Familiefoto's\", \"Voetbal\", \"Astronomie\"" -#: ../../mod/new_channel.php:112 +#: ../../mod/new_channel.php:114 msgid "Choose a short nickname" msgstr "Kies een korte bijnaam" -#: ../../mod/new_channel.php:113 +#: ../../mod/new_channel.php:115 msgid "" "Your nickname will be used to create an easily remembered channel address " "(like an email address) which you can share with others." msgstr "Jouw bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres (zoals een e-mailadres) aan te maken, die je dan kan delen met anderen." -#: ../../mod/new_channel.php:114 +#: ../../mod/new_channel.php:116 msgid "Or import an existing channel from another location" msgstr "Of importeer een bestaand kanaal vanaf een andere locatie." +#: ../../mod/new_channel.php:118 +msgid "Channel Type" +msgstr "Kanaaltype" + +#: ../../mod/new_channel.php:119 +msgid "" +"Please choose a channel type (such as social networking or community forum) " +"and privacy requirements so we can select the best permissions for you" +msgstr "Kies een kanaaltype (zoals voor een sociaal netwerk of groepsforum) en een privacybehoefte, zodat wij voor jou de beste permissies kunnen kiezen" + +#: ../../mod/home.php:46 +msgid "Red Matrix - "The Network"" +msgstr "RedMatrix - "The Network"" + +#: ../../mod/home.php:101 +#, php-format +msgid "Welcome to %s" +msgstr "Welkom op %s" + #: ../../mod/notifications.php:26 msgid "Invalid request identifier." msgstr "Ongeldige verzoek identificator (request identifier)" @@ -7763,6 +7834,10 @@ msgid "" "removed from the network" msgstr "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het RedMatrix-netwerk verwijderd." +#: ../../mod/service_limits.php:19 +msgid "No service class restrictions found." +msgstr "Geen abonnementsbeperkingen gevonden." + #: ../../view/theme/apw/php/config.php:202 #: ../../view/theme/apw/php/config.php:236 msgid "Schema Default" @@ -8048,41 +8123,41 @@ msgstr "Rommelig vormgegeven fotoalbums" msgid "Are you a clean desk or a messy desk person?" msgstr "Ben je iemand die van een opgeruimd bureau houdt of van een rommelig bureau?" -#: ../../boot.php:1292 +#: ../../boot.php:1294 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s mislukt. Zie foutenlogboek." -#: ../../boot.php:1295 +#: ../../boot.php:1297 #, php-format msgid "Update Error at %s" msgstr "Update-fout op %s" -#: ../../boot.php:1469 +#: ../../boot.php:1471 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van de RedMatrix" -#: ../../boot.php:1497 +#: ../../boot.php:1499 msgid "Password" msgstr "Wachtwoord" -#: ../../boot.php:1498 +#: ../../boot.php:1500 msgid "Remember me" msgstr "Aangemeld blijven" -#: ../../boot.php:1503 +#: ../../boot.php:1505 msgid "Forgot your password?" msgstr "Wachtwoord vergeten?" -#: ../../boot.php:1568 +#: ../../boot.php:1570 msgid "permission denied" msgstr "toegang geweigerd" -#: ../../boot.php:1569 +#: ../../boot.php:1571 msgid "Got Zot?" msgstr "Heb je Zot?" -#: ../../boot.php:1999 +#: ../../boot.php:2001 msgid "toggle mobile" msgstr "mobiele weergave omschakelen" diff --git a/view/nl/strings.php b/view/nl/strings.php index 2bdebe21a..41da23582 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -68,7 +68,7 @@ $a->strings["Upload New Photos"] = "Nieuwe foto's uploaden"; $a->strings["Visible to your default audience"] = "Voor iedereen zichtbaar, zoals dit van te voren is ingesteld"; $a->strings["Show"] = "Tonen"; $a->strings["Don't show"] = "Niet tonen"; -$a->strings["Permissions"] = "Privacy-rechten"; +$a->strings["Permissions"] = "Permissies"; $a->strings["Close"] = "Sluiten"; $a->strings[" and "] = " en "; $a->strings["public profile"] = "openbaar profiel"; @@ -90,11 +90,6 @@ $a->strings["duplicate filename or path"] = "dubbele bestandsnaam of pad"; $a->strings["Path not found."] = "Pad niet gevonden"; $a->strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt."; $a->strings["database storage failed."] = "opslag in database mislukt."; -$a->strings["Attachments:"] = "Bijlagen:"; -$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i"; -$a->strings["Starts:"] = "Start:"; -$a->strings["Finishes:"] = "Einde:"; -$a->strings["Location:"] = "Plaats:"; $a->strings["Logout"] = "Uitloggen"; $a->strings["End this session"] = "Beëindig deze sessie"; $a->strings["Home"] = "Home"; @@ -285,6 +280,10 @@ $a->strings["%d connection in common"] = array( 1 => "%d gemeenschappelijke connecties", ); $a->strings["show more"] = "meer connecties weergeven"; +$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i"; +$a->strings["Starts:"] = "Start:"; +$a->strings["Finishes:"] = "Einde:"; +$a->strings["Location:"] = "Plaats:"; $a->strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd."; $a->strings["Not a valid email address"] = "Geen geldig e-mailadres"; $a->strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze RedMatrix-hub niet toegestaan"; @@ -332,6 +331,7 @@ $a->strings["Newest to Oldest"] = "Nieuw naar oud"; $a->strings["Enable Safe Search"] = "Veilig zoeken inschakelen"; $a->strings["Disable Safe Search"] = "Veilig zoeken uitschakelen"; $a->strings["Safe Mode"] = "Veilig zoeken"; +$a->strings["Attachments:"] = "Bijlagen:"; $a->strings["Red Matrix Notification"] = "RedMatrix-notificatie"; $a->strings["redmatrix"] = "RedMatrix"; $a->strings["Thank You,"] = "Bedankt,"; @@ -461,8 +461,8 @@ $a->strings["Clear browser location"] = "Locatie van webbrowser wissen"; $a->strings["clear location"] = "locatie wissen"; $a->strings["Set title"] = "Titel instellen"; $a->strings["Categories (comma-separated list)"] = "Categorieën (door komma's gescheiden lijst)"; -$a->strings["Permission settings"] = "Privacy-rechten"; -$a->strings["permissions"] = "privacy-rechten"; +$a->strings["Permission settings"] = "Permissies"; +$a->strings["permissions"] = "permissies"; $a->strings["Public post"] = "Openbaar bericht"; $a->strings["Example: bob@example.com, mary@example.com"] = "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"; $a->strings["Set expiration date"] = "Verloopdatum instellen"; @@ -682,7 +682,8 @@ $a->strings["Feature settings"] = "Plug-ins"; $a->strings["Display settings"] = "Weergave"; $a->strings["Connected apps"] = "Verbonden applicaties"; $a->strings["Export channel"] = "Kanaal exporteren"; -$a->strings["Automatic Permissions (Advanced)"] = "Automatische privacy-rechten (geavanceerd)"; +$a->strings["Export content"] = "Exporteer gegevens"; +$a->strings["Automatic Permissions (Advanced)"] = "Automatische permissies (geavanceerd)"; $a->strings["Premium Channel Settings"] = "Instellingen premiumkanaal"; $a->strings["Check Mail"] = "Controleer op nieuwe berichten"; $a->strings["Chat Rooms"] = "Chatkanalen"; @@ -737,7 +738,7 @@ $a->strings["Passwords do not match"] = "Wachtwoorden komen niet overeen"; $a->strings["everybody"] = "iedereen"; $a->strings["Secret Passphrase"] = "Geheim wachtwoord"; $a->strings["Passphrase hint"] = "Wachtwoordhint"; -$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "Mededeling: de privacy-rechten zijn veranderd, maar zijn nog niet opgeslagen."; +$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "Mededeling: de permissies zijn veranderd, maar zijn nog niet opgeslagen."; $a->strings["close all"] = "Alles sluiten"; $a->strings["timeago.prefixAgo"] = "timeago.prefixAgo"; $a->strings["timeago.prefixFromNow"] = "timeago.prefixFromNow"; @@ -841,6 +842,14 @@ $a->strings["Can source my public posts in derived channels"] = "Kan mijn openba $a->strings["Somewhat advanced - very useful in open communities"] = "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)"; $a->strings["Can administer my channel resources"] = "Kan mijn kanaal beheren"; $a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet."; +$a->strings["Social Networking"] = "Sociaal netwerk"; +$a->strings["Mostly Public"] = "Grotendeels voor iedereen zichtbaar"; +$a->strings["Restricted"] = "Beperkt zichtbaar"; +$a->strings["Private"] = "Privé"; +$a->strings["Community Forum"] = "Groepsforum"; +$a->strings["Feed Republish"] = "Feed herpubliceren"; +$a->strings["Celebrity/Soapbox"] = "Beroemdheid/alleen volgen"; +$a->strings["Custom/Expert Mode"] = "Aangepaste /expertmodus"; $a->strings["Set your current mood and tell your friends"] = "Noteer je huidige stemming en toon het aan je connecties"; $a->strings["Menu not found."] = "Menu niet gevonden."; $a->strings["Menu element updated."] = "Menu-onderdeel geüpdatet."; @@ -858,7 +867,7 @@ $a->strings["Add menu element"] = "Menu-element toevoegen"; $a->strings["Delete this menu item"] = "Dit menu-item verwijderen"; $a->strings["Edit this menu item"] = "Dit menu-item bewerken"; $a->strings["New Menu Element"] = "Nieuw menu-element"; -$a->strings["Menu Item Permissions"] = "Privacy-rechten menu-item"; +$a->strings["Menu Item Permissions"] = "Permissies menu-item"; $a->strings["(click to open/close)"] = "(klik om te openen/sluiten)"; $a->strings["Link text"] = "Linktekst"; $a->strings["URL of link"] = "URL of link"; @@ -926,6 +935,7 @@ $a->strings["Minimum of 10 seconds, no maximum"] = "Minimaal 10 seconde, geen ma $a->strings["Maximum number of conversations to load at any time:"] = "Maximaal aantal conversaties die per keer geladen worden:"; $a->strings["Maximum of 100 items"] = "Maximaal 100 conversaties"; $a->strings["Don't show emoticons"] = "Geen emoticons weergeven"; +$a->strings["Link post titles to source"] = "Berichtkoppen naar originele locatie linken"; $a->strings["System Page Layout Editor - (advanced)"] = "Lay-out bewerken van systeempagina's (geavanceerd)"; $a->strings["Nobody except yourself"] = "Niemand, behalve jezelf"; $a->strings["Only those you specifically allow"] = "Alleen connecties met uitdrukkelijke toestemming"; @@ -950,6 +960,7 @@ $a->strings["Use Browser Location:"] = "Locatie van webbrowser gebruiken:"; $a->strings["Adult Content"] = "Inhoud voor volwassenen"; $a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassen. (Gebruik de hashtag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)"; $a->strings["Security and Privacy Settings"] = "Veiligheids- privacy-instellingen"; +$a->strings["Your permissions are already configured. Click to view/adjust"] = "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen."; $a->strings["Hide my online presence"] = "Verberg mijn aanwezigheid"; $a->strings["Prevents displaying in your profile that you are online"] = "Voorkomt dat op je kanaal te zien valt dat je momenteel op de RedMatrix aanwezig bent"; $a->strings["Simple Privacy Settings:"] = "Eenvoudige privacy-instellingen:"; @@ -964,7 +975,7 @@ $a->strings["Expire other channel content after this many days"] = "Inhoud van a $a->strings["0 or blank prevents expiration"] = "0 of leeg voorkomt het verlopen"; $a->strings["Maximum Friend Requests/Day:"] = "Maximum aantal connectieverzoeken per dag:"; $a->strings["May reduce spam activity"] = "Kan eventuele spam verminderen"; -$a->strings["Default Post Permissions"] = "Standaard privacy-rechten voor nieuwe berichten"; +$a->strings["Default Post Permissions"] = "Standaard permissies voor nieuwe berichten"; $a->strings["Maximum private messages per day from unknown people:"] = "Maximum aantal privé-berichten per dag van onbekende personen:"; $a->strings["Useful to reduce spamming"] = "Kan eventuele spam verminderen"; $a->strings["Notification Settings"] = "Notificatie-instellingen"; @@ -1100,7 +1111,7 @@ $a->strings["Site URL"] = "URL hub"; $a->strings["Access Type"] = "Toegangstype"; $a->strings["Registration Policy"] = "Registratiebeleid"; $a->strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken."; -$a->strings["Insufficient permissions. Request redirected to profile page."] = "Onvoldoende privacy-rechten. Doorgestuurd naar profielpagina."; +$a->strings["Insufficient permissions. Request redirected to profile page."] = "Onvoldoende permissies. Doorgestuurd naar profielpagina."; $a->strings["Select a bookmark folder"] = "Kies een bladwijzermap"; $a->strings["Save Bookmark"] = "Bladwijzer opslaan"; $a->strings["URL of bookmark"] = "URL van bladwijzer"; @@ -1188,7 +1199,7 @@ $a->strings["Only show ignored connections"] = "Toon alleen genegeerde connectie $a->strings["Only show archived connections"] = "Toon alleen gearchiveerde connecties"; $a->strings["Only show hidden connections"] = "Toon alleen verborgen connecties"; $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]"; -$a->strings["Edit contact"] = "Connectie bewerken"; +$a->strings["Edit connection"] = "Connectie bewerken"; $a->strings["Search your connections"] = "Doorzoek jouw connecties"; $a->strings["Finding: "] = "Zoeken naar: "; $a->strings["Edit post"] = "Bericht bewerken"; @@ -1208,8 +1219,8 @@ $a->strings["Channel has been approved"] = "Connectie/kanaal is geaccepteerd"; $a->strings["Channel has been unapproved"] = "Connectie/kanaal is afgewezen"; $a->strings["Connection has been removed."] = "Connectie is verwijderd"; $a->strings["View %s's profile"] = "Profiel van %s weergeven"; -$a->strings["Refresh Permissions"] = "Privacy-rechten vernieuwen"; -$a->strings["Fetch updated permissions"] = "Aangepaste privacy-rechten ophalen"; +$a->strings["Refresh Permissions"] = "Permissies vernieuwen"; +$a->strings["Fetch updated permissions"] = "Aangepaste permissies ophalen"; $a->strings["Recent Activity"] = "Recente activiteit"; $a->strings["View recent posts and comments"] = "Recente berichten en reacties weergeven"; $a->strings["Unblock"] = "Deblokkeren"; @@ -1227,12 +1238,12 @@ $a->strings["Hide or Unhide this connection"] = "Deze connectie verbergen of nie $a->strings["Delete this connection"] = "Deze connectie verwijderen"; $a->strings["Approve this connection"] = "Deze connectie accepteren"; $a->strings["Accept connection to allow communication"] = "Keur deze connectie goed om communicatie toe te staan"; -$a->strings["Automatic Permissions Settings"] = "Automatische privacy-rechten"; +$a->strings["Automatic Permissions Settings"] = "Automatische permissies"; $a->strings["Connections: settings for %s"] = "Connecties: instellingen voor %s"; -$a->strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = "Wanneer je een connectieverzoek voor een kanaal ontvangt, zullen alle privacy-rechten hier automatisch op de nieuwe connectie worden toegepast en het connectieverzoek worden geaccepteerd. Verlaat deze pagina wanneer je geen gebruik wil maken van deze functie."; +$a->strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = "Wanneer je een connectieverzoek voor een kanaal ontvangt, zullen alle permissies hier automatisch op de nieuwe connectie worden toegepast en het connectieverzoek worden geaccepteerd. Verlaat deze pagina wanneer je geen gebruik wil maken van deze functie."; $a->strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag"; $a->strings["inherited"] = "geërfd"; -$a->strings["Connection has no individual permissions!"] = "Connectie heeft geen individuele privacy-rechten!"; +$a->strings["Connection has no individual permissions!"] = "Connectie heeft geen individuele permissies!"; $a->strings["This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."] = "Dit is mogelijk voldoende, wanneer er naar jouw privacy-instellingen wordt gekeken. Hoewel je wellicht de geavanceerde rechten wil nagaan."; $a->strings["Profile Visibility"] = "Zichtbaarheid profiel"; $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."; @@ -1240,16 +1251,16 @@ $a->strings["Contact Information / Notes"] = "Informatie/aantekeningen over conn $a->strings["Edit contact notes"] = "Bewerk aantekeningen over contact"; $a->strings["Their Settings"] = "Hun instellingen"; $a->strings["My Settings"] = "Mijn instellingen"; -$a->strings["Clear/Disable Automatic Permissions"] = "Verwijderen/uitschakelen automatische privacy-rechten"; +$a->strings["Clear/Disable Automatic Permissions"] = "Verwijderen/uitschakelen automatische permissies"; $a->strings["Forum Members"] = "Forum/groepsleden"; $a->strings["Soapbox"] = "Zeepkist"; $a->strings["Full Sharing (typical social network permissions)"] = "Voluit delen (vergelijkbaar met die van sociale netwerken)"; $a->strings["Cautious Sharing "] = "Voorzichtig delen"; $a->strings["Follow Only"] = "Alleen volgen"; -$a->strings["Individual Permissions"] = "Individuele privacy-rechten"; -$a->strings["Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "Sommige privacy-rechten kunnen worden overgeërfd van de privacy-instellingen van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect."; -$a->strings["Advanced Permissions"] = "Geavanceerde privacy-rechten"; -$a->strings["Simple Permissions (select one and submit)"] = "Eenvoudige privacy-rechten (selecteer er één en opslaan)"; +$a->strings["Individual Permissions"] = "Individuele permissies"; +$a->strings["Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "Sommige permissies kunnen worden overgeërfd van de privacy-instellingen van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect."; +$a->strings["Advanced Permissions"] = "Geavanceerde permissies"; +$a->strings["Simple Permissions (select one and submit)"] = "Eenvoudige permissies (selecteer er één en opslaan)"; $a->strings["Visit %s's profile - %s"] = "Profiel van %s bezoeken - %s"; $a->strings["Block/Unblock contact"] = "Connectie blokkeren/deblokkeren"; $a->strings["Ignore contact"] = "Connectie negeren"; @@ -1277,6 +1288,8 @@ $a->strings["No entries."] = "Geen"; $a->strings["Public access denied."] = "Openbare toegang geweigerd."; $a->strings["Gender: "] = "Geslacht:"; $a->strings["Finding:"] = "Gezocht naar:"; +$a->strings["next page"] = "volgende pagina"; +$a->strings["previous page"] = "vorige pagina"; $a->strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn)."; $a->strings["Status: "] = "Status: "; $a->strings["Sexual Preference: "] = "Seksuele voorkeur: "; @@ -1285,8 +1298,6 @@ $a->strings["Hometown: "] = "Oorspronkelijk uit: "; $a->strings["About: "] = "Over: "; $a->strings["Keywords: "] = "Trefwoorden: "; $a->strings["This site is not a directory server"] = "Deze hub is geen kanalengidshub (directoryserver)"; -$a->strings["Red Matrix - "The Network""] = "RedMatrix - "The Network""; -$a->strings["Welcome to %s"] = "Welkom op %s"; $a->strings["Red Matrix Server - Setup"] = "RedMatrix Server - Setup"; $a->strings["Could not connect to database."] = "Could not connect to database."; $a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Could not connect to specified hub URL. Possible SSL certificate or DNS issue."; @@ -1534,8 +1545,6 @@ $a->strings["Mobile system theme"] = "Standaardthema voor mobiel"; $a->strings["Theme for mobile devices"] = "Thema voor mobiele apparaten"; $a->strings["Accessibility system theme"] = "Standaardthema voor universele toegang"; $a->strings["Accessibility theme"] = "Thema voor universele toegang"; -$a->strings["Channel to use for this website's static pages"] = "Kanaal die op deze hub als statische pagina op de homepage gebruikt moet worden"; -$a->strings["Site Channel"] = "Kanaal op deze RedMatrix-hub"; $a->strings["Enable Diaspora Protocol"] = "Diaspora-protocol inschakelen"; $a->strings["Communicate with Diaspora and Friendica - experimental"] = "Communiceer met Diaspora en Friendica (experimenteel)"; $a->strings["Allow Feeds as Connections"] = "Sta feeds toe als connecties"; @@ -1554,6 +1563,8 @@ $a->strings["Allowed email domains"] = "Toegestane e-maildomeinen"; $a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Door komma's gescheiden lijst met e-maildomeinen die op deze hub mogen registeren. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten."; $a->strings["Block public"] = "Openbare toegang blokkeren"; $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor ingelogde gebruikers."; +$a->strings["Verify Email Addresses"] = "E-mailadres verifieren"; +$a->strings["Check to verify email addresses used in account registration (recommended)."] = "Inschakelen om e-mailadressen te verifiëren die tijdens de accountregistratie worden gebruikt (aanbevolen)."; $a->strings["Force publish"] = "Dwing kanaalvermelding af"; $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld."; $a->strings["Disable discovery tab"] = "Ontdekkingstab"; @@ -1609,8 +1620,8 @@ $a->strings["Service Class"] = "Abonnementen"; $a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?"; $a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"; $a->strings["%s channel censored/uncensored"] = array( - 0 => "%s kanalen gecensureerd/ongecensureerd", - 1 => "%s kanaal gecensureerd/ongecensureerd", + 0 => "%s kanaal gecensureerd/ongecensureerd", + 1 => "%s kanalen gecensureerd/ongecensureerd", ); $a->strings["%s channel deleted"] = array( 0 => "%s kanaal verwijderd", @@ -1666,6 +1677,7 @@ $a->strings["Name of thing e.g. something"] = "Naam van ding"; $a->strings["URL of thing (optional)"] = "URL van ding (optioneel)"; $a->strings["URL for photo of thing (optional)"] = "URL van foto van ding (optioneel)"; $a->strings["Add Thing to your Profile"] = "Ding aan je profiel toevoegen"; +$a->strings["Your service plan only allows %d channels."] = "Jouw abonnement staat maar %d kanalen toe."; $a->strings["Nothing to import."] = "Niets gevonden om te importeren"; $a->strings["Unable to download data from old server"] = "Niet in staat om gegevens van de oude hub te downloaden"; $a->strings["Imported file is empty."] = "Geïmporteerde bestand is leeg"; @@ -1804,6 +1816,10 @@ $a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"A $a->strings["Choose a short nickname"] = "Kies een korte bijnaam"; $a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Jouw bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres (zoals een e-mailadres) aan te maken, die je dan kan delen met anderen."; $a->strings["Or import an existing channel from another location"] = "Of importeer een bestaand kanaal vanaf een andere locatie."; +$a->strings["Channel Type"] = "Kanaaltype"; +$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Kies een kanaaltype (zoals voor een sociaal netwerk of groepsforum) en een privacybehoefte, zodat wij voor jou de beste permissies kunnen kiezen"; +$a->strings["Red Matrix - "The Network""] = "RedMatrix - "The Network""; +$a->strings["Welcome to %s"] = "Welkom op %s"; $a->strings["Invalid request identifier."] = "Ongeldige verzoek identificator (request identifier)"; $a->strings["Discard"] = "Annuleren"; $a->strings["No more system notifications."] = "Geen systeemnotificaties meer."; @@ -1831,6 +1847,7 @@ $a->strings["Remove This Account"] = "Verwijder dit account"; $a->strings["This will completely remove this account including all its channels from the network. Once this has been done it is not recoverable."] = "Deze actie verwijderd dit account volledig, inclusief al zijn kanalen. Dit kan hierna op geen enkele manier ongedaan gemaakt worden."; $a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het RedMatrix-netwerk verwijderen"; $a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het RedMatrix-netwerk verwijderd."; +$a->strings["No service class restrictions found."] = "Geen abonnementsbeperkingen gevonden."; $a->strings["Schema Default"] = "Standaardschema"; $a->strings["Sans-Serif"] = "Schreefloos"; $a->strings["Monospace"] = "Monospace"; From de45f42f9f378b96928a788ca21d4b8e9cf06a56 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Fri, 19 Sep 2014 20:43:43 +0000 Subject: [PATCH 79/94] update nl.2 --- view/nl/messages.po | 14 +++++++------- view/nl/strings.php | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/view/nl/messages.po b/view/nl/messages.po index 006307ca3..b6dd92f9f 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-09-19 00:03-0700\n" -"PO-Revision-Date: 2014-09-19 15:51+0000\n" +"PO-Revision-Date: 2014-09-19 20:33+0000\n" "Last-Translator: jeroenpraat \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" @@ -339,7 +339,7 @@ msgstr "Nieuwe foto's uploaden" #: ../../include/acl_selectors.php:240 msgid "Visible to your default audience" -msgstr "Voor iedereen zichtbaar, zoals dit van te voren is ingesteld" +msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld" #: ../../include/acl_selectors.php:241 msgid "Show" @@ -2912,7 +2912,7 @@ msgstr "Kanaal exporteren" #: ../../include/widgets.php:485 msgid "Export content" -msgstr "Exporteer gegevens" +msgstr "Inhoud exporteren" #: ../../include/widgets.php:491 msgid "Automatic Permissions (Advanced)" @@ -3585,7 +3585,7 @@ msgstr "Sociaal netwerk" #: ../../include/permissions.php:734 ../../include/permissions.php:736 #: ../../include/permissions.php:738 ../../include/permissions.php:740 msgid "Mostly Public" -msgstr "Grotendeels voor iedereen zichtbaar" +msgstr "Vrijwel alles openbaar" #: ../../include/permissions.php:734 ../../include/permissions.php:736 #: ../../include/permissions.php:738 @@ -3594,7 +3594,7 @@ msgstr "Beperkt zichtbaar" #: ../../include/permissions.php:734 ../../include/permissions.php:736 msgid "Private" -msgstr "Privé" +msgstr "Verborgen kanaal" #: ../../include/permissions.php:735 msgid "Community Forum" @@ -3610,7 +3610,7 @@ msgstr "Beroemdheid/alleen volgen" #: ../../include/permissions.php:742 msgid "Custom/Expert Mode" -msgstr "Aangepaste /expertmodus" +msgstr "Expertmodus/handmatig aanpassen" #: ../../mod/mood.php:132 msgid "Set your current mood and tell your friends" @@ -7707,7 +7707,7 @@ msgstr "Kanaaltype" msgid "" "Please choose a channel type (such as social networking or community forum) " "and privacy requirements so we can select the best permissions for you" -msgstr "Kies een kanaaltype (zoals voor een sociaal netwerk of groepsforum) en een privacybehoefte, zodat wij voor jou de beste permissies kunnen kiezen" +msgstr "Kies een kanaaltype (bijv. een persoonlijk kanaal voor een sociaal netwerk of eentje voor een groepsforum) en jouw behoefte aan privacy, zodat wij voor jou de beste permissies kunnen kiezen." #: ../../mod/home.php:46 msgid "Red Matrix - "The Network"" diff --git a/view/nl/strings.php b/view/nl/strings.php index 41da23582..83eadca77 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -65,7 +65,7 @@ $a->strings["Unable to process image"] = "Afbeelding kan niet verwerkt worden"; $a->strings["Photo storage failed."] = "Foto kan niet worden opgeslagen"; $a->strings["Photo Albums"] = "Fotoalbums"; $a->strings["Upload New Photos"] = "Nieuwe foto's uploaden"; -$a->strings["Visible to your default audience"] = "Voor iedereen zichtbaar, zoals dit van te voren is ingesteld"; +$a->strings["Visible to your default audience"] = "Voor iedereen zichtbaar, mits niet anders ingesteld"; $a->strings["Show"] = "Tonen"; $a->strings["Don't show"] = "Niet tonen"; $a->strings["Permissions"] = "Permissies"; @@ -682,7 +682,7 @@ $a->strings["Feature settings"] = "Plug-ins"; $a->strings["Display settings"] = "Weergave"; $a->strings["Connected apps"] = "Verbonden applicaties"; $a->strings["Export channel"] = "Kanaal exporteren"; -$a->strings["Export content"] = "Exporteer gegevens"; +$a->strings["Export content"] = "Inhoud exporteren"; $a->strings["Automatic Permissions (Advanced)"] = "Automatische permissies (geavanceerd)"; $a->strings["Premium Channel Settings"] = "Instellingen premiumkanaal"; $a->strings["Check Mail"] = "Controleer op nieuwe berichten"; @@ -843,13 +843,13 @@ $a->strings["Somewhat advanced - very useful in open communities"] = "Enigszins $a->strings["Can administer my channel resources"] = "Kan mijn kanaal beheren"; $a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet."; $a->strings["Social Networking"] = "Sociaal netwerk"; -$a->strings["Mostly Public"] = "Grotendeels voor iedereen zichtbaar"; +$a->strings["Mostly Public"] = "Vrijwel alles openbaar"; $a->strings["Restricted"] = "Beperkt zichtbaar"; -$a->strings["Private"] = "Privé"; +$a->strings["Private"] = "Verborgen kanaal"; $a->strings["Community Forum"] = "Groepsforum"; $a->strings["Feed Republish"] = "Feed herpubliceren"; $a->strings["Celebrity/Soapbox"] = "Beroemdheid/alleen volgen"; -$a->strings["Custom/Expert Mode"] = "Aangepaste /expertmodus"; +$a->strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen"; $a->strings["Set your current mood and tell your friends"] = "Noteer je huidige stemming en toon het aan je connecties"; $a->strings["Menu not found."] = "Menu niet gevonden."; $a->strings["Menu element updated."] = "Menu-onderdeel geüpdatet."; @@ -1817,7 +1817,7 @@ $a->strings["Choose a short nickname"] = "Kies een korte bijnaam"; $a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Jouw bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres (zoals een e-mailadres) aan te maken, die je dan kan delen met anderen."; $a->strings["Or import an existing channel from another location"] = "Of importeer een bestaand kanaal vanaf een andere locatie."; $a->strings["Channel Type"] = "Kanaaltype"; -$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Kies een kanaaltype (zoals voor een sociaal netwerk of groepsforum) en een privacybehoefte, zodat wij voor jou de beste permissies kunnen kiezen"; +$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Kies een kanaaltype (bijv. een persoonlijk kanaal voor een sociaal netwerk of eentje voor een groepsforum) en jouw behoefte aan privacy, zodat wij voor jou de beste permissies kunnen kiezen."; $a->strings["Red Matrix - "The Network""] = "RedMatrix - "The Network""; $a->strings["Welcome to %s"] = "Welkom op %s"; $a->strings["Invalid request identifier."] = "Ongeldige verzoek identificator (request identifier)"; From 017726f06915e8c14e5f25b284ba2ae6f121acfc Mon Sep 17 00:00:00 2001 From: Jeroen Date: Fri, 19 Sep 2014 21:16:55 +0000 Subject: [PATCH 80/94] Another piece that didn't fit well in the dark schema. Hopefully this is the last. --- view/theme/redbasic/css/style.css | 7 +++++++ view/theme/redbasic/php/style.php | 32 ++++++++++++++++++++--------- view/theme/redbasic/schema/dark.php | 18 +++++++++++----- 3 files changed, 42 insertions(+), 15 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 380d6d49c..4e662f1db 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2435,6 +2435,13 @@ h5, h6 { text-decoration: none; } +.alert-info { + color: $alert_txtcolour; + background-color:$alert_bgcolour; + border-color: $alert_bordercol; + background-image: linear-gradient(to bottom, $alert_bgcolour 0px, $alert_gradientcol 100%); +} + .well { background-color: $advperm_bgcolour; border: 1px solid $advperm_bordercol; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index cd91fcee7..d6d77e961 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -250,16 +250,24 @@ if(! $a->install) { $reply_photo = '32px'; if(! $infomess_bgcolour) $infomess_bgcolour = "#F0F0F0"; - if(! $advperm_bgcolour) - $advperm_bgcolour = "#F5F5F5"; - if(! $advperm_bordercol) - $advperm_bordercol = "#E3E3E3"; - if(! $advperm_gradientcol) - $advperm_gradientcol = "#E8E8E8"; - if(! $cal_bgcolour) - $cal_bgcolour = "#FCF8E3"; - if(! $fancybox_bgcolour) - $fancybox_bgcolour = "#FFF"; + if(! $alert_txtcolour) + $alert_txtcolour = "#31708F"; + if(! $alert_bgcolour) + $alert_bgcolour = "#D9EDF7"; + if(! $alert_bordercol) + $alert_bordercol = "#BCE8F1"; + if(! $alert_gradientcol) + $alert_gradientcol = "#B9DEF0"; + if(! $advperm_bgcolour) + $advperm_bgcolour = "#F5F5F5"; + if(! $advperm_bordercol) + $advperm_bordercol = "#E3E3E3"; + if(! $advperm_gradientcol) + $advperm_gradientcol = "#E8E8E8"; + if(! $cal_bgcolour) + $cal_bgcolour = "#FCF8E3"; + if(! $fancybox_bgcolour) + $fancybox_bgcolour = "#FFF"; if (!$comment_padding) $comment_padding="0px"; if (!$comment_border_left) @@ -384,6 +392,10 @@ $options = array ( '$top_photo' => $top_photo, '$reply_photo' => $reply_photo, '$infomess_bgcolour' => $infomess_bgcolour, +'$alert_txtcolour' => $alert_txtcolour, +'$alert_bgcolour' => $alert_bgcolour, +'$alert_bordercol' => $alert_bordercol, +'$alert_gradientcol' => $alert_gradientcol, '$advperm_bgcolour' => $advperm_bgcolour, '$advperm_bordercol' => $advperm_bordercol, '$advperm_gradientcol' => $advperm_gradientcol, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index a4b43b31e..4114bf775 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -154,16 +154,24 @@ $abookself_bgcolour = "#251111"; if(! $infomess_bgcolour) $infomess_bgcolour = "#333"; + if(! $alert_txtcolour) + $alert_txtcolour = "#CCC"; + if(! $alert_bgcolour) + $alert_bgcolour = "#333"; + if(! $alert_bordercol) + $alert_bordercol = "#444"; + if(! $alert_gradientcol) + $alert_gradientcol = "#333"; if(! $advperm_bgcolour) - $advperm_bgcolour = "#1E1E1E"; + $advperm_bgcolour = "#222"; if(! $advperm_bordercol) - $advperm_bordercol = "#222"; + $advperm_bordercol = "#333"; if(! $advperm_gradientcol) - $advperm_gradientcol = "#111"; + $advperm_gradientcol = "#222"; if(! $cal_bgcolour) - $cal_bgcolour = "#333"; + $cal_bgcolour = "#333"; if(! $fancybox_bgcolour) - $fancybox_bgcolour = "#1E1E1E"; + $fancybox_bgcolour = "#1E1E1E"; if (!$admintable_hoverbgcol) $admintable_hoverbgcol="#222"; if (!$dirpopup_txtcol) From 6923557ecba57366fa0a9bb29424de0d47324589 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Fri, 19 Sep 2014 21:23:41 +0000 Subject: [PATCH 81/94] Bit tweaking --- view/theme/redbasic/schema/dark.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 4114bf775..27648f9fa 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -163,11 +163,11 @@ if(! $alert_gradientcol) $alert_gradientcol = "#333"; if(! $advperm_bgcolour) - $advperm_bgcolour = "#222"; + $advperm_bgcolour = "#1E1E1E"; if(! $advperm_bordercol) - $advperm_bordercol = "#333"; + $advperm_bordercol = "#222"; if(! $advperm_gradientcol) - $advperm_gradientcol = "#222"; + $advperm_gradientcol = "#1E1E1E"; if(! $cal_bgcolour) $cal_bgcolour = "#333"; if(! $fancybox_bgcolour) From cb434818f89435558f0ebfc2b5db589c3eb3c3ef Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 19 Sep 2014 16:50:43 -0700 Subject: [PATCH 82/94] closing tag --- include/permissions.php | 2 +- view/css/mod_new_channel.css | 36 ++++++++++++++++++------------------ view/tpl/new_channel.tpl | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/permissions.php b/include/permissions.php index e25052f95..438b807d0 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -747,7 +747,7 @@ function role_selector($current) { $selected = (($kk === $current) ? ' selected="selected" ' : ''); $o .= ''; } - $o .= ''; + $o .= ''; } $o .= ''; return $o; diff --git a/view/css/mod_new_channel.css b/view/css/mod_new_channel.css index fcef128e3..0fca88389 100644 --- a/view/css/mod_new_channel.css +++ b/view/css/mod_new_channel.css @@ -53,14 +53,14 @@ h2 { * Hide lists on page load ---------------------------------------------------------*/ -#privacy-role-select .SSContainerDivWrapper { +.stylish-select .SSContainerDivWrapper { left:-9999px; } /* * Red example ---------------------------------------------------------*/ -#privacy-role-select .SSContainerDivWrapper { +.stylish-select .SSContainerDivWrapper { margin:0; padding:0; width:290px; @@ -70,7 +70,7 @@ h2 { z-index:2; } -#privacy-role-select ul.newList { +.stylish-select ul.newList { margin:0; padding:0; list-style:none; @@ -80,20 +80,20 @@ h2 { overflow:auto; } -#privacy-role-select ul.newList * { +.stylish-select ul.newList * { margin:0; padding:0; } -#privacy-role-select ul.newList a { +.stylish-select ul.newList a { color: #000; text-decoration:none; display:block; padding:3px 8px; } -#privacy-role-select .newListSelected { +.stylish-select .newListSelected { width:285px; color:#000; height:19px; @@ -102,60 +102,60 @@ h2 { background:url(select-bg.png) no-repeat; } -#privacy-role-select ul.newList li a:focus { +.stylish-select ul.newList li a:focus { -moz-outline-style: none; } -#privacy-role-select .selectedTxt { +.stylish-select .selectedTxt { width:258px; overflow:hidden; height:16px; padding:0 23px 0 0; } -#privacy-role-select .hiLite { +.stylish-select .hiLite { background:#650101!important; color:#fff!important; } -#privacy-role-select .newListHover { +.stylish-select .newListHover { background:#ccc!important; color:#000!important; cursor:default; } -#privacy-role-select .newListDisabled { +.stylish-select .newListDisabled { opacity: 0.6; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; filter: alpha(opacity=60); } -#privacy-role-select .newListItemDisabled { +.stylish-select .newListItemDisabled { opacity: 0.6; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; filter: alpha(opacity=60); } -#privacy-role-select .newListOptionDisabled { +.stylish-select .newListOptionDisabled { opacity: 0.6; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; filter: alpha(opacity=60); } -#privacy-role-select .newListSelHover, -#privacy-role-select .newListSelFocus { +.stylish-select .newListSelHover, +.stylish-select .newListSelFocus { background-position:0 -22px; cursor:default; } -#privacy-role-select .newListOptionTitle { +.stylish-select .newListOptionTitle { font-weight:bold; } -#privacy-role-select .newListOptionTitle ul { +.stylish-select .newListOptionTitle ul { margin:3px 0 0; } -#privacy-role-select .newListOptionTitle li { +.stylish-select .newListOptionTitle li { font-weight:normal; } \ No newline at end of file diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index b28810236..ee07ce1df 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -1,6 +1,6 @@

          {{$title}}

          -
          +
          {{$desc}}
          From 1c564428182ea25892896109f6d8ec3f2a98b045 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 19 Sep 2014 23:35:16 -0700 Subject: [PATCH 83/94] Repeat after me - we always refer to our clientelle as 'members'. If your software calls you a "user" - get rid of it. --- doc/main.bb | 4 ++-- view/css/mod_new_channel.css | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/doc/main.bb b/doc/main.bb index 9baeeebda..06559c327 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -35,8 +35,8 @@ Zot is the great new communicaton protocol invented especially for the Red Matri [zrl=[baseurl]/help/nomadic-identity]Got Zot? Nomadic Identity, Channel Cloning And More[/zrl] [zrl=[baseurl]/help/diaspora_compat]Diaspora Communications Compatibility (Diaspora and Friendica)[/zrl] -[size=large][b]Frequently Asked Questions For Users[/b][/size] -[zrl=[baseurl]/help/faq_users]FAQ For Users[/zrl] +[size=large][b]Frequently Asked Questions For Members[/b][/size] +[zrl=[baseurl]/help/faq_users]FAQ For Members[/zrl] [size=large][b]For Hub Administrators[/b][/size] [zrl=[baseurl]/help/install]Install[/zrl] diff --git a/view/css/mod_new_channel.css b/view/css/mod_new_channel.css index 0fca88389..068f4f3a5 100644 --- a/view/css/mod_new_channel.css +++ b/view/css/mod_new_channel.css @@ -67,7 +67,13 @@ h2 { position:absolute; top:22px; left:0; - z-index:2; + z-index:9999; + font-size: 60%; + line-height: 1.1; +} + +.stylish-select a { + font-weight: normal !important; } .stylish-select ul.newList { @@ -109,7 +115,8 @@ h2 { .stylish-select .selectedTxt { width:258px; overflow:hidden; - height:16px; + height:18px; + font-size: 90%; padding:0 23px 0 0; } From 9feb619bea39824823ce39ca203b92fb6b68e6fb Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 20 Sep 2014 15:40:40 +0200 Subject: [PATCH 84/94] update jg to latest preview release and try once more to really justify the whole gallery --- .../dist/js/jquery.justifiedGallery.js | 1234 +++++++++-------- mod/photos.php | 15 +- view/js/main.js | 14 +- view/tpl/photos_recent.tpl | 8 +- view/tpl/photosajax.tpl | 5 +- 5 files changed, 671 insertions(+), 605 deletions(-) diff --git a/library/justifiedGallery/dist/js/jquery.justifiedGallery.js b/library/justifiedGallery/dist/js/jquery.justifiedGallery.js index 9b5c66081..7754ae437 100644 --- a/library/justifiedGallery/dist/js/jquery.justifiedGallery.js +++ b/library/justifiedGallery/dist/js/jquery.justifiedGallery.js @@ -1,587 +1,661 @@ -/*! - * Justified Gallery - v3.2.0 +/* + * Justified Gallery - v3.4.0 * http://miromannino.com/projects/justified-gallery/ * Copyright (c) 2014 Miro Mannino * Licensed under the MIT license. */ (function($) { - /* Events - jg.complete : called when all the gallery has been created - jg.resize : called when the gallery has been resized - */ - - $.fn.justifiedGallery = function (arg) { - - // Default options - var defaults = { - sizeRangeSuffixes : { - 'lt100': '_t', - 'lt240': '_m', - 'lt320': '_n', - 'lt500': '', - 'lt640': '_z', - 'lt1024': '_b' - }, - rowHeight : 120, - maxRowHeight : 0, //negative value = no limits, 0 = 1.5 * rowHeight - margins : 1, - lastRow : 'nojustify', // or can be 'justify' or 'hide' - justifyThreshold: 0.75, /* if row width / available space > 0.75 it will be always justified - (i.e. lastRow setting is not considered) */ - fixedHeight : false, - captions : true, - cssAnimation: false, - imagesAnimationDuration : 300, //ignored with css animations - captionSettings : { //ignored with css animations - animationDuration : 500, - visibleOpacity : 0.7, - nonVisibleOpacity : 0.0 - }, - rel : null, //rewrite the rel of each analyzed links - target : null, //rewrite the target of all links - extension : /\.[^.]+$/, - refreshTime : 250, - randomize : false - }; - - function getSuffix(width, height, context) { - var longestSide; - longestSide = (width > height) ? width : height; - if (longestSide <= 100) { - return context.settings.sizeRangeSuffixes.lt100; - } else if (longestSide <= 240) { - return context.settings.sizeRangeSuffixes.lt240; - } else if (longestSide <= 320) { - return context.settings.sizeRangeSuffixes.lt320; - } else if (longestSide <= 500) { - return context.settings.sizeRangeSuffixes.lt500; - } else if (longestSide <= 640) { - return context.settings.sizeRangeSuffixes.lt640; - } else { - return context.settings.sizeRangeSuffixes.lt1024; - } - } - - function onEntryMouseEnterForCaption (ev) { - var $caption = $(ev.currentTarget).find('.caption'); - if (ev.data.settings.cssAnimation) { - $caption.addClass('caption-visible').removeClass('caption-hidden'); - } else { - $caption.stop().fadeTo(ev.data.settings.captionSettings.animationDuration, ev.data.settings.captionSettings.visibleOpacity); - } - } - - function onEntryMouseLeaveForCaption (ev) { - var $caption = $(ev.currentTarget).find('.caption'); - if (ev.data.settings.cssAnimation) { - $caption.removeClass('caption-visible').removeClass('caption-hidden'); - } else { - $caption.stop().fadeTo(ev.data.settings.captionSettings.animationDuration, ev.data.settings.captionSettings.nonVisibleOpacity); - } - } - - function displayEntry($entry, x, y, imgWidth, imgHeight, rowHeight, context) { - var $image = $entry.find('img'); - $image.css('width', imgWidth); - $image.css('height', imgHeight); - $image.css('margin-left', - imgWidth / 2); - $image.css('margin-top', - imgHeight / 2); - $entry.width(imgWidth); - $entry.height(rowHeight); - $entry.css('top', y); - $entry.css('left', x); - - //DEBUG// console.log('displayEntry: $image.width() = ' + $image.width() + ' $image.height() = ' + $image.height()); - - // Image reloading for an high quality of thumbnails - var imageSrc = $image.attr('src'); - var newImageSrc = imageSrc.replace(context.settings.extension, '').replace(context.usedSizeRangeRegExp, '') + - getSuffix(imgWidth, imgHeight, context) + - imageSrc.match(context.settings.extension)[0]; - - $image.one('error', function () { - //DEBUG// console.log('revert the original image'); - $image.attr('src', $image.data('jg.originalSrc')); //revert to the original thumbnail, we got it. - }); - - var loadNewImage = function () { - if (imageSrc !== newImageSrc) { //load the new image after the fadeIn - $image.attr('src', newImageSrc); - } - }; - - if (context.settings.cssAnimation) { - $entry.addClass('entry-visible'); - loadNewImage(); - } else { - $entry.stop().fadeTo(context.settings.imagesAnimationDuration, 1.0, loadNewImage); - } - - // Captions ------------------------------ - var captionMouseEvents = $entry.data('jg.captionMouseEvents'); - if (context.settings.captions === true) { - var $imgCaption = $entry.find('.caption'); - if ($imgCaption.length === 0) { // Create it if it doesn't exists - var caption = $image.attr('alt'); - if (typeof caption === 'undefined') caption = $entry.attr('title'); - if (typeof caption !== 'undefined') { // Create only we found something - $imgCaption = $('
          ' + caption + '
          '); - $entry.append($imgCaption); - } - } - - // Create events (we check again the $imgCaption because it can be still inexistent) - if ($imgCaption.length !== 0) { - if (!context.settings.cssAnimation) { - $imgCaption.stop().fadeTo(context.settings.imagesAnimationDuration, context.settings.captionSettings.nonVisibleOpacity); - } - if (typeof captionMouseEvents === 'undefined') { - captionMouseEvents = { - mouseenter: onEntryMouseEnterForCaption, - mouseleave: onEntryMouseLeaveForCaption - }; - $entry.on('mouseenter', undefined, context, captionMouseEvents.mouseenter); - $entry.on('mouseleave', undefined, context, captionMouseEvents.mouseleave); - $entry.data('jg.captionMouseEvents', captionMouseEvents); - } - } - } else { - if (typeof captionMouseEvents !== 'undefined') { - $entry.off('mouseenter', undefined, context, captionMouseEvents.mouseenter); - $entry.off('mouseleave', undefined, context, captionMouseEvents.mouseleave); - $entry.removeData('jg.captionMouseEvents'); - } - } - - } - - function prepareBuildingRow(context, isLastRow) { - var i, $entry, $image, imgAspectRatio, newImgW, newImgH, justify = true; - var minHeight = 0; - var availableWidth = context.galleryWidth - ((context.buildingRow.entriesBuff.length - 1) * context.settings.margins); - var rowHeight = availableWidth / context.buildingRow.aspectRatio; - var justificable = context.buildingRow.width / availableWidth > context.settings.justifyThreshold; - - //Skip the last row if we can't justify it and the lastRow == 'hide' - if (isLastRow && context.settings.lastRow === 'hide' && !justificable) { - for (i = 0; i < context.buildingRow.entriesBuff.length; i++) { - $entry = context.buildingRow.entriesBuff[i]; - if (context.settings.cssAnimation) - $entry.removeClass('entry-visible'); - else - $entry.stop().fadeTo(0, 0); - } - return -1; - } - - // With lastRow = nojustify, justify if is justificable (the images will not become too big) - if (isLastRow && context.settings.lastRow === 'nojustify' && !justificable) justify = false; - - for (i = 0; i < context.buildingRow.entriesBuff.length; i++) { - $image = context.buildingRow.entriesBuff[i].find('img'); - imgAspectRatio = $image.data('jg.imgw') / $image.data('jg.imgh'); - - if (justify) { - newImgW = rowHeight * imgAspectRatio; - newImgH = rowHeight; - - /* With fixedHeight the newImgH must be greater than rowHeight. - In some cases here this is not satisfied (due to the justification). - But we comment it, because is better to have a shorter but justified row instead - to have a cropped image at the end. */ - /*if (context.settings.fixedHeight && newImgH < context.settings.rowHeight) { - newImgW = context.settings.rowHeight * imgAspectRatio; - newImgH = context.settings.rowHeight; - }*/ - } else { - newImgW = context.settings.rowHeight * imgAspectRatio; - newImgH = context.settings.rowHeight; - } - - $image.data('jg.imgw', Math.ceil(newImgW)); - $image.data('jg.imgh', Math.ceil(newImgH)); - if (i === 0 || minHeight > newImgH) minHeight = newImgH; - } - - if (context.settings.fixedHeight && minHeight > context.settings.rowHeight) - minHeight = context.settings.rowHeight; - - return minHeight; - } - - function rewind(context) { - context.lastAnalyzedIndex = -1; - context.buildingRow.entriesBuff = []; - context.buildingRow.aspectRatio = 0; - context.buildingRow.width = 0; - context.offY = 0; - context.firstRowFlushed = false; - } - - function flushRow(context, isLastRow) { - var $entry, $image, minHeight, offX = 0; - - //DEBUG// console.log('flush (width: ' + context.buildingRow.width + ', galleryWidth: ' + context.galleryWidth + ', ' + 'isLastRow: ' + isLastRow + ')'); - - minHeight = prepareBuildingRow(context, isLastRow); - if (isLastRow && context.settings.lastRow === 'hide' && minHeight === -1) { - context.buildingRow.entriesBuff = []; - context.buildingRow.aspectRatio = 0; - context.buildingRow.width = 0; - return; - } - - if (context.settings.maxRowHeight > 0 && context.settings.maxRowHeight < minHeight) - minHeight = context.settings.maxRowHeight; - else if (context.settings.maxRowHeight === 0 && (1.5 * context.settings.rowHeight) < minHeight) - minHeight = 1.5 * context.settings.rowHeight; - - for (var i = 0; i < context.buildingRow.entriesBuff.length; i++) { - $entry = context.buildingRow.entriesBuff[i]; - $image = $entry.find('img'); - displayEntry($entry, offX, context.offY, $image.data('jg.imgw'), $image.data('jg.imgh'), minHeight, context); - offX += $image.data('jg.imgw') + context.settings.margins; - } - - //Gallery Height - context.$gallery.height(context.offY + minHeight + - (context.spinner.active ? context.spinner.$el.innerHeight() : 0) - ); - - if(!isLastRow) { - //Ready for a new row - context.offY += minHeight + context.settings.margins; - - //DEBUG// console.log('minHeight: ' + minHeight + ' offY: ' + context.offY); - - context.buildingRow.entriesBuff = []; //clear the array creating a new one - context.buildingRow.aspectRatio = 0; - context.buildingRow.width = 0; - context.firstRowFlushed = true; - context.$gallery.trigger('jg.rowflush'); - } - } - - function checkWidth(context) { - context.checkWidthIntervalId = setInterval(function () { - var galleryWidth = parseInt(context.$gallery.width(), 10); - if (context.galleryWidth !== galleryWidth) { - //DEBUG// console.log("resize. old: " + context.galleryWidth + " new: " + galleryWidth); - - context.galleryWidth = galleryWidth; - rewind(context); - - // Restart to analyze - startImgAnalyzer(context, true); - } - }, context.settings.refreshTime); - } - - function startLoadingSpinnerAnimation(spinnerContext) { - clearInterval(spinnerContext.intervalId); - spinnerContext.intervalId = setInterval(function () { - if (spinnerContext.phase < spinnerContext.$points.length) - spinnerContext.$points.eq(spinnerContext.phase).fadeTo(spinnerContext.timeslot, 1); - else - spinnerContext.$points.eq(spinnerContext.phase - spinnerContext.$points.length).fadeTo(spinnerContext.timeslot, 0); - spinnerContext.phase = (spinnerContext.phase + 1) % (spinnerContext.$points.length * 2); - }, spinnerContext.timeslot); - } - - function stopLoadingSpinnerAnimation(spinnerContext) { - clearInterval(spinnerContext.intervalId); - spinnerContext.intervalId = null; - } - - function stopImgAnalyzerStarter(context) { - context.yield.flushed = 0; - if (context.imgAnalyzerTimeout !== null) clearTimeout(context.imgAnalyzerTimeout); - } - - function startImgAnalyzer(context, isForResize) { - stopImgAnalyzerStarter(context); - context.imgAnalyzerTimeout = setTimeout(function () { analyzeImages(context, isForResize); }, 0.001); - analyzeImages(context, isForResize); - } - - function analyzeImages(context, isForResize) { - - //DEBUG// - /*var rnd = parseInt(Math.random() * 10000, 10); - //DEBUG// console.log('analyzeImages ' + rnd + ' start'); - //DEBUG// console.log('images status: '); - for (var i = 0; i < context.entries.length; i++) { - var $entry = $(context.entries[i]); - var $image = $entry.find('img'); - //DEBUG// console.log(i + ' (alt: ' + $image.attr('alt') + 'loaded: ' + $image.data('jg.loaded') + ')'); - }*/ - - /* The first row */ - var isLastRow; - - for (var i = context.lastAnalyzedIndex + 1; i < context.entries.length; i++) { - var $entry = $(context.entries[i]); - var $image = $entry.find('img'); - - if ($image.data('jg.loaded') === true) { - isLastRow = i >= context.entries.length - 1; - - var availableWidth = context.galleryWidth - ((context.buildingRow.entriesBuff.length - 1) * context.settings.margins); - var imgAspectRatio = $image.data('jg.imgw') / $image.data('jg.imgh'); - if (availableWidth / (context.buildingRow.aspectRatio + imgAspectRatio) < context.settings.rowHeight) { - flushRow(context, isLastRow); - - if(++context.yield.flushed >= context.yield.every) { - //DEBUG// console.log("yield"); - startImgAnalyzer(context, isForResize); - return; - } - } - - context.buildingRow.entriesBuff.push($entry); - context.buildingRow.aspectRatio += imgAspectRatio; - context.buildingRow.width += imgAspectRatio * context.settings.rowHeight; - context.lastAnalyzedIndex = i; - - } else if ($image.data('jg.loaded') !== 'error') { - return; - } - } - - // Last row flush (the row is not full) - if (context.buildingRow.entriesBuff.length > 0) flushRow(context, isLastRow); - - if (context.spinner.active) { - context.spinner.active = false; - context.$gallery.height(context.$gallery.height() - context.spinner.$el.innerHeight()); - context.spinner.$el.detach(); - stopLoadingSpinnerAnimation(context.spinner); - } - - /* Stop, if there is, the timeout to start the analyzeImages. - This is because an image can be set loaded, and the timeout can be set, - but this image can be analyzed yet. - */ - stopImgAnalyzerStarter(context); - - //On complete callback - if (!isForResize) context.$gallery.trigger('jg.complete'); else context.$gallery.trigger('jg.resize'); - - //DEBUG// console.log('analyzeImages ' + rnd + ' end'); - } - - function checkSettings (context) { - - function checkSuffixesRange(range) { - if (typeof context.settings.sizeRangeSuffixes[range] !== 'string') - throw 'sizeRangeSuffixes.' + range + ' must be a string'; - } - - function checkOrConvertNumber(parent, settingName) { - if (typeof parent[settingName] === 'string') { - parent[settingName] = parseFloat(parent[settingName], 10); - if (isNaN(parent[settingName])) throw 'invalid number for ' + settingName; - } else if (typeof parent[settingName] === 'number') { - if (isNaN(parent[settingName])) throw 'invalid number for ' + settingName; - } else { - throw settingName + ' must be a number'; - } - } - - if (typeof context.settings.sizeRangeSuffixes !== 'object') - throw 'sizeRangeSuffixes must be defined and must be an object'; - - checkSuffixesRange('lt100'); - checkSuffixesRange('lt240'); - checkSuffixesRange('lt320'); - checkSuffixesRange('lt500'); - checkSuffixesRange('lt640'); - checkSuffixesRange('lt1024'); - - checkOrConvertNumber(context.settings, 'rowHeight'); - checkOrConvertNumber(context.settings, 'maxRowHeight'); - checkOrConvertNumber(context.settings, 'margins'); - - if (context.settings.lastRow !== 'nojustify' && - context.settings.lastRow !== 'justify' && - context.settings.lastRow !== 'hide') { - throw 'lastRow must be "nojustify", "justify" or "hide"'; - } - - checkOrConvertNumber(context.settings, 'justifyThreshold'); - if (context.settings.justifyThreshold < 0 || context.settings.justifyThreshold > 1) - throw 'justifyThreshold must be in the interval [0,1]'; - if (typeof context.settings.cssAnimation !== 'boolean') { - throw 'cssAnimation must be a boolean'; - } - - checkOrConvertNumber(context.settings.captionSettings, 'animationDuration'); - checkOrConvertNumber(context.settings, 'imagesAnimationDuration'); - - checkOrConvertNumber(context.settings.captionSettings, 'visibleOpacity'); - if (context.settings.captionSettings.visibleOpacity < 0 || context.settings.captionSettings.visibleOpacity > 1) - throw 'captionSettings.visibleOpacity must be in the interval [0, 1]'; - - checkOrConvertNumber(context.settings.captionSettings, 'nonVisibleOpacity'); - if (context.settings.captionSettings.visibleOpacity < 0 || context.settings.captionSettings.visibleOpacity > 1) - throw 'captionSettings.nonVisibleOpacity must be in the interval [0, 1]'; - - if (typeof context.settings.fixedHeight !== 'boolean') { - throw 'fixedHeight must be a boolean'; - } - - if (typeof context.settings.captions !== 'boolean') { - throw 'captions must be a boolean'; - } - - checkOrConvertNumber(context.settings, 'refreshTime'); - - if (typeof context.settings.randomize !== 'boolean') { - throw 'randomize must be a boolean'; - } - - } - - return this.each(function (index, gallery) { - - var $gallery = $(gallery); - $gallery.addClass('justified-gallery'); - - var context = $gallery.data('jg.context'); - if (typeof context === 'undefined') { - - if (typeof arg !== 'undefined' && arg !== null && typeof arg !== 'object') - throw 'The argument must be an object'; - - // Spinner init - var $spinner = $(''); - - //Context init - context = { - settings : $.extend({}, defaults, arg), - imgAnalyzerTimeout : null, - entries : null, - buildingRow : { - entriesBuff : [], - width : 0, - aspectRatio : 0 - }, - lastAnalyzedIndex : -1, - firstRowFlushed : false, - yield : { - every : 2, /* do a flush every context.yield.every flushes ( - * must be greater than 1, else the analyzeImages will loop */ - flushed : 0 //flushed rows without a yield - }, - offY : 0, - spinner : { - active : false, - phase : 0, - timeslot : 150, - $el : $spinner, - $points : $spinner.find('span'), - intervalId : null - }, - checkWidthIntervalId : null, - galleryWidth : $gallery.width(), - $gallery : $gallery - }; - - $gallery.data('jg.context', context); - - } else if (arg === 'norewind') { - // In this case we don't rewind, and analyze all the images - } else { - context.settings = $.extend({}, context.settings, arg); - rewind(context); - } - - checkSettings(context); - - context.entries = $gallery.find('> a, > div').toArray(); - if (context.entries.length === 0) return; - - // Randomize - if (context.settings.randomize) { - context.entries.sort(function () { return Math.random() * 2 - 1; }); - $.each(context.entries, function () { - $(this).appendTo($gallery); - }); - } - - context.usedSizeRangeRegExp = new RegExp("(" + - context.settings.sizeRangeSuffixes.lt100 + "|" + - context.settings.sizeRangeSuffixes.lt240 + "|" + - context.settings.sizeRangeSuffixes.lt320 + "|" + - context.settings.sizeRangeSuffixes.lt500 + "|" + - context.settings.sizeRangeSuffixes.lt640 + "|" + - context.settings.sizeRangeSuffixes.lt1024 + ")$" - ); - - if (context.settings.maxRowHeight > 0 && context.settings.maxRowHeight < context.settings.rowHeight) - context.settings.maxRowHeight = context.settings.rowHeight; - - var imagesToLoad = false; - $.each(context.entries, function (index, entry) { - var $entry = $(entry); - var $image = $entry.find('img'); - - if ($image.data('jg.loaded') !== true) { - $image.data('jg.loaded', false); - - //DEBUG// console.log('listed ' + $image.attr('alt')); - - imagesToLoad = true; - - // Spinner start - if (context.spinner.active === false) { - context.spinner.active = true; - $gallery.append(context.spinner.$el); - $gallery.height(context.offY + context.spinner.$el.innerHeight()); - startLoadingSpinnerAnimation(context.spinner); - } - - // Link Rel global overwrite - if (context.settings.rel !== null) $entry.attr('rel', context.settings.rel); - - // Link Target global overwrite - if (context.settings.target !== null) $entry.attr('target', context.settings.target); - - // Image src - var imageSrc = (typeof $image.data('safe-src') !== 'undefined') ? $image.data('safe-src') : $image.attr('src'); - $image.data('jg.originalSrc', imageSrc); - $image.attr('src', imageSrc); - - /* Check if the image is loaded or not using another image object. - We cannot use the 'complete' image property, because some browsers, - with a 404 set complete = true */ - var loadImg = new Image(); - var $loadImg = $(loadImg); - $loadImg.one('load', function imgLoaded () { - //DEBUG// console.log('img load (alt: ' + $image.attr('alt') + ')'); - $image.off('load error'); - $image.data('jg.imgw', loadImg.width); - $image.data('jg.imgh', loadImg.height); - $image.data('jg.loaded', true); - startImgAnalyzer(context, false); - }); - $loadImg.one('error', function imgLoadError () { - //DEBUG// console.log('img error (alt: ' + $image.attr('alt') + ')'); - $image.off('load error'); - $image.data('jg.loaded', 'error'); - startImgAnalyzer(context, false); - }); - loadImg.src = imageSrc; - - } - - }); - - if (!imagesToLoad) startImgAnalyzer(context, false); - checkWidth(context); - }); - - }; - + /* Events + jg.complete : called when all the gallery has been created + jg.resize : called when the gallery has been resized + */ + + $.fn.justifiedGallery = function (arg) { + + // Default options + var defaults = { + sizeRangeSuffixes : { + 'lt100': '_t', + 'lt240': '_m', + 'lt320': '_n', + 'lt500': '', + 'lt640': '_z', + 'lt1024': '_b' + }, + rowHeight : 120, + maxRowHeight : 0, //negative value = no limits, 0 = 1.5 * rowHeight + margins : 1, + lastRow : 'nojustify', // or can be 'justify' or 'hide' + justifyThreshold: 0.75, /* if row width / available space > 0.75 it will be always justified + (i.e. lastRow setting is not considered) */ + fixedHeight : false, + waitThumbnailsLoad : true, + captions : true, + cssAnimation: false, + imagesAnimationDuration : 500, //ignored with css animations + captionSettings : { //ignored with css animations + animationDuration : 500, + visibleOpacity : 0.7, + nonVisibleOpacity : 0.0 + }, + rel : null, //rewrite the rel of each analyzed links + target : null, //rewrite the target of all links + extension : /\.[^.\\/]+$/, + refreshTime : 100, + randomize : false + }; + + function getSuffix(width, height, context) { + var longestSide; + longestSide = (width > height) ? width : height; + if (longestSide <= 100) { + return context.settings.sizeRangeSuffixes.lt100; + } else if (longestSide <= 240) { + return context.settings.sizeRangeSuffixes.lt240; + } else if (longestSide <= 320) { + return context.settings.sizeRangeSuffixes.lt320; + } else if (longestSide <= 500) { + return context.settings.sizeRangeSuffixes.lt500; + } else if (longestSide <= 640) { + return context.settings.sizeRangeSuffixes.lt640; + } else { + return context.settings.sizeRangeSuffixes.lt1024; + } + } + + function endsWith(str, suffix) { + return str.indexOf(suffix, str.length - suffix.length) !== -1; + } + + function removeSuffix(str, suffix) { + return str.substring(0, str.length - suffix.length); + } + + function getUsedSuffix(str, context) { + var voidSuffix = false; + for (var si in context.settings.sizeRangeSuffixes) { + if (context.settings.sizeRangeSuffixes[si].length === 0) { + voidSuffix = true; + continue; + } + if (endsWith(str, context.settings.sizeRangeSuffixes[si])) { + return context.settings.sizeRangeSuffixes[si]; + } + } + + if (voidSuffix) return ""; + else throw 'unknown suffix for ' + str; + } + + /* Given an image src, with the width and the height, returns the new image src with the + best suffix to show the best quality thumbnail. */ + function newSrc(imageSrc, imgWidth, imgHeight, context) { + var matchRes = imageSrc.match(context.settings.extension); + var ext = (matchRes != null) ? matchRes[0] : ''; + var newImageSrc = imageSrc.replace(context.settings.extension, ''); + newImageSrc = removeSuffix(newImageSrc, getUsedSuffix(newImageSrc, context)); + newImageSrc += getSuffix(imgWidth, imgHeight, context) + ext; + return newImageSrc; + } + + function onEntryMouseEnterForCaption (ev) { + var $caption = $(ev.currentTarget).find('.caption'); + if (ev.data.settings.cssAnimation) { + $caption.addClass('caption-visible').removeClass('caption-hidden'); + } else { + $caption.stop().fadeTo(ev.data.settings.captionSettings.animationDuration, + ev.data.settings.captionSettings.visibleOpacity); + } + } + + function onEntryMouseLeaveForCaption (ev) { + var $caption = $(ev.currentTarget).find('.caption'); + if (ev.data.settings.cssAnimation) { + $caption.removeClass('caption-visible').removeClass('caption-hidden'); + } else { + $caption.stop().fadeTo(ev.data.settings.captionSettings.animationDuration, + ev.data.settings.captionSettings.nonVisibleOpacity); + } + } + + function showImg($entry, callback, context) { + if (context.settings.cssAnimation) { + $entry.addClass('entry-visible'); + callback(); + } else { + $entry.stop().fadeTo(context.settings.imagesAnimationDuration, 1.0, callback); + } + } + + function hideImgImmediately($entry, context) { + if (context.settings.cssAnimation) { + $entry.removeClass('entry-visible'); + } else { + $entry.stop().fadeTo(0, 0); + } + } + + function displayEntry($entry, x, y, imgWidth, imgHeight, rowHeight, context) { + var $image = $entry.find('img'); + $image.css('width', imgWidth); + $image.css('height', imgHeight); + $image.css('margin-left', - imgWidth / 2); + $image.css('margin-top', - imgHeight / 2); + $entry.width(imgWidth); + $entry.height(rowHeight); + $entry.css('top', y); + $entry.css('left', x); + + //DEBUG// console.log('displayEntry (w: ' + $image.width() + ' h: ' + $image.height()); + + // Image reloading for an high quality of thumbnails + var imageSrc = $image.attr('src'); + var newImageSrc = newSrc(imageSrc, imgWidth, imgHeight, context); + + $image.one('error', function () { + //DEBUG// console.log('revert the original image'); + $image.attr('src', $image.data('jg.originalSrc')); //revert to the original thumbnail, we got it. + }); + + function loadNewImage() { + if (imageSrc !== newImageSrc) { //load the new image after the fadeIn + $image.attr('src', newImageSrc); + } + } + + if ($image.data('jg.loaded') === 'skipped') { + $image.one('load', function() { + showImg($entry, loadNewImage, context); + $image.data('jg.loaded', 'loaded'); + }); + } else { + showImg($entry, loadNewImage, context); + } + + // Captions ------------------------------ + var captionMouseEvents = $entry.data('jg.captionMouseEvents'); + if (context.settings.captions === true) { + var $imgCaption = $entry.find('.caption'); + if ($imgCaption.length === 0) { // Create it if it doesn't exists + var caption = $image.attr('alt'); + if (typeof caption === 'undefined') caption = $entry.attr('title'); + if (typeof caption !== 'undefined') { // Create only we found something + $imgCaption = $('
          ' + caption + '
          '); + $entry.append($imgCaption); + } + } + + // Create events (we check again the $imgCaption because it can be still inexistent) + if ($imgCaption.length !== 0) { + if (!context.settings.cssAnimation) { + $imgCaption.stop().fadeTo(context.settings.imagesAnimationDuration, + context.settings.captionSettings.nonVisibleOpacity); + } + if (typeof captionMouseEvents === 'undefined') { + captionMouseEvents = { + mouseenter: onEntryMouseEnterForCaption, + mouseleave: onEntryMouseLeaveForCaption + }; + $entry.on('mouseenter', undefined, context, captionMouseEvents.mouseenter); + $entry.on('mouseleave', undefined, context, captionMouseEvents.mouseleave); + $entry.data('jg.captionMouseEvents', captionMouseEvents); + } + } + } else { + if (typeof captionMouseEvents !== 'undefined') { + $entry.off('mouseenter', undefined, context, captionMouseEvents.mouseenter); + $entry.off('mouseleave', undefined, context, captionMouseEvents.mouseleave); + $entry.removeData('jg.captionMouseEvents'); + } + } + + } + + function prepareBuildingRow(context, isLastRow) { + var settings = context.settings; + var i, $entry, $image, imgAspectRatio, newImgW, newImgH, justify = true; + var minHeight = 0; + var availableWidth = context.galleryWidth - ( + (context.buildingRow.entriesBuff.length - 1) * settings.margins); + var rowHeight = availableWidth / context.buildingRow.aspectRatio; + var justificable = context.buildingRow.width / availableWidth > settings.justifyThreshold; + + //Skip the last row if we can't justify it and the lastRow == 'hide' + if (isLastRow && settings.lastRow === 'hide' && !justificable) { + for (i = 0; i < context.buildingRow.entriesBuff.length; i++) { + $entry = context.buildingRow.entriesBuff[i]; + if (settings.cssAnimation) + $entry.removeClass('entry-visible'); + else + $entry.stop().fadeTo(0, 0); + } + return -1; + } + + // With lastRow = nojustify, justify if is justificable (the images will not become too big) + if (isLastRow && !justificable && settings.lastRow === 'nojustify') justify = false; + + for (i = 0; i < context.buildingRow.entriesBuff.length; i++) { + $image = context.buildingRow.entriesBuff[i].find('img'); + imgAspectRatio = $image.data('jg.imgw') / $image.data('jg.imgh'); + + if (justify) { + newImgW = rowHeight * imgAspectRatio; + newImgH = rowHeight; + + /* With fixedHeight the newImgH must be greater than rowHeight. + In some cases here this is not satisfied (due to the justification). + But we comment it, because is better to have a shorter but justified row instead + to have a cropped image at the end. */ + /*if (settings.fixedHeight && newImgH < settings.rowHeight) { + newImgW = settings.rowHeight * imgAspectRatio; + newImgH = settings.rowHeight; + }*/ + } else { + newImgW = settings.rowHeight * imgAspectRatio; + newImgH = settings.rowHeight; + } + + $image.data('jg.imgw', Math.ceil(newImgW)); + $image.data('jg.imgh', Math.ceil(newImgH)); + if (i === 0 || minHeight > newImgH) minHeight = newImgH; + } + + if (settings.fixedHeight && minHeight > settings.rowHeight) + minHeight = settings.rowHeight; + + return {minHeight: minHeight, justify: justify}; + } + + function rewind(context) { + context.lastAnalyzedIndex = -1; + context.buildingRow.entriesBuff = []; + context.buildingRow.aspectRatio = 0; + context.buildingRow.width = 0; + context.offY = 0; + } + + function flushRow(context, isLastRow) { + var settings = context.settings; + var $entry, $image, minHeight, buildingRowRes, offX = 0; + + //DEBUG// console.log('flush (isLastRow: ' + isLastRow + ')'); + + buildingRowRes = prepareBuildingRow(context, isLastRow); + minHeight = buildingRowRes.minHeight; + if (isLastRow && settings.lastRow === 'hide' && minHeight === -1) { + context.buildingRow.entriesBuff = []; + context.buildingRow.aspectRatio = 0; + context.buildingRow.width = 0; + return; + } + + if (settings.maxRowHeight > 0 && settings.maxRowHeight < minHeight) + minHeight = settings.maxRowHeight; + else if (settings.maxRowHeight === 0 && (1.5 * settings.rowHeight) < minHeight) + minHeight = 1.5 * settings.rowHeight; + + for (var i = 0; i < context.buildingRow.entriesBuff.length; i++) { + $entry = context.buildingRow.entriesBuff[i]; + $image = $entry.find('img'); + displayEntry($entry, offX, context.offY, $image.data('jg.imgw'), + $image.data('jg.imgh'), minHeight, context); + offX += $image.data('jg.imgw') + settings.margins; + } + + //Gallery Height + context.$gallery.height(context.offY + minHeight + + (context.spinner.active ? context.spinner.$el.innerHeight() : 0) + ); + + if (!isLastRow || (minHeight <= context.settings.rowHeight && buildingRowRes.justify)) { + //Ready for a new row + context.offY += minHeight + context.settings.margins; + + //DEBUG// console.log('minHeight: ' + minHeight + ' offY: ' + context.offY); + + context.buildingRow.entriesBuff = []; //clear the array creating a new one + context.buildingRow.aspectRatio = 0; + context.buildingRow.width = 0; + context.$gallery.trigger('jg.rowflush'); + } + } + + function checkWidth(context) { + context.checkWidthIntervalId = setInterval(function () { + var galleryWidth = parseInt(context.$gallery.width(), 10); + if (context.galleryWidth !== galleryWidth) { + //DEBUG// console.log("resize. old: " + context.galleryWidth + " new: " + galleryWidth); + + context.galleryWidth = galleryWidth; + rewind(context); + + // Restart to analyze + startImgAnalyzer(context, true); + } + }, context.settings.refreshTime); + } + + function startLoadingSpinnerAnimation(spinnerContext) { + clearInterval(spinnerContext.intervalId); + spinnerContext.intervalId = setInterval(function () { + if (spinnerContext.phase < spinnerContext.$points.length) + spinnerContext.$points.eq(spinnerContext.phase).fadeTo(spinnerContext.timeslot, 1); + else + spinnerContext.$points.eq(spinnerContext.phase - spinnerContext.$points.length) + .fadeTo(spinnerContext.timeslot, 0); + spinnerContext.phase = (spinnerContext.phase + 1) % (spinnerContext.$points.length * 2); + }, spinnerContext.timeslot); + } + + function stopLoadingSpinnerAnimation(spinnerContext) { + clearInterval(spinnerContext.intervalId); + spinnerContext.intervalId = null; + } + + function stopImgAnalyzerStarter(context) { + context.yield.flushed = 0; + if (context.imgAnalyzerTimeout !== null) clearTimeout(context.imgAnalyzerTimeout); + } + + function startImgAnalyzer(context, isForResize) { + stopImgAnalyzerStarter(context); + context.imgAnalyzerTimeout = setTimeout(function () { + analyzeImages(context, isForResize); + }, 0.001); + analyzeImages(context, isForResize); + } + + function analyzeImages(context, isForResize) { + + /* //DEBUG// + var rnd = parseInt(Math.random() * 10000, 10); + console.log('analyzeImages ' + rnd + ' start'); + console.log('images status: '); + for (var i = 0; i < context.entries.length; i++) { + var $entry = $(context.entries[i]); + var $image = $entry.find('img'); + console.log(i + ' (alt: ' + $image.attr('alt') + 'loaded: ' + $image.data('jg.loaded') + ')'); + }*/ + + /* The first row */ + var settings = context.settings; + var isLastRow; + + for (var i = context.lastAnalyzedIndex + 1; i < context.entries.length; i++) { + var $entry = $(context.entries[i]); + var $image = $entry.find('img'); + + if ($image.data('jg.loaded') === true || $image.data('jg.loaded') === 'skipped') { + isLastRow = i >= context.entries.length - 1; + + var availableWidth = context.galleryWidth - ( + (context.buildingRow.entriesBuff.length - 1) * settings.margins); + var imgAspectRatio = $image.data('jg.imgw') / $image.data('jg.imgh'); + if (availableWidth / (context.buildingRow.aspectRatio + imgAspectRatio) < settings.rowHeight) { + flushRow(context, isLastRow); + if(++context.yield.flushed >= context.yield.every) { + //DEBUG// console.log("yield"); + startImgAnalyzer(context, isForResize); + return; + } + } + + context.buildingRow.entriesBuff.push($entry); + context.buildingRow.aspectRatio += imgAspectRatio; + context.buildingRow.width += imgAspectRatio * settings.rowHeight; + context.lastAnalyzedIndex = i; + + } else if ($image.data('jg.loaded') !== 'error') { + return; + } + } + + // Last row flush (the row is not full) + if (context.buildingRow.entriesBuff.length > 0) flushRow(context, true); + + if (context.spinner.active) { + context.spinner.active = false; + context.$gallery.height(context.$gallery.height() - context.spinner.$el.innerHeight()); + context.spinner.$el.detach(); + stopLoadingSpinnerAnimation(context.spinner); + } + + /* Stop, if there is, the timeout to start the analyzeImages. + This is because an image can be set loaded, and the timeout can be set, + but this image can be analyzed yet. + */ + stopImgAnalyzerStarter(context); + + //On complete callback + if (!isForResize) + context.$gallery.trigger('jg.complete'); + else + context.$gallery.trigger('jg.resize'); + + //DEBUG// console.log('analyzeImages ' + rnd + ' end'); + } + + function checkSettings (context) { + var settings = context.settings; + + function checkSuffixesRange(range) { + if (typeof settings.sizeRangeSuffixes[range] !== 'string') + throw 'sizeRangeSuffixes.' + range + ' must be a string'; + } + + function checkOrConvertNumber(parent, settingName) { + if (typeof parent[settingName] === 'string') { + parent[settingName] = parseFloat(parent[settingName], 10); + if (isNaN(parent[settingName])) throw 'invalid number for ' + settingName; + } else if (typeof parent[settingName] === 'number') { + if (isNaN(parent[settingName])) throw 'invalid number for ' + settingName; + } else { + throw settingName + ' must be a number'; + } + } + + if (typeof settings.sizeRangeSuffixes !== 'object') + throw 'sizeRangeSuffixes must be defined and must be an object'; + + checkSuffixesRange('lt100'); + checkSuffixesRange('lt240'); + checkSuffixesRange('lt320'); + checkSuffixesRange('lt500'); + checkSuffixesRange('lt640'); + checkSuffixesRange('lt1024'); + + checkOrConvertNumber(settings, 'rowHeight'); + checkOrConvertNumber(settings, 'maxRowHeight'); + + if (settings.maxRowHeight > 0 && + settings.maxRowHeight < settings.rowHeight) { + settings.maxRowHeight = settings.rowHeight; + } + + checkOrConvertNumber(settings, 'margins'); + + if (settings.lastRow !== 'nojustify' && + settings.lastRow !== 'justify' && + settings.lastRow !== 'hide') { + throw 'lastRow must be "nojustify", "justify" or "hide"'; + } + + checkOrConvertNumber(settings, 'justifyThreshold'); + if (settings.justifyThreshold < 0 || settings.justifyThreshold > 1) + throw 'justifyThreshold must be in the interval [0,1]'; + if (typeof settings.cssAnimation !== 'boolean') { + throw 'cssAnimation must be a boolean'; + } + + checkOrConvertNumber(settings.captionSettings, 'animationDuration'); + checkOrConvertNumber(settings, 'imagesAnimationDuration'); + + checkOrConvertNumber(settings.captionSettings, 'visibleOpacity'); + if (settings.captionSettings.visibleOpacity < 0 || settings.captionSettings.visibleOpacity > 1) + throw 'captionSettings.visibleOpacity must be in the interval [0, 1]'; + + checkOrConvertNumber(settings.captionSettings, 'nonVisibleOpacity'); + if (settings.captionSettings.visibleOpacity < 0 || settings.captionSettings.visibleOpacity > 1) + throw 'captionSettings.nonVisibleOpacity must be in the interval [0, 1]'; + + if (typeof settings.fixedHeight !== 'boolean') { + throw 'fixedHeight must be a boolean'; + } + + if (typeof settings.captions !== 'boolean') { + throw 'captions must be a boolean'; + } + + checkOrConvertNumber(settings, 'refreshTime'); + + if (typeof settings.randomize !== 'boolean') { + throw 'randomize must be a boolean'; + } + + } + + return this.each(function (index, gallery) { + + var $gallery = $(gallery); + $gallery.addClass('justified-gallery'); + + var context = $gallery.data('jg.context'); + if (typeof context === 'undefined') { + + if (typeof arg !== 'undefined' && arg !== null && typeof arg !== 'object') + throw 'The argument must be an object'; + + // Spinner init + var $spinner = $(''); + + //Context init + context = { + settings : $.extend({}, defaults, arg), + imgAnalyzerTimeout : null, + entries : null, + buildingRow : { + entriesBuff : [], + width : 0, + aspectRatio : 0 + }, + lastAnalyzedIndex : -1, + yield : { + every : 2, /* do a flush every context.yield.every flushes ( + * must be greater than 1, else the analyzeImages will loop */ + flushed : 0 //flushed rows without a yield + }, + offY : 0, + spinner : { + active : false, + phase : 0, + timeslot : 150, + $el : $spinner, + $points : $spinner.find('span'), + intervalId : null + }, + checkWidthIntervalId : null, + galleryWidth : $gallery.width(), + $gallery : $gallery + }; + + $gallery.data('jg.context', context); + + } else if (arg === 'norewind') { + /* Hide the image of the buildingRow to prevent strange effects when the row will be + re-justified again */ + for (var i = 0; i < context.buildingRow.entriesBuff.length; i++) { + hideImgImmediately(context.buildingRow.entriesBuff[i], context); + } + // In this case we don't rewind, and analyze all the images + } else { + context.settings = $.extend({}, context.settings, arg); + rewind(context); + } + + checkSettings(context); + + context.entries = $gallery.find('> a, > div:not(.spinner, #page-end)').toArray(); + if (context.entries.length === 0) return; + + // Randomize + if (context.settings.randomize) { + context.entries.sort(function () { return Math.random() * 2 - 1; }); + $.each(context.entries, function () { + $(this).appendTo($gallery); + }); + } + + var imagesToLoad = false; + $.each(context.entries, function (index, entry) { + var $entry = $(entry); + var $image = $entry.find('img'); + + if ($image.data('jg.loaded') !== true && $image.data('jg.loaded') !== 'skipped') { + + // Link Rel global overwrite + if (context.settings.rel !== null) $entry.attr('rel', context.settings.rel); + + // Link Target global overwrite + if (context.settings.target !== null) $entry.attr('target', context.settings.target); + + // Image src + var imageSrc = (typeof $image.data('safe-src') !== 'undefined') ? + $image.data('safe-src') : $image.attr('src'); + $image.data('jg.originalSrc', imageSrc); + $image.attr('src', imageSrc); + + var width = parseInt($image.attr('width'), 10); + var height = parseInt($image.attr('height'), 10); + if(context.settings.waitThumbnailsLoad !== true && !isNaN(width) && !isNaN(height)) { + $image.data('jg.imgw', width); + $image.data('jg.imgh', height); + $image.data('jg.loaded', 'skipped'); + startImgAnalyzer(context, false); + return true; + } + + $image.data('jg.loaded', false); + imagesToLoad = true; + + // Spinner start + if (context.spinner.active === false) { + context.spinner.active = true; + $gallery.append(context.spinner.$el); + $gallery.height(context.offY + context.spinner.$el.innerHeight()); + startLoadingSpinnerAnimation(context.spinner); + } + + /* Check if the image is loaded or not using another image object. + We cannot use the 'complete' image property, because some browsers, + with a 404 set complete = true */ + var loadImg = new Image(); + var $loadImg = $(loadImg); + $loadImg.one('load', function imgLoaded () { + //DEBUG// console.log('img load (alt: ' + $image.attr('alt') + ')'); + $image.off('load error'); + $image.data('jg.imgw', loadImg.width); + $image.data('jg.imgh', loadImg.height); + $image.data('jg.loaded', true); + startImgAnalyzer(context, false); + }); + $loadImg.one('error', function imgLoadError () { + //DEBUG// console.log('img error (alt: ' + $image.attr('alt') + ')'); + $image.off('load error'); + $image.data('jg.loaded', 'error'); + startImgAnalyzer(context, false); + }); + loadImg.src = imageSrc; + + } + + }); + + if (!imagesToLoad) startImgAnalyzer(context, false); + checkWidth(context); + }); + + }; + }(jQuery)); diff --git a/mod/photos.php b/mod/photos.php index f2df894c0..44a7ce0f0 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -703,7 +703,7 @@ function photos_content(&$a) { if(count($r)) { $twist = 'rotright'; $o .= ""; - $o .= '
          '; + $o .= '
          '; foreach($r as $rr) { @@ -758,20 +758,15 @@ function photos_content(&$a) { echo $ajaxout; killme(); } - - echo '
          '; echo $ajaxout; - echo '
          '; - echo ''; + echo ''; killme(); } - - $o .= '
          '; // photo-album-contents - $o .= ''; $o .= '
          '; + $o .= '
          '; // photo-album-contents $o .= '
          '; - $o .= ''; + $o .= ''; $o .= '
          '; // $o .= paginate($a); @@ -1226,7 +1221,6 @@ function photos_content(&$a) { if($photos) { $o = replace_macros(get_markup_template('photosajax.tpl'),array( '$photos' => $photos, - '$page' => $a->pager['page'] )); } else { @@ -1243,7 +1237,6 @@ function photos_content(&$a) { '$can_post' => $can_post, '$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'), '$photos' => $photos, - '$page' => $a->pager['page'] )); } diff --git a/view/js/main.js b/view/js/main.js index 2e297c9d6..086ef3196 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -704,22 +704,26 @@ function updateConvItems(mode,data) { } - function justifyPhotos(bParam_page) { + function justifyPhotos() { justifiedGalleryActive = true; - $('#photo-album-contents-' + bParam_page).justifiedGallery({ - lastRow : 'nojustify', + $('#photo-album-contents').justifiedGallery({ margins: 3, - sizeRangeSuffixes : { + sizeRangeSuffixes: { 'lt100': '-2', 'lt240': '-2', 'lt320': '-2', - 'lt500': '-1', + 'lt500': '', 'lt640': '-1', 'lt1024': '-0' } }).on('jg.complete', function(e){ justifiedGalleryActive = false; }); } + function justifyPhotosAjax() { + justifiedGalleryActive = true; + $('#photo-album-contents').justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; }); + } + function notify_popup_loader(notifyType) { /* notifications template */ diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 0f86a635d..fce518cfe 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -3,14 +3,12 @@ {{$upload.0}} {{/if}} -
          +
          {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} - -
          -
          +
          - +
          diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl index a9a9605d0..632aab2b3 100755 --- a/view/tpl/photosajax.tpl +++ b/view/tpl/photosajax.tpl @@ -1,7 +1,4 @@ - -
          {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} -
          - + From bd54358aa6bfe90bfbc8aed7baf3a8110d6e45ba Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 20 Sep 2014 16:31:56 +0200 Subject: [PATCH 85/94] show bookmarks menu only if we have any bookmarks already --- include/conversation.php | 4 +++- include/menu.php | 10 ++++++++++ include/nav.php | 9 +++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 05ae72d61..8f1767482 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1556,7 +1556,9 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ ); } - if($is_owner) { + require_once('include/menu.php'); + $has_bookmarks = menu_list_count(local_user(),'',MENU_BOOKMARK) + menu_list_count(local_user(),'',MENU_SYSTEM|MENU_BOOKMARK); + if($is_owner && $has_bookmarks) { $tabs[] = array( 'label' => t('Bookmarks'), 'url' => $a->get_baseurl() . '/bookmarks', diff --git a/include/menu.php b/include/menu.php index 4b0a11f10..8997d2e39 100644 --- a/include/menu.php +++ b/include/menu.php @@ -124,7 +124,17 @@ function menu_list($channel_id, $name = '', $flags = 0) { return $r; } +function menu_list_count($channel_id, $name = '', $flags = 0) { + $sel_options = ''; + $sel_options .= (($name) ? " and menu_name = '" . protect_sprintf(dbesc($name)) . "' " : ''); + $sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : ''); + + $r = q("select count(*) as total from menu where menu_channel_id = %d $sel_options", + intval($channel_id) + ); + return $r[0]['total']; +} function menu_edit($arr) { diff --git a/include/nav.php b/include/nav.php index 799faf5ce..c6bc4d293 100644 --- a/include/nav.php +++ b/include/nav.php @@ -110,9 +110,14 @@ EOT; $nav['usermenu'][] = Array('chat/' . $channel['channel_address'],t('Chat'),"",t('Your chatrooms')); } - $nav['usermenu'][] = Array('bookmarks', t('Bookmarks'), "", t('Your bookmarks')); + require_once('include/menu.php'); + $has_bookmarks = menu_list_count(local_user(),'',MENU_BOOKMARK) + menu_list_count(local_user(),'',MENU_SYSTEM|MENU_BOOKMARK); + if($has_bookmarks) { + $nav['usermenu'][] = Array('bookmarks', t('Bookmarks'), "", t('Your bookmarks')); + } + if(feature_enabled($channel['channel_id'],'webpages')) - $nav['usermenu'][] = Array('webpages/' . $channel['channel_address'],t('Webpages'),"",t('Your webpages')); + $nav['usermenu'][] = Array('webpages/' . $channel['channel_address'],t('Webpages'),"",t('Your webpages')); } else { if(! get_account_id()) From 6c806f6f48fc7efe5fda380f2f9edb9a7dc09cab Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 20 Sep 2014 17:28:42 +0200 Subject: [PATCH 86/94] aalso change the way we check for number of chatrooms --- include/chat.php | 11 +++++++++++ include/conversation.php | 4 ++-- include/nav.php | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/chat.php b/include/chat.php index b8fb185df..5c3d0c9d9 100644 --- a/include/chat.php +++ b/include/chat.php @@ -189,6 +189,17 @@ function chatroom_list($uid) { return $r; } +function chatroom_list_count($uid) { + require_once('include/security.php'); + $sql_extra = permissions_sql($uid); + + $r = q("select count(*) as total from chatroom where cr_uid = %d $sql_extra", + intval($uid) + ); + + return $r[0]['total']; +} + /** * create a chat message via API. * It is the caller's responsibility to enter the room. diff --git a/include/conversation.php b/include/conversation.php index 8f1767482..6e56782dd 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1545,8 +1545,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ } require_once('include/chat.php'); - $chats = chatroom_list($uid); - if (count($chats)) { + $has_chats = chatroom_list_count($uid); + if (count($has_chats)) { $tabs[] = array( 'label' => t('Chatrooms'), 'url' => $a->get_baseurl() . '/chat/' . $nickname, diff --git a/include/nav.php b/include/nav.php index c6bc4d293..714f4b63d 100644 --- a/include/nav.php +++ b/include/nav.php @@ -105,8 +105,8 @@ EOT; $nav['usermenu'][] = Array('cloud/' . $channel['channel_address'],t('Files'),"",t('Your files')); require_once('include/chat.php'); - $chats = chatroom_list(local_user()); - if (count($chats)) { + $has_chats = chatroom_list_count(local_user()); + if($has_chats) { $nav['usermenu'][] = Array('chat/' . $channel['channel_address'],t('Chat'),"",t('Your chatrooms')); } From 69a10e8ca737a5848dd888879b32a95fa7267ad5 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 20 Sep 2014 17:30:11 +0200 Subject: [PATCH 87/94] oups... --- include/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 6e56782dd..be5267207 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1546,7 +1546,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ require_once('include/chat.php'); $has_chats = chatroom_list_count($uid); - if (count($has_chats)) { + if ($has_chats) { $tabs[] = array( 'label' => t('Chatrooms'), 'url' => $a->get_baseurl() . '/chat/' . $nickname, From 89fec0e085c5e2a902af301af2eb8fd3154a81e6 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 20 Sep 2014 23:28:42 +0200 Subject: [PATCH 88/94] Allow ordering by created --- mod/admin.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index 68ce6fe85..06f44c89b 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -687,7 +687,9 @@ function admin_page_users(&$a){ $order = " order by account_email asc "; if($_REQUEST['order'] === 'expires') $order = " order by account_expires desc "; - + if($_REQUEST['order'] === 'created') + $order = " order by account_created desc "; + $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, " . "`account_service_class`, ( account_flags & %d ) > 0 as `blocked`, " . "(SELECT GROUP_CONCAT( ch.channel_address SEPARATOR ' ') FROM channel as ch " . "WHERE ch.channel_account_id = ac.account_id and not (ch.channel_pageflags & %d )) as `channels` " . From 8d23a8da8dd7326d6ce9c3a64f96e5325a09d4a1 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 20 Sep 2014 16:21:49 -0700 Subject: [PATCH 89/94] fix empty likes --- include/conversation.php | 11 +++++++++-- version.inc | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 05ae72d61..a4d94f946 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -989,7 +989,11 @@ function like_puller($a,$item,&$arr,$mode) { $verb = (($mode === 'like') ? ACTIVITY_LIKE : ACTIVITY_DISLIKE); if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) { - $url = chanlink_url($item['author']['xchan_url']); + + if($item['author']['xchan_url']) + $url = chanlink_url($item['author']['xchan_url']); + else + $url = z_root(); if(! $item['thr_parent']) $item['thr_parent'] = $item['parent_mid']; @@ -1000,7 +1004,10 @@ function like_puller($a,$item,&$arr,$mode) { $arr[$item['thr_parent']] = 1; else $arr[$item['thr_parent']] ++; - $arr[$item['thr_parent'] . '-l'][] = '' . $item['author']['xchan_name'] . ''; + + $name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown')); + + $arr[$item['thr_parent'] . '-l'][] = '' . $name . ''; } return; } diff --git a/version.inc b/version.inc index 61b92795e..5a8480353 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-19.803 +2014-09-20.804 From 22e6e691ca46a49db65a304dc2133b7ee15febc4 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 20 Sep 2014 16:34:48 -0700 Subject: [PATCH 90/94] Navbar notifications: don't show "nothing new here" unless we've checked and there's nothing. Until we know for sure, display "Loading...". --- include/js_strings.php | 1 + include/nav.php | 2 +- view/js/main.js | 2 +- view/tpl/js_strings.tpl | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/js_strings.php b/include/js_strings.php index cda66a09c..f4c0a631d 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -15,6 +15,7 @@ function js_strings() { '$passhint' => t('Passphrase hint'), '$permschange' => t('Notice: Permissions have changed but have not yet been submitted.'), '$closeAll' => t('close all'), + '$nothingnew' => t('Nothing new here'), '$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : ''), '$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : ''), diff --git a/include/nav.php b/include/nav.php index 714f4b63d..98d1b644e 100644 --- a/include/nav.php +++ b/include/nav.php @@ -246,7 +246,7 @@ EOT; '$sitelocation' => $sitelocation, '$nav' => $x['nav'], '$banner' => $banner, - '$emptynotifications' => t('Nothing new here'), + '$emptynotifications' => t('Loading...'), '$userinfo' => $x['usermenu'], '$localuser' => local_user(), '$sel' => $a->nav_sel, diff --git a/view/js/main.js b/view/js/main.js index 086ef3196..7bbd49c1b 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -743,7 +743,7 @@ function updateConvItems(mode,data) { if(data.notify.length==0){ - $("#nav-" + notifyType + "-menu").html(notifications_empty); + $("#nav-" + notifyType + "-menu").html(aStr[nothingnew]); } else { $("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark); diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 515e3107f..eb78c669f 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -15,6 +15,7 @@ 'passhint' : "{{$passhint}}", 'permschange' : "{{$permschange}}", 'closeAll' : "{{$closeAll}}", + 'nothingnew' : "{{$nothingnew}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", From d2268a412dde64104d4e0261cdace7b37efa706b Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Sun, 21 Sep 2014 17:51:01 +0200 Subject: [PATCH 91/94] Don't link unknown likes. Likes/Dislikes of unknown channels have disabled links now. Fixed intention a bit, romved a unused variable. --- include/conversation.php | 184 ++++++++++++++++++-------------------- view/css/conversation.css | 6 ++ 2 files changed, 95 insertions(+), 95 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 4c030662c..b0a388a68 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -440,7 +440,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ for($x = 0; $x < count($arr_blocked); $x ++) $arr_blocked[$x] = trim($arr_blocked[$x]); } - } @@ -458,59 +457,53 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $profile_owner = local_user(); $page_writeable = true; - if(!$update) { - // The special div is needed for liveUpdate to kick in for this page. - // We only launch liveUpdate if you aren't filtering in some incompatible - // way and also you aren't writing a comment (discovered in javascript). - - $live_update_div = '
          ' . "\r\n" - . "\r\n"; - } - + if(!$update) { + // The special div is needed for liveUpdate to kick in for this page. + // We only launch liveUpdate if you aren't filtering in some incompatible + // way and also you aren't writing a comment (discovered in javascript). + $live_update_div = '
          ' . "\r\n" + . "\r\n"; + } } elseif($mode === 'channel') { $profile_owner = $a->profile['profile_uid']; $page_writeable = ($profile_owner == local_user()); - if(!$update) { - $tab = notags(trim($_GET['tab'])); - if($tab === 'posts') { - // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, - // because browser prefetching might change it on us. We have to deliver it with the page. - - $live_update_div = '
          ' . "\r\n" - . "\r\n"; - } - } + if(!$update) { + $tab = notags(trim($_GET['tab'])); + if($tab === 'posts') { + // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, + // because browser prefetching might change it on us. We have to deliver it with the page. + $live_update_div = '
          ' . "\r\n" + . "\r\n"; + } + } } elseif($mode === 'display') { $profile_owner = local_user(); $page_writeable = false; - - $live_update_div = '
          ' . "\r\n"; - + $live_update_div = '
          ' . "\r\n"; } elseif($mode === 'page') { @@ -519,10 +512,10 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $live_update_div = '
          ' . "\r\n"; } + elseif($mode === 'search') { + $live_update_div = '' . "\r\n"; + } - elseif($mode === 'search') { - $live_update_div = '' . "\r\n"; - } elseif($mode === 'photos') { $profile_onwer = $a->profile['profile_uid']; $page_writeable = ($profile_owner == local_user()); @@ -555,7 +548,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $alike = array(); $dlike = array(); - // array with html for each thread (parent+comments) $threads = array(); $threadsid = -1; @@ -603,12 +595,11 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ } else $nickname = $a->user['nickname']; - + $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); if($item['author-link'] && (! $item['author-name'])) $profile_name = $item['author-link']; - $tags=array(); $hashtags = array(); @@ -631,7 +622,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $profile_link = $item['author']['xchan_url']; $profile_avatar = $item['author']['xchan_photo_m']; - $location = format_location($item); localize_item($item); @@ -663,7 +653,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $unverified = ''; - $tags=array(); $terms = get_terms_oftype($item['term'],array(TERM_HASHTAG,TERM_MENTION,TERM_UNKNOWN)); if(count($terms)) @@ -694,12 +683,11 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ 'verified' => $verified, 'unverified' => $unverified, 'txt_cats' => t('Categories:'), - 'txt_folders' => t('Filed under:'), - 'has_cats' => ((count($categories)) ? 'true' : ''), - 'has_folders' => ((count($folders)) ? 'true' : ''), - 'categories' => $categories, - 'folders' => $folders, - + 'txt_folders' => t('Filed under:'), + 'has_cats' => ((count($categories)) ? 'true' : ''), + 'has_folders' => ((count($folders)) ? 'true' : ''), + 'categories' => $categories, + 'folders' => $folders, 'text' => strip_tags($body), 'ago' => relative_date($item['created']), 'app' => $item['app'], @@ -743,10 +731,10 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ // Normal View // logger('conv: items: ' . print_r($items,true)); - require_once('include/ConversationObject.php'); - require_once('include/ItemObject.php'); + require_once('include/ConversationObject.php'); + require_once('include/ItemObject.php'); - $conv = new Conversation($mode, $preview, $prepared_item); + $conv = new Conversation($mode, $preview, $prepared_item); // In the display mode we don't have a profile owner. @@ -754,12 +742,12 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $conv->set_profile_owner($items[0]['uid']); - // get all the topmost parents - // this shouldn't be needed, as we should have only them in our array - // But for now, this array respects the old style, just in case + // get all the topmost parents + // this shouldn't be needed, as we should have only them in our array + // But for now, this array respects the old style, just in case - $threads = array(); - foreach($items as $item) { + $threads = array(); + foreach($items as $item) { // Check for any blocked authors @@ -774,7 +762,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ if($blocked) continue; } - + // Check all the kids too if($arr_blocked && $item['children']) { @@ -786,46 +774,43 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ } } + like_puller($a, $item, $alike, 'like'); + if(feature_enabled($profile_owner, 'dislike')) + like_puller($a, $item, $dlike, 'dislike'); - like_puller($a,$item,$alike,'like'); + if(! visible_activity($item)) { + continue; + } - if(feature_enabled($profile_owner,'dislike')) - like_puller($a,$item,$dlike,'dislike'); + $item['pagedrop'] = $page_dropping; - if(! visible_activity($item)) { - continue; - } - - $item['pagedrop'] = $page_dropping; - - if($item['id'] == $item['parent']) { + if($item['id'] == $item['parent']) { // $tx1 = dba_timer(); - $item_object = new Item($item); - $conv->add_thread($item_object); + $item_object = new Item($item); + $conv->add_thread($item_object); if($page_mode === 'list') $item_object->set_template('conv_list.tpl'); // $tx2 = dba_timer(); // if($mode === 'network') // profiler($tx1,$tx2,'add thread ' . $item['id']); - } - } + } + } $t2 = dba_timer(); - $threads = $conv->get_template_data($alike, $dlike); - if(!$threads) { - logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG); - $threads = array(); - } + $threads = $conv->get_template_data($alike, $dlike); + if(!$threads) { + logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG); + $threads = array(); + } $t3 = dba_timer(); if($mode === 'network') { profiler($t1,$t2,'Conversation prepare'); profiler($t2,$t3,'Conversation get_template'); } - - } - } + } + } if($page_mode === 'traditional' || $page_mode === 'preview') { $page_template = get_markup_template("threaded_conversation.tpl"); @@ -867,8 +852,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ if($page_mode === 'preview') logger('preview: ' . $o); - return $o; - + return $o; } @@ -981,25 +965,32 @@ function item_photo_menu($item){ return $o; } - -function like_puller($a,$item,&$arr,$mode) { +/** + * @brief Returns a like/dislike entry. + * It gives back a HTML link to the channel that liked/disliked. + * + * @param array $a (not used) + * @param array $item + * @param array &$arr + * @param string $mode like/dislike + * @return void + */ +function like_puller($a, $item, &$arr, $mode) { $url = ''; - $sparkle = ''; $verb = (($mode === 'like') ? ACTIVITY_LIKE : ACTIVITY_DISLIKE); - if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) { + if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { if($item['author']['xchan_url']) $url = chanlink_url($item['author']['xchan_url']); - else - $url = z_root(); if(! $item['thr_parent']) $item['thr_parent'] = $item['parent_mid']; if(! ((isset($arr[$item['thr_parent'] . '-l'])) && (is_array($arr[$item['thr_parent'] . '-l'])))) $arr[$item['thr_parent'] . '-l'] = array(); + if(! isset($arr[$item['thr_parent']])) $arr[$item['thr_parent']] = 1; else @@ -1007,7 +998,10 @@ function like_puller($a,$item,&$arr,$mode) { $name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown')); - $arr[$item['thr_parent'] . '-l'][] = '' . $name . ''; + if($url) + $arr[$item['thr_parent'] . '-l'][] = '' . $name . ''; + else + $arr[$item['thr_parent'] . '-l'][] = '' . $name . ''; } return; } diff --git a/view/css/conversation.css b/view/css/conversation.css index a6540ffba..c7b381928 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -232,3 +232,9 @@ display: none; margin-top: 7px; } + +/* disable link handling for unknown entries */ +.dropdown-menu > li > a.disabled { + pointer-events: none; + cursor: default; +} From 09b5bbb032116f9d984f557cdf43aa23fb65650a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 21 Sep 2014 14:46:12 -0700 Subject: [PATCH 92/94] feeds with '@' in the URL were being handled as webfinger addresses and didn't fall through to RSS discovery. Issue #599 --- include/follow.php | 2 +- include/items.php | 1 + version.inc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/follow.php b/include/follow.php index 3c1fcd890..38525982e 100644 --- a/include/follow.php +++ b/include/follow.php @@ -143,7 +143,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) if(! $r) { // attempt network auto-discovery - if(strpos($url,'@')) { + if(strpos($url,'@') && (! $is_http)) { $r = discover_by_webbie($url); } elseif($is_http) { diff --git a/include/items.php b/include/items.php index 840c92982..53a0b25a9 100755 --- a/include/items.php +++ b/include/items.php @@ -1791,6 +1791,7 @@ function get_atom_elements($feed,$item,&$author) { call_hooks('parse_atom', $arr); logger('get_atom_elements: author: ' . print_r($author,true),LOGGER_DATA); + logger('get_atom_elements: ' . print_r($res,true),LOGGER_DATA); return $res; diff --git a/version.inc b/version.inc index 5a8480353..3e346cf06 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-20.804 +2014-09-21.805 From e76ab304670741be338feb0f02cb977fb0e562fe Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 21 Sep 2014 15:11:47 -0700 Subject: [PATCH 93/94] we don't always set HUBLOC_FLAGS_DELETED but we often set hubloc_status = HUBLOC_OFFLINE instead. Filter this as well from deliveries. --- include/notifier.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index 3f34d6133..0c7a15452 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -478,8 +478,9 @@ function notifier_run($argv, $argc){ } else { $r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc - where hubloc_hash in (" . implode(',',$recipients) . ") and not (hubloc_flags & %d) group by hubloc_sitekey", - intval(HUBLOC_FLAGS_DELETED) + where hubloc_hash in (" . implode(',',$recipients) . ") and not (hubloc_flags & %d) and not (hubloc_status & %d) group by hubloc_sitekey", + intval(HUBLOC_FLAGS_DELETED), + intval(HUBLOC_OFFLINE) ); } From 2070dbfdeace4a902208e9dfb50d950647142e99 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 22 Sep 2014 02:27:52 -0700 Subject: [PATCH 94/94] private mail from d* to r# seems to work with these edits. - Now have to go back the other way. --- include/diaspora.php | 17 +++++++---------- version.inc | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index b0943b7ec..6f504b460 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1431,7 +1431,8 @@ function diaspora_conversation($importer,$xml,$msg) { return; } - if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) { + + if(! perm_is_allowed($importer['channel_id'],$contact['xchan_hash'],'post_mail')) { logger('diaspora_conversation: Ignoring this author.'); return 202; } @@ -1531,7 +1532,7 @@ function diaspora_conversation($importer,$xml,$msg) { continue; } - q("insert into mail ( `uid`, `convid`, `from_xchan`,`to_xchan`,`title`,`body`,`mail_flags`,`mid`,`parent_mid`,`created`) values ( %d, %d, '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s')", + q("insert into mail ( `channel_id`, `convid`, `from_xchan`,`to_xchan`,`title`,`body`,`mail_flags`,`mid`,`parent_mid`,`created`) values ( %d, %d, '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s')", intval($importer['channel_id']), intval($conversation['id']), dbesc($person['xchan_hash']), @@ -1645,19 +1646,15 @@ function diaspora_message($importer,$xml,$msg) { return; } - q("insert into mail ( `uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`) values ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')", + q("insert into mail ( `channel_id`, `convid`, `from_xchan`,`to_xchan`,`title`,`body`,`mail_flags`,`mid`,`parent_mid`,`created`) values ( %d, %d, '%s', '%s', '%s', '%s', '%d','%s','%s','%s')", intval($importer['channel_id']), - dbesc($msg_guid), intval($conversation['id']), - dbesc($person['name']), - dbesc($person['photo']), - dbesc($person['url']), - intval($contact['id']), + dbesc($person['xchan_hash']), + dbesc($importer['xchan_hash']), dbesc($conversation['subject']), dbesc($body), 0, - 1, - dbesc($message_id), + dbesc($msg_guid), dbesc($parent_uri), dbesc($msg_created_at) ); diff --git a/version.inc b/version.inc index 3e346cf06..f3afecf7d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-21.805 +2014-09-22.806