Merge branch 'master' into photothread

This commit is contained in:
friendica 2013-04-16 20:16:44 -07:00
commit f72d351224
100 changed files with 1776 additions and 963 deletions

View File

@ -1,4 +1,4 @@
Copyright (c) 2010-2013 the Friendica Project
Copyright (c) 2010-2013 the Red Project
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy

4
README
View File

@ -1,5 +1,5 @@
Friendica RED
=============
RED
===
Red is essentially a "personal CMS" linked to a decentralised permissions and communication platform. This creates a grid of small servers which link together to form a much larger system (much like the internet itself). This allows one to create services with social contexts and extensible permission controls which are all integrated together as if they were offered by a single large data provider - but without the inherent privacy problems and costs associated with centralisation. Privacy and access controls are instead maintained at the local level where they can be enforced by those who own the data being shared. Additionally, identities in Red are not tied to DNS endpoints and have some degree of mobility between providers.

View File

@ -38,8 +38,8 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/BaseObject.php');
require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica Red');
define ( 'FRIENDICA_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'RED_PLATFORM', 'Red');
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1040 );
@ -862,8 +862,8 @@ class App {
if($interval < 10000)
$interval = 40000;
$this->page['title'] = $this->config['system']['sitename'];
if(! x($this->page,'title'))
$this->page['title'] = $this->config['system']['sitename'];
/* put the head template at the beginning of page['htmlhead']
* since the code added by the modules frequently depends on it
@ -873,7 +873,7 @@ class App {
$this->page['htmlhead'] = replace_macros($tpl, array(
'$baseurl' => $this->get_baseurl(),
'$local_user' => local_user(),
'$generator' => FRIENDICA_PLATFORM . ' ' . FRIENDICA_VERSION,
'$generator' => RED_PLATFORM . ' ' . RED_VERSION,
'$update_interval' => $interval,
'$head_css' => head_get_css(),
'$head_js' => head_get_js(),
@ -1445,7 +1445,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
$a->profile = $r[0];
$a->page['title'] = $a->profile['channel_name'] . " @ " . $a->config['sitename'];
$a->page['title'] = $a->profile['channel_name'] . " - " . $a->profile['channel_address'] . "@" . $a->get_hostname();
$_SESSION['theme'] = $a->profile['channel_theme'];
@ -2009,6 +2009,17 @@ function get_my_address() {
return false;
}
/**
* @function zid_init(&$a)
* If somebody arrives at our site using a zid, add their xchan to our DB if we don't have it already.
* And if they aren't already authenticated here, attempt reverse magic auth.
*
* @hooks 'zid_init'
* string 'zid' - their zid
* string 'url' - the destination url
*
*/
function zid_init(&$a) {
$tmp_str = get_my_address();
if(validate_email($tmp_str)) {
@ -2029,10 +2040,27 @@ function zid_init(&$a) {
}
}
/**
* @function zid($s,$force = false)
* Adds a zid parameter to a url
* @param string $s
* The url to accept the zid
* @param boolean $force
* Currently unused
* @return string
*
* @hooks 'zid'
* string url - url to accept zid
* string zid - urlencoded zid
* string result - the return string we calculated, change it if you want to return something else
*/
function zid($s,$force = false) {
if(! strlen($s))
if(! strlen($s) || strpos('zid=',$s))
return $s;
$has_params = ((strpos($s,'?')) ? true : false);
$num_slashes = substr_count($s,'/');
if(! $has_params)
$has_params = ((strpos($s,'&')) ? true : false);
$achar = strpos($s,'?') ? '&' : '?';
@ -2040,8 +2068,11 @@ function zid($s,$force = false) {
$mine = get_my_url();
$myaddr = get_my_address();
if($mine and ! link_compare($mine,$s))
return $s . (($has_params) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr);
return $s;
$zurl = $s . (($num_slashes >= 3) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr);
$arr = array('url' => $s, 'zid' => urlencode($myaddr), 'result' => $zurl);
call_hooks('zid', $arr);
return $arr['result'];
}
/**

View File

@ -432,7 +432,7 @@ Functions</h2></td></tr>
</tr>
</table>
</div><div class="memdoc">
<p><a class="el" href="namespaceFriendica.html">Friendica</a> admin </p>
<p>Red admin </p>
<dl class="params"><dt>Parameters</dt><dd>
<table class="params">
<tr><td class="paramtype"><a class="el" href="classApp.html">App</a></td><td class="paramname">$a</td><td></td></tr>

File diff suppressed because one or more lines are too long

View File

@ -98,8 +98,6 @@ var boot_8php =
[ "DIRECTORY_MODE_STANDALONE", "boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8", null ],
[ "DIRECTORY_REALM", "boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd", null ],
[ "EOL", "boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b", null ],
[ "FRIENDICA_PLATFORM", "boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3", null ],
[ "FRIENDICA_VERSION", "boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be", null ],
[ "GRAVITY_COMMENT", "boot_8php.html#a4a12ce5de39789b0361e308d89925a20", null ],
[ "GRAVITY_LIKE", "boot_8php.html#a1f5906598e90b5ea2b4245f682be4348", null ],
[ "GRAVITY_PARENT", "boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3", null ],
@ -206,6 +204,8 @@ var boot_8php =
[ "PERMS_W_TAGWALL", "boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777", null ],
[ "PERMS_W_WALL", "boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2", null ],
[ "PNG_QUALITY", "boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce", null ],
[ "RED_PLATFORM", "boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4", null ],
[ "RED_VERSION", "boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3", null ],
[ "REGISTER_APPROVE", "boot_8php.html#a7176c0f9f1c98421b97735d892cf6252", null ],
[ "REGISTER_CLOSED", "boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1", null ],
[ "REGISTER_OPEN", "boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63", null ],

View File

@ -615,7 +615,7 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="identity_8php.html#a345f4c943d84de502ec6e72d2c813945">create_identity()</a>, <a class="el" href="boot_8php.html#aca5e42678e178c6b9034610d66666fd7">fix_system_urls()</a>, <a class="el" href="import_8php.html#af17fef0410518f7eac205d0ea416eaa2">import_post()</a>, <a class="el" href="magic_8php.html#acea2cc792849ca2d71d4b689f66518bf">magic_init()</a>, <a class="el" href="zot_8php.html#a3862b3161b2c8557dc1a95020179bd81">zot_build_packet()</a>, and <a class="el" href="zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea">zot_fetch()</a>.</p>
<p>Referenced by <a class="el" href="identity_8php.html#a345f4c943d84de502ec6e72d2c813945">create_identity()</a>, <a class="el" href="boot_8php.html#aca5e42678e178c6b9034610d66666fd7">fix_system_urls()</a>, <a class="el" href="import_8php.html#af17fef0410518f7eac205d0ea416eaa2">import_post()</a>, <a class="el" href="magic_8php.html#acea2cc792849ca2d71d4b689f66518bf">magic_init()</a>, <a class="el" href="post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75">post_post()</a>, <a class="el" href="zot_8php.html#a3862b3161b2c8557dc1a95020179bd81">zot_build_packet()</a>, and <a class="el" href="zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea">zot_fetch()</a>.</p>
</div>
</div>
@ -655,7 +655,7 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="zot_8php.html#ab0227978011d8601494a7651fa26acf0">import_xchan()</a>, <a class="el" href="post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75">post_post()</a>, and <a class="el" href="zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0">zfinger_init()</a>.</p>
<p>Referenced by <a class="el" href="zot_8php.html#ab0227978011d8601494a7651fa26acf0">import_xchan()</a>, <a class="el" href="post_8php.html#af4b48181ce773ef0cdfc972441445c34">post_init()</a>, <a class="el" href="post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75">post_post()</a>, and <a class="el" href="zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0">zfinger_init()</a>.</p>
</div>
</div>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -142,7 +142,7 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353">categories_widget()</a>, <a class="el" href="connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c">connections_content()</a>, <a class="el" href="editpost_8php.html#a34011690864d122680c802e9e748ccfb">editpost_content()</a>, <a class="el" href="classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf">Item\get_comment_box()</a>, <a class="el" href="classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8">Item\get_template_data()</a>, <a class="el" href="item_8php.html#a693cd09805755ab85bbb5ecae69a48c3">item_post()</a>, <a class="el" href="mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79">message_content()</a>, <a class="el" href="mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718">message_post()</a>, <a class="el" href="nav_8php.html#a43be0df73b90647ea70947ce004e231e">nav()</a>, <a class="el" href="mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4">network_content()</a>, <a class="el" href="items_8php.html#abe695dd89e1e10ed042c26b80114f0ed">posted_date_widget()</a>, <a class="el" href="boot_8php.html#a646123ebbb10eb6f5b6ff26f4288da9b">profile_sidebar()</a>, <a class="el" href="profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00">profiles_content()</a>, <a class="el" href="view_2theme_2redbasic_2php_2config_8php.html#ab5073653dfb9eb2216f8580098a87071">redbasic_form()</a>, <a class="el" href="mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad">saved_searches()</a>, and <a class="el" href="search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6">search_saved_searches()</a>.</p>
<p>Referenced by <a class="el" href="contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353">categories_widget()</a>, <a class="el" href="connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c">connections_content()</a>, <a class="el" href="editpost_8php.html#a34011690864d122680c802e9e748ccfb">editpost_content()</a>, <a class="el" href="classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf">Item\get_comment_box()</a>, <a class="el" href="classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8">Item\get_template_data()</a>, <a class="el" href="item_8php.html#a693cd09805755ab85bbb5ecae69a48c3">item_post()</a>, <a class="el" href="mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79">message_content()</a>, <a class="el" href="mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718">message_post()</a>, <a class="el" href="nav_8php.html#a43be0df73b90647ea70947ce004e231e">nav()</a>, <a class="el" href="mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4">network_content()</a>, <a class="el" href="mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812">photos_content()</a>, <a class="el" href="items_8php.html#abe695dd89e1e10ed042c26b80114f0ed">posted_date_widget()</a>, <a class="el" href="boot_8php.html#a646123ebbb10eb6f5b6ff26f4288da9b">profile_sidebar()</a>, <a class="el" href="profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00">profiles_content()</a>, <a class="el" href="view_2theme_2redbasic_2php_2config_8php.html#ab5073653dfb9eb2216f8580098a87071">redbasic_form()</a>, <a class="el" href="mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad">saved_searches()</a>, and <a class="el" href="search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6">search_saved_searches()</a>.</p>
</div>
</div>

View File

@ -279,12 +279,6 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
<li>format_term_for_display()
: <a class="el" href="text_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1">text.php</a>
</li>
<li>FRIENDICA_PLATFORM
: <a class="el" href="boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3">boot.php</a>
</li>
<li>FRIENDICA_VERSION
: <a class="el" href="boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be">boot.php</a>
</li>
<li>fsuggest_content()
: <a class="el" href="fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998">fsuggest.php</a>
</li>

View File

@ -303,6 +303,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
<li>group_post()
: <a class="el" href="mod_2group_8php.html#aed1f009b1221348021bb34761160ef35">group.php</a>
</li>
<li>group_rec_byhash()
: <a class="el" href="include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245">group.php</a>
</li>
<li>group_rmv()
: <a class="el" href="include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5">group.php</a>
</li>

View File

@ -159,6 +159,9 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
<li>like_content()
: <a class="el" href="like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538">like.php</a>
</li>
<li>limit_body_size()
: <a class="el" href="items_8php.html#af94c281016c6c912d06e064113336c5c">items.php</a>
</li>
<li>link_compare()
: <a class="el" href="text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285">text.php</a>
</li>

View File

@ -338,6 +338,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
<li>populate_acl()
: <a class="el" href="acl__selectors_8php.html#a51f2ec7a143d5a5b38e35efd5f3d6e2c">acl_selectors.php</a>
</li>
<li>post_activity_item()
: <a class="el" href="items_8php.html#a410f9c743877c125ca06312373346903">items.php</a>
</li>
<li>post_init()
: <a class="el" href="post_8php.html#af4b48181ce773ef0cdfc972441445c34">post.php</a>
</li>

View File

@ -162,6 +162,12 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});
<li>rebuild_theme_table()
: <a class="el" href="admin_8php.html#ae46311a3fefc21abc838a26e91789de6">admin.php</a>
</li>
<li>RED_PLATFORM
: <a class="el" href="boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4">boot.php</a>
</li>
<li>RED_VERSION
: <a class="el" href="boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3">boot.php</a>
</li>
<li>redbasic_form()
: <a class="el" href="view_2theme_2redbasic_2php_2config_8php.html#ab5073653dfb9eb2216f8580098a87071">config.php</a>
</li>

View File

@ -232,7 +232,7 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');});
: <a class="el" href="datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865">datetime.php</a>
</li>
<li>title_is_body()
: <a class="el" href="items_8php.html#a1f747db2277904f85ac7b9e64c024e4e">items.php</a>
: <a class="el" href="items_8php.html#aa371905f0a211b307cb3f7188c6cba04">items.php</a>
</li>
<li>toggle_mobile_init()
: <a class="el" href="toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254">toggle_mobile.php</a>

View File

@ -177,6 +177,12 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');});
<li>zid_init()
: <a class="el" href="boot_8php.html#a680fbafc2db023c5b1309e0180e81315">boot.php</a>
</li>
<li>zidify_callback()
: <a class="el" href="text_8php.html#a405afe814a23f3bd94d826101aa168ab">text.php</a>
</li>
<li>zidify_links()
: <a class="el" href="text_8php.html#a29988052f3944111def3b6aaf2c7a8f6">text.php</a>
</li>
<li>zot_build_packet()
: <a class="el" href="zot_8php.html#a3862b3161b2c8557dc1a95020179bd81">zot.php</a>
</li>

View File

@ -293,6 +293,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
<li>group_post()
: <a class="el" href="mod_2group_8php.html#aed1f009b1221348021bb34761160ef35">group.php</a>
</li>
<li>group_rec_byhash()
: <a class="el" href="include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245">group.php</a>
</li>
<li>group_rmv()
: <a class="el" href="include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5">group.php</a>
</li>

View File

@ -152,6 +152,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
<li>like_content()
: <a class="el" href="like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538">like.php</a>
</li>
<li>limit_body_size()
: <a class="el" href="items_8php.html#af94c281016c6c912d06e064113336c5c">items.php</a>
</li>
<li>link_compare()
: <a class="el" href="text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285">text.php</a>
</li>

View File

@ -248,6 +248,9 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
<li>populate_acl()
: <a class="el" href="acl__selectors_8php.html#a51f2ec7a143d5a5b38e35efd5f3d6e2c">acl_selectors.php</a>
</li>
<li>post_activity_item()
: <a class="el" href="items_8php.html#a410f9c743877c125ca06312373346903">items.php</a>
</li>
<li>post_init()
: <a class="el" href="post_8php.html#af4b48181ce773ef0cdfc972441445c34">post.php</a>
</li>

View File

@ -204,7 +204,7 @@ $(document).ready(function(){initNavTree('globals_func_0x74.html','');});
: <a class="el" href="datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865">datetime.php</a>
</li>
<li>title_is_body()
: <a class="el" href="items_8php.html#a1f747db2277904f85ac7b9e64c024e4e">items.php</a>
: <a class="el" href="items_8php.html#aa371905f0a211b307cb3f7188c6cba04">items.php</a>
</li>
<li>toggle_mobile_init()
: <a class="el" href="toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254">toggle_mobile.php</a>

View File

@ -173,6 +173,12 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');});
<li>zid_init()
: <a class="el" href="boot_8php.html#a680fbafc2db023c5b1309e0180e81315">boot.php</a>
</li>
<li>zidify_callback()
: <a class="el" href="text_8php.html#a405afe814a23f3bd94d826101aa168ab">text.php</a>
</li>
<li>zidify_links()
: <a class="el" href="text_8php.html#a29988052f3944111def3b6aaf2c7a8f6">text.php</a>
</li>
<li>zot_build_packet()
: <a class="el" href="zot_8php.html#a3862b3161b2c8557dc1a95020179bd81">zot.php</a>
</li>

View File

@ -142,12 +142,6 @@ $(document).ready(function(){initNavTree('globals_vars_0x66.html','');});
<li>foreach
: <a class="el" href="typo_8php.html#a3bb638ebb8472e4ee7c85afe721f4fe3">typo.php</a>
</li>
<li>FRIENDICA_PLATFORM
: <a class="el" href="boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3">boot.php</a>
</li>
<li>FRIENDICA_VERSION
: <a class="el" href="boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be">boot.php</a>
</li>
</ul>
</div><!-- contents -->
</div><!-- doc-content -->

View File

@ -145,6 +145,12 @@ $(document).ready(function(){initNavTree('globals_vars_0x72.html','');});
<li>RANDOM_STRING_TEXT
: <a class="el" href="text_8php.html#a2ffd79c60cc87cec24ef76447b905187">text.php</a>
</li>
<li>RED_PLATFORM
: <a class="el" href="boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4">boot.php</a>
</li>
<li>RED_VERSION
: <a class="el" href="boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3">boot.php</a>
</li>
<li>REGISTER_APPROVE
: <a class="el" href="boot_8php.html#a7176c0f9f1c98421b97735d892cf6252">boot.php</a>
</li>

View File

@ -151,6 +151,7 @@ Functions</h2></td></tr>
</tr>
</table>
</div><div class="memdoc">
<p>If there is a default group for this channel, add this member to it </p>
<p>Referenced by <a class="el" href="mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a">follow_init()</a>.</p>

View File

@ -118,6 +118,8 @@ Functions</h2></td></tr>
<tr class="separator:a4118f498bbd1530c1d0136d016d197a5"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:abd66a5ea34a07a3422dc2dde6c7b3ecb"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb">group_byname</a> ($uid, $name)</td></tr>
<tr class="separator:abd66a5ea34a07a3422dc2dde6c7b3ecb"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a90e157b3e1b99c981809cb5a2abd3245"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245">group_rec_byhash</a> ($uid, $hash)</td></tr>
<tr class="separator:a90e157b3e1b99c981809cb5a2abd3245"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a540e3ef36f47d47532646be4241f6518"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2group_8php.html#a540e3ef36f47d47532646be4241f6518">group_rmv_member</a> ($uid, $name, $member)</td></tr>
<tr class="separator:a540e3ef36f47d47532646be4241f6518"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a0122ef312df2c5546b1a46b3e6c7b31b"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b">group_add_member</a> ($uid, $name, $member, $gid=0)</td></tr>
@ -218,7 +220,7 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3">contactgroup_content()</a>, <a class="el" href="mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83">group_content()</a>, and <a class="el" href="items_8php.html#a53eb3d27e1c55083be93a32f392d54e7">new_follower()</a>.</p>
<p>Referenced by <a class="el" href="contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3">contactgroup_content()</a>, <a class="el" href="mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83">group_content()</a>, <a class="el" href="include_2follow_8php.html#a6553a7650fae55f95660510d90983144">new_contact()</a>, and <a class="el" href="items_8php.html#a53eb3d27e1c55083be93a32f392d54e7">new_follower()</a>.</p>
</div>
</div>
@ -266,6 +268,34 @@ Functions</h2></td></tr>
<p>Referenced by <a class="el" href="contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3">contactgroup_content()</a>, and <a class="el" href="mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83">group_content()</a>.</p>
</div>
</div>
<a class="anchor" id="a90e157b3e1b99c981809cb5a2abd3245"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">group_rec_byhash </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$uid</em>, </td>
</tr>
<tr>
<td class="paramkey"></td>
<td></td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$hash</em>&#160;</td>
</tr>
<tr>
<td></td>
<td>)</td>
<td></td><td></td>
</tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="include_2follow_8php.html#a6553a7650fae55f95660510d90983144">new_contact()</a>.</p>
</div>
</div>
<a class="anchor" id="a4118f498bbd1530c1d0136d016d197a5"></a>

View File

@ -5,6 +5,7 @@ var include_2group_8php =
[ "group_add_member", "include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b", null ],
[ "group_byname", "include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb", null ],
[ "group_get_members", "include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09", null ],
[ "group_rec_byhash", "include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245", null ],
[ "group_rmv", "include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5", null ],
[ "group_rmv_member", "include_2group_8php.html#a540e3ef36f47d47532646be4241f6518", null ],
[ "group_side", "include_2group_8php.html#a1042d74055bafe54a6a30103d87a7f17", null ],

View File

@ -114,6 +114,8 @@ $(document).ready(function(){initNavTree('items_8php.html','');});
Functions</h2></td></tr>
<tr class="memitem:a01e3cf44e082fa9bd06dcde5bf713d70"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70">collect_recipients</a> ($item, &amp;$private)</td></tr>
<tr class="separator:a01e3cf44e082fa9bd06dcde5bf713d70"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a410f9c743877c125ca06312373346903"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#a410f9c743877c125ca06312373346903">post_activity_item</a> ($arr)</td></tr>
<tr class="separator:a410f9c743877c125ca06312373346903"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a079e099e15d88d47aeb6ca6d60da7107"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#a079e099e15d88d47aeb6ca6d60da7107">get_public_feed</a> ($channel, $params)</td></tr>
<tr class="separator:a079e099e15d88d47aeb6ca6d60da7107"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a59abb61d7581dc6592257ef022cbfada"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#a59abb61d7581dc6592257ef022cbfada">get_feed_for</a> (&amp;$a, $dfrn_id, $owner_nick, $last_update, $direction=0)</td></tr>
@ -124,8 +126,10 @@ Functions</h2></td></tr>
<tr class="separator:aa9e99613d38a97b39c8cf5449699c2ee"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:aa579bc4445d60098b1410961ca8e96b7"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#aa579bc4445d60098b1410961ca8e96b7">construct_activity_target</a> ($item)</td></tr>
<tr class="separator:aa579bc4445d60098b1410961ca8e96b7"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a1f747db2277904f85ac7b9e64c024e4e"><td class="memItemLeft" align="right" valign="top"><a class="el" href="style_8php.html#a0a473a25349f07563d6c56d14031f02a">if</a>(!function_exists('limit_body_size'))&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#a1f747db2277904f85ac7b9e64c024e4e">title_is_body</a> ($title, $body)</td></tr>
<tr class="separator:a1f747db2277904f85ac7b9e64c024e4e"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:af94c281016c6c912d06e064113336c5c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#af94c281016c6c912d06e064113336c5c">limit_body_size</a> ($body)</td></tr>
<tr class="separator:af94c281016c6c912d06e064113336c5c"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:aa371905f0a211b307cb3f7188c6cba04"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#aa371905f0a211b307cb3f7188c6cba04">title_is_body</a> ($title, $body)</td></tr>
<tr class="separator:aa371905f0a211b307cb3f7188c6cba04"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a536d0313b6ffe33b9d2490c4e25c5361"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361">get_item_elements</a> ($<a class="el" href="boot_8php.html#a01353c9abebc3544ea080ac161729632">x</a>)</td></tr>
<tr class="separator:a536d0313b6ffe33b9d2490c4e25c5361"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:ae73794179b62d39bb597ff670ab1c1e5"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="items_8php.html#ae73794179b62d39bb597ff670ab1c1e5">import_author_xchan</a> ($<a class="el" href="boot_8php.html#a01353c9abebc3544ea080ac161729632">x</a>)</td></tr>
@ -1175,7 +1179,7 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="items_8php.html#a8794863cdf8ce1333040933d3a3f66bd">consume_feed()</a>, <a class="el" href="event_8php.html#a89ef533faf345db8d64a58d4856bde3a">event_store()</a>, <a class="el" href="item_8php.html#a693cd09805755ab85bbb5ecae69a48c3">item_post()</a>, <a class="el" href="like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538">like_content()</a>, <a class="el" href="items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45">local_delivery()</a>, <a class="el" href="mood_8php.html#a7ae136dd7476865b4828136175db5022">mood_init()</a>, <a class="el" href="include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109">photo_upload()</a>, <a class="el" href="include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274">photos_create_item()</a>, <a class="el" href="mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080">photos_post()</a>, <a class="el" href="poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b">poke_init()</a>, <a class="el" href="zot_8php.html#a37ec13b18057634eadb071f05297f5e1">process_delivery()</a>, <a class="el" href="activities_8php.html#a80134e807719b3c54aba971958d2e132">profile_activity()</a>, <a class="el" href="subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3">subthread_content()</a>, and <a class="el" href="tagger_8php.html#a0e4a3eb177d1684553c547503d67161c">tagger_content()</a>.</p>
<p>Referenced by <a class="el" href="items_8php.html#a8794863cdf8ce1333040933d3a3f66bd">consume_feed()</a>, <a class="el" href="event_8php.html#a89ef533faf345db8d64a58d4856bde3a">event_store()</a>, <a class="el" href="item_8php.html#a693cd09805755ab85bbb5ecae69a48c3">item_post()</a>, <a class="el" href="like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538">like_content()</a>, <a class="el" href="items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45">local_delivery()</a>, <a class="el" href="mood_8php.html#a7ae136dd7476865b4828136175db5022">mood_init()</a>, <a class="el" href="include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109">photo_upload()</a>, <a class="el" href="include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274">photos_create_item()</a>, <a class="el" href="mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080">photos_post()</a>, <a class="el" href="poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b">poke_init()</a>, <a class="el" href="items_8php.html#a410f9c743877c125ca06312373346903">post_activity_item()</a>, <a class="el" href="zot_8php.html#a37ec13b18057634eadb071f05297f5e1">process_delivery()</a>, <a class="el" href="activities_8php.html#a80134e807719b3c54aba971958d2e132">profile_activity()</a>, <a class="el" href="subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3">subthread_content()</a>, and <a class="el" href="tagger_8php.html#a0e4a3eb177d1684553c547503d67161c">tagger_content()</a>.</p>
</div>
</div>
@ -1205,6 +1209,24 @@ Functions</h2></td></tr>
<p>Referenced by <a class="el" href="zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df">update_imported_item()</a>.</p>
</div>
</div>
<a class="anchor" id="af94c281016c6c912d06e064113336c5c"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">limit_body_size </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$body</em></td><td>)</td>
<td></td>
</tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="items_8php.html#a896c1809d58f2d7a42cfe14577958ddf">get_atom_elements()</a>.</p>
</div>
</div>
<a class="anchor" id="ae1c27d1a6379231ac7c0435c8a791d45"></a>
@ -1393,6 +1415,31 @@ Functions</h2></td></tr>
<p>Referenced by <a class="el" href="items_8php.html#a8794863cdf8ce1333040933d3a3f66bd">consume_feed()</a>.</p>
</div>
</div>
<a class="anchor" id="a410f9c743877c125ca06312373346903"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">post_activity_item </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$arr</em></td><td>)</td>
<td></td>
</tr>
</table>
</div><div class="memdoc">
<p>post_activity_item($arr) </p>
<pre class="fragment">post an activity
</pre><dl class="params"><dt>Parameters</dt><dd>
<table class="params">
<tr><td class="paramtype">array</td><td class="paramname">$arr</td><td>In its simplest form one needs only to set $arr['body'] to post a note to the logged in channel's wall. Much more complex activities can be created. Permissions are checked. No filtering, tag expansion or other processing is performed.</td></tr>
</table>
</dd>
</dl>
<dl class="section return"><dt>Returns</dt><dd>array 'success' =&gt; true or false 'activity' =&gt; the resulting activity if successful </dd></dl>
</div>
</div>
<a class="anchor" id="abe695dd89e1e10ed042c26b80114f0ed"></a>
@ -1559,12 +1606,12 @@ Functions</h2></td></tr>
</div>
</div>
<a class="anchor" id="a1f747db2277904f85ac7b9e64c024e4e"></a>
<a class="anchor" id="aa371905f0a211b307cb3f7188c6cba04"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
<td class="memname"><a class="el" href="style_8php.html#a0a473a25349f07563d6c56d14031f02a">if</a> (!function_exists('limit_body_size')) title_is_body </td>
<td class="memname">title_is_body </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$title</em>, </td>

View File

@ -39,18 +39,20 @@ var items_8php =
[ "item_getfeedtags", "items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7", null ],
[ "item_store", "items_8php.html#a8ef003b2bc2dc4816bdcf5800aec1049", null ],
[ "item_store_update", "items_8php.html#a2dc4fb9347f6fb804da4f32c107afb53", null ],
[ "limit_body_size", "items_8php.html#af94c281016c6c912d06e064113336c5c", null ],
[ "local_delivery", "items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45", null ],
[ "lose_follower", "items_8php.html#ade53043e7bc5ab9cc9ef1e4fed6569d4", null ],
[ "lose_sharer", "items_8php.html#a3a218d5e8ffbe261f773225ecded86a2", null ],
[ "mail_store", "items_8php.html#a77da7ce9a117601d49ac4a67c71b514f", null ],
[ "map_scope", "items_8php.html#ac1fcf621dce7370515b420a7753f4726", null ],
[ "new_follower", "items_8php.html#a53eb3d27e1c55083be93a32f392d54e7", null ],
[ "post_activity_item", "items_8php.html#a410f9c743877c125ca06312373346903", null ],
[ "posted_date_widget", "items_8php.html#abe695dd89e1e10ed042c26b80114f0ed", null ],
[ "posted_dates", "items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0", null ],
[ "send_status_notifications", "items_8php.html#aab9e0c58247427126de0699c729c3b6c", null ],
[ "tag_deliver", "items_8php.html#ab1bce4261bcf75ad62753b498a144d17", null ],
[ "termtype", "items_8php.html#ad34827ed330898456783fb14c7b46154", null ],
[ "tgroup_check", "items_8php.html#a88c6cf7649ac836fbbed82a7a0315110", null ],
[ "title_is_body", "items_8php.html#a1f747db2277904f85ac7b9e64c024e4e", null ],
[ "title_is_body", "items_8php.html#aa371905f0a211b307cb3f7188c6cba04", null ],
[ "zot_feed", "items_8php.html#a004e89d86b0f29b2c4da20108ecc4091", null ]
];

File diff suppressed because one or more lines are too long

View File

@ -38,9 +38,9 @@ var NAVTREEINDEX =
"boot_8php.html#ab55e545b72ec8c097e052ea7d373491f",
"classPhoto.html#a4ace266825f6b2bbc3c7f990f5d92500",
"friendica-to-smarty-tpl_8py.html#a5f9bf7a67d955c0d6be70a82097611c5",
"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7",
"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d",
"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda"
"include_2network_8php.html#a6259181fec4d36722d1e91ac6210e876",
"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8",
"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784"
];
var SYNCONMSG = 'click to disable panel synchronisation';

View File

@ -90,164 +90,164 @@ var NAVTREEINDEX0 =
"bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[4,0,0,8,5],
"bbcode_8php.html#a8911e027907820df3db03b4f76724b50":[4,0,0,8,2],
"boot_8php.html":[4,0,4],
"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[4,0,4,118],
"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[4,0,4,116],
"boot_8php.html#a01353c9abebc3544ea080ac161729632":[4,0,4,39],
"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[4,0,4,131],
"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[4,0,4,129],
"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[4,0,4,209],
"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[4,0,4,54],
"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[4,0,4,144],
"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[4,0,4,142],
"boot_8php.html#a0450389f24c632906fbc24347700a543":[4,0,4,50],
"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[4,0,4,97],
"boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[4,0,4,1],
"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[4,0,4,182],
"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[4,0,4,180],
"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[4,0,4,66],
"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[4,0,4,148],
"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[4,0,4,146],
"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[4,0,4,220],
"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[4,0,4,58],
"boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[4,0,4,15],
"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[4,0,4,79],
"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[4,0,4,76],
"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[4,0,4,174],
"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[4,0,4,172],
"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[4,0,4,61],
"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[4,0,4,130],
"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[4,0,4,126],
"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[4,0,4,147],
"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[4,0,4,128],
"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[4,0,4,124],
"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[4,0,4,145],
"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[4,0,4,223],
"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[4,0,4,151],
"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[4,0,4,149],
"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[4,0,4,75],
"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[4,0,4,192],
"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[4,0,4,190],
"boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273":[4,0,4,35],
"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[4,0,4,101],
"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[4,0,4,136],
"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[4,0,4,167],
"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[4,0,4,99],
"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[4,0,4,134],
"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[4,0,4,165],
"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[4,0,4,205],
"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[4,0,4,45],
"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[4,0,4,95],
"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[4,0,4,87],
"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[4,0,4,214],
"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[4,0,4,170],
"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[4,0,4,168],
"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[4,0,4,81],
"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[4,0,4,113],
"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[4,0,4,190],
"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[4,0,4,102],
"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[4,0,4,166],
"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[4,0,4,111],
"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[4,0,4,188],
"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[4,0,4,100],
"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[4,0,4,164],
"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[4,0,4,67],
"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[4,0,4,72],
"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[4,0,4,197],
"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[4,0,4,124],
"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[4,0,4,195],
"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[4,0,4,122],
"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[4,0,4,47],
"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[4,0,4,106],
"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[4,0,4,138],
"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[4,0,4,104],
"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[4,0,4,136],
"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[4,0,4,225],
"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[4,0,4,155],
"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[4,0,4,103],
"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[4,0,4,153],
"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[4,0,4,101],
"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[4,0,4,224],
"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[4,0,4,188],
"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[4,0,4,186],
"boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[4,0,4,12],
"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[4,0,4,59],
"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[4,0,4,52],
"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[4,0,4,114],
"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[4,0,4,184],
"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[4,0,4,165],
"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[4,0,4,141],
"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[4,0,4,112],
"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[4,0,4,182],
"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[4,0,4,163],
"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[4,0,4,139],
"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[4,0,4,70],
"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[4,0,4,218],
"boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[4,0,4,19],
"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[4,0,4,153],
"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[4,0,4,100],
"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[4,0,4,152],
"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[4,0,4,151],
"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[4,0,4,98],
"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[4,0,4,150],
"boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[4,0,4,6],
"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[4,0,4,183],
"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[4,0,4,201],
"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[4,0,4,177],
"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[4,0,4,137],
"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[4,0,4,181],
"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[4,0,4,199],
"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[4,0,4,175],
"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[4,0,4,135],
"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[4,0,4,46],
"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[4,0,4,80],
"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[4,0,4,36],
"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[4,0,4,169],
"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[4,0,4,200],
"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[4,0,4,167],
"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[4,0,4,198],
"boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[4,0,4,22],
"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[4,0,4,60],
"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[4,0,4,159],
"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[4,0,4,157],
"boot_8php.html#a5b45d647da3743a7fc8c6223350b4d67":[4,0,4,32],
"boot_8php.html#a5b7ce5c0a79796800883644c389dc87f":[4,0,4,43],
"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[4,0,4,180],
"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[4,0,4,178],
"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[4,0,4,77],
"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[4,0,4,139],
"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[4,0,4,181],
"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[4,0,4,137],
"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[4,0,4,179],
"boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[4,0,4,21],
"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[4,0,4,74],
"boot_8php.html#a646123ebbb10eb6f5b6ff26f4288da9b":[4,0,4,34],
"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[4,0,4,216],
"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[4,0,4,145],
"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[4,0,4,122],
"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[4,0,4,143],
"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[4,0,4,120],
"boot_8php.html#a680fbafc2db023c5b1309e0180e81315":[4,0,4,44],
"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[4,0,4,125],
"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[4,0,4,123],
"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[4,0,4,49],
"boot_8php.html#a6969947145a139ec374ce098224d8e81":[4,0,4,128],
"boot_8php.html#a6969947145a139ec374ce098224d8e81":[4,0,4,126],
"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[4,0,4,207],
"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[4,0,4,204],
"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[4,0,4,198],
"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[4,0,4,202],
"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[4,0,4,196],
"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[4,0,4,96],
"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[4,0,4,88],
"boot_8php.html#a6df1102664f64b274810db85197c2755":[4,0,4,186],
"boot_8php.html#a6df1102664f64b274810db85197c2755":[4,0,4,184],
"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[4,0,4,206],
"boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[4,0,4,27],
"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[4,0,4,160],
"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[4,0,4,116],
"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[4,0,4,158],
"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[4,0,4,114],
"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[4,0,4,71],
"boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[4,0,4,2],
"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[4,0,4,221],
"boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[4,0,4,4],
"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[4,0,4,73],
"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[4,0,4,85],
"boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be":[4,0,4,99],
"boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3":[4,0,4,98],
"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[4,0,4,64],
"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[4,0,4,115],
"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[4,0,4,140],
"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[4,0,4,113],
"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[4,0,4,138],
"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[4,0,4,68],
"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[4,0,4,142],
"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[4,0,4,140],
"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[4,0,4,82],
"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[4,0,4,178],
"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[4,0,4,176],
"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[4,0,4,53],
"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[4,0,4,110],
"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[4,0,4,158],
"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[4,0,4,108],
"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[4,0,4,156],
"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[4,0,4,93],
"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[4,0,4,202],
"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[4,0,4,112],
"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[4,0,4,108],
"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[4,0,4,205],
"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[4,0,4,200],
"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[4,0,4,110],
"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[4,0,4,106],
"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[4,0,4,203],
"boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[4,0,4,30],
"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[4,0,4,129],
"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[4,0,4,111],
"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[4,0,4,127],
"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[4,0,4,109],
"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[4,0,4,204],
"boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[4,0,4,18],
"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[4,0,4,172],
"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[4,0,4,203],
"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[4,0,4,170],
"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[4,0,4,201],
"boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[4,0,4,5],
"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[4,0,4,195],
"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[4,0,4,173],
"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[4,0,4,193],
"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[4,0,4,171],
"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[4,0,4,217],
"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[4,0,4,194],
"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[4,0,4,161],
"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[4,0,4,192],
"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[4,0,4,159],
"boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[4,0,4,25],
"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[4,0,4,179],
"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[4,0,4,177],
"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[4,0,4,48],
"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[4,0,4,135],
"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[4,0,4,133],
"boot_8php.html#aa4221641e5c21db69fa52c426b9017f5":[4,0,4,9],
"boot_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[4,0,4,20],
"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[4,0,4,133],
"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[4,0,4,131],
"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[4,0,4,84],
"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[4,0,4,90],
"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[4,0,4,199],
"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[4,0,4,120],
"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[4,0,4,197],
"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[4,0,4,118],
"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[4,0,4,65],
"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[4,0,4,164],
"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[4,0,4,162],
"boot_8php.html#ab2878f40a7f3978476fcfb4c95b96806":[4,0,4,11],
"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[4,0,4,105],
"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[4,0,4,185],
"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[4,0,4,103],
"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[4,0,4,183],
"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[4,0,4,31],
"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[4,0,4,157],
"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[4,0,4,189],
"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[4,0,4,104],
"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[4,0,4,121]
"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[4,0,4,155],
"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[4,0,4,187],
"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[4,0,4,102],
"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[4,0,4,119]
};

View File

@ -2,7 +2,7 @@ var NAVTREEINDEX1 =
{
"boot_8php.html#ab55e545b72ec8c097e052ea7d373491f":[4,0,4,40],
"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[4,0,4,55],
"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[4,0,4,175],
"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[4,0,4,173],
"boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[4,0,4,7],
"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[4,0,4,92],
"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[4,0,4,41],
@ -10,61 +10,61 @@ var NAVTREEINDEX1 =
"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[4,0,4,219],
"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[4,0,4,63],
"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[4,0,4,91],
"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[4,0,4,109],
"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[4,0,4,107],
"boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[4,0,4,24],
"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[4,0,4,143],
"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[4,0,4,141],
"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[4,0,4,89],
"boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[4,0,4,38],
"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[4,0,4,56],
"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[4,0,4,222],
"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[4,0,4,107],
"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[4,0,4,171],
"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[4,0,4,105],
"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[4,0,4,169],
"boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[4,0,4,37],
"boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[4,0,4,13],
"boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[4,0,4,8],
"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[4,0,4,146],
"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[4,0,4,196],
"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[4,0,4,144],
"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[4,0,4,194],
"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[4,0,4,62],
"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[4,0,4,132],
"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[4,0,4,130],
"boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13":[4,0,4,10],
"boot_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[4,0,4,16],
"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[4,0,4,69],
"boot_8php.html#ad34c1547020a305915bcc39707744690":[4,0,4,83],
"boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[4,0,4,28],
"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[4,0,4,191],
"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[4,0,4,189],
"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[4,0,4,208],
"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[4,0,4,86],
"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[4,0,4,117],
"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[4,0,4,115],
"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[4,0,4,211],
"boot_8php.html#add517a0958ac684792c62142a3877f81":[4,0,4,42],
"boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[4,0,4,23],
"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[4,0,4,215],
"boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[4,0,4,17],
"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[4,0,4,154],
"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[4,0,4,134],
"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[4,0,4,162],
"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[4,0,4,152],
"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[4,0,4,132],
"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[4,0,4,160],
"boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[4,0,4,26],
"boot_8php.html#aebc5ed38c73ade57f360471da712ded2":[4,0,4,33],
"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[4,0,4,193],
"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[4,0,4,191],
"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[4,0,4,94],
"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[4,0,4,149],
"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[4,0,4,163],
"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[4,0,4,119],
"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[4,0,4,147],
"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[4,0,4,161],
"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[4,0,4,117],
"boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[4,0,4,29],
"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[4,0,4,212],
"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[4,0,4,156],
"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[4,0,4,154],
"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[4,0,4,57],
"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[4,0,4,51],
"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[4,0,4,123],
"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[4,0,4,176],
"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[4,0,4,121],
"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[4,0,4,174],
"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[4,0,4,210],
"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[4,0,4,168],
"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[4,0,4,150],
"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[4,0,4,166],
"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[4,0,4,148],
"boot_8php.html#afb97615e985a013799839b68b99018d7":[4,0,4,213],
"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[4,0,4,78],
"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[4,0,4,127],
"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[4,0,4,125],
"boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[4,0,4,14],
"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[4,0,4,187],
"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[4,0,4,185],
"cache_8php.html":[4,0,0,9],
"channel_8php.html":[4,0,1,7],
"channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[4,0,1,7,1],

View File

@ -65,8 +65,8 @@ var NAVTREEINDEX3 =
"globals_0x77.html":[4,1,0,24],
"globals_0x78.html":[4,1,0,25],
"globals_0x7a.html":[4,1,0,26],
"globals_func.html":[4,1,1],
"globals_func.html":[4,1,1,0],
"globals_func.html":[4,1,1],
"globals_func_0x61.html":[4,1,1,1],
"globals_func_0x62.html":[4,1,1,2],
"globals_func_0x63.html":[4,1,1,3],
@ -224,16 +224,17 @@ var NAVTREEINDEX3 =
"include_2follow_8php.html#a6553a7650fae55f95660510d90983144":[4,0,0,28,0],
"include_2group_8php.html":[4,0,0,31],
"include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b":[4,0,0,31,2],
"include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[4,0,0,31,9],
"include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[4,0,0,31,10],
"include_2group_8php.html#a0a515d42ec78aa0066aac4c278ead5b0":[4,0,0,31,1],
"include_2group_8php.html#a1042d74055bafe54a6a30103d87a7f17":[4,0,0,31,7],
"include_2group_8php.html#a1042d74055bafe54a6a30103d87a7f17":[4,0,0,31,8],
"include_2group_8php.html#a22a81875259c7d3d64d4848afea6b345":[4,0,0,31,0],
"include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5":[4,0,0,31,5],
"include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[4,0,0,31,6],
"include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5":[4,0,0,31,6],
"include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[4,0,0,31,7],
"include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09":[4,0,0,31,4],
"include_2group_8php.html#ab4d9e5b59f48787cb01baae5dc6c381f":[4,0,0,31,10],
"include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245":[4,0,0,31,5],
"include_2group_8php.html#ab4d9e5b59f48787cb01baae5dc6c381f":[4,0,0,31,11],
"include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb":[4,0,0,31,3],
"include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f":[4,0,0,31,8],
"include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f":[4,0,0,31,9],
"include_2message_8php.html":[4,0,0,38],
"include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[4,0,0,38,2],
"include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[4,0,0,38,1],
@ -248,6 +249,5 @@ var NAVTREEINDEX3 =
"include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a":[4,0,0,40,8],
"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[4,0,0,40,13],
"include_2network_8php.html#a540420ff3675a72cb781ef9a7e8c2cd9":[4,0,0,40,5],
"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[4,0,0,40,19],
"include_2network_8php.html#a6259181fec4d36722d1e91ac6210e876":[4,0,0,40,25]
"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[4,0,0,40,19]
};

View File

@ -1,5 +1,6 @@
var NAVTREEINDEX4 =
{
"include_2network_8php.html#a6259181fec4d36722d1e91ac6210e876":[4,0,0,40,25],
"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[4,0,0,40,11],
"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[4,0,0,40,20],
"include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d":[4,0,0,40,9],
@ -51,22 +52,22 @@ var NAVTREEINDEX4 =
"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[4,0,1,35,1],
"item_8php.html#abd0e603a6696051af16476eb968d52e7":[4,0,1,35,2],
"items_8php.html":[4,0,0,36],
"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[4,0,0,36,52],
"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[4,0,0,36,54],
"items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[4,0,0,36,4],
"items_8php.html#a0790a4550b829e85504af548623002ca":[4,0,0,36,5],
"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[4,0,0,36,31],
"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[4,0,0,36,35],
"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[4,0,0,36,23],
"items_8php.html#a1f747db2277904f85ac7b9e64c024e4e":[4,0,0,36,51],
"items_8php.html#a251343637ff40a50cca93452cd530c26":[4,0,0,36,30],
"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[4,0,0,36,3],
"items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[4,0,0,36,11],
"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[4,0,0,36,19],
"items_8php.html#a2dc4fb9347f6fb804da4f32c107afb53":[4,0,0,36,38],
"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[4,0,0,36,0],
"items_8php.html#a3a218d5e8ffbe261f773225ecded86a2":[4,0,0,36,41],
"items_8php.html#a3a218d5e8ffbe261f773225ecded86a2":[4,0,0,36,42],
"items_8php.html#a410f9c743877c125ca06312373346903":[4,0,0,36,46],
"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[4,0,0,36,28],
"items_8php.html#a53eb3d27e1c55083be93a32f392d54e7":[4,0,0,36,44],
"items_8php.html#a53eb3d27e1c55083be93a32f392d54e7":[4,0,0,36,45],
"items_8php.html#a566c601726697e044e75284af7fb6f17":[4,0,0,36,18],
"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[4,0,0,36,10],
"items_8php.html#a59abb61d7581dc6592257ef022cbfada":[4,0,0,36,26],
@ -75,33 +76,35 @@ var NAVTREEINDEX4 =
"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[4,0,0,36,14],
"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[4,0,0,36,34],
"items_8php.html#a77051724d1784074ff187e73a4db93fe":[4,0,0,36,32],
"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[4,0,0,36,42],
"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[4,0,0,36,43],
"items_8php.html#a82955cc578f0fa600acec84475026194":[4,0,0,36,15],
"items_8php.html#a8395d189a36abfa0dfff81a2b0e70669":[4,0,0,36,12],
"items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[4,0,0,36,9],
"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[4,0,0,36,50],
"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[4,0,0,36,52],
"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[4,0,0,36,25],
"items_8php.html#a8ef003b2bc2dc4816bdcf5800aec1049":[4,0,0,36,37],
"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[4,0,0,36,8],
"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[4,0,0,36,29],
"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[4,0,0,36,53],
"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[4,0,0,36,7],
"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[4,0,0,36,20],
"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[4,0,0,36,6],
"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[4,0,0,36,27],
"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[4,0,0,36,47],
"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[4,0,0,36,48],
"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[4,0,0,36,49],
"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[4,0,0,36,50],
"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[4,0,0,36,24],
"items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[4,0,0,36,45],
"items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[4,0,0,36,47],
"items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[4,0,0,36,1],
"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[4,0,0,36,43],
"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[4,0,0,36,44],
"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[4,0,0,36,17],
"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[4,0,0,36,46],
"items_8php.html#ad34827ed330898456783fb14c7b46154":[4,0,0,36,49],
"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[4,0,0,36,48],
"items_8php.html#ad34827ed330898456783fb14c7b46154":[4,0,0,36,51],
"items_8php.html#adc8bda87ba08626f2a8cde7748d1bdae":[4,0,0,36,2],
"items_8php.html#ade53043e7bc5ab9cc9ef1e4fed6569d4":[4,0,0,36,40],
"items_8php.html#ade53043e7bc5ab9cc9ef1e4fed6569d4":[4,0,0,36,41],
"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[4,0,0,36,22],
"items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45":[4,0,0,36,39],
"items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45":[4,0,0,36,40],
"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[4,0,0,36,33],
"items_8php.html#af94c281016c6c912d06e064113336c5c":[4,0,0,36,39],
"items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1":[4,0,0,36,13],
"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[4,0,0,36,21],
"language_8php.html":[4,0,0,37],
@ -246,8 +249,5 @@ var NAVTREEINDEX4 =
"plugin_8php.html":[4,0,0,49],
"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[4,0,0,49,7],
"plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[4,0,0,49,3],
"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[4,0,0,49,11],
"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[4,0,0,49,4],
"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[4,0,0,49,6],
"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[4,0,0,49,9]
"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[4,0,0,49,11]
};

View File

@ -1,5 +1,8 @@
var NAVTREEINDEX5 =
{
"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[4,0,0,49,4],
"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[4,0,0,49,6],
"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[4,0,0,49,9],
"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[4,0,0,49,10],
"plugin_8php.html#a888a4c565cf06eb86ffc67131e5f19e0":[4,0,0,49,2],
"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[4,0,0,49,12],
@ -191,15 +194,17 @@ var NAVTREEINDEX5 =
"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[4,0,0,61,51],
"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[4,0,0,61,46],
"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[4,0,0,61,4],
"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[4,0,0,61,88],
"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[4,0,0,61,80],
"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[4,0,0,61,52],
"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[4,0,0,61,10],
"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[4,0,0,61,88],
"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[4,0,0,61,90],
"text_8php.html#a30311fd46e05be0e2cc466118641a4ed":[4,0,0,61,25],
"text_8php.html#a3299482ac20e9d79453048dd52881d37":[4,0,0,61,21],
"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[4,0,0,61,36],
"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[4,0,0,61,73],
"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[4,0,0,61,7],
"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[4,0,0,61,87],
"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[4,0,0,61,40],
"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[4,0,0,61,72],
"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[4,0,0,61,37],
@ -235,7 +240,7 @@ var NAVTREEINDEX5 =
"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[4,0,0,61,16],
"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[4,0,0,61,58],
"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[4,0,0,61,42],
"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[4,0,0,61,87],
"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[4,0,0,61,89],
"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[4,0,0,61,86],
"text_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[4,0,0,61,78],
"text_8php.html#abb55ec0142207aeec3d90b25ed4d7266":[4,0,0,61,24],
@ -244,10 +249,5 @@ var NAVTREEINDEX5 =
"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[4,0,0,61,43],
"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[4,0,0,61,71],
"text_8php.html#ace3c98538c63e09b70a363210b414112":[4,0,0,61,28],
"text_8php.html#acedb584f65114a33f389efb796172a91":[4,0,0,61,2],
"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[4,0,0,61,13],
"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[4,0,0,61,66],
"text_8php.html#adba17ec946f4285285dc100f7860bf51":[4,0,0,61,54],
"text_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[4,0,0,61,30],
"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[4,0,0,61,44]
"text_8php.html#acedb584f65114a33f389efb796172a91":[4,0,0,61,2]
};

View File

@ -1,5 +1,10 @@
var NAVTREEINDEX6 =
{
"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[4,0,0,61,13],
"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[4,0,0,61,66],
"text_8php.html#adba17ec946f4285285dc100f7860bf51":[4,0,0,61,54],
"text_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[4,0,0,61,30],
"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[4,0,0,61,44],
"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[4,0,0,61,68],
"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[4,0,0,61,17],
"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[4,0,0,61,31],

View File

@ -246,7 +246,7 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2">Item\__construct()</a>, <a class="el" href="include_2api_8php.html#a528d8070ee74ea800102936ce73cf366">api_statuses_home_timeline()</a>, <a class="el" href="include_2api_8php.html#ae0fa388479cace9c5a7a45b571ab42f8">api_statuses_repeat()</a>, <a class="el" href="include_2attach_8php.html#a0d07c5b83d3d54e186f752e571847b36">attach_by_hash()</a>, <a class="el" href="include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932">attach_by_hash_nodata()</a>, <a class="el" href="include_2attach_8php.html#a887d2d44a3ef18dcb6624e7fb58dc8e3">attach_count_files()</a>, <a class="el" href="include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d">attach_list_files()</a>, <a class="el" href="include_2attach_8php.html#a84a8a64c4805e1525b42d4add464833f">attach_store()</a>, <a class="el" href="permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7">check_list_permissions()</a>, <a class="el" href="common_8php.html#ab63408f39abef7a6915186e8dabc5a96">common_content()</a>, <a class="el" href="contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65">common_friends_visitor_widget()</a>, <a class="el" href="include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0">directory_run()</a>, <a class="el" href="item_8php.html#a693cd09805755ab85bbb5ecae69a48c3">item_post()</a>, <a class="el" href="like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538">like_content()</a>, <a class="el" href="photo_8php.html#a582779d24882b0d31ee909a91d70a448">photo_init()</a>, <a class="el" href="include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109">photo_upload()</a>, <a class="el" href="include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979">photos_album_widget()</a>, <a class="el" href="include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9">photos_albums_list()</a>, <a class="el" href="mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080">photos_post()</a>, <a class="el" href="poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498">poco_init()</a>, <a class="el" href="zot_8php.html#a37ec13b18057634eadb071f05297f5e1">process_delivery()</a>, <a class="el" href="zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc">process_mail_delivery()</a>, <a class="el" href="boot_8php.html#aebc5ed38c73ade57f360471da712ded2">profile_load()</a>, <a class="el" href="boot_8php.html#a646123ebbb10eb6f5b6ff26f4288da9b">profile_sidebar()</a>, <a class="el" href="classConversation.html#a66f121ca4026246f86a732e5faa0682c">Conversation\set_mode()</a>, <a class="el" href="subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3">subthread_content()</a>, <a class="el" href="dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a">syncdirs()</a>, <a class="el" href="items_8php.html#ab1bce4261bcf75ad62753b498a144d17">tag_deliver()</a>, <a class="el" href="viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776">viewconnections_content()</a>, <a class="el" href="include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909">z_readdir()</a>, and <a class="el" href="items_8php.html#a004e89d86b0f29b2c4da20108ecc4091">zot_feed()</a>.</p>
<p>Referenced by <a class="el" href="classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2">Item\__construct()</a>, <a class="el" href="include_2api_8php.html#a528d8070ee74ea800102936ce73cf366">api_statuses_home_timeline()</a>, <a class="el" href="include_2api_8php.html#ae0fa388479cace9c5a7a45b571ab42f8">api_statuses_repeat()</a>, <a class="el" href="include_2attach_8php.html#a0d07c5b83d3d54e186f752e571847b36">attach_by_hash()</a>, <a class="el" href="include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932">attach_by_hash_nodata()</a>, <a class="el" href="include_2attach_8php.html#a887d2d44a3ef18dcb6624e7fb58dc8e3">attach_count_files()</a>, <a class="el" href="include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d">attach_list_files()</a>, <a class="el" href="include_2attach_8php.html#a84a8a64c4805e1525b42d4add464833f">attach_store()</a>, <a class="el" href="permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7">check_list_permissions()</a>, <a class="el" href="common_8php.html#ab63408f39abef7a6915186e8dabc5a96">common_content()</a>, <a class="el" href="contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65">common_friends_visitor_widget()</a>, <a class="el" href="include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0">directory_run()</a>, <a class="el" href="item_8php.html#a693cd09805755ab85bbb5ecae69a48c3">item_post()</a>, <a class="el" href="like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538">like_content()</a>, <a class="el" href="photo_8php.html#a582779d24882b0d31ee909a91d70a448">photo_init()</a>, <a class="el" href="include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109">photo_upload()</a>, <a class="el" href="include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979">photos_album_widget()</a>, <a class="el" href="include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9">photos_albums_list()</a>, <a class="el" href="mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080">photos_post()</a>, <a class="el" href="poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498">poco_init()</a>, <a class="el" href="items_8php.html#a410f9c743877c125ca06312373346903">post_activity_item()</a>, <a class="el" href="zot_8php.html#a37ec13b18057634eadb071f05297f5e1">process_delivery()</a>, <a class="el" href="zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc">process_mail_delivery()</a>, <a class="el" href="boot_8php.html#aebc5ed38c73ade57f360471da712ded2">profile_load()</a>, <a class="el" href="boot_8php.html#a646123ebbb10eb6f5b6ff26f4288da9b">profile_sidebar()</a>, <a class="el" href="classConversation.html#a66f121ca4026246f86a732e5faa0682c">Conversation\set_mode()</a>, <a class="el" href="subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3">subthread_content()</a>, <a class="el" href="dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a">syncdirs()</a>, <a class="el" href="items_8php.html#ab1bce4261bcf75ad62753b498a144d17">tag_deliver()</a>, <a class="el" href="viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776">viewconnections_content()</a>, <a class="el" href="include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909">z_readdir()</a>, and <a class="el" href="items_8php.html#a004e89d86b0f29b2c4da20108ecc4091">zot_feed()</a>.</p>
</div>
</div>

View File

@ -46,8 +46,8 @@ var searchData=
['fkoauthdatastore',['FKOAuthDataStore',['../classFKOAuthDataStore.html',1,'']]],
['flip',['flip',['../classPhoto.html#a7acd95a0380f95999dd069fbb5629ea5',1,'Photo']]],
['fnull',['fnull',['../namespaceupdatetpl.html#a79c20eb62d568c999b56eb08530355d3',1,'updatetpl']]],
['follow_2ephp',['follow.php',['../mod_2follow_8php.html',1,'']]],
['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]],
['follow_2ephp',['follow.php',['../mod_2follow_8php.html',1,'']]],
['follow_5fcontent',['follow_content',['../mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592',1,'follow.php']]],
['follow_5finit',['follow_init',['../mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a',1,'follow.php']]],
['follow_5fwidget',['follow_widget',['../contact__widgets_8php.html#af24e693532a045954caab515942cfc6f',1,'contact_widgets.php']]],
@ -65,9 +65,7 @@ var searchData=
['friendica',['Friendica',['../namespaceFriendica.html',1,'']]],
['friendica_2dto_2dsmarty_2dtpl',['friendica-to-smarty-tpl',['../namespacefriendica-to-smarty-tpl.html',1,'']]],
['friendica_2dto_2dsmarty_2dtpl_2epy',['friendica-to-smarty-tpl.py',['../friendica-to-smarty-tpl_8py.html',1,'']]],
['friendica_5fplatform',['FRIENDICA_PLATFORM',['../boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3',1,'boot.php']]],
['friendica_5fsmarty_2ephp',['friendica_smarty.php',['../friendica__smarty_8php.html',1,'']]],
['friendica_5fversion',['FRIENDICA_VERSION',['../boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be',1,'boot.php']]],
['friendicasmarty',['FriendicaSmarty',['../classFriendicaSmarty.html',1,'']]],
['fsuggest_2ephp',['fsuggest.php',['../fsuggest_8php.html',1,'']]],
['fsuggest_5fcontent',['fsuggest_content',['../fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998',1,'fsuggest.php']]],

View File

@ -97,6 +97,7 @@ var searchData=
['group_5fcontent',['group_content',['../mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83',1,'group.php']]],
['group_5fget_5fmembers',['group_get_members',['../include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09',1,'group.php']]],
['group_5fpost',['group_post',['../mod_2group_8php.html#aed1f009b1221348021bb34761160ef35',1,'group.php']]],
['group_5frec_5fbyhash',['group_rec_byhash',['../include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245',1,'group.php']]],
['group_5frmv',['group_rmv',['../include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5',1,'group.php']]],
['group_5frmv_5fmember',['group_rmv_member',['../include_2group_8php.html#a540e3ef36f47d47532646be4241f6518',1,'group.php']]],
['group_5fselect',['group_select',['../acl__selectors_8php.html#aa1e3bc344ca2b29f97eb9860216d21a0',1,'acl_selectors.php']]],

View File

@ -8,6 +8,7 @@ var searchData=
['legal_5fwebbie',['legal_webbie',['../text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728',1,'text.php']]],
['like_2ephp',['like.php',['../like_8php.html',1,'']]],
['like_5fcontent',['like_content',['../like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538',1,'like.php']]],
['limit_5fbody_5fsize',['limit_body_size',['../items_8php.html#af94c281016c6c912d06e064113336c5c',1,'items.php']]],
['link_5fcompare',['link_compare',['../text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285',1,'text.php']]],
['linkify',['linkify',['../text_8php.html#a11255c8c4e5245b6c24f97684826aa54',1,'text.php']]],
['load_5fconfig',['load_config',['../include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1',1,'config.php']]],

View File

@ -82,6 +82,7 @@ var searchData=
['pop_5flang',['pop_lang',['../language_8php.html#a78bd204955ec4cc3a9ac651285a1689d',1,'language.php']]],
['populate_5facl',['populate_acl',['../acl__selectors_8php.html#a51f2ec7a143d5a5b38e35efd5f3d6e2c',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']]],
['post_5fpost',['post_post',['../post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75',1,'post.php']]],
['post_5furl',['post_url',['../include_2network_8php.html#aa44d9e33a579d930e9e79c4ebb3d6b5e',1,'network.php']]],

View File

@ -8,6 +8,8 @@ var searchData=
['randprof_5finit',['randprof_init',['../randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090',1,'randprof.php']]],
['rdelim',['rdelim',['../namespacefriendica-to-smarty-tpl.html#a8540514fb7c4aa18ad2dffa2a975036b',1,'friendica-to-smarty-tpl']]],
['rebuild_5ftheme_5ftable',['rebuild_theme_table',['../admin_8php.html#ae46311a3fefc21abc838a26e91789de6',1,'admin.php']]],
['red_5fplatform',['RED_PLATFORM',['../boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4',1,'boot.php']]],
['red_5fversion',['RED_VERSION',['../boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3',1,'boot.php']]],
['redbasic_5fform',['redbasic_form',['../view_2theme_2redbasic_2php_2config_8php.html#ab5073653dfb9eb2216f8580098a87071',1,'config.php']]],
['redbasic_5finit',['redbasic_init',['../theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b',1,'theme.php']]],
['redir_2ephp',['redir.php',['../redir_8php.html',1,'']]],

View File

@ -36,7 +36,7 @@ var searchData=
['theme_5fstatus',['theme_status',['../admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4',1,'admin.php']]],
['timesel',['timesel',['../datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1',1,'datetime.php']]],
['timezone_5fcmp',['timezone_cmp',['../datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865',1,'datetime.php']]],
['title_5fis_5fbody',['title_is_body',['../items_8php.html#a1f747db2277904f85ac7b9e64c024e4e',1,'items.php']]],
['title_5fis_5fbody',['title_is_body',['../items_8php.html#aa371905f0a211b307cb3f7188c6cba04',1,'items.php']]],
['toggle_5fmobile_2ephp',['toggle_mobile.php',['../toggle__mobile_8php.html',1,'']]],
['toggle_5fmobile_5finit',['toggle_mobile_init',['../toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254',1,'toggle_mobile.php']]],
['toggle_5ftheme',['toggle_theme',['../admin_8php.html#af81f081851791cd15e49e8ff6722dc27',1,'admin.php']]],

View File

@ -12,6 +12,8 @@ var searchData=
['zfinger_5finit',['zfinger_init',['../zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0',1,'zfinger.php']]],
['zid',['zid',['../boot_8php.html#a5b7ce5c0a79796800883644c389dc87f',1,'boot.php']]],
['zid_5finit',['zid_init',['../boot_8php.html#a680fbafc2db023c5b1309e0180e81315',1,'boot.php']]],
['zidify_5fcallback',['zidify_callback',['../text_8php.html#a405afe814a23f3bd94d826101aa168ab',1,'text.php']]],
['zidify_5flinks',['zidify_links',['../text_8php.html#a29988052f3944111def3b6aaf2c7a8f6',1,'text.php']]],
['zot_2ephp',['zot.php',['../zot_8php.html',1,'']]],
['zot_5fbuild_5fpacket',['zot_build_packet',['../zot_8php.html#a3862b3161b2c8557dc1a95020179bd81',1,'zot.php']]],
['zot_5ffeed',['zot_feed',['../items_8php.html#a004e89d86b0f29b2c4da20108ecc4091',1,'items.php']]],

View File

@ -91,6 +91,7 @@ var searchData=
['group_5fcontent',['group_content',['../mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83',1,'group.php']]],
['group_5fget_5fmembers',['group_get_members',['../include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09',1,'group.php']]],
['group_5fpost',['group_post',['../mod_2group_8php.html#aed1f009b1221348021bb34761160ef35',1,'group.php']]],
['group_5frec_5fbyhash',['group_rec_byhash',['../include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245',1,'group.php']]],
['group_5frmv',['group_rmv',['../include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5',1,'group.php']]],
['group_5frmv_5fmember',['group_rmv_member',['../include_2group_8php.html#a540e3ef36f47d47532646be4241f6518',1,'group.php']]],
['group_5fselect',['group_select',['../acl__selectors_8php.html#aa1e3bc344ca2b29f97eb9860216d21a0',1,'acl_selectors.php']]],

View File

@ -3,6 +3,7 @@ var searchData=
['lang_5fselector',['lang_selector',['../text_8php.html#a71f6952243d3fe1c5a8154f78027e29c',1,'text.php']]],
['legal_5fwebbie',['legal_webbie',['../text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728',1,'text.php']]],
['like_5fcontent',['like_content',['../like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538',1,'like.php']]],
['limit_5fbody_5fsize',['limit_body_size',['../items_8php.html#af94c281016c6c912d06e064113336c5c',1,'items.php']]],
['link_5fcompare',['link_compare',['../text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285',1,'text.php']]],
['linkify',['linkify',['../text_8php.html#a11255c8c4e5245b6c24f97684826aa54',1,'text.php']]],
['load_5fconfig',['load_config',['../include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1',1,'config.php']]],

View File

@ -36,6 +36,7 @@ var searchData=
['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#a51f2ec7a143d5a5b38e35efd5f3d6e2c',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']]],
['post_5furl',['post_url',['../include_2network_8php.html#aa44d9e33a579d930e9e79c4ebb3d6b5e',1,'network.php']]],

View File

@ -20,7 +20,7 @@ var searchData=
['theme_5fstatus',['theme_status',['../admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4',1,'admin.php']]],
['timesel',['timesel',['../datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1',1,'datetime.php']]],
['timezone_5fcmp',['timezone_cmp',['../datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865',1,'datetime.php']]],
['title_5fis_5fbody',['title_is_body',['../items_8php.html#a1f747db2277904f85ac7b9e64c024e4e',1,'items.php']]],
['title_5fis_5fbody',['title_is_body',['../items_8php.html#aa371905f0a211b307cb3f7188c6cba04',1,'items.php']]],
['toggle_5fmobile_5finit',['toggle_mobile_init',['../toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254',1,'toggle_mobile.php']]],
['toggle_5ftheme',['toggle_theme',['../admin_8php.html#af81f081851791cd15e49e8ff6722dc27',1,'admin.php']]],
['tryoembed',['tryoembed',['../bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7',1,'bbcode.php']]],

View File

@ -10,6 +10,8 @@ var searchData=
['zfinger_5finit',['zfinger_init',['../zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0',1,'zfinger.php']]],
['zid',['zid',['../boot_8php.html#a5b7ce5c0a79796800883644c389dc87f',1,'boot.php']]],
['zid_5finit',['zid_init',['../boot_8php.html#a680fbafc2db023c5b1309e0180e81315',1,'boot.php']]],
['zidify_5fcallback',['zidify_callback',['../text_8php.html#a405afe814a23f3bd94d826101aa168ab',1,'text.php']]],
['zidify_5flinks',['zidify_links',['../text_8php.html#a29988052f3944111def3b6aaf2c7a8f6',1,'text.php']]],
['zot_5fbuild_5fpacket',['zot_build_packet',['../zot_8php.html#a3862b3161b2c8557dc1a95020179bd81',1,'zot.php']]],
['zot_5ffeed',['zot_feed',['../items_8php.html#a004e89d86b0f29b2c4da20108ecc4091',1,'items.php']]],
['zot_5ffetch',['zot_fetch',['../zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea',1,'zot.php']]],

View File

@ -4,7 +4,5 @@ var searchData=
['filename',['filename',['../namespacefriendica-to-smarty-tpl.html#a5f9bf7a67d955c0d6be70a82097611c5',1,'friendica-to-smarty-tpl']]],
['files',['files',['../namespacefriendica-to-smarty-tpl.html#ae74419b16516956c66f7db714a93a6ac',1,'friendica-to-smarty-tpl']]],
['fnull',['fnull',['../namespaceupdatetpl.html#a79c20eb62d568c999b56eb08530355d3',1,'updatetpl']]],
['foreach',['foreach',['../typo_8php.html#a3bb638ebb8472e4ee7c85afe721f4fe3',1,'typo.php']]],
['friendica_5fplatform',['FRIENDICA_PLATFORM',['../boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3',1,'boot.php']]],
['friendica_5fversion',['FRIENDICA_VERSION',['../boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be',1,'boot.php']]]
['foreach',['foreach',['../typo_8php.html#a3bb638ebb8472e4ee7c85afe721f4fe3',1,'typo.php']]]
];

View File

@ -3,6 +3,8 @@ var searchData=
['random_5fstring_5fhex',['RANDOM_STRING_HEX',['../text_8php.html#aad557c054cf2ed915633701018fc7e3f',1,'text.php']]],
['random_5fstring_5ftext',['RANDOM_STRING_TEXT',['../text_8php.html#a2ffd79c60cc87cec24ef76447b905187',1,'text.php']]],
['rdelim',['rdelim',['../namespacefriendica-to-smarty-tpl.html#a8540514fb7c4aa18ad2dffa2a975036b',1,'friendica-to-smarty-tpl']]],
['red_5fplatform',['RED_PLATFORM',['../boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4',1,'boot.php']]],
['red_5fversion',['RED_VERSION',['../boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3',1,'boot.php']]],
['register_5fapprove',['REGISTER_APPROVE',['../boot_8php.html#a7176c0f9f1c98421b97735d892cf6252',1,'boot.php']]],
['register_5fclosed',['REGISTER_CLOSED',['../boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1',1,'boot.php']]],
['register_5fopen',['REGISTER_OPEN',['../boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63',1,'boot.php']]],

File diff suppressed because one or more lines are too long

View File

@ -87,6 +87,8 @@ var text_8php =
[ "xchan_mail_query", "text_8php.html#a543447c5ed766535221e2d9636b379ee", null ],
[ "xchan_query", "text_8php.html#a24b2b69b9162da789ab6514e0e09a37c", null ],
[ "xmlify", "text_8php.html#aaed4413ed8918838b517e3b2fafaea0d", null ],
[ "zidify_callback", "text_8php.html#a405afe814a23f3bd94d826101aa168ab", null ],
[ "zidify_links", "text_8php.html#a29988052f3944111def3b6aaf2c7a8f6", null ],
[ "RANDOM_STRING_HEX", "text_8php.html#aad557c054cf2ed915633701018fc7e3f", null ],
[ "RANDOM_STRING_TEXT", "text_8php.html#a2ffd79c60cc87cec24ef76447b905187", null ]
];

View File

@ -991,7 +991,7 @@ require_once('include/security.php');
if(perm_is_allowed($r[0]['uid'],$observer['xchan_hash'],'view_stream')) {
if ($r[0]['body'] != "") {
$_REQUEST['body'] = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
$_REQUEST['body'] = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')."[zrl=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/zrl] \n".$r[0]['body'];
$_REQUEST['profile_uid'] = api_user();
$_REQUEST['type'] = 'wall';
$_REQUEST['api_source'] = true;
@ -1524,7 +1524,7 @@ require_once('include/security.php');
$name = get_config('system','sitename');
$server = $a->get_hostname();
$logo = $a->get_baseurl() . '/images/fred-64.png';
$logo = $a->get_baseurl() . '/images/r!.png';
$email = get_config('system','admin_email');
$closed = ((get_config('system','register_policy') == REGISTER_CLOSED) ? 'true' : 'false');
$private = ((get_config('system','block_public')) ? 'true' : 'false');
@ -1541,8 +1541,8 @@ require_once('include/security.php');
'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl,
'shorturllength' => '30',
'friendica' => array(
'FRIENDICA_PLATFORM' => FRIENDICA_PLATFORM,
'FRIENDICA_VERSION' => FRIENDICA_VERSION,
'RED_PLATFORM' => RED_PLATFORM,
'RED_VERSION' => RED_VERSION,
'ZOT_REVISION' => ZOT_REVISION,
'DB_UPDATE_VERSION' => DB_UPDATE_VERSION
)
@ -1577,12 +1577,12 @@ require_once('include/security.php');
if($type === 'xml') {
header("Content-type: application/xml");
echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>' . FRIENDICA_VERSION . '</version>' . "\r\n";
echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>' . RED_VERSION . '</version>' . "\r\n";
killme();
}
elseif($type === 'json') {
header("Content-type: application/json");
echo '"' . FRIENDICA_VERSION . '"';
echo '"' . RED_VERSION . '"';
killme();
}
}

View File

@ -199,7 +199,7 @@ function bb_ShareAttributesSimple($match) {
}
// BBcode 2 HTML was written by WAY2WEB.net
// extended to work with Mistpark/Friendica - Mike Macgirvin
// extended to work with Mistpark/Friendica/Red - Mike Macgirvin
function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
@ -263,21 +263,24 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// Perform URL Search
$Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" >$2</a>', $Text);
$urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]';
if ($tryoembed)
$Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text);
$Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$Text);
$Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/$urlchars+)/ism", '$1<a href="$2" >$2</a>', $Text);
// $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/$urlchars+)\{zid\}($urlchars*)/ism", '$1<a class="zrl" href="$2$3" >$2$3</a>', $Text);
$Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text);
if ($tryoembed)
if($tryoembed)
$Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text);
$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" >$1</a>', $Text);
$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" >$2</a>', $Text);
//$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
$Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '<a class="zrl" href="$1" >$1</a>', $Text);
$Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a class="zrl" href="$1" >$2</a>', $Text);
// Perform MAIL Search
$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);

View File

@ -34,7 +34,7 @@ function notification($params) {
push_lang($recip['account_language']); // should probably have a channel language
$banner = t('Red Notification');
$product = FRIENDICA_PLATFORM;
$product = RED_PLATFORM;
$siteurl = $a->get_baseurl(true);
$thanks = t('Thank You,');
$sitename = get_config('system','sitename');
@ -66,7 +66,7 @@ function notification($params) {
$subject = sprintf( t('[Red:Notify] New mail received at %s'),$sitename);
$preamble = sprintf( t('%1$s sent you a new private message at %2$s.'),$sender['xchan_name'],$sitename);
$epreamble = sprintf( t('%1$s sent you %2$s.'),'[url=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/url]', '[url=$itemlink]' . t('a private message') . '[/url]');
$epreamble = sprintf( t('%1$s sent you %2$s.'),'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a private message') . '[/zrl]');
$sitelink = t('Please visit %s to view and/or reply to your private messages.');
$tsitelink = sprintf( $sitelink, $siteurl . '/message/' . $params['item']['id'] );
$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/message/' . $params['item']['id'] . '">' . $sitename . '</a>');
@ -111,23 +111,23 @@ function notification($params) {
//$possess_desc = str_replace('<!item_type!>',$possess_desc);
// "a post"
$dest_str = sprintf(t('%1$s commented on [url=%2$s]a %3$s[/url]'),
$dest_str = sprintf(t('%1$s commented on [zrl=%2$s]a %3$s[/zrl]'),
'[url=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/url]',
$itemlink,
$item_post_type);
// "George Bull's post"
if($p)
$dest_str = sprintf(t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]'),
'[url=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/url]',
$dest_str = sprintf(t('%1$s commented on [zrl=%2$s]%3$s\'s %4$s[/zrl]'),
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
$itemlink,
$p[0]['author']['xchan_name'],
$item_post_type);
// "your post"
if($p[0]['owner']['xchan_name'] == $p[0]['author']['xchan_name'] && ($p[0]['item_flags'] & ITEM_WALL))
$dest_str = sprintf(t('%1$s commented on [url=%2$s]your %3$s[/url]'),
'[url=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/url]',
$dest_str = sprintf(t('%1$s commented on [zrl=%2$s]your %3$s[/zrl]'),
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
$itemlink,
$item_post_type);
@ -151,8 +151,8 @@ function notification($params) {
$preamble = sprintf( t('%1$s posted to your profile wall at %2$s') , $sender['xchan_name'], $sitename);
$epreamble = sprintf( t('%1$s posted to [url=%2$s]your wall[/url]') ,
'[url=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/url]',
$epreamble = sprintf( t('%1$s posted to [zrl=%2$s]your wall[/zrl]') ,
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
$params['link']);
$sitelink = t('Please visit %s to view and/or reply to the conversation.');
@ -164,8 +164,8 @@ function notification($params) {
if($params['type'] == NOTIFY_TAGSELF) {
$subject = sprintf( t('[Red:Notify] %s tagged you') , $sender['xchan_name']);
$preamble = sprintf( t('%1$s tagged you at %2$s') , $sender['xchan_name'], $sitename);
$epreamble = sprintf( t('%1$s [url=%2$s]tagged you[/url].') ,
'[url=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/url]',
$epreamble = sprintf( t('%1$s [zrl=%2$s]tagged you[/zrl].') ,
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
$params['link']);
$sitelink = t('Please visit %s to view and/or reply to the conversation.');
@ -178,8 +178,8 @@ function notification($params) {
$subject = sprintf( t('[Red:Notify] %1$s poked you') , $sender['xchan_name']);
$preamble = sprintf( t('%1$s poked you at %2$s') , $sender['xchan_name'], $sitename);
$epreamble = sprintf( t('%1$s [url=%2$s]poked you[/url].') ,
'[url=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/url]',
$epreamble = sprintf( t('%1$s [zrl=%2$s]poked you[/zrl].') ,
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
$params['link']);
$subject = str_replace('poked', t($params['activity']), $subject);
@ -195,8 +195,8 @@ function notification($params) {
if($params['type'] == NOTIFY_TAGSHARE) {
$subject = sprintf( t('[Red:Notify] %s tagged your post') , $sender['xchan_name']);
$preamble = sprintf( t('%1$s tagged your post at %2$s') , $sender['xchan_name'], $sitename);
$epreamble = sprintf( t('%1$s tagged [url=%2$s]your post[/url]') ,
'[url=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/url]',
$epreamble = sprintf( t('%1$s tagged [zrl=%2$s]your post[/zrl]') ,
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
$itemlink);
$sitelink = t('Please visit %s to view and/or reply to the conversation.');
@ -208,9 +208,9 @@ function notification($params) {
if($params['type'] == NOTIFY_INTRO) {
$subject = sprintf( t('[Red:Notify] Introduction received'));
$preamble = sprintf( t('You\'ve received an introduction from \'%1$s\' at %2$s'), $sender['xchan_name'], $sitename);
$epreamble = sprintf( t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.'),
$epreamble = sprintf( t('You\'ve received [zrl=%1$s]an introduction[/zrl] from %2$s.'),
$itemlink,
'[url=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/url]');
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]');
$body = sprintf( t('You may visit their profile at %s'),$sender['xchan_url']);
$sitelink = t('Please visit %s to approve or reject the introduction.');
@ -222,10 +222,10 @@ function notification($params) {
if($params['type'] == NOTIFY_SUGGEST) {
$subject = sprintf( t('[Red:Notify] Friend suggestion received'));
$preamble = sprintf( t('You\'ve received a friend suggestion from \'%1$s\' at %2$s'), $sender['xchan_name'], $sitename);
$epreamble = sprintf( t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.'),
$epreamble = sprintf( t('You\'ve received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s.'),
$itemlink,
'[url=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/url]',
'[url=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/url]');
'[zrl=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/zrl]',
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]');
$body = t('Name:') . ' ' . $params['item']['name'] . "\n";
$body .= t('Photo:') . ' ' . $params['item']['photo'] . "\n";

View File

@ -23,6 +23,8 @@ function get_features() {
array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles')),
array('webpages', t('Web Pages'), t('Provide managed web pages on your channel')),
array('prettyphoto', t('Enhanced Photo Albums'), t('Enable photo album with enhanced features')),
//FIXME - needs a description, but how the hell do we explain this to normals?
array('sendzid', t('Extended Identity Sharing'), t(' ')),
array('expert', t('Expert Mode'), t('Enable Expert Mode to provide advanced configuration options')),

View File

@ -257,7 +257,7 @@ function identity_basic_export($channel_id) {
$ret = array();
$ret['compatibility'] = array('project' => FRIENDICA_PLATFORM, 'version' => FRIENDICA_VERSION, 'database' => DB_UPDATE_VERSION);
$ret['compatibility'] = array('project' => RED_PLATFORM, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION);
$r = q("select * from channel where channel_id = %d limit 1",
intval($channel_id)

View File

@ -299,7 +299,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
$salmon = feed_salmonlinks($owner_nick);
$atom .= replace_macros($feed_template, array(
'$version' => xmlify(FRIENDICA_VERSION),
'$version' => xmlify(RED_VERSION),
'$feed_id' => xmlify($a->get_baseurl() . '/channel/' . $owner_nick),
'$feed_title' => xmlify($owner['name']),
'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
@ -1918,7 +1918,7 @@ function tag_deliver($uid,$item_id) {
$body = preg_replace('/\[share(.*?)\[\/share\]/','',$item['body']);
$pattern = '/@\[url\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/url\]/';
$pattern = '/@\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/';
if(! preg_match($pattern,$body,$matches)) {
logger('tag_deliver: mention was in a reshare - ignoring');
@ -2012,7 +2012,7 @@ function tgroup_check($uid,$item) {
$body = preg_replace("/\[share\](.*?)\[\/share\]/ism", '', $item['body']);
$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER);
$cnt = preg_match_all('/[\@\!]\[zrl\=(.*?)\](.*?)\[\/zrl\]/ism',$body,$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
@ -2504,7 +2504,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
*/
$bdtext = sprintf( t('%s\'s birthday'), $contact['name']);
$bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' ) ;
$bdtext2 = sprintf( t('Happy Birthday %s'), ' [zrl=' . $contact['url'] . ']' . $contact['name'] . '[/zrl]' ) ;
$r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
@ -2752,7 +2752,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
// extract tag, if not duplicate, add to parent item
if($xo->id && $xo->content) {
$newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
$newtag = '#[zrl=' . $xo->id . ']'. $xo->content . '[/zrl]';
if(! (stristr($r[0]['tag'],$newtag))) {
q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
@ -3535,7 +3535,7 @@ function local_delivery($importer,$data) {
// extract tag, if not duplicate, and this user allows tags, add to parent item
//FIXME
if($xo->id && $xo->content) {
$newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
$newtag = '#[zrl=' . $xo->id . ']'. $xo->content . '[/zrl]';
if(! (stristr($tagp[0]['tag'],$newtag))) {
$i = q("SELECT `blocktags` FROM `user` where `uid` = %d LIMIT 1",
intval($importer['importer_uid'])
@ -3687,7 +3687,7 @@ function local_delivery($importer,$data) {
if($xo->content) {
if(! (stristr($r[0]['tag'],trim($xo->content)))) {
q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[zrl=' . $xo->id . ']'. $xo->content . '[/zrl]'),
intval($r[0]['id'])
);
}

View File

@ -192,7 +192,6 @@ EOT;
$banner = get_config('system','banner');
if($banner === false)
// $banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/fred-32.png" alt="logo" /></a>';
$banner = 'red';
$tpl = get_markup_template('nav.tpl');

View File

@ -38,8 +38,7 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
}
@curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
//@curl_setopt($ch, CURLOPT_USERAGENT, "Friendica");
@curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Friendica)");
@curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Red)");
if(intval($timeout)) {
@ -124,7 +123,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
curl_setopt($ch, CURLOPT_POST,1);
curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
curl_setopt($ch, CURLOPT_USERAGENT, "Friendica");
curl_setopt($ch, CURLOPT_USERAGENT, "Red");
if(intval($timeout)) {
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
@ -240,7 +239,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
@curl_setopt($ch, CURLOPT_CAINFO, get_capath());
@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
@curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
@curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Friendica Red)");
@curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Red)");
if (x($opts,'accept_content')){
curl_setopt($ch,CURLOPT_HTTPHEADER, array (
@ -335,7 +334,7 @@ function z_post_url($url,$params, $headers = null, $redirects = 0, $timeout = 0)
curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
curl_setopt($ch, CURLOPT_POST,1);
curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
curl_setopt($ch, CURLOPT_USERAGENT, "Friendica");
curl_setopt($ch, CURLOPT_USERAGENT, "Red");
if(intval($timeout)) {
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
@ -1094,7 +1093,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
logger('scale_external_images: ' . $orig_width . '->' . $new_width . 'w ' . $orig_height . '->' . $new_height . 'h' . ' match: ' . $mtch[0], LOGGER_DEBUG);
$s = str_replace($mtch[0],'[img=' . $new_width . 'x' . $new_height. ']' . $scaled . '[/img]'
. "\n" . (($include_link)
? '[url=' . $mtch[1] . ']' . t('view full size') . '[/url]' . "\n"
? '[zrl=' . $mtch[1] . ']' . t('view full size') . '[/zrl]' . "\n"
: ''),$s);
logger('scale_external_images: new string: ' . $s, LOGGER_DEBUG);
}

View File

@ -208,9 +208,9 @@ function photo_upload($channel, $observer, $args) {
$arr['deny_gid'] = $str_group_deny;
$arr['body'] = '[url=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']'
$arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']'
. '[img]' . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
. '[/url]';
. '[/zrl]';
$item_id = item_store($arr);
@ -350,9 +350,9 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) {
$arr['deny_cid'] = $photo['deny_cid'];
$arr['deny_gid'] = $photo['deny_gid'];
$arr['body'] = '[url=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']'
$arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']'
. '[img]' . z_root() . '/photo/' . $photo['resource_id'] . '-' . $photo['scale'] . '[/img]'
. '[/url]';
. '[/zrl]';
$item_id = item_store($arr);
return $item_id;

View File

@ -397,7 +397,7 @@ function upgrade_link($bbcode = false) {
if(! $l)
return '';
if($bbcode)
$t = sprintf('[url=%s]' . t('Click here to upgrade.') . '[/url]', $l);
$t = sprintf('[zrl=%s]' . t('Click here to upgrade.') . '[/zrl]', $l);
else
$t = sprintf('<a href="%s">' . t('Click here to upgrade.') . '</div>', $l);
return $t;

View File

@ -1108,6 +1108,7 @@ function prepare_text($text,$content_type = 'text/bbcode') {
$s = bbcode($text);
else
$s = smilies(bbcode($text));
$s = zidify_links($s);
break;
}
@ -1115,6 +1116,42 @@ function prepare_text($text,$content_type = 'text/bbcode') {
}
/**
* zidify_callback() and zidify_links() work together to turn any HTML a tags with class="zrl" into zid links
* These will typically be generated by a bbcode '[zrl]' tag. This is done inside prepare_text() rather than bbcode()
* because the latter is used for general purpose conversions and the former is used only when preparing text for
* immediate display.
*
* Issues: Currently the order of HTML parameters in the text is somewhat rigid and inflexible.
* We assume it looks like <a class="zrl" href="xxxxxxxxxx"> and will not work if zrl and href appear in a different order.
*/
function zidify_callback($match) {
if (feature_enabled(local_user(),'sendzid')) {
$replace = '<a' . $match[1] . ' href="' . zid($match[2]) . '"';}
else {
$replace = '<a' . $match[1] . 'class="zrl"' . $match[2] . ' href="' . zid($match[3]) . '"';}
$x = str_replace($match[0],$replace,$match[0]);
return $x;
}
function zidify_links($s) {
if (feature_enabled(local_user(),'sendzid')) {
$s = preg_replace_callback('/\<a(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);}
else {
$s = preg_replace_callback('/\<a(.*?)class\=\"zrl\"(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);}
return $s;
}
/**
* return atom link elements for all of our hubs
*/
@ -1633,7 +1670,7 @@ function normalise_openid($s) {
function undo_post_tagging($s) {
$matches = null;
$cnt = preg_match_all('/([@#])\[url=(.*?)\](.*?)\[\/url\]/ism',$s,$matches,PREG_SET_ORDER);
$cnt = preg_match_all('/([@#])\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
$s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);

511
js/jquery-migrate-1.1.1.js Normal file
View File

@ -0,0 +1,511 @@
/*!
* jQuery Migrate - v1.1.1 - 2013-02-16
* https://github.com/jquery/jquery-migrate
* Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
*/
(function( jQuery, window, undefined ) {
// See http://bugs.jquery.com/ticket/13335
// "use strict";
var warnedAbout = {};
// List of warnings already given; public read only
jQuery.migrateWarnings = [];
// Set to true to prevent console output; migrateWarnings still maintained
// jQuery.migrateMute = false;
// Show a message on the console so devs know we're active
if ( !jQuery.migrateMute && window.console && console.log ) {
console.log("JQMIGRATE: Logging is active");
}
// Set to false to disable traces that appear with warnings
if ( jQuery.migrateTrace === undefined ) {
jQuery.migrateTrace = true;
}
// Forget any warnings we've already given; public
jQuery.migrateReset = function() {
warnedAbout = {};
jQuery.migrateWarnings.length = 0;
};
function migrateWarn( msg) {
if ( !warnedAbout[ msg ] ) {
warnedAbout[ msg ] = true;
jQuery.migrateWarnings.push( msg );
if ( window.console && console.warn && !jQuery.migrateMute ) {
console.warn( "JQMIGRATE: " + msg );
if ( jQuery.migrateTrace && console.trace ) {
console.trace();
}
}
}
}
function migrateWarnProp( obj, prop, value, msg ) {
if ( Object.defineProperty ) {
// On ES5 browsers (non-oldIE), warn if the code tries to get prop;
// allow property to be overwritten in case some other plugin wants it
try {
Object.defineProperty( obj, prop, {
configurable: true,
enumerable: true,
get: function() {
migrateWarn( msg );
return value;
},
set: function( newValue ) {
migrateWarn( msg );
value = newValue;
}
});
return;
} catch( err ) {
// IE8 is a dope about Object.defineProperty, can't warn there
}
}
// Non-ES5 (or broken) browser; just set the property
jQuery._definePropertyBroken = true;
obj[ prop ] = value;
}
if ( document.compatMode === "BackCompat" ) {
// jQuery has never supported or tested Quirks Mode
migrateWarn( "jQuery is not compatible with Quirks Mode" );
}
var attrFn = jQuery( "<input/>", { size: 1 } ).attr("size") && jQuery.attrFn,
oldAttr = jQuery.attr,
valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get ||
function() { return null; },
valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set ||
function() { return undefined; },
rnoType = /^(?:input|button)$/i,
rnoAttrNodeType = /^[238]$/,
rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
ruseDefault = /^(?:checked|selected)$/i;
// jQuery.attrFn
migrateWarnProp( jQuery, "attrFn", attrFn || {}, "jQuery.attrFn is deprecated" );
jQuery.attr = function( elem, name, value, pass ) {
var lowerName = name.toLowerCase(),
nType = elem && elem.nodeType;
if ( pass ) {
// Since pass is used internally, we only warn for new jQuery
// versions where there isn't a pass arg in the formal params
if ( oldAttr.length < 4 ) {
migrateWarn("jQuery.fn.attr( props, pass ) is deprecated");
}
if ( elem && !rnoAttrNodeType.test( nType ) &&
(attrFn ? name in attrFn : jQuery.isFunction(jQuery.fn[name])) ) {
return jQuery( elem )[ name ]( value );
}
}
// Warn if user tries to set `type`, since it breaks on IE 6/7/8; by checking
// for disconnected elements we don't warn on $( "<button>", { type: "button" } ).
if ( name === "type" && value !== undefined && rnoType.test( elem.nodeName ) && elem.parentNode ) {
migrateWarn("Can't change the 'type' of an input or button in IE 6/7/8");
}
// Restore boolHook for boolean property/attribute synchronization
if ( !jQuery.attrHooks[ lowerName ] && rboolean.test( lowerName ) ) {
jQuery.attrHooks[ lowerName ] = {
get: function( elem, name ) {
// Align boolean attributes with corresponding properties
// Fall back to attribute presence where some booleans are not supported
var attrNode,
property = jQuery.prop( elem, name );
return property === true || typeof property !== "boolean" &&
( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
name.toLowerCase() :
undefined;
},
set: function( elem, value, name ) {
var propName;
if ( value === false ) {
// Remove boolean attributes when set to false
jQuery.removeAttr( elem, name );
} else {
// value is true since we know at this point it's type boolean and not false
// Set boolean attributes to the same name and set the DOM property
propName = jQuery.propFix[ name ] || name;
if ( propName in elem ) {
// Only set the IDL specifically if it already exists on the element
elem[ propName ] = true;
}
elem.setAttribute( name, name.toLowerCase() );
}
return name;
}
};
// Warn only for attributes that can remain distinct from their properties post-1.9
if ( ruseDefault.test( lowerName ) ) {
migrateWarn( "jQuery.fn.attr('" + lowerName + "') may use property instead of attribute" );
}
}
return oldAttr.call( jQuery, elem, name, value );
};
// attrHooks: value
jQuery.attrHooks.value = {
get: function( elem, name ) {
var nodeName = ( elem.nodeName || "" ).toLowerCase();
if ( nodeName === "button" ) {
return valueAttrGet.apply( this, arguments );
}
if ( nodeName !== "input" && nodeName !== "option" ) {
migrateWarn("jQuery.fn.attr('value') no longer gets properties");
}
return name in elem ?
elem.value :
null;
},
set: function( elem, value ) {
var nodeName = ( elem.nodeName || "" ).toLowerCase();
if ( nodeName === "button" ) {
return valueAttrSet.apply( this, arguments );
}
if ( nodeName !== "input" && nodeName !== "option" ) {
migrateWarn("jQuery.fn.attr('value', val) no longer sets properties");
}
// Does not return so that setAttribute is also used
elem.value = value;
}
};
var matched, browser,
oldInit = jQuery.fn.init,
oldParseJSON = jQuery.parseJSON,
// Note this does NOT include the #9521 XSS fix from 1.7!
rquickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*|#([\w\-]*))$/;
// $(html) "looks like html" rule change
jQuery.fn.init = function( selector, context, rootjQuery ) {
var match;
if ( selector && typeof selector === "string" && !jQuery.isPlainObject( context ) &&
(match = rquickExpr.exec( selector )) && match[1] ) {
// This is an HTML string according to the "old" rules; is it still?
if ( selector.charAt( 0 ) !== "<" ) {
migrateWarn("$(html) HTML strings must start with '<' character");
}
// Now process using loose rules; let pre-1.8 play too
if ( context && context.context ) {
// jQuery object as context; parseHTML expects a DOM object
context = context.context;
}
if ( jQuery.parseHTML ) {
return oldInit.call( this, jQuery.parseHTML( jQuery.trim(selector), context, true ),
context, rootjQuery );
}
}
return oldInit.apply( this, arguments );
};
jQuery.fn.init.prototype = jQuery.fn;
// Let $.parseJSON(falsy_value) return null
jQuery.parseJSON = function( json ) {
if ( !json && json !== null ) {
migrateWarn("jQuery.parseJSON requires a valid JSON string");
return null;
}
return oldParseJSON.apply( this, arguments );
};
jQuery.uaMatch = function( ua ) {
ua = ua.toLowerCase();
var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
/(webkit)[ \/]([\w.]+)/.exec( ua ) ||
/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
/(msie) ([\w.]+)/.exec( ua ) ||
ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
[];
return {
browser: match[ 1 ] || "",
version: match[ 2 ] || "0"
};
};
// Don't clobber any existing jQuery.browser in case it's different
if ( !jQuery.browser ) {
matched = jQuery.uaMatch( navigator.userAgent );
browser = {};
if ( matched.browser ) {
browser[ matched.browser ] = true;
browser.version = matched.version;
}
// Chrome is Webkit, but Webkit is also Safari.
if ( browser.chrome ) {
browser.webkit = true;
} else if ( browser.webkit ) {
browser.safari = true;
}
jQuery.browser = browser;
}
// Warn if the code tries to get jQuery.browser
migrateWarnProp( jQuery, "browser", jQuery.browser, "jQuery.browser is deprecated" );
jQuery.sub = function() {
function jQuerySub( selector, context ) {
return new jQuerySub.fn.init( selector, context );
}
jQuery.extend( true, jQuerySub, this );
jQuerySub.superclass = this;
jQuerySub.fn = jQuerySub.prototype = this();
jQuerySub.fn.constructor = jQuerySub;
jQuerySub.sub = this.sub;
jQuerySub.fn.init = function init( selector, context ) {
if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
context = jQuerySub( context );
}
return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
};
jQuerySub.fn.init.prototype = jQuerySub.fn;
var rootjQuerySub = jQuerySub(document);
migrateWarn( "jQuery.sub() is deprecated" );
return jQuerySub;
};
// Ensure that $.ajax gets the new parseJSON defined in core.js
jQuery.ajaxSetup({
converters: {
"text json": jQuery.parseJSON
}
});
var oldFnData = jQuery.fn.data;
jQuery.fn.data = function( name ) {
var ret, evt,
elem = this[0];
// Handles 1.7 which has this behavior and 1.8 which doesn't
if ( elem && name === "events" && arguments.length === 1 ) {
ret = jQuery.data( elem, name );
evt = jQuery._data( elem, name );
if ( ( ret === undefined || ret === evt ) && evt !== undefined ) {
migrateWarn("Use of jQuery.fn.data('events') is deprecated");
return evt;
}
}
return oldFnData.apply( this, arguments );
};
var rscriptType = /\/(java|ecma)script/i,
oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack;
jQuery.fn.andSelf = function() {
migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
return oldSelf.apply( this, arguments );
};
// Since jQuery.clean is used internally on older versions, we only shim if it's missing
if ( !jQuery.clean ) {
jQuery.clean = function( elems, context, fragment, scripts ) {
// Set context per 1.8 logic
context = context || document;
context = !context.nodeType && context[0] || context;
context = context.ownerDocument || context;
migrateWarn("jQuery.clean() is deprecated");
var i, elem, handleScript, jsTags,
ret = [];
jQuery.merge( ret, jQuery.buildFragment( elems, context ).childNodes );
// Complex logic lifted directly from jQuery 1.8
if ( fragment ) {
// Special handling of each script element
handleScript = function( elem ) {
// Check if we consider it executable
if ( !elem.type || rscriptType.test( elem.type ) ) {
// Detach the script and store it in the scripts array (if provided) or the fragment
// Return truthy to indicate that it has been handled
return scripts ?
scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
fragment.appendChild( elem );
}
};
for ( i = 0; (elem = ret[i]) != null; i++ ) {
// Check if we're done after handling an executable script
if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
// Append to fragment and handle embedded scripts
fragment.appendChild( elem );
if ( typeof elem.getElementsByTagName !== "undefined" ) {
// handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
// Splice the scripts into ret after their former ancestor and advance our index beyond them
ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
i += jsTags.length;
}
}
}
}
return ret;
};
}
var eventAdd = jQuery.event.add,
eventRemove = jQuery.event.remove,
eventTrigger = jQuery.event.trigger,
oldToggle = jQuery.fn.toggle,
oldLive = jQuery.fn.live,
oldDie = jQuery.fn.die,
ajaxEvents = "ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",
rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
hoverHack = function( events ) {
if ( typeof( events ) !== "string" || jQuery.event.special.hover ) {
return events;
}
if ( rhoverHack.test( events ) ) {
migrateWarn("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'");
}
return events && events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
};
// Event props removed in 1.9, put them back if needed; no practical way to warn them
if ( jQuery.event.props && jQuery.event.props[ 0 ] !== "attrChange" ) {
jQuery.event.props.unshift( "attrChange", "attrName", "relatedNode", "srcElement" );
}
// Undocumented jQuery.event.handle was "deprecated" in jQuery 1.7
if ( jQuery.event.dispatch ) {
migrateWarnProp( jQuery.event, "handle", jQuery.event.dispatch, "jQuery.event.handle is undocumented and deprecated" );
}
// Support for 'hover' pseudo-event and ajax event warnings
jQuery.event.add = function( elem, types, handler, data, selector ){
if ( elem !== document && rajaxEvent.test( types ) ) {
migrateWarn( "AJAX events should be attached to document: " + types );
}
eventAdd.call( this, elem, hoverHack( types || "" ), handler, data, selector );
};
jQuery.event.remove = function( elem, types, handler, selector, mappedTypes ){
eventRemove.call( this, elem, hoverHack( types ) || "", handler, selector, mappedTypes );
};
jQuery.fn.error = function() {
var args = Array.prototype.slice.call( arguments, 0);
migrateWarn("jQuery.fn.error() is deprecated");
args.splice( 0, 0, "error" );
if ( arguments.length ) {
return this.bind.apply( this, args );
}
// error event should not bubble to window, although it does pre-1.7
this.triggerHandler.apply( this, args );
return this;
};
jQuery.fn.toggle = function( fn, fn2 ) {
// Don't mess with animation or css toggles
if ( !jQuery.isFunction( fn ) || !jQuery.isFunction( fn2 ) ) {
return oldToggle.apply( this, arguments );
}
migrateWarn("jQuery.fn.toggle(handler, handler...) is deprecated");
// Save reference to arguments for access in closure
var args = arguments,
guid = fn.guid || jQuery.guid++,
i = 0,
toggler = function( event ) {
// Figure out which function to execute
var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
// Make sure that clicks stop
event.preventDefault();
// and execute the function
return args[ lastToggle ].apply( this, arguments ) || false;
};
// link all the functions, so any of them can unbind this click handler
toggler.guid = guid;
while ( i < args.length ) {
args[ i++ ].guid = guid;
}
return this.click( toggler );
};
jQuery.fn.live = function( types, data, fn ) {
migrateWarn("jQuery.fn.live() is deprecated");
if ( oldLive ) {
return oldLive.apply( this, arguments );
}
jQuery( this.context ).on( types, this.selector, data, fn );
return this;
};
jQuery.fn.die = function( types, fn ) {
migrateWarn("jQuery.fn.die() is deprecated");
if ( oldDie ) {
return oldDie.apply( this, arguments );
}
jQuery( this.context ).off( types, this.selector || "**", fn );
return this;
};
// Turn global events into document-triggered events
jQuery.event.trigger = function( event, data, elem, onlyHandlers ){
if ( !elem && !rajaxEvent.test( event ) ) {
migrateWarn( "Global events are undocumented and deprecated" );
}
return eventTrigger.call( this, event, data, elem || document, onlyHandlers );
};
jQuery.each( ajaxEvents.split("|"),
function( _, name ) {
jQuery.event.special[ name ] = {
setup: function() {
var elem = this;
// The document needs no shimming; must be !== for oldIE
if ( elem !== document ) {
jQuery.event.add( document, name + "." + jQuery.guid, function() {
jQuery.event.trigger( name, null, elem, true );
});
jQuery._data( this, name, jQuery.guid++ );
}
return false;
},
teardown: function() {
if ( this !== document ) {
jQuery.event.remove( document, name + "." + jQuery._data( this, name ) );
}
return false;
}
};
}
);
})( jQuery, window );

9
js/jquery.js vendored

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,28 @@
version 1.6.0 (3/18/13)
- visual facelift, with bootstrap-inspired buttons and colors
- simplified HTML/CSS for events and buttons
- dayRender, for modifying a day cell (issue 191, thx althaus)
- week numbers on side of calendar (issue 295)
- weekNumber
- weekNumberCalculation
- weekNumberTitle
- "W" formatting variable
- finer snapping granularity for agenda view events (issue 495, thx ms-doodle-com)
- eventAfterAllRender (issue 753, thx pdrakeweb)
- eventDataTransform (thx joeyspo)
- data-date attributes on cells (thx Jae)
- expose $.fullCalendar.dateFormatters
- when clicking fast on buttons, prevent text selection
- bundled with latest jQuery (1.9.1) and jQuery UI (1.10.2)
- Grunt/Lumbar build system for internal development
- build for Bower package manager
- build for jQuery plugin site
version 1.5.4 (9/5/12)
- made compatible with jQuery 1.8.* (thx archaeron)
- bundled with jQuery 1.8.1 and jQuery UI 1.8.23
version 1.5.3 (2/6/12)
- fixed dragging issue with jQuery UI 1.8.16 (issue 1168)
- bundled with jQuery 1.7.1 and jQuery UI 1.8.17

View File

@ -1,12 +1,7 @@
/*
* FullCalendar v1.5.3 Stylesheet
*
* Copyright (c) 2011 Adam Shaw
* Dual licensed under the MIT and GPL licenses, located in
* MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
*
* Date: Mon Feb 6 22:40:40 2012 -0800
*
/*!
* FullCalendar v1.6.0 Stylesheet
* Docs & License: http://arshaw.com/fullcalendar/
* (c) 2013 Adam Shaw
*/
@ -79,11 +74,8 @@ html .fc,
margin-right: -1px;
}
.fc-header .fc-corner-right {
margin-right: 1px; /* back to normal */
}
.fc-header .ui-corner-right {
.fc-header .fc-corner-right, /* non-theme */
.fc-header .ui-corner-right { /* theme */
margin-right: 0; /* back to normal */
}
@ -124,17 +116,17 @@ html .fc,
.fc-widget-header, /* <th>, usually */
.fc-widget-content { /* <td>, usually */
border: 1px solid #ccc;
border: 1px solid #ddd;
}
.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
background: #ffc;
background: #fcf8e3;
}
.fc-cell-overlay { /* semi-transparent rectangle while dragging */
background: #9cf;
opacity: .2;
filter: alpha(opacity=20); /* for IE */
background: #bce8f1;
opacity: .3;
filter: alpha(opacity=30); /* for IE */
}
@ -145,43 +137,54 @@ html .fc,
.fc-button {
position: relative;
display: inline-block;
padding: 0 .6em;
overflow: hidden;
height: 1.9em;
line-height: 1.9em;
white-space: nowrap;
cursor: pointer;
}
.fc-state-default { /* non-theme */
border-style: solid;
border-width: 1px 0;
border: 1px solid;
}
.fc-button-inner {
position: relative;
float: left;
overflow: hidden;
.fc-state-default.fc-corner-left { /* non-theme */
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}
.fc-state-default .fc-button-inner { /* non-theme */
border-style: solid;
border-width: 0 1px;
.fc-state-default.fc-corner-right { /* non-theme */
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
.fc-button-content {
position: relative;
float: left;
height: 1.9em;
line-height: 1.9em;
padding: 0 .6em;
white-space: nowrap;
/*
Our default prev/next buttons use HTML entities like &lsaquo; &rsaquo; &laquo; &raquo;
and we'll try to make them look good cross-browser.
*/
.fc-text-arrow {
margin: 0 .1em;
font-size: 2em;
font-family: "Courier New", Courier, monospace;
vertical-align: baseline; /* for IE7 */
}
.fc-button-prev .fc-text-arrow,
.fc-button-next .fc-text-arrow { /* for &lsaquo; &rsaquo; */
font-weight: bold;
}
/* icon (for jquery ui) */
.fc-button-content .fc-icon-wrap {
.fc-button .fc-icon-wrap {
position: relative;
float: left;
top: 50%;
}
.fc-button-content .ui-icon {
.fc-button .ui-icon {
position: relative;
float: left;
margin-top: -50%;
@ -189,107 +192,89 @@ html .fc,
*top: -50%;
}
/* gloss effect */
.fc-state-default .fc-button-effect {
position: absolute;
top: 50%;
left: 0;
/*
button states
borrowed from twitter bootstrap (http://twitter.github.com/bootstrap/)
*/
.fc-state-default {
background-color: #f5f5f5;
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
background-repeat: repeat-x;
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
color: #333;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.fc-state-default .fc-button-effect span {
position: absolute;
top: -100px;
left: 0;
width: 500px;
height: 100px;
border-width: 100px 0 0 1px;
border-style: solid;
border-color: #fff;
background: #444;
opacity: .09;
filter: alpha(opacity=9);
}
/* button states (determines colors) */
.fc-state-default,
.fc-state-default .fc-button-inner {
border-style: solid;
border-color: #ccc #bbb #aaa;
background: #F3F3F3;
color: #000;
}
.fc-state-hover,
.fc-state-hover .fc-button-inner {
border-color: #999;
}
.fc-state-down,
.fc-state-down .fc-button-inner {
border-color: #555;
background: #777;
}
.fc-state-active,
.fc-state-active .fc-button-inner {
border-color: #555;
background: #777;
color: #fff;
.fc-state-disabled {
color: #333333;
background-color: #e6e6e6;
}
.fc-state-disabled,
.fc-state-disabled .fc-button-inner {
color: #999;
border-color: #ddd;
.fc-state-hover {
color: #333333;
text-decoration: none;
background-position: 0 -15px;
-webkit-transition: background-position 0.1s linear;
-moz-transition: background-position 0.1s linear;
-o-transition: background-position 0.1s linear;
transition: background-position 0.1s linear;
}
.fc-state-down,
.fc-state-active {
background-color: #cccccc;
background-image: none;
outline: 0;
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.fc-state-disabled {
cursor: default;
background-image: none;
opacity: 0.65;
filter: alpha(opacity=65);
box-shadow: none;
}
.fc-state-disabled .fc-button-effect {
display: none;
}
/* Global Event Styles
------------------------------------------------------------------------*/
.fc-event {
border-style: solid;
border-width: 0;
border: 1px solid #3a87ad; /* default BORDER color */
background-color: #3a87ad; /* default BACKGROUND color */
color: #fff; /* default TEXT color */
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
font-size: .85em;
cursor: default;
}
a.fc-event {
text-decoration: none;
}
a.fc-event,
.fc-event-draggable {
cursor: pointer;
}
a.fc-event {
text-decoration: none;
}
.fc-rtl .fc-event {
text-align: right;
}
.fc-event-skin {
border-color: #36c; /* default BORDER color */
background-color: #36c; /* default BACKGROUND color */
color: #fff; /* default TEXT color */
}
.fc-event-inner {
position: relative;
width: 100%;
height: 100%;
border-style: solid;
border-width: 0;
overflow: hidden;
}
@ -298,7 +283,7 @@ a.fc-event {
padding: 0 1px;
}
.fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/
.fc .ui-resizable-handle {
display: block;
position: absolute;
z-index: 99999;
@ -316,6 +301,20 @@ a.fc-event {
border-width: 1px 0;
margin-bottom: 1px;
}
.fc-ltr .fc-event-hori.fc-event-start,
.fc-rtl .fc-event-hori.fc-event-end {
border-left-width: 1px;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
.fc-ltr .fc-event-hori.fc-event-end,
.fc-rtl .fc-event-hori.fc-event-start {
border-right-width: 1px;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
/* resizable */
@ -341,66 +340,6 @@ a.fc-event {
/* Fake Rounded Corners (for buttons and events)
------------------------------------------------------------*/
.fc-corner-left {
margin-left: 1px;
}
.fc-corner-left .fc-button-inner,
.fc-corner-left .fc-event-inner {
margin-left: -1px;
}
.fc-corner-right {
margin-right: 1px;
}
.fc-corner-right .fc-button-inner,
.fc-corner-right .fc-event-inner {
margin-right: -1px;
}
.fc-corner-top {
margin-top: 1px;
}
.fc-corner-top .fc-event-inner {
margin-top: -1px;
}
.fc-corner-bottom {
margin-bottom: 1px;
}
.fc-corner-bottom .fc-event-inner {
margin-bottom: -1px;
}
/* Fake Rounded Corners SPECIFICALLY FOR EVENTS
-----------------------------------------------------------------*/
.fc-corner-left .fc-event-inner {
border-left-width: 1px;
}
.fc-corner-right .fc-event-inner {
border-right-width: 1px;
}
.fc-corner-top .fc-event-inner {
border-top-width: 1px;
}
.fc-corner-bottom .fc-event-inner {
border-bottom-width: 1px;
}
/* Reusable Separate-border Table
------------------------------------------------------------*/
@ -436,6 +375,15 @@ table.fc-border-separate {
.fc-grid th {
text-align: center;
}
.fc .fc-week-number {
width: 22px;
text-align: center;
}
.fc .fc-week-number div {
padding: 0 2px;
}
.fc-grid .fc-day-number {
float: right;
@ -492,6 +440,10 @@ table.fc-border-separate {
white-space: nowrap;
font-weight: normal;
}
.fc-agenda .fc-week-number {
font-weight: bold;
}
.fc-agenda .fc-day-content {
padding: 2px 2px 1px;
@ -566,19 +518,28 @@ table.fc-border-separate {
.fc-event-vert {
border-width: 0 1px;
}
.fc-event-vert .fc-event-head,
.fc-event-vert .fc-event-content {
position: relative;
z-index: 2;
width: 100%;
overflow: hidden;
.fc-event-vert.fc-event-start {
border-top-width: 1px;
border-top-left-radius: 3px;
border-top-right-radius: 3px;
}
.fc-event-vert.fc-event-end {
border-bottom-width: 1px;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
}
.fc-event-vert .fc-event-time {
white-space: nowrap;
font-size: 10px;
}
.fc-event-vert .fc-event-inner {
position: relative;
z-index: 2;
}
.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay */
position: absolute;

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -1,54 +1,25 @@
/*!
* FullCalendar v1.6.0 Print Stylesheet
* Docs & License: http://arshaw.com/fullcalendar/
* (c) 2013 Adam Shaw
*/
/*
* FullCalendar v1.5.3 Print Stylesheet
*
* Include this stylesheet on your page to get a more printer-friendly calendar.
* When including this stylesheet, use the media='print' attribute of the <link> tag.
* Make sure to include this stylesheet IN ADDITION to the regular fullcalendar.css.
*
* Copyright (c) 2011 Adam Shaw
* Dual licensed under the MIT and GPL licenses, located in
* MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
*
* Date: Mon Feb 6 22:40:40 2012 -0800
*
*/
/* Events
-----------------------------------------------------*/
.fc-event-skin {
background: none !important;
.fc-event {
background: #fff !important;
color: #000 !important;
}
/* horizontal events */
.fc-event-hori {
border-width: 0 0 1px 0 !important;
border-bottom-style: dotted !important;
border-bottom-color: #000 !important;
padding: 1px 0 0 0 !important;
}
.fc-event-hori .fc-event-inner {
border-width: 0 !important;
padding: 0 1px !important;
}
/* vertical events */
.fc-event-vert {
border-width: 0 0 0 1px !important;
border-left-style: dotted !important;
border-left-color: #000 !important;
padding: 0 1px 0 0 !important;
}
.fc-event-vert .fc-event-inner {
border-width: 0 !important;
padding: 1px 0 !important;
}
/* for vertical events */
.fc-event-bg {
display: none !important;

View File

@ -1,12 +1,7 @@
/*
* FullCalendar v1.5.3 Google Calendar Plugin
*
* Copyright (c) 2011 Adam Shaw
* Dual licensed under the MIT and GPL licenses, located in
* MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
*
* Date: Mon Feb 6 22:40:40 2012 -0800
*
/*!
* FullCalendar v1.6.0 Google Calendar Plugin
* Docs & License: http://arshaw.com/fullcalendar/
* (c) 2013 Adam Shaw
*/
(function($) {

View File

@ -0,0 +1,20 @@
Copyright (c) 2013 Adam Shaw
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

View File

@ -1,7 +1,7 @@
<?php
/**
* Friendica admin
* Red admin
*/
@ -188,7 +188,7 @@ function admin_page_summary(&$a) {
'$users' => Array( t('Registered users'), $users),
'$accounts' => $accounts,
'$pending' => Array( t('Pending registrations'), $pending),
'$version' => Array( t('Version'), FRIENDICA_VERSION),
'$version' => Array( t('Version'), RED_VERSION),
'$build' => get_config('system','db_version'),
'$plugins' => Array( t('Active plugins'), $a->plugins )
));
@ -1048,7 +1048,7 @@ readable.");
// name, label, value, help string, extra data...
'$debugging' => array('debugging', t("Debugging"),get_config('system','debugging'), ""),
'$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")),
'$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Red top-level directory.")),
'$loglevel' => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices),
'$form_security_token' => get_form_security_token("admin_logs"),

View File

@ -68,7 +68,7 @@ function invite_post(&$a) {
else
$nmessage = $message;
$res = mail($recip, sprintf( t('Please join us on Friendica'), $a->config['sitename']),
$res = mail($recip, sprintf( t('Please join us on Red'), $a->config['sitename']),
$nmessage,
"From: " . $a->user['email'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"

View File

@ -785,14 +785,14 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
//is it a hash tag?
if(strpos($tag,'#') === 0) {
//if the tag is replaced...
if(strpos($tag,'[url='))
if(strpos($tag,'[zrl='))
//...do nothing
return $replaced;
//base tag has the tags name only
$basetag = str_replace('_',' ',substr($tag,1));
//create text for link
$url = $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag);
$newtag = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
$newtag = '#[zrl=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/zrl]';
//replace tag by the link
$body = str_replace($tag, $newtag, $body);
$replaced = true;
@ -809,7 +809,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
//is it a person tag?
if(strpos($tag,'@') === 0) {
//is it already replaced?
if(strpos($tag,'[url='))
if(strpos($tag,'[zrl='))
return $replaced;
$stat = false;
//get the person's name
@ -905,7 +905,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
//create profile link
$profile = str_replace(',','%2c',$profile);
$url = $profile;
$newtag = '@[url=' . $profile . ']' . $newname . '[/url]';
$newtag = '@[zrl=' . $profile . ']' . $newname . '[/zrl]';
$body = str_replace('@' . $name, $newtag, $body);
//append tag to str_tags
if(! stristr($str_tags,$newtag)) {

View File

@ -135,7 +135,7 @@ function like_content(&$a) {
if(! isset($bodyverb))
return;
$item_flags = ITEM_ORIGIN;
$item_flags = ITEM_ORIGIN | ITEM_NOTSHOWN;
if($item['item_flags'] & ITEM_WALL)
$item_flags |= ITEM_WALL;
@ -153,9 +153,9 @@ function like_content(&$a) {
$arr['author_xchan'] = $observer['xchan_hash'];
$ulink = '[url=' . $thread_owner['xchan_url'] . ']' . $thread_owner['xchan_name'] . '[/url]';
$alink = '[url=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/url]';
$plink = '[url=' . $a->get_baseurl() . '/display/' . $item['mid'] . ']' . $post_type . '[/url]';
$ulink = '[zrl=' . $thread_owner['xchan_url'] . ']' . $thread_owner['xchan_name'] . '[/zrl]';
$alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]';
$plink = '[zrl=' . $a->get_baseurl() . '/display/' . $item['mid'] . ']' . $post_type . '[/zrl]';
$arr['body'] = sprintf( $bodyverb, $alink, $ulink, $plink );

View File

@ -35,7 +35,6 @@ function magic_init(&$a) {
}
if(! $x) {
// Finger them if they've never been seen here before
@ -60,6 +59,9 @@ function magic_init(&$a) {
return;
}
// This is ready-made for a plugin that provides a blacklist or "ask me" before blindly authenticating.
// By default, we'll proceed without asking.
$arr = array(
'channel_id' => local_user(),
'xchan' => $x[0],
@ -117,7 +119,7 @@ function magic_init(&$a) {
goaway($x[0]['hubloc_callback'] . '/' . substr($x[0]['hubloc_addr'],0,strpos($x[0]['hubloc_addr'],'@'))
. '/?f=&auth=' . $channel['channel_address'] . '@' . $a->get_hostname()
. '&sec=' . $token . '&dest=' . $dest . '&version=' . ZOT_REVISION);
. '&sec=' . $token . '&dest=' . urlencode($dest) . '&version=' . ZOT_REVISION);
}
if(strpos($dest,'/'))

View File

@ -160,9 +160,10 @@ function item_redir_and_replace_images($body, $images, $cid) {
$newbody = '';
for($i = 0; $i < count($images); $i++) {
$search = '/\[url\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/url\]' . '/is';
$replace = '[url=' . z_path() . '/redir/' . $cid
. '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/url]' ;
$search = '/\[zrl\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/zrl\]' . '/is';
//FIXME
$replace = '[zrl=' . z_path() . '/redir/' . $cid
. '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/zrl]' ;
$img_end = strpos($origbody, '[!#saved_image' . $i . '#!][/url]') + strlen('[!#saved_image' . $i . '#!][/url]');
$process_part = substr($origbody, 0, $img_end);

View File

@ -60,7 +60,7 @@ function mood_init(&$a) {
$mid = item_message_id();
$action = sprintf( t('%1$s is currently %2$s'), '[url=' . $poster['xchan_url'] . ']' . $poster['xchan_name'] . '[/url]' , $verbs[$verb]);
$action = sprintf( t('%1$s is currently %2$s'), '[zrl=' . $poster['xchan_url'] . ']' . $poster['xchan_name'] . '[/zrl]' , $verbs[$verb]);
$item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_UNSEEN;
if(! $parent_mid)
$item_flags |= ITEM_THREAD_TOP;

View File

@ -63,7 +63,7 @@ function parseurl_getsiteinfo($url) {
$header = $result['header'];
$body = $result['body'];
$body = mb_convert_encoding($body, "UTF-8", $charset);
$body = mb_convert_encoding($body, 'UTF-8', 'UTF-8');
$body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
$doc = new DOMDocument();
@ -99,6 +99,9 @@ function parseurl_getsiteinfo($url) {
$attr["content"] = html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8");
switch (strtolower($attr["name"])) {
case 'generator':
$siteinfo['generator'] = $attr['content'];
break;
case "fulltitle":
$siteinfo["title"] = $attr["content"];
break;
@ -274,6 +277,11 @@ function parse_url_content(&$a) {
$siteinfo = parseurl_getsiteinfo($url);
// If this is a Red site, use zrl rather than url so they get zids sent to them by default
if( x($siteinfo,'generator') && (strpos($siteinfo['generator'],RED_PLATFORM . ' ') == 0))
$template = str_replace('url','zrl',$template);
if($siteinfo["title"] == "") {
echo sprintf($template,$url,$url,'') . $str_tags;
killme();

View File

@ -413,13 +413,13 @@ function photos_post(&$a) {
}
if($profile) {
if(substr($notify,0,4) === 'cid:')
$taginfo[] = array($newname,$profile,$notify,$r[0],'@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]');
$taginfo[] = array($newname,$profile,$notify,$r[0],'@[zrl=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/zrl]');
else
$taginfo[] = array($newname,$profile,$notify,null,$str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]');
if(strlen($str_tags))
$str_tags .= ',';
$profile = str_replace(',','%2c',$profile);
$str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]';
$str_tags .= '@[zrl=' . $profile . ']' . $newname . '[/zrl]';
}
}
}
@ -487,9 +487,9 @@ function photos_post(&$a) {
$arr['tag'] = $tagged[4];
$arr['inform'] = $tagged[2];
$arr['origin'] = 1;
$arr['body'] = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
$arr['body'] = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[zrl=' . $tagged[1] . ']' . $tagged[0] . '[/zrl]', '[zrl=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/zrl]', '[zrl=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/zrl]') ;
$arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource_id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource_id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
$arr['body'] .= "\n\n" . '[zrl=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource_id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource_id'] . '-' . $best . '.' . $ext . '[/img][/zrl]' . "\n" ;
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");

View File

@ -75,7 +75,7 @@ function ping_init(&$a) {
);
break;
case 'all_events':
$r = q("update event set ignore = 1 where ignore = 0 and uid = %d",
$r = q("update event set `ignore` = 1 where `ignore` = 0 and uid = %d",
intval(local_user())
);
break;

View File

@ -104,7 +104,7 @@ function poke_init(&$a) {
$arr['obj_type'] = ACTIVITY_OBJ_PERSON;
$arr['origin'] = 1;
$arr['body'] = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
$arr['body'] = '[zrl=' . $poster['url'] . ']' . $poster['name'] . '[/zrl]' . ' ' . t($verbs[$verb][0]) . ' ' . '[zrl=' . $target['url'] . ']' . $target['name'] . '[/zrl]';
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . $a->get_baseurl() . '/contact/' . $target['id'] . '</id>';
$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");

View File

@ -96,6 +96,13 @@ function post_init(&$a) {
}
if($already_authed || $j['success']) {
if($j['success']) {
// legit response, but we do need to check that this wasn't answered by a man-in-middle
if(! rsa_verify($sec . $x[0]['xchan_hash'],base64url_decode($j['confirm']),$x[0]['xchan_pubkey'])) {
logger('mod_zot: auth: final confirmation failed.');
goaway($desturl);
}
}
// everything is good... maybe
if(local_user()) {
@ -386,7 +393,7 @@ function post_post(&$a) {
$arr = $data['recipients'][0];
$recip_hash = base64url_encode(hash('whirlpool',$arr['guid'] . $arr['guid_sig'], true));
$c = q("select channel_id from channel where channel_hash = '%s' limit 1",
$c = q("select channel_id, channel_prvkey from channel where channel_hash = '%s' limit 1",
dbesc($recip_hash)
);
if(! $c) {
@ -394,6 +401,8 @@ function post_post(&$a) {
json_return_and_die($ret);
}
$confirm = base64url_encode(rsa_sign($data['secret'] . $recip_hash,$c[0]['channel_prvkey']));
// This additionally checks for forged senders since we already stored the expected result in meta
// and we've already verified that this is them via zot_gethub() and that their key signed our token
@ -412,6 +421,7 @@ function post_post(&$a) {
logger('mod_zot: auth_check: success', LOGGER_DEBUG);
$ret['success'] = true;
$ret['confirm'] = $confirm;
json_return_and_die($ret);
}

View File

@ -28,13 +28,13 @@ function siteinfo_init(&$a) {
}
$data = Array(
'version' => FRIENDICA_VERSION,
'version' => RED_VERSION,
'url' => z_root(),
'plugins' => $visible_plugins,
'register_policy' => $register_policy[$a->config['system']['register_policy']],
'admin' => $admin,
'site_name' => $a->config['sitename'],
'platform' => FRIENDICA_PLATFORM,
'platform' => RED_PLATFORM,
'info' => ((x($a->config,'info')) ? $a->config['info'] : '')
);
@ -48,7 +48,7 @@ function siteinfo_init(&$a) {
function siteinfo_content(&$a) {
if(! get_config('system','hidden_version_siteinfo'))
$version = sprintf( t('Version %s'), FRIENDICA_VERSION );
$version = sprintf( t('Version %s'), RED_VERSION );
else
$version = "";

View File

@ -126,9 +126,9 @@ EOT;
$arr['author-link'] = $contact['url'];
$arr['author-avatar'] = $contact['thumb'];
$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
$plink = '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
$ulink = '[zrl=' . $contact['url'] . ']' . $contact['name'] . '[/zrl]';
$alink = '[zrl=' . $item['author-link'] . ']' . $item['author-name'] . '[/zrl]';
$plink = '[zrl=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/zrl]';
$arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink );
$arr['verb'] = $activity;

View File

@ -97,7 +97,7 @@ EOT;
if(! isset($bodyverb))
return;
$termlink = html_entity_decode('&#x2317;') . '[url=' . $a->get_baseurl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
$termlink = html_entity_decode('&#x2317;') . '[zrl=' . $a->get_baseurl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/zrl]';
$arr = array();
@ -116,9 +116,9 @@ EOT;
$arr['author-link'] = $contact['url'];
$arr['author-avatar'] = $contact['thumb'];
$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
$plink = '[url=' . $item['plink'] . ']' . $post_type . '[/url]';
$ulink = '[zrl=' . $contact['url'] . ']' . $contact['name'] . '[/zrl]';
$alink = '[zrl=' . $item['author-link'] . ']' . $item['author-name'] . '[/zrl]';
$plink = '[zrl=' . $item['plink'] . ']' . $post_type . '[/zrl]';
$arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink, $termlink );
$arr['verb'] = ACTIVITY_TAG;
@ -152,7 +152,7 @@ EOT;
if((! $blocktags) && (! stristr($item['tag'], ']' . $term . '[' ))) {
q("update item set tag = '%s' where id = %d limit 1",
dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[zrl=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/zrl]'),
intval($item['id'])
);
}
@ -168,7 +168,7 @@ EOT;
);
if(count($x) && !$x[0]['blocktags'] && (! stristr($r[0]['tag'], ']' . $term . '['))) {
q("update item set tag = '%s' where id = %d limit 1",
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[zrl=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/zrl]'),
intval($r[0]['id'])
);
}

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-05 00:01-0700\n"
"POT-Creation-Date: 2013-04-12 00:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -3546,7 +3546,7 @@ msgid "View Connnections"
msgstr ""
#: ../../mod/chanview.php:74 ../../mod/wall_upload.php:35
#: ../../mod/magic.php:59 ../../mod/page.php:21
#: ../../mod/magic.php:58 ../../mod/page.php:21
msgid "Channel not found."
msgstr ""
@ -3592,13 +3592,13 @@ msgstr ""
msgid "Wall Photos"
msgstr ""
#: ../../mod/post.php:107
#: ../../mod/post.php:114
msgid ""
"Remote authentication blocked. You are logged into this site locally. Please "
"logout and retry."
msgstr ""
#: ../../mod/post.php:117
#: ../../mod/post.php:124
#, php-format
msgid "Welcome %s. Remote authentication successful."
msgstr ""

View File

@ -28,7 +28,7 @@ else
fi
F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php);
F9KVERSION=$(sed -n "s/.*'RED_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php);
echo "Friendica version $F9KVERSION"

View File

@ -1 +1 @@
2013-04-08.277
2013-04-16.285

View File

@ -11,6 +11,7 @@ head_add_css('library/jslider/css/jslider.css');
head_add_css('library/prettyphoto/css/prettyPhoto.css');
head_add_js('js/jquery.js');
head_add_js('js/jquery-migrate-1.1.1.js');
head_add_js('js/jquery.textinputs.js');
head_add_js('js/fk.autocomplete.js');
head_add_js('library/fancybox/jquery.fancybox-1.3.4.pack.js');

View File

@ -3659,6 +3659,15 @@ ul.menu-popup {
width: 690px;
float:left;
}
div.pp_pic_holder {
width: 800px !important;
}
.pp_content {
width: 100% !important;
}
#acl-search {
float:right;
background: #ffffff url("../../../../images/search_18.png") no-repeat right center;

View File

@ -7,7 +7,7 @@
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/fred-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">$product</div><div style="clear: both;"></div></td></tr>
<tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/r!.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">$product</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$preamble</td></tr>

View File

@ -16,7 +16,7 @@ $head_js
<link rel="search"
href="$baseurl/opensearch"
type="application/opensearchdescription+xml"
title="Search in Friendica" />
title="Search in Red" />
<script>

View File

@ -13,7 +13,7 @@ function initEditor(cb){
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true;
$("a#jot-perms-icon").fancybox({
$("a#jot-perms-icon").prettyPhoto({
'transitionIn' : 'elastic',
'transitionOut' : 'elastic'
});
@ -88,7 +88,7 @@ function initEditor(cb){
editor = true;
// setup acl popup
$("a#jot-perms-icon").fancybox({
$("a#jot-perms-icon").prettyPhoyo({
'transitionIn' : 'elastic',
'transitionOut' : 'elastic'
});
@ -252,7 +252,7 @@ function enableOnUser(){
var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){
$.fancybox(data);
$.prettyPhoto(data);
$("#id_term").keypress(function(){
$(this).css("border-color",bordercolor);
})
@ -270,7 +270,7 @@ function enableOnUser(){
// if(timer) clearTimeout(timer);
// timer = setTimeout(NavUpdate,3000);
liking = 1;
$.fancybox.close();
$.prettyPhoto.close();
} else {
$("#id_term").css("border-color","#FF0000");
}

View File

@ -12,7 +12,7 @@
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/fred-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
<tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/r!.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>

View File

@ -21,7 +21,7 @@
<link rel="search"
href="{{$baseurl}}/opensearch"
type="application/opensearchdescription+xml"
title="Search in Friendica" />
title="Search in Red" />
<script>

View File

@ -18,7 +18,7 @@ function initEditor(cb){
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true;
$("a#jot-perms-icon").fancybox({
$("a#jot-perms-icon").prettyPhoto({
'transitionIn' : 'elastic',
'transitionOut' : 'elastic'
});
@ -93,7 +93,7 @@ function initEditor(cb){
editor = true;
// setup acl popup
$("a#jot-perms-icon").fancybox({
$("a#jot-perms-icon").prettyPhoyo({
'transitionIn' : 'elastic',
'transitionOut' : 'elastic'
});
@ -257,7 +257,7 @@ function enableOnUser(){
var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){
$.fancybox(data);
$.prettyPhoto(data);
$("#id_term").keypress(function(){
$(this).css("border-color",bordercolor);
})
@ -275,7 +275,7 @@ function enableOnUser(){
// if(timer) clearTimeout(timer);
// timer = setTimeout(NavUpdate,3000);
liking = 1;
$.fancybox.close();
$.prettyPhoto.close();
} else {
$("#id_term").css("border-color","#FF0000");
}