harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/red

Browse Source
This commit is contained in:
Thomas Willingham 2014-06-22 18:00:23 +01:00
commit 388872949e
81 changed files with 5933 additions and 5577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot.php
View File

@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1112 );
define ( 'DB_UPDATE_VERSION', 1113 );
define ( 'EOL', '<br />' . "\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@ -289,6 +289,7 @@ define ( 'PERMS_SITE' , 0x0004 );
define ( 'PERMS_CONTACTS' , 0x0008 );
define ( 'PERMS_SPECIFIC' , 0x0080 );
define ( 'PERMS_AUTHED' , 0x0100 );
define ( 'PERMS_PENDING' , 0x0200 );
// Address book flags

8
doc/html/acl__selectors_8php.html
View File

@ -124,8 +124,8 @@ Functions</h2></td></tr>
<tr class="separator:a9476997d2968a5794f3723878ed89c91"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:ad6664fb8330308e23f2645cd6624727e"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="acl__selectors_8php.html#ad6664fb8330308e23f2645cd6624727e">fixacl</a> (&amp;$item)</td></tr>
<tr class="separator:ad6664fb8330308e23f2645cd6624727e"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a7b5446e999636ceceea65c154d865a31"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31">populate_acl</a> ($defaults=null, $unused=false)</td></tr>
<tr class="separator:a7b5446e999636ceceea65c154d865a31"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:ad25bba63a51a2b0b5b463efae50df528"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="acl__selectors_8php.html#ad25bba63a51a2b0b5b463efae50df528">populate_acl</a> ($defaults=null, $show_jotnets=true)</td></tr>
<tr class="separator:ad25bba63a51a2b0b5b463efae50df528"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table>
<h2 class="groupheader">Function Documentation</h2>
<a class="anchor" id="a9476997d2968a5794f3723878ed89c91"></a>
@ -246,7 +246,7 @@ Functions</h2></td></tr>
</div>
</div>
<a class="anchor" id="a7b5446e999636ceceea65c154d865a31"></a>
<a class="anchor" id="ad25bba63a51a2b0b5b463efae50df528"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
@ -260,7 +260,7 @@ Functions</h2></td></tr>
<td class="paramkey"></td>
<td></td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$unused</em> = <code>false</code>&#160;</td>
<td class="paramname"><em>$show_jotnets</em> = <code>true</code>&#160;</td>
</tr>
<tr>
<td></td>

2
doc/html/acl__selectors_8php.js
View File

@ -3,5 +3,5 @@ var acl__selectors_8php =
[ "contact_select", "acl__selectors_8php.html#a9476997d2968a5794f3723878ed89c91", null ],
[ "fixacl", "acl__selectors_8php.html#ad6664fb8330308e23f2645cd6624727e", null ],
[ "group_select", "acl__selectors_8php.html#aa1e3bc344ca2b29f97eb9860216d21a0", null ],
[ "populate_acl", "acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31", null ]
[ "populate_acl", "acl__selectors_8php.html#ad25bba63a51a2b0b5b463efae50df528", null ]
];

4
doc/html/apw_2php_2style_8php.html
View File

File diff suppressed because one or more lines are too long

40
doc/html/boot_8php.html
View File

File diff suppressed because one or more lines are too long

1
doc/html/boot_8php.js
View File

@ -224,6 +224,7 @@ var boot_8php =
[ "PERMS_AUTHED", "boot_8php.html#a852d4036a3bed66af1534d014c4ecde2", null ],
[ "PERMS_CONTACTS", "boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6", null ],
[ "PERMS_NETWORK", "boot_8php.html#a6df1102664f64b274810db85197c2755", null ],
[ "PERMS_PENDING", "boot_8php.html#a205d013103997adfa72953d2f20c01e1", null ],
[ "PERMS_PUBLIC", "boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7", null ],
[ "PERMS_R_ABOOK", "boot_8php.html#a3d6d4fc5fafcc9156811669158541caf", null ],
[ "PERMS_R_PAGES", "boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e", null ],

2
doc/html/datetime_8php.html
View File

File diff suppressed because one or more lines are too long

4
doc/html/dba__driver_8php.html
View File

File diff suppressed because one or more lines are too long

3
doc/html/globals_0x68.html
View File

@ -165,6 +165,9 @@ $(document).ready(function(){initNavTree('globals_0x68.html','');});
<li>head_get_js()
: <a class="el" href="plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1">plugin.php</a>
</li>
<li>head_get_main_js()
: <a class="el" href="plugin_8php.html#a67ca417634de2d0beffffc54aeb951ff">plugin.php</a>
</li>
<li>head_remove_css()
: <a class="el" href="plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf">plugin.php</a>
</li>

6
doc/html/globals_0x69.html
View File

@ -241,6 +241,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
<li>is_windows()
: <a class="el" href="boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08">boot.php</a>
</li>
<li>item_add_cid()
: <a class="el" href="items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df">items.php</a>
</li>
<li>ITEM_BLOCKED
: <a class="el" href="boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f">boot.php</a>
</li>
@ -325,6 +328,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
<li>ITEM_RELAY
: <a class="el" href="boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221">boot.php</a>
</li>
<li>item_remove_cid()
: <a class="el" href="items_8php.html#a5ed782ff5b9cf050bec931e06de12c00">items.php</a>
</li>
<li>ITEM_RETAINED
: <a class="el" href="boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81">boot.php</a>
</li>

5
doc/html/globals_0x70.html
View File

@ -240,6 +240,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
<li>PERMS_NETWORK
: <a class="el" href="boot_8php.html#a6df1102664f64b274810db85197c2755">boot.php</a>
</li>
<li>PERMS_PENDING
: <a class="el" href="boot_8php.html#a205d013103997adfa72953d2f20c01e1">boot.php</a>
</li>
<li>PERMS_PUBLIC
: <a class="el" href="boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7">boot.php</a>
</li>
@ -403,7 +406,7 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
: <a class="el" href="language_8php.html#a78bd204955ec4cc3a9ac651285a1689d">language.php</a>
</li>
<li>populate_acl()
: <a class="el" href="acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31">acl_selectors.php</a>
: <a class="el" href="acl__selectors_8php.html#ad25bba63a51a2b0b5b463efae50df528">acl_selectors.php</a>
</li>
<li>post_activity_item()
: <a class="el" href="items_8php.html#a410f9c743877c125ca06312373346903">items.php</a>

4
doc/html/globals_0x73.html
View File

@ -304,10 +304,10 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
: <a class="el" href="taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd">taxonomy.php</a>
</li>
<li>stream_perms_api_uids()
: <a class="el" href="security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809">security.php</a>
: <a class="el" href="security_8php.html#a6126c77a1267e046ac59cf864613f011">security.php</a>
</li>
<li>stream_perms_xchans()
: <a class="el" href="security_8php.html#a15e0f8f511cc06192db63387f97238b3">security.php</a>
: <a class="el" href="security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c">security.php</a>
</li>
<li>string_plural_select_default()
: <a class="el" href="language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0">language.php</a>

3
doc/html/globals_func_0x68.html
View File

@ -164,6 +164,9 @@ $(document).ready(function(){initNavTree('globals_func_0x68.html','');});
<li>head_get_js()
: <a class="el" href="plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1">plugin.php</a>
</li>
<li>head_get_main_js()
: <a class="el" href="plugin_8php.html#a67ca417634de2d0beffffc54aeb951ff">plugin.php</a>
</li>
<li>head_remove_css()
: <a class="el" href="plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf">plugin.php</a>
</li>

6
doc/html/globals_func_0x69.html
View File

@ -233,6 +233,9 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
<li>is_windows()
: <a class="el" href="boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08">boot.php</a>
</li>
<li>item_add_cid()
: <a class="el" href="items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df">items.php</a>
</li>
<li>item_check_service_class()
: <a class="el" href="item_8php.html#a5b1b36cb301a94b38150074f0d424e74">item.php</a>
</li>
@ -269,6 +272,9 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
<li>item_redir_and_replace_images()
: <a class="el" href="conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533">conversation.php</a>
</li>
<li>item_remove_cid()
: <a class="el" href="items_8php.html#a5ed782ff5b9cf050bec931e06de12c00">items.php</a>
</li>
<li>item_store()
: <a class="el" href="items_8php.html#a2541e6861a56d145c9281877cc501615">items.php</a>
</li>

2
doc/html/globals_func_0x70.html
View File

@ -270,7 +270,7 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
: <a class="el" href="language_8php.html#a78bd204955ec4cc3a9ac651285a1689d">language.php</a>
</li>
<li>populate_acl()
: <a class="el" href="acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31">acl_selectors.php</a>
: <a class="el" href="acl__selectors_8php.html#ad25bba63a51a2b0b5b463efae50df528">acl_selectors.php</a>
</li>
<li>post_activity_item()
: <a class="el" href="items_8php.html#a410f9c743877c125ca06312373346903">items.php</a>

4
doc/html/globals_func_0x73.html
View File

@ -291,10 +291,10 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
: <a class="el" href="taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd">taxonomy.php</a>
</li>
<li>stream_perms_api_uids()
: <a class="el" href="security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809">security.php</a>
: <a class="el" href="security_8php.html#a6126c77a1267e046ac59cf864613f011">security.php</a>
</li>
<li>stream_perms_xchans()
: <a class="el" href="security_8php.html#a15e0f8f511cc06192db63387f97238b3">security.php</a>
: <a class="el" href="security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c">security.php</a>
</li>
<li>string_plural_select_default()
: <a class="el" href="language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0">language.php</a>

3
doc/html/globals_vars_0x70.html
View File

@ -190,6 +190,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x70.html','');});
<li>PERMS_NETWORK
: <a class="el" href="boot_8php.html#a6df1102664f64b274810db85197c2755">boot.php</a>
</li>
<li>PERMS_PENDING
: <a class="el" href="boot_8php.html#a205d013103997adfa72953d2f20c01e1">boot.php</a>
</li>
<li>PERMS_PUBLIC
: <a class="el" href="boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7">boot.php</a>
</li>

2
doc/html/include_2chat_8php.html
View File

@ -309,7 +309,7 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="widgets_8php.html#a47c72aac42058ea086c9ef8651c259da">widget_chatroom_list()</a>.</p>
<p>Referenced by <a class="el" href="nav_8php.html#a43be0df73b90647ea70947ce004e231e">nav()</a>, and <a class="el" href="widgets_8php.html#a47c72aac42058ea086c9ef8651c259da">widget_chatroom_list()</a>.</p>
</div>
</div>

69
doc/html/items_8php.html
View File

@ -236,6 +236,10 @@ Functions</h2></td></tr>
<tr class="separator:a756738301f2ed96be50232500677d58a"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a2baa9e05f1e8aa3dd61c85803ae39bd6"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6">update_remote_id</a> ($channel, $post_id, $webpage, $pagetitle, $namespace, $remote_id, $mid)</td></tr>
<tr class="separator:a2baa9e05f1e8aa3dd61c85803ae39bd6"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a02ca33c31ed535d24894f8a9a91ce9df"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df">item_add_cid</a> ($xchan_hash, $mid, $uid)</td></tr>
<tr class="separator:a02ca33c31ed535d24894f8a9a91ce9df"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a5ed782ff5b9cf050bec931e06de12c00"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#a5ed782ff5b9cf050bec931e06de12c00">item_remove_cid</a> ($xchan_hash, $mid, $uid)</td></tr>
<tr class="separator:a5ed782ff5b9cf050bec931e06de12c00"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table>
<h2 class="groupheader">Function Documentation</h2>
<a class="anchor" id="a36e656667193c83aa2cc03a024fc131b"></a>
@ -1195,6 +1199,39 @@ Functions</h2></td></tr>
<p>Referenced by <a class="el" href="items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361">get_item_elements()</a>, <a class="el" href="items_8php.html#a94ddb1d6c8fa21dd7433677e85168037">get_mail_elements()</a>, and <a class="el" href="items_8php.html#a251343637ff40a50cca93452cd530c26">get_profile_elements()</a>.</p>
</div>
</div>
<a class="anchor" id="a02ca33c31ed535d24894f8a9a91ce9df"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">item_add_cid </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$xchan_hash</em>, </td>
</tr>
<tr>
<td class="paramkey"></td>
<td></td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$mid</em>, </td>
</tr>
<tr>
<td class="paramkey"></td>
<td></td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$uid</em>&#160;</td>
</tr>
<tr>
<td></td>
<td>)</td>
<td></td><td></td>
</tr>
</table>
</div><div class="memdoc">
<p>change access control for item with message_id $mid and channel_id $uid </p>
</div>
</div>
<a class="anchor" id="a6f7e1334af5d684a987fa6a3eb37f4cc"></a>
@ -1255,6 +1292,38 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
</div>
</div>
<a class="anchor" id="a5ed782ff5b9cf050bec931e06de12c00"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">item_remove_cid </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$xchan_hash</em>, </td>
</tr>
<tr>
<td class="paramkey"></td>
<td></td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$mid</em>, </td>
</tr>
<tr>
<td class="paramkey"></td>
<td></td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$uid</em>&#160;</td>
</tr>
<tr>
<td></td>
<td>)</td>
<td></td><td></td>
</tr>
</table>
</div><div class="memdoc">
</div>
</div>
<a class="anchor" id="a2541e6861a56d145c9281877cc501615"></a>

2
doc/html/items_8php.js
View File

@ -37,9 +37,11 @@ var items_8php =
[ "has_permissions", "items_8php.html#a77051724d1784074ff187e73a4db93fe", null ],
[ "import_author_rss", "items_8php.html#a6bee35961f2e32905f20367a9309d627", null ],
[ "import_author_xchan", "items_8php.html#ae73794179b62d39bb597ff670ab1c1e5", null ],
[ "item_add_cid", "items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df", null ],
[ "item_expire", "items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc", null ],
[ "item_getfeedattach", "items_8php.html#a09d425596b9f8663472cf7474ad36d96", null ],
[ "item_getfeedtags", "items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7", null ],
[ "item_remove_cid", "items_8php.html#a5ed782ff5b9cf050bec931e06de12c00", null ],
[ "item_store", "items_8php.html#a2541e6861a56d145c9281877cc501615", null ],
[ "item_store_update", "items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484", null ],
[ "items_fetch", "items_8php.html#a756738301f2ed96be50232500677d58a", null ],

2
doc/html/language_8php.html
View File

File diff suppressed because one or more lines are too long

16
doc/html/navtree.js
View File

@ -36,14 +36,14 @@ var NAVTREE =
var NAVTREEINDEX =
[
"BS-Default_8php.html",
"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9",
"classApp.html#ab35b01a366a2ea95725e97af278f87ab",
"classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b",
"features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0",
"include_2api_8php.html#ab1ecb58954f722444bfe03233345cb1b",
"layouts_8php.html",
"post__to__red_8php.html#ae0b881461afbdba93d9329068ea52136",
"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4"
"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd",
"classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e",
"classphoto__driver.html#a5864fae7d8389372955a8e78cec527ac",
"features_8php.html",
"include_2api_8php.html#aafa82b65a9f879a1a1197cfe8aaf3898",
"language_8php.html#ac6ae482ee54fa2764d5c2e77305aeb96",
"post__to__red_8php.html#a99811555b30bde504a863e44015f2f19",
"text_8php.html#aac0969ae09853205992ba06ab9f9f61a"
];
var SYNCONMSG = 'click to disable panel synchronisation';

56
doc/html/navtreeindex0.js
View File

@ -43,9 +43,9 @@ var NAVTREEINDEX0 =
"acl_8php.html#a57dceff370d4a0e7ae673d50fbfda61f":[5,0,1,2,1],
"acl_8php.html#ac6776dba871806ecdb5d1659bc2eb07a":[5,0,1,2,0],
"acl__selectors_8php.html":[5,0,0,3],
"acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31":[5,0,0,3,3],
"acl__selectors_8php.html#a9476997d2968a5794f3723878ed89c91":[5,0,0,3,0],
"acl__selectors_8php.html#aa1e3bc344ca2b29f97eb9860216d21a0":[5,0,0,3,2],
"acl__selectors_8php.html#ad25bba63a51a2b0b5b463efae50df528":[5,0,0,3,3],
"acl__selectors_8php.html#ad6664fb8330308e23f2645cd6624727e":[5,0,0,3,1],
"activities_8php.html":[5,0,0,4],
"activities_8php.html#a80134e807719b3c54aba971958d2e132":[5,0,0,4,0],
@ -135,7 +135,7 @@ var NAVTREEINDEX0 =
"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,141],
"boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,36],
"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,155],
"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,256],
"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,257],
"boot_8php.html#a028380b2902a86ba32198f6d3b5d10bb":[5,0,4,134],
"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,54],
"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,174],
@ -145,15 +145,15 @@ var NAVTREEINDEX0 =
"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,214],
"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,69],
"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,178],
"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,275],
"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,271],
"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,274],
"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,276],
"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,272],
"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,275],
"boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[5,0,4,21],
"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,61],
"boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[5,0,4,15],
"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[5,0,4,79],
"boot_8php.html#a107d53f96acf5319905a34b1870db09a":[5,0,4,39],
"boot_8php.html#a115faf8797718c3165498abbd6895843":[5,0,4,260],
"boot_8php.html#a115faf8797718c3165498abbd6895843":[5,0,4,261],
"boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81":[5,0,4,136],
"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[5,0,4,83],
"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[5,0,4,80],
@ -163,43 +163,44 @@ var NAVTREEINDEX0 =
"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,150],
"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,177],
"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[5,0,4,144],
"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,283],
"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,250],
"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,285],
"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,284],
"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,251],
"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,286],
"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,181],
"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,78],
"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,229],
"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,230],
"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,109],
"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,161],
"boot_8php.html#a205d013103997adfa72953d2f20c01e1":[5,0,4,224],
"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,197],
"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,252],
"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,253],
"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[5,0,4,40],
"boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[5,0,4,20],
"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,102],
"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,94],
"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,263],
"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,264],
"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,200],
"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,85],
"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,135],
"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,227],
"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,228],
"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,110],
"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[5,0,4,248],
"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[5,0,4,249],
"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,196],
"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,131],
"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[5,0,4,70],
"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[5,0,4,75],
"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,234],
"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,235],
"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,148],
"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,42],
"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,124],
"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,163],
"boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214":[5,0,4,211],
"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,289],
"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,290],
"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,185],
"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,113],
"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[5,0,4,118],
"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,288],
"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,225],
"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,289],
"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,226],
"boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[5,0,4,12],
"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,62],
"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,92],
@ -212,23 +213,23 @@ var NAVTREEINDEX0 =
"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,158],
"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,73],
"boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[5,0,4,164],
"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,272],
"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,273],
"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,183],
"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,108],
"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,242],
"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,243],
"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,182],
"boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[5,0,4,6],
"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,216],
"boot_8php.html#a4f507a5996dbb3da148add0339a40d5a":[5,0,4,58],
"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,238],
"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,239],
"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,207],
"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,162],
"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[5,0,4,41],
"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,84],
"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,33],
"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,199],
"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,237],
"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[5,0,4,286],
"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,238],
"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[5,0,4,287],
"boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[5,0,4,19],
"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,63],
"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,189],
@ -240,14 +241,13 @@ var NAVTREEINDEX0 =
"boot_8php.html#a6252d8eca67c689d9035ec6da544cf46":[5,0,4,24],
"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,77],
"boot_8php.html#a639f079bf28f7bbb2769fee651d76dd8":[5,0,4,106],
"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,268],
"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,269],
"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,175],
"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,146],
"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,149],
"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[5,0,4,44],
"boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,152],
"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,254],
"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,241],
"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,235],
"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,103]
"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,255],
"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,242],
"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,236]
};

84
doc/html/navtreeindex1.js
View File

@ -1,22 +1,23 @@
var NAVTREEINDEX1 =
{
"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,103],
"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,95],
"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,223],
"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[5,0,4,133],
"boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[5,0,4,217],
"boot_8php.html#a7037bcbca223395c06bc67f65024de7a":[5,0,4,104],
"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,253],
"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,254],
"boot_8php.html#a718a801b0be6cbaef5e519516da12721":[5,0,4,168],
"boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[5,0,4,28],
"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,190],
"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,139],
"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,74],
"boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[5,0,4,2],
"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,276],
"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,277],
"boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[5,0,4,4],
"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,76],
"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,89],
"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,244],
"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,245],
"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[5,0,4,119],
"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[5,0,4,67],
"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,138],
@ -36,34 +37,34 @@ var NAVTREEINDEX1 =
"boot_8php.html#a852d4036a3bed66af1534d014c4ecde2":[5,0,4,221],
"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,129],
"boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[5,0,4,121],
"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,267],
"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,266],
"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,268],
"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,267],
"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,188],
"boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[5,0,4,16],
"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,100],
"boot_8php.html#a8b2af16eaee9e7768a88d0e437877f3b":[5,0,4,218],
"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,239],
"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,240],
"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,132],
"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,126],
"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,246],
"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[5,0,4,284],
"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,247],
"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[5,0,4,285],
"boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,31],
"boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11],
"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,153],
"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,130],
"boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,128],
"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[5,0,4,279],
"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,251],
"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[5,0,4,280],
"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,252],
"boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,17],
"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,202],
"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,240],
"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,241],
"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,48],
"boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5],
"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,232],
"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,233],
"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,203],
"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[5,0,4,282],
"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,269],
"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,231],
"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[5,0,4,283],
"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,270],
"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,232],
"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,191],
"boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,25],
"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,210],
@ -74,7 +75,7 @@ var NAVTREEINDEX1 =
"boot_8php.html#aa589421267f0c2f0d643f727792cce35":[5,0,4,115],
"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[5,0,4,88],
"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[5,0,4,97],
"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,236],
"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,237],
"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,143],
"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[5,0,4,220],
"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,68],
@ -83,32 +84,32 @@ var NAVTREEINDEX1 =
"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,222],
"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,32],
"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,215],
"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,243],
"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,244],
"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,187],
"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,226],
"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,227],
"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,114],
"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,145],
"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,55],
"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,205],
"boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[5,0,4,7],
"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,99],
"boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d":[5,0,4,278],
"boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d":[5,0,4,279],
"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,37],
"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,247],
"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,248],
"boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[5,0,4,3],
"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,273],
"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,274],
"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[5,0,4,66],
"boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[5,0,4,117],
"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,98],
"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,127],
"boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[5,0,4,23],
"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,173],
"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,245],
"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,246],
"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,96],
"boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08":[5,0,4,26],
"boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[5,0,4,35],
"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[5,0,4,56],
"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,280],
"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,281],
"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,123],
"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,125],
"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,201],
@ -116,9 +117,9 @@ var NAVTREEINDEX1 =
"boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[5,0,4,13],
"boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[5,0,4,8],
"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,176],
"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[5,0,4,281],
"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,233],
"boot_8php.html#ace6d70ac290397ddd40e561fd0831858":[5,0,4,265],
"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[5,0,4,282],
"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,234],
"boot_8php.html#ace6d70ac290397ddd40e561fd0831858":[5,0,4,266],
"boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[5,0,4,208],
"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,65],
"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,156],
@ -127,25 +128,25 @@ var NAVTREEINDEX1 =
"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[5,0,4,72],
"boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,87],
"boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[5,0,4,29],
"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,228],
"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,255],
"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,249],
"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,229],
"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,256],
"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,250],
"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,93],
"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,140],
"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,258],
"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,259],
"boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,38],
"boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[5,0,4,22],
"boot_8php.html#ae0da3ca0f54d75d22c71e007331f8d06":[5,0,4,105],
"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,264],
"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,265],
"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,184],
"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,159],
"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,192],
"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[5,0,4,277],
"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[5,0,4,278],
"boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,27],
"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,270],
"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,271],
"boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[5,0,4,50],
"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,230],
"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[5,0,4,259],
"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,231],
"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[5,0,4,260],
"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,167],
"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,101],
"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,179],
@ -153,7 +154,7 @@ var NAVTREEINDEX1 =
"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,142],
"boot_8php.html#aefe573c3c7b0d37fbff264bbae79d673":[5,0,4,112],
"boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,30],
"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,261],
"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,262],
"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,186],
"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,60],
"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,51],
@ -161,16 +162,16 @@ var NAVTREEINDEX1 =
"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,206],
"boot_8php.html#af6b3de425e5849c73370a484c44607a3":[5,0,4,165],
"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,90],
"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,257],
"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,258],
"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,198],
"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,180],
"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,262],
"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,263],
"boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,47],
"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,82],
"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,151],
"boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[5,0,4,14],
"boot_8php.html#afef254290febac854c85fc698d9483a6":[5,0,4,287],
"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,224],
"boot_8php.html#afef254290febac854c85fc698d9483a6":[5,0,4,288],
"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,225],
"boxy_8php.html":[5,0,3,1,3,1,0],
"cache_8php.html":[5,0,0,13],
"channel_8php.html":[5,0,1,12],
@ -248,6 +249,5 @@ var NAVTREEINDEX1 =
"classApp.html#a98ef4cfd36693a3457c879b76bc6d694":[4,0,5,44],
"classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d":[4,0,5,64],
"classApp.html#aa5a87c46ab3fee21362c466bf78042ef":[4,0,5,91],
"classApp.html#aab23c59172310fd30f2d60dc039d3eea":[4,0,5,13],
"classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e":[4,0,5,38]
"classApp.html#aab23c59172310fd30f2d60dc039d3eea":[4,0,5,13]
};

4
doc/html/navtreeindex2.js
View File

@ -1,5 +1,6 @@
var NAVTREEINDEX2 =
{
"classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e":[4,0,5,38],
"classApp.html#ab35b01a366a2ea95725e97af278f87ab":[4,0,5,86],
"classApp.html#ab3da757abe5cb45bf88f07cc51a73b58":[4,0,5,35],
"classApp.html#ab47de68fa39806d1fb0976407e188b77":[4,0,5,71],
@ -248,6 +249,5 @@ var NAVTREEINDEX2 =
"classphoto__driver.html#a3e4215890f4a4894bf3799a7d2e0c0b1":[4,0,19,29],
"classphoto__driver.html#a4920ed7cbb1ac735ac84153067537f03":[4,0,19,26],
"classphoto__driver.html#a4de5bac8daea8f291a33c80788019d0d":[4,0,19,14],
"classphoto__driver.html#a56634842b071b96502716e9843ea5361":[4,0,19,19],
"classphoto__driver.html#a5864fae7d8389372955a8e78cec527ac":[4,0,19,16]
"classphoto__driver.html#a56634842b071b96502716e9843ea5361":[4,0,19,19]
};

4
doc/html/navtreeindex3.js
View File

@ -1,5 +1,6 @@
var NAVTREEINDEX3 =
{
"classphoto__driver.html#a5864fae7d8389372955a8e78cec527ac":[4,0,19,16],
"classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b":[4,0,19,22],
"classphoto__driver.html#a6c6c16dbc4f517ce799f9143ed61f0e3":[4,0,19,9],
"classphoto__driver.html#a6eee8e36eaf9339f4faf80ddd43162da":[4,0,19,23],
@ -248,6 +249,5 @@ var NAVTREEINDEX3 =
"extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb":[5,0,2,4,0],
"extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,4,1],
"fbrowser_8php.html":[5,0,1,32],
"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,32,0],
"features_8php.html":[5,0,0,35]
"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,32,0]
};

4
doc/html/navtreeindex4.js
View File

@ -1,5 +1,6 @@
var NAVTREEINDEX4 =
{
"features_8php.html":[5,0,0,35],
"features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[5,0,0,35,0],
"features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[5,0,0,35,1],
"feed_8php.html":[5,0,1,33],
@ -248,6 +249,5 @@ var NAVTREEINDEX4 =
"include_2api_8php.html#aa49741342ad8ba285737eea1209a37e1":[5,0,0,5,25],
"include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d":[5,0,0,5,52],
"include_2api_8php.html#aa6fc3bc8c0fad1d081db0dcc456dd77f":[5,0,0,5,29],
"include_2api_8php.html#aa9dc5350b26d6c7727d6c4b641ecba18":[5,0,0,5,3],
"include_2api_8php.html#aafa82b65a9f879a1a1197cfe8aaf3898":[5,0,0,5,49]
"include_2api_8php.html#aa9dc5350b26d6c7727d6c4b641ecba18":[5,0,0,5,3]
};

58
doc/html/navtreeindex5.js
View File

@ -1,5 +1,6 @@
var NAVTREEINDEX5 =
{
"include_2api_8php.html#aafa82b65a9f879a1a1197cfe8aaf3898":[5,0,0,5,49],
"include_2api_8php.html#ab1ecb58954f722444bfe03233345cb1b":[5,0,0,5,17],
"include_2api_8php.html#abe8e929e93f7ab134b1cb1fb30f19a76":[5,0,0,5,48],
"include_2api_8php.html#ac2c2b18c426d697d11a830bca146be8a":[5,0,0,5,30],
@ -175,67 +176,69 @@ var NAVTREEINDEX5 =
"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,46,1],
"item_8php.html#aa22feef4de326e1d7078dedd892e615c":[5,0,1,46,2],
"items_8php.html":[5,0,0,46],
"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,46,61],
"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,46,63],
"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,46,3],
"items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,46,7],
"items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df":[5,0,0,46,37],
"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,46,28],
"items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,46,8],
"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,46,33],
"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,46,38],
"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,46,39],
"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,46,25],
"items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[5,0,0,46,5],
"items_8php.html#a251343637ff40a50cca93452cd530c26":[5,0,0,46,32],
"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,46,40],
"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,46,42],
"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[5,0,0,46,4],
"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[5,0,0,46,60],
"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[5,0,0,46,62],
"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,46,21],
"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[5,0,0,46,0],
"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,46,47],
"items_8php.html#a49905ea75adfe8a2d110be344d18d6a6":[5,0,0,46,49],
"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,46,52],
"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,46,49],
"items_8php.html#a49905ea75adfe8a2d110be344d18d6a6":[5,0,0,46,51],
"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,46,54],
"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,46,30],
"items_8php.html#a555762e1022a4b8e3c3abd32e7812408":[5,0,0,46,15],
"items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,46,20],
"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,46,13],
"items_8php.html#a5ed782ff5b9cf050bec931e06de12c00":[5,0,0,46,41],
"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,46,18],
"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,46,39],
"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,46,40],
"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,46,16],
"items_8php.html#a6bee35961f2e32905f20367a9309d627":[5,0,0,46,35],
"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,46,37],
"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,46,42],
"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,46,38],
"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,46,44],
"items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,46,34],
"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,46,45],
"items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a":[5,0,0,46,53],
"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,46,47],
"items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a":[5,0,0,46,55],
"items_8php.html#a81565acf729e629e588d823308448e3c":[5,0,0,46,1],
"items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,46,17],
"items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[5,0,0,46,50],
"items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[5,0,0,46,52],
"items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,46,12],
"items_8php.html#a87ac9e359591721a824ecd23bbb56296":[5,0,0,46,6],
"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,46,58],
"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,46,60],
"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,46,27],
"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[5,0,0,46,11],
"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[5,0,0,46,31],
"items_8php.html#aa2d3caa2f27720762b5c729e07df40fb":[5,0,0,46,44],
"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,46,59],
"items_8php.html#aa2d3caa2f27720762b5c729e07df40fb":[5,0,0,46,46],
"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,46,61],
"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[5,0,0,46,10],
"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[5,0,0,46,22],
"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[5,0,0,46,9],
"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[5,0,0,46,29],
"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,46,55],
"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,46,57],
"items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb":[5,0,0,46,14],
"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,46,56],
"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,46,58],
"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[5,0,0,46,26],
"items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[5,0,0,46,2],
"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[5,0,0,46,46],
"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[5,0,0,46,48],
"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,46,19],
"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[5,0,0,46,41],
"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,46,48],
"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,46,57],
"items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a":[5,0,0,46,51],
"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[5,0,0,46,43],
"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,46,50],
"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,46,59],
"items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a":[5,0,0,46,53],
"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,46,24],
"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,46,36],
"items_8php.html#af6237605c60d69abdd959ddbbee3420c":[5,0,0,46,54],
"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,46,43],
"items_8php.html#af6237605c60d69abdd959ddbbee3420c":[5,0,0,46,56],
"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,46,45],
"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[5,0,0,46,23],
"lang_8php.html":[5,0,1,47],
"lang_8php.html#a4c5c1140f51a638f224275cd618c2f37":[5,0,1,47,0],
@ -246,8 +249,5 @@ var NAVTREEINDEX5 =
"language_8php.html#a686bcafa6b0d5c86d37b38a1db5b6997":[5,0,0,47,9],
"language_8php.html#a78bd204955ec4cc3a9ac651285a1689d":[5,0,0,47,5],
"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[5,0,0,47,4],
"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[5,0,0,47,1],
"language_8php.html#ac6ae482ee54fa2764d5c2e77305aeb96":[5,0,0,47,8],
"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,47,6],
"language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,47,2]
"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[5,0,0,47,1]
};

50
doc/html/navtreeindex6.js
View File

@ -1,5 +1,8 @@
var NAVTREEINDEX6 =
{
"language_8php.html#ac6ae482ee54fa2764d5c2e77305aeb96":[5,0,0,47,8],
"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,47,6],
"language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,47,2],
"layouts_8php.html":[5,0,1,48],
"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,48,0],
"like_8php.html":[5,0,1,49],
@ -102,8 +105,8 @@ var NAVTREEINDEX6 =
"namespaces.html":[3,0],
"namespaceupdatetpl.html":[4,0,3],
"namespaceupdatetpl.html":[3,0,3],
"namespaceutil.html":[4,0,4],
"namespaceutil.html":[3,0,4],
"namespaceutil.html":[4,0,4],
"nav_8php.html":[5,0,0,50],
"nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,50,0],
"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,50,1],
@ -188,36 +191,37 @@ var NAVTREEINDEX6 =
"ping_8php.html":[5,0,1,78],
"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,78,0],
"plugin_8php.html":[5,0,0,61],
"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,61,22],
"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,61,25],
"plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3":[5,0,0,61,21],
"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,61,23],
"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,61,26],
"plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3":[5,0,0,61,22],
"plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[5,0,0,61,8],
"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,61,16],
"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,61,19],
"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,61,17],
"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,61,20],
"plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[5,0,0,61,7],
"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,61,15],
"plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4":[5,0,0,61,13],
"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,61,29],
"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,61,16],
"plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4":[5,0,0,61,14],
"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,61,30],
"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[5,0,0,61,9],
"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,61,27],
"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,61,28],
"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[5,0,0,61,11],
"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,61,24],
"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,61,28],
"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,61,25],
"plugin_8php.html#a67ca417634de2d0beffffc54aeb951ff":[5,0,0,61,12],
"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,61,29],
"plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[5,0,0,61,4],
"plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[5,0,0,61,0],
"plugin_8php.html#a855c4fdb38c0fc2714d537752a4347f9":[5,0,0,61,18],
"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,61,30],
"plugin_8php.html#a855c4fdb38c0fc2714d537752a4347f9":[5,0,0,61,19],
"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,61,31],
"plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[5,0,0,61,1],
"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,61,26],
"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,61,23],
"plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf":[5,0,0,61,12],
"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,61,17],
"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,61,27],
"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,61,24],
"plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf":[5,0,0,61,13],
"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,61,18],
"plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[5,0,0,61,3],
"plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[5,0,0,61,6],
"plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[5,0,0,61,2],
"plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b":[5,0,0,61,14],
"plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b":[5,0,0,61,15],
"plugin_8php.html#af92789f559b89a380e49d303218aeeca":[5,0,0,61,10],
"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,61,20],
"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,61,21],
"plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,61,5],
"po2php_8php.html":[5,0,2,7],
"po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,7,0],
@ -245,9 +249,5 @@ var NAVTREEINDEX6 =
"post__to__red_8php.html#a7e68a8d9c83cb28d032aad3ea85ce0a6":[5,0,2,1,0,0,13],
"post__to__red_8php.html#a8ec8f8809e3c5d1b2c9598c8185d63aa":[5,0,2,1,0,0,4],
"post__to__red_8php.html#a906be8f72cf1aa2e199c0683ea6a4017":[5,0,2,1,0,0,15],
"post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f":[5,0,2,1,0,0,10],
"post__to__red_8php.html#a99811555b30bde504a863e44015f2f19":[5,0,2,1,0,0,20],
"post__to__red_8php.html#aa97aeda12ef080665f16311a4e1eb901":[5,0,2,1,0,0,14],
"post__to__red_8php.html#aacba7a0646fc00ae6ac4f5dc383fccab":[5,0,2,1,0,0,8],
"post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65":[5,0,2,1,0,0,19]
"post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f":[5,0,2,1,0,0,10]
};

14
doc/html/navtreeindex7.js
View File

@ -1,5 +1,9 @@
var NAVTREEINDEX7 =
{
"post__to__red_8php.html#a99811555b30bde504a863e44015f2f19":[5,0,2,1,0,0,20],
"post__to__red_8php.html#aa97aeda12ef080665f16311a4e1eb901":[5,0,2,1,0,0,14],
"post__to__red_8php.html#aacba7a0646fc00ae6ac4f5dc383fccab":[5,0,2,1,0,0,8],
"post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65":[5,0,2,1,0,0,19],
"post__to__red_8php.html#ae0b881461afbdba93d9329068ea52136":[5,0,2,1,0,0,7],
"post__to__red_8php.html#ae6f3a2c0561cbeacda5be565b06de8a7":[5,0,2,1,0,0,6],
"post__to__red_8php.html#aeec4125719184e7b097b3b9fba3101b5":[5,0,2,1,0,0,0],
@ -71,9 +75,10 @@ var NAVTREEINDEX7 =
"search__ac_8php.html":[5,0,1,98],
"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,98,0],
"security_8php.html":[5,0,0,69],
"security_8php.html#a15e0f8f511cc06192db63387f97238b3":[5,0,0,69,11],
"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,69,2],
"security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c":[5,0,0,69,11],
"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,69,4],
"security_8php.html#a6126c77a1267e046ac59cf864613f011":[5,0,0,69,10],
"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[5,0,0,69,5],
"security_8php.html#a8d23d2597aae380a3341872fe9513380":[5,0,0,69,1],
"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[5,0,0,69,7],
@ -81,7 +86,6 @@ var NAVTREEINDEX7 =
"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[5,0,0,69,9],
"security_8php.html#acd06ef411116115c2f0a92633700db8a":[5,0,0,69,6],
"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[5,0,0,69,0],
"security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809":[5,0,0,69,10],
"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[5,0,0,69,8],
"session_8php.html":[5,0,0,70],
"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[5,0,0,70,4],
@ -245,9 +249,5 @@ var NAVTREEINDEX7 =
"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,76,29],
"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,76,17],
"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,76,55],
"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,76,36],
"text_8php.html#aac0969ae09853205992ba06ab9f9f61a":[5,0,0,76,28],
"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,76,90],
"text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[5,0,0,76,69],
"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,76,85]
"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,76,36]
};

4
doc/html/navtreeindex8.js
View File

@ -1,5 +1,9 @@
var NAVTREEINDEX8 =
{
"text_8php.html#aac0969ae09853205992ba06ab9f9f61a":[5,0,0,76,28],
"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,76,90],
"text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[5,0,0,76,69],
"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,76,85],
"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,76,88],
"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,76,56],
"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,76,37],

2
doc/html/permissions_8php.html
View File

@ -197,7 +197,7 @@ Functions</h2></td></tr>
</dl>
<dl class="section return"><dt>Returns</dt><dd>: array of all permissions, key is permission name, value is true or false </dd></dl>
<p>Referenced by <a class="el" href="achievements_8php.html#a35ae04ada0e227d19671f289a32fb30e">achievements_content()</a>, <a class="el" href="blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12">blocks_content()</a>, <a class="el" href="security_8php.html#a8d23d2597aae380a3341872fe9513380">change_channel()</a>, <a class="el" href="channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1">channel_content()</a>, <a class="el" href="connedit_8php.html#a795acb3d9d841f55c255d7611681ab67">connedit_content()</a>, <a class="el" href="editlayout_8php.html#aa877e4157a26b099de904164181dd386">editlayout_content()</a>, <a class="el" href="editwebpage_8php.html#a375e945255fad79a71036528f7480650">editwebpage_content()</a>, <a class="el" href="filestorage_8php.html#a61bb1be78472555df4ce619f51014040">filestorage_content()</a>, <a class="el" href="layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50">layouts_content()</a>, <a class="el" href="page_8php.html#a91a5f649f68406149108bded1dc90b22">page_content()</a>, <a class="el" href="webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d">webpages_content()</a>, and <a class="el" href="zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0">zfinger_init()</a>.</p>
<p>Referenced by <a class="el" href="achievements_8php.html#a35ae04ada0e227d19671f289a32fb30e">achievements_content()</a>, <a class="el" href="blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12">blocks_content()</a>, <a class="el" href="security_8php.html#a8d23d2597aae380a3341872fe9513380">change_channel()</a>, <a class="el" href="channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1">channel_content()</a>, <a class="el" href="connedit_8php.html#a795acb3d9d841f55c255d7611681ab67">connedit_content()</a>, <a class="el" href="editlayout_8php.html#aa877e4157a26b099de904164181dd386">editlayout_content()</a>, <a class="el" href="editwebpage_8php.html#a375e945255fad79a71036528f7480650">editwebpage_content()</a>, <a class="el" href="filestorage_8php.html#a61bb1be78472555df4ce619f51014040">filestorage_content()</a>, <a class="el" href="layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50">layouts_content()</a>, <a class="el" href="page_8php.html#a91a5f649f68406149108bded1dc90b22">page_content()</a>, <a class="el" href="webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d">webpages_content()</a>, <a class="el" href="zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0">zfinger_init()</a>, and <a class="el" href="zot_8php.html#a7ac30ff51274bf0b6d3eade37972145c">zot_refresh()</a>.</p>
</div>
</div>

25
doc/html/plugin_8php.html
View File

File diff suppressed because one or more lines are too long

1
doc/html/plugin_8php.js
View File

@ -12,6 +12,7 @@ var plugin_8php =
[ "head_add_js", "plugin_8php.html#a516591850f4fd49fd1425cfa54089db8", null ],
[ "head_get_css", "plugin_8php.html#af92789f559b89a380e49d303218aeeca", null ],
[ "head_get_js", "plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1", null ],
[ "head_get_main_js", "plugin_8php.html#a67ca417634de2d0beffffc54aeb951ff", null ],
[ "head_remove_css", "plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf", null ],
[ "head_remove_js", "plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4", null ],
[ "insert_hook", "plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b", null ],

BIN
doc/html/rm-64.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

1
doc/html/search/all_68.js
View File

@ -7,6 +7,7 @@ var searchData=
['head_5fget_5fcss',['head_get_css',['../plugin_8php.html#af92789f559b89a380e49d303218aeeca',1,'plugin.php']]],
['head_5fget_5ficon',['head_get_icon',['../classApp.html#af17df107f2216ddf5ad2a7e0f2ba2166',1,'App\head_get_icon()'],['../boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77',1,'head_get_icon():&#160;boot.php']]],
['head_5fget_5fjs',['head_get_js',['../plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1',1,'plugin.php']]],
['head_5fget_5fmain_5fjs',['head_get_main_js',['../plugin_8php.html#a67ca417634de2d0beffffc54aeb951ff',1,'plugin.php']]],
['head_5fremove_5fcss',['head_remove_css',['../plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf',1,'plugin.php']]],
['head_5fremove_5fjs',['head_remove_js',['../plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4',1,'plugin.php']]],
['head_5fset_5ficon',['head_set_icon',['../classApp.html#a8863703a0305eaa45eb970dbd2046291',1,'App\head_set_icon()'],['../boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84',1,'head_set_icon():&#160;boot.php']]],

2
doc/html/search/all_69.js
View File

@ -47,6 +47,7 @@ var searchData=
['is_5fwritable',['is_writable',['../classConversation.html#a5879199008b96bee7550b576d614e1c1',1,'Conversation']]],
['item',['Item',['../classItem.html',1,'']]],
['item_2ephp',['item.php',['../item_8php.html',1,'']]],
['item_5fadd_5fcid',['item_add_cid',['../items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df',1,'items.php']]],
['item_5fblocked',['ITEM_BLOCKED',['../boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f',1,'boot.php']]],
['item_5fbug',['ITEM_BUG',['../boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34',1,'boot.php']]],
['item_5fbuildblock',['ITEM_BUILDBLOCK',['../boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf',1,'boot.php']]],
@ -75,6 +76,7 @@ var searchData=
['item_5fpost_5ftype',['item_post_type',['../text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e',1,'text.php']]],
['item_5fredir_5fand_5freplace_5fimages',['item_redir_and_replace_images',['../conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533',1,'conversation.php']]],
['item_5frelay',['ITEM_RELAY',['../boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221',1,'boot.php']]],
['item_5fremove_5fcid',['item_remove_cid',['../items_8php.html#a5ed782ff5b9cf050bec931e06de12c00',1,'items.php']]],
['item_5fretained',['ITEM_RETAINED',['../boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81',1,'boot.php']]],
['item_5fspam',['ITEM_SPAM',['../boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb',1,'boot.php']]],
['item_5fstarred',['ITEM_STARRED',['../boot_8php.html#a7af107fab8d62b9a73801713b774ed30',1,'boot.php']]],

3
doc/html/search/all_70.js
View File

@ -41,6 +41,7 @@ var searchData=
['perms_5fauthed',['PERMS_AUTHED',['../boot_8php.html#a852d4036a3bed66af1534d014c4ecde2',1,'boot.php']]],
['perms_5fcontacts',['PERMS_CONTACTS',['../boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6',1,'boot.php']]],
['perms_5fnetwork',['PERMS_NETWORK',['../boot_8php.html#a6df1102664f64b274810db85197c2755',1,'boot.php']]],
['perms_5fpending',['PERMS_PENDING',['../boot_8php.html#a205d013103997adfa72953d2f20c01e1',1,'boot.php']]],
['perms_5fpublic',['PERMS_PUBLIC',['../boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7',1,'boot.php']]],
['perms_5fr_5fabook',['PERMS_R_ABOOK',['../boot_8php.html#a3d6d4fc5fafcc9156811669158541caf',1,'boot.php']]],
['perms_5fr_5fpages',['PERMS_R_PAGES',['../boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e',1,'boot.php']]],
@ -114,7 +115,7 @@ var searchData=
['poller_2ephp',['poller.php',['../poller_8php.html',1,'']]],
['poller_5frun',['poller_run',['../poller_8php.html#a5f12df3a4738124b6c039971e87e76da',1,'poller.php']]],
['pop_5flang',['pop_lang',['../language_8php.html#a78bd204955ec4cc3a9ac651285a1689d',1,'language.php']]],
['populate_5facl',['populate_acl',['../acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31',1,'acl_selectors.php']]],
['populate_5facl',['populate_acl',['../acl__selectors_8php.html#ad25bba63a51a2b0b5b463efae50df528',1,'acl_selectors.php']]],
['post_2ephp',['post.php',['../post_8php.html',1,'']]],
['post_5factivity_5fitem',['post_activity_item',['../items_8php.html#a410f9c743877c125ca06312373346903',1,'items.php']]],
['post_5finit',['post_init',['../post_8php.html#af4b48181ce773ef0cdfc972441445c34',1,'post.php']]],

4
doc/html/search/all_73.js
View File

@ -101,8 +101,8 @@ var searchData=
['storage_5fdefault_5fpermissions',['STORAGE_DEFAULT_PERMISSIONS',['../boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6',1,'boot.php']]],
['store',['store',['../classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b',1,'photo_driver']]],
['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]],
['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809',1,'security.php']]],
['stream_5fperms_5fxchans',['stream_perms_xchans',['../security_8php.html#a15e0f8f511cc06192db63387f97238b3',1,'security.php']]],
['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#a6126c77a1267e046ac59cf864613f011',1,'security.php']]],
['stream_5fperms_5fxchans',['stream_perms_xchans',['../security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c',1,'security.php']]],
['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]],
['string_5fsplitter',['string_splitter',['../spam_8php.html#a05861201147b9a538d006f0269255cf9',1,'spam.php']]],
['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]],

1
doc/html/search/functions_68.js
View File

@ -7,6 +7,7 @@ var searchData=
['head_5fget_5fcss',['head_get_css',['../plugin_8php.html#af92789f559b89a380e49d303218aeeca',1,'plugin.php']]],
['head_5fget_5ficon',['head_get_icon',['../classApp.html#af17df107f2216ddf5ad2a7e0f2ba2166',1,'App\head_get_icon()'],['../boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77',1,'head_get_icon():&#160;boot.php']]],
['head_5fget_5fjs',['head_get_js',['../plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1',1,'plugin.php']]],
['head_5fget_5fmain_5fjs',['head_get_main_js',['../plugin_8php.html#a67ca417634de2d0beffffc54aeb951ff',1,'plugin.php']]],
['head_5fremove_5fcss',['head_remove_css',['../plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf',1,'plugin.php']]],
['head_5fremove_5fjs',['head_remove_js',['../plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4',1,'plugin.php']]],
['head_5fset_5ficon',['head_set_icon',['../classApp.html#a8863703a0305eaa45eb970dbd2046291',1,'App\head_set_icon()'],['../boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84',1,'head_set_icon():&#160;boot.php']]],

2
doc/html/search/functions_69.js
View File

@ -40,6 +40,7 @@ var searchData=
['is_5fwall_5fto_5fwall',['is_wall_to_wall',['../classItem.html#aabf87ded59c25b5fe2b2296678e70509',1,'Item']]],
['is_5fwindows',['is_windows',['../boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08',1,'boot.php']]],
['is_5fwritable',['is_writable',['../classConversation.html#a5879199008b96bee7550b576d614e1c1',1,'Conversation']]],
['item_5fadd_5fcid',['item_add_cid',['../items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df',1,'items.php']]],
['item_5fcheck_5fservice_5fclass',['item_check_service_class',['../item_8php.html#a5b1b36cb301a94b38150074f0d424e74',1,'item.php']]],
['item_5fcontent',['item_content',['../item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221',1,'item.php']]],
['item_5fexpire',['item_expire',['../items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc',1,'items.php']]],
@ -52,6 +53,7 @@ var searchData=
['item_5fpost',['item_post',['../item_8php.html#a693cd09805755ab85bbb5ecae69a48c3',1,'item.php']]],
['item_5fpost_5ftype',['item_post_type',['../text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e',1,'text.php']]],
['item_5fredir_5fand_5freplace_5fimages',['item_redir_and_replace_images',['../conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533',1,'conversation.php']]],
['item_5fremove_5fcid',['item_remove_cid',['../items_8php.html#a5ed782ff5b9cf050bec931e06de12c00',1,'items.php']]],
['item_5fstore',['item_store',['../items_8php.html#a2541e6861a56d145c9281877cc501615',1,'items.php']]],
['item_5fstore_5fupdate',['item_store_update',['../items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484',1,'items.php']]],
['items_5ffetch',['items_fetch',['../items_8php.html#a756738301f2ed96be50232500677d58a',1,'items.php']]]

2
doc/html/search/functions_70.js
View File

@ -43,7 +43,7 @@ var searchData=
['poke_5finit',['poke_init',['../poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b',1,'poke.php']]],
['poller_5frun',['poller_run',['../poller_8php.html#a5f12df3a4738124b6c039971e87e76da',1,'poller.php']]],
['pop_5flang',['pop_lang',['../language_8php.html#a78bd204955ec4cc3a9ac651285a1689d',1,'language.php']]],
['populate_5facl',['populate_acl',['../acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31',1,'acl_selectors.php']]],
['populate_5facl',['populate_acl',['../acl__selectors_8php.html#ad25bba63a51a2b0b5b463efae50df528',1,'acl_selectors.php']]],
['post_5factivity_5fitem',['post_activity_item',['../items_8php.html#a410f9c743877c125ca06312373346903',1,'items.php']]],
['post_5finit',['post_init',['../post_8php.html#af4b48181ce773ef0cdfc972441445c34',1,'post.php']]],
['post_5fpost',['post_post',['../post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75',1,'post.php']]],

4
doc/html/search/functions_73.js
View File

@ -82,8 +82,8 @@ var searchData=
['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]],
['store',['store',['../classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b',1,'photo_driver']]],
['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]],
['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809',1,'security.php']]],
['stream_5fperms_5fxchans',['stream_perms_xchans',['../security_8php.html#a15e0f8f511cc06192db63387f97238b3',1,'security.php']]],
['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#a6126c77a1267e046ac59cf864613f011',1,'security.php']]],
['stream_5fperms_5fxchans',['stream_perms_xchans',['../security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c',1,'security.php']]],
['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]],
['string_5fsplitter',['string_splitter',['../spam_8php.html#a05861201147b9a538d006f0269255cf9',1,'spam.php']]],
['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]],

1
doc/html/search/variables_70.js
View File

@ -18,6 +18,7 @@ var searchData=
['perms_5fauthed',['PERMS_AUTHED',['../boot_8php.html#a852d4036a3bed66af1534d014c4ecde2',1,'boot.php']]],
['perms_5fcontacts',['PERMS_CONTACTS',['../boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6',1,'boot.php']]],
['perms_5fnetwork',['PERMS_NETWORK',['../boot_8php.html#a6df1102664f64b274810db85197c2755',1,'boot.php']]],
['perms_5fpending',['PERMS_PENDING',['../boot_8php.html#a205d013103997adfa72953d2f20c01e1',1,'boot.php']]],
['perms_5fpublic',['PERMS_PUBLIC',['../boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7',1,'boot.php']]],
['perms_5fr_5fabook',['PERMS_R_ABOOK',['../boot_8php.html#a3d6d4fc5fafcc9156811669158541caf',1,'boot.php']]],
['perms_5fr_5fpages',['PERMS_R_PAGES',['../boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e',1,'boot.php']]],

16
doc/html/security_8php.html
View File

@ -132,10 +132,10 @@ Functions</h2></td></tr>
<tr class="separator:a77ba0d1889a39cf32434c5ce96fe1433"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a444ac867dfa8c37cf0a7a226412bee28"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="security_8php.html#a444ac867dfa8c37cf0a7a226412bee28">check_form_security_token_ForbiddenOnErr</a> ($typename= '', $formname= 'form_security_token')</td></tr>
<tr class="separator:a444ac867dfa8c37cf0a7a226412bee28"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:ae92c5c1a1cbbc49ddbb8b3265d2db809"><td class="memItemLeft" align="right" valign="top"><a class="el" href="theme_2mytheme_2php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a">if</a>(!function_exists('init_groups_visitor'))&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809">stream_perms_api_uids</a> ($perms_min=<a class="el" href="boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f">PERMS_SITE</a>)</td></tr>
<tr class="separator:ae92c5c1a1cbbc49ddbb8b3265d2db809"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a15e0f8f511cc06192db63387f97238b3"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="security_8php.html#a15e0f8f511cc06192db63387f97238b3">stream_perms_xchans</a> ($perms_min=<a class="el" href="boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f">PERMS_SITE</a>)</td></tr>
<tr class="separator:a15e0f8f511cc06192db63387f97238b3"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a6126c77a1267e046ac59cf864613f011"><td class="memItemLeft" align="right" valign="top"><a class="el" href="theme_2mytheme_2php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a">if</a>(!function_exists('init_groups_visitor'))&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="security_8php.html#a6126c77a1267e046ac59cf864613f011">stream_perms_api_uids</a> ($perms=NULL)</td></tr>
<tr class="separator:a6126c77a1267e046ac59cf864613f011"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a3ef2be6a7e4928e39d50059d6feb457c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c">stream_perms_xchans</a> ($perms=NULL)</td></tr>
<tr class="separator:a3ef2be6a7e4928e39d50059d6feb457c"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table>
<h2 class="groupheader">Function Documentation</h2>
<a class="anchor" id="adc7bf51e3b8d67bd80e9348f9ab03733"></a>
@ -421,7 +421,7 @@ Functions</h2></td></tr>
</div>
</div>
<a class="anchor" id="ae92c5c1a1cbbc49ddbb8b3265d2db809"></a>
<a class="anchor" id="a6126c77a1267e046ac59cf864613f011"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
@ -429,7 +429,7 @@ Functions</h2></td></tr>
<td class="memname"><a class="el" href="theme_2mytheme_2php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a">if</a> (!function_exists('init_groups_visitor')) stream_perms_api_uids </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$perms_min</em> = <code><a class="el" href="boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f">PERMS_SITE</a></code></td><td>)</td>
<td class="paramname"><em>$perms</em> = <code>NULL</code></td><td>)</td>
<td></td>
</tr>
</table>
@ -439,7 +439,7 @@ Functions</h2></td></tr>
</div>
</div>
<a class="anchor" id="a15e0f8f511cc06192db63387f97238b3"></a>
<a class="anchor" id="a3ef2be6a7e4928e39d50059d6feb457c"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
@ -447,7 +447,7 @@ Functions</h2></td></tr>
<td class="memname">stream_perms_xchans </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$perms_min</em> = <code><a class="el" href="boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f">PERMS_SITE</a></code></td><td>)</td>
<td class="paramname"><em>$perms</em> = <code>NULL</code></td><td>)</td>
<td></td>
</tr>
</table>

4
doc/html/security_8php.js
View File

@ -10,6 +10,6 @@ var security_8php =
[ "item_permissions_sql", "security_8php.html#a9355488460ab11d6058656ff919e5cf9", null ],
[ "permissions_sql", "security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f", null ],
[ "public_permissions_sql", "security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01", null ],
[ "stream_perms_api_uids", "security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809", null ],
[ "stream_perms_xchans", "security_8php.html#a15e0f8f511cc06192db63387f97238b3", null ]
[ "stream_perms_api_uids", "security_8php.html#a6126c77a1267e046ac59cf864613f011", null ],
[ "stream_perms_xchans", "security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c", null ]
];

8
doc/html/text_8php.html
View File

File diff suppressed because one or more lines are too long

2
doc/html/typohelper_8php.html
View File

@ -130,7 +130,7 @@ Variables</h2></td></tr>
<b>Initial value:</b><div class="fragment"><div class="line">= &lt;&lt;&lt; <a class="code" href="typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805">EOT</a></div>
<div class="line"> error_reporting(E_ERROR | E_WARNING | E_PARSE )</div>
</div><!-- fragment -->
<p>Referenced by <a class="el" href="include_2api_8php.html#aea2dda92a155f2843a0ca188d8dfdf25">api_date()</a>, <a class="el" href="setup_8php.html#a14d208682a88632290c895d20da6e7d6">check_php()</a>, <a class="el" href="text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3">check_webbie()</a>, <a class="el" href="dba__driver_8php.html#ab222aa1dbf9ea93b320f82028739127e">dbesc()</a>, <a class="el" href="classdba__mysql.html#a99a7691ea6cb1300031fb6549379066e">dba_mysql\escape()</a>, <a class="el" href="classdba__mysqli.html#a27d6a748af7f80028801306e7ea33f64">dba_mysqli\escape()</a>, <a class="el" href="plugin_8php.html#af92789f559b89a380e49d303218aeeca">head_get_css()</a>, <a class="el" href="plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1">head_get_js()</a>, <a class="el" href="items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484">item_store_update()</a>, <a class="el" href="items_8php.html#aa2d3caa2f27720762b5c729e07df40fb">list_post_dates()</a>, <a class="el" href="setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a">load_database()</a>, <a class="el" href="include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe">photos_album_get_db_idstr()</a>, <a class="el" href="mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080">photos_post()</a>, <a class="el" href="items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0">posted_dates()</a>, <a class="el" href="datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82">relative_date()</a>, <a class="el" href="security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809">stream_perms_api_uids()</a>, <a class="el" href="security_8php.html#a15e0f8f511cc06192db63387f97238b3">stream_perms_xchans()</a>, <a class="el" href="thing_8php.html#a8be23b1d475ec3d9291999221c674c80">thing_init()</a>, and <a class="el" href="text_8php.html#aaed4413ed8918838b517e3b2fafaea0d">xmlify()</a>.</p>
<p>Referenced by <a class="el" href="include_2api_8php.html#aea2dda92a155f2843a0ca188d8dfdf25">api_date()</a>, <a class="el" href="setup_8php.html#a14d208682a88632290c895d20da6e7d6">check_php()</a>, <a class="el" href="text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3">check_webbie()</a>, <a class="el" href="dba__driver_8php.html#ab222aa1dbf9ea93b320f82028739127e">dbesc()</a>, <a class="el" href="classdba__mysql.html#a99a7691ea6cb1300031fb6549379066e">dba_mysql\escape()</a>, <a class="el" href="classdba__mysqli.html#a27d6a748af7f80028801306e7ea33f64">dba_mysqli\escape()</a>, <a class="el" href="plugin_8php.html#af92789f559b89a380e49d303218aeeca">head_get_css()</a>, <a class="el" href="plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1">head_get_js()</a>, <a class="el" href="plugin_8php.html#a67ca417634de2d0beffffc54aeb951ff">head_get_main_js()</a>, <a class="el" href="items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484">item_store_update()</a>, <a class="el" href="items_8php.html#aa2d3caa2f27720762b5c729e07df40fb">list_post_dates()</a>, <a class="el" href="setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a">load_database()</a>, <a class="el" href="include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe">photos_album_get_db_idstr()</a>, <a class="el" href="mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080">photos_post()</a>, <a class="el" href="items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0">posted_dates()</a>, <a class="el" href="datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82">relative_date()</a>, <a class="el" href="security_8php.html#a6126c77a1267e046ac59cf864613f011">stream_perms_api_uids()</a>, <a class="el" href="security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c">stream_perms_xchans()</a>, <a class="el" href="thing_8php.html#a8be23b1d475ec3d9291999221c674c80">thing_init()</a>, and <a class="el" href="text_8php.html#aaed4413ed8918838b517e3b2fafaea0d">xmlify()</a>.</p>
</div>
</div>

2
doc/html/zot_8php.html
View File

@ -213,7 +213,7 @@ Functions</h2></td></tr>
</div><div class="memdoc">
<p>Send a zot packet to all hubs where this channel is duplicated, refreshing such things as personal settings, channel permissions, address book updates, etc. </p>
<p>Referenced by <a class="el" href="connections_8php.html#a15af118efee9c948b6f8294e54a73bb2">connections_clone()</a>, <a class="el" href="connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5">connedit_clone()</a>, <a class="el" href="notes_8php.html#a4dbd7b1f906440746af48b484d66535a">notes_init()</a>, and <a class="el" href="settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586">settings_post()</a>.</p>
<p>Referenced by <a class="el" href="connections_8php.html#a15af118efee9c948b6f8294e54a73bb2">connections_clone()</a>, <a class="el" href="connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5">connedit_clone()</a>, <a class="el" href="notes_8php.html#a4dbd7b1f906440746af48b484d66535a">notes_init()</a>, <a class="el" href="profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04">profiles_post()</a>, and <a class="el" href="settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586">settings_post()</a>.</p>
</div>
</div>

13
include/Contact.php
View File

@ -133,6 +133,19 @@ function abook_toggle_flag($abook,$flag) {
intval($abook['abook_id']),
intval($abook['abook_channel'])
);
// if unsetting the archive bit, update the timestamps so we'll try to connect for an additional 30 days.
if(($flag === ABOOK_FLAG_ARCHIVED) && ($abook['abook_flags'] & ABOOK_FLAG_ARCHIVED)) {
$r = q("update abook set abook_connected = '%s', abook_updated = '%s'
where abook_id = %d and abook_channel = %d limit 1",
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($abook['abook_id']),
intval($abook['abook_channel'])
);
}
$a = get_app();
if($a->data['abook'])
$a->data['abook']['abook_flags'] = $a->data['abook']['abook_flags'] ^ $flag;

12
include/bbcode.php
View File

@ -344,9 +344,15 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$a = get_app();
// Move all spaces out of the tags
$Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
$Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
// Move all spaces out of the tags
// ....Uhm why?
// This is basically doing a trim() on the stuff in between tags, but it messes up
// carefully crafted bbcode and especially other pre-formatted code.
// Commenting out until we come up with a use case where it's needed. Then let's try and
// special case rather than a heavy-handed approach like this.
// $Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
// $Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
// Hide all [noparse] contained bbtags by spacefying them
if (strpos($Text,'[noparse]') !== false) {

2
include/conversation.php
View File

@ -909,7 +909,7 @@ function item_photo_menu($item){
}
if((local_user()) && local_user() == $item['uid']) {
$vsrc_link = $a->get_baseurl() . '/viewsrc/' . $item['id'];
$vsrc_link = 'javascript:viewsrc(' . $item['id'] . '); return false;';
if($item['parent'] == $item['id'] && $channel && ($channel_hash != $item['author_xchan'])) {
$sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
}

14
include/items.php
View File

@ -943,6 +943,8 @@ function map_scope($scope) {
return 'network: red';
case PERMS_SITE:
return 'site: ' . get_app()->get_hostname();
case PERMS_PENDING:
return 'any connections';
case PERMS_CONTACTS:
default:
return 'contacts';
@ -4085,7 +4087,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
}
if(! array_key_exists('nouveau',$arr)) {
$sql_extra2 = " AND item.parent = item.id ";
$sql_extra2 = " AND item.parent = item.id ";
$sql_extra3 = '';
}
@ -4126,12 +4128,12 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
$pager_sql = sprintf(" LIMIT %d, %d ",intval($arr['start']), intval($arr['records']));
if(array_key_exists('cmin',$arr) || array_key_exists('cmax',$arr)) {
if(($arr['cmin'] != 0) || ($arr['cmax'] != 99)) {
if(($arr['cmin'] != 0) || ($arr['cmax'] != 99)) {
// Not everybody who shows up in the network stream will be in your address book.
// By default those that aren't are assumed to have closeness = 99; but this isn't
// recorded anywhere. So if cmax is 99, we'll open the search up to anybody in
// the stream with a NULL address book entry.
// Not everybody who shows up in the network stream will be in your address book.
// By default those that aren't are assumed to have closeness = 99; but this isn't
// recorded anywhere. So if cmax is 99, we'll open the search up to anybody in
// the stream with a NULL address book entry.
$sql_nets .= " AND ";

40
include/permissions.php
View File

@ -177,32 +177,36 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) {
continue;
}
// If PERMS_CONTACTS or PERMS_SPECIFIC, they need to be in your address book
// $x is a valid address book entry
// From here on we require that the observer be a connection and
// handle whether we're allowing any, approved or specific ones
if(! $x) {
$ret[$perm_name] = false;
continue;
}
// They are in your address book, but haven't been approved
if($r[0][$channel_perm] & PERMS_PENDING) {
$ret[$perm_name] = true;
continue;
}
if($x[0]['abook_flags'] & ABOOK_FLAG_PENDING) {
$ret[$perm_name] = false;
continue;
}
if(($r) && ($r[0][$channel_perm] & PERMS_CONTACTS)) {
// They're a contact, so they have permission
// They're a contact, so they have permission
if($r[0][$channel_perm] & PERMS_CONTACTS) {
$ret[$perm_name] = true;
continue;
}
// Permission granted to certain channels. Let's see if the observer is one of them
if(($r) && ($r[0][$channel_perm] & PERMS_SPECIFIC)) {
if($r[0][$channel_perm] & PERMS_SPECIFIC) {
if(($x[0]['abook_my_perms'] & $global_perms[$perm_name][1])) {
$ret[$perm_name] = true;
continue;
@ -216,7 +220,6 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) {
}
$arr = array(
'channel_id' => $uid,
'observer_hash' => $observer_xchan,
@ -229,7 +232,6 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) {
function perm_is_allowed($uid,$observer_xchan,$permission) {
$arr = array(
'channel_id' => $uid,
'observer_hash' => $observer_xchan,
@ -280,7 +282,6 @@ function perm_is_allowed($uid,$observer_xchan,$permission) {
}
}
// Check if this $uid is actually the $observer_xchan
if($r[0]['channel_hash'] === $observer_xchan)
@ -312,16 +313,27 @@ function perm_is_allowed($uid,$observer_xchan,$permission) {
if($c)
return true;
return false;
}
}
// From here on we require that the observer be a connection and
// handle whether we're allowing any, approved or specific ones
if(! $x) {
return false;
}
// They are in your address book, but haven't been approved
if($r[0][$channel_perm] & PERMS_PENDING) {
return true;
}
if($x[0]['abook_flags'] & ABOOK_FLAG_PENDING) {
return false;
}
// They're a contact, so they have permission
if($r[0][$channel_perm] & PERMS_CONTACTS) {
return true;
}
@ -333,13 +345,9 @@ function perm_is_allowed($uid,$observer_xchan,$permission) {
return true;
}
// No permissions allowed.
return false;
}
@ -356,7 +364,6 @@ function check_list_permissions($uid,$arr,$perm) {
}
function site_default_perms() {
$typical = array(
@ -378,7 +385,6 @@ function site_default_perms() {
'delegate' => 0,
);
$global_perms = get_perms();
$ret = array();

12
include/photos.php
View File

@ -264,7 +264,7 @@ function photos_albums_list($channel,$observer) {
$sql_extra = permissions_sql($channel_id);
$albums = q("SELECT distinct album from photo where uid = %d and ( photo_flags = %d or photo_flags = %d ) $sql_extra order by created desc",
$albums = q("SELECT count( distinct resource_id ) as total, album from photo where uid = %d and ( photo_flags = %d or photo_flags = %d ) $sql_extra group by album order by created desc",
intval($channel_id),
intval(PHOTO_NORMAL),
intval(PHOTO_PROFILE)
@ -277,13 +277,15 @@ function photos_albums_list($channel,$observer) {
if($albums) {
$ret['success'] = true;
$ret['albums'] = array();
foreach($albums as $k => $album) {
$entry = array(
'text' => $album['album'],
'text' => $album['album'],
'total' => $album['total'],
'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . bin2hex($album['album']),
'urlencode' => urlencode($album['album']),
'bin2hex' => bin2hex($album['album']));
$ret[] = $entry;
$ret['albums'][] = $entry;
}
}
return $ret;
@ -305,11 +307,11 @@ function photos_album_widget($channelx,$observer,$albums = null) {
$albums = photos_albums_list($channelx,$observer);
}
if($albums) {
if($albums['success']) {
$o = replace_macros(get_markup_template('photo_albums.tpl'),array(
'$nick' => $channelx['channel_address'],
'$title' => t('Photo Albums'),
'$albums' => $albums,
'$albums' => $albums['albums'],
'$baseurl' => z_root(),
'$upload' => ((perm_is_allowed($channelx['channel_id'],(($observer) ? $observer['xchan_hash'] : ''),'post_photos'))
? t('Upload New Photos') : '')

21
include/security.php
View File

@ -311,7 +311,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
}
function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
if (!check_form_security_token($typename, $formname)) {
$a = get_app();
$a = get_app();
logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
header('HTTP/1.1 403 Forbidden');
@ -342,19 +342,22 @@ function init_groups_visitor($contact_id) {
// This is used to determine which uid have posts which are visible to the logged in user (from the API) for the
// public_timeline, and we can use this in a community page by making $perms_min = PERMS_NETWORK unless logged in.
// public_timeline, and we can use this in a community page by making
// $perms = (PERMS_NETWORK|PERMS_PUBLIC) unless logged in.
// Collect uids of everybody on this site who has opened their posts to everybody on this site (or greater visibility)
// We always include yourself if logged in because you can always see your own posts
// resolving granular permissions for the observer against every person and every post on the site
// will likely be too expensive.
// Returns a string list of comma separated channel_ids suitable for direct inclusion in a SQL query
function stream_perms_api_uids($perms_min = PERMS_SITE) {
function stream_perms_api_uids($perms = NULL ) {
$perms = is_null($perms) ? (PERMS_SITE|PERMS_NETWORK|PERMS_PUBLIC) : $perms;
$ret = array();
if(local_user())
$ret[] = local_user();
$r = q("select channel_id from channel where channel_r_stream > 0 and channel_r_stream <= %d and not (channel_pageflags & %d)",
intval($perms_min),
$r = q("select channel_id from channel where channel_r_stream > 0 and (channel_r_stream & %d) and not (channel_pageflags & %d)",
intval($perms),
intval(PAGE_CENSORED|PAGE_SYSTEM|PAGE_REMOVED)
);
if($r)
@ -373,13 +376,15 @@ function stream_perms_api_uids($perms_min = PERMS_SITE) {
return $str;
}
function stream_perms_xchans($perms_min = PERMS_SITE) {
function stream_perms_xchans($perms = NULL ) {
$perms = is_null($perms) ? (PERMS_SITE|PERMS_NETWORK|PERMS_PUBLIC) : $perms;
$ret = array();
if(local_user())
$ret[] = get_observer_hash();
$r = q("select channel_hash from channel where channel_r_stream > 0 and channel_r_stream <= %d and not (channel_pageflags & %d)",
intval($perms_min),
$r = q("select channel_hash from channel where channel_r_stream > 0 and (channel_r_stream & %d) and not (channel_pageflags & %d)",
intval($perms),
intval(PAGE_CENSORED|PAGE_SYETEM|PAGE_REMOVED)
);
if($r)

26
include/zot.php
View File

@ -314,11 +314,8 @@ function zot_refresh($them,$channel = null, $force = false) {
if(! $x['success'])
return false;
$xchan_hash = $x['hash'];
$their_perms = 0;
if($channel) {
$global_perms = get_perms();
if($j['permissions']['data']) {
@ -417,6 +414,9 @@ function zot_refresh($them,$channel = null, $force = false) {
if($z)
$default_perms = intval($z[0]['abook_my_perms']);
// Keep original perms to check if we need to notify them
$previous_perms = get_all_perms($channel['channel_id'],$x['hash']);
$y = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_their_perms, abook_my_perms, abook_created, abook_updated, abook_dob, abook_flags ) values ( %d, %d, '%s', %d, %d, '%s', '%s', '%s', %d )",
intval($channel['channel_account_id']),
intval($channel['channel_id']),
@ -431,8 +431,9 @@ function zot_refresh($them,$channel = null, $force = false) {
if($y) {
logger("New introduction received for {$channel['channel_name']}");
if($default_perms) {
// send back a permissions update for auto-friend/auto-permissions
$new_perms = get_all_perms($channel['channel_id'],$x['hash']);
if($new_perms != $previous_perms) {
// Send back a permissions update if permissions have changed
$z = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) limit 1",
dbesc($x['hash']),
intval($channel['channel_id']),
@ -455,8 +456,11 @@ function zot_refresh($them,$channel = null, $force = false) {
));
}
if($new_connection && (! ($new_connection[0]['abook_flags'] & ABOOK_FLAG_PENDING)) && ($their_perms & PERMS_R_STREAM))
if($new_connection && ($their_perms & PERMS_R_STREAM)) {
if(($channel['channel_w_stream'] & PERMS_PENDING)
|| (! ($new_connection[0]['abook_flags'] & ABOOK_FLAG_PENDING)) )
proc_run('php','include/onepoll.php',$new_connection[0]['abook_id']);
}
}
}
@ -1135,7 +1139,7 @@ function zot_import($arr, $sender_url) {
if(array_key_exists('iv',$data)) {
$data = json_decode(crypto_unencapsulate($data,get_config('system','prvkey')),true);
}
}
$incoming = $data['pickup'];
@ -1147,7 +1151,7 @@ function zot_import($arr, $sender_url) {
if(array_key_exists('iv',$i['notify'])) {
$i['notify'] = json_decode(crypto_unencapsulate($i['notify'],get_config('system','prvkey')),true);
}
}
logger('zot_import: notify: ' . print_r($i['notify'],true), LOGGER_DATA);
@ -1329,7 +1333,7 @@ function public_recips($msg) {
if(! $r)
$r = array();
$x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & " . PAGE_REMOVED . " ) and (( " . $col . " & " . PERMS_SPECIFIC . " ) and ( abook_my_perms & " . $field . " )) OR ( " . $col . " & " . PERMS_CONTACTS . " ) ",
$x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & " . PAGE_REMOVED . " ) and (( " . $col . " & " . PERMS_SPECIFIC . " ) and ( abook_my_perms & " . $field . " )) OR ( " . $col . " & " . PERMS_PENDING . " ) OR (( " . $col . " & " . PERMS_CONTACTS . " ) and not ( abook_flags & " . ABOOK_FLAG_PENDING . " )) ",
dbesc($msg['notify']['sender']['hash'])
);
@ -2044,12 +2048,12 @@ function build_sync_packet($uid = 0, $packet = null) {
if(! $uid)
return;
$r = q("select * from channel where channel_id = %d limit 1",
$r = q("select * from channel where channel_id = %d limit 1",
intval($uid)
);
if(! $r)
return;
$channel = $r[0];
$h = q("select * from hubloc where hubloc_hash = '%s'",

16
install/database.sql
View File

@ -573,6 +573,22 @@ CREATE TABLE IF NOT EXISTS `item_id` (
KEY `iid` (`iid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `likes` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`liker` char(128) NOT NULL DEFAULT '',
`likee` char(128) NOT NULL DEFAULT '',
`iid` int(11) NOT NULL DEFAULT '0',
`verb` char(255) NOT NULL DEFAULT '',
`target_type` char(255) NOT NULL DEFAULT '',
`target` mediumtext NOT NULL,
PRIMARY KEY (`id`),
KEY `liker` (`liker`),
KEY `likee` (`likee`),
KEY `iid` (`iid`),
KEY `verb` (`verb`),
KEY `target_type` (`target_type`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `mail` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`mail_flags` int(10) unsigned NOT NULL DEFAULT '0',

24
install/update.php
View File

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1112 );
define( 'UPDATE_VERSION' , 1113 );
/**
*
@ -1251,3 +1251,25 @@ function update_r1111() {
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}
function update_r1112() {
$r = q("CREATE TABLE IF NOT EXISTS `likes` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`liker` char(128) NOT NULL DEFAULT '',
`likee` char(128) NOT NULL DEFAULT '',
`iid` int(11) NOT NULL DEFAULT '0',
`verb` char(255) NOT NULL DEFAULT '',
`target_type` char(255) NOT NULL DEFAULT '',
`target` mediumtext NOT NULL,
PRIMARY KEY (`id`),
KEY `liker` (`liker`),
KEY `likee` (`likee`),
KEY `iid` (`iid`),
KEY `verb` (`verb`),
KEY `target_type` (`target_type`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8");
if($r)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}

2
mod/display.php
View File

@ -175,7 +175,7 @@ function display_content(&$a, $update = 0, $load = false) {
and mid = '%s'
AND (((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = ''
AND `item`.`deny_gid` = '' AND item_private = 0 )
and owner_xchan in ( " . stream_perms_xchans(($observer) ? PERMS_NETWORK : PERMS_PUBLIC) . " ))
and owner_xchan in ( " . stream_perms_xchans(($observer) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
OR owner_xchan = '%s')
$sql_extra )
group by mid limit 1",

8
mod/item.php
View File

@ -46,7 +46,7 @@ function item_post(&$a) {
call_hooks('post_local_start', $_REQUEST);
logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
// logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
@ -376,6 +376,7 @@ function item_post(&$a) {
}
}
$expires = '0000-00-00 00:00:00';
if(feature_enabled($profile_uid,'content_expire')) {
@ -396,6 +397,7 @@ function item_post(&$a) {
$body = z_input_filter($profile_uid,$body,$mimetype);
}
// Verify ability to use html or php!!!
$execflag = false;
@ -417,6 +419,7 @@ function item_post(&$a) {
}
}
if($mimetype === 'text/bbcode') {
// BBCODE alert: the following functions assume bbcode input
@ -465,7 +468,6 @@ function item_post(&$a) {
$body = preg_replace_callback('/\[img(.*?)\](.*?)\[\/img\]/ism','red_zrlify_img_callback',$body);
/**
*
* When a photo was uploaded into the message using the (profile wall) ajax
@ -513,6 +515,7 @@ function item_post(&$a) {
$body = scale_external_images($body,false);
/**
* Look for any tags and linkify them
*/
@ -603,7 +606,6 @@ function item_post(&$a) {
// BBCODE end alert
if(strlen($categories)) {
$cats = explode(',',$categories);
foreach($cats as $cat) {

2
mod/mood.php
View File

@ -19,7 +19,7 @@ function mood_init(&$a) {
$verbs = get_mood_verbs();
if(! in_array($verb,$verbs))
if(! array_key_exists($verb,$verbs))
return;
$activity = ACTIVITY_MOOD . '#' . urlencode($verb);

61
mod/network.php
View File

@ -104,7 +104,6 @@ function network_content(&$a, $update = 0, $load = false) {
$file = ((x($_GET,'file')) ? $_GET['file'] : '');
if(x($_GET,'search') || x($_GET,'file'))
$nouveau = true;
if($cid)
@ -205,25 +204,11 @@ function network_content(&$a, $update = 0, $load = false) {
// We only launch liveUpdate if you aren't filtering in some incompatible
// way and also you aren't writing a comment (discovered in javascript).
if($gid || $cid || $cmin || ($cmax != 99) || $star || $liked || $conv || $spam || $nouveau || $list)
$firehose = 0;
$o .= '<div id="live-network"></div>' . "\r\n";
$o .= "<script> var profile_uid = " . $_SESSION['uid']
. "; var netargs = '" . substr($a->cmd,8)
. '?f='
. ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '')
. ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '')
. ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '')
. ((x($_GET,'order')) ? '&order=' . $_GET['order'] : '')
. ((x($_GET,'liked')) ? '&liked=' . $_GET['liked'] : '')
. ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '')
. ((x($_GET,'spam')) ? '&spam=' . $_GET['spam'] : '')
. ((x($_GET,'cmin')) ? '&cmin=' . $_GET['cmin'] : '')
. ((x($_GET,'cmax')) ? '&cmax=' . $_GET['cmax'] : '')
. ((x($_GET,'file')) ? '&file=' . $_GET['file'] : '')
. ((x($_GET,'fh')) ? '&fh=' . $_GET['fh'] : '')
. "'; var profile_page = " . $a->pager['page'] . ";</script>";
$o .= "<script> var profile_uid = " . $_SESSION['uid'] . "; var profile_page = " . $a->pager['page'] . ";</script>";
$a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
'$baseurl' => z_root(),
@ -329,13 +314,10 @@ function network_content(&$a, $update = 0, $load = false) {
$uids = " and item.uid = " . local_user() . " ";
}
$simple_update = (($update) ? " and ( item.item_flags & " . intval(ITEM_UNSEEN) . " ) " : '');
if($load)
$simple_update = '';
$start = dba_timer();
if($nouveau && $load) {
// "New Item View" - show all items unthreaded in reverse created date order
@ -389,8 +371,6 @@ function network_content(&$a, $update = 0, $load = false) {
}
}
$first = dba_timer();
// Then fetch all the children of the parents that are on this page
$parents_str = '';
$update_unseen = '';
@ -406,22 +386,9 @@ function network_content(&$a, $update = 0, $load = false) {
dbesc($parents_str)
);
$second = dba_timer();
xchan_query($items);
$third = dba_timer();
$items = fetch_post_tags($items,true);
$fourth = dba_timer();
$items = conv_sort($items,$ordering);
//logger('items: ' . print_r($items,true));
}
else {
$items = array();
@ -432,8 +399,6 @@ function network_content(&$a, $update = 0, $load = false) {
}
// logger('items: ' . count($items));
if(($update_unseen) && (! $firehose))
$r = q("UPDATE `item` SET item_flags = ( item_flags ^ %d)
WHERE (item_flags & %d) AND `uid` = %d $update_unseen ",
@ -444,28 +409,10 @@ function network_content(&$a, $update = 0, $load = false) {
$mode = (($nouveau) ? 'network-new' : 'network');
$fifth = dba_timer();
$o .= conversation($a,$items,$mode,$update,'client');
$sixth = dba_timer();
if(($items) && (! $update))
$o .= alt_pager($a,count($items));
if($load) {
// logger('mod_network: load: ' . count($items) . ' items', LOGGER_DATA);
profiler($start,$first,'network parents');
profiler($first,$second,'network children');
profiler($second,$third,'network authors');
profiler($third,$fourth,'network tags');
profiler($fourth,$fifth,'network sort');
profiler($fifth,$sixth,'network render');
profiler($start,$sixth,'network total');
profiler(1,1,'-- ' . count($items));
}
return $o;
}

11
mod/photos.php
View File

@ -539,8 +539,8 @@ function photos_content(&$a) {
$albumselect = '<select id="photos-upload-album-select" name="album" size="4">';
$albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
if(count($albums)) {
foreach($albums as $album) {
if(count($albums['albums'])) {
foreach($albums['albums'] as $album) {
if(! $album['text'])
continue;
$selected = (($selname === $album['text']) ? ' selected="selected" ' : '');
@ -548,8 +548,6 @@ function photos_content(&$a) {
}
}
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
$albumselect .= '</select>';
$uploader = '';
@ -929,6 +927,10 @@ function photos_content(&$a) {
$edit = null;
if($can_post) {
if(array_key_exists('albums', $a->data))
$albums = get_app()->data['albums'];
else
$albums = photos_albums_list($a->data['channel'],$a->data['observer']);
$album_e = $ph[0]['album'];
$caption_e = $ph[0]['description'];
@ -939,6 +941,7 @@ function photos_content(&$a) {
'id' => $ph[0]['id'],
'rotatecw' => t('Rotate CW (right)'),
'rotateccw' => t('Rotate CCW (left)'),
'albums' => $albums['albums'],
'album' => $album_e,
'newalbum' => t('New album name'),
'nickname' => $a->data['channel']['channel_address'],

2
mod/search.php
View File

@ -143,7 +143,7 @@ function search_content(&$a,$update = 0, $load = false) {
WHERE item_restrict = 0
AND (((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = ''
AND `item`.`deny_gid` = '' AND item_private = 0 )
and owner_xchan in ( " . stream_perms_xchans(($observer) ? PERMS_NETWORK : PERMS_PUBLIC) . " ))
and owner_xchan in ( " . stream_perms_xchans(($observer) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
$pub_sql ) OR owner_xchan = '%s')
$sql_extra
group by mid ORDER BY created DESC $pager_sql",

3
mod/settings.php
View File

@ -792,7 +792,8 @@ function settings_content(&$a) {
$perm_opts = array(
array( t('Nobody except yourself'), 0),
array( t('Only those you specifically allow'), PERMS_SPECIFIC),
array( t('Anybody in your address book'), PERMS_CONTACTS),
array( t('Approved connections'), PERMS_CONTACTS),
array( t('Any connections'), PERMS_PENDING),
array( t('Anybody on this website'), PERMS_SITE),
array( t('Anybody in this network'), PERMS_NETWORK),
array( t('Anybody authenticated'), PERMS_AUTHED),

10343
util/messages.po
View File

File diff suppressed because it is too large Load Diff

0
util/shred/JSON.sh → util/shredder/JSON.sh
View File

0
util/shred/OAuth.sh → util/shredder/OAuth.sh
View File

36
util/shred/FriendicaOAuth.sh → util/shredder/ShredOAuth.sh
View File

@ -174,17 +174,45 @@ FO_statuses_home_timeline () {
FO_command () {
local command="$1"
local post="$2"
declare -a opts=("${!3}")
local params=(
$(OAuth_param 'screen_name' $screen_name)
$(OAuth_param 'count' $count)
)
local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "${redmatrix_url}/api/${command}.json" ${params[@]})
#echo "$3"
#echo '---'
#echo "${opts[@]}"
convscreen=$(OAuth_PE "$screen_name");
FO_ret=$(curl -s --get "${redmatrix_url}/api/${command}.json" --data "screen_name=${convscreen}&count=${count}" --header "${auth_header}")
data="screen_name=${convscreen}&count=${count}"
if [ ${#opts[@]} != 0 ]; then
for b in ${opts[@]}; do
lhs=`echo $b | awk -F= '{print $1};'`
rhs=`echo $b | awk -F= '{print $2};'`
params=("${params[@]}" $(OAuth_param "$lhs" "$rhs"))
data=$data"&""$lhs"="$rhs"
done
fi
#echo 'params: ' ${params[@]}
#echo 'data: ' $data
local auth_header='';
if [ "$post" == '1' ]; then
auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'POST' "${redmatrix_url}/api/${command}.json" ${params[@]})
FO_ret=$(curl -s "${redmatrix_url}/api/${command}.json" --data-urlencode "${data}" --header "${auth_header}")
else
auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "${redmatrix_url}/api/${command}.json" ${params[@]})
FO_ret=$(curl -s --get "${redmatrix_url}/api/${command}.json" --data "${data}" --header "${auth_header}")
fi
FO_rval=$?
return $FO_rval

BIN
util/shredder/jansson-2.6.tar.gz Normal file
View File

Binary file not shown.

BIN
util/shredder/jshon.tar.gz Normal file
View File

Binary file not shown.

63
util/shred/shred → util/shredder/shredder
View File

@ -112,10 +112,13 @@ load_config () {
# Source Config
[[ -f "$FCLI_RC" ]] && . "$FCLI_RC" || show_config_help 1
THISDIR=$(dirname $0)
if [ $THISDIR == '' ]; then THISDIR=. ; fi
PATH=$THISDIR:$PATH
# Source FriendicaOAuth.sh
OAuth_sh=$(which FriendicaOAuth.sh)
(( $? != 0 )) && echo 'Unable to locate FriendicaOAuth.sh! Make sure it is in searching PATH.' && exit 1
# Source ShredOAuth.sh
OAuth_sh=$(which ShredOAuth.sh)
(( $? != 0 )) && echo 'Unable to locate ShredOAuth.sh! Make sure it is in searching PATH.' && exit 1
source "$OAuth_sh"
# Source JSON.sh
@ -152,9 +155,10 @@ main () {
fcli_in_reply_to_status_id=
fcli_file=
fcli_help_flag=
JS_Fields=()
fcli_opts=
fcli_post=
while getopts "C:c:s:r:f:h:i" name
while getopts "C:c:s:r:f:q:hp" name
do
case $name in
c) fcli_command="$OPTARG";;
@ -163,7 +167,8 @@ main () {
r) fcli_in_reply_to_status_id="$OPTARG";;
f) fcli_file="$OPTARG";;
h) fcli_help_flag="1";;
i) JS_Fields=("${JS_Fields[@]}" "$OPTARG");;
p) fcli_post="1";;
q) fcli_opts=("${fcli_opts[@]}" "$OPTARG");;
?) usage
exit 2;;
esac
@ -171,9 +176,9 @@ main () {
load_config
if [[ "$fcli_help_flag" == "1" ]]; then case $fcli_command in
statuses_update)
show_statuses_update 0
;;
# statuses_update)
# show_statuses_update 0
# ;;
home_timeline)
show_home_timeline 0
;;
@ -198,33 +203,27 @@ main () {
return $FO_rval
;;
statuses_update)
[[ "$fcli_status" == "" ]] && show_statuses_update 1
FO_statuses_update 'json' "$fcli_status" "$fcli_in_reply_to_status_id"
JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
echo "$JS_Parsed" | js "user" "name" ,
echo -n " - "
echo "$JS_Parsed" | js "created_at"
echo "$JS_Parsed" | js "text"
echo ""
echo "------------------------------------------------------------------------------"
return $FO_rval
;;
# statuses_update)
# [[ "$fcli_status" == "" ]] && show_statuses_update 1
# FO_statuses_update 'json' "$fcli_status" "$fcli_in_reply_to_status_id"
# JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
# echo "$JS_Parsed" | js "user" "name" ,
# echo -n " - "
# echo "$JS_Parsed" | js "created_at"
# echo "$JS_Parsed" | js "text"
# echo ""
# echo "------------------------------------------------------------------------------"
# return $FO_rval
# ;;
*)
FO_command $fcli_command
JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
# echo "${fcli_opts[@]}"
# for a in ${JS_Parsed[@]}; do
FO_command "$fcli_command" "$fcli_post" fcli_opts[@]
echo $FO_ret
# if [ ${#JS_Fields[@]} != 0 ]; then
# for b in ${JS_Fields[@]}; do
# echo "$JS_Parsed" | js ${a} ${b}
# done
# else
echo "$JS_Parsed"
# fi
# done
return $FO_rval
;;

2
version.inc
View File

@ -1 +1 @@
2014-06-17.709
2014-06-22.714

39
view/js/main.js
View File

@ -112,8 +112,9 @@
return true;
}
function viewsrc(id) {
$.colorbox({href: 'viewsrc/' + id });
}
function qCommentInsert(obj,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
@ -196,17 +197,6 @@
msie = false; // $.browser.msie ;
/* setup tooltips *//*
$("a,.tt").each(function(){
var e = $(this);
var pos="bottom";
if (e.hasClass("tttop")) pos="top";
if (e.hasClass("ttbottom")) pos="bottom";
if (e.hasClass("ttleft")) pos="left";
if (e.hasClass("ttright")) pos="right";
e.tipTip({defaultPosition: pos, edgeOffset: 8});
});*/
var e = document.getElementById('content-complete');
if(e)
pageHasMoreContent = false;
@ -600,7 +590,7 @@ function updateConvItems(mode,data) {
var update_url;
if(typeof buildCmd == 'function') {
// if(typeof buildCmd == 'function') {
if(scroll_next) {
bParam_page = next_page;
page_load = true;
@ -609,12 +599,12 @@ function updateConvItems(mode,data) {
bParam_page = 1;
}
update_url = buildCmd();
}
else {
page_load = false;
var udargs = ((page_load) ? '/load' : '');
update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
}
// }
// else {
// page_load = false;
// var udargs = ((page_load) ? '/load' : '');
// update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
// }
if(page_load)
$("#page-spinner").spin('small');
@ -648,15 +638,6 @@ function updateConvItems(mode,data) {
}
function imgbright(node) {
// $(node).removeClass("drophide").addClass("drop");
}
function imgdull(node) {
// $(node).removeClass("drop").addClass("drophide");
}
function notify_popup_loader(notifyType) {
/* notifications template */

142
view/js/mod_settings.js
View File

@ -25,100 +25,98 @@ $(document).ready(function() {
});
function channel_privacy_macro(n) {
if(n == 0) {
$('#id_view_stream option').eq(0).attr('selected','selected');
$('#id_view_profile option').eq(0).attr('selected','selected');
$('#id_view_photos option').eq(0).attr('selected','selected');
$('#id_view_contacts option').eq(0).attr('selected','selected');
$('#id_view_storage option').eq(0).attr('selected','selected');
$('#id_view_pages option').eq(0).attr('selected','selected');
$('#id_send_stream option').eq(0).attr('selected','selected');
$('#id_post_wall option').eq(0).attr('selected','selected');
$('#id_post_comments option').eq(0).attr('selected','selected');
$('#id_post_mail option').eq(0).attr('selected','selected');
$('#id_post_photos option').eq(0).attr('selected','selected');
$('#id_tag_deliver option').eq(0).attr('selected','selected');
$('#id_chat option').eq(0).attr('selected','selected');
$('#id_write_storage option').eq(0).attr('selected','selected');
$('#id_write_pages option').eq(0).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
if(n == 0) {
$('#id_view_stream option').eq(0).attr('selected','selected');
$('#id_view_profile option').eq(0).attr('selected','selected');
$('#id_view_photos option').eq(0).attr('selected','selected');
$('#id_view_contacts option').eq(0).attr('selected','selected');
$('#id_view_storage option').eq(0).attr('selected','selected');
$('#id_view_pages option').eq(0).attr('selected','selected');
$('#id_send_stream option').eq(0).attr('selected','selected');
$('#id_post_wall option').eq(0).attr('selected','selected');
$('#id_post_comments option').eq(0).attr('selected','selected');
$('#id_post_mail option').eq(0).attr('selected','selected');
$('#id_post_photos option').eq(0).attr('selected','selected');
$('#id_tag_deliver option').eq(0).attr('selected','selected');
$('#id_chat option').eq(0).attr('selected','selected');
$('#id_write_storage option').eq(0).attr('selected','selected');
$('#id_write_pages option').eq(0).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
$('#id_republish option').eq(0).attr('selected','selected');
$('#id_bookmark option').eq(0).attr('selected','selected');
$('#id_profile_in_directory_onoff .off').removeClass('hidden');
$('#id_profile_in_directory_onoff .on').addClass('hidden');
$('#id_profile_in_directory').val(0);
}
if(n == 1) {
$('#id_view_stream option').eq(1).attr('selected','selected');
$('#id_view_profile option').eq(1).attr('selected','selected');
$('#id_view_photos option').eq(1).attr('selected','selected');
$('#id_view_contacts option').eq(1).attr('selected','selected');
$('#id_view_storage option').eq(1).attr('selected','selected');
$('#id_view_pages option').eq(1).attr('selected','selected');
$('#id_send_stream option').eq(1).attr('selected','selected');
$('#id_post_wall option').eq(1).attr('selected','selected');
$('#id_post_comments option').eq(1).attr('selected','selected');
$('#id_post_mail option').eq(1).attr('selected','selected');
$('#id_post_photos option').eq(1).attr('selected','selected');
$('#id_tag_deliver option').eq(1).attr('selected','selected');
$('#id_chat option').eq(1).attr('selected','selected');
$('#id_write_storage option').eq(1).attr('selected','selected');
$('#id_write_pages option').eq(1).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
if(n == 1) {
$('#id_view_stream option').eq(1).attr('selected','selected');
$('#id_view_profile option').eq(1).attr('selected','selected');
$('#id_view_photos option').eq(1).attr('selected','selected');
$('#id_view_contacts option').eq(1).attr('selected','selected');
$('#id_view_storage option').eq(1).attr('selected','selected');
$('#id_view_pages option').eq(1).attr('selected','selected');
$('#id_send_stream option').eq(1).attr('selected','selected');
$('#id_post_wall option').eq(1).attr('selected','selected');
$('#id_post_comments option').eq(1).attr('selected','selected');
$('#id_post_mail option').eq(1).attr('selected','selected');
$('#id_post_photos option').eq(1).attr('selected','selected');
$('#id_tag_deliver option').eq(1).attr('selected','selected');
$('#id_chat option').eq(1).attr('selected','selected');
$('#id_write_storage option').eq(1).attr('selected','selected');
$('#id_write_pages option').eq(1).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
$('#id_republish option').eq(0).attr('selected','selected');
$('#id_bookmark option').eq(1).attr('selected','selected');
$('#id_profile_in_directory_onoff .off').removeClass('hidden');
$('#id_profile_in_directory_onoff .on').addClass('hidden');
$('#id_profile_in_directory').val(0);
}
if(n == 2) {
$('#id_view_stream option').eq(6).attr('selected','selected');
$('#id_view_profile option').eq(6).attr('selected','selected');
$('#id_view_photos option').eq(6).attr('selected','selected');
$('#id_view_contacts option').eq(6).attr('selected','selected');
$('#id_view_storage option').eq(6).attr('selected','selected');
$('#id_view_pages option').eq(6).attr('selected','selected');
$('#id_send_stream option').eq(2).attr('selected','selected');
$('#id_post_wall option').eq(1).attr('selected','selected');
$('#id_post_comments option').eq(2).attr('selected','selected');
$('#id_post_mail option').eq(1).attr('selected','selected');
$('#id_post_photos option').eq(0).attr('selected','selected');
$('#id_tag_deliver option').eq(1).attr('selected','selected');
$('#id_chat option').eq(1).attr('selected','selected');
$('#id_write_storage option').eq(0).attr('selected','selected');
$('#id_write_pages option').eq(0).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
if(n == 2) {
$('#id_view_stream option').eq(7).attr('selected','selected');
$('#id_view_profile option').eq(7).attr('selected','selected');
$('#id_view_photos option').eq(7).attr('selected','selected');
$('#id_view_contacts option').eq(7).attr('selected','selected');
$('#id_view_storage option').eq(7).attr('selected','selected');
$('#id_view_pages option').eq(7).attr('selected','selected');
$('#id_send_stream option').eq(2).attr('selected','selected');
$('#id_post_wall option').eq(1).attr('selected','selected');
$('#id_post_comments option').eq(2).attr('selected','selected');
$('#id_post_mail option').eq(1).attr('selected','selected');
$('#id_post_photos option').eq(0).attr('selected','selected');
$('#id_tag_deliver option').eq(1).attr('selected','selected');
$('#id_chat option').eq(1).attr('selected','selected');
$('#id_write_storage option').eq(0).attr('selected','selected');
$('#id_write_pages option').eq(0).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
$('#id_republish option').eq(1).attr('selected','selected');
$('#id_bookmark option').eq(1).attr('selected','selected');
$('#id_profile_in_directory_onoff .on').removeClass('hidden');
$('#id_profile_in_directory_onoff .off').addClass('hidden');
$('#id_profile_in_directory').val(1);
}
if(n == 3) {
$('#id_view_stream option').eq(6).attr('selected','selected');
$('#id_view_profile option').eq(6).attr('selected','selected');
$('#id_view_photos option').eq(6).attr('selected','selected');
$('#id_view_contacts option').eq(6).attr('selected','selected');
$('#id_view_storage option').eq(6).attr('selected','selected');
$('#id_view_pages option').eq(6).attr('selected','selected');
$('#id_send_stream option').eq(4).attr('selected','selected');
$('#id_post_wall option').eq(4).attr('selected','selected');
$('#id_post_comments option').eq(4).attr('selected','selected');
$('#id_post_mail option').eq(4).attr('selected','selected');
$('#id_post_photos option').eq(2).attr('selected','selected');
$('#id_tag_deliver option').eq(1).attr('selected','selected');
$('#id_chat option').eq(4).attr('selected','selected');
$('#id_write_storage option').eq(2).attr('selected','selected');
$('#id_write_pages option').eq(2).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
$('#id_republish option').eq(4).attr('selected','selected');
$('#id_bookmark option').eq(4).attr('selected','selected');
if(n == 3) {
$('#id_view_stream option').eq(7).attr('selected','selected');
$('#id_view_profile option').eq(7).attr('selected','selected');
$('#id_view_photos option').eq(7).attr('selected','selected');
$('#id_view_contacts option').eq(7).attr('selected','selected');
$('#id_view_storage option').eq(7).attr('selected','selected');
$('#id_view_pages option').eq(7).attr('selected','selected');
$('#id_send_stream option').eq(5).attr('selected','selected');
$('#id_post_wall option').eq(5).attr('selected','selected');
$('#id_post_comments option').eq(5).attr('selected','selected');
$('#id_post_mail option').eq(5).attr('selected','selected');
$('#id_post_photos option').eq(2).attr('selected','selected');
$('#id_tag_deliver option').eq(1).attr('selected','selected');
$('#id_chat option').eq(5).attr('selected','selected');
$('#id_write_storage option').eq(2).attr('selected','selected');
$('#id_write_pages option').eq(2).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
$('#id_republish option').eq(5).attr('selected','selected');
$('#id_bookmark option').eq(5).attr('selected','selected');
$('#id_profile_in_directory_onoff .on').removeClass('hidden');
$('#id_profile_in_directory_onoff .off').addClass('hidden');
$('#id_profile_in_directory').val(1);
}
}

19
view/theme/redbasic/css/style.css
View File

@ -1032,12 +1032,9 @@ aside li {
.profile-match-photo {
float: left;
text-align: center;
width: 120px;
}
.profile-match-name {
text-align: center;
width: 120px;
height: 1.5em;
overflow: hidden !important;
@ -1058,12 +1055,18 @@ aside li {
}
.profile-match-wrapper {
float: left;
padding: 10px;
width: 120px;
min-height: 120px;
scroll: auto;
float: left;
width: 120px;
height: 150px;
padding: 10px;
margin: 8px 10px 0 0;
border-top: 1px solid #eee;
border-left: 2px solid #eee;
}
.profile-match-ignore {
float: right;
}
#profile-match-wrapper-end {
clear: both;
}

4
view/tpl/nav.tpl
View File

@ -74,7 +74,7 @@
</li>
<li class="{{$sel.home}} visible-xs">
<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a>
<span class="home-update badge"rel="#nav-home-menu"></span>
<span class="home-update badge" rel="#nav-home-menu"></span>
</li>
{{/if}}
@ -173,5 +173,3 @@
</ul>
</div>
</div>

4
view/tpl/photo_albums.tpl
View File

@ -3,7 +3,9 @@
{{if $albums}}
<ul>
{{foreach $albums as $al}}
<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a></li>
{{if $al.text}}
<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a> ({{$al.total}})</li>
{{/if}}
{{/foreach}}
</ul>
{{/if}}

36
view/tpl/photo_view.tpl
View File

@ -5,11 +5,11 @@
{{if $tools}}
<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
{{/if}}
{{if $lock}} | <i class="lockview icon-lock" title="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" ></i> {{/if}}
{{if $lock}} | <i class="lockview icon-lock" title="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');"></i> {{/if}}
</div>
{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}}
<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;" ><img style="max-width: 100%;" src="{{$photo.src}}" /></a></div>
<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="max-width: 100%;" src="{{$photo.src}}"></a></div>
{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}}
<div id="photo-photo-end"></div>
<div id="photo-caption">{{$desc}}</div>
@ -24,22 +24,30 @@
{{if $edit}}
<div id="photo-edit-edit-wrapper" class="fakelink" onclick="openClose('photo-edit-edit');">{{$edit.edit}}</div>
<div id="photo-edit-edit" style="display: none;">
<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" >
<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
<input type="hidden" name="item_id" value="{{$edit.item_id}}" />
<input type="hidden" name="item_id" value="{{$edit.item_id}}">
<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label>
<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" />
<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" list="dl-albums">
{{if $edit.albums}}
<datalist id="dl-albums">
{{foreach $edit.albums as $al}}
{{if $al.text}}
<option value="{{$al.text}}">
{{/if}}
{{/foreach}}
</datalist>
{{/if}}
<div id="photo-edit-albumname-end"></div>
<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
<input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$edit.caption}}" />
<input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$edit.caption}}">
<div id="photo-edit-caption-end"></div>
<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$edit.tag_label}}</label>
<input name="newtag" id="photo-edit-newtag" size="84" title="{{$edit.help_tags}}" type="text" />
<input name="newtag" id="photo-edit-newtag" size="84" title="{{$edit.help_tags}}" type="text">
<div id="photo-edit-tags-end"></div>
<div id="photo-edit-rotate-wrapper">
@ -47,13 +55,13 @@
{{$edit.rotatecw}}<br>
{{$edit.rotateccw}}
</div>
<input type="radio" name="rotate" value="1" /><br>
<input type="radio" name="rotate" value="2" />
<input type="radio" name="rotate" value="1"><br>
<input type="radio" name="rotate" value="2">
</div>
<div id="photo-edit-rotate-end"></div>
<div id="settings-default-perms" class="settings-default-perms" >
<span id="jot-perms-icon" class="{{$edit.lockstate}}" ></span>
<div id="settings-default-perms" class="settings-default-perms">
<span id="jot-perms-icon" class="{{$edit.lockstate}}"></span>
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$edit.permissions}}</button>
{{$edit.aclselect}}
<div id="settings-default-perms-menu-end"></div>
@ -61,8 +69,8 @@
<br/>
<div id="settings-default-perms-end"></div>
<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}" />
<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete()"; />
<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}">
<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();">
<div id="photo-edit-end"></div>
</form>

4
view/tpl/suggest_friends.tpl
View File

@ -1,16 +1,16 @@
<div class="profile-match-wrapper">
<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="icon-remove drop-icons"></i></a>
<div class="profile-match-photo">
<a href="{{$entry.url}}">
<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.profile}}]" />
</a>
</div>
<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="icon-remove drop-icons btn btn-default"></i></a>
<div class="profile-match-break"></div>
<div class="profile-match-name">
<a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
</div>
<div class="profile-match-end"></div>
{{if $entry.connlnk}}
<div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="icon-plus connect-icon"></i> {{$entry.conntxt}}</a></div>
<div class="profile-match-connect btn btn-default"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="icon-plus connect-icon"></i> {{$entry.conntxt}}</a></div>
{{/if}}
</div>