From dab64ca1657f74890f5a7dcb4bd5f00d1b5da2fb Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 12 Feb 2015 16:52:30 -0800
Subject: [PATCH] New event trigger names reworked. Replaced all '-' with '_'
 for compatibility with e_notify.

---
 e107_admin/newspost.php                  |  6 +++---
 e107_admin/updateadmin.php               |  2 +-
 e107_admin/users.php                     |  8 ++++----
 e107_handlers/admin_ui.php               |  2 +-
 e107_handlers/bounce_handler.php         |  6 +++---
 e107_handlers/login.php                  |  2 +-
 e107_handlers/online_class.php           |  2 +-
 e107_handlers/user_handler.php           |  3 +++
 e107_handlers/user_model.php             | 18 ++++++++++++------
 e107_plugins/download/includes/admin.php |  4 ++--
 e107_plugins/forum/forum_class.php       | 14 +++++++-------
 e107_plugins/pm/pm_class.php             |  4 ++--
 upload.php                               |  2 +-
 13 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index fb131fc49..3cafa8dc1 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -1288,7 +1288,7 @@ class admin_newspost
 					e107::getEvent()->trigger("newsdel", $del_id);
 					if($sql->delete("news", "news_id={$del_id}"))
 					{
-						e107::getEvent()->trigger("admin-news-delete", $del_id);
+						e107::getEvent()->trigger("admin_news_delete", $del_id);
 						e107::getLog()->add('NEWS_01',$del_id,E_LOG_INFORMATIVE,'');
 						$this->show_message(NWSLAN_31." #".$del_id." ".NWSLAN_32, E_MESSAGE_SUCCESS);
 						$this->clear_cache();
@@ -1564,7 +1564,7 @@ class admin_newspost
 				$this->clear_cache();
 
 				e107::getEvent()->trigger("newscatpost", array_merge($inserta['data'], $rwinserta['data'])); // @deprecated
-				e107::getEvent()->trigger("admin-news-category-create", array_merge($inserta['data'], $rwinserta['data']));
+				e107::getEvent()->trigger("admin_news_category_create", array_merge($inserta['data'], $rwinserta['data']));
 			}
 			else
 			{
@@ -1674,7 +1674,7 @@ class admin_newspost
 
 					
 					e107::getEvent()->trigger("newscatupd", array_merge($updatea['data'], $inserta['data'])); // @deprecated
-					e107::getEvent()->trigger("admin-news-category-update", array_merge($updatea['data'], $inserta['data']));
+					e107::getEvent()->trigger("admin_news_category_update", array_merge($updatea['data'], $inserta['data']));
 				}
 				else
 				{
diff --git a/e107_admin/updateadmin.php b/e107_admin/updateadmin.php
index f2c1e859a..ae3fb85bf 100644
--- a/e107_admin/updateadmin.php
+++ b/e107_admin/updateadmin.php
@@ -57,7 +57,7 @@ if (isset($_POST['update_settings']))
 				$e_event->trigger('adpword'); //@deprecated 
 				
 				$eventData = array('user_id'=> USERID, 'user_pwchange'=> $userData['data']['user_pwchange']); 
-				e107::getEvent()->trigger('admin-password-update',$eventData ); 
+				e107::getEvent()->trigger('admin_password_update',$eventData ); 
 				 
 				$ns->tablerender(UDALAN_2, $mes->render());
 			}
diff --git a/e107_admin/users.php b/e107_admin/users.php
index fb2ead55a..231ce2f5e 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -517,7 +517,7 @@ class users_admin_ui extends e_admin_ui
 			
 			e107::getLog()->add('USET_10', str_replace(array('--UID--', '--NAME--', '--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_166), E_LOG_INFORMATIVE);
 			$e_event->trigger('userfull', $row); //BC
-			e107::getEvent()->trigger('admin-user-activate', $row);
+			e107::getEvent()->trigger('admin_user_activate', $row);
 			
 			$mes->addSuccess(USRLAN_86." (#".$sysuser->getId()." : ".$sysuser->getName().' - '.$sysuser->getValue('email').")");
 			
@@ -581,7 +581,7 @@ class users_admin_ui extends e_admin_ui
 			
 			$eventData = array('user_id' => $sysuser->getId(), 'admin_id' => $user->getId());
 			e107::getEvent()->trigger('loginas', $eventData); // BC
-			e107::getEvent()->trigger('admin-user-loginas', $eventData); 
+			e107::getEvent()->trigger('admin_user_loginas', $eventData); 
 			
 	  	}
 	}
@@ -609,7 +609,7 @@ class users_admin_ui extends e_admin_ui
 			
 			$eventData = array('user_id' => $sysuser->getId(), 'admin_id' => $user->getId());
 			e107::getEvent()->trigger('logoutas', $eventData); //BC 
-			e107::getEvent()->trigger('admin-user-logoutas', $eventData); 
+			e107::getEvent()->trigger('admin_user_logoutas', $eventData); 
 			$this->redirect('list', 'main', true);
 	  	}
 		
@@ -1260,7 +1260,7 @@ class users_admin_ui extends e_admin_ui
 			// Add to user audit trail
 			$admin_log->user_audit(USER_AUDIT_ADD_ADMIN, $user_data, 0, $user_data['user_loginname']);
 			$e_event->trigger('userfull', $user_data);
-			e107::getEvent()->trigger('admin-user-create', $user_data); 
+			e107::getEvent()->trigger('admin_user_create', $user_data); 
 			
 			// send everything available for user data - bit sparse compared with user-generated signup
 			if(isset($_POST['sendconfemail']))
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index cfbc32df6..4a4066611 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -4017,7 +4017,7 @@ class e_admin_controller_ui extends e_admin_controller
 			return false; 
 		} 
 		
-		return 'admin-'.strtolower($plug).'-'.strtolower($type); 
+		return 'admin_'.strtolower($plug).'_'.strtolower($type); 
 
 	}
 }
diff --git a/e107_handlers/bounce_handler.php b/e107_handlers/bounce_handler.php
index 2236eb3cb..9a1e604eb 100644
--- a/e107_handlers/bounce_handler.php
+++ b/e107_handlers/bounce_handler.php
@@ -135,14 +135,14 @@ class e107Bounce
 	        switch($the['action'])
 			{
 	            case 'failed':
-					e107::getEvent()->trigger('email-bounce-failed', $the);
+					e107::getEvent()->trigger('email_bounce_failed', $the);
 					$this->setUser_Bounced(null, $the['user_email']);
 					break;
 					
 	            case 'transient':
 	               
 	            //    $num_attempts  = delivery_attempts($the['user_email']);
-					e107::getEvent()->trigger('email-bounce-transient', $the);
+					e107::getEvent()->trigger('email_bounce_transient', $the);
 	                if($num_attempts  > 10)
 					{
 	                    $this->setUser_Bounced($the['user_id'], $the['user_email']);
@@ -154,7 +154,7 @@ class e107Bounce
 	                break;
 					
 	            case 'autoreply':
-	            	e107::getEvent()->trigger('email-bounce-autoreply', $the);    
+	            	e107::getEvent()->trigger('email_bounce_autoreply', $the);    
 	              //  postpone($the['user_email'], '7 days');
 	                break;
 					
diff --git a/e107_handlers/login.php b/e107_handlers/login.php
index 904a1d694..2bfff369a 100644
--- a/e107_handlers/login.php
+++ b/e107_handlers/login.php
@@ -544,7 +544,7 @@ class userlogin
 					$time = time();
 					e107::getIPHandler()->add_ban(4,LAN_LOGIN_18,$this->userIP,1);
 					e107::getDb()->insert("generic", "0, 'auto_banned', '".$time."', 0, '{$this->userIP}', '{$extra_text}', '".LAN_LOGIN_20.": ".e107::getParser()->toDB($username).", ".LAN_LOGIN_17.": ".md5($ouserpass)."' ");
-					e107::getEvent()->trigger('user-ban-failed-login', array('time'=>$time, 'ip'=>$this->userIP, 'other'=>$extra_text)); 
+					e107::getEvent()->trigger('user_ban_failed_login', array('time'=>$time, 'ip'=>$this->userIP, 'other'=>$extra_text)); 
 				}
 			}
 		}
diff --git a/e107_handlers/online_class.php b/e107_handlers/online_class.php
index ad2314001..2598ee467 100755
--- a/e107_handlers/online_class.php
+++ b/e107_handlers/online_class.php
@@ -221,7 +221,7 @@ class e_online
 					if (true === e107::getIPHandler()->add_ban(2,str_replace('--HITS--',$row['online_pagecount'],BANLAN_78),$ip,0))
 					{
 						e107::getEvent()->trigger('flood', $ip); //BC
-						e107::getEvent()->trigger('user-ban-flood', $ip);
+						e107::getEvent()->trigger('user_ban_flood', $ip);
 						exit;
 					}
 				}
diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php
index be4ed0452..795959803 100644
--- a/e107_handlers/user_handler.php
+++ b/e107_handlers/user_handler.php
@@ -1048,6 +1048,9 @@ class e_user_provider
 			$userdata['provider'] = $this->getProvider();
 			
 			e107::getEvent()->trigger('userveri', $userdata);	 // Trigger New verified user. 
+			
+			e107::getEvent()->trigger('user_xup_signup', $userdata); 
+			
 			$ret = e107::getEvent()->trigger('usersupprov', $userdata);	// XXX - it's time to pass objects instead of array? 
 			if(true === $ret) return $this;
 			
diff --git a/e107_handlers/user_model.php b/e107_handlers/user_model.php
index 3ed0ad867..f1420ae64 100644
--- a/e107_handlers/user_model.php
+++ b/e107_handlers/user_model.php
@@ -1455,8 +1455,11 @@ class e_user extends e_user_model
 		$userlogin = new userlogin();
 		$userlogin->login($uname, $upass_plain, $uauto, $uchallange, $noredirect);
 		
-		$this->setSessionData(true)
-			->setData($userlogin->getUserData());
+		$userdata  = $userlogin->getUserData(); 
+		
+		$this->setSessionData(true)->setData($userdata);
+		
+		e107::getEvent()->trigger('user_login', $userdata); 	
 
 		return $this->isUser();
 	}
@@ -1475,8 +1478,11 @@ class e_user extends e_user_model
 		$userlogin = new userlogin();
 		$userlogin->login($xup, '', 'provider', false, true);
 		
-		$this->setSessionData(true)
-			->setData($userlogin->getUserData());
+		$userdata  = $userlogin->getUserData(); 
+		
+		$this->setSessionData(true)->setData($userdata);
+			
+		e107::getEvent()->trigger('user_xup_login', $userdata); 	
 
 		return $this->isUser();
 	}
@@ -1828,9 +1834,9 @@ class e_user extends e_user_model
 	final protected function _load($user_id)
 	{
 		$qry = 'SELECT u.*, ue.* FROM #user AS u LEFT JOIN #user_extended as ue ON u.user_id=ue.user_extended_id WHERE user_id='.intval($user_id);
-		if(e107::getDb()->db_Select_gen($qry))
+		if(e107::getDb()->gen($qry))
 		{
-			return e107::getDb()->db_Fetch();
+			return e107::getDb()->fetch();
 		}
 		return array();
 	}
diff --git a/e107_plugins/download/includes/admin.php b/e107_plugins/download/includes/admin.php
index fb691423d..41cea608a 100644
--- a/e107_plugins/download/includes/admin.php
+++ b/e107_plugins/download/includes/admin.php
@@ -1784,7 +1784,7 @@ $columnInfo = array(
 				unset($dlInfo['download_class']);         // Also replicating 0.7
 				$e_event->trigger('dlupdate', $dlInfo); // @deprecated 
 				
-				e107::getEvent()->trigger('admin-download-update',$dlInfo); 
+				e107::getEvent()->trigger('admin_download_update',$dlInfo); 
 	      }
 	      else // Its a new entry. 
 	      {
@@ -1804,7 +1804,7 @@ $columnInfo = array(
 		            unset($dlInfo['download_class']);         // Also replicating 0.7
 		            $e_event->trigger("dlpost", $dlInfo); // @deprecated 
 					
-					e107::getEvent()->trigger('admin-download-create',$dlInfo); 
+					e107::getEvent()->trigger('admin_download_create',$dlInfo); 
 		
 		            if ($_POST['remove_upload'])
 		            {
diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php
index 20862d107..f3b444985 100644
--- a/e107_plugins/forum/forum_class.php
+++ b/e107_plugins/forum/forum_class.php
@@ -598,7 +598,7 @@ class e107forum
 //		$info['_FIELD_TYPES'] = $this->fieldTypes['forum_post'];
 		$info['data'] = $postInfo;
 		$postId = $sql->insert('forum_post', $info);
-	  	e107::getEvent()->trigger('user-forum-post-created', $info);
+	  	e107::getEvent()->trigger('user_forum_post_created', $info);
 		$forumInfo = array();
 
 		if($postId && $updateThread)
@@ -628,7 +628,7 @@ class e107forum
 			$info['_FIELD_TYPES']['thread_total_replies'] = 'cmd';
 
 			$result = $sql->update('forum_thread', $info);
-		  	e107::getEvent()->trigger('user-forum-topic-updated', $info);
+		  	e107::getEvent()->trigger('user_forum_topic_updated', $info);
 		}
 
 		if(($result || !$updateThread) && $updateForum)
@@ -685,7 +685,7 @@ class e107forum
 		$info['data'] = $threadInfo;
 		if($newThreadId = e107::getDb()->insert('forum_thread', $info))
 		{
-		  	e107::getEvent()->trigger('user-forum-topic-created', $info);
+		  	e107::getEvent()->trigger('user_forum_topic_created', $info);
 			$postInfo['post_thread'] = $newThreadId;
 			$newPostId = $this->postAdd($postInfo, false);
 			$this->threadMarkAsRead($newThreadId);
@@ -742,7 +742,7 @@ class e107forum
 //		$info['_FIELD_TYPES'] = $this->fieldTypes['forum_thread'];
 		$info['WHERE'] = 'thread_id = '.(int)$threadId;
 		e107::getDb()->update('forum_thread', $info);
-	  	e107::getEvent()->trigger('user-forum-topic-updated', $info);
+	  	e107::getEvent()->trigger('user_forum_topic_updated', $info);
 	}
 
 	
@@ -754,7 +754,7 @@ class e107forum
 //		$info['_FIELD_TYPES'] = $this->fieldTypes['forum_post'];
 		$info['WHERE'] = 'post_id = '.(int)$postId;
 		e107::getDb()->update('forum_post', $info);
-	  	e107::getEvent()->trigger('user-forum-post-updated', $info);
+	  	e107::getEvent()->trigger('user_forum_post_updated', $info);
 	}
 
 	
@@ -1890,7 +1890,7 @@ class e107forum
 			if($sql->delete('forum_thread', 'thread_id='.$threadId))
 			{
 				$status = true;
-			  	e107::getEvent()->trigger('user-forum-topic-deleted', $threadId);
+			  	e107::getEvent()->trigger('user_forum_topic_deleted', $threadId);
 			}
 
 			//Delete any thread tracking
@@ -1942,7 +1942,7 @@ class e107forum
 		if($sql->delete('forum_post', 'post_id='.$postId))
 		{
 			$deleted = true;
-		  	e107::getEvent()->trigger('user-forum-post-deleted', $postId);
+		  	e107::getEvent()->trigger('user_forum_post_deleted', $postId);
 		}
 
 		// update statistics
diff --git a/e107_plugins/pm/pm_class.php b/e107_plugins/pm/pm_class.php
index e77b790b5..6d1fb6420 100755
--- a/e107_plugins/pm/pm_class.php
+++ b/e107_plugins/pm/pm_class.php
@@ -56,7 +56,7 @@ class private_message
 			{
 				$this->pm_send_receipt($pm_info);
 			}
-		  	e107::getEvent()->trigger('user-pm-read', $pm_id);
+		  	e107::getEvent()->trigger('user_pm_read', $pm_id);
 		}
 	}
 
@@ -211,7 +211,7 @@ class private_message
 
 				if($pmid = $sql->insert('private_msg', $info))
 				{
-				  	e107::getEvent()->trigger('user-pm-sent', $info);
+				  	e107::getEvent()->trigger('user_pm_sent', $info);
 					if($class == FALSE)
 					{
 						$toclass .= $u['user_name'].', ';
diff --git a/upload.php b/upload.php
index 28acfcb99..cfc64d2d2 100644
--- a/upload.php
+++ b/upload.php
@@ -202,7 +202,7 @@ class userUpload
 	                $edata_fu = array("upload_user" => $poster, "upload_email" => $postemail, "upload_name" => $tp -> toDB($_POST['file_name']),"upload_file" => $file, "upload_version" => $_POST['file_version'], "upload_description" => $tp -> toDB($_POST['file_description']), "upload_size" => $filesize, "upload_category" => $downloadCategory, "upload_website" => $tp -> toDB($_POST['file_website']), "upload_image" => $image, "upload_demo" => $tp -> toDB($_POST['file_demo']), "upload_time" => $file_time);
 	                
 					e107::getEvent()->trigger("fileupload", $edata_fu); // BC
-					e107::getEvent()->trigger("user-file-upload", $edata_fu);
+					e107::getEvent()->trigger("user_file_upload", $edata_fu);
 					
 	                $mes->addSuccess(LAN_404);
 	            }