Support for PHP 7

.gitignore

@@ -0,0 +1 @@
+.idea

composer.json

@@ -0,0 +1,4 @@
+{
+  "name": "hookpress",
+  "type": "wordpress-plugin"
+}

hookpress.php

@@ -3,14 +3,14 @@
 Plugin Name: HookPress
 Plugin URI: http://mitcho.com/code/hookpress/
 Description: HookPress turns all of your WordPress-internal hooks into webhooks. Possible uses include generating push notifications or using non-PHP web technology to extend WordPress. Read more about webhooks at <a href='http://webhooks.org/'>the webhooks site</a>.
-Version: 1.14
+Version: 1.16
 Author: mitcho (Michael Yoshitaka Erlewine)
 Author URI: http://mitcho.com/
 Donate link: http://tinyurl.com/donatetomitcho
 */
 
 define('HOOKPRESS_PRIORITY',12838790321);
-$hookpress_version = "1.14";
+$hookpress_version = "1.16";
 require('includes.php');
 
 function hookpress_init() {
@@ -21,9 +21,11 @@ function hookpress_init() {
 		update_option('hookpress_version',$hookpress_version);
 
 	add_action('admin_menu', 'hookpress_config_page');
+	hookpress_register_hooks();
+
 }
+
 add_action('init', 'hookpress_init');
-hookpress_register_hooks();
 
 // register ajax service
 add_action('wp_ajax_hookpress_get_fields', 'hookpress_ajax_get_fields');

includes.php

@@ -27,14 +27,22 @@ function hookpress_get_fields( $type ) {
 	}
 
 	// if it's a POST, we have a URL for it as well.
-	if ($type == 'POST' || $type == 'PARENT_POST')
+	if ($type == 'POST' || $type == 'PARENT_POST') {
+
 		$fields[] = 'post_url';
 
+		$meta_keys = $wpdb->get_col("select distinct(meta_key) from $wpdb->postmeta");
+
+		$fields = array_merge($fields, $meta_keys);
+	}
+
 	if ($type == 'PARENT_POST')
-		$fields = array_map(create_function('$x','return "parent_$x";'),$fields);
+		$fields = array_map(function ($x) { return "parent_$x"; }, $fields);
 
 	if ($type == 'OLD_USER_OBJ')
-		$fields = array_map(create_function('$x','return "old_$x";'),$fields);
+		$fields = array_map(function ($x) { return "old_$x"; }, $fields);
+
+	$fields = apply_filters('hookpress_get_fields', $fields, $type);
 
 	return array_unique($fields);
 }
@@ -43,12 +51,14 @@ function hookpress_print_edit_webhook( $id ){
 ?>
 <?php
 	global $wpdb, $hookpress_actions, $hookpress_filters;
-	
+
 	$webhooks = hookpress_get_hooks( );
 	$desc = $webhooks[$id];
-
-	if ($desc['type'] == 'action')
-		$hooks = array_keys($hookpress_actions);	
+
+	if ($desc['type'] == 'action') {
+		$actions = apply_filters( 'hookpress_actions', $hookpress_actions );
+		$hooks = array_keys($actions);
+	}
 	if ($desc['type'] == 'filter')
 		$hooks = array_keys($hookpress_filters);
 ?>
@@ -58,7 +68,7 @@ function hookpress_print_edit_webhook( $id ){
 <input type="hidden" name="enabled" id="enabled" value="<?php echo $desc['enabled']; ?>" />
 <table>
 <tr><td><label style='font-weight: bold' for='edithook'><?php _e("WordPress hook type",'hookpress');?>: </label></td>
-<td><input type='radio' id='action' class='newtype' name='newtype' <?php checked('action',$desc['type']);?>> <?php _e("action","hookpress");?></input> 
+<td><input type='radio' id='action' class='newtype' name='newtype' <?php checked('action',$desc['type']);?>> <?php _e("action","hookpress");?></input>
 <input type='radio' id='filter' class='newtype' name='newtype' <?php checked('filter',$desc['type']);?>> <?php _e("filter","hookpress");?></input></td></tr>
 <tr>
 <td><label style='font-weight: bold' for='edithook' id='action_or_filter'>
@@ -70,7 +80,7 @@ function hookpress_print_edit_webhook( $id ){
 ?>
 </label></td>
 <td><select name='edithook' id='edithook'>
-		<?php		
+		<?php
 			sort($hooks);
 			foreach ($hooks as $hook) {
 				$selected = ($hook == $desc['hook'])?'selected="true"':'';
@@ -90,19 +100,21 @@ function hookpress_print_edit_webhook( $id ){
 <select style='vertical-align: top' name='editfields' id='editfields' multiple='multiple' size='8'>
 <?php
 	global $wpdb, $hookpress_actions, $hookpress_filters;
-	if ($desc['type'] == 'action')
-		$args = $hookpress_actions[$desc['hook']];
+	if ($desc['type'] == 'action') {
+		$hooks = apply_filters( 'hookpress_actions', $hookpress_actions );
+		$args = $hooks[$desc['hook']];
+	}
 	if ($desc['type'] == 'filter')
 		$args = $hookpress_filters[$desc['hook']];
-		
+
 	$fields = array();
 	foreach ($args as $arg) {
-		if (ereg('[A-Z]+',$arg))
+		if (preg_match('/[A-Z]+/',$arg))
 			$fields = array_merge($fields,hookpress_get_fields($arg));
 		else
 			$fields[] = $arg;
 	}
-	
+
 	if ($desc['type'] == 'filter') {
 		$first = array_shift($fields);
 		$first = esc_html( $first );
@@ -140,7 +152,7 @@ function hookpress_print_webhook_row( $id ) {
 	$desc = $webhooks[$id];
 
 	if( !empty( $desc ) ):
-	
+
 	$is_active = $desc['enabled'];
 	$html_safe['id'] = esc_html( $id );
 
@@ -160,9 +172,9 @@ function hookpress_print_webhook_row( $id ) {
 		$fields = implode('</code>, <code>', $desc['fields'] );
 	} else
 		$fields = esc_html( $desc['fields'][0] );
-		
+
 	$edit = '<a href="#TB_inline?inlineId=hookpress-webhook&height=330&width=500" id="edit'. $html_safe['id'] . '" title="' . __('Edit this webhook') . '" class="thickbox edit">' . __('Edit') . '</a>';
-	
+
 	$activeornot = $desc['enabled'] ? 'active' : 'inactive';
 
 	$html_safe['hook'] = esc_html( $desc['hook'] );
@@ -205,10 +217,10 @@ function hookpress_print_webhooks_table() {
 <?php
 
 	if ( !empty($webhooks) ) :
-	
+
 	foreach ( (array)$webhooks as $id => $desc) :
-		
-		if( !empty( $desc ) ):		
+
+		if( !empty( $desc ) ):
 			hookpress_print_webhook_row( $id );
 		endif;
 	endforeach;
@@ -224,24 +236,28 @@ function hookpress_print_webhooks_table() {
 function hookpress_register_hooks() {
 	global $hookpress_callbacks, $hookpress_actions, $hookpress_filters;
 	$hookpress_callbacks = array();
-	
+
 	$all_hooks = hookpress_get_hooks( );
-	
+
 	if (!is_array( $all_hooks ) )
 		return;
 
 	foreach ( $all_hooks as $id => $desc) {
 		if (count($desc) && $desc['enabled']) {
-			$hookpress_callbacks[$id] = create_function('','
+
+			$hookpress_callbacks[$id] = function() use ($id) {
 				$args = func_get_args();
-				return hookpress_generic_action('.$id.',$args);
-			');
+
+				return hookpress_generic_action($id, $args);
+			};
 
 			$arg_count = 0;
 			if (isset($desc['type']) && $desc['type'] == 'filter')
 				$arg_count = count($hookpress_filters[$desc['hook']]);
-			else
-				$arg_count = count($hookpress_actions[$desc['hook']]);
+			else {
+				$hooks = apply_filters( 'hookpress_actions', $hookpress_actions );
+				$arg_count = count($hooks[$desc['hook']]);
+			}
 
 			add_filter($desc['hook'], $hookpress_callbacks[$id], HOOKPRESS_PRIORITY, $arg_count);
 		}
@@ -250,38 +266,45 @@ function hookpress_register_hooks() {
 
 function hookpress_generic_action($id,$args) {
 	global $hookpress_version, $wpdb, $hookpress_actions, $hookpress_filters, $wp_version;
-	
+
 	$webhooks = hookpress_get_hooks( );
 	$desc = $webhooks[$id];
 
 	do_action( 'hookpress_hook_fired', $desc );
 
 	$obj = array();
-	
+
 	// generate the expected argument names
 	if (isset($desc['type']) && $desc['type'] == 'filter')
-		$arg_names = $hookpress_filters[$desc['hook']];	
-	else
-		$arg_names = $hookpress_actions[$desc['hook']];
-
+		$arg_names = $hookpress_filters[$desc['hook']];
+	else {
+		$hooks = apply_filters( 'hookpress_actions', $hookpress_actions );
+		$arg_names = $hooks[$desc['hook']];
+	}
+
 	foreach($args as $i => $arg) {
-		$newobj = array();
+		$newobj = apply_filters('hookpress_get_data', $obj, $arg_names[$i], $arg);
+
 		switch($arg_names[$i]) {
 			case 'POST':
 			case 'ATTACHMENT':
 				$newobj = get_post($arg,ARRAY_A);
 
-				if ($arg_names[$i] == 'POST')
+				if ($arg_names[$i] == 'POST') {
 					$newobj["post_url"] = get_permalink($newobj["ID"]);
-
+
+					$meta = get_post_meta($newobj["ID"], '', true);
+					$newobj = array_merge($meta, $newobj);
+				}
+
 				if (wp_is_post_revision($arg)) {
 					$parent = get_post(wp_is_post_revision($arg));
 					foreach ($parent as $key => $val) {
 						$newobj["parent_$key"] = $val;
 					}
 					$newobj["parent_post_url"] = get_permalink($newobj["parent_ID"]);
 				}
-				
+
 				break;
 			case 'COMMENT':
 				$arg = (int) $arg;
@@ -302,20 +325,20 @@ function hookpress_generic_action($id,$args) {
 			case 'USER_OBJ':
 				$newobj = (array) $arg;
 			case 'OLD_USER_OBJ':
-				$newobj = array_map(create_function('$x','return "old_$x";'), (array) $arg);
+				$newobj = array_map(function ($x) { return "old_$x"; }, (array) $arg);
 			default:
 				$newobj[$arg_names[$i]] = $arg;
 		}
 		$obj = array_merge($obj,$newobj);
 	}
-	
+
 	// take only the fields we care about
 	$obj_to_post = array_intersect_key($obj,array_flip($desc['fields']));
 	$obj_to_post['hook'] = $desc['hook'];
-	
+
 	$user_agent = "HookPress/{$hookpress_version} (compatible; WordPress {$wp_version}; +http://mitcho.com/code/hookpress/)";
-	
+
 	$request = apply_filters( 'hookpress_request', array('user-agent' => $user_agent, 'body' => $obj_to_post, 'referer' => get_bloginfo('url')) );
-	
+
 	return wp_remote_post($desc['url'], $request);
 }