From 2b57c339c04020cc8d57b7673cdc413f8be4f130 Mon Sep 17 00:00:00 2001 From: "p.tacconi"
'; diff --git a/version.inc b/version.inc index 3d9c7ec6f..888fa6d36 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-10-13.465 +2013-10-14.466 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0c5c916ae..860578368 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3473,4 +3473,8 @@ a .drop-icons { .attach-clip { margin-right: 3px; font-size: 1.8em; +} + +.item-category { + margin-right: 10px; } \ No newline at end of file diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl new file mode 100644 index 000000000..c482d1ebe --- /dev/null +++ b/view/tpl/item_categories.tpl @@ -0,0 +1,8 @@ +{{if $categories}} ++{{/if}} + diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl new file mode 100644 index 000000000..0e68a172a --- /dev/null +++ b/view/tpl/item_filer.tpl @@ -0,0 +1,8 @@ +{{if $categories}} + +{{/if}} + From 43289103ee99018f2c57391f6851970d7b7b4b39 Mon Sep 17 00:00:00 2001 From: marijusDate: Mon, 14 Oct 2013 18:13:02 +0200 Subject: [PATCH 13/43] i guess we should use .active class for all selected links. --- view/theme/redbasic/css/style.css | 10 ++-------- view/tpl/generic_links_widget.tpl | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 860578368..d6c1b3511 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -369,7 +369,7 @@ footer { margin-bottom: 10px; } -.group-selected, .nets-selected, .fileas-selected, .categories-selected, .settings-widget .active { +.group-selected, .nets-selected, .fileas-selected, .categories-selected, .active { color: #444444 !important; } @@ -1482,12 +1482,6 @@ tr.mceLast { box-shadow: 0 0 0 0; } -.settings-widget .selected { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - box-shadow: 4px 4px 3px 0 #444444; -} - #sidebar-page-list .label { margin-left: 5px; } @@ -3477,4 +3471,4 @@ a .drop-icons { .item-category { margin-right: 10px; -} \ No newline at end of file +} diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl index 8b4c67b6f..5ae52aa8a 100755 --- a/view/tpl/generic_links_widget.tpl +++ b/view/tpl/generic_links_widget.tpl @@ -4,7 +4,7 @@ {{foreach $items as $item}} -
From 9945c1844c9ed8dca42f448ff17dd21b047e896f Mon Sep 17 00:00:00 2001 From: Thomas Willingham- {{$item.label}}
+- {{$item.label}}
{{/foreach}}Date: Mon, 14 Oct 2013 21:44:35 +0100 Subject: [PATCH 14/43] Issue #181 --- mod/setup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/setup.php b/mod/setup.php index 97bdba34e..b825b5e0d 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -453,8 +453,8 @@ function check_funcs(&$checks) { $ck_funcs[4]['help']= t('Error: mb_string PHP module required but not installed.'); } if(! function_exists('mcrypt_encrypt')){ - $ck_funcs[4]['status']= false; - $ck_funcs[4]['help']= t('Error: mcrypt PHP module required but not installed.'); + $ck_funcs[5]['status']= false; + $ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.'); } $checks = array_merge($checks, $ck_funcs); From 9787872778d02d770431386853fa3313f453398e Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 14 Oct 2013 15:34:47 -0700 Subject: [PATCH 15/43] linkify post categories --- include/text.php | 9 ++++++++- mod/item.php | 2 +- view/tpl/item_categories.tpl | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/include/text.php b/include/text.php index 125e1182f..ff75535b0 100755 --- a/include/text.php +++ b/include/text.php @@ -1024,6 +1024,9 @@ function theme_attachments(&$item) { $icon = ''; $icontype = substr($r['type'],0,strpos($r['type'],'/')); + // FIXME This should probably be a giant "if" statement in the template so that we don't have icon names + // embedded in php code + switch($icontype) { case 'video': $icon = 'icon-facetime-video'; @@ -1073,8 +1076,10 @@ function format_categories(&$item,$writeable) { $categories = array(); foreach($terms as $t) { $term = htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8') ; + if(! trim($term)) + continue; $removelink = (($writeable) ? z_root() . '/filerm/' . $item['id'] . '?f=&cat=' . urlencode($t['term']) : ''); - $categories[] = array('term' => $term, 'writeable' => $writeable, 'removelink' => $removelink); + $categories[] = array('term' => $term, 'writeable' => $writeable, 'removelink' => $removelink, 'url' => $t['url']); } } $s = replace_macros(get_markup_template('item_categories.tpl'),array( @@ -1093,6 +1098,8 @@ function format_filer(&$item) { $categories = array(); foreach($terms as $t) { $term = htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8') ; + if(! trim($term)) + continue; $removelink = z_root() . '/filerm/' . $item['id'] . '?f=&term=' . urlencode($t['term']); $categories[] = array('term' => $term, 'removelink' => $removelink); } diff --git a/mod/item.php b/mod/item.php index 3d4845a47..1bdd951cd 100644 --- a/mod/item.php +++ b/mod/item.php @@ -529,7 +529,7 @@ function item_post(&$a) { 'type' => TERM_CATEGORY, 'otype' => TERM_OBJ_POST, 'term' => trim($cat), - 'url' => '' + 'url' => $owner_xchan['xchan_url'] . '?f=&cat=' . urlencode(trim($cat)) ); } } diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl index c482d1ebe..599ad21bd 100644 --- a/view/tpl/item_categories.tpl +++ b/view/tpl/item_categories.tpl @@ -1,7 +1,7 @@ {{if $categories}} {{/if}} From f3fcffb29d22066f0ce627faa6af3287dd716698 Mon Sep 17 00:00:00 2001 From: friendicaDate: Mon, 14 Oct 2013 15:38:05 -0700 Subject: [PATCH 16/43] We really don't need the category delete links on each category in each post with categories, as we can now change the categories by editing the post. So take out the delete links. --- view/tpl/item_categories.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl index 599ad21bd..ec2639a6f 100644 --- a/view/tpl/item_categories.tpl +++ b/view/tpl/item_categories.tpl @@ -1,7 +1,7 @@ {{if $categories}} {{/if}} From 96ba0dccf993490f7019b94950bad23a354d3127 Mon Sep 17 00:00:00 2001 From: friendicaDate: Mon, 14 Oct 2013 20:51:26 -0700 Subject: [PATCH 17/43] sql typo in directory sync --- include/dir_fns.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index ba3aa1877..e3cd8ae77 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -85,7 +85,7 @@ function sync_directories($dirmode) { if(is_array($t['flags']) && in_array('deleted',$t['flags'])) $ud_flags |= UPDATE_FLAGS_DELETED; $z = q("insert into updates ( ud_hash, ud_guid, ud_date, ud_flags, ud_addr ) - values ( '%s', '%s', '%s', '%d, '%s' ) ", + values ( '%s', '%s', '%s', %d, '%s' ) ", dbesc($t['hash']), dbesc($t['transaction_id']), dbesc($t['timestamp']), From a13ab4ee9b4266b7671f010780b41521624a1afc Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 14 Oct 2013 21:09:39 -0700 Subject: [PATCH 18/43] sql wrong number of args --- include/zot.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/zot.php b/include/zot.php index b250557e6..f1e298f91 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1568,6 +1568,7 @@ function update_modtime($hash,$guid,$addr,$flags = 0) { else { q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d) ", intval(UPDATE_FLAGS_UPDATED), + dbesc($addr), intval(UPDATE_FLAGS_UPDATED) ); } From 6dbaaef7b7e4d1b23541a92f71e4a738f99c36d8 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 14 Oct 2013 21:19:23 -0700 Subject: [PATCH 19/43] don't update old entries with no address --- include/onedirsync.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/onedirsync.php b/include/onedirsync.php index b9c17628a..5f971629f 100644 --- a/include/onedirsync.php +++ b/include/onedirsync.php @@ -28,7 +28,7 @@ function onedirsync_run($argv, $argc){ if(! $r) return; - if($r['ud_flags'] & UPDATE_FLAGS_UPDATED) + if(($r[0]['ud_flags'] & UPDATE_FLAGS_UPDATED) || (! $r[0]['ud_addr'])) return; update_directory_entry($r[0]); From 3a615528e8992055fc1dbff87db8531d3fee1eb7 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 14 Oct 2013 21:39:54 -0700 Subject: [PATCH 20/43] sync tweaks --- include/poller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index 95eb810a0..97571d331 100644 --- a/include/poller.php +++ b/include/poller.php @@ -242,7 +242,7 @@ function poller_run($argv, $argc){ } if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) { - $r = q("select ud_id from updates where not ( ud_flags & %d ) and ( ud_last = '0000-00-00 00:00:00' OR ud_last > UTC_TIMESTAMP() - INTERVAL 7 DAY ) ", + $r = q("select ud_id from updates where not ( ud_flags & %d ) and ud_addr != '' and ( ud_last = '0000-00-00 00:00:00' OR ud_last > UTC_TIMESTAMP() - INTERVAL 7 DAY ) ", intval(UPDATE_FLAGS_UPDATED) ); if($r) { From 83daf51460db24356b0690aff2cfb5e639f98576 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 14 Oct 2013 21:56:56 -0700 Subject: [PATCH 21/43] extra logging --- include/dir_fns.php | 5 ++++- include/onedirsync.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index e3cd8ae77..adbcb6e3c 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -103,12 +103,15 @@ function update_directory_entry($ud) { logger('update_directory_entry: ' . print_r($ud,true), LOGGER_DATA); if($ud['ud_addr'] && (! ($ud['ud_flags'] & UPDATE_FLAGS_DELETED))) { + $success = false; $x = zot_finger($ud['ud_addr'],''); if($x['success']) { $j = json_decode($x['body'],true); + if($j) + $success = true; $y = import_xchan($j,0); } - else { + if(! $success) { $r = q("update updates set ud_last = '%s' where ud_addr = '%s'", dbesc(datetime_convert()), dbesc($ud['ud_addr']) diff --git a/include/onedirsync.php b/include/onedirsync.php index 5f971629f..35fcbbc7b 100644 --- a/include/onedirsync.php +++ b/include/onedirsync.php @@ -12,7 +12,7 @@ function onedirsync_run($argv, $argc){ cli_startup(); $a = get_app(); - logger('onedirsync: start'); + logger('onedirsync: start' . intval($argv[1])); if(($argc > 1) && (intval($argv[1]))) $update_id = intval($argv[1]); From b75163fb80518efb9e06b374f5093da5d2e6f6d4 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 14 Oct 2013 22:04:45 -0700 Subject: [PATCH 22/43] why do these have invalid id's? --- include/onedirsync.php | 2 +- include/poller.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/onedirsync.php b/include/onedirsync.php index 35fcbbc7b..c2ac3b59d 100644 --- a/include/onedirsync.php +++ b/include/onedirsync.php @@ -12,7 +12,7 @@ function onedirsync_run($argv, $argc){ cli_startup(); $a = get_app(); - logger('onedirsync: start' . intval($argv[1])); + logger('onedirsync: start ' . intval($argv[1])); if(($argc > 1) && (intval($argv[1]))) $update_id = intval($argv[1]); diff --git a/include/poller.php b/include/poller.php index 97571d331..48959fe61 100644 --- a/include/poller.php +++ b/include/poller.php @@ -242,7 +242,7 @@ function poller_run($argv, $argc){ } if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) { - $r = q("select ud_id from updates where not ( ud_flags & %d ) and ud_addr != '' and ( ud_last = '0000-00-00 00:00:00' OR ud_last > UTC_TIMESTAMP() - INTERVAL 7 DAY ) ", + $r = q("select * from updates where not ( ud_flags & %d ) and ud_addr != '' and ( ud_last = '0000-00-00 00:00:00' OR ud_last > UTC_TIMESTAMP() - INTERVAL 7 DAY ) ", intval(UPDATE_FLAGS_UPDATED) ); if($r) { From 89378fb12ab0be501a6fae23fd23a9a097742125 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 14 Oct 2013 22:20:14 -0700 Subject: [PATCH 23/43] update even if no change --- include/zot.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/zot.php b/include/zot.php index f1e298f91..0ee099ce5 100644 --- a/include/zot.php +++ b/include/zot.php @@ -723,6 +723,14 @@ function import_xchan($arr,$ud_flags = 1) { update_modtime($xchan_hash,$guid,$arr['address'],$ud_flags); logger('import_xchan: changed: ' . $what,LOGGER_DEBUG); } + elseif(! $ud_flags) { + // nothing changed but we still need to update the updates record + q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d) ", + intval(UPDATE_FLAGS_UPDATED), + dbesc($arr['address']), + intval(UPDATE_FLAGS_UPDATED) + ); + } if(! x($ret,'message')) { $ret['success'] = true; From 66f427db5ea1c27f247ed329521695bc34a8fdd6 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 15 Oct 2013 02:33:35 -0700 Subject: [PATCH 24/43] directory sync optimisations to save redundant processing --- include/onedirsync.php | 19 +++++++++++++++++++ include/poller.php | 2 +- version.inc | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/include/onedirsync.php b/include/onedirsync.php index c2ac3b59d..8ae1df5e5 100644 --- a/include/onedirsync.php +++ b/include/onedirsync.php @@ -31,6 +31,25 @@ function onedirsync_run($argv, $argc){ if(($r[0]['ud_flags'] & UPDATE_FLAGS_UPDATED) || (! $r[0]['ud_addr'])) return; + // Have we probed this channel more recently than the other directory server + // (where we received this update from) ? + // If we have, we don't need to do anything except mark any older entries updated + + $x = q("select * from updates where ud_addr = '%s' and ud_date > '%s' and ( ud_flags & %d ) order by ud_date desc limit 1", + dbesc($r[0]['ud_addr']), + dbesc($r[0]['ud_date']), + intval(UPDATE_FLAGS_UPDATED) + ); + if($x) { + $y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not ( ud_flags & %d ) and ud_date < '%s' ", + intval(UPDATE_FLAGS_UPDATED), + dbesc($r[0]['ud_addr']), + intval(UPDATE_FLAGS_UPDATED), + dbesc($x[0]['ud_date']) + ); + return; + } + update_directory_entry($r[0]); return; diff --git a/include/poller.php b/include/poller.php index 48959fe61..94ca99e54 100644 --- a/include/poller.php +++ b/include/poller.php @@ -242,7 +242,7 @@ function poller_run($argv, $argc){ } if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) { - $r = q("select * from updates where not ( ud_flags & %d ) and ud_addr != '' and ( ud_last = '0000-00-00 00:00:00' OR ud_last > UTC_TIMESTAMP() - INTERVAL 7 DAY ) ", + $r = q("select distinct ud_addr, updates.* from updates where not ( ud_flags & %d ) and ud_addr != '' and ( ud_last = '0000-00-00 00:00:00' OR ud_last > UTC_TIMESTAMP() - INTERVAL 7 DAY ) group by ud_addr ", intval(UPDATE_FLAGS_UPDATED) ); if($r) { diff --git a/version.inc b/version.inc index 888fa6d36..cb921a3a7 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-10-14.466 +2013-10-15.467 From 100043da38af9e1f01a3943e5bc996ab5311894a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 15 Oct 2013 15:51:20 -0700 Subject: [PATCH 25/43] oauth wasn't logging in properly, also fixed api status_show to return last public post, not the last private post --- include/api.php | 8 +++++--- include/oauth.php | 9 ++++++++- mod/item.php | 1 - 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/include/api.php b/include/api.php index 2760914e9..1dd970cbc 100644 --- a/include/api.php +++ b/include/api.php @@ -72,7 +72,9 @@ require_once('include/photos.php'); // login with oauth try { $oauth = new FKOAuth1(); - list($consumer,$token) = $oauth->verify_request(OAuthRequest::from_request()); + $req = OAuthRequest::from_request(); + list($consumer,$token) = $oauth->verify_request($req); +// list($consumer,$token) = $oauth->verify_request(OAuthRequest::from_request()); if (!is_null($token)){ $oauth->loginUser($token->uid); call_hooks('logged_in', $a->user); @@ -676,7 +678,6 @@ require_once('include/photos.php'); } } - // call out normal post function require_once('mod/item.php'); @@ -696,7 +697,7 @@ require_once('include/photos.php'); require_once('include/security.php'); $lastwall = q("SELECT * from item where 1 - and item_private != 0 and item_restrict = 0 + and item_private = 0 and item_restrict = 0 and author_xchan = '%s' and allow_cid = '' and allow_gid = '' and deny_cid = '' and deny_gid = '' and verb = '%s' @@ -749,6 +750,7 @@ require_once('include/photos.php'); ); $status_info['user'] = $user_info; } + return api_apply_template("status", $type, array('$status' => $status_info)); } diff --git a/include/oauth.php b/include/oauth.php index b10802ecd..8eb8a83d8 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -151,15 +151,22 @@ class FKOAuth1 extends OAuthServer { header('HTTP/1.0 401 Unauthorized'); die('This api requires login'); } + $_SESSION['uid'] = $record['channel_id']; $_SESSION['theme'] = $record['channel_theme']; $_SESSION['account_id'] = $record['channel_account_id']; $_SESSION['mobile_theme'] = get_pconfig($record['channel_id'], 'system', 'mobile_theme'); $_SESSION['authenticated'] = 1; -// $_SESSION['page_flags'] = $record['page-flags']; $_SESSION['my_url'] = $a->get_baseurl() . '/channel/' . $record['channel_address']; $_SESSION['addr'] = $_SERVER['REMOTE_ADDR']; $_SESSION['allow_api'] = true; + $x = q("select * from account where account_id = %d limit 1", + intval($record['channel_account_id']) + ); + if($x) + $a->account = $x[0]; + + change_channel($record['channel_id']); $a->channel = $record; diff --git a/mod/item.php b/mod/item.php index 1bdd951cd..08076bdf6 100644 --- a/mod/item.php +++ b/mod/item.php @@ -161,7 +161,6 @@ function item_post(&$a) { $observer = $a->get_observer(); - if($parent) { logger('mod_item: item_post parent=' . $parent); $can_comment = false; From 9cb3a44177115e81a9a1923fd0e00386748a6582 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 15 Oct 2013 16:52:57 -0700 Subject: [PATCH 26/43] add code-style guidelines. These aren't laws or rules, they are guidelines. --- doc/Developers.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/doc/Developers.md b/doc/Developers.md index e4905ccd1..4b339dee9 100644 --- a/doc/Developers.md +++ b/doc/Developers.md @@ -27,3 +27,27 @@ Please pull in any changes from the project repository and merge them with your Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. Further documentation can be found at the Github wiki pages at: [https://github.com/friendica/red/wiki](https://github.com/friendica/red/wiki). + +**Licensing** + +All code contributed to the project falls under the MIT license, unless otherwise specified. We will accept third-party code which falls under MIT, BSD and LGPL, but copyleft licensing (GPL, and AGPL) is only permitted in addons. It must be possible to completely remove the GPL (copyleft) code from the main project without breaking anything. + +**Coding Style** + +In the interests of consistency we adopt the following code styling. We may accept patches using other styles, but where possible please try to provide a consistent code style. We aren't going to argue or debate the merits of this style, and it is irrelevant what project 'xyz' uses. This is not project 'xyz'. This is a baseline to try and keep the code readable now and in the future. + +* All comments should be in English. + +* We use doxygen to generate documentation. This hasn't been consistently applied, but learning it and using it are highly encouraged. + +* Indentation is accomplished primarily with tabs using a tab-width of 4. + +* String concatenation and operators should be separated by whitespace. e.g. "$foo = $bar . 'abc';" instead of "$foo=$bar.'abc';" + +* Generally speaking, we use single quotes for string variables and double quotes for SQL statements. "Here documents" should be avoided. Sometimes using double quoted strings with variable replacement is the most efficient means of creating the string. In most cases, you should be using single quotes. + +* Use whitespace liberally to enhance readability. When creating arrays with many elements, we will often set one key/value pair per line, indented from the parent line appropriately. Lining up the assignment operators takes a bit more work, but also increases readability. + +* Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. + + From a3b358d0256a8519744ab71cfb02fcb8f650a271 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Oct 2013 00:17:16 -0700 Subject: [PATCH 27/43] wrong app name --- mod/view.php | 2 +- util/shred/FriendicaOAuth.sh | 4 ++-- version.inc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/view.php b/mod/view.php index 9e5eff962..d4381743c 100644 --- a/mod/view.php +++ b/mod/view.php @@ -1,6 +1,6 @@ Date: Wed, 16 Oct 2013 17:08:19 +0100 Subject: [PATCH 28/43] Don't break themes by using functions we don't need. If you've got a theme that started off copying Redbasic (ie, all of you) need to do this too. --- view/theme/redbasic/php/config.php | 2 +- view/theme/redbasic/php/style.php | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index faf6c6f35..44ddb78b9 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -39,7 +39,7 @@ function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $scheme_choices = array(); $scheme_choices["---"] = t("Default"); - $files = glob('view/theme/' . current_theme() . '/schema/*'); + $files = glob('view/theme/redbasic/schema/*'); if($files) { foreach($files as $file) { $f = basename($file, ".php"); diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index b5d020937..1f3e46d9d 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,4 +1,5 @@ $nav_bg_1, From b860a21fdce3c4b99b7cecc8ac8d1f776e788197 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 16 Oct 2013 19:05:40 +0100 Subject: [PATCH 29/43] Check only for php in schema globs. --- view/theme/redbasic/php/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 44ddb78b9..90bd109ad 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -39,7 +39,7 @@ function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $scheme_choices = array(); $scheme_choices["---"] = t("Default"); - $files = glob('view/theme/redbasic/schema/*'); + $files = glob('view/theme/redbasic/schema/*.php'); if($files) { foreach($files as $file) { $f = basename($file, ".php"); From 90fc3c1caf647214a079bfa12f92373e514276cd Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 17 Oct 2013 02:16:47 +0100 Subject: [PATCH 30/43] Errant logging. --- view/theme/redbasic/php/style.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 1f3e46d9d..3344fcb3a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,6 +1,4 @@ Date: Wed, 16 Oct 2013 20:04:52 -0700 Subject: [PATCH 31/43] first cut at plugin author's guide --- doc/Plugins.md | 201 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 doc/Plugins.md diff --git a/doc/Plugins.md b/doc/Plugins.md new file mode 100644 index 000000000..1ddd47ee2 --- /dev/null +++ b/doc/Plugins.md @@ -0,0 +1,201 @@ +Creating Plugins/Addons for the Red Matrix +========================================== + + +So you want to make the Red Matrix do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. + + +In your Red Matrix folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. + + mkdir addon + +Then figure out a name for your addon. You probably have at least a vague idea of what you want it to do. For our example I'm going to create a plugin called 'randplace' that provides a somewhat random location for each of your posts. The name of your plugin is used to find the functions we need to access and is part of the function names, so to be safe, use only simple text characters. + +Once you've chosen a name, create a directory beneath 'addon' to hold your working file or files. + + mkdir addon/randplace + +Now create your plugin file. It needs to have the same name, and it's a PHP script, so using your favourite editor, create the file + + addon/randplace/randplace.php + +The very first line of this file needs to be + + + * + */ + +These tags will be seen by the site administrator when he/she installs or manages plugins from the admin panel. There can be more than one author. Just add another line starting with 'Author:'. + +The typical plugin will have at least the following functions: + +* pluginname_load() +* pluginname_unload() + +In our case, we'll call them randplace_load() and randplace_unload(), as that is the name of our plugin. These functions are called whenever we wish to either initialise the plugin or remove it from the current webpage. Also if your plugin requires things like altering the database schema before it can run for the very first time, you would likely place these instructions in the functions named + +* pluginname_install() +* pluginname_uninstall() + + +Next we'll talk about **hooks**. Hooks are places in the Red Matrix code where we allow plugins to do stuff. There are a lot of these, and they each have a name. What we normally do is use the pluginname_register() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. + +We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your Red Matrix installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. + + + function randplace_load() { + register_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); + + register_hook('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); + register_hook('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); + + } + + +So we're going to catch three events, 'post_local' which is triggered when a post is made on the local system, 'feature_settings' to set some preferences for our plugin, and 'feature_settings_post' to store those settings. + +Next we'll create an unload function. This is easy, as it just unregisters our hooks. It takes exactly the same arguments. + + function randplace_unload() { + unregister_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); + + unregister_hook('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); + unregister_hook('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); + + } + + +Hooks are called with two arguments. The first is always $a, which is our global App structure and contains a huge amount of information about the state of the web request we are processing; as well as who the viewer is, and what our login state is, and the current contents of the web page we're probably constructing. + +The second argument is specific to the hook you're calling. It contains information relevant to that particular place in the program, and often allows you to look at, and even change it. In order to change it, you need to add '&' to the variable name so it is passed to your function by reference. Otherwise it will create a copy and any changes you make will be lost when the hook process returns. Usually (but not always) the second argument is a named array of data structures. Please see the "hook reference" (not yet written as of this date) for details on any specific hook. Occasionally you may need to view the program source to see precisely how a given hook is called and how the results are processed. + +Let's go ahead and add some code to implement our post_local hook handler. + + function randplace_post_hook($a, &$item) { + + /** + * + * An item was posted on the local system. + * We are going to look for specific items: + * - A status post by a profile owner + * - The profile owner must have allowed our plugin + * + */ + + logger('randplace invoked'); + + if(! local_user()) /* non-zero if this is a logged in user of this system */ + return; + + if(local_user() != $item['uid']) /* Does this person own the post? */ + return; + + if(($item['parent']) || ($item['restrict'])) { + /* If the item has a parent, or item_restrict is non-zero, this is a comment or something else, not a status post. */ + return; + } + + /* Retrieve our personal config setting */ + + $active = get_pconfig(local_user(), 'randplace', 'enable'); + + if(! $active) + return; + /** + * + * OK, we're allowed to do our stuff. + * Here's what we are going to do: + * load the list of timezone names, and use that to generate a list of world cities. + * Then we'll pick one of those at random and put it in the "location" field for the post. + * + */ + + $cities = array(); + $zones = timezone_identifiers_list(); + foreach($zones as $zone) { + if((strpos($zone,'/')) && (! stristr($zone,'US/')) && (! stristr($zone,'Etc/'))) + $cities[] = str_replace('_', ' ',substr($zone,strpos($zone,'/') + 1)); + } + + if(! count($cities)) + return; + $city = array_rand($cities,1); + $item['location'] = $cities[$city]; + + return; + } + + +Now let's add our functions to create and store preference settings. + + /** + * + * Callback from the settings post function. + * $post contains the $_POST array. + * We will make sure we've got a valid user account + * and if so set our configuration setting for this person. + * + */ + + function randplace_settings_post($a,$post) { + if(! local_user()) + return; + if($_POST['randplace-submit']) + set_pconfig(local_user(),'randplace','enable',intval($_POST['randplace'])); + } + + + + /** + * + * Called from the Feature Setting form. + * Add our own settings info to the page. + * + */ + + + + function randplace_settings(&$a,&$s) { + + if(! local_user()) + return; + + /* Add our stylesheet to the page so we can make our settings look nice */ + + head_add_css(/addon/randplace/randplace.css'); + + /* Get the current state of our config variable */ + + $enabled = get_pconfig(local_user(),'randplace','enable'); + + $checked = (($enabled) ? ' checked="checked" ' : ''); + + /* Add some HTML to the existing form */ + + $s .= ' '; + $s .= ''; + + } + + + + + + \ No newline at end of file From 06e1e6a1b66b90431b5acf1876a7d62c2d67938f Mon Sep 17 00:00:00 2001 From: friendica' . t('Randplace Settings') . '
'; + $s .= ''; + $s .= ''; + $s .= ''; + $s .= ''; + + /* provide a submit button */ + + $s .= 'Date: Wed, 16 Oct 2013 20:30:56 -0700 Subject: [PATCH 32/43] minor edits --- doc/Plugins.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/Plugins.md b/doc/Plugins.md index 1ddd47ee2..80379c478 100644 --- a/doc/Plugins.md +++ b/doc/Plugins.md @@ -99,7 +99,7 @@ Let's go ahead and add some code to implement our post_local hook handler. if(local_user() != $item['uid']) /* Does this person own the post? */ return; - if(($item['parent']) || ($item['restrict'])) { + if(($item['parent']) || ($item['item_restrict'])) { /* If the item has a parent, or item_restrict is non-zero, this is a comment or something else, not a status post. */ return; } @@ -140,8 +140,9 @@ Now let's add our functions to create and store preference settings. /** * * Callback from the settings post function. - * $post contains the $_POST array. - * We will make sure we've got a valid user account + * $post contains the global $_POST array. + * We will make sure we've got a valid user account + * and that only our own submit button was clicked * and if so set our configuration setting for this person. * */ @@ -158,8 +159,16 @@ Now let's add our functions to create and store preference settings. /** * * Called from the Feature Setting form. - * Add our own settings info to the page. + * The second argument is a string in this case, the HTML content region of the page. + * Add our own settings info to the string. * + * For uniformity of settings pages, we use the following convention + * + **/ From da738134875ac9a5640b2361d18146283da784e4 Mon Sep 17 00:00:00 2001 From: friendicatitle
+ * .... settings html - many elements will be floated... + * + * + *Date: Wed, 16 Oct 2013 21:00:14 -0700 Subject: [PATCH 33/43] advanced plugins as a stepping stone to building modules --- doc/Plugins.md | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/doc/Plugins.md b/doc/Plugins.md index 80379c478..aec4c8399 100644 --- a/doc/Plugins.md +++ b/doc/Plugins.md @@ -207,4 +207,38 @@ Now let's add our functions to create and store preference settings. - \ No newline at end of file +***Advanced Plugins*** + +Sometimes your plugins want to provide a range of new functionality which isn't provided at all or is clumsy to provide using hooks. In this case your plugin can also act as a 'module'. A module in our case refers to a structured webpage handler which responds to a given URL. Then anything which accesses that URL will be handled completely by your plugin. + +The key to this is to create a simple function named pluginname_module() which does nothing. + + function randplace_module() { return; } + +Once this function exists, the URL https://yoursite/randplace will access your plugin as a module. Then you can define functions which are called at various points to build a webpage just like the modules in the mod/ directory. The typical functions and the order which they are called is + + modulename_init($a) // (e.g. randplace_init($a);) called first - if you wish to emit json or xml, + // you should do it here, followed by killme() which will avoid the default action of building a webpage + modulename_aside($a) // Often used to create sidebar content + modulename_post($a) // Called whenever the page is accessed via the "post" method + modulename_content($a) // called to generate the central page content. This function should return a string + // consisting of the central page content. + +Your module functions have access to the URL path as if they were standalone programs in the Unix operating system. For instance if you visit the page + + https://yoursite/randplace/something/somewhere/whatever + +we will create an argc/argv list for use by your module functions + + $x = argc(); $x will be 4, the number of path arguments after the sitename + + for($x = 0; $x < argc(); $x ++) + echo $x . ' ' . argv($x); + + + 0 randplace + 1 something + 2 somewhere + 3 whatever + + From 2cf136b1861b10e02158fcd34fb6814d0ed9e324 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Oct 2013 21:50:09 -0700 Subject: [PATCH 34/43] wrong function name --- doc/Plugins.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Plugins.md b/doc/Plugins.md index aec4c8399..6b4058443 100644 --- a/doc/Plugins.md +++ b/doc/Plugins.md @@ -47,7 +47,7 @@ In our case, we'll call them randplace_load() and randplace_unload(), as that is * pluginname_uninstall() -Next we'll talk about **hooks**. Hooks are places in the Red Matrix code where we allow plugins to do stuff. There are a lot of these, and they each have a name. What we normally do is use the pluginname_register() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. +Next we'll talk about **hooks**. Hooks are places in the Red Matrix code where we allow plugins to do stuff. There are a lot of these, and they each have a name. What we normally do is use the pluginname_install() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your Red Matrix installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. From 78475d349b289734277997324f550d8e86149cc2 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Oct 2013 21:51:42 -0700 Subject: [PATCH 35/43] and did it again --- doc/Plugins.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Plugins.md b/doc/Plugins.md index 6b4058443..1b5f57240 100644 --- a/doc/Plugins.md +++ b/doc/Plugins.md @@ -47,7 +47,7 @@ In our case, we'll call them randplace_load() and randplace_unload(), as that is * pluginname_uninstall() -Next we'll talk about **hooks**. Hooks are places in the Red Matrix code where we allow plugins to do stuff. There are a lot of these, and they each have a name. What we normally do is use the pluginname_install() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. +Next we'll talk about **hooks**. Hooks are places in the Red Matrix code where we allow plugins to do stuff. There are a lot of these, and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your Red Matrix installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. From 4a87ebfc1267b04a84b278089f4482018d067786 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 18 Oct 2013 14:25:27 -0700 Subject: [PATCH 36/43] doc updates --- doc/html/Contact_8php.html | 2 +- doc/html/boot_8php.html | 18 +-- doc/html/dba__driver_8php.html | 2 +- .../dir_55dbaf9b7b53c4fc605c9011743a7353.html | 2 + .../dir_55dbaf9b7b53c4fc605c9011743a7353.js | 3 +- doc/html/dir__fns_8php.html | 19 +++ doc/html/dir__fns_8php.js | 1 + doc/html/extract_8php.html | 4 +- doc/html/files.html | 10 +- doc/html/globals.html | 2 +- doc/html/globals_0x64.html | 3 + doc/html/globals_0x66.html | 6 + doc/html/globals_0x74.html | 5 +- doc/html/globals_func_0x64.html | 3 + doc/html/globals_func_0x66.html | 6 + doc/html/globals_func_0x74.html | 7 +- doc/html/globals_vars.html | 2 +- doc/html/include_2config_8php.html | 2 +- doc/html/language_8php.html | 2 +- doc/html/navtree.js | 8 +- doc/html/navtreeindex3.js | 18 +-- doc/html/navtreeindex4.js | 8 +- doc/html/navtreeindex5.js | 12 +- doc/html/navtreeindex6.js | 122 +++++++++--------- doc/html/navtreeindex7.js | 12 +- doc/html/plugin_8php.html | 2 +- doc/html/redbasic_2php_2style_8php.html | 9 +- doc/html/redbasic_2php_2style_8php.js | 2 +- doc/html/search/all_24.js | 2 +- doc/html/search/all_64.js | 4 +- doc/html/search/all_66.js | 2 + doc/html/search/all_74.js | 1 + doc/html/search/files_64.js | 1 + doc/html/search/functions_64.js | 1 + doc/html/search/functions_66.js | 2 + doc/html/search/functions_74.js | 1 + doc/html/search/variables_24.js | 2 +- doc/html/security_8php.html | 2 +- doc/html/taxonomy_8php.html | 2 +- doc/html/text_8php.html | 74 ++++++++++- doc/html/text_8php.js | 3 + doc/html/view_8php.html | 2 +- 42 files changed, 264 insertions(+), 127 deletions(-) diff --git a/doc/html/Contact_8php.html b/doc/html/Contact_8php.html index eeb281502..f531cc3ad 100644 --- a/doc/html/Contact_8php.html +++ b/doc/html/Contact_8php.html @@ -541,7 +541,7 @@ Functions -diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index c7bc3bc0e..f53d465b6 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -224,7 +224,7 @@ VariablesReferenced by chanview_content(), connections_aside(), and photos_init().
+Referenced by chanview_content(), connections_aside(), message_content(), and photos_init().
const ZOT_REVISION 1 - + const DB_UPDATE_VERSION 1077 const DB_UPDATE_VERSION 1078 const EOL '<br />' . "\r\n" @@ -862,7 +862,7 @@ Variables -@@ -1330,7 +1330,7 @@ VariablesReferenced by FriendicaSmarty\__construct(), apw_form(), construct_page(), current_theme_url(), redbasic_form(), and theme_include().
+Referenced by FriendicaSmarty\__construct(), apw_form(), construct_page(), current_theme_url(), and theme_include().
e.g.: proc_run("ls","-la","/tmp");
$cmd and string args are surrounded with ""
-Referenced by build_sync_packet(), channel_remove(), connect_post(), connections_content(), connections_post(), create_identity(), directory_run(), drop_item(), drop_items(), events_post(), fix_system_urls(), fsuggest_post(), import_post(), item_expire(), item_post(), like_content(), mood_init(), new_contact(), notifier_run(), photo_upload(), photos_post(), poller_run(), post_activity_item(), process_delivery(), profile_activity(), profile_photo_post(), profiles_post(), send_message(), settings_post(), tag_deliver(), tagger_content(), thing_init(), zid_init(), and zot_refresh().
+Referenced by build_sync_packet(), channel_remove(), connect_post(), connections_content(), connections_post(), create_identity(), directory_run(), drop_item(), drop_items(), events_post(), fix_system_urls(), fsuggest_post(), import_post(), item_expire(), item_post(), like_content(), message_content(), mood_init(), new_contact(), notifier_run(), photo_upload(), photos_post(), poller_run(), post_activity_item(), process_delivery(), profile_activity(), profile_photo_post(), profiles_post(), send_message(), settings_post(), tag_deliver(), tagger_content(), thing_init(), zid_init(), and zot_refresh().
@@ -1615,7 +1615,7 @@ Variables-@@ -2410,7 +2410,7 @@ VariablesReferenced by allowed_public_recips(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), filestorage_content(), follow_init(), format_css_if_exists(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), invite_content(), item_photo_menu(), item_store(), lastpost_content(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sync_directories(), tagger_content(), thing_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().
+Referenced by allowed_public_recips(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_css_if_exists(), format_filer(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), invite_content(), item_photo_menu(), item_store(), lastpost_content(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().
- const DB_UPDATE_VERSION 1077 +const DB_UPDATE_VERSION 1078 @@ -3178,7 +3178,7 @@ Variables-@@ -4463,7 +4463,7 @@ VariablesReferenced by encode_mail(), get_mail_elements(), and process_mail_delivery().
+Referenced by encode_mail(), get_mail_elements(), message_content(), and process_mail_delivery().
-@@ -4477,7 +4477,7 @@ VariablesReferenced by categories_widget(), channel_content(), decode_tags(), editpost_content(), encode_item_terms(), file_tag_file_query(), filerm_content(), item_post(), and prepare_body().
+Referenced by categories_widget(), channel_content(), decode_tags(), editpost_content(), encode_item_terms(), file_tag_file_query(), filerm_content(), format_categories(), and item_post().
-@@ -4680,7 +4680,7 @@ VariablesReferenced by decode_tags(), file_tag_file_query(), fileas_widget(), filer_content(), filerm_content(), item_expire(), items_fetch(), network_content(), and prepare_body().
+Referenced by decode_tags(), file_tag_file_query(), fileas_widget(), filer_content(), filerm_content(), format_filer(), item_expire(), items_fetch(), and network_content().
-diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index ed5124f5b..169568bbe 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ FunctionsReferenced by onedirsync_run(), poller_run(), and update_modtime().
+Referenced by import_xchan(), onedirsync_run(), poller_run(), and update_modtime().
-diff --git a/doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.html b/doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.html index 08f198664..1b2076720 100644 --- a/doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.html +++ b/doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.html @@ -106,6 +106,8 @@ $(document).ready(function(){initNavTree('dir_55dbaf9b7b53c4fc605c9011743a7353.h DirectoriesReferenced by account_verify_password(), acl_init(), add_fcontact(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), blocks_content(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), 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(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), crepair_post(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store(), events_content(), expand_groups(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), get_item_elements(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), layouts_content(), like_content(), load_config(), load_plugin(), load_xconfig(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifier_run(), notify_init(), oauth_get_client(), onepoll_run(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), rconnect_url(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), settings_post(), siteinfo_init(), sources_post(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), user_allow(), user_deny(), vcard_from_xchan(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().
+Referenced by account_verify_password(), acl_init(), add_fcontact(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), blocks_content(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), 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(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), crepair_post(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store(), events_content(), expand_groups(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), get_item_elements(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), layouts_content(), like_content(), load_config(), load_plugin(), load_xconfig(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), rconnect_url(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), settings_post(), siteinfo_init(), sources_post(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), user_allow(), user_deny(), vcard_from_xchan(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().
directory php + + directory schema diff --git a/doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.js b/doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.js index 53796edd8..b48a368d3 100644 --- a/doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.js +++ b/doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.js @@ -1,4 +1,5 @@ var dir_55dbaf9b7b53c4fc605c9011743a7353 = [ - [ "php", "dir_032dd9e2cfe278a2cfa5eb9547448eb9.html", "dir_032dd9e2cfe278a2cfa5eb9547448eb9" ] + [ "php", "dir_032dd9e2cfe278a2cfa5eb9547448eb9.html", "dir_032dd9e2cfe278a2cfa5eb9547448eb9" ], + [ "schema", "dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html", "dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb" ] ]; \ No newline at end of file diff --git a/doc/html/dir__fns_8php.html b/doc/html/dir__fns_8php.html index 47dddfeae..d940f08e3 100644 --- a/doc/html/dir__fns_8php.html +++ b/doc/html/dir__fns_8php.html @@ -114,6 +114,8 @@ $(document).ready(function(){initNavTree('dir__fns_8php.html','');}); Functions find_upstream_directory ($dirmode) + + dir_sort_links () sync_directories ($dirmode) @@ -122,6 +124,23 @@ Functions update_directory_entry ($ud) Function Documentation
+ ++++
++ +dir_sort_links +( +) ++ + ++Referenced by directory_aside().
+ +@@ -160,7 +160,7 @@ Variablesdiff --git a/doc/html/dir__fns_8php.js b/doc/html/dir__fns_8php.js index 9ffa8fd9b..906b34bd7 100644 --- a/doc/html/dir__fns_8php.js +++ b/doc/html/dir__fns_8php.js @@ -1,5 +1,6 @@ var dir__fns_8php = [ + [ "dir_sort_links", "dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774", null ], [ "find_upstream_directory", "dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d", null ], [ "sync_directories", "dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6", null ], [ "syncdirs", "dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a", null ], diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 0612ae8b4..aafba0347 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables-Referenced by activity_sanitise(), add_fcontact(), api_rss_extra(), array_sanitise(), attach_store(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connect_content(), connections_content(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), 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(), identity_basic_import(), ids_to_querystr(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), message_content(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), photos_post(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), prepare_body(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profile_tabs(), profiles_content(), register_post(), remove_community_tag(), photo_driver\save(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tagger_content(), tagrm_content(), tagrm_post(), thing_init(), validate_channelname(), wfinger_init(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().
+Referenced by activity_sanitise(), add_fcontact(), api_rss_extra(), array_sanitise(), attach_store(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connect_content(), connections_content(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), 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(), identity_basic_import(), ids_to_querystr(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), message_content(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), photos_post(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profile_tabs(), profiles_content(), register_post(), remove_community_tag(), photo_driver\save(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), thing_init(), validate_channelname(), wfinger_init(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().
-diff --git a/doc/html/files.html b/doc/html/files.html index 43d51f55f..c0c22cda7 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -352,10 +352,12 @@ $(document).ready(function(){initNavTree('files.html','');}); - - - - + + + + + +Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), chanlink_hash(), chanlink_url(), comanche_parser(), comanche_region(), comanche_webpage(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_ol(), diaspora_ul(), expand_acl(), fetch_url(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), message_content(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), post_url(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), search(), App\set_widget(), siteinfo_content(), smilies(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger(), webfinger_dfrn(), x(), z_fetch_url(), z_input_filter(), z_post_url(), zfinger_init(), and zid().
+Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), chanlink_hash(), chanlink_url(), comanche_parser(), comanche_region(), comanche_webpage(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_ol(), diaspora_ul(), expand_acl(), fetch_url(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_categories(), format_filer(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), message_content(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), post_url(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), search(), App\set_widget(), siteinfo_content(), smilies(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), theme_attachments(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger(), webfinger_dfrn(), x(), z_fetch_url(), z_input_filter(), z_post_url(), zfinger_init(), and zid().
diff --git a/doc/html/globals.html b/doc/html/globals.html index e2db6519d..c2e83ed6a 100644 --- a/doc/html/globals.html +++ b/doc/html/globals.html @@ -246,7 +246,7 @@ $(document).ready(function(){initNavTree('globals.html','');}); : extract.php boot.php
$schema -: style.php +: style.php $sectionleft : minimalisticdarkness.php diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html index dd09f7376..0d29620ee 100644 --- a/doc/html/globals_0x64.html +++ b/doc/html/globals_0x64.html @@ -228,6 +228,9 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');}); diaspora_ul() : bb2diaspora.php +dir_sort_links() +: dir_fns.php + dir_tagadelic() : taxonomy.php diff --git a/doc/html/globals_0x66.html b/doc/html/globals_0x66.html index 87118be5c..0cb5d6eb2 100644 --- a/doc/html/globals_0x66.html +++ b/doc/html/globals_0x66.html @@ -243,6 +243,9 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});foreach : typo.php +format_categories() +: text.php + format_css_if_exists() : plugin.php @@ -255,6 +258,9 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});format_event_html() : event.php +format_filer() +: text.php + format_js_if_exists() : plugin.php diff --git a/doc/html/globals_0x74.html b/doc/html/globals_0x74.html index 1bc9f9a88..df8fe975b 100644 --- a/doc/html/globals_0x74.html +++ b/doc/html/globals_0x74.html @@ -228,8 +228,11 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');});tgroup_check() : items.php +theme_attachments() +: text.php + theme_content() -: config.php +: config.php theme_include() : plugin.php diff --git a/doc/html/globals_func_0x64.html b/doc/html/globals_func_0x64.html index c73b57683..cb7a98fd7 100644 --- a/doc/html/globals_func_0x64.html +++ b/doc/html/globals_func_0x64.html @@ -221,6 +221,9 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');}); diaspora_ul() : bb2diaspora.php +dir_sort_links() +: dir_fns.php + dir_tagadelic() : taxonomy.php diff --git a/doc/html/globals_func_0x66.html b/doc/html/globals_func_0x66.html index 9d3d0d3a0..e99245f92 100644 --- a/doc/html/globals_func_0x66.html +++ b/doc/html/globals_func_0x66.html @@ -239,6 +239,9 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});follow_widget() : contact_widgets.php +format_categories() +: text.php + format_css_if_exists() : plugin.php @@ -251,6 +254,9 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});format_event_html() : event.php +format_filer() +: text.php + format_js_if_exists() : plugin.php diff --git a/doc/html/globals_func_0x74.html b/doc/html/globals_func_0x74.html index 9d54a82c0..efc157b7f 100644 --- a/doc/html/globals_func_0x74.html +++ b/doc/html/globals_func_0x74.html @@ -185,14 +185,17 @@ $(document).ready(function(){initNavTree('globals_func_0x74.html','');});tgroup_check() : items.php +theme_attachments() +: text.php + theme_content() -: config.php +: config.php theme_include() : plugin.php theme_post() -: config.php +: config.php theme_status() : admin.php diff --git a/doc/html/globals_vars.html b/doc/html/globals_vars.html index 2b98986c4..6a77980f5 100644 --- a/doc/html/globals_vars.html +++ b/doc/html/globals_vars.html @@ -241,7 +241,7 @@ $(document).ready(function(){initNavTree('globals_vars.html','');}); : extract.php $schema -: style.php +: style.php $sectionleft : minimalisticdarkness.php diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 25ee3237c..483ae4f36 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -256,7 +256,7 @@ Functions -diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 87d4cbc0b..cb79e4ef6 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -280,7 +280,7 @@ FunctionsReferenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), smilies(), unobscure(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().
+Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), find_upstream_directory(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), smilies(), unobscure(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().
-diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 1dd29b54c..2572485c2 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -39,10 +39,10 @@ var NAVTREEINDEX = "boot_8php.html#a9255af5ae9c887520091ea04763c1a88", "classFKOAuthDataStore.html", "crepair_8php.html#a29464c01838e209c8059cfcd2d195caa", -"globals_vars_0x77.html", -"items_8php.html#aa371905f0a211b307cb3f7188c6cba04", -"profile__photo_8php.html", -"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186" +"globals_vars_0x73.html", +"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf", +"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5", +"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index e61d7f71d..368092b86 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -15,6 +15,7 @@ var NAVTREEINDEX3 = "crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85":[5,0,0,23,6], "crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914":[5,0,0,23,3], "crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec":[5,0,0,23,5], +"dark_8php.html":[5,0,3,1,1,1,0], "darkness_8php.html":[5,0,3,1,0,1,0], "darknessleftaside_8php.html":[5,0,3,1,0,1,1], "darknessrightaside_8php.html":[5,0,3,1,0,1,2], @@ -53,14 +54,16 @@ var NAVTREEINDEX3 = "dir_0eaa4a0adae8ba4811e133c6e594aeee.html":[5,0,2,0], "dir_21bc5169ff11430004758be31dcfc6c4.html":[5,0,0,0], "dir_23ec12649285f9fabf3a6b7380226c28.html":[5,0,2], +"dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html":[5,0,3,1,1,1], "dir_55dbaf9b7b53c4fc605c9011743a7353.html":[5,0,3,1,1], "dir_817f6d302394b98e59575acdb59998bc.html":[5,0,3,0], "dir_8543001e5d25368a6edede3e63efb554.html":[5,0,3,1], "dir__fns_8php.html":[5,0,0,26], -"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[5,0,0,26,3], -"dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a":[5,0,0,26,2], -"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[5,0,0,26,0], -"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[5,0,0,26,1], +"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[5,0,0,26,4], +"dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a":[5,0,0,26,3], +"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[5,0,0,26,1], +"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[5,0,0,26,2], +"dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[5,0,0,26,0], "dir_aae29906d7bfc07d076125f669c8352e.html":[5,0,0,1], "dir_b2f003339c516cc00c8cadcafbe82f13.html":[5,0,3], "dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html":[5,0,3,1,0,0], @@ -230,8 +233,8 @@ var NAVTREEINDEX3 = "globals_func_0x77.html":[5,1,1,23], "globals_func_0x78.html":[5,1,1,24], "globals_func_0x7a.html":[5,1,1,25], -"globals_vars.html":[5,1,2], "globals_vars.html":[5,1,2,0], +"globals_vars.html":[5,1,2], "globals_vars_0x61.html":[5,1,2,1], "globals_vars_0x63.html":[5,1,2,2], "globals_vars_0x64.html":[5,1,2,3], @@ -246,8 +249,5 @@ var NAVTREEINDEX3 = "globals_vars_0x6d.html":[5,1,2,12], "globals_vars_0x6e.html":[5,1,2,13], "globals_vars_0x70.html":[5,1,2,14], -"globals_vars_0x72.html":[5,1,2,15], -"globals_vars_0x73.html":[5,1,2,16], -"globals_vars_0x74.html":[5,1,2,17], -"globals_vars_0x75.html":[5,1,2,18] +"globals_vars_0x72.html":[5,1,2,15] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 1e08e12d6..f47432492 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,8 @@ var NAVTREEINDEX4 = { +"globals_vars_0x73.html":[5,1,2,16], +"globals_vars_0x74.html":[5,1,2,17], +"globals_vars_0x75.html":[5,1,2,18], "globals_vars_0x77.html":[5,1,2,19], "globals_vars_0x78.html":[5,1,2,20], "globals_vars_0x7a.html":[5,1,2,21], @@ -246,8 +249,5 @@ var NAVTREEINDEX4 = "items_8php.html#a8395d189a36abfa0dfff81a2b0e70669":[5,0,0,41,14], "items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,41,11], "items_8php.html#a87ac9e359591721a824ecd23bbb56296":[5,0,0,41,5], -"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,41,52], -"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,41,27], -"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[5,0,0,41,10], -"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[5,0,0,41,31] +"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,41,52] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index a1447bd4d..46b3a0d32 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,8 @@ var NAVTREEINDEX5 = { +"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,41,27], +"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[5,0,0,41,10], +"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[5,0,0,41,31], "items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,41,53], "items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[5,0,0,41,9], "items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[5,0,0,41,22], @@ -126,10 +129,10 @@ var NAVTREEINDEX5 = "namespacemembers_func.html":[3,1,1], "namespacemembers_vars.html":[3,1,2], "namespaces.html":[3,0], -"namespaceupdatetpl.html":[3,0,3], "namespaceupdatetpl.html":[4,0,3], -"namespaceutil.html":[3,0,4], +"namespaceupdatetpl.html":[3,0,3], "namespaceutil.html":[4,0,4], +"namespaceutil.html":[3,0,4], "nav_8php.html":[5,0,0,45], "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,45,0], "nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,45,1], @@ -246,8 +249,5 @@ var NAVTREEINDEX5 = "probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,74,0], "profile_8php.html":[5,0,1,75], "profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e":[5,0,1,75,0], -"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,75,1], -"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,75,2], -"profile__advanced_8php.html":[5,0,0,58], -"profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,58,0] +"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,75,1] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 77b693da2..8ddbd79d7 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,5 +1,8 @@ var NAVTREEINDEX6 = { +"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,75,2], +"profile__advanced_8php.html":[5,0,0,58], +"profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,58,0], "profile__photo_8php.html":[5,0,1,76], "profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,76,1], "profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,76,2], @@ -36,10 +39,10 @@ var NAVTREEINDEX6 = "redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c":[5,0,3,1,1,0,1,0], "redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351":[5,0,3,1,1,0,1,7], "redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b":[5,0,3,1,1,0,1,2], +"redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee":[5,0,3,1,1,0,1,8], "redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a":[5,0,3,1,1,0,1,11], "redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649":[5,0,3,1,1,0,1,6], "redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a":[5,0,3,1,1,0,1,9], -"redbasic_2php_2style_8php.html#ae1359c972b337e4bbc2bf2aece6e58db":[5,0,3,1,1,0,1,8], "redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc":[5,0,3,1,1,0,1,3], "redbasic_2php_2theme_8php.html":[5,0,3,1,1,0,2], "redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[5,0,3,1,1,0,2,0], @@ -171,83 +174,80 @@ var NAVTREEINDEX6 = "template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,68,1], "template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[5,0,0,68,2], "text_8php.html":[5,0,0,69], -"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[5,0,0,69,37], -"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,69,43], -"text_8php.html#a05b7f26dc2df78681f57eeade53040c6":[5,0,0,69,26], +"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[5,0,0,69,39], +"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,69,45], +"text_8php.html#a05b7f26dc2df78681f57eeade53040c6":[5,0,0,69,28], "text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,69,6], "text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,69,16], "text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,69,11], -"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,69,42], +"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,69,44], "text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,69,5], -"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,69,74], -"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,69,30], -"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,69,33], -"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,69,47], -"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,69,50], -"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,69,44], -"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,69,45], -"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,69,40], +"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,69,77], +"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,69,32], +"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,69,35], +"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,69,49], +"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,69,52], +"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,69,46], +"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,69,47], +"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,69,42], "text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,69,4], -"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,69,82], -"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,69,71], -"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,69,46], +"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,69,85], +"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,69,74], +"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,69,48], "text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,69,10], -"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,69,84], -"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,69,79], -"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,69,77], -"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,69,28], -"text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[5,0,0,69,39], -"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,69,69], +"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,69,87], +"text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,69,23], +"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,69,82], +"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,69,80], +"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,69,30], +"text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[5,0,0,69,41], +"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,69,71], "text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,69,7], -"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,69,80], -"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,69,31], -"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,69,68], -"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,69,29], -"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,69,41], -"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,69,59], -"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,69,48], -"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,69,58], -"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,69,76], +"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,69,83], +"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,69,33], +"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,69,70], +"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,69,31], +"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,69,43], +"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,69,61], +"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,69,50], +"text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[5,0,0,69,24], +"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,69,60], +"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,69,79], "text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,69,9], "text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,69,14], -"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,69,75], -"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,69,38], -"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,69,25], -"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,69,72], +"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,69,78], +"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,69,40], +"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,69,27], +"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,69,75], "text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,69,1], -"text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[5,0,0,69,32], -"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,69,24], -"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,69,73], +"text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[5,0,0,69,34], +"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,69,26], +"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,69,76], "text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,69,8], -"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,69,66], -"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,69,70], +"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,69,68], +"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,69,72], "text_8php.html#a87a3cefc603302c78982f1d8e1245265":[5,0,0,69,15], "text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,69,20], -"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,69,57], +"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,69,59], "text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,69,19], "text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,69,3], -"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,69,52], -"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,69,63], -"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,69,61], -"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,69,65], -"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,69,27], +"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,69,54], +"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,69,65], +"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,69,63], +"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,69,67], +"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,69,29], "text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,69,17], -"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,69,53], -"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,69,34], -"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,69,83], -"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,69,78], -"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,69,81], -"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,69,54], -"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,69,35], -"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,69,67], +"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,69,55], +"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,69,36], +"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,69,86], +"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,69,81], +"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,69,84], +"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,69,56], +"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,69,37], +"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,69,69], "text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,69,21], "text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,69,2], "text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,69,13], -"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,69,62], -"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,69,49], -"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,69,36], -"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,69,64], -"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,69,18], -"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,69,55], -"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,69,23] +"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,69,64], +"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,69,51] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 2ac7d6128..96849b7a2 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,11 +1,17 @@ var NAVTREEINDEX7 = { +"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,69,38], +"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,69,66], +"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,69,18], +"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,69,57], +"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,69,25], "text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,69,0], -"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,69,60], +"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,69,73], +"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,69,62], "text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,69,22], "text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,69,12], -"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,69,56], -"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,69,51], +"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,69,58], +"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,69,53], "theme_2apw_2schema_2default_8php.html":[5,0,3,1,0,1,3], "theme__init_8php.html":[5,0,3,0,6], "thing_8php.html":[5,0,1,102], diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 37c45ace6..eb30844ae 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -282,7 +282,7 @@ FunctionsReferenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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_post(), advanced_profile(), allfriends_content(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), apps_content(), apw_form(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_store(), authenticate_success(), bb_ShareAttributes(), bbcode(), blocks_content(), categories_widget(), channel_content(), channel_init(), chanview_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(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connect_content(), connect_init(), connect_post(), connections_content(), connections_post(), construct_page(), contact_block(), contact_poll_interval(), contact_reputation(), conversation(), create_account(), create_identity(), crepair_content(), crepair_post(), datesel_format(), day_translate(), delegate_content(), design_tools(), dir_tagblock(), directory_content(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), fix_attached_photo_permissions(), follow_init(), follow_widget(), format_event_diaspora(), format_event_html(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), Item\get_template_data(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), identity_check_service_class(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), intro_content(), intro_post(), invite_content(), invite_post(), item_check_service_class(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), lastpost_content(), lastpost_init(), layout_select(), layouts_content(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), message_aside(), message_content(), message_post(), 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(), nogroup_content(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), page_content(), paginate(), pdl_selector(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), populate_acl(), post_activity_item(), post_init(), posted_date_widget(), prepare_body(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeme_content(), rmagic_content(), saved_searches(), scale_external_images(), search(), search_content(), search_saved_searches(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_aside(), settings_post(), setup_content(), sexpref_selector(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), thing_content(), thing_init(), timezone_cmp(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_deny(), validate_channelname(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), vote_content(), wall_upload_post(), webpages_content(), what_next(), writepages_widget(), xchan_content(), z_readdir(), and zfinger_init().
+Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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_post(), advanced_profile(), allfriends_content(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), apps_content(), apw_form(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_store(), authenticate_success(), bb_ShareAttributes(), bbcode(), blocks_content(), categories_widget(), channel_content(), channel_init(), chanview_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(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connect_content(), connect_init(), connect_post(), connections_content(), connections_post(), construct_page(), contact_block(), contact_poll_interval(), contact_reputation(), conversation(), create_account(), create_identity(), crepair_content(), crepair_post(), datesel_format(), day_translate(), delegate_content(), design_tools(), dir_sort_links(), dir_tagblock(), directory_content(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), fix_attached_photo_permissions(), follow_init(), follow_widget(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), Item\get_template_data(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), identity_check_service_class(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), intro_content(), intro_post(), invite_content(), invite_post(), item_check_service_class(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), lastpost_content(), lastpost_init(), layout_select(), layouts_content(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), message_aside(), message_content(), message_post(), 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(), nogroup_content(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), page_content(), paginate(), pdl_selector(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), populate_acl(), post_activity_item(), post_init(), posted_date_widget(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeme_content(), rmagic_content(), saved_searches(), scale_external_images(), search(), search_content(), search_saved_searches(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_aside(), settings_post(), setup_content(), sexpref_selector(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), thing_content(), thing_init(), timezone_cmp(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_deny(), validate_channelname(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), vote_content(), wall_upload_post(), webpages_content(), what_next(), writepages_widget(), xchan_content(), z_readdir(), and zfinger_init().
-diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html index 2e20c91d1..0d9531f78 100644 --- a/doc/html/redbasic_2php_2style_8php.html +++ b/doc/html/redbasic_2php_2style_8php.html @@ -118,9 +118,8 @@ VariablesReferenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), allfriends_content(), alt_pager(), api_apply_template(), api_content(), apps_content(), apw_form(), blocks_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), design_tools(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), follow_widget(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), intro_content(), invite_content(), lang_selector(), lastpost_content(), layouts_content(), login(), lostpass_content(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), saved_searches(), search_content(), settings_aside(), setup_content(), siteinfo_content(), sources_content(), suggest_content(), thing_content(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), writepages_widget(), and xrd_init().
+Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), allfriends_content(), alt_pager(), api_apply_template(), api_content(), apps_content(), apw_form(), blocks_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), design_tools(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), follow_widget(), format_categories(), format_filer(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), intro_content(), invite_content(), lang_selector(), lastpost_content(), layouts_content(), login(), lostpass_content(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), saved_searches(), search_content(), settings_aside(), setup_content(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), writepages_widget(), and xrd_init().
$nav_colour = get_pconfig($uid, "redbasic", "nav_colour") - - if($nav_colour=="red") if($nav_colour=="black")
-if($nav_colour=="silver")$schema = get_pconfig($uid,'redbasic','schema') + + $schema = get_pconfig($uid,'redbasic','schema') $bgcolour = get_pconfig($uid, "redbasic", "background_colour") @@ -251,12 +250,12 @@ if($nav_colour=="silver") $background_image = get_pconfig($uid, "redbasic", "background_image") +
- if ($nav_colour=="red") if ($nav_colour=="black") if ($nav_colour=="silver") $schema = get_pconfig($uid,'redbasic','schema') +$schema = get_pconfig($uid,'redbasic','schema') diff --git a/doc/html/redbasic_2php_2style_8php.js b/doc/html/redbasic_2php_2style_8php.js index 73f723574..15ca28822 100644 --- a/doc/html/redbasic_2php_2style_8php.js +++ b/doc/html/redbasic_2php_2style_8php.js @@ -8,7 +8,7 @@ var redbasic_2php_2style_8php = [ "$item_opacity", "redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8", null ], [ "$nav_colour", "redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649", null ], [ "$radius", "redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351", null ], - [ "$schema", "redbasic_2php_2style_8php.html#ae1359c972b337e4bbc2bf2aece6e58db", null ], + [ "$schema", "redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee", null ], [ "$shadow", "redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a", null ], [ "$uid", "redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a", null ], [ "if", "redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a", null ] diff --git a/doc/html/search/all_24.js b/doc/html/search/all_24.js index d72b14692..b23cf75d0 100644 --- a/doc/html/search/all_24.js +++ b/doc/html/search/all_24.js @@ -102,7 +102,7 @@ var searchData= ['_24replace',['$replace',['../classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10',1,'Template']]], ['_24res',['$res',['../docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5',1,'docblox_errorchecker.php']]], ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]], - ['_24schema',['$schema',['../redbasic_2php_2style_8php.html#ae1359c972b337e4bbc2bf2aece6e58db',1,'style.php']]], + ['_24schema',['$schema',['../redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee',1,'style.php']]], ['_24scheme',['$scheme',['../classApp.html#ad082d63acc078e5bf23825a03bdd6a76',1,'App']]], ['_24search',['$search',['../classTemplate.html#a317d535946dc065c35dd5cd38380e6c6',1,'Template']]], ['_24sectionleft',['$sectionleft',['../minimalisticdarkness_8php.html#a0ac3f5b52212b0af87d513273da03ead',1,'minimalisticdarkness.php']]], diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js index ab4dbd7b2..c81ee7b8d 100644 --- a/doc/html/search/all_64.js +++ b/doc/html/search/all_64.js @@ -1,5 +1,6 @@ var searchData= [ + ['dark_2ephp',['dark.php',['../dark_8php.html',1,'']]], ['darkness_2ephp',['darkness.php',['../darkness_8php.html',1,'']]], ['darknessleftaside_2ephp',['darknessleftaside.php',['../darknessleftaside_8php.html',1,'']]], ['darknessrightaside_2ephp',['darknessrightaside.php',['../darknessrightaside_8php.html',1,'']]], @@ -47,10 +48,11 @@ var searchData= ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]], ['diaspora_5ful',['diaspora_ul',['../bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc',1,'bb2diaspora.php']]], ['dir_5ffns_2ephp',['dir_fns.php',['../dir__fns_8php.html',1,'']]], + ['dir_5fsort_5flinks',['dir_sort_links',['../dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774',1,'dir_fns.php']]], ['dir_5ftagadelic',['dir_tagadelic',['../taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332',1,'taxonomy.php']]], ['dir_5ftagblock',['dir_tagblock',['../taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1',1,'taxonomy.php']]], - ['directory_2ephp',['directory.php',['../mod_2directory_8php.html',1,'']]], ['directory_2ephp',['directory.php',['../include_2directory_8php.html',1,'']]], + ['directory_2ephp',['directory.php',['../mod_2directory_8php.html',1,'']]], ['directory_5faside',['directory_aside',['../mod_2directory_8php.html#aa1d928543212871491706216742dd73c',1,'directory.php']]], ['directory_5fcontent',['directory_content',['../mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44',1,'directory.php']]], ['directory_5ffallback_5fmaster',['DIRECTORY_FALLBACK_MASTER',['../boot_8php.html#abedd940e664017c61b48c6efa31d0cb8',1,'boot.php']]], diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js index 8ba44eea7..1937023b2 100644 --- a/doc/html/search/all_66.js +++ b/doc/html/search/all_66.js @@ -49,10 +49,12 @@ var searchData= ['follow_5finit',['follow_init',['../mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a',1,'follow.php']]], ['follow_5fwidget',['follow_widget',['../contact__widgets_8php.html#af24e693532a045954caab515942cfc6f',1,'contact_widgets.php']]], ['foreach',['foreach',['../typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5',1,'typo.php']]], + ['format_5fcategories',['format_categories',['../text_8php.html#a3054189cff173977f4216c9a3dd29e1b',1,'text.php']]], ['format_5fcss_5fif_5fexists',['format_css_if_exists',['../plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6',1,'plugin.php']]], ['format_5fevent_5fbbcode',['format_event_bbcode',['../event_8php.html#abb74206cf42d694307c3d7abb7af9869',1,'event.php']]], ['format_5fevent_5fdiaspora',['format_event_diaspora',['../bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863',1,'bb2diaspora.php']]], ['format_5fevent_5fhtml',['format_event_html',['../event_8php.html#a2ac9f1b08de03250ecd794f705781d17',1,'event.php']]], + ['format_5ffiler',['format_filer',['../text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91',1,'text.php']]], ['format_5fjs_5fif_5fexists',['format_js_if_exists',['../plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f',1,'plugin.php']]], ['format_5flike',['format_like',['../conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3',1,'conversation.php']]], ['format_5flocation',['format_location',['../conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3',1,'conversation.php']]], diff --git a/doc/html/search/all_74.js b/doc/html/search/all_74.js index ad92607ec..3c25fd0c2 100644 --- a/doc/html/search/all_74.js +++ b/doc/html/search/all_74.js @@ -37,6 +37,7 @@ var searchData= ['tgroup_5fcheck',['tgroup_check',['../items_8php.html#a88c6cf7649ac836fbbed82a7a0315110',1,'items.php']]], ['theme_2ephp',['theme.php',['../apw_2php_2theme_8php.html',1,'']]], ['theme_2ephp',['theme.php',['../redbasic_2php_2theme_8php.html',1,'']]], + ['theme_5fattachments',['theme_attachments',['../text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53',1,'text.php']]], ['theme_5fcontent',['theme_content',['../view_2theme_2apw_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php']]], ['theme_5finclude',['theme_include',['../plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2',1,'plugin.php']]], ['theme_5finit_2ephp',['theme_init.php',['../theme__init_8php.html',1,'']]], diff --git a/doc/html/search/files_64.js b/doc/html/search/files_64.js index 2e33480fd..4145691dc 100644 --- a/doc/html/search/files_64.js +++ b/doc/html/search/files_64.js @@ -1,5 +1,6 @@ var searchData= [ + ['dark_2ephp',['dark.php',['../dark_8php.html',1,'']]], ['darkness_2ephp',['darkness.php',['../darkness_8php.html',1,'']]], ['darknessleftaside_2ephp',['darknessleftaside.php',['../darknessleftaside_8php.html',1,'']]], ['darknessrightaside_2ephp',['darknessrightaside.php',['../darknessrightaside_8php.html',1,'']]], diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js index 82623fe6f..18a462b18 100644 --- a/doc/html/search/functions_64.js +++ b/doc/html/search/functions_64.js @@ -29,6 +29,7 @@ var searchData= ['diaspora2bb',['diaspora2bb',['../bb2diaspora_8php.html#a26c09c218413610e62e60754c579f6c6',1,'bb2diaspora.php']]], ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]], ['diaspora_5ful',['diaspora_ul',['../bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc',1,'bb2diaspora.php']]], + ['dir_5fsort_5flinks',['dir_sort_links',['../dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774',1,'dir_fns.php']]], ['dir_5ftagadelic',['dir_tagadelic',['../taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332',1,'taxonomy.php']]], ['dir_5ftagblock',['dir_tagblock',['../taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1',1,'taxonomy.php']]], ['directory_5faside',['directory_aside',['../mod_2directory_8php.html#aa1d928543212871491706216742dd73c',1,'directory.php']]], diff --git a/doc/html/search/functions_66.js b/doc/html/search/functions_66.js index 0f35442fc..f45e2a64f 100644 --- a/doc/html/search/functions_66.js +++ b/doc/html/search/functions_66.js @@ -34,10 +34,12 @@ var searchData= ['follow_5fcontent',['follow_content',['../mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592',1,'follow.php']]], ['follow_5finit',['follow_init',['../mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a',1,'follow.php']]], ['follow_5fwidget',['follow_widget',['../contact__widgets_8php.html#af24e693532a045954caab515942cfc6f',1,'contact_widgets.php']]], + ['format_5fcategories',['format_categories',['../text_8php.html#a3054189cff173977f4216c9a3dd29e1b',1,'text.php']]], ['format_5fcss_5fif_5fexists',['format_css_if_exists',['../plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6',1,'plugin.php']]], ['format_5fevent_5fbbcode',['format_event_bbcode',['../event_8php.html#abb74206cf42d694307c3d7abb7af9869',1,'event.php']]], ['format_5fevent_5fdiaspora',['format_event_diaspora',['../bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863',1,'bb2diaspora.php']]], ['format_5fevent_5fhtml',['format_event_html',['../event_8php.html#a2ac9f1b08de03250ecd794f705781d17',1,'event.php']]], + ['format_5ffiler',['format_filer',['../text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91',1,'text.php']]], ['format_5fjs_5fif_5fexists',['format_js_if_exists',['../plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f',1,'plugin.php']]], ['format_5flike',['format_like',['../conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3',1,'conversation.php']]], ['format_5flocation',['format_location',['../conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3',1,'conversation.php']]], diff --git a/doc/html/search/functions_74.js b/doc/html/search/functions_74.js index b5303e39a..dba912e89 100644 --- a/doc/html/search/functions_74.js +++ b/doc/html/search/functions_74.js @@ -15,6 +15,7 @@ var searchData= ['terminate_5ffriendship',['terminate_friendship',['../Contact_8php.html#a38daa1c210b78385307123450ca9a1fc',1,'Contact.php']]], ['termtype',['termtype',['../items_8php.html#ad34827ed330898456783fb14c7b46154',1,'items.php']]], ['tgroup_5fcheck',['tgroup_check',['../items_8php.html#a88c6cf7649ac836fbbed82a7a0315110',1,'items.php']]], + ['theme_5fattachments',['theme_attachments',['../text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53',1,'text.php']]], ['theme_5fcontent',['theme_content',['../view_2theme_2apw_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php']]], ['theme_5finclude',['theme_include',['../plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2',1,'plugin.php']]], ['theme_5fpost',['theme_post',['../view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php']]], diff --git a/doc/html/search/variables_24.js b/doc/html/search/variables_24.js index d72b14692..b23cf75d0 100644 --- a/doc/html/search/variables_24.js +++ b/doc/html/search/variables_24.js @@ -102,7 +102,7 @@ var searchData= ['_24replace',['$replace',['../classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10',1,'Template']]], ['_24res',['$res',['../docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5',1,'docblox_errorchecker.php']]], ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]], - ['_24schema',['$schema',['../redbasic_2php_2style_8php.html#ae1359c972b337e4bbc2bf2aece6e58db',1,'style.php']]], + ['_24schema',['$schema',['../redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee',1,'style.php']]], ['_24scheme',['$scheme',['../classApp.html#ad082d63acc078e5bf23825a03bdd6a76',1,'App']]], ['_24search',['$search',['../classTemplate.html#a317d535946dc065c35dd5cd38380e6c6',1,'Template']]], ['_24sectionleft',['$sectionleft',['../minimalisticdarkness_8php.html#a0ac3f5b52212b0af87d513273da03ead',1,'minimalisticdarkness.php']]], diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html index f673ce1f2..1113fe9a1 100644 --- a/doc/html/security_8php.html +++ b/doc/html/security_8php.html @@ -198,7 +198,7 @@ Functions-diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html index ab57db795..ecfdd110b 100644 --- a/doc/html/taxonomy_8php.html +++ b/doc/html/taxonomy_8php.html @@ -296,7 +296,7 @@ FunctionsReferenced by api_user(), authenticate_success(), import_post(), manage_content(), and new_channel_post().
+Referenced by api_user(), authenticate_success(), import_post(), FKOAuth1\loginUser(), manage_content(), and new_channel_post().
-diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 97bce5ecf..d49fa1614 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -199,6 +199,12 @@ FunctionsReferenced by conversation(), editpost_content(), item_expire(), item_getfeedtags(), prepare_body(), tag_deliver(), and tgroup_check().
+Referenced by conversation(), editpost_content(), format_categories(), format_filer(), item_expire(), item_getfeedtags(), tag_deliver(), and tgroup_check().
unobscure (&$item) + + theme_attachments (&$item) + + format_categories (&$item, $writeable) + + format_filer (&$item) prepare_body (&$item, $attach=false) @@ -778,6 +784,52 @@ Variables prepare_text ($text, $content_type= 'text/bbcode') Referenced by item_post(), message_post(), and profiles_post().
+ + + +++ +++
++ +format_categories +( +& +$item, ++ ++ + + $writeable ++ ++ ) ++ + ++Referenced by prepare_body().
+ ++@@ -1084,7 +1136,7 @@ Variables++
++ +format_filer +( +& +$item ) ++ + +Referenced by prepare_body().
+-@@ -1710,7 +1762,7 @@ VariablesReferenced by editpost_content(), encode_item(), encode_mail(), localize_item(), message_content(), prepare_body(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), remove_community_tag(), tag_deliver(), and unobscure().
+Referenced by editpost_content(), encode_item(), encode_mail(), localize_item(), message_content(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), remove_community_tag(), tag_deliver(), theme_attachments(), and unobscure().
-
- Returns
- string substituted string
Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), allfriends_content(), alt_pager(), api_apply_template(), api_content(), apps_content(), apw_form(), blocks_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), design_tools(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), follow_widget(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), intro_content(), invite_content(), lang_selector(), lastpost_content(), layouts_content(), login(), lostpass_content(), lostpass_post(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), saved_searches(), search_content(), send_reg_approval_email(), send_verification_email(), settings_aside(), setup_content(), setup_post(), siteinfo_content(), sources_content(), suggest_content(), thing_content(), user_allow(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), writepages_widget(), and xrd_init().
+Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), allfriends_content(), alt_pager(), api_apply_template(), api_content(), apps_content(), apw_form(), blocks_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), design_tools(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), follow_widget(), format_categories(), format_filer(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), intro_content(), invite_content(), lang_selector(), lastpost_content(), layouts_content(), login(), lostpass_content(), lostpass_post(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), saved_searches(), search_content(), send_reg_approval_email(), send_verification_email(), settings_aside(), setup_content(), setup_post(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), user_allow(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), writepages_widget(), and xrd_init().
@@ -1878,6 +1930,24 @@ VariablesReferenced by expand_groups(), identity_basic_export(), lockview_content(), notifier_run(), tagadelic(), and zot_import().
+ + + ++diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js index b1c7b9c4a..830f4192c 100644 --- a/doc/html/text_8php.js +++ b/doc/html/text_8php.js @@ -23,6 +23,8 @@ var text_8php = [ "feed_salmonlinks", "text_8php.html#a89929fa6f70a8ba54d5273fcf622b665", null ], [ "find_xchan_in_array", "text_8php.html#ace3c98538c63e09b70a363210b414112", null ], [ "fix_mce_lf", "text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28", null ], + [ "format_categories", "text_8php.html#a3054189cff173977f4216c9a3dd29e1b", null ], + [ "format_filer", "text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91", null ], [ "generate_user_guid", "text_8php.html#ae4f6881d7e13623f8eded6277595112a", null ], [ "get_mentions", "text_8php.html#a76d1b3435c067978d7b484c45f56472b", null ], [ "get_mood_verbs", "text_8php.html#a736db13a966b8abaf8c9198faa35911a", null ], @@ -71,6 +73,7 @@ var text_8php = [ "smile_encode", "text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6", null ], [ "smilies", "text_8php.html#a3d225b253bb9e0f2498c11647d927b0b", null ], [ "stringify_array_elms", "text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13", null ], + [ "theme_attachments", "text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53", null ], [ "unamp", "text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7", null ], [ "undo_post_tagging", "text_8php.html#a740ad03e00459039a2c0992246c4e727", null ], [ "unobscure", "text_8php.html#a8264348059abd1d4d5bb521323d3b19a", null ], diff --git a/doc/html/view_8php.html b/doc/html/view_8php.html index b4498a4f9..08a8b7479 100644 --- a/doc/html/view_8php.html +++ b/doc/html/view_8php.html @@ -129,7 +129,7 @@ Functions++
++ +theme_attachments +( +& +$item ) ++ + +Referenced by prepare_body().
+-From 3772682204544e733baf910e6dfe35c0fe99e0e2 Mon Sep 17 00:00:00 2001 From: friendicaload view/theme/$current_theme/style.php with friendica contex
+load view/theme/$current_theme/style.php with Red context
Date: Fri, 18 Oct 2013 14:25:55 -0700 Subject: [PATCH 37/43] Put a status editor on the display page if you're logged in. This fixes issue #113 and also provides the ability to reshare from that page. --- doc/html/dark_8php.html | 112 ++++++ .../dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html | 112 ++++++ .../dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js | 4 + include/conversation.php | 2 +- mod/display.php | 23 ++ util/messages.po | 343 ++++++++++-------- version.inc | 2 +- 7 files changed, 444 insertions(+), 154 deletions(-) create mode 100644 doc/html/dark_8php.html create mode 100644 doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html create mode 100644 doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js diff --git a/doc/html/dark_8php.html b/doc/html/dark_8php.html new file mode 100644 index 000000000..4499c7c2f --- /dev/null +++ b/doc/html/dark_8php.html @@ -0,0 +1,112 @@ + + + + + + + The Red Matrix: view/theme/redbasic/schema/dark.php File Reference + + + + + + + + + + + + + +++ + +++ + + + + ++ +
++ + ++ + +The Red Matrix +++ + + + ++ diff --git a/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html new file mode 100644 index 000000000..12217cad9 --- /dev/null +++ b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html @@ -0,0 +1,112 @@ + + + + + + ++ ++ +++++dark.php File Reference++The Red Matrix: view/theme/redbasic/schema Directory Reference + + + + + + + + + + + + + +++ + + + diff --git a/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js new file mode 100644 index 000000000..7889bb4f4 --- /dev/null +++ b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js @@ -0,0 +1,4 @@ +var dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb = +[ + [ "dark.php", "dark_8php.html", null ] +]; \ No newline at end of file diff --git a/include/conversation.php b/include/conversation.php index 1820a8568..f9568c23f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1076,7 +1076,7 @@ function status_editor($a,$x,$popup=false) { call_hooks('jot_networks', $jotnets); $o .= replace_macros($tpl,array( - '$return_path' => $a->query_string, + '$return_path' => ((x($x,'return_path')) ? $x['return_path'] : $a->query_string), '$action' => $a->get_baseurl(true) . '/item', '$share' => (x($x,'button') ? $x['button'] : t('Share')), '$webpage' => $webpage, diff --git a/mod/display.php b/mod/display.php index 41df5fca6..99cbd6f0e 100644 --- a/mod/display.php +++ b/mod/display.php @@ -35,6 +35,29 @@ function display_content(&$a, $update = 0, $load = false) { $observer_is_owner = false; + + if(local_user() && (! $update)) { + + $channel = $a->get_channel(); + + $x = array( + 'is_owner' => true, + 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), + 'default_location' => $channel['channel_location'], + 'nickname' => $channel['channel_address'], + 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + + 'acl' => populate_acl($channel, false), + 'bang' => '', + 'visitor' => 'block', + 'profile_uid' => local_user(), + 'return_path' => '/channel/' . $channel['channel_address'] + ); + + $o .= status_editor($a,$x); + + } + // This page can be viewed by anybody so the query could be complicated // First we'll see if there is a copy of the item which is owned by us - if we're logged in locally. // If that fails (or we aren't logged in locally), diff --git a/util/messages.po b/util/messages.po index c6acd1d7e..5e94d95d1 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-10-11.463\n" +"Project-Id-Version: 2013-10-18.470\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-11 00:02-0700\n" +"POT-Creation-Date: 2013-10-18 00:02-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME++ + + + ++ +
++ + ++ + +The Red Matrix ++\n" "Language-Team: LANGUAGE \n" @@ -53,7 +53,7 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/api.php:970 +#: ../../include/api.php:972 msgid "Public Timeline" msgstr "" @@ -341,7 +341,7 @@ msgstr "" #: ../../include/ItemObject.php:244 ../../include/conversation.php:704 #: ../../include/conversation.php:1104 ../../mod/photos.php:1073 -#: ../../mod/message.php:303 ../../mod/message.php:466 +#: ../../mod/message.php:321 ../../mod/message.php:498 #: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:128 #: ../../mod/editpost.php:103 ../../mod/editblock.php:123 msgid "Please wait" @@ -380,8 +380,8 @@ msgstr "" #: ../../mod/admin.php:1096 ../../mod/group.php:87 ../../mod/photos.php:693 #: ../../mod/photos.php:787 ../../mod/photos.php:1052 #: ../../mod/photos.php:1092 ../../mod/photos.php:1178 -#: ../../mod/message.php:304 ../../mod/message.php:465 -#: ../../mod/connections.php:428 ../../mod/profiles.php:529 +#: ../../mod/message.php:322 ../../mod/message.php:497 +#: ../../mod/connections.php:429 ../../mod/profiles.php:529 #: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../mod/poke.php:166 #: ../../mod/fsuggest.php:108 ../../mod/mood.php:137 #: ../../view/theme/redbasic/php/config.php:64 @@ -429,7 +429,7 @@ msgid "Preview" msgstr "" #: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 -#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:183 +#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:185 #: ../../boot.php:1716 msgid "Connect" msgstr "" @@ -639,6 +639,22 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" +#: ../../include/dir_fns.php:15 +msgid "Sort Options" +msgstr "" + +#: ../../include/dir_fns.php:16 +msgid "Alphabetic" +msgstr "" + +#: ../../include/dir_fns.php:17 +msgid "Reverse Alphabetic" +msgstr "" + +#: ../../include/dir_fns.php:18 +msgid "Newest to Oldest" +msgstr "" + #: ../../include/event.php:11 ../../include/bb2diaspora.php:433 msgid "l F d, Y \\@ g:i A" msgstr "" @@ -652,7 +668,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:158 ../../boot.php:1766 +#: ../../mod/events.php:450 ../../mod/directory.php:160 ../../boot.php:1766 msgid "Location:" msgstr "" @@ -1024,7 +1040,7 @@ msgstr "" msgid "Full Name:" msgstr "" -#: ../../include/profile_advanced.php:17 ../../mod/directory.php:160 +#: ../../include/profile_advanced.php:17 ../../mod/directory.php:162 #: ../../boot.php:1768 msgid "Gender:" msgstr "" @@ -1045,7 +1061,7 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../mod/directory.php:162 +#: ../../include/profile_advanced.php:37 ../../mod/directory.php:164 #: ../../boot.php:1769 msgid "Status:" msgstr "" @@ -1059,7 +1075,7 @@ msgstr "" msgid "Sexual Preference:" msgstr "" -#: ../../include/profile_advanced.php:48 ../../mod/directory.php:164 +#: ../../include/profile_advanced.php:48 ../../mod/directory.php:166 #: ../../boot.php:1770 msgid "Homepage:" msgstr "" @@ -1080,7 +1096,7 @@ msgstr "" msgid "Religion:" msgstr "" -#: ../../include/profile_advanced.php:58 ../../mod/directory.php:166 +#: ../../include/profile_advanced.php:58 ../../mod/directory.php:168 msgid "About:" msgstr "" @@ -1380,100 +1396,91 @@ msgstr "" msgid "December" msgstr "" -#: ../../include/text.php:1062 ../../mod/message.php:405 +#: ../../include/text.php:1050 ../../mod/message.php:433 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1063 ../../mod/message.php:406 +#: ../../include/text.php:1051 ../../mod/message.php:434 msgid "bytes" msgstr "" -#: ../../include/text.php:1099 ../../include/text.php:1114 -#: ../../include/conversation.php:828 -msgid "remove" +#: ../../include/text.php:1086 +msgid "remove category" msgstr "" -#: ../../include/text.php:1099 ../../include/text.php:1114 -msgid "[remove]" +#: ../../include/text.php:1108 +msgid "remove from file" msgstr "" -#: ../../include/text.php:1102 ../../include/conversation.php:675 -msgid "Categories:" -msgstr "" - -#: ../../include/text.php:1117 ../../include/conversation.php:676 -msgid "Filed under:" -msgstr "" - -#: ../../include/text.php:1133 ../../include/text.php:1145 +#: ../../include/text.php:1162 ../../include/text.php:1174 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1316 ../../mod/events.php:326 +#: ../../include/text.php:1345 ../../mod/events.php:326 msgid "link to source" msgstr "" -#: ../../include/text.php:1335 +#: ../../include/text.php:1364 msgid "Select a page layout: " msgstr "" -#: ../../include/text.php:1338 ../../include/text.php:1403 +#: ../../include/text.php:1367 ../../include/text.php:1432 msgid "default" msgstr "" -#: ../../include/text.php:1374 +#: ../../include/text.php:1403 msgid "Page content type: " msgstr "" -#: ../../include/text.php:1415 +#: ../../include/text.php:1444 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1567 ../../include/conversation.php:117 +#: ../../include/text.php:1596 ../../include/conversation.php:117 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 msgid "photo" msgstr "" -#: ../../include/text.php:1570 ../../include/conversation.php:120 +#: ../../include/text.php:1599 ../../include/conversation.php:120 #: ../../mod/tagger.php:49 msgid "event" msgstr "" -#: ../../include/text.php:1573 ../../include/conversation.php:145 +#: ../../include/text.php:1602 ../../include/conversation.php:145 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 msgid "status" msgstr "" -#: ../../include/text.php:1575 ../../include/conversation.php:147 +#: ../../include/text.php:1604 ../../include/conversation.php:147 #: ../../mod/tagger.php:55 msgid "comment" msgstr "" -#: ../../include/text.php:1580 +#: ../../include/text.php:1609 msgid "activity" msgstr "" -#: ../../include/text.php:1842 +#: ../../include/text.php:1871 msgid "Design" msgstr "" -#: ../../include/text.php:1844 +#: ../../include/text.php:1873 msgid "Blocks" msgstr "" -#: ../../include/text.php:1845 +#: ../../include/text.php:1874 msgid "Menus" msgstr "" -#: ../../include/text.php:1846 +#: ../../include/text.php:1875 msgid "Layouts" msgstr "" -#: ../../include/text.php:1847 +#: ../../include/text.php:1876 msgid "Pages" msgstr "" -#: ../../include/identity.php:14 ../../mod/item.php:1141 +#: ../../include/identity.php:14 ../../mod/item.php:1126 msgid "Unable to obtain identity information from database" msgstr "" @@ -1550,7 +1557,7 @@ msgstr "" #: ../../include/attach.php:133 ../../include/attach.php:189 #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/items.php:3523 +#: ../../include/attach.php:464 ../../include/items.php:3548 #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 #: ../../mod/invite.php:102 ../../mod/allfriends.php:10 #: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31 @@ -1571,7 +1578,7 @@ msgstr "" #: ../../mod/notifications.php:66 ../../mod/blocks.php:29 #: ../../mod/blocks.php:44 ../../mod/editpost.php:13 ../../mod/poke.php:128 #: ../../mod/channel.php:123 ../../mod/fsuggest.php:78 -#: ../../mod/editblock.php:48 ../../mod/item.php:174 ../../mod/item.php:182 +#: ../../mod/editblock.php:48 ../../mod/item.php:173 ../../mod/item.php:181 #: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18 #: ../../mod/mood.php:114 ../../index.php:178 ../../index.php:340 msgid "Permission denied." @@ -1954,7 +1961,7 @@ msgstr "" msgid "Search site content" msgstr "" -#: ../../include/nav.php:137 ../../mod/directory.php:210 +#: ../../include/nav.php:137 ../../mod/directory.php:212 msgid "Directory" msgstr "" @@ -1998,7 +2005,7 @@ msgstr "" msgid "Intros" msgstr "" -#: ../../include/nav.php:157 ../../mod/connections.php:561 +#: ../../include/nav.php:157 ../../mod/connections.php:562 msgid "New Connections" msgstr "" @@ -2083,7 +2090,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:181 ../../mod/connections.php:667 +#: ../../include/nav.php:181 ../../mod/connections.php:668 msgid "Connections" msgstr "" @@ -2228,8 +2235,8 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:48 ../../mod/connections.php:673 -#: ../../mod/directory.php:206 ../../mod/directory.php:211 +#: ../../include/contact_widgets.php:48 ../../mod/connections.php:674 +#: ../../mod/directory.php:208 ../../mod/directory.php:213 msgid "Find" msgstr "" @@ -2459,10 +2466,22 @@ msgstr "" msgid "View %s's profile @ %s" msgstr "" +#: ../../include/conversation.php:675 +msgid "Categories:" +msgstr "" + +#: ../../include/conversation.php:676 +msgid "Filed under:" +msgstr "" + #: ../../include/conversation.php:702 msgid "View in context" msgstr "" +#: ../../include/conversation.php:828 +msgid "remove" +msgstr "" + #: ../../include/conversation.php:832 msgid "Loading..." msgstr "" @@ -2526,8 +2545,8 @@ msgstr "" msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1061 ../../mod/message.php:253 -#: ../../mod/message.php:370 +#: ../../include/conversation.php:1061 ../../mod/message.php:271 +#: ../../mod/message.php:398 msgid "Please enter a link URL:" msgstr "" @@ -2559,8 +2578,8 @@ msgstr "" msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1085 ../../mod/message.php:300 -#: ../../mod/message.php:462 ../../mod/editlayout.php:101 +#: ../../include/conversation.php:1085 ../../mod/message.php:318 +#: ../../mod/message.php:494 ../../mod/editlayout.php:101 #: ../../mod/editwebpage.php:120 ../../mod/editpost.php:95 #: ../../mod/editblock.php:115 msgid "Upload photo" @@ -2570,8 +2589,8 @@ msgstr "" msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1087 ../../mod/message.php:301 -#: ../../mod/message.php:463 ../../mod/editlayout.php:102 +#: ../../include/conversation.php:1087 ../../mod/message.php:319 +#: ../../mod/message.php:495 ../../mod/editlayout.php:102 #: ../../mod/editwebpage.php:121 ../../mod/editpost.php:96 #: ../../mod/editblock.php:116 msgid "Attach file" @@ -2581,8 +2600,8 @@ msgstr "" msgid "attach file" msgstr "" -#: ../../include/conversation.php:1089 ../../mod/message.php:302 -#: ../../mod/message.php:464 ../../mod/editlayout.php:103 +#: ../../include/conversation.php:1089 ../../mod/message.php:320 +#: ../../mod/message.php:496 ../../mod/editlayout.php:103 #: ../../mod/editwebpage.php:122 ../../mod/editpost.php:97 #: ../../mod/editblock.php:117 msgid "Insert web link" @@ -2685,25 +2704,25 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../../include/items.php:3472 ../../mod/page.php:66 ../../mod/admin.php:150 +#: ../../include/items.php:3497 ../../mod/page.php:66 ../../mod/admin.php:150 #: ../../mod/admin.php:714 ../../mod/admin.php:917 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/display.php:32 msgid "Item not found." msgstr "" -#: ../../include/items.php:3644 +#: ../../include/items.php:3669 msgid "Archives" msgstr "" -#: ../../include/items.php:3805 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3830 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "" -#: ../../include/items.php:3821 ../../mod/network.php:469 +#: ../../include/items.php:3846 ../../mod/network.php:469 msgid "Group is empty" msgstr "" -#: ../../include/items.php:3837 +#: ../../include/items.php:3862 msgid "Connection not found." msgstr "" @@ -2870,8 +2889,8 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/invite.php:141 ../../mod/message.php:297 -#: ../../mod/message.php:458 +#: ../../mod/invite.php:141 ../../mod/message.php:315 +#: ../../mod/message.php:490 msgid "Your message:" msgstr "" @@ -3786,7 +3805,7 @@ msgstr "" #: ../../mod/viewconnections.php:28 ../../mod/photos.php:576 #: ../../mod/display.php:9 ../../mod/search.php:80 ../../mod/community.php:18 -#: ../../mod/directory.php:23 +#: ../../mod/directory.php:25 msgid "Public access denied." msgstr "" @@ -4378,12 +4397,12 @@ msgid "Deny" msgstr "" #: ../../mod/admin.php:678 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:325 ../../mod/connections.php:466 +#: ../../mod/connections.php:325 ../../mod/connections.php:467 msgid "Block" msgstr "" #: ../../mod/admin.php:679 ../../mod/connections.php:325 -#: ../../mod/connections.php:466 +#: ../../mod/connections.php:467 msgid "Unblock" msgstr "" @@ -4827,7 +4846,7 @@ msgid "Drop" msgstr "" #: ../../mod/menu.php:57 ../../mod/network.php:321 -#: ../../mod/connections.php:528 +#: ../../mod/connections.php:529 msgid "New" msgstr "" @@ -4920,45 +4939,61 @@ msgstr "" msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:287 +#: ../../mod/message.php:248 +msgid "Message recalled." +msgstr "" + +#: ../../mod/message.php:305 msgid "Send Private Message" msgstr "" -#: ../../mod/message.php:288 ../../mod/message.php:453 +#: ../../mod/message.php:306 ../../mod/message.php:485 msgid "To:" msgstr "" -#: ../../mod/message.php:293 ../../mod/message.php:455 +#: ../../mod/message.php:311 ../../mod/message.php:487 msgid "Subject:" msgstr "" -#: ../../mod/message.php:322 +#: ../../mod/message.php:340 msgid "No messages." msgstr "" -#: ../../mod/message.php:338 ../../mod/message.php:424 +#: ../../mod/message.php:356 ../../mod/message.php:452 msgid "Delete message" msgstr "" -#: ../../mod/message.php:340 +#: ../../mod/message.php:358 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:359 +#: ../../mod/message.php:377 msgid "Message not found." msgstr "" -#: ../../mod/message.php:446 +#: ../../mod/message.php:453 +msgid "Recall message" +msgstr "" + +#: ../../mod/message.php:455 +msgid "Message has been recalled." +msgstr "" + +#: ../../mod/message.php:474 +msgid "Private Conversation" +msgstr "" + +#: ../../mod/message.php:478 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:448 +#: ../../mod/message.php:480 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:452 +#: ../../mod/message.php:484 msgid "Send Reply" msgstr "" @@ -5083,7 +5118,7 @@ msgid "Invalid connection." msgstr "" #: ../../mod/intro.php:17 ../../mod/intro.php:100 -#: ../../mod/connections.php:332 ../../mod/connections.php:467 +#: ../../mod/connections.php:332 ../../mod/connections.php:468 #: ../../mod/notifications.php:51 ../../mod/notifications.php:162 #: ../../mod/notifications.php:208 msgid "Ignore" @@ -5109,7 +5144,7 @@ msgstr "" msgid "System error. Please try again later." msgstr "" -#: ../../mod/intro.php:95 ../../mod/connections.php:472 +#: ../../mod/intro.php:95 ../../mod/connections.php:473 #: ../../mod/notifications.php:155 ../../mod/notifications.php:202 msgid "Hide this contact from others" msgstr "" @@ -5224,7 +5259,7 @@ msgstr "" msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/connections.php:332 ../../mod/connections.php:467 +#: ../../mod/connections.php:332 ../../mod/connections.php:468 msgid "Unignore" msgstr "" @@ -5264,7 +5299,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: ../../mod/connections.php:397 ../../mod/connections.php:425 +#: ../../mod/connections.php:397 ../../mod/connections.php:426 msgid "Approve this connection" msgstr "" @@ -5292,218 +5327,222 @@ msgstr "" msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connections.php:426 -msgid "Connection has no individual permissions!" +#: ../../mod/connections.php:425 +msgid "inherited" msgstr "" #: ../../mod/connections.php:427 +msgid "Connection has no individual permissions!" +msgstr "" + +#: ../../mod/connections.php:428 msgid "" "This may be appropriate based on your privacy settings" "a>, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/connections.php:429 +#: ../../mod/connections.php:430 msgid "Profile Visibility" msgstr "" -#: ../../mod/connections.php:430 +#: ../../mod/connections.php:431 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/connections.php:431 +#: ../../mod/connections.php:432 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connections.php:432 +#: ../../mod/connections.php:433 msgid "Edit contact notes" msgstr "" -#: ../../mod/connections.php:434 +#: ../../mod/connections.php:435 msgid "Their Settings" msgstr "" -#: ../../mod/connections.php:435 +#: ../../mod/connections.php:436 msgid "My Settings" msgstr "" -#: ../../mod/connections.php:437 +#: ../../mod/connections.php:438 msgid "Forum Members" msgstr "" -#: ../../mod/connections.php:438 +#: ../../mod/connections.php:439 msgid "Soapbox" msgstr "" -#: ../../mod/connections.php:439 +#: ../../mod/connections.php:440 msgid "Full Sharing" msgstr "" -#: ../../mod/connections.php:440 +#: ../../mod/connections.php:441 msgid "Cautious Sharing" msgstr "" -#: ../../mod/connections.php:441 +#: ../../mod/connections.php:442 msgid "Follow Only" msgstr "" -#: ../../mod/connections.php:442 +#: ../../mod/connections.php:443 msgid "Individual Permissions" msgstr "" -#: ../../mod/connections.php:443 -msgid "" -"Individual permissions are only enabled for privacy " -"settings which are set to \"Only those you specifically allow\". " -"Otherwise they are controlled by your privacy settings." -msgstr "" - #: ../../mod/connections.php:444 -msgid "Advanced Permissions" +msgid "" +"Some permissions may be inherited from your privacy " +"settings, which have higher priority. Changing those on this page will " +"have no effect." msgstr "" #: ../../mod/connections.php:445 +msgid "Advanced Permissions" +msgstr "" + +#: ../../mod/connections.php:446 msgid "Quick Links" msgstr "" -#: ../../mod/connections.php:449 +#: ../../mod/connections.php:450 #, php-format msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connections.php:450 +#: ../../mod/connections.php:451 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connections.php:451 +#: ../../mod/connections.php:452 msgid "Ignore contact" msgstr "" -#: ../../mod/connections.php:452 +#: ../../mod/connections.php:453 msgid "Repair URL settings" msgstr "" -#: ../../mod/connections.php:453 +#: ../../mod/connections.php:454 msgid "View conversations" msgstr "" -#: ../../mod/connections.php:455 +#: ../../mod/connections.php:456 msgid "Delete contact" msgstr "" -#: ../../mod/connections.php:458 +#: ../../mod/connections.php:459 msgid "Last update:" msgstr "" -#: ../../mod/connections.php:460 +#: ../../mod/connections.php:461 msgid "Update public posts" msgstr "" -#: ../../mod/connections.php:462 +#: ../../mod/connections.php:463 msgid "Update now" msgstr "" -#: ../../mod/connections.php:468 +#: ../../mod/connections.php:469 msgid "Currently blocked" msgstr "" -#: ../../mod/connections.php:469 +#: ../../mod/connections.php:470 msgid "Currently ignored" msgstr "" -#: ../../mod/connections.php:470 +#: ../../mod/connections.php:471 msgid "Currently archived" msgstr "" -#: ../../mod/connections.php:471 +#: ../../mod/connections.php:472 msgid "Currently pending" msgstr "" -#: ../../mod/connections.php:472 +#: ../../mod/connections.php:473 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/connections.php:508 ../../mod/connections.php:580 +#: ../../mod/connections.php:509 ../../mod/connections.php:581 msgid "Blocked" msgstr "" -#: ../../mod/connections.php:513 ../../mod/connections.php:587 +#: ../../mod/connections.php:514 ../../mod/connections.php:588 msgid "Ignored" msgstr "" -#: ../../mod/connections.php:518 ../../mod/connections.php:601 +#: ../../mod/connections.php:519 ../../mod/connections.php:602 msgid "Hidden" msgstr "" -#: ../../mod/connections.php:523 ../../mod/connections.php:594 +#: ../../mod/connections.php:524 ../../mod/connections.php:595 msgid "Archived" msgstr "" -#: ../../mod/connections.php:534 +#: ../../mod/connections.php:535 msgid "All" msgstr "" -#: ../../mod/connections.php:555 +#: ../../mod/connections.php:556 msgid "Suggestions" msgstr "" -#: ../../mod/connections.php:558 +#: ../../mod/connections.php:559 msgid "Suggest new connections" msgstr "" -#: ../../mod/connections.php:564 +#: ../../mod/connections.php:565 msgid "Show pending (new) connections" msgstr "" -#: ../../mod/connections.php:567 +#: ../../mod/connections.php:568 msgid "All Connections" msgstr "" -#: ../../mod/connections.php:570 +#: ../../mod/connections.php:571 msgid "Show all connections" msgstr "" -#: ../../mod/connections.php:573 +#: ../../mod/connections.php:574 msgid "Unblocked" msgstr "" -#: ../../mod/connections.php:576 +#: ../../mod/connections.php:577 msgid "Only show unblocked connections" msgstr "" -#: ../../mod/connections.php:583 +#: ../../mod/connections.php:584 msgid "Only show blocked connections" msgstr "" -#: ../../mod/connections.php:590 +#: ../../mod/connections.php:591 msgid "Only show ignored connections" msgstr "" -#: ../../mod/connections.php:597 +#: ../../mod/connections.php:598 msgid "Only show archived connections" msgstr "" -#: ../../mod/connections.php:604 +#: ../../mod/connections.php:605 msgid "Only show hidden connections" msgstr "" -#: ../../mod/connections.php:646 +#: ../../mod/connections.php:647 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/connections.php:647 ../../mod/nogroup.php:41 +#: ../../mod/connections.php:648 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/connections.php:671 +#: ../../mod/connections.php:672 msgid "Search your connections" msgstr "" -#: ../../mod/connections.php:672 +#: ../../mod/connections.php:673 msgid "Finding: " msgstr "" @@ -5755,7 +5794,7 @@ msgid "" "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:584 ../../mod/directory.php:145 +#: ../../mod/profiles.php:584 ../../mod/directory.php:147 msgid "Age: " msgstr "" @@ -6398,7 +6437,7 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1067 +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1052 msgid "Wall Photos" msgstr "" @@ -6467,24 +6506,24 @@ msgstr "" msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:322 +#: ../../mod/item.php:321 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:366 +#: ../../mod/item.php:365 msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/item.php:782 +#: ../../mod/item.php:767 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1146 +#: ../../mod/item.php:1131 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1152 +#: ../../mod/item.php:1137 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -6653,23 +6692,23 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/directory.php:148 +#: ../../mod/directory.php:150 msgid "Gender: " msgstr "" -#: ../../mod/directory.php:207 +#: ../../mod/directory.php:209 msgid "Finding:" msgstr "" -#: ../../mod/directory.php:215 +#: ../../mod/directory.php:217 msgid "next page" msgstr "" -#: ../../mod/directory.php:215 +#: ../../mod/directory.php:217 msgid "previous page" msgstr "" -#: ../../mod/directory.php:222 +#: ../../mod/directory.php:224 msgid "No entries (some entries may be hidden)." msgstr "" diff --git a/version.inc b/version.inc index d5bf9feac..be191a19a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-10-16.468 +2013-10-18.470 From 4ce948731aa2a927758a74d3cdf3d113cbddf4b0 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 18 Oct 2013 15:48:59 -0700 Subject: [PATCH 38/43] doc - complete hook list, still need detailed functional descriptions with parameters and examples for each --- doc/Hooks.md | 155 +++++++++++++++++++++++++++++++++++++++++++++++ include/auth.php | 3 +- mod/display.php | 2 +- 3 files changed, 158 insertions(+), 2 deletions(-) create mode 100644 doc/Hooks.md diff --git a/doc/Hooks.md b/doc/Hooks.md new file mode 100644 index 000000000..a02bc631d --- /dev/null +++ b/doc/Hooks.md @@ -0,0 +1,155 @@ +Hooks - Complete List +===================== + + +* 'about_hook' +* 'account_settings' +* 'app_menu' +* 'atom_author' +* 'atom_entry' +* 'atom_feed' +* 'atom_feed_end' +* 'authenticate' +* 'avatar_lookup' +* 'bb2diaspora' +* 'bbcode' +* 'channel_remove' +* 'check_account_email' +* 'check_account_invite' +* 'check_account_password' +* 'connect_premium' +* 'connector_settings' +* 'contact_block_end' +* 'contact_edit' +* 'contact_edit_post' +* 'contact_photo_menu' +* 'contact_select_options' +* 'conversation_start' +* 'cron' +* 'directory_item' +* 'display_item' +* 'display_item' +* 'display_settings' +* 'display_settings_post' +* 'enotify' +* 'enotify_mail' +* 'enotify_store' +* 'event_created' +* 'event_updated' +* 'feature_enabled' +* 'feature_settings' +* 'feature_settings_post' +* 'follow' +* 'gender_selector' +* 'get_all_perms' +* 'get_features' +* 'get_widgets' +* 'get_widgets' +* 'global_permissions' +* 'home_content' +* 'home_init' +* 'html2bbcode' +* 'import_directory_profile' +* 'init_1'); +* 'item_photo_menu' +* 'item_translate' +* 'item_translate' +* 'jot_networks' +* 'jot_networks' +* 'jot_networks' +* 'jot_networks' +* 'jot_networks' +* 'jot_tool' +* 'jot_tool' +* 'jot_tool' +* 'jot_tool' +* 'jot_tool' +* 'logged_in' +* 'logged_in' +* 'logged_in' +* 'login_hook' +* 'logging_out' +* 'magic_auth' +* 'magic_auth_success' +* 'main_slider' +* 'marital_selector' +* 'mood_verbs' +* 'network_content_init' +* 'network_ping' +* 'network_tabs' +* 'network_to_name' +* 'notifier_end' +* 'notifier_normal' +* 'obj_verbs' +* 'oembed_probe' +* 'page_content_top' +* 'page_end' +* 'page_header' +* 'parse_atom' +* 'parse_link' +* 'pdl_selector' +* 'perm_is_allowed' +* 'personal_xrd' +* 'photo_post_end' +* 'photo_post_end' +* 'photo_upload_begin' +* 'photo_upload_end' +* 'photo_upload_end' +* 'photo_upload_end' +* 'photo_upload_end' +* 'photo_upload_file' +* 'photo_upload_form' +* 'poke_verbs' +* 'post_local' +* 'post_local' +* 'post_local_end' +* 'post_local_end' +* 'post_local_end' +* 'post_local_end' +* 'post_local_end' +* 'post_local_start' +* 'post_mail' +* 'post_mail_end' +* 'post_remote' +* 'post_remote_end' +* 'post_remote_update' +* 'post_remote_update_end' +* 'prepare_body' +* 'prepare_body_final' +* 'prepare_body_init' +* 'proc_run' +* 'profile_advanced' +* 'profile_edit' +* 'profile_post' +* 'profile_sidebar' +* 'profile_sidebar_enter' +* 'profile_tabs' +* 'register_account' +* 'render_location' +* 'settings_account' +* 'settings_form' +* 'settings_post' +* 'sexpref_selector' +* 'smilie' +* 'validate_channelname' +* 'webfinger' +* 'zid' +* 'zid_init' + +***General Module Hooks*** + +* $a->module . '_mod_aftercontent' +* $a->module . '_mod_aside' +* $a->module . '_mod_content' +* $a->module . '_mod_init' +* $a->module . '_mod_post' + +***General Selector Hooks*** + +* $a->module . '_post_' . $selname +* $a->module . '_post_' . $selname +* $a->module . '_post_' . $selname +* $a->module . '_pre_' . $selname +* $a->module . '_pre_' . $selname +* $a->module . '_pre_' . $selname + diff --git a/include/auth.php b/include/auth.php index d04ebbe43..8eb8bf333 100644 --- a/include/auth.php +++ b/include/auth.php @@ -61,7 +61,8 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) { // process logout request - call_hooks("logging_out"); + $args = array('channel_id' => local_user()); + call_hooks('logging_out', $args); nuke_session(); info( t('Logged out.') . EOL); goaway(z_root()); diff --git a/mod/display.php b/mod/display.php index 99cbd6f0e..d91d14d01 100644 --- a/mod/display.php +++ b/mod/display.php @@ -51,7 +51,7 @@ function display_content(&$a, $update = 0, $load = false) { 'bang' => '', 'visitor' => 'block', 'profile_uid' => local_user(), - 'return_path' => '/channel/' . $channel['channel_address'] + 'return_path' => 'channel/' . $channel['channel_address'] ); $o .= status_editor($a,$x); From 7e5570aa9c01203e9a876ccda8366c6ffb315988 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 18 Oct 2013 15:52:17 -0700 Subject: [PATCH 39/43] add hooklist to plugin page --- doc/Plugins.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Plugins.md b/doc/Plugins.md index 1b5f57240..f22f1b09d 100644 --- a/doc/Plugins.md +++ b/doc/Plugins.md @@ -47,7 +47,7 @@ In our case, we'll call them randplace_load() and randplace_unload(), as that is * pluginname_uninstall() -Next we'll talk about **hooks**. Hooks are places in the Red Matrix code where we allow plugins to do stuff. There are a lot of these, and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. +Next we'll talk about **hooks**. Hooks are places in the Red Matrix code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your Red Matrix installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. From ac23a1bfa2fdf3312714757915138379b93a606a Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 18 Oct 2013 15:57:10 -0700 Subject: [PATCH 40/43] put translate README into help docs --- doc/Developers.md | 2 ++ README.translate.md => doc/Translations.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) rename README.translate.md => doc/Translations.md (99%) diff --git a/doc/Developers.md b/doc/Developers.md index 4b339dee9..baadd1a2e 100644 --- a/doc/Developers.md +++ b/doc/Developers.md @@ -20,6 +20,8 @@ to notify us to merge your work. Our translations are managed through Transifex. If you wish to help out translating the Red Matrix to another language, sign up on transifex.com, visit [https://www.transifex.com/projects/p/red-matrix/](https://www.transifex.com/projects/p/red-matrix/) and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. +[Translations - More Info](help/Translations) + **Important** Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. diff --git a/README.translate.md b/doc/Translations.md similarity index 99% rename from README.translate.md rename to doc/Translations.md index 93e39dc7d..1ebdfb67d 100644 --- a/README.translate.md +++ b/doc/Translations.md @@ -1,5 +1,5 @@ Translating the Red Matrix -====================== +========================== Translation Process ------------------- From f2daed5188f5999d6cdf5a4de7e05dc03ac6f69c Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 18 Oct 2013 17:01:06 -0700 Subject: [PATCH 41/43] basic gotcha's enumerated when porting Friendica addons --- doc/Plugins.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/Plugins.md b/doc/Plugins.md index f22f1b09d..c3eaea348 100644 --- a/doc/Plugins.md +++ b/doc/Plugins.md @@ -242,3 +242,19 @@ we will create an argc/argv list for use by your module functions 3 whatever +***Porting Friendica Plugins*** + +The Red Matrix uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are: + +* Friendica's pluginname_install() is pluginname_load() + +* Friendica's pluginname_uninstall() is pluginname_unload() + +The Red Matrix has _install and _uninstall functions but these are used differently. + +* Friendica's "plugin_settings" hook is called "feature_settings" + +* Friendica's "plugin_settings_post" hook is called "feature_settings_post" + +Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the Red Matrix. Many structured data names (especially DB schema columns) are also quite different. + From d54b6099d248a2fa05bb21d7f1b822bbaa0421fa Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 19 Oct 2013 01:48:43 -0700 Subject: [PATCH 42/43] remove "via wall-To-Wall" text as it's soooo Facebook and is out of place in derived/sourced channels. It's now just "$author via $xyz". --- include/ItemObject.php | 1 + version.inc | 2 +- view/tpl/conv_item.tpl | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/ItemObject.php b/include/ItemObject.php index df9386232..fc99c50ad 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -201,6 +201,7 @@ class Item extends BaseObject { 'linktitle' => sprintf( t('View %s\'s profile - %s'), $profile_name, $item['author']['xchan_addr']), 'olinktitle' => sprintf( t('View %s\'s profile - %s'), $this->get_owner_name(), $item['owner']['xchan_addr']), 'to' => t('to'), + 'via' => t('via'), 'wall' => t('Wall-to-Wall'), 'vwall' => t('via Wall-To-Wall:'), 'profile_url' => $profile_link, diff --git a/version.inc b/version.inc index be191a19a..7398de6a6 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-10-18.470 +2013-10-19.471 diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index c44e2253a..095bd0df3 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -37,7 +37,7 @@ From 49fb6326e0e978f57b2f988935af6e8e3d2f4417 Mon Sep 17 00:00:00 2001 From: Thomas WillinghamDate: Sat, 19 Oct 2013 18:02:50 +0100 Subject: [PATCH 43/43] Clean up dupes in hook list --- doc/Hooks.md | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/doc/Hooks.md b/doc/Hooks.md index a02bc631d..005898ef0 100644 --- a/doc/Hooks.md +++ b/doc/Hooks.md @@ -44,28 +44,15 @@ Hooks - Complete List * 'get_all_perms' * 'get_features' * 'get_widgets' -* 'get_widgets' * 'global_permissions' * 'home_content' * 'home_init' * 'html2bbcode' * 'import_directory_profile' -* 'init_1'); * 'item_photo_menu' * 'item_translate' -* 'item_translate' -* 'jot_networks' -* 'jot_networks' -* 'jot_networks' -* 'jot_networks' * 'jot_networks' * 'jot_tool' -* 'jot_tool' -* 'jot_tool' -* 'jot_tool' -* 'jot_tool' -* 'logged_in' -* 'logged_in' * 'logged_in' * 'login_hook' * 'logging_out' @@ -94,18 +81,10 @@ Hooks - Complete List * 'photo_post_end' * 'photo_upload_begin' * 'photo_upload_end' -* 'photo_upload_end' -* 'photo_upload_end' -* 'photo_upload_end' * 'photo_upload_file' * 'photo_upload_form' * 'poke_verbs' * 'post_local' -* 'post_local' -* 'post_local_end' -* 'post_local_end' -* 'post_local_end' -* 'post_local_end' * 'post_local_end' * 'post_local_start' * 'post_mail'