From 9028e6bd30d5e457c63365cffba693a071bd1e4e Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Jan 2015 19:41:09 -0800 Subject: [PATCH 01/52] typo in postgres db update, remove redmatrix.nl from directory servers since it isn't a directory server any more. --- boot.php | 1 - install/update.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/boot.php b/boot.php index bca90fd27..2c85d52f0 100755 --- a/boot.php +++ b/boot.php @@ -81,7 +81,6 @@ define ( 'DIRECTORY_FALLBACK_MASTER', 'https://zothub.com'); $DIRECTORY_FALLBACK_SERVERS = array( 'https://zothub.com', 'https://zotid.net', - 'https://redmatrix.nl', 'https://red.zottel.red', 'https://red.pixelbits.de', 'https://whogotzot.com' diff --git a/install/update.php b/install/update.php index a8cecef5a..f5444089d 100644 --- a/install/update.php +++ b/install/update.php @@ -1515,7 +1515,7 @@ function update_r1133() { xp_client varchar( 20 ) NOT NULL DEFAULT '', xp_channel bigint NOT NULL DEFAULT '0', xp_perm varchar( 64 ) NOT NULL DEFAULT '', - PRIMARY_KEY (\"xp_id\") "); + PRIMARY KEY (\"xp_id\") "); $r2 = q("create index \"xp_client\" on xperm (\"xp_client\", create index \"xp_channel\" on xperm (\"xp_channel\"), create index \"xp_perm\" on xperm (\"xp_perm\") "); From d0258c0da2c76c54edc800d26f559a654f5366f8 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Jan 2015 20:58:55 -0800 Subject: [PATCH 02/52] More styling for poco reputation page. Note: the reason this isn't yet linked to the UI is because we need to age some old '1' values that are bogus. --- view/css/mod_prep.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/css/mod_prep.css b/view/css/mod_prep.css index 3701cbdff..bb29086da 100644 --- a/view/css/mod_prep.css +++ b/view/css/mod_prep.css @@ -5,4 +5,8 @@ .prep-details { float: left; +} + +.directory-item { + margin: 10px; } \ No newline at end of file From 90fbfb313ee40735f7b8501fb6c5330a06aead5d Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Tue, 20 Jan 2015 20:59:08 -0800 Subject: [PATCH 03/52] Rework directory server update selection query --- include/poller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index 896553a43..61b0881f4 100644 --- a/include/poller.php +++ b/include/poller.php @@ -389,7 +389,7 @@ function poller_run($argv, $argc){ } if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) { - $r = q("select distinct ud_addr, updates.* from updates where ( ud_flags & %d ) = 0 and ud_addr != '' and ( ud_last = '%s' OR ud_last > %s - INTERVAL %s ) group by ud_addr ", + $r = q("SELECT u.ud_addr, u.ud_id, u.ud_last FROM updates AS u INNER JOIN (SELECT ud_addr, max(ud_last) AS ud_last FROM updates WHERE ( ud_flags & %d ) = 0 AND ud_addr != '' AND ( ud_last = '%s' OR ud_last > %s - INTERVAL %s ) GROUP BY ud_addr) AS s ON s.ud_addr = u.ud_addr AND s.ud_last = u.ud_last ", intval(UPDATE_FLAGS_UPDATED), dbesc(NULL_DATE), db_utcnow(), db_quoteinterval('7 DAY') From 2d682cf8b098899148017429bb7826f98accbe97 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Jan 2015 21:08:44 -0800 Subject: [PATCH 04/52] add my.federated.social as directory server --- boot.php | 1 + 1 file changed, 1 insertion(+) diff --git a/boot.php b/boot.php index 2c85d52f0..98ff45ebb 100755 --- a/boot.php +++ b/boot.php @@ -83,6 +83,7 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://zotid.net', 'https://red.zottel.red', 'https://red.pixelbits.de', + 'https://my.federated.social', 'https://whogotzot.com' ); From 2757da433e99fda4368ce07f4f44a0e59a5dd45e Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 21 Jan 2015 11:38:55 +0100 Subject: [PATCH 05/52] bring back nav-search spinner --- view/js/autocomplete.js | 14 +++++++++----- view/theme/redbasic/css/style.css | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 1c524789d..86847cb35 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -3,15 +3,18 @@ * * require jQuery, jquery.textcomplete */ -function contact_search(term, callback, backend_url, type, extra_channels) { +function contact_search(term, callback, backend_url, type, extra_channels, spinelement) { + if(spinelement){ + $(spinelement).spin('tiny'); + } // Check if there is a cached result that contains the same information we would get with a full server-side search - var bt = backend_url+type; if(!(bt in contact_search.cache)) contact_search.cache[bt] = {}; var lterm = term.toLowerCase(); // Ignore case for(t in contact_search.cache[bt]) { if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results + $(spinelement).spin(false); // Filter old results locally var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one matching.unshift({taggable:false, text: term, replace: term}); @@ -44,6 +47,7 @@ function contact_search(term, callback, backend_url, type, extra_channels) { var items = data.items.slice(0); items.unshift({taggable:false, text: term, replace: term}); callback(items); + $(spinelement).spin(false); }, }).fail(function () {callback([]); }); // Callback must be invoked even if something went wrong. } @@ -98,7 +102,7 @@ function submit_form(e) { contacts = { match: /(^|\s)(@\!*)([^ \n]+)$/, index: 3, - search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels); }, + search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels, spinelement=false); }, replace: editor_replace, template: contact_format, } @@ -125,7 +129,7 @@ function submit_form(e) { contacts = { match: /(^@)([^\n]{2,})$/, index: 2, - search: function(term, callback) { contact_search(term, callback, backend_url, 'x',[]); }, + search: function(term, callback) { contact_search(term, callback, backend_url, 'x', [], spinelement='#nav-search-spinner'); }, replace: basic_replace, template: contact_format, } @@ -147,7 +151,7 @@ function submit_form(e) { contacts = { match: /(^)([^\n]+)$/, index: 2, - search: function(term, callback) { contact_search(term, callback, backend_url, typ,[]); }, + search: function(term, callback) { contact_search(term, callback, backend_url, typ,[], spinelement=false); }, replace: basic_replace, template: contact_format, } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ce933ba10..c95909085 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -876,8 +876,8 @@ footer { nav .acpopup { top: 49px !important; - right: 30px !important; - margin-left: -45px; + margin-left: -35px; + width: 290px; } .profile-clear { From 6ea5b577157606ee649b7948197dc7b23e61ce40 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Wed, 21 Jan 2015 12:28:45 +0100 Subject: [PATCH 06/52] Update to latest version of jquery-textcomplete. --- .../jquery.textcomplete.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/library/jquery-textcomplete/jquery.textcomplete.js b/library/jquery-textcomplete/jquery.textcomplete.js index c8303eaa0..3df84f3b4 100644 --- a/library/jquery-textcomplete/jquery.textcomplete.js +++ b/library/jquery-textcomplete/jquery.textcomplete.js @@ -124,9 +124,8 @@ if (typeof jQuery === 'undefined') { this.views = []; this.option = $.extend({}, Completer._getDefaults(), option); - if (!this.$el.is('input[type=text]') && !this.$el.is('textarea') && !element.isContentEditable && element.contentEditable != 'true') { - throw new Error('textcomplete must be called on a input[type=text], Textarea or a ContentEditable.'); + throw new Error('textcomplete must be called on a Textarea or a ContentEditable.'); } if (element === document.activeElement) { @@ -414,6 +413,22 @@ if (typeof jQuery === 'undefined') { setPosition: function (position) { this.$el.css(this._applyPlacement(position)); + + // Make the dropdown fixed if the input is also fixed + // This can't be done during init, as textcomplete may be used on multiple elements on the same page + // Because the same dropdown is reused behind the scenes, we need to recheck every time the dropdown is showed + var position = 'absolute'; + // Check if input or one of its parents has positioning we need to care about + this.$inputEl.add(this.$inputEl.parents()).each(function() { + if($(this).css('position') === 'absolute') // The element has absolute positioning, so it's all OK + return false; + if($(this).css('position') === 'fixed') { + position = 'fixed'; + return false; + } + }); + this.$el.css({ position: position }); // Update positioning + return this; }, From 84833ca15ec39e85d8c39457f0bb850a0a22525f Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Wed, 21 Jan 2015 12:34:01 +0100 Subject: [PATCH 07/52] Update to latest version of jRange (fixes issue #867) --- library/jRange/jquery.range-min.js | 2 +- library/jRange/jquery.range.css | 3 +++ library/jRange/jquery.range.js | 10 +++++++--- library/jRange/jquery.range.less | 3 +++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/library/jRange/jquery.range-min.js b/library/jRange/jquery.range-min.js index 8aa6e7ecb..00dadf220 100644 --- a/library/jRange/jquery.range-min.js +++ b/library/jRange/jquery.range-min.js @@ -1 +1 @@ -!function($,t,i,s){"use strict";var o=function(){return this.init.apply(this,arguments)};o.prototype={defaults:{onstatechange:function(){},isRange:!1,showLabels:!0,showScale:!0,step:1,format:"%s",theme:"theme-green",width:300},template:'
123456
456789
',init:function(t,i){this.options=$.extend({},this.defaults,i),this.inputNode=$(t),this.options.value=this.inputNode.val()||(this.options.isRange?this.options.from+","+this.options.from:this.options.from),this.domNode=$(this.template),this.domNode.addClass(this.options.theme),this.inputNode.after(this.domNode),this.domNode.on("change",this.onChange),this.pointers=$(".pointer",this.domNode),this.lowPointer=this.pointers.first(),this.highPointer=this.pointers.last(),this.labels=$(".pointer-label",this.domNode),this.lowLabel=this.labels.first(),this.highLabel=this.labels.last(),this.scale=$(".scale",this.domNode),this.bar=$(".selected-bar",this.domNode),this.clickableBar=this.domNode.find(".clickable-dummy"),this.interval=this.options.to-this.options.from,this.render()},render:function(){return 0!==this.inputNode.width()||this.options.width?(this.domNode.width(this.options.width||this.inputNode.width()),this.inputNode.hide(),this.isSingle()&&(this.lowPointer.hide(),this.lowLabel.hide()),this.options.showLabels||this.labels.hide(),this.attachEvents(),this.options.showScale&&this.renderScale(),void this.setValue(this.options.value)):void console.log("jRange : no width found, returning")},isSingle:function(){return"number"==typeof this.options.value?!0:-1!==this.options.value.indexOf(",")||this.options.isRange?!1:!0},attachEvents:function(){this.clickableBar.click($.proxy(this.barClicked,this)),this.pointers.mousedown($.proxy(this.onDragStart,this)),this.pointers.bind("dragstart",function(t){t.preventDefault()})},onDragStart:function(t){if(1===t.which){t.stopPropagation(),t.preventDefault();var s=$(t.target);s.addClass("focused"),this[(s.hasClass("low")?"low":"high")+"Label"].addClass("focused"),$(i).on("mousemove.slider",$.proxy(this.onDrag,this,s)),$(i).on("mouseup.slider",$.proxy(this.onDragEnd,this))}},onDrag:function(t,i){i.stopPropagation(),i.preventDefault();var s=i.clientX-this.domNode.offset().left;this.domNode.trigger("change",[this,t,s])},onDragEnd:function(){this.pointers.removeClass("focused"),this.labels.removeClass("focused"),$(i).off(".slider"),$(i).off(".slider")},barClicked:function(t){var i=t.pageX-this.clickableBar.offset().left;if(this.isSingle())this.setPosition(this.pointers.last(),i,!0,!0);else{var s=Math.abs(parseInt(this.pointers.first().css("left"),10)-i+this.pointers.first().width()/2)'+("|"!=t[o]?""+t[o]+"":"")+"";this.scale.html(s),$("ins",this.scale).each(function(){$(this).css({marginLeft:-$(this).outerWidth()/2})})},getBarWidth:function(){var t=this.options.value.split(",");return t.length>1?parseInt(t[1],10)-parseInt(t[0],10):parseInt(t[0],10)},showPointerValue:function(t,i,o){var e=$(".pointer-label",this.domNode)[t.hasClass("low")?"first":"last"](),n,h=this.positionToValue(i);if($.isFunction(this.options.format)){var a=this.isSingle()?s:t.hasClass("low")?"low":"high";n=this.options.format(h,a)}else n=this.options.format.replace("%s",h);var r=e.html(n).width(),l=i-r/2;l=Math.min(Math.max(l,0),this.options.width-r),e[o?"animate":"css"]({left:l}),this.setInputValue(t,h)},valuesToPrc:function(t){var i=100*(t[0]-this.options.from)/this.interval,s=100*(t[1]-this.options.from)/this.interval;return[i,s]},prcToPx:function(t){return this.domNode.width()*t/100},positionToValue:function(t){var i=t/this.domNode.width()*this.interval;return i+=this.options.from,Math.round(i/this.options.step)*this.options.step},setInputValue:function(t,i){if(this.isSingle())this.options.value=i.toString();else{var s=this.options.value.split(",");this.options.value=t.hasClass("low")?i+","+s[1]:s[0]+","+i}this.inputNode.val()!==this.options.value&&(this.inputNode.val(this.options.value),this.options.onstatechange.call(this,this.options.value))},getValue:function(){return this.options.value}};var e="jRange";$.fn[e]=function(t){var i=arguments,s;return this.each(function(){var n=$(this),h=$.data(this,"plugin_"+e),a="object"==typeof t&&t;h||n.data("plugin_"+e,h=new o(this,a)),"string"==typeof t&&(s=h[t].apply(h,Array.prototype.slice.call(i,1)))}),s||this}}(jQuery,window,document); \ No newline at end of file +!function($,t,i,s){"use strict";var o=function(){return this.init.apply(this,arguments)};o.prototype={defaults:{onstatechange:function(){},isRange:!1,showLabels:!0,showScale:!0,step:1,format:"%s",theme:"theme-green",width:300,minRange:0,maxRange:"auto"},template:'
123456
456789
',init:function(t,i){this.options=$.extend({},this.defaults,i),this.inputNode=$(t),this.options.value=this.inputNode.val()||(this.options.isRange?this.options.from+","+this.options.from:this.options.from),this.domNode=$(this.template),this.domNode.addClass(this.options.theme),this.inputNode.after(this.domNode),this.domNode.on("change",this.onChange),this.pointers=$(".pointer",this.domNode),this.lowPointer=this.pointers.first(),this.highPointer=this.pointers.last(),this.labels=$(".pointer-label",this.domNode),this.lowLabel=this.labels.first(),this.highLabel=this.labels.last(),this.scale=$(".scale",this.domNode),this.bar=$(".selected-bar",this.domNode),this.clickableBar=this.domNode.find(".clickable-dummy"),this.interval=this.options.to-this.options.from,this.render()},render:function(){return 0!==this.inputNode.width()||this.options.width?(this.domNode.width(this.options.width||this.inputNode.width()),this.inputNode.hide(),this.isSingle()&&(this.lowPointer.hide(),this.lowLabel.hide()),this.options.showLabels||this.labels.hide(),this.attachEvents(),this.options.showScale&&this.renderScale(),void this.setValue(this.options.value)):void console.log("jRange : no width found, returning")},isSingle:function(){return"number"==typeof this.options.value?!0:-1!==this.options.value.indexOf(",")||this.options.isRange?!1:!0},attachEvents:function(){this.clickableBar.click($.proxy(this.barClicked,this)),this.pointers.mousedown($.proxy(this.onDragStart,this)),this.pointers.bind("dragstart",function(t){t.preventDefault()})},onDragStart:function(t){if(1===t.which){t.stopPropagation(),t.preventDefault();var s=$(t.target);this.pointers.removeClass("last-active"),s.addClass("focused last-active"),this[(s.hasClass("low")?"low":"high")+"Label"].addClass("focused"),$(i).on("mousemove.slider",$.proxy(this.onDrag,this,s)),$(i).on("mouseup.slider",$.proxy(this.onDragEnd,this))}},onDrag:function(t,i){i.stopPropagation(),i.preventDefault();var s=i.clientX-this.domNode.offset().left;this.domNode.trigger("change",[this,t,s])},onDragEnd:function(){this.pointers.removeClass("focused"),this.labels.removeClass("focused"),$(i).off(".slider"),$(i).off(".slider")},barClicked:function(t){var i=t.pageX-this.clickableBar.offset().left;if(this.isSingle())this.setPosition(this.pointers.last(),i,!0,!0);else{var s=Math.abs(parseInt(this.pointers.first().css("left"),10)-i+this.pointers.first().width()/2)'+("|"!=t[o]?""+t[o]+"":"")+"";this.scale.html(s),$("ins",this.scale).each(function(){$(this).css({marginLeft:-$(this).outerWidth()/2})})},getBarWidth:function(){var t=this.options.value.split(",");return t.length>1?parseInt(t[1],10)-parseInt(t[0],10):parseInt(t[0],10)},showPointerValue:function(t,i,o){var e=$(".pointer-label",this.domNode)[t.hasClass("low")?"first":"last"](),n,h=this.positionToValue(i);if($.isFunction(this.options.format)){var a=this.isSingle()?s:t.hasClass("low")?"low":"high";n=this.options.format(h,a)}else n=this.options.format.replace("%s",h);var r=e.html(n).width(),l=i-r/2;l=Math.min(Math.max(l,0),this.options.width-r),e[o?"animate":"css"]({left:l}),this.setInputValue(t,h)},valuesToPrc:function(t){var i=100*(t[0]-this.options.from)/this.interval,s=100*(t[1]-this.options.from)/this.interval;return[i,s]},prcToPx:function(t){return this.domNode.width()*t/100},positionToValue:function(t){var i=t/this.domNode.width()*this.interval;return i+=this.options.from,Math.round(i/this.options.step)*this.options.step},setInputValue:function(t,i){if(this.isSingle())this.options.value=i.toString();else{var s=this.options.value.split(",");this.options.value=t.hasClass("low")?i+","+s[1]:s[0]+","+i}this.inputNode.val()!==this.options.value&&(this.inputNode.val(this.options.value),this.options.onstatechange.call(this,this.options.value))},getValue:function(){return this.options.value}};var e="jRange";$.fn[e]=function(t){var i=arguments,s;return this.each(function(){var n=$(this),h=$.data(this,"plugin_"+e),a="object"==typeof t&&t;h||n.data("plugin_"+e,h=new o(this,a)),"string"==typeof t&&(s=h[t].apply(h,Array.prototype.slice.call(i,1)))}),s||this}}(jQuery,window,document); \ No newline at end of file diff --git a/library/jRange/jquery.range.css b/library/jRange/jquery.range.css index 27375c846..4fb1578dc 100644 --- a/library/jRange/jquery.range.css +++ b/library/jRange/jquery.range.css @@ -19,6 +19,9 @@ opacity: 1; z-index: 2; } +.slider-container .back-bar .pointer.last-active { + z-index: 3; +} .slider-container .back-bar .pointer-label { position: absolute; top: -17px; diff --git a/library/jRange/jquery.range.js b/library/jRange/jquery.range.js index 978b3e7ba..b3208387d 100644 --- a/library/jRange/jquery.range.js +++ b/library/jRange/jquery.range.js @@ -33,7 +33,9 @@ step : 1, format: '%s', theme : 'theme-green', - width : 300 + width : 300, + minRange: 0, + maxRange: 'auto' }, template : '
\
\ @@ -103,7 +105,8 @@ if(e.which !== 1){return;} e.stopPropagation(); e.preventDefault(); var pointer = $(e.target); - pointer.addClass('focused'); + this.pointers.removeClass('last-active'); + pointer.addClass('focused last-active'); this[(pointer.hasClass('low')?'low':'high') + 'Label'].addClass('focused'); $(document).on('mousemove.slider', $.proxy(this.onDrag, this, pointer)); $(document).on('mouseup.slider', $.proxy(this.onDragEnd, this)); @@ -280,6 +283,7 @@ options = typeof option === 'object' && option; if (!data) { $this.data('plugin_' + pluginName, (data = new jRange(this, options))); + $(window).resize(function() { data.setValue(data.getValue()); }); // Update slider position when window is resized to keep it in sync with scale } // if first argument is a string, call silimarly named function // this gives flexibility to call functions of the plugin e.g. @@ -294,4 +298,4 @@ return result || this; }; -})(jQuery, window, document); \ No newline at end of file +})(jQuery, window, document); diff --git a/library/jRange/jquery.range.less b/library/jRange/jquery.range.less index 979ed2e1a..cb6e12288 100644 --- a/library/jRange/jquery.range.less +++ b/library/jRange/jquery.range.less @@ -73,6 +73,9 @@ cursor: move; opacity: 1; z-index: 2; + &.last-active{ + z-index: 3; + } } .pointer-label { position: absolute; From 6d0e6b78b4b9797ae2f9c34e4a79a187086495d4 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Jan 2015 14:25:45 -0800 Subject: [PATCH 08/52] update V3 roadmap --- doc/roadmap.bb | 3 +++ version.inc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/roadmap.bb b/doc/roadmap.bb index 9ac51adf2..54dbdc96b 100644 --- a/doc/roadmap.bb +++ b/doc/roadmap.bb @@ -2,6 +2,9 @@ Roadmap for Redmatrix V3 +Crypto + Convert E2EE to dynamic loading (on demand) using jQuery.getScript() [or other methods] to only load encryption libs when you require them. This should also support multiple encryption libraries (e.g. SJCL, others) triggered from the choice of algorithm and remain pluggable. + Subscriptions and business models Build enough into core(/addons) to generate income (or at least try and cover costs) out of the box diff --git a/version.inc b/version.inc index 986738806..742b0e1ed 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-01-20.922 +2015-01-21.923 From 503047dc327a514563a1be64bba163100af5cdec Mon Sep 17 00:00:00 2001 From: Jeroen Date: Thu, 22 Jan 2015 00:11:00 +0000 Subject: [PATCH 09/52] added redmatrix.nl back as a directory server. this was not the issue with the performance problems --- boot.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 98ff45ebb..88e79a95c 100755 --- a/boot.php +++ b/boot.php @@ -84,7 +84,8 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://red.zottel.red', 'https://red.pixelbits.de', 'https://my.federated.social', - 'https://whogotzot.com' + 'https://whogotzot.com', + 'https://redmatrix.nl' ); From 4ff71fc0c7d28b8a843cc67eac1d9463afe575ee Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 22 Jan 2015 02:34:38 +0100 Subject: [PATCH 10/52] change mod/sharedwithme backend to use activity object - this is not backwards compatible --- boot.php | 2 +- include/attach.php | 103 +++++++++++++++++++++++++++++++------------ mod/filestorage.php | 6 +-- mod/sharedwithme.php | 72 ++++++++++++++++-------------- 4 files changed, 116 insertions(+), 67 deletions(-) diff --git a/boot.php b/boot.php index 98ff45ebb..d6c9af7bb 100755 --- a/boot.php +++ b/boot.php @@ -501,7 +501,6 @@ define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' ); define ( 'ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke' ); define ( 'ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood' ); -define ( 'ACTIVITY_FILE', NAMESPACE_ZOT . '/activity/file' ); define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' ); define ( 'ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note' ); @@ -515,6 +514,7 @@ define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT . '/activity/tagterm' ); define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile' ); define ( 'ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing' ); define ( 'ACTIVITY_OBJ_LOCATION',NAMESPACE_ZOT . '/activity/location' ); +define ( 'ACTIVITY_OBJ_FILE', NAMESPACE_ZOT . '/activity/file' ); /** * item weight for query ordering diff --git a/include/attach.php b/include/attach.php index 5ef3bea24..673e438bf 100644 --- a/include/attach.php +++ b/include/attach.php @@ -753,7 +753,7 @@ function attach_delete($channel_id, $resource) { $channel_address = (($c) ? $c[0]['channel_address'] : 'notfound'); - $r = q("SELECT hash, filename, flags, folder FROM attach WHERE hash = '%s' AND uid = %d limit 1", + $r = q("SELECT hash, flags, folder FROM attach WHERE hash = '%s' AND uid = %d limit 1", dbesc($resource), intval($channel_id) ); @@ -762,8 +762,6 @@ function attach_delete($channel_id, $resource) { if(! $r) return; - $url = get_parent_cloudpath($channel_id, $channel_address, $resource) . $r[0]['filename']; - // If resource is a directory delete everything in the directory recursive if($r[0]['flags'] & ATTACH_FLAG_DIR) { $x = q("SELECT hash, flags FROM attach WHERE folder = '%s' AND uid = %d", @@ -806,7 +804,7 @@ function attach_delete($channel_id, $resource) { intval($channel_id) ); - file_activity($channel_id, $resource, $allow_cid='', $allow_gid='', $deny_cid='', $deny_gid='', $url, 'drop', $no_activity=false); + file_activity($channel_id, $resource, $cloudpath='', $allow_cid='', $allow_gid='', $deny_cid='', $deny_gid='', 'drop', $no_activity=false); } /** @@ -942,32 +940,76 @@ function pipe_streams($in, $out) { return $size; } -function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $url, $action, $no_activity) { +function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $verb, $no_activity) { require_once('include/items.php'); - $url = rawurlencode($url); - $poster = get_app()->get_observer(); - $verb = ACTIVITY_FILE . '/' . $action . '/' . $hash; + switch($verb) { + case 'post': + $activity = ACTIVITY_POST; + $x = q("SELECT creator, filename, filetype, filesize, revision, folder, flags, created, edited FROM attach WHERE uid = %d AND hash = '%s' LIMIT 1", + intval($channel_id), + dbesc($hash) + ); + break; + case 'drop': + $activity = ACTIVITY_UPDATE; + break; + default: + return; + break; + } + + $url = (($cloudpath && $x[0]['filename']) ? rawurlencode($cloudpath . $x[0]['filename']) : 'unavailable'); $mid = item_message_id(); $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_UNSEEN; - if($action == 'post') { - //check if activity item exists - //if yes send drop activity and create a new one + $links = array( + 'rel' => 'alternate', + 'type' => 'text/html', + 'href' => $url + ); - $r = q("SELECT * FROM item WHERE verb = '%s'", - dbesc($verb) + $objtype = ACTIVITY_OBJ_FILE; + + $object = array( + 'type' => ACTIVITY_OBJ_FILE, + 'title' => (($x[0]['filename']) ? $x[0]['filename'] : 'unavailable'), + 'id' => $url, + 'link' => $links, + + 'hash' => $hash, + 'creator' => (($x[0]['creator']) ? $x[0]['creator'] : ''), + 'filename' => (($x[0]['filename']) ? $x[0]['filename'] : ''), + 'filetype' => (($x[0]['filetype']) ? $x[0]['filetype'] : ''), + 'filesize' => (($x[0]['filesize']) ? $x[0]['filesize'] : ''), + 'revision' => (($x[0]['revision']) ? $x[0]['revision'] : ''), + 'folder' => (($x[0]['folder']) ? $x[0]['folder'] : ''), + 'flags' => (($x[0]['flags']) ? $x[0]['flags'] : ''), + 'created' => (($x[0]['created']) ? $x[0]['created'] : ''), + 'edited' => (($x[0]['edited']) ? $x[0]['edited'] : '') + ); + + $private = (($allow_cid || $allow_gid || $deny_cid || $deny_gid) ? 1 : 0); + + if($verb == 'post') { + //check if activity item exists + //if yes send update (drop) activity and create a new one + $y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND object LIKE '%s'", + dbesc(ACTIVITY_POST), + dbesc(ACTIVITY_OBJ_FILE), + dbesc('%"hash":"' . $hash . '"%') ); - if($r) { + if($y) { $dmid = item_message_id(); - $updateverb = ACTIVITY_FILE . '/drop/' . $hash . '#' . $mid; + + $object['mid'] = $mid; //attach mid for update object $arr = array(); @@ -979,14 +1021,17 @@ function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $d $arr['author_xchan'] = $poster['xchan_hash']; $arr['owner_xchan'] = $poster['xchan_hash']; $arr['title'] = ''; - $arr['allow_cid'] = $allow_cid; - $arr['allow_gid'] = $allow_gid; - $arr['deny_cid'] = $deny_cid; - $arr['deny_gid'] = $deny_gid; + //updates must be visible to everybody -> perms may have changed + $arr['allow_cid'] = ''; + $arr['allow_gid'] = ''; + $arr['deny_cid'] = ''; + $arr['deny_gid'] = ''; $arr['item_restrict'] = ITEM_HIDDEN; $arr['item_private'] = 0; - $arr['verb'] = $updateverb; - $arr['body'] = $url; + $arr['verb'] = ACTIVITY_UPDATE; + $arr['obj_type'] = $objtype; + $arr['object'] = json_encode($object); + $arr['body'] = ''; $post = item_store($arr); $item_id = $post['item_id']; @@ -995,7 +1040,9 @@ function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $d proc_run('php',"include/notifier.php","activity",$item_id); } - //call_hooks('post_local_end', $arr); + call_hooks('post_local_end', $arr); + + unset($object['mid']); //remove mid for new object //notice( t('File activity updated') . EOL); @@ -1025,9 +1072,11 @@ function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $d $arr['deny_cid'] = $deny_cid; $arr['deny_gid'] = $deny_gid; $arr['item_restrict'] = ITEM_HIDDEN; - $arr['item_private'] = 0; - $arr['verb'] = $verb; - $arr['body'] = $url; + $arr['item_private'] = $private; + $arr['verb'] = $activity; + $arr['obj_type'] = $objtype; + $arr['object'] = json_encode($object); + $arr['body'] = ''; $post = item_store($arr); $item_id = $post['item_id']; @@ -1036,9 +1085,9 @@ function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $d proc_run('php',"include/notifier.php","activity",$item_id); } - //call_hooks('post_local_end', $arr); + call_hooks('post_local_end', $arr); - //(($action === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL)); + //(($verb === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL)); return; diff --git a/mod/filestorage.php b/mod/filestorage.php index 67abc2eab..9852f4e73 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -21,7 +21,6 @@ function filestorage_post(&$a) { $recurse = ((x($_POST, 'recurse')) ? intval($_POST['recurse']) : 0); $resource = ((x($_POST, 'filehash')) ? notags($_POST['filehash']) : ''); - $no_activity = ((x($_POST, 'no_activity')) ? intval($_POST['no_activity']) : 0); if(! $resource) { @@ -40,10 +39,7 @@ function filestorage_post(&$a) { $channel = $a->get_channel(); $cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource); - $filename = find_filename_by_hash($channel_id, $resource); - $url = $cloudPath . $filename; - - file_activity($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $url, 'post', $no_activity); + file_activity($channel_id, $resource, $cloudPath, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity); goaway($cloudPath); } diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php index d4aa129ac..53884788d 100644 --- a/mod/sharedwithme.php +++ b/mod/sharedwithme.php @@ -1,5 +1,4 @@ 1) && (argv(1) === 'dropall')) { - q("DELETE FROM item WHERE verb LIKE '%s' AND uid = %d", - dbesc($postverb . '%'), + q("DELETE FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d", + dbesc(ACTIVITY_POST), + dbesc(ACTIVITY_OBJ_FILE), intval(local_user()) ); @@ -77,11 +83,13 @@ function sharedwithme_content(&$a) { } //list files - $r = q("SELECT * FROM item WHERE verb LIKE '%s' AND uid = %d", - dbesc($postverb . '%'), - intval(local_user()) + $r = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'", + dbesc(ACTIVITY_POST), + dbesc(ACTIVITY_OBJ_FILE), + intval(local_user()), + dbesc($channel['channel_hash']) ); - + $o = profile_tabs($a, $is_owner, $channel['channel_address']); $o .= '
'; @@ -96,19 +104,15 @@ function sharedwithme_content(&$a) { if($r) { foreach($r as $rr) { - //don't display the files we shared with others - if($rr['owner_xchan'] != $channel['channel_hash']) { - unobscure($rr); - $url = rawurldecode($rr['body']); - $o .= '' . $url . ' 

'; - } + $object = json_decode($rr['object'],true); + $url = rawurldecode($object['link']['href']); + $o .= '' . $url . ' 

'; } } $o .= '
'; return $o; - } From 8472e706bc8c2be81a4426586d511de21c919209 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Jan 2015 18:34:15 -0800 Subject: [PATCH 11/52] hubloc manage issue --- mod/locs.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/locs.php b/mod/locs.php index b1169fcca..7ca813c34 100644 --- a/mod/locs.php +++ b/mod/locs.php @@ -24,7 +24,7 @@ function locs_post(&$a) { intval(HUBLOC_FLAGS_PRIMARY), dbesc($channel['channel_hash']) ); - $r = q("update hubloc set hubloc_flags = (hubloc_flags & %d) where hubloc_id = %d and hubloc_hash = '%s'", + $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d and hubloc_hash = '%s'", intval(HUBLOC_FLAGS_PRIMARY), intval($hubloc_id), dbesc($channel['channel_hash']) @@ -36,12 +36,14 @@ function locs_post(&$a) { if($_REQUEST['drop']) { $hubloc_id = intval($_REQUEST['drop']); + if($hubloc_id) { $r = q("select hubloc_id, hubloc_flags from hubloc where hubloc_id = %d and hubloc_url != '%s' and hubloc_hash = '%s' limit 1", intval($hubloc_id), dbesc(z_root()), dbesc($channel['channel_hash']) ); + if(! $r) { notice( t('Location not found.') . EOL); return; @@ -50,7 +52,7 @@ function locs_post(&$a) { notice( t('Primary location cannot be removed.') . EOL); return; } - $r = q("update hubloc set hubloc_flags = (hubloc_flags & %d) where hubloc_id = %d and hubloc_hash = '%s'", + $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d and hubloc_hash = '%s'", intval(HUBLOC_FLAGS_DELETED), intval($hubloc_id), dbesc($channel['channel_hash']) From b946ac63a17ce95aa80d016ca4c2195ec8d7498a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Jan 2015 19:09:12 -0800 Subject: [PATCH 12/52] couple of hubloc manager issues --- mod/locs.php | 6 +++++- view/tpl/locmanage.tpl | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mod/locs.php b/mod/locs.php index 7ca813c34..bf2737718 100644 --- a/mod/locs.php +++ b/mod/locs.php @@ -11,15 +11,18 @@ function locs_post(&$a) { if($_REQUEST['primary']) { $hubloc_id = intval($_REQUEST['primary']); if($hubloc_id) { + $r = q("select hubloc_id from hubloc where hubloc_id = %d and hubloc_hash = '%s' limit 1", intval($hubloc_id), dbesc($channel['channel_hash']) ); + if(! $r) { notice( t('Location not found.') . EOL); return; } - $r = q("update hubloc set hubloc_flags = (hubloc_flags & ~%d) where (hubloc_flags & %d)>0 and hubloc_hash = '%s' ", + + $r = q("update hubloc set hubloc_flags = (hubloc_flags - %d) where (hubloc_flags & %d)>0 and hubloc_hash = '%s' ", intval(HUBLOC_FLAGS_PRIMARY), intval(HUBLOC_FLAGS_PRIMARY), dbesc($channel['channel_hash']) @@ -29,6 +32,7 @@ function locs_post(&$a) { intval($hubloc_id), dbesc($channel['channel_hash']) ); + proc_run('php','include/notifier.php','location',$channel['channel_id']); return; } diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index 5a25850a1..d1bb00543 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -2,10 +2,10 @@ @@ -17,7 +17,7 @@ function drophub(id) { {{$hub.hubloc_url}} ({{$hub.hubloc_addr}}){{if $hub.deleted}}{{/if}} -{{if $hub.primary}}{{else}}{{/if}} +{{if $hub.primary}}{{else}}{{/if}} {{if $hub.primary}}{{else}}{{if ! $hub.deleted}}{{/if}}{{/if}} From 3731ff97ffa9d6c98c7287458edd783823f68305 Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 22 Jan 2015 04:57:59 +0100 Subject: [PATCH 13/52] make $links an array of links --- include/attach.php | 3 ++- mod/sharedwithme.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/attach.php b/include/attach.php index 673e438bf..a6757744f 100644 --- a/include/attach.php +++ b/include/attach.php @@ -968,7 +968,8 @@ function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $ $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_UNSEEN; - $links = array( + $links = array(); + $links[] = array( 'rel' => 'alternate', 'type' => 'text/html', 'href' => $url diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php index 53884788d..ff93051da 100644 --- a/mod/sharedwithme.php +++ b/mod/sharedwithme.php @@ -1,5 +1,6 @@ ' . $url . ' 

'; } } From 76fe9dc7023f6d67c19770b46ed639c56bc0ff06 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Jan 2015 20:08:10 -0800 Subject: [PATCH 14/52] zot_finger second arg is optional but function declaration didn't specify this - causes issue with check_upstream_directory --- include/zot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/zot.php b/include/zot.php index 384769d61..3d92f7824 100644 --- a/include/zot.php +++ b/include/zot.php @@ -176,7 +176,7 @@ function zot_zot($url,$data) { */ -function zot_finger($webbie,$channel,$autofallback = true) { +function zot_finger($webbie,$channel = null,$autofallback = true) { if(strpos($webbie,'@') === false) { From 6d291d880e14c0489277fd670f235bdb60bcfcd5 Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Wed, 21 Jan 2015 21:25:50 -0800 Subject: [PATCH 15/52] directory server dba sql fixes --- mod/dirsearch.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/dirsearch.php b/mod/dirsearch.php index a88db0a2c..4a44feb7d 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -148,10 +148,10 @@ function dirsearch_content(&$a) { // If &return_total=1, we count matching entries and return that as 'total_items' for use in pagination. // By default we return one page (default 80 items maximum) and do not count total entries - $logic = ((strlen($sql_extra)) ? 0 : 1); + $logic = ((strlen($sql_extra)) ? 'false' : 'true'); if($hash) - $logic = 1; + $logic = 'true'; if($dirmode == DIRECTORY_MODE_STANDALONE) { $sql_extra .= " and xchan_addr like '%%" . get_app()->get_hostname() . "' "; @@ -165,7 +165,7 @@ function dirsearch_content(&$a) { if($limit) $qlimit = " LIMIT $limit "; else { - $qlimit = " LIMIT " . intval($startrec) . " , " . intval($perpage); + $qlimit = " LIMIT " . intval($perpage) . " OFFSET " . intval($startrec); if($return_total) { $r = q("SELECT COUNT(xchan_hash) AS `total` FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and xchan_network = 'zot' and not ( xchan_flags & %d)>0 and not ( xchan_flags & %d )>0 and not ( xchan_flags & %d )>0 $safesql ", intval(XCHAN_FLAGS_HIDDEN), From d94114ec986ba1440b74d41bec8896db186f8eb2 Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 22 Jan 2015 12:12:42 +0100 Subject: [PATCH 16/52] add some mimetypes --- include/RedDAV/RedBrowser.php | 7 +++++-- include/attach.php | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php index 93a546086..5642c3f86 100644 --- a/include/RedDAV/RedBrowser.php +++ b/include/RedDAV/RedBrowser.php @@ -378,11 +378,14 @@ class RedBrowser extends DAV\Browser\Plugin { 'audio/mpeg' => 'icon-music', 'audio/wav' => 'icon-music', 'application/ogg' => 'icon-music', + 'audio/ogg' => 'icon-music', + 'audio/webm' => 'icon-music', + 'audio/mp4' => 'icon-music', //Video 'video/quicktime' => 'icon-film', - - + 'video/webm' => 'icon-film', + 'video/mp4' => 'icon-film' ); $iconFromType = 'icon-file-alt'; diff --git a/include/attach.php b/include/attach.php index a6757744f..c66ba40d5 100644 --- a/include/attach.php +++ b/include/attach.php @@ -64,6 +64,11 @@ function z_mime_content_type($filename) { 'qt' => 'video/quicktime', 'mov' => 'video/quicktime', 'ogg' => 'application/ogg', + 'opus' => 'audio/ogg', + 'webm' => 'audio/webm', + 'webm' => 'video/webm', + 'mp4' => 'audio/mp4', + 'mp4' => 'video/mp4', // adobe 'pdf' => 'application/pdf', @@ -81,6 +86,22 @@ function z_mime_content_type($filename) { // open office 'odt' => 'application/vnd.oasis.opendocument.text', 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', + 'odp' => 'application/vnd.oasis.opendocument.presentation', + 'odg' => 'application/vnd.oasis.opendocument.graphics', + 'odc' => 'application/vnd.oasis.opendocument.chart', + 'odf' => 'application/vnd.oasis.opendocument.formula', + 'odi' => 'application/vnd.oasis.opendocument.image', + 'odm' => 'application/vnd.oasis.opendocument.text-master', + 'odb' => 'application/vnd.oasis.opendocument.base', + 'odb' => 'application/vnd.oasis.opendocument.database', + 'ott' => 'application/vnd.oasis.opendocument.text-template', + 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template', + 'otp' => 'application/vnd.oasis.opendocument.presentation-template', + 'otg' => 'application/vnd.oasis.opendocument.graphics-template', + 'otc' => 'application/vnd.oasis.opendocument.chart-template', + 'otf' => 'application/vnd.oasis.opendocument.formula-template', + 'oti' => 'application/vnd.oasis.opendocument.image-template', + 'oth' => 'application/vnd.oasis.opendocument.text-web' ); $dot = strpos($filename, '.'); From 9d9be768c53bebbc8e339704d74b3e6e78700d5a Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Thu, 22 Jan 2015 09:25:34 -0800 Subject: [PATCH 17/52] fix dir server query take 2 rationale: use latest entry rather than latest update. update timestamp is updated for all entries upon success so they are equivalent. prevents dupes from fake null dates. --- include/poller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index 61b0881f4..d78355db1 100644 --- a/include/poller.php +++ b/include/poller.php @@ -389,7 +389,7 @@ function poller_run($argv, $argc){ } if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) { - $r = q("SELECT u.ud_addr, u.ud_id, u.ud_last FROM updates AS u INNER JOIN (SELECT ud_addr, max(ud_last) AS ud_last FROM updates WHERE ( ud_flags & %d ) = 0 AND ud_addr != '' AND ( ud_last = '%s' OR ud_last > %s - INTERVAL %s ) GROUP BY ud_addr) AS s ON s.ud_addr = u.ud_addr AND s.ud_last = u.ud_last ", + $r = q("SELECT u.ud_addr, u.ud_id, u.ud_last FROM updates AS u INNER JOIN (SELECT ud_addr, max(ud_id) AS ud_id FROM updates WHERE ( ud_flags & %d ) = 0 AND ud_addr != '' AND ( ud_last = '%s' OR ud_last > %s - INTERVAL %s ) GROUP BY ud_addr) AS s ON s.ud_id = u.ud_id ", intval(UPDATE_FLAGS_UPDATED), dbesc(NULL_DATE), db_utcnow(), db_quoteinterval('7 DAY') From 87dcc4c145cae992d7aa009c36fa45cf543cad55 Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 22 Jan 2015 22:50:38 +0100 Subject: [PATCH 18/52] possible performance improvement for sharedwithme update query --- mod/sharedwithme.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php index ff93051da..baaf41f61 100644 --- a/mod/sharedwithme.php +++ b/mod/sharedwithme.php @@ -12,7 +12,7 @@ function sharedwithme_content(&$a) { $is_owner = (local_user() && (local_user() == $channel['channel_id'])); - //maintenance - see if a file got dropped and remove it systemwide + //maintenance - see if a file got dropped and remove it systemwide - this should possibly go to include/poller $x = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d", dbesc(ACTIVITY_UPDATE), dbesc(ACTIVITY_OBJ_FILE), @@ -26,18 +26,21 @@ function sharedwithme_content(&$a) { $object = json_decode($xx['object'],true); $hash = $object['hash']; - //If object has a mid it's an update - the inlcuded mid is the latest and should not be removed + //If object has a mid it's an update activity - the inlcuded mid is the latest and should not be removed $update = (($object['mid']) ? true : false); if($update) { $mid = $object['mid']; - $y = q("DELETE FROM item WHERE (mid != '%s' AND obj_type = '%s' AND object LIKE '%s') AND (verb = '%s' OR verb = '%s')", + unset($object['mid']); //remove mid from object to match the post activity object + + $y = q("DELETE FROM item WHERE (mid != '%s' AND obj_type = '%s') AND (object = '%s' AND verb = '%s') OR (object = '%s' AND verb = '%s')", dbesc($mid), dbesc(ACTIVITY_OBJ_FILE), - dbesc('%"hash":"' . $hash . '"%'), + dbesc(json_encode($object)), dbesc(ACTIVITY_POST), + dbesc($xx['object']), dbesc(ACTIVITY_UPDATE) ); From e87437626867caf133eee2ef7cdba39506497eab Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 23 Jan 2015 02:09:28 +0100 Subject: [PATCH 19/52] this will require more fixing in include/enotify --- mod/ping.php | 2 +- view/tpl/hdr.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/ping.php b/mod/ping.php index 593ae21f8..1cebd152d 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -229,7 +229,7 @@ function ping_init(&$a) { foreach($z as $zz) { $notifs[] = array( 'notify_link' => $a->get_baseurl() . '/notify/view/' . $zz['id'], - 'name' => '', // not required here because the name is in the message + 'name' => $zz['name'], 'url' => $zz['url'], 'photo' => $zz['photo'], 'when' => relative_date($zz['date']), diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index cfd22e607..c3f0700f0 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,5 +1,5 @@ From 0cdcc4bc500c082c7d87096cc6be9dfe7c5db2f5 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 23 Jan 2015 03:25:17 -0800 Subject: [PATCH 20/52] doc updates --- doc/html/apw_2php_2style_8php.html | 4 +- doc/html/boot_8php.html | 83 +- doc/html/boot_8php.js | 2 +- doc/html/conversation_8php.html | 2 +- doc/html/dba__driver_8php.html | 8 +- .../dir_d41ce877eb409a4791b288730010abe2.html | 2 + .../dir_d41ce877eb409a4791b288730010abe2.js | 1 + doc/html/extract_8php.html | 2 +- doc/html/files.html | 69 +- doc/html/fixd_8php.html | 2 +- doc/html/globals_0x61.html | 6 +- doc/html/globals_0x66.html | 3 + doc/html/globals_0x73.html | 3 + doc/html/globals_0x7a.html | 2 +- doc/html/globals_func_0x66.html | 3 + doc/html/globals_func_0x73.html | 3 + doc/html/globals_func_0x7a.html | 2 +- doc/html/globals_vars_0x61.html | 6 +- doc/html/include_2attach_8php.html | 80 +- doc/html/include_2attach_8php.js | 1 + doc/html/include_2network_8php.html | 4 +- doc/html/items_8php.html | 2 +- doc/html/language_8php.html | 2 +- doc/html/navtree.js | 8 +- doc/html/navtreeindex0.js | 6 +- doc/html/navtreeindex1.js | 12 +- doc/html/navtreeindex5.js | 6 +- doc/html/navtreeindex6.js | 14 +- doc/html/navtreeindex7.js | 8 +- doc/html/navtreeindex8.js | 56 +- doc/html/navtreeindex9.js | 113 +- doc/html/php_2theme__init_8php.html | 2 +- doc/html/plugin_8php.html | 2 +- doc/html/search/all_61.js | 2 +- doc/html/search/all_66.js | 1 + doc/html/search/all_73.js | 12 +- doc/html/search/all_7a.js | 2 +- doc/html/search/files_73.js | 11 +- doc/html/search/functions_66.js | 1 + doc/html/search/functions_73.js | 1 + doc/html/search/functions_7a.js | 2 +- doc/html/search/variables_61.js | 2 +- doc/html/sharedwithme_8php.html | 137 ++ doc/html/sharedwithme_8php.js | 4 + doc/html/text_8php.html | 6 +- doc/html/typo_8php.html | 2 +- doc/html/zot_8php.html | 10 +- doc/html/zot_8php.js | 2 +- util/messages.po | 1798 +++++++++-------- version.inc | 2 +- 50 files changed, 1389 insertions(+), 1125 deletions(-) create mode 100644 doc/html/sharedwithme_8php.html create mode 100644 doc/html/sharedwithme_8php.js diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html index 649e3be04..2284b3b0b 100644 --- a/doc/html/apw_2php_2style_8php.html +++ b/doc/html/apw_2php_2style_8php.html @@ -160,7 +160,7 @@ Variables
-

Referenced by reload_plugins().

+

Referenced by RedMatrix\RedDAV\RedFile\put(), and reload_plugins().

@@ -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(), RedMatrix\RedDAV\RedDirectory\childExists(), cloud_init(), common_init(), connedit_content(), construct_page(), consume_feed(), conversation(), RedMatrix\RedDAV\RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), dav_init(), decode_tags(), deliver_run(), diaspora_comment(), diaspora_like(), diaspora_mention_callback(), diaspora_request(), dir_tagadelic(), directory_content(), directory_run(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), editblock_content(), editlayout_content(), editwebpage_content(), email_header_encode(), encode_item(), encode_mail(), dba_postgres\escape(), 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(), foofoo(), fsuggest_post(), get_all_perms(), get_diaspora_reshare_xml(), 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_role_perms(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getQuotaInfo(), gprobe_run(), handle_feed(), hcard_init(), hostxrd_init(), ids_to_querystr(), impel_init(), 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(), linkify_tags(), locs_content(), 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(), notifications_off(), notifications_on(), notifier_run(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), page_init(), 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(), prepare_body(), print_template(), private_messages_list(), proc_run(), process_channel_sync_delivery(), process_location_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), prune_hub_reinstalls(), public_recips(), pubrsatome(), RedMatrix\RedDAV\RedFile\put(), dba_mysql\q(), dba_mysqli\q(), dba_postgres\q(), random_profile(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), reflect_comment_store(), reflect_find_user(), reflect_photo_callback(), 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(), set_linkified_perms(), 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(), toggle_theme(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedMatrix\RedDAV\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().

+

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_upstream_directory(), check_webbie(), RedMatrix\RedDAV\RedDirectory\childExists(), cloud_init(), common_init(), connedit_content(), construct_page(), consume_feed(), conversation(), RedMatrix\RedDAV\RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), dav_init(), decode_tags(), deliver_run(), diaspora_comment(), diaspora_like(), diaspora_mention_callback(), diaspora_request(), dir_tagadelic(), directory_content(), directory_run(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), editblock_content(), editlayout_content(), editwebpage_content(), email_header_encode(), encode_item(), encode_mail(), dba_postgres\escape(), event_store_item(), events_post(), expand_groups(), expire_run(), externals_run(), feature_enabled(), fetch_post_tags(), fetch_xrd_links(), file_activity(), filer_content(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), foofoo(), fsuggest_post(), get_all_perms(), get_diaspora_reshare_xml(), 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_role_perms(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getQuotaInfo(), gprobe_run(), handle_feed(), hcard_init(), hostxrd_init(), ids_to_querystr(), impel_init(), 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(), linkify_tags(), locs_content(), 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(), notifications_off(), notifications_on(), notifier_run(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), page_init(), 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(), prepare_body(), print_template(), private_messages_list(), proc_run(), process_channel_sync_delivery(), process_location_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), prune_hub_reinstalls(), public_recips(), pubrsatome(), RedMatrix\RedDAV\RedFile\put(), dba_mysql\q(), dba_mysqli\q(), dba_postgres\q(), random_profile(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), reflect_comment_store(), reflect_find_user(), reflect_photo_callback(), 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(), set_linkified_perms(), share_init(), share_unshield(), sharedwithme_content(), 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(), toggle_theme(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedMatrix\RedDAV\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 b182f850c..8305436d9 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -242,7 +242,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1132 +const DB_UPDATE_VERSION 1134   const EOL '<br>' . "\r\n"   @@ -678,8 +678,6 @@ Variables   const ACTIVITY_MOOD NAMESPACE_ZOT . '/activity/mood'   -const ACTIVITY_FILE NAMESPACE_ZOT . '/activity/file' -  const ACTIVITY_OBJ_COMMENT NAMESPACE_ACTIVITY_SCHEMA . 'comment'   const ACTIVITY_OBJ_NOTE NAMESPACE_ACTIVITY_SCHEMA . 'note' @@ -704,6 +702,8 @@ Variables   const ACTIVITY_OBJ_LOCATION NAMESPACE_ZOT . '/activity/location'   +const ACTIVITY_OBJ_FILE NAMESPACE_ZOT . '/activity/file' +  const GRAVITY_PARENT 0   const GRAVITY_LIKE 3 @@ -854,7 +854,7 @@ Variables
-

Referenced by App\__construct(), _well_known_init(), achievements_content(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_profs(), admin_page_users(), admin_post(), api_get_user(), apps_content(), attach_init(), block_content(), blocks_init(), channel_init(), chat_content(), chat_init(), cloud_init(), common_init(), connect_init(), connections_content(), connedit_content(), connedit_init(), connedit_post(), contactgroup_content(), dav_init(), dirsearch_content(), display_content(), editblock_content(), editblock_init(), editlayout_content(), editlayout_init(), editpost_content(), editwebpage_content(), editwebpage_init(), events_content(), feed_init(), filestorage_content(), group_content(), group_post(), hcard_init(), help_content(), home_content(), home_init(), importelm_post(), item_content(), layouts_content(), layouts_init(), like_content(), lockview_content(), mail_content(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), new_channel_init(), notes_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), online_init(), p_init(), page_init(), pdledit_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), prep_init(), profile_init(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), queue_run(), rbmark_content(), receive_post(), register_init(), regmod_content(), regver_content(), rpost_content(), settings_init(), settings_post(), setup_init(), share_init(), sources_content(), starred_init(), subthread_content(), tagger_content(), tagrm_content(), thing_content(), uexport_init(), update_channel_content(), update_display_content(), update_home_content(), update_network_content(), update_search_content(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_init(), xref_init(), and zotfeed_init().

+

Referenced by App\__construct(), _well_known_init(), achievements_content(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_profs(), admin_page_users(), admin_post(), api_get_user(), apps_content(), attach_init(), block_content(), blocks_init(), channel_init(), chat_content(), chat_init(), cloud_init(), common_init(), connect_init(), connections_content(), connedit_content(), connedit_init(), connedit_post(), contactgroup_content(), dav_init(), dirsearch_content(), display_content(), editblock_content(), editblock_init(), editlayout_content(), editlayout_init(), editpost_content(), editwebpage_content(), editwebpage_init(), events_content(), feed_init(), filestorage_content(), group_content(), group_post(), hcard_init(), help_content(), home_content(), home_init(), importelm_post(), item_content(), layouts_content(), layouts_init(), like_content(), lockview_content(), mail_content(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), new_channel_init(), notes_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), online_init(), p_init(), page_init(), pdledit_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), prep_init(), profile_init(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), queue_run(), rbmark_content(), receive_post(), register_init(), regmod_content(), regver_content(), rpost_content(), settings_init(), settings_post(), setup_init(), share_init(), sharedwithme_content(), sources_content(), starred_init(), subthread_content(), tagger_content(), tagrm_content(), thing_content(), uexport_init(), update_channel_content(), update_display_content(), update_home_content(), update_network_content(), update_search_content(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_init(), xref_init(), and zotfeed_init().

@@ -872,7 +872,7 @@ Variables
-

Referenced by App\__construct(), _well_known_init(), achievements_content(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_profs(), admin_page_users(), admin_post(), api_get_user(), api_statuses_destroy(), api_statuses_repeat(), api_statuses_show(), apps_content(), attach_init(), block_content(), block_init(), blocks_content(), blocks_init(), channel_init(), chat_content(), chat_init(), cloud_init(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), contactgroup_content(), dav_init(), dirsearch_content(), display_content(), editblock_content(), editblock_init(), editlayout_content(), editlayout_init(), editpost_content(), editwebpage_content(), editwebpage_init(), events_content(), feed_init(), filestorage_content(), get_online_status(), group_content(), group_post(), hcard_init(), help_content(), home_content(), home_init(), importelm_post(), item_content(), layouts_content(), layouts_init(), like_content(), lockview_content(), mail_content(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), new_channel_init(), notes_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), online_init(), p_init(), page_init(), pdledit_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), prep_init(), profile_init(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), queue_run(), rbmark_content(), receive_post(), register_init(), regmod_content(), regver_content(), rpost_content(), settings_post(), setup_init(), share_init(), sources_content(), starred_init(), subthread_content(), tagger_content(), tagrm_content(), thing_content(), uexport_init(), update_channel_content(), update_display_content(), update_home_content(), update_network_content(), update_search_content(), view_init(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), webpages_init(), widget_collections(), widget_mailmenu(), widget_settings_menu(), xref_init(), and zotfeed_init().

+

Referenced by App\__construct(), _well_known_init(), achievements_content(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_profs(), admin_page_users(), admin_post(), api_get_user(), api_statuses_destroy(), api_statuses_repeat(), api_statuses_show(), apps_content(), attach_init(), block_content(), block_init(), blocks_content(), blocks_init(), channel_init(), chat_content(), chat_init(), cloud_init(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), contactgroup_content(), dav_init(), dirsearch_content(), display_content(), editblock_content(), editblock_init(), editlayout_content(), editlayout_init(), editpost_content(), editwebpage_content(), editwebpage_init(), events_content(), feed_init(), filestorage_content(), get_online_status(), group_content(), group_post(), hcard_init(), help_content(), home_content(), home_init(), importelm_post(), item_content(), layouts_content(), layouts_init(), like_content(), lockview_content(), mail_content(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), new_channel_init(), notes_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), online_init(), p_init(), page_init(), pdledit_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), prep_init(), profile_init(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), queue_run(), rbmark_content(), receive_post(), register_init(), regmod_content(), regver_content(), rpost_content(), settings_post(), setup_init(), share_init(), sharedwithme_content(), sources_content(), starred_init(), subthread_content(), tagger_content(), tagrm_content(), thing_content(), uexport_init(), update_channel_content(), update_display_content(), update_home_content(), update_network_content(), update_search_content(), view_init(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), webpages_init(), widget_collections(), widget_mailmenu(), widget_settings_menu(), xref_init(), and zotfeed_init().

@@ -1100,7 +1100,7 @@ Variables

Returns numeric account_id if authenticated or 0. It is possible to be authenticated and not connected to a channel.

Returns
int|bool account_id or false
-

Referenced by api_user(), change_channel(), channel_content(), events_post(), feed_init(), home_init(), identity_selector(), import_content(), import_post(), item_post(), manage_content(), mimetype_select(), mood_init(), nav(), new_channel_content(), new_channel_post(), new_contact(), profile_content(), profile_photo_post(), profiles_init(), removeaccount_post(), rpost_content(), settings_post(), z_input_filter(), and zotfeed_init().

+

Referenced by api_user(), change_channel(), channel_content(), events_post(), feed_init(), file_activity(), home_init(), identity_selector(), import_content(), import_post(), item_post(), manage_content(), mimetype_select(), mood_init(), nav(), new_channel_content(), new_channel_post(), new_contact(), profile_content(), profile_photo_post(), profiles_init(), removeaccount_post(), rpost_content(), settings_post(), z_input_filter(), and zotfeed_init().

@@ -1121,7 +1121,7 @@ Variables

Useful in functions which require it but don't get it passed to them

Returns
App
-

Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), account_remove(), account_service_class_allows(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_statuses_user_timeline(), api_user(), app_render(), app_store(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), comanche_get_channel_id(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connedit_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), dir_tagblock(), dirsearch_content(), drop_item(), editpost_content(), event_store_item(), externals_run(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), ical_wrapper(), identity_selector(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), insert_hook(), is_developer(), is_public_profile(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), list_smilies(), load_contact_links(), load_hooks(), local_dir_update(), login(), FKOAuth1\loginUser(), manage_content(), map_scope(), menu_add_item(), menu_edit_item(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), onedirsync_run(), onepoll_run(), page_init(), parse_app_description(), photos_album_widget(), ping_init(), poco_load(), poller_run(), post_activity_item(), preg_heart(), proc_run(), process_delivery(), process_location_delivery(), profile_activity(), profile_sidebar(), register_page_template(), replace_macros(), rmagic_init(), rpost_callback(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), siteinfo_init(), smilies(), store_diaspora_comment_sig(), tag_deliver(), tgroup_check(), theme_include(), tryzrlvideo(), tt(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), verify_email_address(), wfinger_init(), what_next(), widget_archive(), widget_catcloud_wall(), widget_categories(), widget_chatroom_list(), widget_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_menu_preview(), widget_photo_albums(), widget_photo_rand(), widget_profile(), widget_random_block(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().

+

Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), RedMatrix\RedDAV\RedDirectory\__construct(), abook_toggle_flag(), account_remove(), account_service_class_allows(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_statuses_user_timeline(), api_user(), app_render(), app_store(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), RedMatrix\RedDAV\RedDirectory\childExists(), cli_suggest_run(), comanche_get_channel_id(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connedit_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), dir_tagblock(), dirsearch_content(), drop_item(), editpost_content(), event_store_item(), externals_run(), file_activity(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_theme_config_file(), get_theme_screenshot(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), gprobe_run(), group_select(), guess_image_type(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), ical_wrapper(), identity_selector(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), insert_hook(), is_developer(), is_public_profile(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), list_smilies(), load_contact_links(), load_hooks(), local_dir_update(), login(), FKOAuth1\loginUser(), manage_content(), map_scope(), menu_add_item(), menu_edit_item(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), onedirsync_run(), onepoll_run(), page_init(), parse_app_description(), photos_album_widget(), ping_init(), poco_load(), poller_run(), post_activity_item(), preg_heart(), proc_run(), process_delivery(), process_location_delivery(), profile_activity(), profile_sidebar(), register_page_template(), replace_macros(), rmagic_init(), rpost_callback(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), siteinfo_init(), smilies(), store_diaspora_comment_sig(), tag_deliver(), tgroup_check(), theme_include(), tryzrlvideo(), tt(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), verify_email_address(), wfinger_init(), what_next(), widget_archive(), widget_catcloud_wall(), widget_categories(), widget_chatroom_list(), widget_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_menu_preview(), widget_photo_albums(), widget_photo_rand(), widget_profile(), widget_random_block(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().

@@ -1260,7 +1260,7 @@ Variables

Redirect to another URL and terminate this process.

-

Referenced by account_remove(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs_post(), admin_page_plugins(), admin_page_profs(), admin_page_profs_post(), admin_page_site_post(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), api_content(), appman_post(), authenticate_success(), channel_content(), channel_remove(), chanview_content(), chat_content(), chat_post(), chatsvc_content(), check_form_security_token_redirectOnErr(), connect_post(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), display_content(), drop_item(), events_post(), filerm_content(), filestorage_content(), filestorage_post(), follow_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), mood_init(), network_content(), new_channel_post(), new_contact(), notifications_post(), notify_init(), openid_content(), pdledit_post(), photos_content(), photos_post(), post_init(), profile_photo_post(), profiles_init(), randprof_init(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), search_content(), settings_post(), sources_content(), sources_post(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), wfinger_init(), xref_init(), and zid_init().

+

Referenced by account_remove(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs_post(), admin_page_plugins(), admin_page_profs(), admin_page_profs_post(), admin_page_site_post(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), api_content(), appman_post(), authenticate_success(), channel_content(), channel_remove(), chanview_content(), chat_content(), chat_post(), chatsvc_content(), check_form_security_token_redirectOnErr(), connect_post(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), display_content(), drop_item(), events_post(), filerm_content(), filestorage_content(), filestorage_post(), follow_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), mood_init(), network_content(), new_channel_post(), new_contact(), notifications_post(), notify_init(), openid_content(), pdledit_post(), photos_content(), photos_post(), post_init(), profile_photo_post(), profiles_init(), randprof_init(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), search_content(), settings_post(), sharedwithme_content(), sources_content(), sources_post(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), wfinger_init(), xref_init(), and zid_init().

@@ -1496,7 +1496,7 @@ Variables

Returns authenticated numeric channel_id if authenticated and connected to a channel or 0. Sometimes referred to as $uid in the code.

Returns
int|bool channel_id or false
-

Referenced by Conversation\__construct(), acl_init(), admin_page_site_post(), api_content(), api_get_user(), api_post(), api_user(), app_render(), appman_content(), appman_post(), apps_content(), apw_form(), best_link_url(), blocks_content(), bookmarks_content(), bookmarks_init(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), cloud_init(), comanche_get_channel_id(), common_friends_visitor_widget(), connect_content(), connect_post(), connections_content(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), contact_block(), contact_select(), contactgroup_content(), conversation(), current_theme(), dav_init(), delegate_content(), directory_content(), directory_init(), display_content(), drop_item(), drop_items(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_online_status(), Item\get_template_data(), get_theme_uid(), group_content(), group_get_members(), group_post(), group_select(), group_side(), handle_tag(), hcard_init(), home_content(), home_init(), identity_selector(), impel_init(), invite_content(), invite_post(), is_public_profile(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), lockview_content(), locs_content(), locs_post(), login(), login_content(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), mimetype_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), new_contact(), notes_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), parse_app_description(), pdledit_content(), pdledit_post(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), profperm_init(), rbmark_content(), redbasic_form(), regmod_content(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_init(), rpost_content(), search(), search_ac_init(), search_content(), searchbox(), send_message(), service_class_allows(), service_class_fetch(), service_limits_content(), Conversation\set_mode(), settings_init(), settings_post(), share_init(), smilies(), sources_content(), sources_post(), starred_init(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_content(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_notes(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), z_input_filter(), zid_init(), and zping_content().

+

Referenced by Conversation\__construct(), acl_init(), admin_page_site_post(), api_content(), api_get_user(), api_post(), api_user(), app_render(), appman_content(), appman_post(), apps_content(), apw_form(), best_link_url(), blocks_content(), bookmarks_content(), bookmarks_init(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), cloud_init(), comanche_get_channel_id(), common_friends_visitor_widget(), connect_content(), connect_post(), connections_content(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), contact_block(), contact_select(), contactgroup_content(), conversation(), current_theme(), dav_init(), delegate_content(), directory_content(), directory_init(), display_content(), drop_item(), drop_items(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_online_status(), Item\get_template_data(), get_theme_uid(), group_content(), group_get_members(), group_post(), group_select(), group_side(), handle_tag(), hcard_init(), home_content(), home_init(), identity_selector(), impel_init(), invite_content(), invite_post(), is_public_profile(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), lockview_content(), locs_content(), locs_post(), login(), login_content(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), mimetype_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), new_contact(), notes_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), parse_app_description(), pdledit_content(), pdledit_post(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), profperm_init(), rbmark_content(), redbasic_form(), regmod_content(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_init(), rpost_content(), search(), search_ac_init(), search_content(), searchbox(), send_message(), service_class_allows(), service_class_fetch(), service_limits_content(), Conversation\set_mode(), settings_init(), settings_post(), share_init(), sharedwithme_content(), smilies(), sources_content(), sources_post(), starred_init(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_content(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_notes(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), z_input_filter(), zid_init(), and zping_content().

@@ -1555,7 +1555,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(), 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(), locs_content(), locs_post(), 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_init(), pdledit_content(), photos_content(), photos_post(), poke_content(), post_init(), prep_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(), 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(), locs_content(), locs_post(), 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_init(), pdledit_content(), photos_content(), photos_post(), poke_content(), post_init(), prep_content(), prep_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(), sharedwithme_content(), 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().

@@ -1611,7 +1611,7 @@ Variables

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

$cmd and string args are surrounded with ""

-

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(), locs_post(), 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(), remove_obsolete_hublocs(), send_message(), settings_post(), start_delivery_chain(), tag_deliver(), tagger_content(), zid_init(), zot_process_message_request(), 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(), file_activity(), fix_system_urls(), follow_init(), fsuggest_post(), import_post(), item_post(), like_content(), locs_post(), 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(), remove_obsolete_hublocs(), send_message(), settings_post(), start_delivery_chain(), tag_deliver(), tagger_content(), zid_init(), zot_process_message_request(), and zot_refresh().

@@ -1772,7 +1772,7 @@ Variables
See Also
App::get_baseurl()
Returns
string
-

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(), 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(), Item\get_template_data(), RedMatrix\RedDAV\RedBrowser\getAssetUrl(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_content(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), like_content(), locs_post(), 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(), oembed_iframe(), 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(), reflect_article_callback(), reflect_comment_store(), reflect_photo_callback(), 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(), xchan_store(), 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(), 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(), Item\get_template_data(), RedMatrix\RedDAV\RedBrowser\getAssetUrl(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_content(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), like_content(), locs_post(), 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(), oembed_iframe(), 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(), reflect_article_callback(), reflect_comment_store(), reflect_photo_callback(), 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(), sharedwithme_content(), 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(), xchan_store(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_new_uid(), and zot_refresh().

@@ -1789,10 +1789,11 @@ Variables Initial value:
= array(
'https://zothub.com',
'https://zotid.net',
-
'https://redmatrix.nl',
'https://red.zottel.red',
'https://red.pixelbits.de',
-
'https://whogotzot.com'
+
'https://my.federated.social',
+
'https://whogotzot.com',
+
'https://redmatrix.nl'
)

Referenced by find_upstream_directory().

@@ -2174,18 +2175,6 @@ Variables
-
- - -
-
- - - - -
const ACTIVITY_FILE NAMESPACE_ZOT . '/activity/file'
-
-
@@ -2295,6 +2284,20 @@ Variables

Referenced by event_addtocal(), event_store_item(), Item\get_template_data(), localize_item(), and tagger_content().

+ + + +
+
+ + + + +
const ACTIVITY_OBJ_FILE NAMESPACE_ZOT . '/activity/file'
+
+ +

Referenced by file_activity(), and sharedwithme_content().

+
@@ -2453,7 +2456,7 @@ Variables
-

Referenced by api_format_items(), api_status_show(), api_users_show(), construct_verb(), diaspora_comment(), diaspora_post(), event_store_item(), item_post(), item_post_type(), item_store(), mail_store(), photo_upload(), post_activity_item(), refimport_content(), reflect_comment_store(), and send_status_notifications().

+

Referenced by api_format_items(), api_status_show(), api_users_show(), construct_verb(), diaspora_comment(), diaspora_post(), event_store_item(), file_activity(), item_post(), item_post_type(), item_store(), mail_store(), photo_upload(), post_activity_item(), refimport_content(), reflect_comment_store(), send_status_notifications(), and sharedwithme_content().

@@ -2519,7 +2522,7 @@ Variables
-

Referenced by profile_activity().

+

Referenced by file_activity(), profile_activity(), and sharedwithme_content().

@@ -2655,7 +2658,7 @@ Variables
- +
const DB_UPDATE_VERSION 1132const DB_UPDATE_VERSION 1134
@@ -2741,7 +2744,7 @@ Variables
-

Referenced by check_upstream_directory(), directory_content(), directory_run(), import_site(), navbar_complete(), poller_run(), pubsites_content(), sync_directories(), update_suggestions(), and zfinger_init().

+

Referenced by directory_content(), directory_run(), import_site(), navbar_complete(), poller_run(), pubsites_content(), sync_directories(), update_suggestions(), and zfinger_init().

@@ -2755,7 +2758,7 @@ Variables
-

Referenced by check_upstream_directory(), import_site(), poller_run(), sync_directories(), and zfinger_init().

+

Referenced by import_site(), poller_run(), sync_directories(), and zfinger_init().

@@ -2769,7 +2772,7 @@ Variables
-

Referenced by check_upstream_directory(), directory_content(), directory_run(), dirsearch_content(), externals_run(), import_site(), import_xchan(), navbar_complete(), pubsites_content(), sync_directories(), update_suggestions(), and zfinger_init().

+

Referenced by directory_content(), directory_run(), dirsearch_content(), externals_run(), import_site(), import_xchan(), navbar_complete(), pubsites_content(), sync_directories(), update_suggestions(), and zfinger_init().

@@ -2839,7 +2842,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(), 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(), locs_content(), locs_post(), 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_init(), 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(), refimport_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_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(), xchan_content(), and zot_process_message_request().

+

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(), 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(), locs_content(), locs_post(), 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_init(), pdledit_content(), pdledit_post(), photos_content(), photos_post(), poke_content(), post_init(), post_post(), prep_content(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), refimport_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), service_limits_content(), settings_post(), setup_content(), sharedwithme_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), tagrm_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(), xchan_content(), and zot_process_message_request().

@@ -2920,7 +2923,7 @@ Variables
-

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

+

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

@@ -3094,7 +3097,7 @@ Variables
-

Referenced by delete_item_lowlevel(), drop_item(), encode_item_flags(), get_item_elements(), item_post(), like_content(), photo_upload(), and photos_create_item().

+

Referenced by delete_item_lowlevel(), drop_item(), encode_item_flags(), file_activity(), get_item_elements(), item_post(), like_content(), photo_upload(), and photos_create_item().

@@ -3193,7 +3196,7 @@ Variables

Item Flags

-

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(), process_delivery(), profile_activity(), refimport_content(), reflect_comment_store(), 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(), file_activity(), item_post(), like_content(), mood_init(), notifier_run(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), process_delivery(), profile_activity(), refimport_content(), reflect_comment_store(), start_delivery_chain(), subthread_content(), tag_deliver(), tagger_content(), and thing_init().

@@ -3329,7 +3332,7 @@ Variables
-

Referenced by api_statuses_home_timeline(), channel_content(), Item\count_unseen_descendants(), diaspora_post(), display_content(), format_notification(), home_content(), item_post(), item_store(), item_store_update(), items_fetch(), manage_content(), mood_init(), network_content(), and ping_init().

+

Referenced by api_statuses_home_timeline(), channel_content(), Item\count_unseen_descendants(), diaspora_post(), display_content(), file_activity(), format_notification(), home_content(), item_post(), item_store(), item_store_update(), items_fetch(), manage_content(), mood_init(), network_content(), and ping_init().

@@ -3386,7 +3389,7 @@ Variables
-

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(), p_init(), photo_upload(), photos_create_item(), ping_init(), poke_init(), post_activity_item(), process_delivery(), profile_activity(), refimport_content(), reflect_comment_store(), start_delivery_chain(), subthread_content(), tag_deliver(), tagger_content(), thing_init(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_local_posts_stat(), widget_catcloud_wall(), widget_tagcloud_wall(), and zot_feed().

+

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

@@ -3472,7 +3475,7 @@ Variables
-

Referenced by admin_page_logs(), allowed_public_recips(), bb2diaspora_itemwallwall(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), deliver_run(), detect_language(), diaspora_decode(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), discover_by_url(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), impel_init(), import_xchan(), item_store(), item_store_update(), RedMatrix\RedDAV\RedDirectory\log(), RedMatrix\RedDAV\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(), pubsub_init(), pubsub_post(), receive_post(), RedChannelList(), RedFileData(), set_linkified_perms(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\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_finger(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

+

Referenced by admin_page_logs(), allowed_public_recips(), bb2diaspora_itemwallwall(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), deliver_run(), detect_language(), diaspora_decode(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), discover_by_url(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), impel_init(), import_xchan(), item_store(), item_store_update(), RedMatrix\RedDAV\RedDirectory\log(), RedMatrix\RedDAV\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(), pubsub_init(), pubsub_post(), receive_post(), RedChannelList(), RedFileData(), set_linkified_perms(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\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_finger(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

@@ -3486,7 +3489,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(), contact_remove(), conversation(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), RedMatrix\RedDAV\RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_handle_from_contact(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_reshare(), diaspora_transmit(), directory_content(), directory_run(), discover_by_webbie(), expire_run(), externals_run(), fetch_lrdd_template(), fix_private_photos(), RedMatrix\RedDAV\RedFile\get(), get_diaspora_key(), get_diaspora_reshare_xml(), Conversation\get_template_data(), group_content(), guess_image_type(), hubloc_change_primary(), 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(), RedMatrix\RedDAV\RedFile\put(), queue_run(), receive_post(), Item\remove_child(), remove_obsolete_hublocs(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), 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().

+

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(), contact_remove(), conversation(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), RedMatrix\RedDAV\RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_handle_from_contact(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_reshare(), diaspora_transmit(), directory_content(), directory_run(), discover_by_webbie(), expire_run(), externals_run(), fetch_lrdd_template(), fix_private_photos(), RedMatrix\RedDAV\RedFile\get(), get_diaspora_key(), get_diaspora_reshare_xml(), Conversation\get_template_data(), group_content(), guess_image_type(), hubloc_change_primary(), 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(), RedMatrix\RedDAV\RedFile\put(), queue_run(), receive_post(), Item\remove_child(), remove_obsolete_hublocs(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), 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().

diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 22830da81..32cf1e11c 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -73,7 +73,6 @@ var boot_8php = [ "ACTIVITY_DISAGREE", "boot_8php.html#aab8b7ce53e7b8fd7fa27ff42fbc912cb", null ], [ "ACTIVITY_DISLIKE", "boot_8php.html#a0e57f846e6d47a308feced0f7274f178", null ], [ "ACTIVITY_FAVORITE", "boot_8php.html#a3e2ea123d29a72012db1241f96280b0e", null ], - [ "ACTIVITY_FILE", "boot_8php.html#a7cfd5a02abaf6d85e2f915ccf60dca46", null ], [ "ACTIVITY_FOLLOW", "boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434", null ], [ "ACTIVITY_FRIEND", "boot_8php.html#a176664e78dcb9132e16be69418223eb2", null ], [ "ACTIVITY_JOIN", "boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3", null ], @@ -82,6 +81,7 @@ var boot_8php = [ "ACTIVITY_OBJ_ALBUM", "boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14", null ], [ "ACTIVITY_OBJ_COMMENT", "boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562", null ], [ "ACTIVITY_OBJ_EVENT", "boot_8php.html#a2e90096fede6acce16abf0da8cb2febe", null ], + [ "ACTIVITY_OBJ_FILE", "boot_8php.html#aa726114f13c1119ae77c3464d6afeaed", null ], [ "ACTIVITY_OBJ_GROUP", "boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3", null ], [ "ACTIVITY_OBJ_HEART", "boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f", null ], [ "ACTIVITY_OBJ_LOCATION", "boot_8php.html#a9687c702656af105e9a09048c21aec4c", null ], diff --git a/doc/html/conversation_8php.html b/doc/html/conversation_8php.html index eba5264f5..375598135 100644 --- a/doc/html/conversation_8php.html +++ b/doc/html/conversation_8php.html @@ -621,7 +621,7 @@ Functions
-

Referenced by bookmarks_content(), channel_content(), chat_content(), events_content(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), photos_content(), profile_content(), and webpages_content().

+

Referenced by bookmarks_content(), channel_content(), chat_content(), events_content(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), photos_content(), profile_content(), sharedwithme_content(), and webpages_content().

diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 9d196c8a6..7d996d287 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -363,7 +363,7 @@ Functions
Returns
Return an escaped string of the value to pass to a DB query.
-

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(), bb2diaspora_itemwallwall(), 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(), RedMatrix\RedDAV\RedDirectory\createFile(), 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_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_relay(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_flag_build(), dir_query_build(), directory_init(), directory_run(), dirsearch_content(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), editblock_content(), 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(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), Cache\get(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\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(), hubloc_change_primary(), impel_init(), 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(), locs_content(), locs_post(), 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(), menu_list_count(), 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(), p_init(), page_init(), 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(), prep_content(), prep_init(), 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(), pubsub_init(), pubsub_post(), pubsubhubbub_init(), RedMatrix\RedDAV\RedFile\put(), queue_run(), rconnect_url(), receive_post(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), refimport_content(), reflect_comment_store(), reflect_get_channel(), 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(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\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(), 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(), RedMatrix\RedDAV\RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_item(), widget_random_block(), widget_savedsearch(), xchan_content(), xchan_mail_query(), xchan_query(), xchan_store(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_process_message_request(), 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(), bb2diaspora_itemwallwall(), 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_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(), RedMatrix\RedDAV\RedDirectory\createFile(), 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_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_relay(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_flag_build(), dir_query_build(), directory_init(), directory_run(), dirsearch_content(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), editblock_content(), 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_activity(), 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(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), Cache\get(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\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(), hubloc_change_primary(), impel_init(), 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(), locs_content(), locs_post(), 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(), menu_list_count(), 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(), p_init(), page_init(), 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(), prep_content(), prep_init(), 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(), pubsub_init(), pubsub_post(), pubsubhubbub_init(), RedMatrix\RedDAV\RedFile\put(), queue_run(), rconnect_url(), receive_post(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), refimport_content(), reflect_comment_store(), reflect_get_channel(), 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(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), settings_post(), sharedwithme_content(), 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(), 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(), RedMatrix\RedDAV\RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_item(), widget_random_block(), widget_savedsearch(), xchan_content(), xchan_mail_query(), xchan_query(), xchan_store(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_process_message_request(), zot_process_response(), zot_refresh(), and zotfeed_init().

@@ -441,7 +441,7 @@ Functions
-

Referenced by attach_store(), photos_post(), photo_driver\save(), and photo_driver\store().

+

Referenced by attach_store(), photos_post(), RedMatrix\RedDAV\RedFile\put(), photo_driver\save(), and photo_driver\store().

@@ -528,7 +528,7 @@ Functions
-

Referenced by photo_init(), photos_post(), and profile_photo_post().

+

Referenced by RedMatrix\RedDAV\RedFile\get(), photo_init(), photos_post(), profile_photo_post(), and RedMatrix\RedDAV\RedFile\put().

@@ -575,7 +575,7 @@ Functions
Returns
bool|array
-

Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_service_class_allows(), 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(), bb2diaspora_itemwallwall(), bb2dmention_callback(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), catblock(), categories_widget(), change_channel(), 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(), chatroom_list_count(), 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(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\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_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_init(), directory_run(), 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(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), Cache\get(), RedMatrix\RedDAV\RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_channel_default_perms(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getLastModified(), RedMatrix\RedDAV\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(), hubloc_change_primary(), identity_basic_export(), identity_check_service_class(), identity_selector(), impel_init(), 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(), locs_content(), locs_post(), 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(), menu_list_count(), 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_off(), notifications_on(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), p_init(), page_init(), 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(), prep_content(), prep_init(), 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(), pubsub_init(), pubsub_post(), pubsubhubbub_init(), RedMatrix\RedDAV\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(), refimport_content(), reflect_comment_store(), reflect_get_channel(), 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(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\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_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_channels_total_stat(), update_directory_entry(), update_local_posts_stat(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedMatrix\RedDAV\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_random_block(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), wtagblock(), xchan_content(), xchan_fetch(), xchan_mail_query(), xchan_query(), xchan_store(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_import(), zot_process_message_request(), zot_process_response(), zot_refresh(), and zotfeed_init().

+

Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_service_class_allows(), 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(), bb2diaspora_itemwallwall(), bb2dmention_callback(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), catblock(), categories_widget(), change_channel(), 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(), chatroom_list_count(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), 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(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\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_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_init(), directory_run(), 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(), file_activity(), 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(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), Cache\get(), RedMatrix\RedDAV\RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_channel_default_perms(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getLastModified(), RedMatrix\RedDAV\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(), hubloc_change_primary(), identity_basic_export(), identity_check_service_class(), identity_selector(), impel_init(), 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(), locs_content(), locs_post(), 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(), menu_list_count(), 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_off(), notifications_on(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), p_init(), page_init(), 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(), prep_content(), prep_init(), 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(), pubsub_init(), pubsub_post(), pubsubhubbub_init(), RedMatrix\RedDAV\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(), refimport_content(), reflect_comment_store(), reflect_get_channel(), 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(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), settings_post(), setup_content(), share_init(), sharedwithme_content(), 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_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_channels_total_stat(), update_directory_entry(), update_local_posts_stat(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedMatrix\RedDAV\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_random_block(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), wtagblock(), xchan_content(), xchan_fetch(), xchan_mail_query(), xchan_query(), xchan_store(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_import(), zot_process_message_request(), zot_process_response(), zot_refresh(), and zotfeed_init().

diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index 9984bba3f..decdcf7a4 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -334,6 +334,8 @@ Files   file  share.php   +file  sharedwithme.php +  file  siteinfo.php   file  sitelist.php diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index 320717eac..8a9ca512d 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -114,6 +114,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "settings.php", "settings_8php.html", "settings_8php" ], [ "setup.php", "setup_8php.html", "setup_8php" ], [ "share.php", "share_8php.html", "share_8php" ], + [ "sharedwithme.php", "sharedwithme_8php.html", "sharedwithme_8php" ], [ "siteinfo.php", "siteinfo_8php.html", "siteinfo_8php" ], [ "sitelist.php", "sitelist_8php.html", "sitelist_8php" ], [ "smilies.php", "smilies_8php.html", "smilies_8php" ], diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 4449c0243..fd6750d9a 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
-

Referenced by _well_known_init(), account_service_class_allows(), 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(), 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(), foofoo(), format_like(), generate_map(), generate_named_map(), 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(), impel_init(), 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(), refimport_content(), reflect_comment_store(), 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(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), sync_locations(), tag_deliver(), tagger_content(), theme_attachments(), theme_content(), thing_init(), translate_system_apps(), validate_channelname(), verify_email_address(), wfinger_init(), widget_affinity(), widget_archive(), widget_catcloud_wall(), widget_clock(), widget_item(), widget_photo(), widget_photo_rand(), widget_random_block(), widget_suggestions(), widget_tagcloud_wall(), xchan_fetch(), xchan_mail_query(), xchan_query(), xchan_store(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_feed(), zot_fetch(), zot_gethub(), zot_import(), zot_process_message_request(), zot_process_response(), and zot_register_hub().

+

Referenced by _well_known_init(), account_service_class_allows(), 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(), 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(), file_activity(), filter_insecure(), find_xchan_in_array(), foofoo(), format_like(), generate_map(), generate_named_map(), 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(), impel_init(), 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(), refimport_content(), reflect_comment_store(), 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(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), sync_locations(), tag_deliver(), tagger_content(), theme_attachments(), theme_content(), thing_init(), translate_system_apps(), validate_channelname(), verify_email_address(), wfinger_init(), widget_affinity(), widget_archive(), widget_catcloud_wall(), widget_clock(), widget_item(), widget_photo(), widget_photo_rand(), widget_random_block(), widget_suggestions(), widget_tagcloud_wall(), xchan_fetch(), xchan_mail_query(), xchan_query(), xchan_store(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_feed(), zot_fetch(), zot_gethub(), zot_import(), zot_process_message_request(), zot_process_response(), and zot_register_hub().

diff --git a/doc/html/files.html b/doc/html/files.html index f39d6043c..53d53745b 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -322,40 +322,41 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*settings.php |o*setup.php |o*share.php -|o*siteinfo.php -|o*sitelist.php -|o*smilies.php -|o*sources.php -|o*sslify.php -|o*starred.php -|o*subthread.php -|o*suggest.php -|o*tagger.php -|o*tagrm.php -|o*thing.php -|o*toggle_mobile.php -|o*toggle_safesearch.php -|o*uexport.php -|o*update_channel.php -|o*update_display.php -|o*update_home.php -|o*update_network.php -|o*update_search.php -|o*view.php -|o*viewconnections.php -|o*viewsrc.php -|o*vote.php -|o*wall_attach.php -|o*wall_upload.php -|o*webfinger.php -|o*webpages.php -|o*wfinger.php -|o*xchan.php -|o*xrd.php -|o*xref.php -|o*zfinger.php -|o*zotfeed.php -|\*zping.php +|o*sharedwithme.php +|o*siteinfo.php +|o*sitelist.php +|o*smilies.php +|o*sources.php +|o*sslify.php +|o*starred.php +|o*subthread.php +|o*suggest.php +|o*tagger.php +|o*tagrm.php +|o*thing.php +|o*toggle_mobile.php +|o*toggle_safesearch.php +|o*uexport.php +|o*update_channel.php +|o*update_display.php +|o*update_home.php +|o*update_network.php +|o*update_search.php +|o*view.php +|o*viewconnections.php +|o*viewsrc.php +|o*vote.php +|o*wall_attach.php +|o*wall_upload.php +|o*webfinger.php +|o*webpages.php +|o*wfinger.php +|o*xchan.php +|o*xrd.php +|o*xref.php +|o*zfinger.php +|o*zotfeed.php +|\*zping.php o+util |o+fpostit ||\*fpostit.php diff --git a/doc/html/fixd_8php.html b/doc/html/fixd_8php.html index ea7819f0a..9b74491d1 100644 --- a/doc/html/fixd_8php.html +++ b/doc/html/fixd_8php.html @@ -132,7 +132,7 @@ Variables
-

Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_service_class_allows(), account_service_class_fetch(), account_total(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_content(), admin_page_dbsync(), admin_page_hubloc_post(), admin_page_profs(), admin_page_profs_post(), admin_page_summary(), all_friends(), allowed_public_recips(), api_call(), 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_oauth_access_token(), api_oauth_request_token(), api_red_xchan(), api_statuses_destroy(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_user_timeline(), 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(), autoname(), bb2diaspora_itemwallwall(), bb2dmention_callback(), bb_translate_video(), block_content(), blocks_content(), bookmark_add(), build_sync_packet(), catblock(), categories_widget(), change_channel(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_content(), chat_message(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatroom_list_count(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_upstream_directory(), check_webbie(), collect_recipients(), comanche_block(), common_content(), common_friends(), common_friends_visitor_widget(), common_friends_zcid(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_init(), connedit_post(), construct_activity_object(), construct_activity_target(), 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(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), current_theme(), 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_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_images(), diaspora_send_mail(), diaspora_signed_retraction(), dir_tagadelic(), dir_tagblock(), directory_content(), dirsearch_content(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editwebpage_content(), encode_item(), event_addtocal(), event_store_event(), event_store_item(), events_content(), expand_groups(), expire_run(), externals_run(), fbrowser_content(), feed_init(), 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(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), Cache\get(), RedMatrix\RedDAV\RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_channel_default_perms(), get_cloudpath(), get_diaspora_key(), get_events(), get_item_elements(), get_online_status(), get_plugin_info(), get_sys_channel(), get_theme_info(), get_things(), get_words(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getLastModified(), 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_tag(), hcard_init(), home_content(), hubloc_change_primary(), identity_basic_export(), identity_check_service_class(), identity_selector(), import_author_diaspora(), import_author_rss(), import_author_unknown(), import_author_zot(), import_channel_photo(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), importelm_post(), install_plugin(), invite_post(), is_matrix_url(), is_sys_channel(), item_add_cid(), item_check_service_class(), item_expire(), item_getfeedattach(), 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_database(), load_hooks(), load_pconfig(), load_xconfig(), local_dir_update(), lockview_content(), locs_content(), locs_post(), 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_content(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), menu_list_count(), menu_post(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mitem_post(), mood_init(), msearch_post(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_off(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), p_init(), page_content(), page_init(), pagelist_widget(), pdl_selector(), pemtome(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poke_content(), poke_init(), poller_run(), post_activity_item(), post_post(), preg_heart(), prep_content(), 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(), pubrsatome(), pubsub_init(), pubsub_post(), pubsubhubbub_init(), RedMatrix\RedDAV\RedFile\put(), dba_mysql\q(), dba_mysqli\q(), dba_postgres\q(), queue_run(), random_profile(), rconnect_url(), receive_post(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_read(), ref_session_write(), refimport_content(), reflect_comment_store(), register_content(), register_hook(), register_post(), relative_date(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_obsolete_hublocs(), replace_macros(), FriendicaSmartyEngine\replace_macros(), 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_default_login_identity(), RedMatrix\RedDAV\RedBasicAuth\setAuthenticated(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\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_content(), suggestion_query(), sync_directories(), sync_locations(), tag_deliver(), tagadelic(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), theme_attachments(), thing_content(), thing_init(), unregister_hook(), update_birthdays(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_channels_total_stat(), update_directory_entry(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedMatrix\RedDAV\RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_attach_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_item(), widget_random_block(), widget_savedsearch(), widget_suggestedchats(), widget_suggestions(), widget_tagcloud(), wtagblock(), xchan_content(), xchan_fetch(), xchan_store(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_gethub(), zot_import(), zot_process_message_request(), zot_process_response(), zot_refresh(), zotfeed_init(), and zping_content().

+

Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_service_class_allows(), account_service_class_fetch(), account_total(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_content(), admin_page_dbsync(), admin_page_hubloc_post(), admin_page_profs(), admin_page_profs_post(), admin_page_summary(), all_friends(), allowed_public_recips(), api_call(), 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_oauth_access_token(), api_oauth_request_token(), api_red_xchan(), api_statuses_destroy(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_user_timeline(), 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(), autoname(), bb2diaspora_itemwallwall(), bb2dmention_callback(), bb_translate_video(), block_content(), blocks_content(), bookmark_add(), build_sync_packet(), catblock(), categories_widget(), change_channel(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_content(), chat_message(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatroom_list_count(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), collect_recipients(), comanche_block(), common_content(), common_friends(), common_friends_visitor_widget(), common_friends_zcid(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_init(), connedit_post(), construct_activity_object(), construct_activity_target(), 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(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), current_theme(), 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_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_images(), diaspora_send_mail(), diaspora_signed_retraction(), dir_tagadelic(), dir_tagblock(), directory_content(), dirsearch_content(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editwebpage_content(), encode_item(), event_addtocal(), event_store_event(), event_store_item(), events_content(), expand_groups(), expire_run(), externals_run(), fbrowser_content(), feed_init(), 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(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), Cache\get(), RedMatrix\RedDAV\RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_channel_default_perms(), get_cloudpath(), get_diaspora_key(), get_events(), get_item_elements(), get_online_status(), get_plugin_info(), get_sys_channel(), get_theme_info(), get_things(), get_words(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getLastModified(), 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_tag(), hcard_init(), home_content(), hubloc_change_primary(), identity_basic_export(), identity_check_service_class(), identity_selector(), import_author_diaspora(), import_author_rss(), import_author_unknown(), import_author_zot(), import_channel_photo(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), importelm_post(), install_plugin(), invite_post(), is_matrix_url(), is_sys_channel(), item_add_cid(), item_check_service_class(), item_expire(), item_getfeedattach(), 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_database(), load_hooks(), load_pconfig(), load_xconfig(), local_dir_update(), lockview_content(), locs_content(), locs_post(), 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_content(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), menu_list_count(), menu_post(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mitem_post(), mood_init(), msearch_post(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_off(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), p_init(), page_content(), page_init(), pagelist_widget(), pdl_selector(), pemtome(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poke_content(), poke_init(), poller_run(), post_activity_item(), post_post(), preg_heart(), prep_content(), prep_init(), 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(), pubrsatome(), pubsub_init(), pubsub_post(), pubsubhubbub_init(), RedMatrix\RedDAV\RedFile\put(), dba_mysql\q(), dba_mysqli\q(), dba_postgres\q(), queue_run(), random_profile(), rconnect_url(), receive_post(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_read(), ref_session_write(), refimport_content(), reflect_comment_store(), register_content(), register_hook(), register_post(), relative_date(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_obsolete_hublocs(), replace_macros(), FriendicaSmartyEngine\replace_macros(), 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_default_login_identity(), RedMatrix\RedDAV\RedBasicAuth\setAuthenticated(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), settings_post(), setup_content(), share_init(), sharedwithme_content(), 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_content(), suggestion_query(), sync_directories(), sync_locations(), tag_deliver(), tagadelic(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), theme_attachments(), thing_content(), thing_init(), unregister_hook(), update_birthdays(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_channels_total_stat(), update_directory_entry(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedMatrix\RedDAV\RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_attach_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_item(), widget_random_block(), widget_savedsearch(), widget_suggestedchats(), widget_suggestions(), widget_tagcloud(), wtagblock(), xchan_content(), xchan_fetch(), xchan_store(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_gethub(), zot_import(), zot_process_message_request(), zot_process_response(), zot_refresh(), zotfeed_init(), and zping_content().

diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html index 2cc98ef7d..624e186d5 100644 --- a/doc/html/globals_0x61.html +++ b/doc/html/globals_0x61.html @@ -262,9 +262,6 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
  • ACTIVITY_FAVORITE : boot.php
    • -
  • ACTIVITY_FILE -: boot.php -
  • ACTIVITY_FOLLOW : boot.php
    • @@ -292,6 +289,9 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
  • ACTIVITY_OBJ_EVENT : boot.php
    • +
  • ACTIVITY_OBJ_FILE +: boot.php +
  • ACTIVITY_OBJ_GROUP : boot.php
    • diff --git a/doc/html/globals_0x66.html b/doc/html/globals_0x66.html index f9f54e4f1..782f6b821 100644 --- a/doc/html/globals_0x66.html +++ b/doc/html/globals_0x66.html @@ -169,6 +169,9 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
  • fetch_xrd_links() : network.php
    • +
  • file_activity() +: attach.php +
  • file_tag_decode() : taxonomy.php
    • diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html index 4f608db99..15ce07762 100644 --- a/doc/html/globals_0x73.html +++ b/doc/html/globals_0x73.html @@ -244,6 +244,9 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
  • share_unshield() : bb2diaspora.php
    • +
  • sharedwithme_content() +: sharedwithme.php +
  • showForm() : fpostit.php
    • diff --git a/doc/html/globals_0x7a.html b/doc/html/globals_0x7a.html index 148f8f27c..4de454356 100644 --- a/doc/html/globals_0x7a.html +++ b/doc/html/globals_0x7a.html @@ -212,7 +212,7 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');}); : zot.php
  • zot_finger() -: zot.php +: zot.php
  • zot_get_hublocs() : zot.php diff --git a/doc/html/globals_func_0x66.html b/doc/html/globals_func_0x66.html index 8e4a3453d..b685734ef 100644 --- a/doc/html/globals_func_0x66.html +++ b/doc/html/globals_func_0x66.html @@ -168,6 +168,9 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});
  • fetch_xrd_links() : network.php
    • +
  • file_activity() +: attach.php +
  • file_tag_decode() : taxonomy.php
    • diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html index 104d4722a..6c7f58196 100644 --- a/doc/html/globals_func_0x73.html +++ b/doc/html/globals_func_0x73.html @@ -243,6 +243,9 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
  • share_unshield() : bb2diaspora.php
    • +
  • sharedwithme_content() +: sharedwithme.php +
  • showForm() : fpostit.php
    • diff --git a/doc/html/globals_func_0x7a.html b/doc/html/globals_func_0x7a.html index 7e8807ac6..791d1b2ef 100644 --- a/doc/html/globals_func_0x7a.html +++ b/doc/html/globals_func_0x7a.html @@ -208,7 +208,7 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');}); : zot.php
  • zot_finger() -: zot.php +: zot.php
  • zot_get_hublocs() : zot.php diff --git a/doc/html/globals_vars_0x61.html b/doc/html/globals_vars_0x61.html index 5bb09f6f0..5e51ad6da 100644 --- a/doc/html/globals_vars_0x61.html +++ b/doc/html/globals_vars_0x61.html @@ -224,9 +224,6 @@ $(document).ready(function(){initNavTree('globals_vars_0x61.html','');});
  • ACTIVITY_FAVORITE : boot.php
    • -
  • ACTIVITY_FILE -: boot.php -
  • ACTIVITY_FOLLOW : boot.php
    • @@ -251,6 +248,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x61.html','');});
  • ACTIVITY_OBJ_EVENT : boot.php
    • +
  • ACTIVITY_OBJ_FILE +: boot.php +
  • ACTIVITY_OBJ_GROUP : boot.php
    • diff --git a/doc/html/include_2attach_8php.html b/doc/html/include_2attach_8php.html index 22833ea99..938987fa5 100644 --- a/doc/html/include_2attach_8php.html +++ b/doc/html/include_2attach_8php.html @@ -144,10 +144,10 @@ Functions  Delete a file/directory from a channel. More...
       get_cloudpath ($arr) - Returns path to file in cloud/. More...
    + Returns path to file in cloud/. This function cannot be used with mod/dav as it always returns a path valid under mod/cloud. More...
       get_parent_cloudpath ($channel_id, $channel_name, $attachHash) - Returns path to parent folder in cloud/. More...
    + Returns path to parent folder in cloud/. This function cannot be used with mod/dav as it always returns a path valid under mod/cloud. More...
       find_folder_hash_by_attach_hash ($channel_id, $attachHash)  Return the hash of an attachment's folder. More...
    @@ -157,6 +157,8 @@ Functions    pipe_streams ($in, $out)   + file_activity ($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $verb, $no_activity) + 

    Detailed Description

    File/attach API with the potential for revision control.

    @@ -578,6 +580,76 @@ Functions

    Referenced by fix_attached_file_permissions(), importelm_post(), send_message(), and wall_attach_post().

    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    file_activity ( $channel_id,
     $hash,
     $cloudpath,
     $allow_cid,
     $allow_gid,
     $deny_cid,
     $deny_gid,
     $verb,
     $no_activity 
    )
    +
    + +

    Referenced by attach_delete(), and filestorage_post().

    +
    @@ -670,7 +742,7 @@ Functions
    -

    Returns path to file in cloud/.

    +

    Returns path to file in cloud/. This function cannot be used with mod/dav as it always returns a path valid under mod/cloud.

    Parameters
    @@ -713,7 +785,7 @@ Functions
    array$arr,[uid]int the channels uid $arr[folder] string $arr[filename]] string
    -

    Returns path to parent folder in cloud/.

    +

    Returns path to parent folder in cloud/. This function cannot be used with mod/dav as it always returns a path valid under mod/cloud.

    Parameters
    diff --git a/doc/html/include_2attach_8php.js b/doc/html/include_2attach_8php.js index 00bc8533e..5fe8c65c7 100644 --- a/doc/html/include_2attach_8php.js +++ b/doc/html/include_2attach_8php.js @@ -8,6 +8,7 @@ var include_2attach_8php = [ "attach_list_files", "include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d", null ], [ "attach_mkdir", "include_2attach_8php.html#ab6830b3ab74a5d284876141ac80f6cbc", null ], [ "attach_store", "include_2attach_8php.html#a84a8a64c4805e1525b42d4add464833f", null ], + [ "file_activity", "include_2attach_8php.html#a3502fd6e55160e0ccdeab88c02723b9f", null ], [ "find_filename_by_hash", "include_2attach_8php.html#a4dbfd7e1cef52aa9ef52f4b88929fa86", null ], [ "find_folder_hash_by_attach_hash", "include_2attach_8php.html#a052f14487ff2ce72f62a09fac8d7e997", null ], [ "get_cloudpath", "include_2attach_8php.html#a6aa00ea010ea030110faefb75eafc1ce", null ], diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index ff1e4b20a..78db42895 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -747,7 +747,7 @@ 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 check_htaccess(), directory_content(), discover_by_url(), discover_by_webbie(), externals_run(), fetch_xrd_links(), get_diaspora_reshare_xml(), handle_feed(), import_post(), import_profile_photo(), import_site(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), random_profile(), reflect_photo_callback(), remote_online_status(), scale_external_images(), scrape_feed(), scrape_vcard(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), webfinger_rfc7033(), z_post_url(), zot_finger(), and zot_register_hub().

    +

    Referenced by check_htaccess(), directory_content(), discover_by_url(), discover_by_webbie(), externals_run(), fetch_xrd_links(), get_diaspora_reshare_xml(), handle_feed(), import_post(), import_profile_photo(), import_site(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), random_profile(), reflect_photo_callback(), remote_online_status(), scale_external_images(), scrape_feed(), scrape_vcard(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), webfinger_rfc7033(), z_post_url(), zot_finger(), and zot_register_hub().

    @@ -798,7 +798,7 @@ 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(), z_post_url_json(), 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().

    diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index c91269a88..1b4e93368 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -1506,7 +1506,7 @@ Functions
    int$channel_idThe id of the channel
    -

    Referenced by consume_feed(), diaspora_asphoto(), diaspora_comment(), diaspora_like(), diaspora_post(), diaspora_reshare(), event_store_item(), impel_init(), import_post(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), post_activity_item(), process_delivery(), profile_activity(), refimport_content(), reflect_comment_store(), and subthread_content().

    +

    Referenced by consume_feed(), diaspora_asphoto(), diaspora_comment(), diaspora_like(), diaspora_post(), diaspora_reshare(), event_store_item(), file_activity(), impel_init(), import_post(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), post_activity_item(), process_delivery(), profile_activity(), refimport_content(), reflect_comment_store(), and subthread_content().

    diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 4b5136059..a0ab384d3 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -360,7 +360,7 @@ Functions
    Returns
    translated string if exists, otherwise return $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(), bookmark_add(), bookmarks_content(), bookmarks_init(), catblock(), 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(), dav_init(), day_translate(), delegate_content(), design_tools(), diaspora_like(), dir_safe_mode(), dir_sort_links(), dir_tagblock(), directory_content(), dirsearch_content(), display_content(), dob(), 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(), foofoo(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), get_roles(), Item\get_template_data(), get_timezones(), RedMatrix\RedDAV\RedBrowser\getIconFromType(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), home_content(), RedMatrix\RedDAV\RedBrowser\htmlActionsPanel(), identity_check_service_class(), impel_init(), 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(), like_puller(), load_database(), localize_item(), lockview_content(), locs_content(), locs_post(), 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_init(), 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(), prep_content(), 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(), 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(), uexport_content(), update_birthdays(), update_channel_content(), update_display_content(), update_home_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_photo(), widget_photo_rand(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), widget_tagcloud(), writepages_widget(), wtagblock(), 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(), bookmark_add(), bookmarks_content(), bookmarks_init(), catblock(), 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(), dav_init(), day_translate(), delegate_content(), design_tools(), diaspora_like(), dir_safe_mode(), dir_sort_links(), dir_tagblock(), directory_content(), dirsearch_content(), display_content(), dob(), 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(), foofoo(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), get_roles(), Item\get_template_data(), get_timezones(), RedMatrix\RedDAV\RedBrowser\getIconFromType(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), home_content(), RedMatrix\RedDAV\RedBrowser\htmlActionsPanel(), identity_check_service_class(), impel_init(), 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(), like_puller(), load_database(), localize_item(), lockview_content(), locs_content(), locs_post(), 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_init(), 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(), prep_content(), 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(), send_message(), send_reg_approval_email(), send_verification_email(), service_limits_content(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), sharedwithme_content(), 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(), uexport_content(), update_birthdays(), update_channel_content(), update_display_content(), update_home_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_photo(), widget_photo_rand(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), widget_tagcloud(), writepages_widget(), wtagblock(), xchan_content(), z_readdir(), and zfinger_init().

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index f7469da83..f4f8c00bf 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -42,10 +42,10 @@ var NAVTREEINDEX = "classRedMatrix_1_1RedDAV_1_1RedFile.html#ab7ab7ba81fab28eb02382cfdfd80ecfe", "datetime_8php.html#a77bb385ae8a9e7ca663309c102c0d766", "functions_func_0x65.html", -"include_2attach_8php.html#a4dbfd7e1cef52aa9ef52f4b88929fa86", -"manage_8php.html", -"profperm_8php.html", -"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f" +"include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d", +"mail_8php.html#acfc2cc0bf4e0b178207758384977f25a", +"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04", +"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 4bc078b43..4bbeea8e2 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -162,7 +162,7 @@ var NAVTREEINDEX0 = "boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[6,0,4,121], "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[6,0,4,1], "boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[6,0,4,231], -"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[6,0,4,80], +"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[6,0,4,79], "boot_8php.html#a0afeb43da443d6ff3526ede5ecdcc3b3":[6,0,4,309], "boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[6,0,4,193], "boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[6,0,4,296], @@ -179,7 +179,7 @@ var NAVTREEINDEX0 = "boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[6,0,4,95], "boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[6,0,4,92], "boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[6,0,4,220], -"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[6,0,4,75], +"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[6,0,4,74], "boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[6,0,4,169], "boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[6,0,4,165], "boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[6,0,4,192], @@ -209,7 +209,7 @@ var NAVTREEINDEX0 = "boot_8php.html#a2b525996e4426bdddbcec277778bde08":[6,0,4,268], "boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[6,0,4,212], "boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[6,0,4,146], -"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[6,0,4,81], +"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[6,0,4,80], "boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[6,0,4,87], "boot_8php.html#a329400dcb29897cdaae3020109272285":[6,0,4,17], "boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[6,0,4,251], diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index daaeb12eb..542a6e811 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -10,7 +10,7 @@ var NAVTREEINDEX1 = "boot_8php.html#a59717d02602a4babf2a54da8b33d93a5":[6,0,4,41], "boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[6,0,4,319], "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[6,0,4,21], -"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[6,0,4,74], +"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[6,0,4,73], "boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[6,0,4,205], "boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[6,0,4,93], "boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[6,0,4,184], @@ -50,14 +50,13 @@ var NAVTREEINDEX1 = "boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[6,0,4,101], "boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[6,0,4,264], "boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[6,0,4,133], -"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[6,0,4,78], +"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[6,0,4,77], "boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[6,0,4,154], "boot_8php.html#a7b511bd93202c43405adbe3b5bcebbfe":[6,0,4,304], "boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[6,0,4,185], "boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[6,0,4,82], "boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[6,0,4,125], "boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b":[6,0,4,66], -"boot_8php.html#a7cfd5a02abaf6d85e2f915ccf60dca46":[6,0,4,73], "boot_8php.html#a7e5627b5ca4b7464feb0f08663b19ea1":[6,0,4,312], "boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[6,0,4,187], "boot_8php.html#a7eeb83e15968f7a6cc5937d493815773":[6,0,4,53], @@ -113,12 +112,13 @@ var NAVTREEINDEX1 = "boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[6,0,4,172], "boot_8php.html#aa561f801e962b67a5c4d0548ea95fd17":[6,0,4,20], "boot_8php.html#aa589421267f0c2f0d643f727792cce35":[6,0,4,129], +"boot_8php.html#aa726114f13c1119ae77c3464d6afeaed":[6,0,4,81], "boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[6,0,4,100], "boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[6,0,4,111], "boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[6,0,4,254], "boot_8php.html#aab8b7ce53e7b8fd7fa27ff42fbc912cb":[6,0,4,70], "boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[6,0,4,236], -"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[6,0,4,79], +"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[6,0,4,78], "boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[6,0,4,210], "boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[6,0,4,134], "boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[6,0,4,238], @@ -140,7 +140,7 @@ var NAVTREEINDEX1 = "boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[6,0,4,267], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[6,0,4,3], "boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[6,0,4,294], -"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[6,0,4,77], +"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[6,0,4,76], "boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[6,0,4,131], "boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[6,0,4,112], "boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[6,0,4,142], @@ -165,7 +165,7 @@ var NAVTREEINDEX1 = "boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[6,0,4,250], "boot_8php.html#ace6d70ac290397ddd40e561fd0831858":[6,0,4,286], "boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[6,0,4,224], -"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[6,0,4,76], +"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[6,0,4,75], "boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[6,0,4,171], "boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[6,0,4,181], "boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13":[6,0,4,10], diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index e4d8f80c8..37ffd0178 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -246,8 +246,8 @@ var NAVTREEINDEX5 = "include_2apps_8php.html#ae64f72eb4f126e03b4eb65ed1702a3ca":[6,0,0,8,10], "include_2apps_8php.html#aeab6a62d2f3dfaa86ed043a006305f46":[6,0,0,8,9], "include_2attach_8php.html":[6,0,0,9], -"include_2attach_8php.html#a052f14487ff2ce72f62a09fac8d7e997":[6,0,0,9,9], +"include_2attach_8php.html#a052f14487ff2ce72f62a09fac8d7e997":[6,0,0,9,10], "include_2attach_8php.html#a0d07c5b83d3d54e186f752e571847b36":[6,0,0,9,0], -"include_2attach_8php.html#a1d72ef7cb940f6868e3e2a841cadfe8f":[6,0,0,9,11], -"include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d":[6,0,0,9,5] +"include_2attach_8php.html#a1d72ef7cb940f6868e3e2a841cadfe8f":[6,0,0,9,12], +"include_2attach_8php.html#a3502fd6e55160e0ccdeab88c02723b9f":[6,0,0,9,8] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index c0ee3996e..b994fa5be 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,16 +1,17 @@ var NAVTREEINDEX6 = { -"include_2attach_8php.html#a4dbfd7e1cef52aa9ef52f4b88929fa86":[6,0,0,9,8], +"include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d":[6,0,0,9,5], +"include_2attach_8php.html#a4dbfd7e1cef52aa9ef52f4b88929fa86":[6,0,0,9,9], "include_2attach_8php.html#a5c0875eafb8c0f8a0620ff7a875a2221":[6,0,0,9,2], -"include_2attach_8php.html#a5d484de2d19a93071571d6499a50ae34":[6,0,0,9,12], -"include_2attach_8php.html#a6aa00ea010ea030110faefb75eafc1ce":[6,0,0,9,10], -"include_2attach_8php.html#a6fdd92775f31c07d2863e16e0026018a":[6,0,0,9,13], +"include_2attach_8php.html#a5d484de2d19a93071571d6499a50ae34":[6,0,0,9,13], +"include_2attach_8php.html#a6aa00ea010ea030110faefb75eafc1ce":[6,0,0,9,11], +"include_2attach_8php.html#a6fdd92775f31c07d2863e16e0026018a":[6,0,0,9,14], "include_2attach_8php.html#a70bd666e080c2af5a91f5d14c297b8cd":[6,0,0,9,4], "include_2attach_8php.html#a84a8a64c4805e1525b42d4add464833f":[6,0,0,9,7], "include_2attach_8php.html#a887d2d44a3ef18dcb6624e7fb58dc8e3":[6,0,0,9,3], "include_2attach_8php.html#ab6830b3ab74a5d284876141ac80f6cbc":[6,0,0,9,6], "include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932":[6,0,0,9,1], -"include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909":[6,0,0,9,14], +"include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909":[6,0,0,9,15], "include_2bookmarks_8php.html":[6,0,0,14], "include_2bookmarks_8php.html#a743763b0ce83af0bbc8a2f7ac16033aa":[6,0,0,14,1], "include_2bookmarks_8php.html#aef1cb2968c41c759f2d106e1088ca323":[6,0,0,14,0], @@ -248,6 +249,5 @@ var NAVTREEINDEX6 = "magic_8php.html":[6,0,1,55], "magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[6,0,1,55,0], "mail_8php.html":[6,0,1,56], -"mail_8php.html#a3c7c485fc69f92371e8b20936040eca1":[6,0,1,56,0], -"mail_8php.html#acfc2cc0bf4e0b178207758384977f25a":[6,0,1,56,1] +"mail_8php.html#a3c7c485fc69f92371e8b20936040eca1":[6,0,1,56,0] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 87e529b06..2c9692c77 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,5 +1,6 @@ var NAVTREEINDEX7 = { +"mail_8php.html#acfc2cc0bf4e0b178207758384977f25a":[6,0,1,56,1], "manage_8php.html":[6,0,1,57], "manage_8php.html#a2bca247b5296827638959138367db4f5":[6,0,1,57,0], "match_8php.html":[6,0,1,58], @@ -89,10 +90,10 @@ var NAVTREEINDEX7 = "namespacemembers_func.html":[4,1,1], "namespacemembers_vars.html":[4,1,2], "namespaces.html":[4,0], -"namespaceupdatetpl.html":[4,0,4], "namespaceupdatetpl.html":[5,0,4], -"namespaceutil.html":[5,0,5], +"namespaceupdatetpl.html":[4,0,4], "namespaceutil.html":[4,0,5], +"namespaceutil.html":[5,0,5], "nav_8php.html":[6,0,0,53], "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[6,0,0,53,0], "nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[6,0,0,53,1], @@ -248,6 +249,5 @@ var NAVTREEINDEX7 = "profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[6,0,0,67,0], "profiles_8php.html":[6,0,1,92], "profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[6,0,1,92,1], -"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[6,0,1,92,0], -"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[6,0,1,92,2] +"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[6,0,1,92,0] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js index 10e040f32..f6a67fb15 100644 --- a/doc/html/navtreeindex8.js +++ b/doc/html/navtreeindex8.js @@ -1,5 +1,6 @@ var NAVTREEINDEX8 = { +"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[6,0,1,92,2], "profperm_8php.html":[6,0,1,93], "profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[6,0,1,93,1], "profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[6,0,1,93,0], @@ -128,17 +129,19 @@ var NAVTREEINDEX8 = "setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[6,0,1,112,6], "share_8php.html":[6,0,1,113], "share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[6,0,1,113,0], +"sharedwithme_8php.html":[6,0,1,114], +"sharedwithme_8php.html#a322b2b86b82e1d3a7de292758cd3d190":[6,0,1,114,0], "simple__black__on__white_8php.html":[6,0,3,1,3,1,4], "simple__green__on__black_8php.html":[6,0,3,1,3,1,5], "simple__white__on__black_8php.html":[6,0,3,1,3,1,6], -"siteinfo_8php.html":[6,0,1,114], -"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[6,0,1,114,1], -"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[6,0,1,114,0], -"sitelist_8php.html":[6,0,1,115], -"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[6,0,1,115,0], +"siteinfo_8php.html":[6,0,1,115], +"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[6,0,1,115,1], +"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[6,0,1,115,0], +"sitelist_8php.html":[6,0,1,116], +"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[6,0,1,116,0], "smarty_8php.html":[6,0,0,74], -"smilies_8php.html":[6,0,1,116], -"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[6,0,1,116,0], +"smilies_8php.html":[6,0,1,117], +"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[6,0,1,117,0], "socgraph_8php.html":[6,0,0,75], "socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[6,0,0,75,0], "socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[6,0,0,75,6], @@ -149,19 +152,19 @@ var NAVTREEINDEX8 = "socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[6,0,0,75,2], "socgraph_8php.html#af175807406d94407a5e11742a3287746":[6,0,0,75,5], "socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[6,0,0,75,3], -"sources_8php.html":[6,0,1,117], -"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[6,0,1,117,0], -"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[6,0,1,117,1], +"sources_8php.html":[6,0,1,118], +"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[6,0,1,118,0], +"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[6,0,1,118,1], "spam_8php.html":[6,0,0,76], "spam_8php.html#a05861201147b9a538d006f0269255cf9":[6,0,0,76,1], "spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6":[6,0,0,76,0], "sporadic_2php_2style_8php.html":[6,0,3,1,4,0,0], "sporadic_2php_2theme_8php.html":[6,0,3,1,4,0,1], "sporadic_2php_2theme_8php.html#a76ef724ca35812c083088fe573507ef6":[6,0,3,1,4,0,1,0], -"sslify_8php.html":[6,0,1,118], -"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[6,0,1,118,0], -"starred_8php.html":[6,0,1,119], -"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[6,0,1,119,0], +"sslify_8php.html":[6,0,1,119], +"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[6,0,1,119,0], +"starred_8php.html":[6,0,1,120], +"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[6,0,1,120,0], "statistics__fns_8php.html":[6,0,0,77], "statistics__fns_8php.html#a05858927cce81fd367aedf85a94ed90c":[6,0,0,77,2], "statistics__fns_8php.html#a82726229a961d3bd3d543005c61dd8e6":[6,0,0,77,0], @@ -170,24 +173,24 @@ var NAVTREEINDEX8 = "stumble_2php_2style_8php.html":[6,0,3,1,5,0,0], "stumble_2php_2theme_8php.html":[6,0,3,1,5,0,1], "stumble_2php_2theme_8php.html#a71db9eff6289e0ee47771c37c01d6753":[6,0,3,1,5,0,1,0], -"subthread_8php.html":[6,0,1,120], -"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[6,0,1,120,0], +"subthread_8php.html":[6,0,1,121], +"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[6,0,1,121,0], "suckerberg_2php_2style_8php.html":[6,0,3,1,6,0,0], "suckerberg_2php_2theme_8php.html":[6,0,3,1,6,0,1], "suckerberg_2php_2theme_8php.html#a4104fce7d5fb71d15ed811978b628fc8":[6,0,3,1,6,0,1,0], -"suggest_8php.html":[6,0,1,121], -"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[6,0,1,121,0], -"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[6,0,1,121,1], +"suggest_8php.html":[6,0,1,122], +"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[6,0,1,122,0], +"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[6,0,1,122,1], "sunbeam_2php_2style_8php.html":[6,0,3,1,7,0,0], "sunbeam_2php_2theme_8php.html":[6,0,3,1,7,0,1], "sunbeam_2php_2theme_8php.html#a72ead3f3b9b85241d4661c4f5c5f1525":[6,0,3,1,7,0,1,0], "system__unavailable_8php.html":[6,0,0,78], "system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[6,0,0,78,0], -"tagger_8php.html":[6,0,1,122], -"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[6,0,1,122,0], -"tagrm_8php.html":[6,0,1,123], -"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[6,0,1,123,1], -"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[6,0,1,123,0], +"tagger_8php.html":[6,0,1,123], +"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[6,0,1,123,0], +"tagrm_8php.html":[6,0,1,124], +"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[6,0,1,124,1], +"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[6,0,1,124,0], "taxonomy_8php.html":[6,0,0,79], "taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[6,0,0,79,10], "taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[6,0,0,79,1], @@ -246,8 +249,5 @@ var NAVTREEINDEX8 = "text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[6,0,0,81,7], "text_8php.html#a405afe814a23f3bd94d826101aa168ab":[6,0,0,81,94], "text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[6,0,0,81,38], -"text_8php.html#a4446c7f8996a280f7e08b7bfe6c6c8bc":[6,0,0,81,51], -"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[6,0,0,81,35], -"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[6,0,0,81,48], -"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[6,0,0,81,68] +"text_8php.html#a4446c7f8996a280f7e08b7bfe6c6c8bc":[6,0,0,81,51] }; diff --git a/doc/html/navtreeindex9.js b/doc/html/navtreeindex9.js index 4d43b4ccd..6a869353f 100644 --- a/doc/html/navtreeindex9.js +++ b/doc/html/navtreeindex9.js @@ -1,5 +1,8 @@ var NAVTREEINDEX9 = { +"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[6,0,0,81,35], +"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[6,0,0,81,48], +"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[6,0,0,81,68], "text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[6,0,0,81,57], "text_8php.html#a4e4045a07c55cacf3e4b63bde190d954":[6,0,0,81,50], "text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[6,0,0,81,25], @@ -65,14 +68,14 @@ var NAVTREEINDEX9 = "theme_2mytheme_2php_2default_8php.html":[6,0,3,1,2,0,0], "theme_2mytheme_2php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[6,0,3,1,2,0,0,0], "theme_2redbasic_2php_2theme__init_8php.html":[6,0,3,1,3,0,3], -"thing_8php.html":[6,0,1,124], -"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[6,0,1,124,0], -"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[6,0,1,124,1], +"thing_8php.html":[6,0,1,125], +"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[6,0,1,125,0], +"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[6,0,1,125,1], "todo.html":[3], -"toggle__mobile_8php.html":[6,0,1,125], -"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[6,0,1,125,0], -"toggle__safesearch_8php.html":[6,0,1,126], -"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[6,0,1,126,0], +"toggle__mobile_8php.html":[6,0,1,126], +"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[6,0,1,126,0], +"toggle__safesearch_8php.html":[6,0,1,127], +"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[6,0,1,127,0], "tpldebug_8php.html":[6,0,2,7], "tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[6,0,2,7,0], "tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[6,0,2,7,1], @@ -86,19 +89,19 @@ var NAVTREEINDEX9 = "typohelper_8php.html":[6,0,2,9], "typohelper_8php.html#a7542d95618011800c61773127fa625cf":[6,0,2,9,0], "typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[6,0,2,9,1], -"uexport_8php.html":[6,0,1,127], -"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[6,0,1,127,1], -"uexport_8php.html#ae6f79d60916c01675c8cf663cb5fec84":[6,0,1,127,0], -"update__channel_8php.html":[6,0,1,128], -"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[6,0,1,128,0], -"update__display_8php.html":[6,0,1,129], -"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[6,0,1,129,0], -"update__home_8php.html":[6,0,1,130], -"update__home_8php.html#a668340089acd150b830134476a647d05":[6,0,1,130,0], -"update__network_8php.html":[6,0,1,131], -"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[6,0,1,131,0], -"update__search_8php.html":[6,0,1,132], -"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[6,0,1,132,0], +"uexport_8php.html":[6,0,1,128], +"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[6,0,1,128,1], +"uexport_8php.html#ae6f79d60916c01675c8cf663cb5fec84":[6,0,1,128,0], +"update__channel_8php.html":[6,0,1,129], +"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[6,0,1,129,0], +"update__display_8php.html":[6,0,1,130], +"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[6,0,1,130,0], +"update__home_8php.html":[6,0,1,131], +"update__home_8php.html#a668340089acd150b830134476a647d05":[6,0,1,131,0], +"update__network_8php.html":[6,0,1,132], +"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[6,0,1,132,0], +"update__search_8php.html":[6,0,1,133], +"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[6,0,1,133,0], "updatetpl_8py.html":[6,0,2,10], "updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[6,0,2,10,5], "updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[6,0,2,10,2], @@ -114,28 +117,28 @@ var NAVTREEINDEX9 = "view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793":[6,0,3,1,3,0,0,0], "view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[6,0,3,1,3,0,0,1], "view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[6,0,3,1,3,0,0,2], -"view_8php.html":[6,0,1,133], -"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,133,0], -"viewconnections_8php.html":[6,0,1,134], -"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[6,0,1,134,1], -"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[6,0,1,134,0], -"viewsrc_8php.html":[6,0,1,135], -"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[6,0,1,135,0], -"vote_8php.html":[6,0,1,136], -"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[6,0,1,136,2], -"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[6,0,1,136,0], -"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[6,0,1,136,1], -"wall__attach_8php.html":[6,0,1,137], -"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[6,0,1,137,0], -"wall__upload_8php.html":[6,0,1,138], -"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[6,0,1,138,0], -"webfinger_8php.html":[6,0,1,139], -"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[6,0,1,139,0], -"webpages_8php.html":[6,0,1,140], -"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[6,0,1,140,0], -"webpages_8php.html#af9ad0b65eba79acead3fa32b43d888b7":[6,0,1,140,1], -"wfinger_8php.html":[6,0,1,141], -"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[6,0,1,141,0], +"view_8php.html":[6,0,1,134], +"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,134,0], +"viewconnections_8php.html":[6,0,1,135], +"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[6,0,1,135,1], +"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[6,0,1,135,0], +"viewsrc_8php.html":[6,0,1,136], +"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[6,0,1,136,0], +"vote_8php.html":[6,0,1,137], +"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[6,0,1,137,2], +"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[6,0,1,137,0], +"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[6,0,1,137,1], +"wall__attach_8php.html":[6,0,1,138], +"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[6,0,1,138,0], +"wall__upload_8php.html":[6,0,1,139], +"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[6,0,1,139,0], +"webfinger_8php.html":[6,0,1,140], +"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[6,0,1,140,0], +"webpages_8php.html":[6,0,1,141], +"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[6,0,1,141,0], +"webpages_8php.html#af9ad0b65eba79acead3fa32b43d888b7":[6,0,1,141,1], +"wfinger_8php.html":[6,0,1,142], +"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[6,0,1,142,0], "widedarkness_8php.html":[6,0,3,1,0,2,10], "widgets_8php.html":[6,0,0,82], "widgets_8php.html#a08035db02ff6a23260146b4c64153422":[6,0,0,82,12], @@ -171,17 +174,17 @@ var NAVTREEINDEX9 = "widgets_8php.html#af8eb466ef91d9e96e13335ead5eba380":[6,0,0,82,23], "widgets_8php.html#af919de8e7e2ba8192a65fadc72a2c8b5":[6,0,0,82,4], "widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[6,0,0,82,18], -"xchan_8php.html":[6,0,1,142], -"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,142,0], -"xrd_8php.html":[6,0,1,143], -"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[6,0,1,143,0], -"xref_8php.html":[6,0,1,144], -"xref_8php.html#a9bee399213b8de8226b0d60834307473":[6,0,1,144,0], +"xchan_8php.html":[6,0,1,143], +"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,143,0], +"xrd_8php.html":[6,0,1,144], +"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[6,0,1,144,0], +"xref_8php.html":[6,0,1,145], +"xref_8php.html#a9bee399213b8de8226b0d60834307473":[6,0,1,145,0], "yolo_2php_2style_8php.html":[6,0,3,1,8,0,0], "yolo_2php_2theme_8php.html":[6,0,3,1,8,0,1], "yolo_2php_2theme_8php.html#a2e02a06ae3f6ea911b45931ba7cbc3da":[6,0,3,1,8,0,1,0], -"zfinger_8php.html":[6,0,1,145], -"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[6,0,1,145,0], +"zfinger_8php.html":[6,0,1,146], +"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[6,0,1,146,0], "zot_8php.html":[6,0,0,83], "zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[6,0,0,83,15], "zot_8php.html#a084c581d534e7e3b759488b46602288f":[6,0,0,83,20], @@ -201,10 +204,10 @@ var NAVTREEINDEX9 = "zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[6,0,0,83,3], "zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988":[6,0,0,83,12], "zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[6,0,0,83,29], -"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[6,0,0,83,23], "zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[6,0,0,83,14], "zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[6,0,0,83,13], "zot_8php.html#aa97b33b619dd7132a9274f852af6ceb5":[6,0,0,83,1], +"zot_8php.html#aaa77f03d4e89a70ebf0402e1cc9426d7":[6,0,0,83,23], "zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[6,0,0,83,16], "zot_8php.html#ab15c04e7e5f44edf45ec50dd7d183254":[6,0,0,83,17], "zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[6,0,0,83,27], @@ -216,8 +219,8 @@ var NAVTREEINDEX9 = "zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca":[6,0,0,83,21], "zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[6,0,0,83,24], "zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[6,0,0,83,26], -"zotfeed_8php.html":[6,0,1,146], -"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[6,0,1,146,0], -"zping_8php.html":[6,0,1,147], -"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[6,0,1,147,0] +"zotfeed_8php.html":[6,0,1,147], +"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[6,0,1,147,0], +"zping_8php.html":[6,0,1,148], +"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[6,0,1,148,0] }; diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index 8100b5c73..755ca74f8 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 acl_init(), admin_page_channels(), api_call(), api_direct_messages_box(), 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(), dav_init(), design_tools(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_request(), 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(), impel_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), locs_content(), locs_post(), 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(), 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(), refimport_content(), reflect_comment_store(), reflect_photo_callback(), 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().

    +

    Referenced by acl_init(), admin_page_channels(), api_call(), api_direct_messages_box(), 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(), dav_init(), design_tools(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_request(), 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(), impel_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), locs_content(), locs_post(), 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(), 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(), refimport_content(), reflect_comment_store(), reflect_photo_callback(), rpost_content(), send_message(), settings_post(), sharedwithme_content(), 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/plugin_8php.html b/doc/html/plugin_8php.html index 0a626c481..f18f73d4f 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -206,7 +206,7 @@ Functions
    -

    Referenced by _well_known_init(), api_login(), atom_author(), atom_entry(), authenticate_success(), avatar_img(), bb2diaspora(), bbcode(), channel_remove(), chat_message(), chatsvc_post(), check_account_email(), check_account_invite(), check_account_password(), connect_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_identity(), cronhooks_run(), directory_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store_item(), externals_run(), feature_enabled(), gender_selector(), gender_selector_min(), generate_map(), generate_named_map(), get_all_perms(), get_atom_elements(), get_features(), get_feed_for(), get_mood_verbs(), get_perms(), get_poke_verbs(), get_role_perms(), Item\get_template_data(), App\get_widgets(), group_select(), home_content(), home_init(), hostxrd_init(), html2bbcode(), import_author_xchan(), import_directory_profile(), import_xchan(), item_photo_menu(), item_post(), item_store(), item_store_update(), like_content(), list_smilies(), login(), magic_init(), mail_store(), marital_selector(), marital_selector_min(), mood_init(), nav(), network_content(), network_to_name(), new_contact(), notification(), notifier_run(), obj_verbs(), oembed_fetch_url(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_content(), ping_init(), poller_run(), populate_acl(), post_activity_item(), post_init(), prepare_body(), probe_well_known(), proc_run(), process_delivery(), profile_content(), profile_sidebar(), profiles_content(), profiles_post(), replace_macros(), rmagic_post(), settings_post(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), subthread_content(), tag_deliver(), validate_channelname(), wfinger_init(), widget_affinity(), xrd_init(), zfinger_init(), zid(), and zid_init().

    +

    Referenced by _well_known_init(), api_login(), atom_author(), atom_entry(), authenticate_success(), avatar_img(), bb2diaspora(), bbcode(), channel_remove(), chat_message(), chatsvc_post(), check_account_email(), check_account_invite(), check_account_password(), connect_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_identity(), cronhooks_run(), directory_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store_item(), externals_run(), feature_enabled(), file_activity(), gender_selector(), gender_selector_min(), generate_map(), generate_named_map(), get_all_perms(), get_atom_elements(), get_features(), get_feed_for(), get_mood_verbs(), get_perms(), get_poke_verbs(), get_role_perms(), Item\get_template_data(), App\get_widgets(), group_select(), home_content(), home_init(), hostxrd_init(), html2bbcode(), import_author_xchan(), import_directory_profile(), import_xchan(), item_photo_menu(), item_post(), item_store(), item_store_update(), like_content(), list_smilies(), login(), magic_init(), mail_store(), marital_selector(), marital_selector_min(), mood_init(), nav(), network_content(), network_to_name(), new_contact(), notification(), notifier_run(), obj_verbs(), oembed_fetch_url(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_content(), ping_init(), poller_run(), populate_acl(), post_activity_item(), post_init(), prepare_body(), probe_well_known(), proc_run(), process_delivery(), profile_content(), profile_sidebar(), profiles_content(), profiles_post(), replace_macros(), rmagic_post(), settings_post(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), subthread_content(), tag_deliver(), validate_channelname(), wfinger_init(), widget_affinity(), xrd_init(), zfinger_init(), zid(), and zid_init().

    diff --git a/doc/html/search/all_61.js b/doc/html/search/all_61.js index d48506f9e..a440ad685 100644 --- a/doc/html/search/all_61.js +++ b/doc/html/search/all_61.js @@ -46,7 +46,6 @@ var searchData= ['activity_5fdisagree',['ACTIVITY_DISAGREE',['../boot_8php.html#aab8b7ce53e7b8fd7fa27ff42fbc912cb',1,'boot.php']]], ['activity_5fdislike',['ACTIVITY_DISLIKE',['../boot_8php.html#a0e57f846e6d47a308feced0f7274f178',1,'boot.php']]], ['activity_5ffavorite',['ACTIVITY_FAVORITE',['../boot_8php.html#a3e2ea123d29a72012db1241f96280b0e',1,'boot.php']]], - ['activity_5ffile',['ACTIVITY_FILE',['../boot_8php.html#a7cfd5a02abaf6d85e2f915ccf60dca46',1,'boot.php']]], ['activity_5ffollow',['ACTIVITY_FOLLOW',['../boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434',1,'boot.php']]], ['activity_5ffriend',['ACTIVITY_FRIEND',['../boot_8php.html#a176664e78dcb9132e16be69418223eb2',1,'boot.php']]], ['activity_5fjoin',['ACTIVITY_JOIN',['../boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3',1,'boot.php']]], @@ -56,6 +55,7 @@ var searchData= ['activity_5fobj_5falbum',['ACTIVITY_OBJ_ALBUM',['../boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14',1,'boot.php']]], ['activity_5fobj_5fcomment',['ACTIVITY_OBJ_COMMENT',['../boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562',1,'boot.php']]], ['activity_5fobj_5fevent',['ACTIVITY_OBJ_EVENT',['../boot_8php.html#a2e90096fede6acce16abf0da8cb2febe',1,'boot.php']]], + ['activity_5fobj_5ffile',['ACTIVITY_OBJ_FILE',['../boot_8php.html#aa726114f13c1119ae77c3464d6afeaed',1,'boot.php']]], ['activity_5fobj_5fgroup',['ACTIVITY_OBJ_GROUP',['../boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3',1,'boot.php']]], ['activity_5fobj_5fheart',['ACTIVITY_OBJ_HEART',['../boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f',1,'boot.php']]], ['activity_5fobj_5flocation',['ACTIVITY_OBJ_LOCATION',['../boot_8php.html#a9687c702656af105e9a09048c21aec4c',1,'boot.php']]], diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js index 7e2378199..10e9b143c 100644 --- a/doc/html/search/all_66.js +++ b/doc/html/search/all_66.js @@ -12,6 +12,7 @@ var searchData= ['fetch_5flrdd_5ftemplate',['fetch_lrdd_template',['../include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0',1,'network.php']]], ['fetch_5fpost_5ftags',['fetch_post_tags',['../items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9',1,'items.php']]], ['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]], + ['file_5factivity',['file_activity',['../include_2attach_8php.html#a3502fd6e55160e0ccdeab88c02723b9f',1,'attach.php']]], ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]], ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]], ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'taxonomy.php']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index 47a430c2e..fdcce0962 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -76,6 +76,8 @@ var searchData= ['share_5finit',['share_init',['../share_8php.html#afeb26046bdd02567ecd29ab5f188b249',1,'share.php']]], ['share_5fshield',['share_shield',['../bb2diaspora_8php.html#ad033be99e87a2aaa05e569c68f30792d',1,'bb2diaspora.php']]], ['share_5funshield',['share_unshield',['../bb2diaspora_8php.html#ab61b4f8c065e97b151411858bb2f209a',1,'bb2diaspora.php']]], + ['sharedwithme_2ephp',['sharedwithme.php',['../sharedwithme_8php.html',1,'']]], + ['sharedwithme_5fcontent',['sharedwithme_content',['../sharedwithme_8php.html#a322b2b86b82e1d3a7de292758cd3d190',1,'sharedwithme.php']]], ['showform',['showForm',['../fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443',1,'fpostit.php']]], ['simple_5fblack_5fon_5fwhite_2ephp',['simple_black_on_white.php',['../simple__black__on__white_8php.html',1,'']]], ['simple_5fgreen_5fon_5fblack_2ephp',['simple_green_on_black.php',['../simple__green__on__black_8php.html',1,'']]], @@ -128,15 +130,15 @@ var searchData= ['strip_5fzids',['strip_zids',['../text_8php.html#a2f2585385530cb935a6325c809d84a4d',1,'text.php']]], ['stripdcode_5fbr_5fcb',['stripdcode_br_cb',['../bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93',1,'bb2diaspora.php']]], ['stumble_5finit',['stumble_init',['../stumble_2php_2theme_8php.html#a71db9eff6289e0ee47771c37c01d6753',1,'theme.php']]], - ['style_2ephp',['style.php',['../stumble_2php_2style_8php.html',1,'']]], - ['style_2ephp',['style.php',['../yolo_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../sunbeam_2php_2style_8php.html',1,'']]], - ['style_2ephp',['style.php',['../suckerberg_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], - ['style_2ephp',['style.php',['../mytheme_2php_2style_8php.html',1,'']]], - ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../yolo_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../sporadic_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../stumble_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../suckerberg_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../mytheme_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../hivenet_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]], ['subthread_5fcontent',['subthread_content',['../subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3',1,'subthread.php']]], ['suckerberg_5finit',['suckerberg_init',['../suckerberg_2php_2theme_8php.html#a4104fce7d5fb71d15ed811978b628fc8',1,'theme.php']]], diff --git a/doc/html/search/all_7a.js b/doc/html/search/all_7a.js index abbf3009d..daaaa3269 100644 --- a/doc/html/search/all_7a.js +++ b/doc/html/search/all_7a.js @@ -24,7 +24,7 @@ var searchData= ['zot_5fencode_5flocations',['zot_encode_locations',['../zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca',1,'zot.php']]], ['zot_5ffeed',['zot_feed',['../items_8php.html#a1cf89557f32d5dfbe8bd90448dc1aa92',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']]], + ['zot_5ffinger',['zot_finger',['../zot_8php.html#aaa77f03d4e89a70ebf0402e1cc9426d7',1,'zot.php']]], ['zot_5fget_5fhublocs',['zot_get_hublocs',['../zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7',1,'zot.php']]], ['zot_5fgethub',['zot_gethub',['../zot_8php.html#a55056e863a7860bc0cf922e78fcce073',1,'zot.php']]], ['zot_5fimport',['zot_import',['../zot_8php.html#aeea071f17e306fe3d0c488551906bfab',1,'zot.php']]], diff --git a/doc/html/search/files_73.js b/doc/html/search/files_73.js index a9d0d27d8..0e11a6781 100644 --- a/doc/html/search/files_73.js +++ b/doc/html/search/files_73.js @@ -8,6 +8,7 @@ var searchData= ['settings_2ephp',['settings.php',['../settings_8php.html',1,'']]], ['setup_2ephp',['setup.php',['../setup_8php.html',1,'']]], ['share_2ephp',['share.php',['../share_8php.html',1,'']]], + ['sharedwithme_2ephp',['sharedwithme.php',['../sharedwithme_8php.html',1,'']]], ['simple_5fblack_5fon_5fwhite_2ephp',['simple_black_on_white.php',['../simple__black__on__white_8php.html',1,'']]], ['simple_5fgreen_5fon_5fblack_2ephp',['simple_green_on_black.php',['../simple__green__on__black_8php.html',1,'']]], ['simple_5fwhite_5fon_5fblack_2ephp',['simple_white_on_black.php',['../simple__white__on__black_8php.html',1,'']]], @@ -21,15 +22,15 @@ var searchData= ['sslify_2ephp',['sslify.php',['../sslify_8php.html',1,'']]], ['starred_2ephp',['starred.php',['../starred_8php.html',1,'']]], ['statistics_5ffns_2ephp',['statistics_fns.php',['../statistics__fns_8php.html',1,'']]], - ['style_2ephp',['style.php',['../stumble_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../suckerberg_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../sunbeam_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../yolo_2php_2style_8php.html',1,'']]], - ['style_2ephp',['style.php',['../apw_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',['../suckerberg_2php_2style_8php.html',1,'']]], - ['style_2ephp',['style.php',['../sporadic_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../hivenet_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../mytheme_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../sporadic_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../stumble_2php_2style_8php.html',1,'']]], ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]], ['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]], ['system_5funavailable_2ephp',['system_unavailable.php',['../system__unavailable_8php.html',1,'']]] diff --git a/doc/html/search/functions_66.js b/doc/html/search/functions_66.js index 7f97017bd..05b883038 100644 --- a/doc/html/search/functions_66.js +++ b/doc/html/search/functions_66.js @@ -8,6 +8,7 @@ var searchData= ['fetch_5flrdd_5ftemplate',['fetch_lrdd_template',['../include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0',1,'network.php']]], ['fetch_5fpost_5ftags',['fetch_post_tags',['../items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9',1,'items.php']]], ['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]], + ['file_5factivity',['file_activity',['../include_2attach_8php.html#a3502fd6e55160e0ccdeab88c02723b9f',1,'attach.php']]], ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]], ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]], ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'taxonomy.php']]], diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index 4ef58029c..5674a53bf 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -68,6 +68,7 @@ var searchData= ['share_5finit',['share_init',['../share_8php.html#afeb26046bdd02567ecd29ab5f188b249',1,'share.php']]], ['share_5fshield',['share_shield',['../bb2diaspora_8php.html#ad033be99e87a2aaa05e569c68f30792d',1,'bb2diaspora.php']]], ['share_5funshield',['share_unshield',['../bb2diaspora_8php.html#ab61b4f8c065e97b151411858bb2f209a',1,'bb2diaspora.php']]], + ['sharedwithme_5fcontent',['sharedwithme_content',['../sharedwithme_8php.html#a322b2b86b82e1d3a7de292758cd3d190',1,'sharedwithme.php']]], ['showform',['showForm',['../fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443',1,'fpostit.php']]], ['site_5fdefault_5fperms',['site_default_perms',['../permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d',1,'permissions.php']]], ['siteinfo_5fcontent',['siteinfo_content',['../siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656',1,'siteinfo.php']]], diff --git a/doc/html/search/functions_7a.js b/doc/html/search/functions_7a.js index 9ea50e71d..795f6069d 100644 --- a/doc/html/search/functions_7a.js +++ b/doc/html/search/functions_7a.js @@ -21,7 +21,7 @@ var searchData= ['zot_5fencode_5flocations',['zot_encode_locations',['../zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca',1,'zot.php']]], ['zot_5ffeed',['zot_feed',['../items_8php.html#a1cf89557f32d5dfbe8bd90448dc1aa92',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']]], + ['zot_5ffinger',['zot_finger',['../zot_8php.html#aaa77f03d4e89a70ebf0402e1cc9426d7',1,'zot.php']]], ['zot_5fget_5fhublocs',['zot_get_hublocs',['../zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7',1,'zot.php']]], ['zot_5fgethub',['zot_gethub',['../zot_8php.html#a55056e863a7860bc0cf922e78fcce073',1,'zot.php']]], ['zot_5fimport',['zot_import',['../zot_8php.html#aeea071f17e306fe3d0c488551906bfab',1,'zot.php']]], diff --git a/doc/html/search/variables_61.js b/doc/html/search/variables_61.js index 1a8baa4a5..47d0a745e 100644 --- a/doc/html/search/variables_61.js +++ b/doc/html/search/variables_61.js @@ -28,7 +28,6 @@ var searchData= ['activity_5fdisagree',['ACTIVITY_DISAGREE',['../boot_8php.html#aab8b7ce53e7b8fd7fa27ff42fbc912cb',1,'boot.php']]], ['activity_5fdislike',['ACTIVITY_DISLIKE',['../boot_8php.html#a0e57f846e6d47a308feced0f7274f178',1,'boot.php']]], ['activity_5ffavorite',['ACTIVITY_FAVORITE',['../boot_8php.html#a3e2ea123d29a72012db1241f96280b0e',1,'boot.php']]], - ['activity_5ffile',['ACTIVITY_FILE',['../boot_8php.html#a7cfd5a02abaf6d85e2f915ccf60dca46',1,'boot.php']]], ['activity_5ffollow',['ACTIVITY_FOLLOW',['../boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434',1,'boot.php']]], ['activity_5ffriend',['ACTIVITY_FRIEND',['../boot_8php.html#a176664e78dcb9132e16be69418223eb2',1,'boot.php']]], ['activity_5fjoin',['ACTIVITY_JOIN',['../boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3',1,'boot.php']]], @@ -37,6 +36,7 @@ var searchData= ['activity_5fobj_5falbum',['ACTIVITY_OBJ_ALBUM',['../boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14',1,'boot.php']]], ['activity_5fobj_5fcomment',['ACTIVITY_OBJ_COMMENT',['../boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562',1,'boot.php']]], ['activity_5fobj_5fevent',['ACTIVITY_OBJ_EVENT',['../boot_8php.html#a2e90096fede6acce16abf0da8cb2febe',1,'boot.php']]], + ['activity_5fobj_5ffile',['ACTIVITY_OBJ_FILE',['../boot_8php.html#aa726114f13c1119ae77c3464d6afeaed',1,'boot.php']]], ['activity_5fobj_5fgroup',['ACTIVITY_OBJ_GROUP',['../boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3',1,'boot.php']]], ['activity_5fobj_5fheart',['ACTIVITY_OBJ_HEART',['../boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f',1,'boot.php']]], ['activity_5fobj_5flocation',['ACTIVITY_OBJ_LOCATION',['../boot_8php.html#a9687c702656af105e9a09048c21aec4c',1,'boot.php']]], diff --git a/doc/html/sharedwithme_8php.html b/doc/html/sharedwithme_8php.html new file mode 100644 index 000000000..331c0eb03 --- /dev/null +++ b/doc/html/sharedwithme_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/sharedwithme.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    sharedwithme.php File Reference
    +
    +
    + + + + +

    +Functions

     sharedwithme_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    sharedwithme_content (& $a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/sharedwithme_8php.js b/doc/html/sharedwithme_8php.js new file mode 100644 index 000000000..a6186aede --- /dev/null +++ b/doc/html/sharedwithme_8php.js @@ -0,0 +1,4 @@ +var sharedwithme_8php = +[ + [ "sharedwithme_content", "sharedwithme_8php.html#a322b2b86b82e1d3a7de292758cd3d190", null ] +]; \ No newline at end of file diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 479b95104..84a9f9722 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -1074,7 +1074,7 @@ Variables
    -

    Referenced by localize_item(), remove_community_tag(), and tag_deliver().

    +

    Referenced by localize_item(), remove_community_tag(), sharedwithme_content(), and tag_deliver().

    @@ -1269,7 +1269,7 @@ Variables

    Safe from birthday paradox.

    Returns
    string a unique id
    -

    Referenced by event_store_item(), impel_init(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), post_activity_item(), profile_activity(), and subthread_content().

    +

    Referenced by event_store_item(), file_activity(), impel_init(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), post_activity_item(), profile_activity(), and subthread_content().

    @@ -1533,7 +1533,7 @@ Variables -

    Referenced by 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(), bookmark_add(), bookmarks_init(), build_sync_packet(), channel_remove(), chanview_content(), chat_post(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), cloud_init(), connedit_post(), consume_feed(), contact_remove(), conversation(), create_account(), create_identity(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), cronhooks_run(), datetime_convert(), dav_init(), RedMatrix\RedDAV\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(), 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(), RedMatrix\RedDAV\RedFile\get(), get_atom_elements(), get_diaspora_key(), get_diaspora_reshare_xml(), get_item_elements(), Conversation\get_template_data(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), group_content(), guess_image_type(), http_status_exit(), hubloc_change_primary(), impel_init(), 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(), RedMatrix\RedDAV\RedDirectory\log(), RedMatrix\RedDAV\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(), process_channel_sync_delivery(), process_delivery(), process_location_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), prune_hub_reinstalls(), public_recips(), pubsub_init(), pubsub_post(), pubsubhubbub_init(), RedMatrix\RedDAV\RedFile\put(), dba_mysql\q(), dba_mysqli\q(), dba_postgres\q(), queue_run(), random_profile(), 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(), set_linkified_perms(), Conversation\set_mode(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), settings_post(), 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(), RedMatrix\RedDAV\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_message_request(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

    +

    Referenced by 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(), bookmark_add(), bookmarks_init(), build_sync_packet(), channel_remove(), chanview_content(), chat_post(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), cloud_init(), connedit_post(), consume_feed(), contact_remove(), conversation(), create_account(), create_identity(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), cronhooks_run(), datetime_convert(), dav_init(), RedMatrix\RedDAV\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(), 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(), RedMatrix\RedDAV\RedFile\get(), get_atom_elements(), get_diaspora_key(), get_diaspora_reshare_xml(), get_item_elements(), Conversation\get_template_data(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), group_content(), guess_image_type(), http_status_exit(), hubloc_change_primary(), impel_init(), 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(), RedMatrix\RedDAV\RedDirectory\log(), RedMatrix\RedDAV\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(), process_channel_sync_delivery(), process_delivery(), process_location_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), prune_hub_reinstalls(), public_recips(), pubsub_init(), pubsub_post(), pubsubhubbub_init(), RedMatrix\RedDAV\RedFile\put(), dba_mysql\q(), dba_mysqli\q(), dba_postgres\q(), queue_run(), random_profile(), 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(), set_linkified_perms(), Conversation\set_mode(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), settings_post(), 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(), RedMatrix\RedDAV\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_message_request(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

    diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index df232e1a8..ee2f53dbb 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -134,7 +134,7 @@ Variables
    -

    Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), account_service_class_allows(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), advanced_profile(), allowed_email(), allowed_url(), alt_pager(), api_account_verify_credentials(), api_albums(), api_apply_template(), api_call(), api_content(), api_direct_messages_all(), api_direct_messages_box(), api_direct_messages_conversation(), api_direct_messages_inbox(), api_direct_messages_new(), api_direct_messages_sentbox(), api_favorites(), api_followers_ids(), api_format_as(), api_format_items(), api_friends_ids(), api_get_user(), api_item_get_user(), api_login(), api_photos(), api_post(), api_rss_extra(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_followers(), api_statuses_friends(), api_statuses_home_timeline(), api_statuses_mediap(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_statusnet_config(), api_users_show(), app_name_compare(), appman_content(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bb_sanitize_style(), bbcode(), best_link_url(), block_content(), block_init(), blocks_content(), blocks_init(), bookmarks_content(), bookmarks_init(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), cli_suggest_run(), cloud_init(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_clone(), connections_content(), connections_init(), connections_post(), connedit_clone(), connedit_content(), connedit_init(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_identity(), current_theme(), current_theme_url(), dav_init(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), directory_content(), directory_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editblock_init(), editlayout_content(), editlayout_init(), editpost_content(), editwebpage_content(), editwebpage_init(), ev_compare(), event_store_item(), events_content(), events_post(), expand_acl(), expand_groups(), externals_run(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), findpeople_widget(), fix_private_photos(), follow_init(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_custom_nav(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_pconfig(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_init(), head_get_icon(), head_remove_css(), head_remove_js(), head_set_icon(), help_content(), hivenet_init(), home_content(), home_init(), hostxrd_init(), impel_init(), import_channel_photo(), import_post(), import_profile_photo(), info(), insert_hook(), invite_content(), invite_post(), is_developer(), is_site_admin(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), layouts_content(), layouts_init(), like_content(), link_compare(), linkify_tags(), list_smilies(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_pdl(), load_translation_table(), load_xconfig(), locs_content(), locs_post(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), manual_config(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), mytheme_init(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), p_init(), page_content(), page_init(), paginate(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), preg_heart(), prep_content(), prep_init(), probe_content(), proc_run(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_init(), pubsub_init(), pubsub_post(), pubsubhubbub_init(), push_lang(), queue_run(), randprof_init(), rbmark_content(), rbmark_post(), red_item_new(), redbasic_form(), register_content(), regmod_content(), regver_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), rpost_content(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), search_ac_init(), search_content(), search_init(), send_message(), service_class_allows(), service_class_fetch(), service_limits_content(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_init(), settings_post(), setup_content(), setup_post(), share_init(), siteinfo_content(), siteinfo_init(), smilies(), smilies_content(), sources_post(), sporadic_init(), stumble_init(), subthread_content(), suckerberg_init(), suggest_content(), sunbeam_init(), t(), tag_deliver(), tag_sort_length(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), tgroup_check(), theme_content(), theme_include(), thing_content(), thing_init(), timezone_cmp(), toggle_mobile_init(), tt(), uexport_init(), update_channel_content(), update_display_content(), update_home_content(), update_network_content(), update_search_content(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), webpages_init(), wfinger_init(), what_next(), widget_archive(), widget_catcloud_wall(), widget_categories(), widget_chatroom_list(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_item(), widget_mailmenu(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), xrd_init(), yolo_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

    +

    Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), account_service_class_allows(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), advanced_profile(), allowed_email(), allowed_url(), alt_pager(), api_account_verify_credentials(), api_albums(), api_apply_template(), api_call(), api_content(), api_direct_messages_all(), api_direct_messages_box(), api_direct_messages_conversation(), api_direct_messages_inbox(), api_direct_messages_new(), api_direct_messages_sentbox(), api_favorites(), api_followers_ids(), api_format_as(), api_format_items(), api_friends_ids(), api_get_user(), api_item_get_user(), api_login(), api_photos(), api_post(), api_rss_extra(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_followers(), api_statuses_friends(), api_statuses_home_timeline(), api_statuses_mediap(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_statusnet_config(), api_users_show(), app_name_compare(), appman_content(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bb_sanitize_style(), bbcode(), best_link_url(), block_content(), block_init(), blocks_content(), blocks_init(), bookmarks_content(), bookmarks_init(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), cli_suggest_run(), cloud_init(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_clone(), connections_content(), connections_init(), connections_post(), connedit_clone(), connedit_content(), connedit_init(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_identity(), current_theme(), current_theme_url(), dav_init(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), directory_content(), directory_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editblock_init(), editlayout_content(), editlayout_init(), editpost_content(), editwebpage_content(), editwebpage_init(), ev_compare(), event_store_item(), events_content(), events_post(), expand_acl(), expand_groups(), externals_run(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), findpeople_widget(), fix_private_photos(), follow_init(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_custom_nav(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_pconfig(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_init(), head_get_icon(), head_remove_css(), head_remove_js(), head_set_icon(), help_content(), hivenet_init(), home_content(), home_init(), hostxrd_init(), impel_init(), import_channel_photo(), import_post(), import_profile_photo(), info(), insert_hook(), invite_content(), invite_post(), is_developer(), is_site_admin(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), layouts_content(), layouts_init(), like_content(), link_compare(), linkify_tags(), list_smilies(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_pdl(), load_translation_table(), load_xconfig(), locs_content(), locs_post(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), manual_config(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), mytheme_init(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), p_init(), page_content(), page_init(), paginate(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), preg_heart(), prep_content(), prep_init(), probe_content(), proc_run(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_init(), pubsub_init(), pubsub_post(), pubsubhubbub_init(), push_lang(), queue_run(), randprof_init(), rbmark_content(), rbmark_post(), red_item_new(), redbasic_form(), register_content(), regmod_content(), regver_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), rpost_content(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), search_ac_init(), search_content(), search_init(), send_message(), service_class_allows(), service_class_fetch(), service_limits_content(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_init(), settings_post(), setup_content(), setup_post(), share_init(), sharedwithme_content(), siteinfo_content(), siteinfo_init(), smilies(), smilies_content(), sources_post(), sporadic_init(), stumble_init(), subthread_content(), suckerberg_init(), suggest_content(), sunbeam_init(), t(), tag_deliver(), tag_sort_length(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), tgroup_check(), theme_content(), theme_include(), thing_content(), thing_init(), timezone_cmp(), toggle_mobile_init(), tt(), uexport_init(), update_channel_content(), update_display_content(), update_home_content(), update_network_content(), update_search_content(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), webpages_init(), wfinger_init(), what_next(), widget_archive(), widget_catcloud_wall(), widget_categories(), widget_chatroom_list(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_item(), widget_mailmenu(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), xrd_init(), yolo_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

    diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index 9d79e4f17..77d6256a8 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -122,8 +122,8 @@ Functions    zot_zot ($url, $data)   - zot_finger ($webbie, $channel, $autofallback=true) -  + zot_finger ($webbie, $channel=null, $autofallback=true) +   zot_refresh ($them, $channel=null, $force=false)    zot_gethub ($arr) @@ -939,7 +939,7 @@ which will be processed and delivered before this function ultimately returns. - +
    @@ -953,7 +953,7 @@ which will be processed and delivered before this function ultimately returns. - + @@ -980,7 +980,7 @@ which will be processed and delivered before this function ultimately returns.
    Returns
    : array => see z_post_url and mod/zfinger.php
    -

    Referenced by chanview_content(), gprobe_run(), magic_init(), mail_post(), new_contact(), poco_load(), post_init(), probe_content(), process_channel_sync_delivery(), and update_directory_entry().

    +

    Referenced by chanview_content(), check_upstream_directory(), gprobe_run(), magic_init(), mail_post(), new_contact(), poco_load(), post_init(), probe_content(), process_channel_sync_delivery(), and update_directory_entry().

    diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js index 521de64be..c05d59966 100644 --- a/doc/html/zot_8php.js +++ b/doc/html/zot_8php.js @@ -23,7 +23,7 @@ var zot_8php = [ "zot_build_packet", "zot_8php.html#a084c581d534e7e3b759488b46602288f", null ], [ "zot_encode_locations", "zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca", null ], [ "zot_fetch", "zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea", null ], - [ "zot_finger", "zot_8php.html#a95528377d7303131958c9f0b7158fdce", null ], + [ "zot_finger", "zot_8php.html#aaa77f03d4e89a70ebf0402e1cc9426d7", null ], [ "zot_get_hublocs", "zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7", null ], [ "zot_gethub", "zot_8php.html#a55056e863a7860bc0cf922e78fcce073", null ], [ "zot_import", "zot_8php.html#aeea071f17e306fe3d0c488551906bfab", null ], diff --git a/util/messages.po b/util/messages.po index 17995d3b4..66d6daa05 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-01-16.920\n" +"Project-Id-Version: 2015-01-23.925\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-16 00:03-0800\n" +"POT-Creation-Date: 2015-01-23 00:04-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -30,7 +30,7 @@ msgid "Profile Photos" msgstr "" #: ../../include/menu.php:42 ../../include/page_widgets.php:8 -#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:263 +#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266 #: ../../include/ItemObject.php:100 ../../include/apps.php:254 #: ../../mod/settings.php:639 ../../mod/editpost.php:112 #: ../../mod/connections.php:382 ../../mod/connections.php:395 @@ -300,50 +300,50 @@ msgid "Visible to specific connections." msgstr "" #: ../../include/items.php:3968 ../../mod/display.php:32 -#: ../../mod/thing.php:76 ../../mod/filestorage.php:26 ../../mod/admin.php:168 +#: ../../mod/thing.php:76 ../../mod/filestorage.php:27 ../../mod/admin.php:168 #: ../../mod/admin.php:898 ../../mod/admin.php:1101 ../../mod/viewsrc.php:20 msgid "Item not found." msgstr "" #: ../../include/items.php:4038 ../../include/photos.php:15 -#: ../../include/attach.php:116 ../../include/attach.php:163 -#: ../../include/attach.php:226 ../../include/attach.php:240 -#: ../../include/attach.php:280 ../../include/attach.php:294 -#: ../../include/attach.php:318 ../../include/attach.php:511 -#: ../../include/attach.php:585 ../../include/chat.php:116 +#: ../../include/attach.php:137 ../../include/attach.php:184 +#: ../../include/attach.php:247 ../../include/attach.php:261 +#: ../../include/attach.php:301 ../../include/attach.php:315 +#: ../../include/attach.php:339 ../../include/attach.php:532 +#: ../../include/attach.php:606 ../../include/chat.php:116 #: ../../mod/setup.php:207 ../../mod/register.php:72 ../../mod/mitem.php:106 #: ../../mod/achievements.php:30 ../../mod/group.php:9 #: ../../mod/settings.php:554 ../../mod/poke.php:128 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/events.php:199 ../../mod/authtest.php:13 #: ../../mod/profile.php:64 ../../mod/profile.php:72 ../../mod/block.php:22 #: ../../mod/block.php:72 ../../mod/delegate.php:6 ../../mod/mail.php:114 -#: ../../mod/sources.php:66 ../../mod/profiles.php:188 -#: ../../mod/profiles.php:576 ../../mod/channel.php:90 -#: ../../mod/channel.php:201 ../../mod/channel.php:244 ../../mod/chat.php:90 -#: ../../mod/chat.php:95 ../../mod/regmod.php:17 ../../mod/editpost.php:13 -#: ../../mod/common.php:35 ../../mod/connections.php:169 -#: ../../mod/mood.php:112 ../../mod/webpages.php:67 ../../mod/bookmarks.php:46 -#: ../../mod/manage.php:6 ../../mod/blocks.php:67 ../../mod/blocks.php:75 -#: ../../mod/editblock.php:65 ../../mod/pdledit.php:21 -#: ../../mod/editlayout.php:64 ../../mod/editlayout.php:89 -#: ../../mod/network.php:12 ../../mod/editwebpage.php:64 -#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:118 -#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277 -#: ../../mod/like.php:166 ../../mod/thing.php:247 ../../mod/thing.php:264 -#: ../../mod/thing.php:299 ../../mod/fsuggest.php:78 -#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:67 -#: ../../mod/filestorage.php:82 ../../mod/filestorage.php:109 -#: ../../mod/locs.php:71 ../../mod/item.php:195 ../../mod/item.php:203 -#: ../../mod/item.php:931 ../../mod/suggest.php:26 ../../mod/layouts.php:67 -#: ../../mod/layouts.php:74 ../../mod/layouts.php:85 -#: ../../mod/connedit.php:284 ../../mod/menu.php:61 ../../mod/invite.php:13 -#: ../../mod/invite.php:104 ../../mod/notifications.php:66 -#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 -#: ../../mod/viewsrc.php:14 ../../mod/message.php:16 -#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 -#: ../../mod/photos.php:68 ../../mod/page.php:28 ../../mod/page.php:78 -#: ../../mod/appman.php:66 ../../mod/service_limits.php:7 ../../index.php:190 -#: ../../index.php:390 +#: ../../mod/sources.php:66 ../../mod/connedit.php:284 +#: ../../mod/profiles.php:188 ../../mod/profiles.php:576 +#: ../../mod/channel.php:90 ../../mod/channel.php:201 +#: ../../mod/channel.php:244 ../../mod/chat.php:90 ../../mod/chat.php:95 +#: ../../mod/regmod.php:17 ../../mod/editpost.php:13 ../../mod/common.php:35 +#: ../../mod/connections.php:169 ../../mod/mood.php:112 +#: ../../mod/webpages.php:67 ../../mod/bookmarks.php:46 ../../mod/manage.php:6 +#: ../../mod/blocks.php:67 ../../mod/blocks.php:75 ../../mod/editblock.php:65 +#: ../../mod/pdledit.php:21 ../../mod/editlayout.php:64 +#: ../../mod/editlayout.php:89 ../../mod/network.php:12 +#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86 +#: ../../mod/editwebpage.php:118 ../../mod/profile_photo.php:264 +#: ../../mod/profile_photo.php:277 ../../mod/like.php:166 +#: ../../mod/thing.php:247 ../../mod/thing.php:264 ../../mod/thing.php:299 +#: ../../mod/fsuggest.php:78 ../../mod/filestorage.php:18 +#: ../../mod/filestorage.php:71 ../../mod/filestorage.php:86 +#: ../../mod/filestorage.php:113 ../../mod/locs.php:77 ../../mod/item.php:195 +#: ../../mod/item.php:203 ../../mod/item.php:931 ../../mod/suggest.php:26 +#: ../../mod/layouts.php:67 ../../mod/layouts.php:74 ../../mod/layouts.php:85 +#: ../../mod/menu.php:61 ../../mod/invite.php:13 ../../mod/invite.php:104 +#: ../../mod/notifications.php:66 ../../mod/viewconnections.php:22 +#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:14 +#: ../../mod/message.php:16 ../../mod/new_channel.php:68 +#: ../../mod/new_channel.php:99 ../../mod/photos.php:68 ../../mod/page.php:28 +#: ../../mod/page.php:78 ../../mod/appman.php:66 +#: ../../mod/service_limits.php:7 ../../mod/sharedwithme.php:7 +#: ../../index.php:190 ../../index.php:390 msgid "Permission denied." msgstr "" @@ -404,19 +404,6 @@ msgstr "" msgid "Edited" msgstr "" -#: ../../include/zot.php:664 -msgid "Invalid data packet" -msgstr "" - -#: ../../include/zot.php:680 -msgid "Unable to verify channel signature" -msgstr "" - -#: ../../include/zot.php:1834 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "" - #: ../../include/oembed.php:171 msgid "Embedded content" msgstr "" @@ -499,65 +486,7 @@ msgstr "" msgid "Location:" msgstr "" -#: ../../include/attach.php:221 ../../include/attach.php:275 -msgid "Item was not found." -msgstr "" - -#: ../../include/attach.php:331 -msgid "No source file." -msgstr "" - -#: ../../include/attach.php:348 -msgid "Cannot locate file to replace" -msgstr "" - -#: ../../include/attach.php:366 -msgid "Cannot locate file to revise/update" -msgstr "" - -#: ../../include/attach.php:377 -#, php-format -msgid "File exceeds size limit of %d" -msgstr "" - -#: ../../include/attach.php:389 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "" - -#: ../../include/attach.php:472 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "" - -#: ../../include/attach.php:484 -msgid "Stored file could not be verified. Upload failed." -msgstr "" - -#: ../../include/attach.php:526 ../../include/attach.php:543 -msgid "Path not available." -msgstr "" - -#: ../../include/attach.php:590 -msgid "Empty pathname" -msgstr "" - -#: ../../include/attach.php:606 -msgid "duplicate filename or path" -msgstr "" - -#: ../../include/attach.php:630 -msgid "Path not found." -msgstr "" - -#: ../../include/attach.php:681 -msgid "mkdir failed." -msgstr "" - -#: ../../include/attach.php:685 -msgid "database storage failed." -msgstr "" - -#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1548 +#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1549 msgid "Logout" msgstr "" @@ -643,7 +572,7 @@ msgstr "" msgid "Your webpages" msgstr "" -#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1549 +#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1550 msgid "Login" msgstr "" @@ -668,7 +597,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1525 +#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1526 msgid "Register" msgstr "" @@ -676,8 +605,8 @@ msgstr "" msgid "Create an account" msgstr "" -#: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:58 -#: ../../mod/help.php:63 +#: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:59 +#: ../../mod/help.php:64 msgid "Help" msgstr "" @@ -694,8 +623,8 @@ msgstr "" msgid "Applications, utilities, links, games" msgstr "" -#: ../../include/nav.php:165 ../../include/text.php:842 -#: ../../include/text.php:854 ../../include/apps.php:147 +#: ../../include/nav.php:165 ../../include/text.php:836 +#: ../../include/text.php:848 ../../include/apps.php:147 #: ../../mod/search.php:30 msgid "Search" msgstr "" @@ -1080,33 +1009,13 @@ msgstr "" msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/Contact.php:107 ../../include/identity.php:840 -#: ../../include/conversation.php:946 ../../include/widgets.php:136 -#: ../../include/widgets.php:175 ../../mod/suggest.php:51 -#: ../../mod/match.php:62 ../../mod/directory.php:264 -msgid "Connect" -msgstr "" - -#: ../../include/Contact.php:124 -msgid "New window" -msgstr "" - -#: ../../include/Contact.php:125 -msgid "Open the selected location in a different window or browser tab" -msgstr "" - -#: ../../include/Contact.php:215 ../../mod/admin.php:648 -#, php-format -msgid "User '%s' deleted" -msgstr "" - #: ../../include/RedDAV/RedBrowser.php:106 -#: ../../include/RedDAV/RedBrowser.php:262 +#: ../../include/RedDAV/RedBrowser.php:265 msgid "parent" msgstr "" #: ../../include/RedDAV/RedBrowser.php:130 -#: ../../include/RedDAV/RedBrowser.php:348 +#: ../../include/RedDAV/RedBrowser.php:351 msgid "Collection" msgstr "" @@ -1151,91 +1060,97 @@ msgstr "" msgid "Total" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:258 ../../mod/settings.php:579 -#: ../../mod/settings.php:605 ../../mod/admin.php:868 -msgid "Name" +#: ../../include/RedDAV/RedBrowser.php:253 +msgid "Shared" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:259 -msgid "Type" -msgstr "" - -#: ../../include/RedDAV/RedBrowser.php:260 -msgid "Size" -msgstr "" - -#: ../../include/RedDAV/RedBrowser.php:261 -msgid "Last Modified" -msgstr "" - -#: ../../include/RedDAV/RedBrowser.php:264 ../../include/conversation.php:644 -#: ../../include/ItemObject.php:120 ../../include/apps.php:255 -#: ../../mod/group.php:176 ../../mod/settings.php:640 ../../mod/thing.php:234 -#: ../../mod/admin.php:732 ../../mod/admin.php:863 ../../mod/connedit.php:496 -#: ../../mod/photos.php:1038 -msgid "Delete" -msgstr "" - -#: ../../include/RedDAV/RedBrowser.php:321 -msgid "Create new folder" -msgstr "" - -#: ../../include/RedDAV/RedBrowser.php:322 ../../mod/mitem.php:169 +#: ../../include/RedDAV/RedBrowser.php:254 +#: ../../include/RedDAV/RedBrowser.php:325 ../../mod/mitem.php:169 #: ../../mod/menu.php:100 ../../mod/new_channel.php:121 msgid "Create" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:323 -msgid "Upload file" -msgstr "" - -#: ../../include/RedDAV/RedBrowser.php:324 ../../mod/profile_photo.php:362 +#: ../../include/RedDAV/RedBrowser.php:255 +#: ../../include/RedDAV/RedBrowser.php:327 ../../mod/profile_photo.php:362 #: ../../mod/photos.php:706 ../../mod/photos.php:1214 msgid "Upload" msgstr "" +#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/settings.php:579 +#: ../../mod/settings.php:605 ../../mod/admin.php:868 +msgid "Name" +msgstr "" + +#: ../../include/RedDAV/RedBrowser.php:262 +msgid "Type" +msgstr "" + +#: ../../include/RedDAV/RedBrowser.php:263 +msgid "Size" +msgstr "" + +#: ../../include/RedDAV/RedBrowser.php:264 +msgid "Last Modified" +msgstr "" + +#: ../../include/RedDAV/RedBrowser.php:267 ../../include/conversation.php:644 +#: ../../include/ItemObject.php:120 ../../include/apps.php:255 +#: ../../mod/group.php:176 ../../mod/settings.php:640 +#: ../../mod/connedit.php:496 ../../mod/thing.php:234 ../../mod/admin.php:732 +#: ../../mod/admin.php:863 ../../mod/photos.php:1038 +msgid "Delete" +msgstr "" + +#: ../../include/RedDAV/RedBrowser.php:324 +msgid "Create new folder" +msgstr "" + +#: ../../include/RedDAV/RedBrowser.php:326 +msgid "Upload file" +msgstr "" + #: ../../include/bookmarks.php:35 #, php-format msgid "%1$s's bookmarks" msgstr "" -#: ../../include/dir_fns.php:73 +#: ../../include/dir_fns.php:88 msgid "Directory Options" msgstr "" -#: ../../include/dir_fns.php:74 +#: ../../include/dir_fns.php:89 msgid "Alphabetic" msgstr "" -#: ../../include/dir_fns.php:75 +#: ../../include/dir_fns.php:90 msgid "Reverse Alphabetic" msgstr "" -#: ../../include/dir_fns.php:76 +#: ../../include/dir_fns.php:91 msgid "Newest to Oldest" msgstr "" -#: ../../include/dir_fns.php:77 +#: ../../include/dir_fns.php:92 msgid "Oldest to Newest" msgstr "" -#: ../../include/dir_fns.php:78 +#: ../../include/dir_fns.php:93 msgid "Public Forums Only" msgstr "" -#: ../../include/dir_fns.php:80 +#: ../../include/dir_fns.php:95 msgid "Sort" msgstr "" -#: ../../include/dir_fns.php:96 +#: ../../include/dir_fns.php:111 msgid "Enable Safe Search" msgstr "" -#: ../../include/dir_fns.php:98 +#: ../../include/dir_fns.php:113 msgid "Disable Safe Search" msgstr "" -#: ../../include/dir_fns.php:100 +#: ../../include/dir_fns.php:115 msgid "Safe Mode" msgstr "" @@ -1281,7 +1196,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:79 ../../mod/admin.php:728 -#: ../../mod/admin.php:737 ../../boot.php:1551 +#: ../../mod/admin.php:737 ../../boot.php:1552 msgid "Email" msgstr "" @@ -1334,7 +1249,7 @@ msgid "Don't show" msgstr "" #: ../../include/acl_selectors.php:248 ../../mod/events.php:600 -#: ../../mod/chat.php:209 ../../mod/filestorage.php:141 +#: ../../mod/chat.php:209 ../../mod/filestorage.php:145 #: ../../mod/photos.php:559 ../../mod/photos.php:918 msgid "Permissions" msgstr "" @@ -1344,344 +1259,62 @@ msgstr "" msgid "Close" msgstr "" -#: ../../include/text.php:320 -msgid "prev" +#: ../../include/attach.php:242 ../../include/attach.php:296 +msgid "Item was not found." msgstr "" -#: ../../include/text.php:322 -msgid "first" +#: ../../include/attach.php:352 +msgid "No source file." msgstr "" -#: ../../include/text.php:351 -msgid "last" +#: ../../include/attach.php:369 +msgid "Cannot locate file to replace" msgstr "" -#: ../../include/text.php:354 -msgid "next" +#: ../../include/attach.php:387 +msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/text.php:366 -msgid "older" -msgstr "" - -#: ../../include/text.php:368 -msgid "newer" -msgstr "" - -#: ../../include/text.php:756 -msgid "No connections" -msgstr "" - -#: ../../include/text.php:772 +#: ../../include/attach.php:398 #, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/text.php:785 -msgid "View Connections" -msgstr "" - -#: ../../include/text.php:843 ../../include/text.php:855 -#: ../../include/widgets.php:192 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1341 -#: ../../mod/admin.php:1362 -msgid "Save" -msgstr "" - -#: ../../include/text.php:920 -msgid "poke" -msgstr "" - -#: ../../include/text.php:920 ../../include/conversation.php:243 -msgid "poked" -msgstr "" - -#: ../../include/text.php:921 -msgid "ping" -msgstr "" - -#: ../../include/text.php:921 -msgid "pinged" -msgstr "" - -#: ../../include/text.php:922 -msgid "prod" -msgstr "" - -#: ../../include/text.php:922 -msgid "prodded" -msgstr "" - -#: ../../include/text.php:923 -msgid "slap" -msgstr "" - -#: ../../include/text.php:923 -msgid "slapped" -msgstr "" - -#: ../../include/text.php:924 -msgid "finger" -msgstr "" - -#: ../../include/text.php:924 -msgid "fingered" -msgstr "" - -#: ../../include/text.php:925 -msgid "rebuff" -msgstr "" - -#: ../../include/text.php:925 -msgid "rebuffed" -msgstr "" - -#: ../../include/text.php:935 -msgid "happy" -msgstr "" - -#: ../../include/text.php:936 -msgid "sad" -msgstr "" - -#: ../../include/text.php:937 -msgid "mellow" -msgstr "" - -#: ../../include/text.php:938 -msgid "tired" -msgstr "" - -#: ../../include/text.php:939 -msgid "perky" -msgstr "" - -#: ../../include/text.php:940 -msgid "angry" -msgstr "" - -#: ../../include/text.php:941 -msgid "stupified" -msgstr "" - -#: ../../include/text.php:942 -msgid "puzzled" -msgstr "" - -#: ../../include/text.php:943 -msgid "interested" -msgstr "" - -#: ../../include/text.php:944 -msgid "bitter" -msgstr "" - -#: ../../include/text.php:945 -msgid "cheerful" -msgstr "" - -#: ../../include/text.php:946 -msgid "alive" -msgstr "" - -#: ../../include/text.php:947 -msgid "annoyed" -msgstr "" - -#: ../../include/text.php:948 -msgid "anxious" -msgstr "" - -#: ../../include/text.php:949 -msgid "cranky" -msgstr "" - -#: ../../include/text.php:950 -msgid "disturbed" -msgstr "" - -#: ../../include/text.php:951 -msgid "frustrated" -msgstr "" - -#: ../../include/text.php:952 -msgid "depressed" -msgstr "" - -#: ../../include/text.php:953 -msgid "motivated" -msgstr "" - -#: ../../include/text.php:954 -msgid "relaxed" -msgstr "" - -#: ../../include/text.php:955 -msgid "surprised" -msgstr "" - -#: ../../include/text.php:1121 -msgid "Monday" -msgstr "" - -#: ../../include/text.php:1121 -msgid "Tuesday" -msgstr "" - -#: ../../include/text.php:1121 -msgid "Wednesday" -msgstr "" - -#: ../../include/text.php:1121 -msgid "Thursday" -msgstr "" - -#: ../../include/text.php:1121 -msgid "Friday" -msgstr "" - -#: ../../include/text.php:1121 -msgid "Saturday" -msgstr "" - -#: ../../include/text.php:1121 -msgid "Sunday" -msgstr "" - -#: ../../include/text.php:1125 -msgid "January" -msgstr "" - -#: ../../include/text.php:1125 -msgid "February" -msgstr "" - -#: ../../include/text.php:1125 -msgid "March" -msgstr "" - -#: ../../include/text.php:1125 -msgid "April" -msgstr "" - -#: ../../include/text.php:1125 -msgid "May" -msgstr "" - -#: ../../include/text.php:1125 -msgid "June" -msgstr "" - -#: ../../include/text.php:1125 -msgid "July" -msgstr "" - -#: ../../include/text.php:1125 -msgid "August" -msgstr "" - -#: ../../include/text.php:1125 -msgid "September" -msgstr "" - -#: ../../include/text.php:1125 -msgid "October" -msgstr "" - -#: ../../include/text.php:1125 -msgid "November" -msgstr "" - -#: ../../include/text.php:1125 -msgid "December" -msgstr "" - -#: ../../include/text.php:1203 -msgid "unknown.???" -msgstr "" - -#: ../../include/text.php:1204 -msgid "bytes" -msgstr "" - -#: ../../include/text.php:1240 -msgid "remove category" -msgstr "" - -#: ../../include/text.php:1309 -msgid "remove from file" -msgstr "" - -#: ../../include/text.php:1385 ../../include/text.php:1396 -msgid "Click to open/close" -msgstr "" - -#: ../../include/text.php:1544 ../../mod/events.php:418 -msgid "Link to Source" -msgstr "" - -#: ../../include/text.php:1563 -msgid "Select a page layout: " -msgstr "" - -#: ../../include/text.php:1566 ../../include/text.php:1626 -msgid "default" -msgstr "" - -#: ../../include/text.php:1599 -msgid "Page content type: " -msgstr "" - -#: ../../include/text.php:1638 -msgid "Select an alternate language" -msgstr "" - -#: ../../include/text.php:1757 ../../include/conversation.php:120 -#: ../../include/diaspora.php:1928 ../../mod/subthread.php:72 -#: ../../mod/subthread.php:174 ../../mod/like.php:302 ../../mod/tagger.php:45 -msgid "photo" +msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/text.php:1760 ../../include/conversation.php:123 -#: ../../mod/tagger.php:49 -msgid "event" +#: ../../include/attach.php:410 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/text.php:1763 ../../include/conversation.php:148 -#: ../../include/diaspora.php:1928 ../../mod/subthread.php:72 -#: ../../mod/subthread.php:174 ../../mod/like.php:302 ../../mod/tagger.php:53 -msgid "status" +#: ../../include/attach.php:493 +msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/text.php:1765 ../../include/conversation.php:150 -#: ../../mod/tagger.php:55 -msgid "comment" +#: ../../include/attach.php:505 +msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/text.php:1770 -msgid "activity" +#: ../../include/attach.php:547 ../../include/attach.php:564 +msgid "Path not available." msgstr "" -#: ../../include/text.php:2057 -msgid "Design" +#: ../../include/attach.php:611 +msgid "Empty pathname" msgstr "" -#: ../../include/text.php:2060 -msgid "Blocks" +#: ../../include/attach.php:627 +msgid "duplicate filename or path" msgstr "" -#: ../../include/text.php:2061 -msgid "Menus" +#: ../../include/attach.php:651 +msgid "Path not found." msgstr "" -#: ../../include/text.php:2062 -msgid "Layouts" +#: ../../include/attach.php:702 +msgid "mkdir failed." msgstr "" -#: ../../include/text.php:2063 -msgid "Pages" +#: ../../include/attach.php:706 +msgid "database storage failed." msgstr "" #: ../../include/account.php:23 @@ -1826,6 +1459,19 @@ msgstr[1] "" msgid "show more" msgstr "" +#: ../../include/zot.php:664 +msgid "Invalid data packet" +msgstr "" + +#: ../../include/zot.php:680 +msgid "Unable to verify channel signature" +msgstr "" + +#: ../../include/zot.php:1834 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "" + #: ../../include/event.php:376 msgid "This event has been added to your calendar." msgstr "" @@ -1922,11 +1568,18 @@ msgstr "" #: ../../include/identity.php:691 ../../mod/achievements.php:11 #: ../../mod/profile.php:16 ../../mod/webpages.php:29 ../../mod/blocks.php:29 #: ../../mod/editblock.php:29 ../../mod/editlayout.php:28 -#: ../../mod/editwebpage.php:28 ../../mod/filestorage.php:48 +#: ../../mod/editwebpage.php:28 ../../mod/filestorage.php:52 #: ../../mod/connect.php:13 ../../mod/layouts.php:29 ../../mod/hcard.php:8 msgid "Requested profile is not available." msgstr "" +#: ../../include/identity.php:840 ../../include/Contact.php:107 +#: ../../include/conversation.php:946 ../../include/widgets.php:136 +#: ../../include/widgets.php:175 ../../mod/suggest.php:51 +#: ../../mod/match.php:62 ../../mod/directory.php:264 +msgid "Connect" +msgstr "" + #: ../../include/identity.php:854 ../../mod/profiles.php:774 msgid "Change profile photo" msgstr "" @@ -2311,6 +1964,359 @@ msgstr "" msgid "[Red:Notify]" msgstr "" +#: ../../include/Contact.php:124 +msgid "New window" +msgstr "" + +#: ../../include/Contact.php:125 +msgid "Open the selected location in a different window or browser tab" +msgstr "" + +#: ../../include/Contact.php:215 ../../mod/admin.php:648 +#, php-format +msgid "User '%s' deleted" +msgstr "" + +#: ../../include/text.php:320 +msgid "prev" +msgstr "" + +#: ../../include/text.php:322 +msgid "first" +msgstr "" + +#: ../../include/text.php:351 +msgid "last" +msgstr "" + +#: ../../include/text.php:354 +msgid "next" +msgstr "" + +#: ../../include/text.php:366 +msgid "older" +msgstr "" + +#: ../../include/text.php:368 +msgid "newer" +msgstr "" + +#: ../../include/text.php:750 +msgid "No connections" +msgstr "" + +#: ../../include/text.php:766 +#, php-format +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/text.php:779 +msgid "View Connections" +msgstr "" + +#: ../../include/text.php:837 ../../include/text.php:849 +#: ../../include/widgets.php:192 ../../mod/rbmark.php:28 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1341 +#: ../../mod/admin.php:1362 +msgid "Save" +msgstr "" + +#: ../../include/text.php:914 +msgid "poke" +msgstr "" + +#: ../../include/text.php:914 ../../include/conversation.php:243 +msgid "poked" +msgstr "" + +#: ../../include/text.php:915 +msgid "ping" +msgstr "" + +#: ../../include/text.php:915 +msgid "pinged" +msgstr "" + +#: ../../include/text.php:916 +msgid "prod" +msgstr "" + +#: ../../include/text.php:916 +msgid "prodded" +msgstr "" + +#: ../../include/text.php:917 +msgid "slap" +msgstr "" + +#: ../../include/text.php:917 +msgid "slapped" +msgstr "" + +#: ../../include/text.php:918 +msgid "finger" +msgstr "" + +#: ../../include/text.php:918 +msgid "fingered" +msgstr "" + +#: ../../include/text.php:919 +msgid "rebuff" +msgstr "" + +#: ../../include/text.php:919 +msgid "rebuffed" +msgstr "" + +#: ../../include/text.php:929 +msgid "happy" +msgstr "" + +#: ../../include/text.php:930 +msgid "sad" +msgstr "" + +#: ../../include/text.php:931 +msgid "mellow" +msgstr "" + +#: ../../include/text.php:932 +msgid "tired" +msgstr "" + +#: ../../include/text.php:933 +msgid "perky" +msgstr "" + +#: ../../include/text.php:934 +msgid "angry" +msgstr "" + +#: ../../include/text.php:935 +msgid "stupified" +msgstr "" + +#: ../../include/text.php:936 +msgid "puzzled" +msgstr "" + +#: ../../include/text.php:937 +msgid "interested" +msgstr "" + +#: ../../include/text.php:938 +msgid "bitter" +msgstr "" + +#: ../../include/text.php:939 +msgid "cheerful" +msgstr "" + +#: ../../include/text.php:940 +msgid "alive" +msgstr "" + +#: ../../include/text.php:941 +msgid "annoyed" +msgstr "" + +#: ../../include/text.php:942 +msgid "anxious" +msgstr "" + +#: ../../include/text.php:943 +msgid "cranky" +msgstr "" + +#: ../../include/text.php:944 +msgid "disturbed" +msgstr "" + +#: ../../include/text.php:945 +msgid "frustrated" +msgstr "" + +#: ../../include/text.php:946 +msgid "depressed" +msgstr "" + +#: ../../include/text.php:947 +msgid "motivated" +msgstr "" + +#: ../../include/text.php:948 +msgid "relaxed" +msgstr "" + +#: ../../include/text.php:949 +msgid "surprised" +msgstr "" + +#: ../../include/text.php:1115 +msgid "Monday" +msgstr "" + +#: ../../include/text.php:1115 +msgid "Tuesday" +msgstr "" + +#: ../../include/text.php:1115 +msgid "Wednesday" +msgstr "" + +#: ../../include/text.php:1115 +msgid "Thursday" +msgstr "" + +#: ../../include/text.php:1115 +msgid "Friday" +msgstr "" + +#: ../../include/text.php:1115 +msgid "Saturday" +msgstr "" + +#: ../../include/text.php:1115 +msgid "Sunday" +msgstr "" + +#: ../../include/text.php:1119 +msgid "January" +msgstr "" + +#: ../../include/text.php:1119 +msgid "February" +msgstr "" + +#: ../../include/text.php:1119 +msgid "March" +msgstr "" + +#: ../../include/text.php:1119 +msgid "April" +msgstr "" + +#: ../../include/text.php:1119 +msgid "May" +msgstr "" + +#: ../../include/text.php:1119 +msgid "June" +msgstr "" + +#: ../../include/text.php:1119 +msgid "July" +msgstr "" + +#: ../../include/text.php:1119 +msgid "August" +msgstr "" + +#: ../../include/text.php:1119 +msgid "September" +msgstr "" + +#: ../../include/text.php:1119 +msgid "October" +msgstr "" + +#: ../../include/text.php:1119 +msgid "November" +msgstr "" + +#: ../../include/text.php:1119 +msgid "December" +msgstr "" + +#: ../../include/text.php:1197 +msgid "unknown.???" +msgstr "" + +#: ../../include/text.php:1198 +msgid "bytes" +msgstr "" + +#: ../../include/text.php:1234 +msgid "remove category" +msgstr "" + +#: ../../include/text.php:1303 +msgid "remove from file" +msgstr "" + +#: ../../include/text.php:1379 ../../include/text.php:1390 +msgid "Click to open/close" +msgstr "" + +#: ../../include/text.php:1538 ../../mod/events.php:418 +msgid "Link to Source" +msgstr "" + +#: ../../include/text.php:1557 +msgid "Select a page layout: " +msgstr "" + +#: ../../include/text.php:1560 ../../include/text.php:1620 +msgid "default" +msgstr "" + +#: ../../include/text.php:1593 +msgid "Page content type: " +msgstr "" + +#: ../../include/text.php:1632 +msgid "Select an alternate language" +msgstr "" + +#: ../../include/text.php:1751 ../../include/conversation.php:120 +#: ../../include/diaspora.php:1928 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/like.php:302 ../../mod/tagger.php:45 +msgid "photo" +msgstr "" + +#: ../../include/text.php:1754 ../../include/conversation.php:123 +#: ../../mod/tagger.php:49 +msgid "event" +msgstr "" + +#: ../../include/text.php:1757 ../../include/conversation.php:148 +#: ../../include/diaspora.php:1928 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/like.php:302 ../../mod/tagger.php:53 +msgid "status" +msgstr "" + +#: ../../include/text.php:1759 ../../include/conversation.php:150 +#: ../../mod/tagger.php:55 +msgid "comment" +msgstr "" + +#: ../../include/text.php:1764 +msgid "activity" +msgstr "" + +#: ../../include/text.php:2051 +msgid "Design" +msgstr "" + +#: ../../include/text.php:2054 +msgid "Blocks" +msgstr "" + +#: ../../include/text.php:2055 +msgid "Menus" +msgstr "" + +#: ../../include/text.php:2056 +msgid "Layouts" +msgstr "" + +#: ../../include/text.php:2057 +msgid "Pages" +msgstr "" + #: ../../include/network.php:590 msgid "view full size" msgstr "" @@ -2929,17 +2935,17 @@ msgstr "" #: ../../mod/settings.php:741 ../../mod/settings.php:823 #: ../../mod/settings.php:1019 ../../mod/poke.php:166 ../../mod/events.php:602 #: ../../mod/mail.php:355 ../../mod/sources.php:104 ../../mod/sources.php:138 -#: ../../mod/profiles.php:667 ../../mod/chat.php:177 ../../mod/chat.php:211 -#: ../../mod/mood.php:135 ../../mod/pdledit.php:58 ../../mod/thing.php:284 -#: ../../mod/thing.php:327 ../../mod/fsuggest.php:108 -#: ../../mod/filestorage.php:150 ../../mod/connect.php:93 -#: ../../mod/locs.php:99 ../../mod/import.php:504 ../../mod/admin.php:414 -#: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994 -#: ../../mod/admin.php:1193 ../../mod/admin.php:1280 -#: ../../mod/connedit.php:600 ../../mod/invite.php:142 ../../mod/xchan.php:11 -#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:925 -#: ../../mod/photos.php:965 ../../mod/photos.php:1075 ../../mod/appman.php:99 -#: ../../mod/poll.php:68 ../../view/theme/apw/php/config.php:256 +#: ../../mod/connedit.php:600 ../../mod/profiles.php:667 +#: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/mood.php:135 +#: ../../mod/pdledit.php:58 ../../mod/thing.php:284 ../../mod/thing.php:327 +#: ../../mod/fsuggest.php:108 ../../mod/filestorage.php:154 +#: ../../mod/connect.php:93 ../../mod/locs.php:105 ../../mod/import.php:504 +#: ../../mod/admin.php:414 ../../mod/admin.php:725 ../../mod/admin.php:861 +#: ../../mod/admin.php:994 ../../mod/admin.php:1193 ../../mod/admin.php:1280 +#: ../../mod/invite.php:142 ../../mod/xchan.php:11 ../../mod/photos.php:565 +#: ../../mod/photos.php:642 ../../mod/photos.php:925 ../../mod/photos.php:965 +#: ../../mod/photos.php:1075 ../../mod/appman.php:99 ../../mod/poll.php:68 +#: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "" @@ -3614,7 +3620,7 @@ msgid "Additional features" msgstr "" #: ../../include/widgets.php:484 -msgid "Feature settings" +msgid "Feature/Addon settings" msgstr "" #: ../../include/widgets.php:490 @@ -5017,7 +5023,7 @@ msgstr "" msgid "Channel not found." msgstr "" -#: ../../mod/block.php:75 ../../mod/display.php:102 ../../mod/help.php:70 +#: ../../mod/block.php:75 ../../mod/display.php:102 ../../mod/help.php:71 #: ../../mod/page.php:81 ../../index.php:241 msgid "Page not found." msgstr "" @@ -5246,6 +5252,348 @@ msgstr "" msgid "All Connections" msgstr "" +#: ../../mod/connedit.php:73 ../../mod/connections.php:37 +msgid "Could not access contact record." +msgstr "" + +#: ../../mod/connedit.php:95 ../../mod/connections.php:51 +msgid "Could not locate selected profile." +msgstr "" + +#: ../../mod/connedit.php:159 ../../mod/connections.php:94 +msgid "Connection updated." +msgstr "" + +#: ../../mod/connedit.php:161 ../../mod/connections.php:96 +msgid "Failed to update connection record." +msgstr "" + +#: ../../mod/connedit.php:208 +msgid "is now connected to" +msgstr "" + +#: ../../mod/connedit.php:328 +msgid "Could not access address book record." +msgstr "" + +#: ../../mod/connedit.php:342 +msgid "Refresh failed - channel is currently unavailable." +msgstr "" + +#: ../../mod/connedit.php:349 +msgid "Channel has been unblocked" +msgstr "" + +#: ../../mod/connedit.php:350 +msgid "Channel has been blocked" +msgstr "" + +#: ../../mod/connedit.php:354 ../../mod/connedit.php:366 +#: ../../mod/connedit.php:378 ../../mod/connedit.php:390 +#: ../../mod/connedit.php:406 +msgid "Unable to set address book parameters." +msgstr "" + +#: ../../mod/connedit.php:361 +msgid "Channel has been unignored" +msgstr "" + +#: ../../mod/connedit.php:362 +msgid "Channel has been ignored" +msgstr "" + +#: ../../mod/connedit.php:373 +msgid "Channel has been unarchived" +msgstr "" + +#: ../../mod/connedit.php:374 +msgid "Channel has been archived" +msgstr "" + +#: ../../mod/connedit.php:385 +msgid "Channel has been unhidden" +msgstr "" + +#: ../../mod/connedit.php:386 +msgid "Channel has been hidden" +msgstr "" + +#: ../../mod/connedit.php:401 +msgid "Channel has been approved" +msgstr "" + +#: ../../mod/connedit.php:402 +msgid "Channel has been unapproved" +msgstr "" + +#: ../../mod/connedit.php:430 +msgid "Connection has been removed." +msgstr "" + +#: ../../mod/connedit.php:450 +#, php-format +msgid "View %s's profile" +msgstr "" + +#: ../../mod/connedit.php:454 +msgid "Refresh Permissions" +msgstr "" + +#: ../../mod/connedit.php:457 +msgid "Fetch updated permissions" +msgstr "" + +#: ../../mod/connedit.php:461 +msgid "Recent Activity" +msgstr "" + +#: ../../mod/connedit.php:464 +msgid "View recent posts and comments" +msgstr "" + +#: ../../mod/connedit.php:470 ../../mod/connedit.php:640 +#: ../../mod/admin.php:734 +msgid "Unblock" +msgstr "" + +#: ../../mod/connedit.php:470 ../../mod/connedit.php:640 +#: ../../mod/admin.php:733 +msgid "Block" +msgstr "" + +#: ../../mod/connedit.php:473 +msgid "Block (or Unblock) all communications with this connection" +msgstr "" + +#: ../../mod/connedit.php:477 ../../mod/connedit.php:641 +msgid "Unignore" +msgstr "" + +#: ../../mod/connedit.php:477 ../../mod/connedit.php:641 +#: ../../mod/notifications.php:51 +msgid "Ignore" +msgstr "" + +#: ../../mod/connedit.php:480 +msgid "Ignore (or Unignore) all inbound communications from this connection" +msgstr "" + +#: ../../mod/connedit.php:483 +msgid "Unarchive" +msgstr "" + +#: ../../mod/connedit.php:483 +msgid "Archive" +msgstr "" + +#: ../../mod/connedit.php:486 +msgid "" +"Archive (or Unarchive) this connection - mark channel dead but keep content" +msgstr "" + +#: ../../mod/connedit.php:489 +msgid "Unhide" +msgstr "" + +#: ../../mod/connedit.php:489 +msgid "Hide" +msgstr "" + +#: ../../mod/connedit.php:492 +msgid "Hide or Unhide this connection from your other connections" +msgstr "" + +#: ../../mod/connedit.php:499 +msgid "Delete this connection" +msgstr "" + +#: ../../mod/connedit.php:559 ../../mod/connedit.php:596 +msgid "Approve this connection" +msgstr "" + +#: ../../mod/connedit.php:559 +msgid "Accept connection to allow communication" +msgstr "" + +#: ../../mod/connedit.php:575 +#, php-format +msgid "Connections: settings for %s" +msgstr "" + +#: ../../mod/connedit.php:576 +msgid "Apply these permissions automatically" +msgstr "" + +#: ../../mod/connedit.php:580 +msgid "Apply the permissions indicated on this page to all new connections." +msgstr "" + +#: ../../mod/connedit.php:583 +msgid "Slide to adjust your degree of friendship" +msgstr "" + +#: ../../mod/connedit.php:584 +msgid "Rating (this information may be public)" +msgstr "" + +#: ../../mod/connedit.php:585 +msgid "Optionally explain your rating (this information may be public)" +msgstr "" + +#: ../../mod/connedit.php:592 +msgid "" +"Default permissions for your channel type have (just) been applied. They " +"have not yet been submitted. Please review the permissions on this page and " +"make any desired changes at this time. This new connection may not " +"be able to communicate with you until you submit this page, which will " +"install and apply the selected permissions." +msgstr "" + +#: ../../mod/connedit.php:595 +msgid "inherited" +msgstr "" + +#: ../../mod/connedit.php:598 +msgid "Connection has no individual permissions!" +msgstr "" + +#: ../../mod/connedit.php:599 +msgid "" +"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." +msgstr "" + +#: ../../mod/connedit.php:601 +msgid "Profile Visibility" +msgstr "" + +#: ../../mod/connedit.php:602 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "" + +#: ../../mod/connedit.php:603 +msgid "Contact Information / Notes" +msgstr "" + +#: ../../mod/connedit.php:604 +msgid "Edit contact notes" +msgstr "" + +#: ../../mod/connedit.php:606 +msgid "Their Settings" +msgstr "" + +#: ../../mod/connedit.php:607 +msgid "My Settings" +msgstr "" + +#: ../../mod/connedit.php:609 +msgid "" +"Default permissions for this channel type have (just) been applied. They " +"have not been saved and there are currently no stored default " +"permissions. Please review/edit the applied settings and click [Submit] to " +"finalize." +msgstr "" + +#: ../../mod/connedit.php:610 +msgid "Clear/Disable Automatic Permissions" +msgstr "" + +#: ../../mod/connedit.php:611 +msgid "Forum Members" +msgstr "" + +#: ../../mod/connedit.php:612 +msgid "Soapbox" +msgstr "" + +#: ../../mod/connedit.php:613 +msgid "Full Sharing (typical social network permissions)" +msgstr "" + +#: ../../mod/connedit.php:614 +msgid "Cautious Sharing " +msgstr "" + +#: ../../mod/connedit.php:615 +msgid "Follow Only" +msgstr "" + +#: ../../mod/connedit.php:616 +msgid "Individual Permissions" +msgstr "" + +#: ../../mod/connedit.php:617 +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:618 +msgid "Advanced Permissions" +msgstr "" + +#: ../../mod/connedit.php:619 +msgid "Simple Permissions (select one and submit)" +msgstr "" + +#: ../../mod/connedit.php:623 +#, php-format +msgid "Visit %s's profile - %s" +msgstr "" + +#: ../../mod/connedit.php:624 +msgid "Block/Unblock contact" +msgstr "" + +#: ../../mod/connedit.php:625 +msgid "Ignore contact" +msgstr "" + +#: ../../mod/connedit.php:626 +msgid "Repair URL settings" +msgstr "" + +#: ../../mod/connedit.php:627 +msgid "View conversations" +msgstr "" + +#: ../../mod/connedit.php:629 +msgid "Delete contact" +msgstr "" + +#: ../../mod/connedit.php:632 +msgid "Last update:" +msgstr "" + +#: ../../mod/connedit.php:634 +msgid "Update public posts" +msgstr "" + +#: ../../mod/connedit.php:636 +msgid "Update now" +msgstr "" + +#: ../../mod/connedit.php:642 +msgid "Currently blocked" +msgstr "" + +#: ../../mod/connedit.php:643 +msgid "Currently ignored" +msgstr "" + +#: ../../mod/connedit.php:644 +msgid "Currently archived" +msgstr "" + +#: ../../mod/connedit.php:645 +msgid "Currently pending" +msgstr "" + #: ../../mod/profiles.php:18 ../../mod/profiles.php:174 #: ../../mod/profiles.php:231 ../../mod/profiles.php:600 msgid "Profile not found." @@ -5738,7 +6086,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1557 +#: ../../mod/lostpass.php:85 ../../boot.php:1558 msgid "Password Reset" msgstr "" @@ -5796,22 +6144,6 @@ msgstr "" msgid "Welcome to %s" msgstr "" -#: ../../mod/connections.php:37 ../../mod/connedit.php:73 -msgid "Could not access contact record." -msgstr "" - -#: ../../mod/connections.php:51 ../../mod/connedit.php:95 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../mod/connections.php:94 ../../mod/connedit.php:159 -msgid "Connection updated." -msgstr "" - -#: ../../mod/connections.php:96 ../../mod/connedit.php:161 -msgid "Failed to update connection record." -msgstr "" - #: ../../mod/connections.php:192 ../../mod/connections.php:293 msgid "Blocked" msgstr "" @@ -5963,10 +6295,6 @@ msgstr "" msgid "My Connections Bookmarks" msgstr "" -#: ../../mod/dirsearch.php:21 -msgid "This site is not a directory server" -msgstr "" - #: ../../mod/display.php:9 ../../mod/search.php:13 #: ../../mod/viewconnections.php:17 ../../mod/photos.php:429 #: ../../mod/directory.php:22 @@ -6238,12 +6566,8 @@ msgstr "" msgid "Thank you." msgstr "" -#: ../../mod/help.php:41 ../../mod/help.php:47 ../../mod/help.php:53 -msgid "Help:" -msgstr "" - -#: ../../mod/help.php:67 ../../index.php:238 -msgid "Not Found" +#: ../../mod/dirsearch.php:21 +msgid "This site is not a directory server" msgstr "" #: ../../mod/thing.php:96 @@ -6320,46 +6644,50 @@ msgstr "" msgid "Suggest a friend for %s" msgstr "" -#: ../../mod/filestorage.php:76 +#: ../../mod/filestorage.php:80 msgid "Permission Denied." msgstr "" -#: ../../mod/filestorage.php:92 +#: ../../mod/filestorage.php:96 msgid "File not found." msgstr "" -#: ../../mod/filestorage.php:135 +#: ../../mod/filestorage.php:139 msgid "Edit file permissions" msgstr "" -#: ../../mod/filestorage.php:144 +#: ../../mod/filestorage.php:148 msgid "Set/edit permissions" msgstr "" -#: ../../mod/filestorage.php:145 +#: ../../mod/filestorage.php:149 msgid "Include all files and sub folders" msgstr "" -#: ../../mod/filestorage.php:146 +#: ../../mod/filestorage.php:150 msgid "Return to file list" msgstr "" -#: ../../mod/filestorage.php:148 +#: ../../mod/filestorage.php:152 msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../mod/filestorage.php:149 +#: ../../mod/filestorage.php:153 msgid "Copy/paste this URL to link file from a web page" msgstr "" -#: ../../mod/filestorage.php:151 +#: ../../mod/filestorage.php:155 msgid "Attach this file to a new post" msgstr "" -#: ../../mod/filestorage.php:152 +#: ../../mod/filestorage.php:156 msgid "Show URL to this file" msgstr "" +#: ../../mod/filestorage.php:157 +msgid "Do not show in shared with me folder of your connections" +msgstr "" + #: ../../mod/connect.php:56 ../../mod/connect.php:104 msgid "Continue" msgstr "" @@ -6407,31 +6735,31 @@ msgstr "" msgid "- select -" msgstr "" -#: ../../mod/locs.php:19 ../../mod/locs.php:46 +#: ../../mod/locs.php:21 ../../mod/locs.php:52 msgid "Location not found." msgstr "" -#: ../../mod/locs.php:50 +#: ../../mod/locs.php:56 msgid "Primary location cannot be removed." msgstr "" -#: ../../mod/locs.php:82 +#: ../../mod/locs.php:88 msgid "No locations found." msgstr "" -#: ../../mod/locs.php:95 +#: ../../mod/locs.php:101 msgid "Manage Channel Locations" msgstr "" -#: ../../mod/locs.php:96 +#: ../../mod/locs.php:102 msgid "Location (address)" msgstr "" -#: ../../mod/locs.php:97 +#: ../../mod/locs.php:103 msgid "Primary Location" msgstr "" -#: ../../mod/locs.php:98 +#: ../../mod/locs.php:104 msgid "Drop location" msgstr "" @@ -6574,15 +6902,19 @@ msgstr "" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/prep.php:57 +#: ../../mod/prep.php:62 +msgid "No ratings available" +msgstr "" + +#: ../../mod/prep.php:66 msgid "Ratings" msgstr "" -#: ../../mod/prep.php:58 +#: ../../mod/prep.php:67 msgid "Rating: " msgstr "" -#: ../../mod/prep.php:59 +#: ../../mod/prep.php:68 msgid "Description: " msgstr "" @@ -7042,16 +7374,6 @@ msgstr "" msgid "Deny" msgstr "" -#: ../../mod/admin.php:733 ../../mod/connedit.php:470 -#: ../../mod/connedit.php:640 -msgid "Block" -msgstr "" - -#: ../../mod/admin.php:734 ../../mod/connedit.php:470 -#: ../../mod/connedit.php:640 -msgid "Unblock" -msgstr "" - #: ../../mod/admin.php:737 msgid "Register date" msgstr "" @@ -7248,322 +7570,6 @@ msgstr "" msgid "Edit Profile Field" msgstr "" -#: ../../mod/connedit.php:208 -msgid "is now connected to" -msgstr "" - -#: ../../mod/connedit.php:328 -msgid "Could not access address book record." -msgstr "" - -#: ../../mod/connedit.php:342 -msgid "Refresh failed - channel is currently unavailable." -msgstr "" - -#: ../../mod/connedit.php:349 -msgid "Channel has been unblocked" -msgstr "" - -#: ../../mod/connedit.php:350 -msgid "Channel has been blocked" -msgstr "" - -#: ../../mod/connedit.php:354 ../../mod/connedit.php:366 -#: ../../mod/connedit.php:378 ../../mod/connedit.php:390 -#: ../../mod/connedit.php:406 -msgid "Unable to set address book parameters." -msgstr "" - -#: ../../mod/connedit.php:361 -msgid "Channel has been unignored" -msgstr "" - -#: ../../mod/connedit.php:362 -msgid "Channel has been ignored" -msgstr "" - -#: ../../mod/connedit.php:373 -msgid "Channel has been unarchived" -msgstr "" - -#: ../../mod/connedit.php:374 -msgid "Channel has been archived" -msgstr "" - -#: ../../mod/connedit.php:385 -msgid "Channel has been unhidden" -msgstr "" - -#: ../../mod/connedit.php:386 -msgid "Channel has been hidden" -msgstr "" - -#: ../../mod/connedit.php:401 -msgid "Channel has been approved" -msgstr "" - -#: ../../mod/connedit.php:402 -msgid "Channel has been unapproved" -msgstr "" - -#: ../../mod/connedit.php:430 -msgid "Connection has been removed." -msgstr "" - -#: ../../mod/connedit.php:450 -#, php-format -msgid "View %s's profile" -msgstr "" - -#: ../../mod/connedit.php:454 -msgid "Refresh Permissions" -msgstr "" - -#: ../../mod/connedit.php:457 -msgid "Fetch updated permissions" -msgstr "" - -#: ../../mod/connedit.php:461 -msgid "Recent Activity" -msgstr "" - -#: ../../mod/connedit.php:464 -msgid "View recent posts and comments" -msgstr "" - -#: ../../mod/connedit.php:473 -msgid "Block (or Unblock) all communications with this connection" -msgstr "" - -#: ../../mod/connedit.php:477 ../../mod/connedit.php:641 -msgid "Unignore" -msgstr "" - -#: ../../mod/connedit.php:477 ../../mod/connedit.php:641 -#: ../../mod/notifications.php:51 -msgid "Ignore" -msgstr "" - -#: ../../mod/connedit.php:480 -msgid "Ignore (or Unignore) all inbound communications from this connection" -msgstr "" - -#: ../../mod/connedit.php:483 -msgid "Unarchive" -msgstr "" - -#: ../../mod/connedit.php:483 -msgid "Archive" -msgstr "" - -#: ../../mod/connedit.php:486 -msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" -msgstr "" - -#: ../../mod/connedit.php:489 -msgid "Unhide" -msgstr "" - -#: ../../mod/connedit.php:489 -msgid "Hide" -msgstr "" - -#: ../../mod/connedit.php:492 -msgid "Hide or Unhide this connection from your other connections" -msgstr "" - -#: ../../mod/connedit.php:499 -msgid "Delete this connection" -msgstr "" - -#: ../../mod/connedit.php:559 ../../mod/connedit.php:596 -msgid "Approve this connection" -msgstr "" - -#: ../../mod/connedit.php:559 -msgid "Accept connection to allow communication" -msgstr "" - -#: ../../mod/connedit.php:575 -#, php-format -msgid "Connections: settings for %s" -msgstr "" - -#: ../../mod/connedit.php:576 -msgid "Apply these permissions automatically" -msgstr "" - -#: ../../mod/connedit.php:580 -msgid "Apply the permissions indicated on this page to all new connections." -msgstr "" - -#: ../../mod/connedit.php:583 -msgid "Slide to adjust your degree of friendship" -msgstr "" - -#: ../../mod/connedit.php:584 -msgid "Rating (this information may be public)" -msgstr "" - -#: ../../mod/connedit.php:585 -msgid "Optionally explain your rating (this information may be public)" -msgstr "" - -#: ../../mod/connedit.php:592 -msgid "" -"Default permissions for your channel type have (just) been applied. They " -"have not yet been submitted. Please review the permissions on this page and " -"make any desired changes at this time. This new connection may not " -"be able to communicate with you until you submit this page, which will " -"install and apply the selected permissions." -msgstr "" - -#: ../../mod/connedit.php:595 -msgid "inherited" -msgstr "" - -#: ../../mod/connedit.php:598 -msgid "Connection has no individual permissions!" -msgstr "" - -#: ../../mod/connedit.php:599 -msgid "" -"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." -msgstr "" - -#: ../../mod/connedit.php:601 -msgid "Profile Visibility" -msgstr "" - -#: ../../mod/connedit.php:602 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "" - -#: ../../mod/connedit.php:603 -msgid "Contact Information / Notes" -msgstr "" - -#: ../../mod/connedit.php:604 -msgid "Edit contact notes" -msgstr "" - -#: ../../mod/connedit.php:606 -msgid "Their Settings" -msgstr "" - -#: ../../mod/connedit.php:607 -msgid "My Settings" -msgstr "" - -#: ../../mod/connedit.php:609 -msgid "" -"Default permissions for this channel type have (just) been applied. They " -"have not been saved and there are currently no stored default " -"permissions. Please review/edit the applied settings and click [Submit] to " -"finalize." -msgstr "" - -#: ../../mod/connedit.php:610 -msgid "Clear/Disable Automatic Permissions" -msgstr "" - -#: ../../mod/connedit.php:611 -msgid "Forum Members" -msgstr "" - -#: ../../mod/connedit.php:612 -msgid "Soapbox" -msgstr "" - -#: ../../mod/connedit.php:613 -msgid "Full Sharing (typical social network permissions)" -msgstr "" - -#: ../../mod/connedit.php:614 -msgid "Cautious Sharing " -msgstr "" - -#: ../../mod/connedit.php:615 -msgid "Follow Only" -msgstr "" - -#: ../../mod/connedit.php:616 -msgid "Individual Permissions" -msgstr "" - -#: ../../mod/connedit.php:617 -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:618 -msgid "Advanced Permissions" -msgstr "" - -#: ../../mod/connedit.php:619 -msgid "Simple Permissions (select one and submit)" -msgstr "" - -#: ../../mod/connedit.php:623 -#, php-format -msgid "Visit %s's profile - %s" -msgstr "" - -#: ../../mod/connedit.php:624 -msgid "Block/Unblock contact" -msgstr "" - -#: ../../mod/connedit.php:625 -msgid "Ignore contact" -msgstr "" - -#: ../../mod/connedit.php:626 -msgid "Repair URL settings" -msgstr "" - -#: ../../mod/connedit.php:627 -msgid "View conversations" -msgstr "" - -#: ../../mod/connedit.php:629 -msgid "Delete contact" -msgstr "" - -#: ../../mod/connedit.php:632 -msgid "Last update:" -msgstr "" - -#: ../../mod/connedit.php:634 -msgid "Update public posts" -msgstr "" - -#: ../../mod/connedit.php:636 -msgid "Update now" -msgstr "" - -#: ../../mod/connedit.php:642 -msgid "Currently blocked" -msgstr "" - -#: ../../mod/connedit.php:643 -msgid "Currently ignored" -msgstr "" - -#: ../../mod/connedit.php:644 -msgid "Currently archived" -msgstr "" - -#: ../../mod/connedit.php:645 -msgid "Currently pending" -msgstr "" - #: ../../mod/menu.php:31 msgid "Menu updated." msgstr "" @@ -7743,6 +7749,14 @@ msgstr "" msgid "network" msgstr "" +#: ../../mod/help.php:41 ../../mod/help.php:47 ../../mod/help.php:53 +msgid "Help:" +msgstr "" + +#: ../../mod/help.php:68 ../../index.php:238 +msgid "Not Found" +msgstr "" + #: ../../mod/lockview.php:31 msgid "Remote privacy information not available." msgstr "" @@ -8157,6 +8171,14 @@ msgstr "" msgid "No service class restrictions found." msgstr "" +#: ../../mod/sharedwithme.php:98 +msgid "Remove all entries" +msgstr "" + +#: ../../mod/sharedwithme.php:100 +msgid "Files shared with me" +msgstr "" + #: ../../view/theme/apw/php/config.php:202 #: ../../view/theme/apw/php/config.php:236 msgid "Schema Default" @@ -8425,41 +8447,41 @@ msgstr "" msgid "Are you a clean desk or a messy desk person?" msgstr "" -#: ../../boot.php:1354 +#: ../../boot.php:1355 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1357 +#: ../../boot.php:1358 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1524 +#: ../../boot.php:1525 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1552 +#: ../../boot.php:1553 msgid "Password" msgstr "" -#: ../../boot.php:1553 +#: ../../boot.php:1554 msgid "Remember me" msgstr "" -#: ../../boot.php:1556 +#: ../../boot.php:1557 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1637 +#: ../../boot.php:1638 msgid "permission denied" msgstr "" -#: ../../boot.php:1638 +#: ../../boot.php:1639 msgid "Got Zot?" msgstr "" -#: ../../boot.php:2121 +#: ../../boot.php:2122 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 742b0e1ed..27408b584 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-01-21.923 +2015-01-23.925 From c49c96962fdcdb69a06d4f7e641d6ab9768b7ca4 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 23 Jan 2015 03:25:40 -0800 Subject: [PATCH 21/52] provide pref to set default photo resolution for posts to something other than 2. The only acceptable option is 1. (640) --- include/photos.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/photos.php b/include/photos.php index 2393153c6..2e5e22968 100644 --- a/include/photos.php +++ b/include/photos.php @@ -256,6 +256,15 @@ function photo_upload($channel, $observer, $args) { else $tag = '[zmg]'; + $preferred = intval(get_pconfig($channel['channel_id'],'system','post_photores')); + if($preferred == 1) { + $tag = '[zmg]'; + if($r2) + $smallest = 1; + else + $smallest = 0; + } + $arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' . $tag . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/zmg]' . '[/zrl]'; From 8789c96e78734cbc5420404eff149e514fe17ee7 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 23 Jan 2015 14:50:39 +0100 Subject: [PATCH 22/52] some code restructure --- include/attach.php | 98 +++++++++++++++++++++++++------------------- mod/filestorage.php | 3 +- mod/sharedwithme.php | 4 +- 3 files changed, 59 insertions(+), 46 deletions(-) diff --git a/include/attach.php b/include/attach.php index c66ba40d5..a201fd3d4 100644 --- a/include/attach.php +++ b/include/attach.php @@ -779,10 +779,12 @@ function attach_delete($channel_id, $resource) { intval($channel_id) ); - if(! $r) return; + $cloudpath = get_parent_cloudpath($channel_id, $channel_address, $resource); + $object = get_file_activity_object($channel_id, $resource, $cloudpath); + // If resource is a directory delete everything in the directory recursive if($r[0]['flags'] & ATTACH_FLAG_DIR) { $x = q("SELECT hash, flags FROM attach WHERE folder = '%s' AND uid = %d", @@ -825,7 +827,8 @@ function attach_delete($channel_id, $resource) { intval($channel_id) ); - file_activity($channel_id, $resource, $cloudpath='', $allow_cid='', $allow_gid='', $deny_cid='', $deny_gid='', 'drop', $no_activity=false); + file_activity($channel_id, $object, $allow_cid='', $allow_gid='', $deny_cid='', $deny_gid='', 'update', $no_activity=false); + } /** @@ -961,21 +964,15 @@ function pipe_streams($in, $out) { return $size; } -function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $verb, $no_activity) { +function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $verb, $no_activity) { require_once('include/items.php'); - $poster = get_app()->get_observer(); - switch($verb) { case 'post': $activity = ACTIVITY_POST; - $x = q("SELECT creator, filename, filetype, filesize, revision, folder, flags, created, edited FROM attach WHERE uid = %d AND hash = '%s' LIMIT 1", - intval($channel_id), - dbesc($hash) - ); break; - case 'drop': + case 'update': $activity = ACTIVITY_UPDATE; break; default: @@ -983,48 +980,25 @@ function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $ break; } - $url = (($cloudpath && $x[0]['filename']) ? rawurlencode($cloudpath . $x[0]['filename']) : 'unavailable'); + $poster = get_app()->get_observer(); $mid = item_message_id(); - $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_UNSEEN; - - $links = array(); - $links[] = array( - 'rel' => 'alternate', - 'type' => 'text/html', - 'href' => $url - ); - $objtype = ACTIVITY_OBJ_FILE; - $object = array( - 'type' => ACTIVITY_OBJ_FILE, - 'title' => (($x[0]['filename']) ? $x[0]['filename'] : 'unavailable'), - 'id' => $url, - 'link' => $links, + $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_UNSEEN; - 'hash' => $hash, - 'creator' => (($x[0]['creator']) ? $x[0]['creator'] : ''), - 'filename' => (($x[0]['filename']) ? $x[0]['filename'] : ''), - 'filetype' => (($x[0]['filetype']) ? $x[0]['filetype'] : ''), - 'filesize' => (($x[0]['filesize']) ? $x[0]['filesize'] : ''), - 'revision' => (($x[0]['revision']) ? $x[0]['revision'] : ''), - 'folder' => (($x[0]['folder']) ? $x[0]['folder'] : ''), - 'flags' => (($x[0]['flags']) ? $x[0]['flags'] : ''), - 'created' => (($x[0]['created']) ? $x[0]['created'] : ''), - 'edited' => (($x[0]['edited']) ? $x[0]['edited'] : '') - ); + $jsonobject = json_encode($object); $private = (($allow_cid || $allow_gid || $deny_cid || $deny_gid) ? 1 : 0); if($verb == 'post') { //check if activity item exists //if yes send update (drop) activity and create a new one - $y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND object LIKE '%s'", + $y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND object = '%s' LIMIT 1", dbesc(ACTIVITY_POST), - dbesc(ACTIVITY_OBJ_FILE), - dbesc('%"hash":"' . $hash . '"%') + dbesc($objtype), + dbesc($jsonobject) ); if($y) { @@ -1033,6 +1007,8 @@ function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $ $object['mid'] = $mid; //attach mid for update object + $ujsonobject = json_encode($object); + $arr = array(); $arr['aid'] = get_account_id(); @@ -1052,7 +1028,7 @@ function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $ $arr['item_private'] = 0; $arr['verb'] = ACTIVITY_UPDATE; $arr['obj_type'] = $objtype; - $arr['object'] = json_encode($object); + $arr['object'] = $ujsonobject; $arr['body'] = ''; $post = item_store($arr); @@ -1064,8 +1040,6 @@ function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $ call_hooks('post_local_end', $arr); - unset($object['mid']); //remove mid for new object - //notice( t('File activity updated') . EOL); if($no_activity) { @@ -1097,7 +1071,7 @@ function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $ $arr['item_private'] = $private; $arr['verb'] = $activity; $arr['obj_type'] = $objtype; - $arr['object'] = json_encode($object); + $arr['object'] = $jsonobject; $arr['body'] = ''; $post = item_store($arr); @@ -1114,3 +1088,41 @@ function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $ return; } + +function get_file_activity_object($channel_id, $hash, $cloudpath) { + + $x = q("SELECT creator, filename, filetype, filesize, revision, folder, flags, created, edited FROM attach WHERE uid = %d AND hash = '%s' LIMIT 1", + intval($channel_id), + dbesc($hash) + ); + + $url = (($cloudpath && $x[0]['filename']) ? rawurlencode($cloudpath . $x[0]['filename']) : 'unavailable'); + + $links = array(); + $links[] = array( + 'rel' => 'alternate', + 'type' => 'text/html', + 'href' => $url + ); + + $object = array( + 'type' => ACTIVITY_OBJ_FILE, + 'title' => (($x[0]['filename']) ? $x[0]['filename'] : 'unavailable'), + 'id' => $url, + 'link' => $links, + + 'hash' => $hash, + 'creator' => (($x[0]['creator']) ? $x[0]['creator'] : ''), + 'filename' => (($x[0]['filename']) ? $x[0]['filename'] : ''), + 'filetype' => (($x[0]['filetype']) ? $x[0]['filetype'] : ''), + 'filesize' => (($x[0]['filesize']) ? $x[0]['filesize'] : ''), + 'revision' => (($x[0]['revision']) ? $x[0]['revision'] : ''), + 'folder' => (($x[0]['folder']) ? $x[0]['folder'] : ''), + 'flags' => (($x[0]['flags']) ? $x[0]['flags'] : ''), + 'created' => (($x[0]['created']) ? $x[0]['created'] : ''), + 'edited' => (($x[0]['edited']) ? $x[0]['edited'] : '') + ); + + return $object; + +} diff --git a/mod/filestorage.php b/mod/filestorage.php index 9852f4e73..05f6a79e6 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -38,8 +38,9 @@ function filestorage_post(&$a) { //Build directory tree and redirect $channel = $a->get_channel(); $cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource); + $object = get_file_activity_object($channel_id, $resource, $cloudPath); - file_activity($channel_id, $resource, $cloudPath, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity); + file_activity($channel_id, $object, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity); goaway($cloudPath); } diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php index baaf41f61..bbb9c2aef 100644 --- a/mod/sharedwithme.php +++ b/mod/sharedwithme.php @@ -48,9 +48,9 @@ function sharedwithme_content(&$a) { else { - $z = q("DELETE FROM item WHERE (obj_type = '%s' AND object LIKE '%s') AND (verb = '%s' OR verb = '%s')", + $z = q("DELETE FROM item WHERE (obj_type = '%s' AND object = '%s') AND (verb = '%s' OR verb = '%s')", dbesc(ACTIVITY_OBJ_FILE), - dbesc('%"hash":"' . $hash . '"%'), + dbesc($xx['object']), dbesc(ACTIVITY_POST), dbesc(ACTIVITY_UPDATE) ); From b4f1cc5044c74432773a4796235a1907e1fcc470 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 23 Jan 2015 15:03:19 +0100 Subject: [PATCH 23/52] we get the object info before it is deleted now --- include/attach.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/attach.php b/include/attach.php index a201fd3d4..720c8da86 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1096,31 +1096,31 @@ function get_file_activity_object($channel_id, $hash, $cloudpath) { dbesc($hash) ); - $url = (($cloudpath && $x[0]['filename']) ? rawurlencode($cloudpath . $x[0]['filename']) : 'unavailable'); + $url = rawurlencode($cloudpath . $x[0]['filename']); $links = array(); $links[] = array( - 'rel' => 'alternate', + 'rel' => 'alternate', 'type' => 'text/html', 'href' => $url ); $object = array( 'type' => ACTIVITY_OBJ_FILE, - 'title' => (($x[0]['filename']) ? $x[0]['filename'] : 'unavailable'), + 'title' => $x[0]['filename']), 'id' => $url, 'link' => $links, 'hash' => $hash, - 'creator' => (($x[0]['creator']) ? $x[0]['creator'] : ''), - 'filename' => (($x[0]['filename']) ? $x[0]['filename'] : ''), - 'filetype' => (($x[0]['filetype']) ? $x[0]['filetype'] : ''), - 'filesize' => (($x[0]['filesize']) ? $x[0]['filesize'] : ''), - 'revision' => (($x[0]['revision']) ? $x[0]['revision'] : ''), - 'folder' => (($x[0]['folder']) ? $x[0]['folder'] : ''), - 'flags' => (($x[0]['flags']) ? $x[0]['flags'] : ''), - 'created' => (($x[0]['created']) ? $x[0]['created'] : ''), - 'edited' => (($x[0]['edited']) ? $x[0]['edited'] : '') + 'creator' => $x[0]['creator'], + 'filename' => $x[0]['filename'], + 'filetype' => $x[0]['filetype'], + 'filesize' => $x[0]['filesize'], + 'revision' => $x[0]['revision'], + 'folder' => $x[0]['folder'], + 'flags' => $x[0]['flags'], + 'created' => $x[0]['created'], + 'edited' => $x[0]['edited'] ); return $object; From ea209a84ab946ee320c1f1cc39b667e9da23abe6 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 23 Jan 2015 15:06:30 +0100 Subject: [PATCH 24/52] typo --- include/attach.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/attach.php b/include/attach.php index 720c8da86..db42cd2a3 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1107,7 +1107,7 @@ function get_file_activity_object($channel_id, $hash, $cloudpath) { $object = array( 'type' => ACTIVITY_OBJ_FILE, - 'title' => $x[0]['filename']), + 'title' => $x[0]['filename'], 'id' => $url, 'link' => $links, From eb4e6ab073990e775ce7d717a1cdfdaec4327e07 Mon Sep 17 00:00:00 2001 From: zottel Date: Fri, 23 Jan 2015 23:20:30 +0100 Subject: [PATCH 25/52] add db update 1131/1132 to database schemas --- install/schema_mysql.sql | 2 ++ install/schema_postgres.sql | 2 ++ 2 files changed, 4 insertions(+) diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 52570898b..226ea2308 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -13,6 +13,7 @@ CREATE TABLE IF NOT EXISTS `abook` ( `abook_their_perms` int(11) NOT NULL DEFAULT '0', `abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT '99', `abook_rating` int(11) NOT NULL DEFAULT '0', + `abook_rating_text` TEXT NOT NULL DEFAULT '', `abook_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `abook_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `abook_connected` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -1529,6 +1530,7 @@ CREATE TABLE IF NOT EXISTS `xlink` ( `xlink_xchan` char(255) NOT NULL DEFAULT '', `xlink_link` char(255) NOT NULL DEFAULT '', `xlink_rating` int(11) NOT NULL DEFAULT '0', + `xlink_rating_text` TEXT NOT NULL DEFAULT '', `xlink_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`xlink_id`), KEY `xlink_xchan` (`xlink_xchan`), diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index a1b5a76fb..8539e672d 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -7,6 +7,7 @@ CREATE TABLE "abook" ( "abook_their_perms" bigint NOT NULL DEFAULT '0', "abook_closeness" numeric(3) NOT NULL DEFAULT '99', "abook_rating" bigint NOT NULL DEFAULT '0', + "abook_rating_text" TEXT NOT NULL DEFAULT '', "abook_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', "abook_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', "abook_connected" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', @@ -1142,6 +1143,7 @@ CREATE TABLE "xlink" ( "xlink_xchan" text NOT NULL DEFAULT '', "xlink_link" text NOT NULL DEFAULT '', "xlink_rating" bigint NOT NULL DEFAULT '0', + "xlink_rating_text" TEXT NOT NULL DEFAULT '', "xlink_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', PRIMARY KEY ("xlink_id") ); From 0cbe64c3606312302ad5d3ef56df5d152983ee4e Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 24 Jan 2015 01:13:02 +0100 Subject: [PATCH 26/52] some more kiss --- include/attach.php | 112 +++++++++++++++++++------------------------ mod/sharedwithme.php | 39 ++++----------- 2 files changed, 58 insertions(+), 93 deletions(-) diff --git a/include/attach.php b/include/attach.php index db42cd2a3..153186312 100644 --- a/include/attach.php +++ b/include/attach.php @@ -968,18 +968,6 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, require_once('include/items.php'); - switch($verb) { - case 'post': - $activity = ACTIVITY_POST; - break; - case 'update': - $activity = ACTIVITY_UPDATE; - break; - default: - return; - break; - } - $poster = get_app()->get_observer(); $mid = item_message_id(); @@ -988,65 +976,63 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_UNSEEN; - $jsonobject = json_encode($object); - $private = (($allow_cid || $allow_gid || $deny_cid || $deny_gid) ? 1 : 0); - if($verb == 'post') { - //check if activity item exists - //if yes send update (drop) activity and create a new one - $y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND object = '%s' LIMIT 1", - dbesc(ACTIVITY_POST), - dbesc($objtype), - dbesc($jsonobject) - ); + $jsonobject = json_encode($object); - if($y) { + //check if item for this object exists + $y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND object = '%s' LIMIT 1", + dbesc(ACTIVITY_POST), + dbesc($objtype), + dbesc($jsonobject) + ); - $dmid = item_message_id(); - $object['mid'] = $mid; //attach mid for update object + if($y) { + $update = true; + $object['d_mid'] = $y[0]['mid']; //attach mid of the old object + $u_jsonobject = json_encode($object); + } - $ujsonobject = json_encode($object); + if($update && $verb == 'post' ) { + //send update activity and create a new one - $arr = array(); + $u_mid = item_message_id(); - $arr['aid'] = get_account_id(); - $arr['uid'] = $channel_id; - $arr['mid'] = $dmid; - $arr['parent_mid'] = $dmid; - $arr['item_flags'] = $item_flags; - $arr['author_xchan'] = $poster['xchan_hash']; - $arr['owner_xchan'] = $poster['xchan_hash']; - $arr['title'] = ''; - //updates must be visible to everybody -> perms may have changed - $arr['allow_cid'] = ''; - $arr['allow_gid'] = ''; - $arr['deny_cid'] = ''; - $arr['deny_gid'] = ''; - $arr['item_restrict'] = ITEM_HIDDEN; - $arr['item_private'] = 0; - $arr['verb'] = ACTIVITY_UPDATE; - $arr['obj_type'] = $objtype; - $arr['object'] = $ujsonobject; - $arr['body'] = ''; + $arr = array(); - $post = item_store($arr); - $item_id = $post['item_id']; - - if($item_id) { - proc_run('php',"include/notifier.php","activity",$item_id); - } - - call_hooks('post_local_end', $arr); - - //notice( t('File activity updated') . EOL); - - if($no_activity) { - return; - } + $arr['aid'] = get_account_id(); + $arr['uid'] = $channel_id; + $arr['mid'] = $u_mid; + $arr['parent_mid'] = $u_mid; + $arr['item_flags'] = $item_flags; + $arr['author_xchan'] = $poster['xchan_hash']; + $arr['owner_xchan'] = $poster['xchan_hash']; + $arr['title'] = ''; + //updates should be visible to everybody -> perms may have changed + $arr['allow_cid'] = ''; + $arr['allow_gid'] = ''; + $arr['deny_cid'] = ''; + $arr['deny_gid'] = ''; + $arr['item_restrict'] = ITEM_HIDDEN; + $arr['item_private'] = 0; + $arr['verb'] = ACTIVITY_UPDATE; + $arr['obj_type'] = $objtype; + $arr['object'] = $u_jsonobject; + $arr['body'] = ''; + $post = item_store($arr); + $item_id = $post['item_id']; + if($item_id) { + proc_run('php',"include/notifier.php","activity",$item_id); } + + call_hooks('post_local_end', $arr); + + $update = false; + + notice( t('File activity updated') . EOL); + } if($no_activity) { @@ -1069,9 +1055,9 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $arr['deny_gid'] = $deny_gid; $arr['item_restrict'] = ITEM_HIDDEN; $arr['item_private'] = $private; - $arr['verb'] = $activity; + $arr['verb'] = (($update) ? ACTIVITY_UPDATE : ACTIVITY_POST); $arr['obj_type'] = $objtype; - $arr['object'] = $jsonobject; + $arr['object'] = (($update) ? $u_jsonobject : $jsonobject); $arr['body'] = ''; $post = item_store($arr); @@ -1083,7 +1069,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, call_hooks('post_local_end', $arr); - //(($verb === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL)); + (($verb === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL)); return; diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php index bbb9c2aef..8b7d2661c 100644 --- a/mod/sharedwithme.php +++ b/mod/sharedwithme.php @@ -24,38 +24,17 @@ function sharedwithme_content(&$a) { foreach($x as $xx) { $object = json_decode($xx['object'],true); - $hash = $object['hash']; - //If object has a mid it's an update activity - the inlcuded mid is the latest and should not be removed - $update = (($object['mid']) ? true : false); + $d_mid = $object['d_mid']; + $u_mid = $xx['mid']; - if($update) { - - $mid = $object['mid']; - - unset($object['mid']); //remove mid from object to match the post activity object - - $y = q("DELETE FROM item WHERE (mid != '%s' AND obj_type = '%s') AND (object = '%s' AND verb = '%s') OR (object = '%s' AND verb = '%s')", - dbesc($mid), - dbesc(ACTIVITY_OBJ_FILE), - dbesc(json_encode($object)), - dbesc(ACTIVITY_POST), - dbesc($xx['object']), - dbesc(ACTIVITY_UPDATE) - ); - - } - - else { - - $z = q("DELETE FROM item WHERE (obj_type = '%s' AND object = '%s') AND (verb = '%s' OR verb = '%s')", - dbesc(ACTIVITY_OBJ_FILE), - dbesc($xx['object']), - dbesc(ACTIVITY_POST), - dbesc(ACTIVITY_UPDATE) - ); - - } + $y = q("DELETE FROM item WHERE obj_type = '%s' AND (verb = '%s' AND mid = '%s') OR (verb = '%s' AND mid = '%s')", + dbesc(ACTIVITY_OBJ_FILE), + dbesc(ACTIVITY_POST), + dbesc($d_mid), + dbesc(ACTIVITY_UPDATE), + dbesc($u_mid) + ); } From 43793540214ac6a578f8495c3cca41d831eb7536 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 24 Jan 2015 01:15:54 +0100 Subject: [PATCH 27/52] disable notices --- include/attach.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/attach.php b/include/attach.php index 153186312..9c71beb23 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1031,7 +1031,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $update = false; - notice( t('File activity updated') . EOL); + //notice( t('File activity updated') . EOL); } @@ -1069,7 +1069,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, call_hooks('post_local_end', $arr); - (($verb === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL)); + //(($verb === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL)); return; From 891d231bbe4ee4499cf9e62013971b85a0542404 Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Fri, 23 Jan 2015 17:25:05 -0800 Subject: [PATCH 28/52] rand() fixes --- mod/dirsearch.php | 5 +++-- mod/sitelist.php | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 4a44feb7d..06d530849 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -355,14 +355,15 @@ function dir_parse_query($s) { function list_public_sites() { + $rand = db_getfunc('rand'); $realm = get_directory_realm(); if($realm == DIRECTORY_REALM) { - $r = q("select * from site where site_access != 0 and site_register !=0 and ( site_realm = '%s' or site_realm = '') order by rand()", + $r = q("select * from site where site_access != 0 and site_register !=0 and ( site_realm = '%s' or site_realm = '') order by $rand", dbesc($realm) ); } else { - $r = q("select * from site where site_access != 0 and site_register !=0 and site_realm = '%s' order by rand()", + $r = q("select * from site where site_access != 0 and site_register !=0 and site_realm = '%s' order by $rand", dbesc($realm) ); } diff --git a/mod/sitelist.php b/mod/sitelist.php index 95cf862df..4e52f0463 100644 --- a/mod/sitelist.php +++ b/mod/sitelist.php @@ -9,8 +9,9 @@ function sitelist_init(&$a) { $sql_order = " order by site_url "; + $rand = db_getfunc('rand'); if($order == 'random') - $sql_order = " order by rand() "; + $sql_order = " order by $rand "; $sql_limit = " limit $start, $limit "; From befe77a93f305c56db2f96604fabebaec6399cb9 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 23 Jan 2015 21:48:34 -0800 Subject: [PATCH 29/52] onedirsync issue reported by habeas codice --- include/onedirsync.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/onedirsync.php b/include/onedirsync.php index a1450e183..de8dab92d 100644 --- a/include/onedirsync.php +++ b/include/onedirsync.php @@ -56,11 +56,10 @@ function onedirsync_run($argv, $argc){ dbesc($r[0]['ud_addr']) ); if(($h) && ($h[0]['hubloc_status'] & HUBLOC_OFFLINE)) { - $y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 and ud_date < '%s' ", + $y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 ", intval(UPDATE_FLAGS_UPDATED), dbesc($r[0]['ud_addr']), - intval(UPDATE_FLAGS_UPDATED), - dbesc($x[0]['ud_date']) + intval(UPDATE_FLAGS_UPDATED) ); return; From 146efbc18e95b7f008b683e436c0f0f2fd7db2a1 Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Fri, 23 Jan 2015 22:34:45 -0800 Subject: [PATCH 30/52] unmatched parens --- install/update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/update.php b/install/update.php index f5444089d..8cd25f1bf 100644 --- a/install/update.php +++ b/install/update.php @@ -1515,7 +1515,7 @@ function update_r1133() { xp_client varchar( 20 ) NOT NULL DEFAULT '', xp_channel bigint NOT NULL DEFAULT '0', xp_perm varchar( 64 ) NOT NULL DEFAULT '', - PRIMARY KEY (\"xp_id\") "); + PRIMARY KEY (\"xp_id\") )"); $r2 = q("create index \"xp_client\" on xperm (\"xp_client\", create index \"xp_channel\" on xperm (\"xp_channel\"), create index \"xp_perm\" on xperm (\"xp_perm\") "); From e4e990df06ef64dd08bdd6e6a78bf461dc97cc19 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 24 Jan 2015 12:22:04 +0100 Subject: [PATCH 31/52] the old item must be removed before the new is created --- include/attach.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/attach.php b/include/attach.php index 9c71beb23..850f71f20 100644 --- a/include/attach.php +++ b/include/attach.php @@ -987,11 +987,18 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, dbesc($jsonobject) ); - if($y) { $update = true; $object['d_mid'] = $y[0]['mid']; //attach mid of the old object $u_jsonobject = json_encode($object); + + //we have got the relevant info - delete the old item before we create the new one + $z = q("DELETE FROM item WHERE obj_type = '%s' AND verb = '%s' AND mid = '%s'", + dbesc(ACTIVITY_OBJ_FILE), + dbesc(ACTIVITY_POST), + dbesc($y[0]['mid']) + ); + } if($update && $verb == 'post' ) { From 63f1ae5e204cdb615a0edb0d16c4c471c2f3264e Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 24 Jan 2015 14:35:21 +0100 Subject: [PATCH 32/52] optimize check query --- include/attach.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/attach.php b/include/attach.php index 850f71f20..c7216df7a 100644 --- a/include/attach.php +++ b/include/attach.php @@ -981,10 +981,11 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $jsonobject = json_encode($object); //check if item for this object exists - $y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND object = '%s' LIMIT 1", + $y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND resource_id = '%s' AND uid = %d LIMIT 1", dbesc(ACTIVITY_POST), dbesc($objtype), - dbesc($jsonobject) + dbesc($object['hash']), + intval(local_user()) ); if($y) { @@ -1026,6 +1027,8 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $arr['verb'] = ACTIVITY_UPDATE; $arr['obj_type'] = $objtype; $arr['object'] = $u_jsonobject; + $arr['resource_id'] = $object['hash']; + $arr['resource_type'] = 'attach'; $arr['body'] = ''; $post = item_store($arr); @@ -1064,6 +1067,8 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $arr['item_private'] = $private; $arr['verb'] = (($update) ? ACTIVITY_UPDATE : ACTIVITY_POST); $arr['obj_type'] = $objtype; + $arr['resource_id'] = $object['hash']; + $arr['resource_type'] = 'attach'; $arr['object'] = (($update) ? $u_jsonobject : $jsonobject); $arr['body'] = ''; From ba10833bc5ae0afb51d2fc6609370865386678fb Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 25 Jan 2015 04:16:28 +0100 Subject: [PATCH 33/52] Check allowed emails, also add blacklisting for not allowed emails: config:'system','not_allowed_email' --- .../classRedMatrix_1_1Import_1_1Import.html | 447 ------------------ .../classRedmatrix_1_1Import_1_1Import.js | 18 - doc/html/namespaceRedmatrix_1_1Import.html | 120 ----- doc/html/namespaceRedmatrix_1_1Import.js | 4 - include/network.php | 35 +- 5 files changed, 29 insertions(+), 595 deletions(-) delete mode 100644 doc/html/classRedMatrix_1_1Import_1_1Import.html delete mode 100644 doc/html/classRedmatrix_1_1Import_1_1Import.js delete mode 100644 doc/html/namespaceRedmatrix_1_1Import.html delete mode 100644 doc/html/namespaceRedmatrix_1_1Import.js diff --git a/doc/html/classRedMatrix_1_1Import_1_1Import.html b/doc/html/classRedMatrix_1_1Import_1_1Import.html deleted file mode 100644 index 2119780c3..000000000 --- a/doc/html/classRedMatrix_1_1Import_1_1Import.html +++ /dev/null @@ -1,447 +0,0 @@ - - - - - - -The Red Matrix: RedMatrix\Import\Import Class Reference - - - - - - - - - - - - - -
    -
    -
     $channel, $channel = null,
    - - - - - - -
    -
    The Red Matrix -
    -
    -
    - - - - - -
    -
    - -
    -
    -
    - -
    - - - - -
    - -
    - -
    -
    -Public Member Functions | -Protected Attributes | -Private Attributes | -List of all members
    -
    -
    RedMatrix\Import\Import Class Reference
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - -

    -Public Member Functions

     get_credentials ()
     
     get_itemlist ()
     
     get_item_ident ($item)
     
     get_item ($item_ident)
     
     get_taxonomy ($item_ident)
     
     get_children ($item_ident)
     
     convert_item ($item_ident)
     
     convert_taxonomy ($item_ident)
     
     convert_child ($child)
     
     store ($item, $update=false)
     
     run ()
     
    - - - - - - - -

    -Protected Attributes

     $itemlist = null
     
     $src_items = null
     
     $items = null
     
    - - - -

    -Private Attributes

     $credentials = null
     
    -

    Member Function Documentation

    - -
    -
    - - - - - - - - -
    RedMatrix\Import\Import::convert_child ( $child)
    -
    - -

    Referenced by RedMatrix\Import\Import\run().

    - -
    -
    - -
    -
    - - - - - - - - -
    RedMatrix\Import\Import::convert_item ( $item_ident)
    -
    - -

    Referenced by RedMatrix\Import\Import\run().

    - -
    -
    - -
    -
    - - - - - - - - -
    RedMatrix\Import\Import::convert_taxonomy ( $item_ident)
    -
    - -

    Referenced by RedMatrix\Import\Import\run().

    - -
    -
    - -
    -
    - - - - - - - - -
    RedMatrix\Import\Import::get_children ( $item_ident)
    -
    - -

    Referenced by RedMatrix\Import\Import\run().

    - -
    -
    - -
    -
    - - - - - - - -
    RedMatrix\Import\Import::get_credentials ()
    -
    - -

    Referenced by RedMatrix\Import\Import\run().

    - -
    -
    - -
    -
    - - - - - - - - -
    RedMatrix\Import\Import::get_item ( $item_ident)
    -
    - -

    Referenced by RedMatrix\Import\Import\run().

    - -
    -
    - -
    -
    - - - - - - - - -
    RedMatrix\Import\Import::get_item_ident ( $item)
    -
    - -
    -
    - -
    -
    - - - - - - - -
    RedMatrix\Import\Import::get_itemlist ()
    -
    - -

    Referenced by RedMatrix\Import\Import\run().

    - -
    -
    - -
    -
    - - - - - - - - -
    RedMatrix\Import\Import::get_taxonomy ( $item_ident)
    -
    - -

    Referenced by RedMatrix\Import\Import\run().

    - -
    -
    - -
    -
    - - - - - - - -
    RedMatrix\Import\Import::run ()
    -
    - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - -
    RedMatrix\Import\Import::store ( $item,
     $update = false 
    )
    -
    - -
    -
    -

    Member Data Documentation

    - -
    -
    - - - - - -
    - - - - -
    RedMatrix\Import\Import::$credentials = null
    -     		-private
    -
    - -

    Referenced by RedMatrix\Import\Import\get_credentials().

    - -
    -
    - -
    -
    - - - - - -
    - - - - -
    RedMatrix\Import\Import::$itemlist = null
    -     		-protected
    -
    - -

    Referenced by RedMatrix\Import\Import\get_itemlist().

    - -
    -
    - -
    -
    - - - - - -
    - - - - -
    RedMatrix\Import\Import::$items = null
    -     		-protected
    -
    - -
    -
    - -
    -
    - - - - - -
    - - - - -
    RedMatrix\Import\Import::$src_items = null
    -     		-protected
    -
    - -
    -
    -
    The documentation for this class was generated from the following file: -
    -
    - diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.js b/doc/html/classRedmatrix_1_1Import_1_1Import.js deleted file mode 100644 index 6d01249e1..000000000 --- a/doc/html/classRedmatrix_1_1Import_1_1Import.js +++ /dev/null @@ -1,18 +0,0 @@ -var classRedMatrix_1_1Import_1_1Import = -[ - [ "convert_child", "classRedMatrix_1_1Import_1_1Import.html#a5434325afb2c633c52540127d717800a", null ], - [ "convert_item", "classRedMatrix_1_1Import_1_1Import.html#a107703a43a1b0ceb2af7ae470cb3f218", null ], - [ "convert_taxonomy", "classRedMatrix_1_1Import_1_1Import.html#addf6e53dacd971eaab49be4b17a767d6", null ], - [ "get_children", "classRedMatrix_1_1Import_1_1Import.html#a57561904b0f127e0d9a3e2c33688daf8", null ], - [ "get_credentials", "classRedMatrix_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367", null ], - [ "get_item", "classRedMatrix_1_1Import_1_1Import.html#a27987a41cb703a796f1821baeb4774a2", null ], - [ "get_item_ident", "classRedMatrix_1_1Import_1_1Import.html#a772c28edf36aaf8e66007a95004c4059", null ], - [ "get_itemlist", "classRedMatrix_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc", null ], - [ "get_taxonomy", "classRedMatrix_1_1Import_1_1Import.html#ae3c6472bea1a44025bc2e152604eb20c", null ], - [ "run", "classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c", null ], - [ "store", "classRedMatrix_1_1Import_1_1Import.html#a33ed595de044c0ec1cd84cca719e31dc", null ], - [ "$credentials", "classRedMatrix_1_1Import_1_1Import.html#a864aac9fadb4846f5d9f840e8e0f440f", null ], - [ "$itemlist", "classRedMatrix_1_1Import_1_1Import.html#ad0d2bdc3b388220479063915b4f5c2fc", null ], - [ "$items", "classRedMatrix_1_1Import_1_1Import.html#a0a05dac405ccc5b617b7b7b3c8ed783c", null ], - [ "$src_items", "classRedMatrix_1_1Import_1_1Import.html#a88c2eeba8d0cba3e7c12a2c45ba0fbc6", null ] -]; diff --git a/doc/html/namespaceRedmatrix_1_1Import.html b/doc/html/namespaceRedmatrix_1_1Import.html deleted file mode 100644 index a0ab85227..000000000 --- a/doc/html/namespaceRedmatrix_1_1Import.html +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - -The Red Matrix: RedMatrix\Import Namespace Reference - - - - - - - - - - - - - -
    -
    - - - - - - - -
    -
    The Red Matrix -
    -
    -
    - - - - - -
    -
    - -
    -
    -
    - -
    - - - - -
    - -
    - -
    -
    -Classes
    -
    -
    RedMatrix\Import Namespace Reference
    -
    -
    - - - - -

    -Classes

    class  Import
     
    -
    -
    - diff --git a/doc/html/namespaceRedmatrix_1_1Import.js b/doc/html/namespaceRedmatrix_1_1Import.js deleted file mode 100644 index c26a05140..000000000 --- a/doc/html/namespaceRedmatrix_1_1Import.js +++ /dev/null @@ -1,4 +0,0 @@ -var namespaceRedMatrix_1_1Import = -[ - [ "Import", "classRedMatrix_1_1Import_1_1Import.html", "classRedMatrix_1_1Import_1_1Import" ] -]; \ No newline at end of file diff --git a/include/network.php b/include/network.php index 170b77d7d..224d9d5e1 100644 --- a/include/network.php +++ b/include/network.php @@ -464,24 +464,47 @@ function allowed_email($email) { return false; $str_allowed = get_config('system','allowed_email'); - if(! $str_allowed) + $str_not_allowed = get_config('system','not_allowed_email'); + + if(! $str_allowed && ! $str_not_allowed) return true; - $found = false; - + $return = false; + $found_allowed = false; + $found_not_allowed = false; + $fnmatch = function_exists('fnmatch'); + $allowed = explode(',',$str_allowed); if(count($allowed)) { foreach($allowed as $a) { $pat = strtolower(trim($a)); - if(($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) { - $found = true; + if(($fnmatch && fnmatch($pat,$email)) || ($pat == $domain)) { + $found_allowed = true; break; } } } - return $found; + + $not_allowed = explode(',',$str_not_allowed); + + if(count($not_allowed)) { + foreach($not_allowed as $na) { + $pat = strtolower(trim($na)); + if(($fnmatch && fnmatch($pat,$email)) || ($pat == $domain)) { + $found_not_allowed = true; + break; + } + } + } + + if ($found_allowed) { + $return = true; + } elseif (!$str_allowed && !$found_not_allowed) { + $return = true; + } + return $return; } From 2e783dbe79be9db8f88dde092daa33592c1e3672 Mon Sep 17 00:00:00 2001 From: Alexandre Hannud Abdo Date: Sun, 25 Jan 2015 02:08:59 -0200 Subject: [PATCH 34/52] Call sslify with an extra path element so files keep their names The main motivation for this is when saving images one doesn't need to inspect and manually input the file's actual name. There might be other benefits, perhaps in automated downloads. --- include/text.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index b6e4abf24..47694a17c 100644 --- a/include/text.php +++ b/include/text.php @@ -898,7 +898,8 @@ function sslify($s) { $cnt = preg_match_all("/\<(.*?)src=\"(http\:.*?)\"(.*?)\>/",$s,$matches,PREG_SET_ORDER); if($cnt) { foreach($matches as $match) { - $s = str_replace($match[2],z_root() . '/sslify?f=&url=' . urlencode($match[2]),$s); + $filename = basename( parse_url($match[2],PHP_URL_PATH) ); + $s = str_replace($match[2],z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($match[2]),$s); } } return $s; From 1d80bcf2e722508702d21b7a6e03e4eea75137e8 Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Sat, 24 Jan 2015 21:16:43 -0800 Subject: [PATCH 35/52] standardize sql --- mod/sitelist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/sitelist.php b/mod/sitelist.php index 4e52f0463..95a53c9a4 100644 --- a/mod/sitelist.php +++ b/mod/sitelist.php @@ -13,7 +13,7 @@ function sitelist_init(&$a) { if($order == 'random') $sql_order = " order by $rand "; - $sql_limit = " limit $start, $limit "; + $sql_limit = " LIMIT $limit OFFSET $start "; $sql_extra = ""; if($open) From 1d6aead325aa052fbacaad24efdbc784f1ee9407 Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Sat, 24 Jan 2015 22:07:53 -0800 Subject: [PATCH 36/52] remove superfluous group by this gets called from a zot post_post dealing with a specific messageid and hubloc_hash combination. grouping by site doesn't make sense here and it gets grouped when pulled back out elsewhere anyway --- include/zot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/zot.php b/include/zot.php index 3d92f7824..780c6a265 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2919,7 +2919,7 @@ function zot_process_message_request($data) { $r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc where hubloc_hash = '%s' and not (hubloc_flags & %d)>0 - and not (hubloc_status & %d)>0 group by hubloc_sitekey", + and not (hubloc_status & %d)>0 ", dbesc($sender_hash), intval(HUBLOC_FLAGS_DELETED), intval(HUBLOC_OFFLINE) From 30815e0c5799cdf5d79330f126eba922a375f0a8 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 25 Jan 2015 00:38:38 -0800 Subject: [PATCH 37/52] don't set a rating of 1 on old sites that report poco rating as an array. Just set it to 0. It will be fixed whenever they upgrade. --- include/socgraph.php | 2 +- version.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index 15ef480f6..5aa72f0be 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -119,7 +119,7 @@ function poco_load($xchan = '',$url = null) { $name = $entry['displayName']; $hash = $entry['hash']; - $rating = ((array_key_exists('rating',$entry)) ? intval($entry['rating']) : 0); + $rating = ((array_key_exists('rating',$entry) && (! is_array($entry['rating']))) ? intval($entry['rating']) : 0); $rating_text = ((array_key_exists('rating_text',$entry)) ? escape_tags($entry['rating_text']) :''); if(x($entry,'urls') && is_array($entry['urls'])) { diff --git a/version.inc b/version.inc index 27408b584..2574e9160 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-01-23.925 +2015-01-25.927 From 200d973581ea808edf56ea249bff0fb0256b039c Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Sun, 25 Jan 2015 04:04:53 -0800 Subject: [PATCH 38/52] suppress notices that might be confusing --- install/migrate-mypg.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/migrate-mypg.php b/install/migrate-mypg.php index 10bf1e387..cfd4f681a 100644 --- a/install/migrate-mypg.php +++ b/install/migrate-mypg.php @@ -33,7 +33,7 @@ function parse_htconfig($file) { function get_configtype(array $data) { if(!isset($data['host'], $data['user'], $data['pass'], $data['data'])) return 'none'; - if($data['type'] == 1) + if(@$data['type'] == 1) return 'pgsql'; return 'mysql'; } @@ -112,7 +112,7 @@ foreach(array('install','include','mod','view') as $dir) { } $cfgfile = '.htconfig.php'; -if($argv[1] == '--resume') { +if($argc >= 2 && $argv[1] == '--resume') { if($argc < 4) { echo "Resume usage {$argv[0]} --resume \n"; exit(); From 0ca71a6b5e007f59aca055156f8546e84e972ca6 Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Sun, 25 Jan 2015 04:05:28 -0800 Subject: [PATCH 39/52] update schema --- install/migrate_mypg_fixseq.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/migrate_mypg_fixseq.sql b/install/migrate_mypg_fixseq.sql index 806c5cf31..1dcb85fff 100644 --- a/install/migrate_mypg_fixseq.sql +++ b/install/migrate_mypg_fixseq.sql @@ -52,4 +52,4 @@ SELECT SETVAL('public.xign_id_seq', COALESCE(MAX(id), 1) ) FROM public.xign; SELECT SETVAL('public.xlink_xlink_id_seq', COALESCE(MAX(xlink_id), 1) ) FROM public.xlink; SELECT SETVAL('public.xtag_xtag_id_seq', COALESCE(MAX(xtag_id), 1) ) FROM public.xtag; - + SELECT SETVAL('public.xperm_id_seq', COALESCE(MAX(xp_id), 1) ) FROM public.xperm; From dc259ba027e75ec8ababff322940165613b286ed Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Sun, 25 Jan 2015 04:13:14 -0800 Subject: [PATCH 40/52] typo --- install/migrate_mypg_fixseq.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/migrate_mypg_fixseq.sql b/install/migrate_mypg_fixseq.sql index 1dcb85fff..fde187dc7 100644 --- a/install/migrate_mypg_fixseq.sql +++ b/install/migrate_mypg_fixseq.sql @@ -52,4 +52,4 @@ SELECT SETVAL('public.xign_id_seq', COALESCE(MAX(id), 1) ) FROM public.xign; SELECT SETVAL('public.xlink_xlink_id_seq', COALESCE(MAX(xlink_id), 1) ) FROM public.xlink; SELECT SETVAL('public.xtag_xtag_id_seq', COALESCE(MAX(xtag_id), 1) ) FROM public.xtag; - SELECT SETVAL('public.xperm_id_seq', COALESCE(MAX(xp_id), 1) ) FROM public.xperm; + SELECT SETVAL('public.xperm_xp_id_seq', COALESCE(MAX(xp_id), 1) ) FROM public.xperm; From b3370243e8ac7100ea73aa4a78904311067dcc05 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 25 Jan 2015 12:35:57 -0800 Subject: [PATCH 41/52] move connection approval checkbox to top of page (above the sliders) - instead of being in between rating and rating text. --- view/tpl/abook_edit.tpl | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 7c75bfac4..2454feaa8 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -30,12 +30,18 @@ - - {{if $last_update}} {{$lastupdtext}} {{$last_update}} {{/if}} + +{{if $is_pending}} +
    +{{include file="field_checkbox.tpl" field=$unapproved}} +
    +{{/if}} + + {{if $notself}} {{if $slide}}

    {{$lbl_slider}}

    @@ -55,7 +61,6 @@ {{/if}} - {{if $self}}
    {{$autolbl}}
    @@ -63,19 +68,11 @@
    {{/if}} - - -{{if $is_pending}} -
    -{{include file="field_checkbox.tpl" field=$unapproved}} -
    -{{/if}} - {{if $rating}} {{if $notself}}

    {{$lbl_rating_txt}}

    From 4776f62be9066a0e35a3b578a7502336effbb6a9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 25 Jan 2015 12:41:08 -0800 Subject: [PATCH 42/52] recognise opus as an audio file --- include/bbcode.php | 2 +- include/oembed.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 33017c011..5504dce7a 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -746,7 +746,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = preg_replace_callback("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", 'tryzrlvideo', $Text); } if (strpos($Text,'[/audio]') !== false) { - $Text = preg_replace_callback("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", 'tryzrlaudio', $Text); + $Text = preg_replace_callback("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3|opus))\[\/audio\]/ism", 'tryzrlaudio', $Text); } // Try to Oembed diff --git a/include/oembed.php b/include/oembed.php index e08b287d1..38c433e99 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -21,7 +21,7 @@ function oembed_fetch_url($embedurl){ // These media files should now be caught in bbcode.php // left here as a fallback in case this is called from another source - $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm"); + $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm","opus"); $ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION); From 1cbfe5adf1b1c69e55d1eef68da609f9c3d3179f Mon Sep 17 00:00:00 2001 From: anaqreon Date: Sun, 25 Jan 2015 15:49:07 -0500 Subject: [PATCH 43/52] misspelling --- mod/viewconnections.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/viewconnections.php b/mod/viewconnections.php index 40d26c823..aab136c43 100644 --- a/mod/viewconnections.php +++ b/mod/viewconnections.php @@ -83,7 +83,7 @@ function viewconnections_content(&$a) { $tpl = get_markup_template("viewcontact_template.tpl"); $o .= replace_macros($tpl, array( - '$title' => t('View Connnections'), + '$title' => t('View Connections'), '$contacts' => $contacts, '$paginate' => paginate($a), )); From 4ca2ec7638664dd0514beddd982c9d7b541522eb Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 25 Jan 2015 13:30:40 -0800 Subject: [PATCH 44/52] rework the new connection stuff so we don't need a "permissions have been changed but not saved" message. --- include/follow.php | 23 +++++++++-------------- mod/connedit.php | 13 +++---------- view/js/mod_connedit.js | 8 ++++---- 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/include/follow.php b/include/follow.php index 1abd0e3b9..06c0c5c62 100644 --- a/include/follow.php +++ b/include/follow.php @@ -66,14 +66,15 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $my_perms = get_channel_default_perms($uid); - if($is_red && $j) { + $role = get_pconfig($uid,'system','permissions_role'); + if($role) { + $x = get_role_perms($role); + if($x['perms_follow']) + $my_perms = $x['perms_follow']; + } - $role = get_pconfig($uid,'system','permissions_role'); - if($role) { - $x = get_role_perms($role); - if($x['perms_follow']) - $my_perms = $x['perms_follow']; - } + + if($is_red && $j) { logger('follow: ' . $url . ' ' . print_r($j,true), LOGGER_DEBUG); @@ -105,7 +106,6 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $xchan_hash = $x['hash']; - $their_perms = 0; $global_perms = get_perms(); @@ -163,12 +163,6 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) if($r) { $xchan_hash = $r[0]['xchan_hash']; $their_perms = 0; - $role = get_pconfig($uid,'system','permissions_role'); - if($role) { - $x = get_role_perms($role); - if($x['perms_follow']) - $my_perms = $x['perms_follow']; - } } } @@ -198,6 +192,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) } if($is_http) { + if(! intval(get_config('system','feed_contacts'))) { $result['message'] = t('Protocol disabled.'); return $result; diff --git a/mod/connedit.php b/mod/connedit.php index c27f4588a..089587fc7 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -131,6 +131,7 @@ function connedit_post(&$a) { if(($_REQUEST['pending']) && ($abook_flags & ABOOK_FLAG_PENDING)) { $abook_flags = ( $abook_flags ^ ABOOK_FLAG_PENDING ); $new_friend = true; + } $r = q("UPDATE abook SET abook_profile = '%s', abook_my_perms = %d , abook_closeness = %d, abook_rating = %d, abook_rating_text = '%s', abook_flags = %d @@ -273,27 +274,19 @@ function connedit_content(&$a) { $sort_type = 0; $o = ''; - // this triggers some javascript to set Full Sharing by default after - // completing a "follow" - which can be changed to something else before - // form submission, but this gives us something useable - - if($_GET['follow'] == 1) { - $o .= ''; - } if(! local_user()) { notice( t('Permission denied.') . EOL); return login(); } - $my_perms = 0; + $my_perms = get_channel_default_perms(local_user()); $role = get_pconfig(local_user(),'system','permissions_role'); if($role) { $x = get_role_perms($role); if($x['perms_accept']) $my_perms = $x['perms_accept']; - else - $my_perms = get_channel_default_perms(local_user()); } + if($my_perms) { $o .= "