access blockem from item photo menu

diff --git a/blockem.tgz b/blockem.tgz
index d31c638f2aab7e80d3ac3ff0a8d88127509c6d8e..63454971d76a20f73554e69126e0cc1c3cffa62a 100644 (file)
Binary files a/blockem.tgz and b/blockem.tgz differ

diff --git a/blockem/blockem.php b/blockem/blockem.php
index f8c30dc6c46ee86c34f3faec71d277b26e9d5335..b0e4d805baab4b1bfe564336478f4dfabd0e0bf8 100644 (file)
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -14,7 +14,8 @@ function blockem_install() {
        register_hook('display_item', 'addon/blockem/blockem.php', 'blockem_display_item');
        register_hook('plugin_settings', 'addon/blockem/blockem.php', 'blockem_addon_settings');
        register_hook('plugin_settings_post', 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
-
+       register_hook('conversation_start', 'addon/blockem/blockem.php', 'blockem_conversation_start');
+       register_hook('item_photo_menu', 'addon/blockem/blockem.php', 'blockem_item_photo_menu');
 }
 
 
@@ -23,6 +24,8 @@ function blockem_uninstall() {
        unregister_hook('display_item', 'addon/blockem/blockem.php', 'blockem_display_item');
        unregister_hook('plugin_settings', 'addon/blockem/blockem.php', 'blockem_addon_settings');
        unregister_hook('plugin_settings_post', 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
+       unregister_hook('conversation_start', 'addon/blockem/blockem.php', 'blockem_conversation_start');
+       unregister_hook('item_photo_menu', 'addon/blockem/blockem.php', 'blockem_item_photo_menu');
 
 }
 
@@ -109,3 +112,82 @@ function blockem_display_item(&$a,&$b) {
                $b['output'] = preg_replace('/\<img(.*?)src=\"(.*?)\" class=\"wall\-item\-photo(.*?)\>/','<img$1src="' . $a->get_baseurl() . "/images/default-profile-sm.jpg" . '" class="wall-item-photo$3>',$b['output']);
 }
 
+
+function blockem_conversation_start(&$a,&$b) {
+
+       if(! local_user())
+               return;
+
+       $words = get_pconfig(local_user(),'blockem','words');
+       if($words) {
+               $a->data['blockem'] = explode(',',$words);
+       }
+       $a->page['htmlhead'] .= <<< EOT
+
+<script>
+function blockemBlock(author) {
+       $.get('blockem?block=' +author, function(data) {
+               location.reload(true);
+       });
+}
+function blockemUnblock(author) {
+       $.get('blockem?unblock=' +author, function(data) {
+               location.reload(true);
+       });
+}
+</script>
+
+EOT;
+
+}
+
+function blockem_item_photo_menu(&$a,&$b) {
+
+       $blocked = false;
+       $author = $b['item']['author-link'];
+       if(is_array($a->data['blockem'])) {
+               foreach($a->data['blockem'] as $bloke) {
+                       if(link_compare($bloke,$author)) {
+                               $blocked = true;
+                               break;
+                       }
+               }
+       }
+       if($blocked)
+               $b['menu'][ t('Unblock Author')] = 'javascript:blockemUnblock("' . $author . '");';
+       else
+               $b['menu'][ t('Block Author')] = 'javascript:blockemBlock("' . $author . '");';
+}
+
+function blockem_module() {}
+
+
+function blockem_init(&$a) {
+
+       if(! local_user())
+               return;
+
+       $words = get_pconfig(local_user(),'blockem','words');
+
+       if(array_key_exists('block',$_GET) && $_GET['block']) {
+               if(strlen($words))
+                       $words .= ',';
+               $words .= trim($_GET['block']);
+       }
+       if(array_key_exists('unblock',$_GET) && $_GET['unblock']) {
+               $arr = explode(',',$words);
+               $newarr = array();
+
+               if(count($arr)) {
+                       foreach($arr as $x) {
+                               if(! link_compare(trim($x),trim($_GET['unblock'])))
+                                       $newarr[] = $x;
+                       }
+               }
+               $words = implode(',',$newarr);
+       }
+
+       set_pconfig(local_user(),'blockem','words',$words);
+       info( t('blockem settings updated') . EOL );
+       killme();
+}
\ No newline at end of file

diff --git a/fortunate.tgz b/fortunate.tgz
index 5c9ce167fd291b3f51ab790aa8b48a6da19ec693..e9c20413b0c40461808001bf9653faee2c41bc51 100644 (file)
Binary files a/fortunate.tgz and b/fortunate.tgz differ

diff --git a/fortunate/fortunate.php b/fortunate/fortunate.php
index 5a6302e58d8509c38e7c119161436a83b95443e5..f434d486bd9dcb4907b4c2d2625d5a3ac73acb6c 100644 (file)
--- a/fortunate/fortunate.php
+++ b/fortunate/fortunate.php
@@ -16,7 +16,7 @@ function fortunate_uninstall() {
 }
 
 
-function fortunate_fetch($a,&$b) {
+function fortunate_fetch(&$a,&$b) {
 
        $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' 
                . $a->get_baseurl() . '/addon/fortunate/fortunate.css' . '" media="all" />' . "\r\n";