From b6985e0e668cc847967f756701db18d24c92c8b9 Mon Sep 17 00:00:00 2001 From: tony baldwin Date: Sat, 2 Jun 2012 13:06:35 -0400 Subject: [PATCH] removed 2 lines in posterous that were rendering plugin unproductive libertree snuck in...not yet functional --- libertree.tar.gz | Bin 0 -> 2156 bytes libertree/libertree.css | 16 ++++ libertree/libertree.php | 195 ++++++++++++++++++++++++++++++++++++++++ posterous/posterous.php | 3 - 4 files changed, 211 insertions(+), 3 deletions(-) create mode 100644 libertree.tar.gz create mode 100755 libertree/libertree.css create mode 100755 libertree/libertree.php diff --git a/libertree.tar.gz b/libertree.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b38846f0530714a82a7f995736da7f955c515b2c GIT binary patch literal 2156 zcmV-y2$T08iwFQoh_p`t1MOLDQ`<-q=BxcHI$Bp`rwp>$IH__l6id9DRAqrP=Dq-> z8cAbYhb-x4Mu2NK|NVMKua;$uS#n!f$5evlnSP(AdwOKgwI~yeQe)?bjSh~Fy`KE+ ze(ZIMpXu1?;!LmGdEfbfblvWU&d)p0`*9}aBjSQEfE^L|i^u3Tt^bb>FWdj@X)m0G zFRJ75{qOd=`yUGX-^KlZzyGnf1DzMOV$JwJ-~WRn-0gbZc=xUj@8FcoX&=6&NPzQz z3pfdUpV}f|lHxPvHgiMa27W(Y76D|?0b<)h21h|P8=ujjWwW0Qa#sD5YhTnrNa+|J8|)=AFz3@Xd4}z z`pz2Z{|bcZQ*j@#TVC*C8|jG%zD9$c?kk!hgzHcF^IS-HpQ=O!R?2vWl9(4Y)xTGP zBJ#_yi2TjK_-mk8(NF=4=R#sdb_FQ@3LsYG{}@O-LCuSR;(NWaRHR-v-!@45ZNo~j z;ZB-wK<%X&amt#lRz1x!Mn%MYgqi%(@UpFk0ZgedLv&!`PMbyMc5a#8)>D%bJ+3eA zh}SGgYQbOt-PDwV8i!7{)?``>$wwkDQ>r9#>S36vgTk668xl3C8AqUlJ)`z5bp~4U zpy6B}^d*TF> z_4$PCl1$)OxhDxfttfGwLc;IH5!=0IBn&BA(d7|~detmyNt4bL7qilm+Bj6yP%`!0i>9uh z8mdHFolZDzOp7&q>3A0dz4@-vg)-Vh8YI73S-Vy9m#B6 zTix#C^RJMgZp#SfQVT_E^&BXWC4p2?EN6@=R4*P+tdmd| zDX2Ql+k(0C3KcoUGgV+ISSwtvDY5n1ceR5R8<^j9mv_%FU_5iV>Twa#7M{8bu&_Ct z5r2v)g1L*WWN;7IR;n%p^EV7Il=4|Fg5ypmR5g;aK;ng0EyuuUSXa7aMDx(+tofEp z|L?TMrJiZq#-43d>Wi`g}5DYQt(1@ovMZwcxMLc!IRWf#rjysC=rr0Q0!WC?%+=Q*?4A zC~xp$#qeJ#EX6H(gu965G!s-Jta4+6QGnv@`*7ixBfG-sW>sTXNtq`tQhP)C_!^Hg(sxy~v@4W$okj zn1=x)>K&A-#SKBGCSeTi#J^AL#%fR7=gQ*%y)Ju~HdN!_^q>H4a<_wJ~5 zeG`9N8G2iW33)M04Mj_N`+PL~&Ab?n&9l+x;Yj7R^6NnwTdUQukD|n$HB$y492#?c zOx80KuWrx`wQ{w8BkjV9AOA;j>TP{9B~{6tdEw4OFK{ptZ8R{Y_*AP&_|zJRG&1Lz z|B_LcovIFlLny>dLBI-}1p={+R5DPK-<~0_jr(J|zANJRsjqm-_3QB4=L?KYyd5!28V(U8jV^tl zw&aTe$|%P&p03UD*)=g=FUd)E=OKJ0fo;RAl16E=1IT`Y8c=&C8KBn5ft)xFZRN~5aHSv6#n i=H#~iM~SkRQ2yO}_&Q$4>v$c{8UF#7RtZ)BC;$L@b29V* literal 0 HcmV?d00001 diff --git a/libertree/libertree.css b/libertree/libertree.css new file mode 100755 index 00000000..cb401d55 --- /dev/null +++ b/libertree/libertree.css @@ -0,0 +1,16 @@ + +#libertree-enable-label, #libertree-username-label, #libertree-password-label, #libertree-bydefault-label { + float: left; + width: 200px; + margin-top: 10px; +} + +#libertree-checkbox, #libertree-username, #libertree-password, #libertree-bydefault { + float: left; + margin-top: 10px; +} + +#libertree-submit { + margin-top: 15px; +} + diff --git a/libertree/libertree.php b/libertree/libertree.php new file mode 100755 index 00000000..e91996cc --- /dev/null +++ b/libertree/libertree.php @@ -0,0 +1,195 @@ + + */ + +function libertree_install() { + register_hook('post_local', 'addon/libertree/libertree.php', 'libertree_post_local'); + register_hook('notifier_normal', 'addon/libertree/libertree.php', 'libertree_send'); + register_hook('jot_networks', 'addon/libertree/libertree.php', 'libertree_jot_nets'); + register_hook('connector_settings', 'addon/libertree/libertree.php', 'libertree_settings'); + register_hook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post'); + +} +function libertree_uninstall() { + unregister_hook('post_local', 'addon/libertree/libertree.php', 'libertree_post_local'); + unregister_hook('notifier_normal', 'addon/libertree/libertree.php', 'libertree_send'); + unregister_hook('jot_networks', 'addon/libertree/libertree.php', 'libertree_jot_nets'); + unregister_hook('connector_settings', 'addon/libertree/libertree.php', 'libertree_settings'); + unregister_hook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post'); +} + + +function libertree_jot_nets(&$a,&$b) { + if(! local_user()) + return; + + $ltree_post = get_pconfig(local_user(),'libertree','post'); + if(intval($ltree_post) == 1) { + $ltree_defpost = get_pconfig(local_user(),'libertree','post_by_default'); + $selected = ((intval($ltree_defpost) == 1) ? ' checked="checked" ' : ''); + $b .= '
' + . t('Post to libertree') . '
'; + } +} + + +function libertree_settings(&$a,&$s) { + + if(! local_user()) + return; + + /* Add our stylesheet to the page so we can make our settings look nice */ + + $a->page['htmlhead'] .= '' . "\r\n"; + + /* Get the current state of our config variables */ + + $enabled = get_pconfig(local_user(),'libertree','post'); + + $checked = (($enabled) ? ' checked="checked" ' : ''); + + $def_enabled = get_pconfig(local_user(),'libertree','post_by_default'); + + $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + + $ltree_api_token = get_pconfig(local_user(), 'libertree', 'libertree_api_token'); + $ltree_url = get_pconfig(local_user(), 'libertree', 'libertree_url'); + + + /* Add some HTML to the existing form */ + + $s .= '
'; + $s .= '

' . t('libertree Post Settings') . '

'; + $s .= '
'; + $s .= ''; + $s .= ''; + $s .= '
'; + + $s .= '
'; + $s .= ''; + $s .= ''; + $s .= '
'; + + $s .= '
'; + $s .= ''; + $s .= ''; + $s .= '
'; + + $s .= '
'; + $s .= ''; + $s .= ''; + $s .= '
'; + + /* provide a submit button */ + + $s .= '
'; + +} + + +function libertree_settings_post(&$a,&$b) { + + if(x($_POST,'libertree-submit')) { + + set_pconfig(local_user(),'libertree','post',intval($_POST['libertree'])); + set_pconfig(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault'])); + set_pconfig(local_user(),'libertree','libertree_api_token',trim($_POST['libertree_api_token'])); + set_pconfig(local_user(),'libertree','libertree_url',trim($_POST['libertree_url'])); + + } + +} + +function libertree_post_local(&$a,&$b) { + + // This can probably be changed to allow editing by pointing to a different API endpoint + + if($b['edit']) + return; + + if((! local_user()) || (local_user() != $b['uid'])) + return; + + if($b['private'] || $b['parent']) + return; + + $ltree_post = intval(get_pconfig(local_user(),'libertree','post')); + + $ltree_enable = (($ltree_post && x($_REQUEST,'libertree_enable')) ? intval($_REQUEST['libertree_enable']) : 0); + + if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'libertree','post_by_default'))) + $ltree_enable = 1; + + if(! $ltree_enable) + return; + + if(strlen($b['postopts'])) + $b['postopts'] .= ','; + $b['postopts'] .= 'libertree'; +} + + + + +function libertree_send(&$a,&$b) { + + logger('libertree_send: invoked'); + return; + + if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) + return; + + if(! strstr($b['postopts'],'libertree')) + return; + + if($b['parent'] != $b['id']) + return; + + + $ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token'); + $ltree_url = get_pconfig($b['uid'],'libertree','libertree_url'); + $ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token"; + + if($ltree_url && $ltree_api_token && $ltree_blog) { + + require_once('include/bb2diaspora.php'); + $tag_arr = array(); + $tags = ''; + $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER); + + if($x) { + foreach($matches as $mtch) { + $tag_arr[] = $mtch[2]; + } + } + if(count($tag_arr)) + $tags = implode(',',$tag_arr); + + + $params = array( + 'text' => bb2diaspora($b['body']) + // 'token' => $ltree_api_token + ); + + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $ltree_blog); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5); + curl_setopt($ch, CURLOPT_HEADER, false); + curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC); + curl_setopt($ch, CURLOPT_POST, true); + curl_setopt($ch, CURLOPT_POSTFIELDS, $params); + + $data = curl_exec($ch); + $result = curl_multi_getcontent($ch); + curl_close($ch); + + logger('libertree_send: ' . $result); + } +} + diff --git a/posterous/posterous.php b/posterous/posterous.php index 25a009c5..eda2a93a 100755 --- a/posterous/posterous.php +++ b/posterous/posterous.php @@ -153,9 +153,6 @@ function posterous_post_local(&$a,&$b) { function posterous_send(&$a,&$b) { - logger('posterous_send: invoked'); - return; - if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) return;