Revert "Revert "merge""

This reverts commit 9294f72adb3c076932558b6f29a4c570e7962764.

1 files changed, 99 insertions, 25 deletions

diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html
index 394aa007c..74e453f0c 100644
--- a/doc/html/zot_8php.html
+++ b/doc/html/zot_8php.html
@@ -158,6 +158,12 @@ Functions</h2></td></tr>
 <tr class="separator:a3bf11286c2619b4ca28e49d5b5ab374a"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a666d3efcac00ec1b4a4537a60655f2ab"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab">update_modtime</a> ($hash)</td></tr>
 <tr class="separator:a666d3efcac00ec1b4a4537a60655f2ab"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2657e141d62d5f67ad3c87651b585299"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="zot_8php.html#a2657e141d62d5f67ad3c87651b585299">import_site</a> ($arr, $pubkey)</td></tr>
+<tr class="separator:a2657e141d62d5f67ad3c87651b585299"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ac34e479d27f32b82dd6b33542f81a6a7"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7">build_sync_packet</a> ($uid=0, $packet=null)</td></tr>
+<tr class="separator:ac34e479d27f32b82dd6b33542f81a6a7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ac301c67864917c35922257950ae0f95c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="zot_8php.html#ac301c67864917c35922257950ae0f95c">process_channel_sync_delivery</a> ($sender, $arr, $deliveries)</td></tr>
+<tr class="separator:ac301c67864917c35922257950ae0f95c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <h2 class="groupheader">Function Documentation</h2>
 <a class="anchor" id="a703f528ade8382cf374e4119bd6f7859"></a>
@@ -178,6 +184,35 @@ Functions</h2></td></tr>
 
 </div>
 </div>
+<a class="anchor" id="ac34e479d27f32b82dd6b33542f81a6a7"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">build_sync_packet </td>
+          <td>(</td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$uid</em> = <code>0</code>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$packet</em> = <code>null</code>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+<p>Send a zot packet to all hubs where this channel is duplicated, refreshing such things as personal settings, channel permissions, address book updates, etc. </p>
+
+<p>Referenced by <a class="el" href="connections_8php.html#a15af118efee9c948b6f8294e54a73bb2">connections_clone()</a>, and <a class="el" href="settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586">settings_post()</a>.</p>
+
+</div>
+</div>
 <a class="anchor" id="adfeb9400ae6b726beec89f8f1e8fde72"></a>
 <div class="memitem">
 <div class="memproto">
@@ -268,6 +303,34 @@ Functions</h2></td></tr>
 
 </div>
 </div>
+<a class="anchor" id="a2657e141d62d5f67ad3c87651b585299"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">import_site </td>
+          <td>(</td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$arr</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$pubkey</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="zot_8php.html#ab0227978011d8601494a7651fa26acf0">import_xchan()</a>.</p>
+
+</div>
+</div>
 <a class="anchor" id="ab0227978011d8601494a7651fa26acf0"></a>
 <div class="memitem">
 <div class="memproto">
@@ -286,6 +349,40 @@ Functions</h2></td></tr>
 
 </div>
 </div>
+<a class="anchor" id="ac301c67864917c35922257950ae0f95c"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">process_channel_sync_delivery </td>
+          <td>(</td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$sender</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$arr</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$deliveries</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="zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c">zot_import()</a>.</p>
+
+</div>
+</div>
 <a class="anchor" id="a37ec13b18057634eadb071f05297f5e1"></a>
 <div class="memitem">
 <div class="memproto">
@@ -539,31 +636,8 @@ Functions</h2></td></tr>
         </tr>
       </table>
 </div><div class="memdoc">
-<p>obsolete</p>
-<p>function zot_notify($channel,$url,$type = 'notify',$recipients = null, $remote_key = null) { </p>
-<pre class="fragment">$params = array(
-    'type' =&gt; $type,
-    'sender' =&gt; json_encode(array(
-        'guid' =&gt; $channel['channel_guid'],
-        'guid_sig' =&gt; base64url_encode(rsa_sign($channel['channel_guid'],$channel['channel_prvkey'])),
-        'url' =&gt; z_root(),
-        'url_sig' =&gt; base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))
-    )), 
-    'callback' =&gt; '/post',
-    'version' =&gt; ZOT_REVISION
-);
-
-if($recipients)
-    $params['recipients'] = json_encode($recipients);
-</pre><p>Hush-hush ultra top-secret mode </p>
-<pre class="fragment">if($remote_key) {
-    $params = aes_encapsulate($params,$remote_key);
-}
-
-$x = z_post_url($url,$params);
-return($x);
-</pre> 
-<p>Referenced by <a class="el" href="include_2settings_8php.html#ac34e479d27f32b82dd6b33542f81a6a7">build_sync_packet()</a>, <a class="el" href="include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0">directory_run()</a>, <a class="el" href="notifier_8php.html#a568c502f626cff95e344c0748938b85d">notifier_run()</a>, and <a class="el" href="post_8php.html#af4b48181ce773ef0cdfc972441445c34">post_init()</a>.</p>
+
+<p>Referenced by <a class="el" href="zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7">build_sync_packet()</a>, <a class="el" href="include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0">directory_run()</a>, <a class="el" href="notifier_8php.html#a568c502f626cff95e344c0748938b85d">notifier_run()</a>, and <a class="el" href="post_8php.html#af4b48181ce773ef0cdfc972441445c34">post_init()</a>.</p>
 
 </div>
 </div>