aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/diaspora_8php.html
diff options
context:
space:
mode:
Diffstat (limited to 'doc/html/diaspora_8php.html')
-rw-r--r--doc/html/diaspora_8php.html69
1 files changed, 30 insertions, 39 deletions
diff --git a/doc/html/diaspora_8php.html b/doc/html/diaspora_8php.html
index 69825ab17..fa14301e9 100644
--- a/doc/html/diaspora_8php.html
+++ b/doc/html/diaspora_8php.html
@@ -116,14 +116,16 @@ Functions</h2></td></tr>
<tr class="separator:ab99505944728d46585b8312989de533d"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a6f0a67b6b17503c125af32763be931b7"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch</a> ($importer, $msg, $attempt=1)</td></tr>
<tr class="separator:a6f0a67b6b17503c125af32763be931b7"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a625056c9dab9b9779d0665650e260bb9"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a625056c9dab9b9779d0665650e260bb9">diaspora_handle_from_contact</a> ($contact_id)</td></tr>
-<tr class="separator:a625056c9dab9b9779d0665650e260bb9"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a858f70153c384f8778082cf7843a19da"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a858f70153c384f8778082cf7843a19da">diaspora_is_blacklisted</a> ($s)</td></tr>
+<tr class="separator:a858f70153c384f8778082cf7843a19da"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a5ed66b910d7b0284f9b3ee04e72306ff"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a5ed66b910d7b0284f9b3ee04e72306ff">diaspora_handle_from_contact</a> ($contact_hash)</td></tr>
+<tr class="separator:a5ed66b910d7b0284f9b3ee04e72306ff"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:aa8e551a53fcce34be3942d0c3e20d1f4"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#aa8e551a53fcce34be3942d0c3e20d1f4">diaspora_get_contact_by_handle</a> ($uid, $handle)</td></tr>
<tr class="separator:aa8e551a53fcce34be3942d0c3e20d1f4"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:aade0c165fcdded71352c7a67bf6ce37b"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#aade0c165fcdded71352c7a67bf6ce37b">find_diaspora_person_by_handle</a> ($handle)</td></tr>
<tr class="separator:aade0c165fcdded71352c7a67bf6ce37b"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a986114ce8d7a582ebd0b5972738e1fc2"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a986114ce8d7a582ebd0b5972738e1fc2">get_diaspora_key</a> ($uri)</td></tr>
-<tr class="separator:a986114ce8d7a582ebd0b5972738e1fc2"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a9bf7ef4094e0e14f6e2b7fe76ab7ad2e"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a9bf7ef4094e0e14f6e2b7fe76ab7ad2e">get_diaspora_key</a> ($handle)</td></tr>
+<tr class="separator:a9bf7ef4094e0e14f6e2b7fe76ab7ad2e"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:addaf8f202e52e3f0a49ed05681f9405c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#addaf8f202e52e3f0a49ed05681f9405c">diaspora_pubmsg_build</a> ($msg, $user, $contact, $prvkey, $pubkey)</td></tr>
<tr class="separator:addaf8f202e52e3f0a49ed05681f9405c"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:aca23425928635776dc17927041fc3fa8"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#aca23425928635776dc17927041fc3fa8">diaspora_msg_build</a> ($msg, $user, $contact, $prvkey, $pubkey, $public=false)</td></tr>
@@ -132,8 +134,6 @@ Functions</h2></td></tr>
<tr class="separator:a849754ec369e1a60fadae5c14584ca36"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:ac1ab782a34552a7c6b4dc961754ed598"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598">diaspora_request</a> ($importer, $xml)</td></tr>
<tr class="separator:ac1ab782a34552a7c6b4dc961754ed598"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a978b08b5130bc94cf38ef3a2bcba0e3a"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a978b08b5130bc94cf38ef3a2bcba0e3a">diaspora_post_allow</a> ($importer, $contact)</td></tr>
-<tr class="separator:a978b08b5130bc94cf38ef3a2bcba0e3a"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a20b968d64ef26afe5cb0cc75a7570a31"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31">diaspora_post</a> ($importer, $xml, $msg)</td></tr>
<tr class="separator:a20b968d64ef26afe5cb0cc75a7570a31"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a2bf43f6b5890897f425ef4325d34b007"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007">diaspora_reshare</a> ($importer, $xml, $msg)</td></tr>
@@ -405,7 +405,7 @@ Functions</h2></td></tr>
</div>
</div>
-<a class="anchor" id="a625056c9dab9b9779d0665650e260bb9"></a>
+<a class="anchor" id="a5ed66b910d7b0284f9b3ee04e72306ff"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
@@ -413,7 +413,7 @@ Functions</h2></td></tr>
<td class="memname">diaspora_handle_from_contact </td>
<td>(</td>
<td class="paramtype">&#160;</td>
- <td class="paramname"><em>$contact_id</em></td><td>)</td>
+ <td class="paramname"><em>$contact_hash</em></td><td>)</td>
<td></td>
</tr>
</table>
@@ -423,6 +423,24 @@ Functions</h2></td></tr>
</div>
</div>
+<a class="anchor" id="a858f70153c384f8778082cf7843a19da"></a>
+<div class="memitem">
+<div class="memproto">
+ <table class="memname">
+ <tr>
+ <td class="memname">diaspora_is_blacklisted </td>
+ <td>(</td>
+ <td class="paramtype">&#160;</td>
+ <td class="paramname"><em>$s</em></td><td>)</td>
+ <td></td>
+ </tr>
+ </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="diaspora_8php.html#aa8e551a53fcce34be3942d0c3e20d1f4">diaspora_get_contact_by_handle()</a>, and <a class="el" href="diaspora_8php.html#aade0c165fcdded71352c7a67bf6ce37b">find_diaspora_person_by_handle()</a>.</p>
+
+</div>
+</div>
<a class="anchor" id="ad9985cc4214bdfc14878785c838c8690"></a>
<div class="memitem">
<div class="memproto">
@@ -635,34 +653,6 @@ Functions</h2></td></tr>
</div>
</div>
-<a class="anchor" id="a978b08b5130bc94cf38ef3a2bcba0e3a"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">diaspora_post_allow </td>
- <td>(</td>
- <td class="paramtype">&#160;</td>
- <td class="paramname"><em>$importer</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">&#160;</td>
- <td class="paramname"><em>$contact</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="diaspora_8php.html#a006731620a5242d410358b32678e48e3">diaspora_asphoto()</a>, <a class="el" href="diaspora_8php.html#a0fb2abe304aae19efc040a5e6b917829">diaspora_comment()</a>, <a class="el" href="diaspora_8php.html#a5d57518545baa31cf8a85a937a267681">diaspora_like()</a>, <a class="el" href="diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2">diaspora_photo()</a>, <a class="el" href="diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31">diaspora_post()</a>, and <a class="el" href="diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007">diaspora_reshare()</a>.</p>
-
-</div>
-</div>
<a class="anchor" id="a900abf51398b2ef26cd2cd31c52f1b0f"></a>
<div class="memitem">
<div class="memproto">
@@ -766,6 +756,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="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
@@ -1211,11 +1202,11 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
-<p>Referenced by <a class="el" href="diaspora_8php.html#a0fb2abe304aae19efc040a5e6b917829">diaspora_comment()</a>, <a class="el" href="diaspora_8php.html#adef30b6fac948baedcc7194d5d155b5f">diaspora_conversation()</a>, <a class="el" href="diaspora_8php.html#a5d57518545baa31cf8a85a937a267681">diaspora_like()</a>, <a class="el" href="diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46">diaspora_message()</a>, <a class="el" href="diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598">diaspora_request()</a>, <a class="el" href="diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007">diaspora_reshare()</a>, and <a class="el" href="diaspora_8php.html#a986114ce8d7a582ebd0b5972738e1fc2">get_diaspora_key()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#a0fb2abe304aae19efc040a5e6b917829">diaspora_comment()</a>, <a class="el" href="diaspora_8php.html#adef30b6fac948baedcc7194d5d155b5f">diaspora_conversation()</a>, <a class="el" href="diaspora_8php.html#a5d57518545baa31cf8a85a937a267681">diaspora_like()</a>, <a class="el" href="diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46">diaspora_message()</a>, <a class="el" href="diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598">diaspora_request()</a>, <a class="el" href="diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007">diaspora_reshare()</a>, and <a class="el" href="diaspora_8php.html#a9bf7ef4094e0e14f6e2b7fe76ab7ad2e">get_diaspora_key()</a>.</p>
</div>
</div>
-<a class="anchor" id="a986114ce8d7a582ebd0b5972738e1fc2"></a>
+<a class="anchor" id="a9bf7ef4094e0e14f6e2b7fe76ab7ad2e"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
@@ -1223,7 +1214,7 @@ Functions</h2></td></tr>
<td class="memname">get_diaspora_key </td>
<td>(</td>
<td class="paramtype">&#160;</td>
- <td class="paramname"><em>$uri</em></td><td>)</td>
+ <td class="paramname"><em>$handle</em></td><td>)</td>
<td></td>
</tr>
</table>