Adding sender name in notifications

main/cron/notification.php

@@ -1,4 +1,12 @@
 <?php
+/* For licensing terms, see /license.txt */
+/**
+ * @package chamilo.notification
+ * @author Julio Montoya <gugli100@gmail.com>
+ */
+
+$language_file = array('userInfo');
+
 require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'notification.lib.php';
 $notify = new Notification();

main/inc/lib/message.lib.php

@@ -287,16 +287,17 @@ class MessageManager
 			//Load user settings
 			require_once api_get_path(LIBRARY_PATH).'notification.lib.php';
 			$notification = new Notification();			    
-		    if (empty($group_id)) {
-                $user_id = $receiver_user_id;
-                $notification->save_message_notifications(array($user_id), $subject,$content);                
+		    if (empty($group_id)) {                
+		        $sender_info = api_get_user_info($user_sender_id);
+                $notification->save_message_notifications(array($receiver_user_id), $subject, $content, $sender_info);                
 		    } else {
+		        $group_info = GroupPortalManager::get_group_data($group_id);		        
 		        $user_list = GroupPortalManager::get_users_by_group($group_id, false, array(),0, 1000);
 		        $new_user_list = array();		   
                 foreach($user_list as $user_data) {
                     $new_user_list[]= $user_data['user_id'];
                 }
-                $notification->save_group_notifications($new_user_list, $subject,$content);                     		
+                $notification->save_group_notifications($new_user_list, $subject, $content, $group_info);                     		
 		    }
 			return $inbox_last_id;
         } else {

main/inc/lib/notification.lib.php

@@ -33,21 +33,25 @@ define('NOTIFY_GROUP_NO',			'0');
 class Notification extends Model {
     
     var $table;
-    var $columns = array('id','dest_user_id','dest_mail','title','content','send_freq','created_at','sent_at');
-    var $max_content_length = 254; //Max lenght of the notification.content field
-    var $debug = true;
+    var $columns             = array('id','dest_user_id','dest_mail','title','content','send_freq','created_at','sent_at');
+    var $max_content_length  = 254; //Max lenght of the notification.content field
+    var $debug               = true;
+    
+    var $admin_name;
+    var $admin_email;
     
 	public function __construct() {
-        $this->table =  Database::get_main_table(TABLE_NOTIFICATION);
+        $this->table       = Database::get_main_table(TABLE_NOTIFICATION);
+        $this->admin_name  = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS); //api_get_setting('siteName')        
+        $this->admin_email = api_get_setting('emailAdministrator');            
 	}    
    
     public function send($frec = NOTIFY_MESSAGE_DAILY) {
         $notifications = $this->find('all',array('where'=>array('sent_at IS NULL AND send_freq = ?'=>$frec)));
         if (!empty($notifications)) {
             foreach($notifications as $item_to_send) {
-                //Sending email                                
-                //$name = api_get_person_name($user_info['firstname'], $user_info['lastname']);                                  
-                api_mail_html($item_to_send['dest_mail'], $item_to_send['dest_mail'], $item_to_send['title'], $item_to_send['content']);                    
+                //Sending email
+                api_mail_html($item_to_send['dest_mail'], $item_to_send['dest_mail'], $item_to_send['title'], $item_to_send['content'], $this->admin_name, $this->admin_email);                    
                 if ($this->debug) { error_log('Sending message to: '.$item_to_send['dest_mail']); }
                 //Updating
                 $item_to_send['sent_at'] = api_get_utc_datetime();
@@ -62,9 +66,17 @@ class Notification extends Model {
      * @param	array	user list of ids
      * @param	string	title
      * @param	string	content of the message
+     * @param	array	sender info (return of the api_get_user_info() function )
      * 
      */
-    public function save_message_notifications($user_list, $title, $content) {
+    public function save_message_notifications($user_list, $title, $content, $sender_info = array()) {        
+        if (!empty($sender_info)) {
+            $sender_name = api_get_person_name($sender_info['firstname'], $sender_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
+            $sender_mail = $sender_info['email'] ;            
+            $content = sprintf(get_lang('YouHaveANewMessageFromX'), $sender_name).'<br />'.$content;            
+        }
+        $content = $content.'<br />'.Display::url(get_lang('SeeMessage'), api_get_path(WEB_CODE_PATH).'messages/inbox.php');
+        
         if (!empty($user_list)) {            
             foreach($user_list  as $user_id) {
                 $extra_data = UserManager::get_extra_user_data($user_id);              
@@ -76,11 +88,10 @@ class Notification extends Model {
                         $user_info = api_get_user_info($user_id);
                         if (!empty($user_info['mail'])) {                            
                             $name = api_get_person_name($user_info['firstname'], $user_info['lastname']);
-                            api_mail_html($name, $user_info['mail'], $title, $content);
+                            api_mail_html($name, $user_info['mail'], $title, $content, $this->admin_name, $this->admin_email);
                         }
                         $params['sent_at']       = api_get_utc_datetime();
-                    default:    			        
-                        $extra_data              = UserManager::get_extra_user_data($user_id);
+                    default:
                         $user_info               = api_get_user_info($user_id);			    
                 	    $params['dest_user_id']  = $user_id;
                 	    $params['dest_mail']     = $user_info['mail'];
@@ -101,8 +112,16 @@ class Notification extends Model {
      * @param	string	content of the message
      * 
      */
-    public function save_invitation_notifications($user_list, $title, $content) {
-        if (!empty($user_list)) {            
+    public function save_invitation_notifications($user_list, $title, $content, $sender_info = array()) {
+        if (!empty($sender_info)) {
+            $sender_name = api_get_person_name($sender_info['firstname'], $sender_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
+            $sender_mail = $sender_info['email'] ;            
+            $content = sprintf(get_lang('YouHaveANewInvitationFromX'), $sender_name).'<br />'.$content;                
+        }        
+        
+        $content = $content.'<br />'.Display::url(get_lang('SeeInvitation'), api_get_path(WEB_CODE_PATH).'social/invitations.php');
+        
+        if (!empty($user_list)) {
             foreach($user_list  as $user_id) {                
                 $extra_data = UserManager::get_extra_user_data($user_id);   
                 $params = array();           
@@ -113,11 +132,10 @@ class Notification extends Model {
                         $user_info = api_get_user_info($user_id);
                         if (!empty($user_info['mail'])) {
                             $name = api_get_person_name($user_info['firstname'], $user_info['lastname']);                            
-                            api_mail_html($name, $user_info['mail'], $title, $content);
+                            api_mail_html($name, $user_info['mail'], $title, $content, $this->admin_name, $this->admin_email);
                         }
                         $params['sent_at']       = api_get_utc_datetime();    
-                    default:    			        
-                        $extra_data              = UserManager::get_extra_user_data($user_id);
+                    default:    		
                         $user_info               = api_get_user_info($user_id);			    
                 	    $params['dest_user_id']  = $user_id;
                 	    $params['dest_mail']     = $user_info['mail'];
@@ -139,7 +157,12 @@ class Notification extends Model {
      * @param	string	content of the message
      * 
      */
-    public function save_group_notifications($user_list, $title, $content) {
+    public function save_group_notifications($user_list, $title, $content, $sender_info = array()) {
+        if (!empty($sender_info)) {            
+            $sender_name = $sender_info['name'];                    
+            $content     = sprintf(get_lang('YouHaveReceivedANewMessageInTheGroupX'), $sender_name).'<br />'.$content;
+            $content     = $content.'<br />'.Display::url(get_lang('SeeMessage'), api_get_path(WEB_CODE_PATH).'social/groups.php?id='.$sender_info['id']);
+        }        
         if (!empty($user_list)) {            
             foreach($user_list  as $user_id) {
                 //Avoiding sending a message to myself    
@@ -155,11 +178,10 @@ class Notification extends Model {
                         $user_info = api_get_user_info($user_id);
                         if (!empty($user_info['mail'])) {
                             $name = api_get_person_name($user_info['firstname'], $user_info['lastname']);                            
-                            api_mail_html($name, $user_info['mail'], $title, $content);
+                            api_mail_html($name, $user_info['mail'], $title, $content, $this->admin_name, $this->admin_email);
                         }
                         $params['sent_at']       = api_get_utc_datetime();
-                    default:    			        
-                        $extra_data              = UserManager::get_extra_user_data($user_id);
+                    default:
                         $user_info               = api_get_user_info($user_id);			    
                 	    $params['dest_user_id']  = $user_id;
                 	    $params['dest_mail']     = $user_info['mail'];

main/inc/lib/social.lib.php

@@ -1,4 +1,4 @@
-<?php //$id: $
+<?php
 /* For licensing terms, see /license.txt */
 
 /**
@@ -170,7 +170,7 @@ class SocialManager extends UserManager {
 	 * @author isaac flores paz <florespaz@bidsoftperu.com>
 	 * @author Julio Montoya <gugli100@gmail.com> Cleaning code
 	 */
-	public static function send_invitation_friend ($user_id,$friend_id,$message_title,$message_content) {
+	public static function send_invitation_friend ($user_id, $friend_id, $message_title, $message_content) {
 		$tbl_message = Database::get_main_table(TABLE_MAIN_MESSAGE);
 		$user_id = intval($user_id);
 		$friend_id = intval($friend_id);
@@ -180,24 +180,25 @@ class SocialManager extends UserManager {
 		$current_date = date('Y-m-d H:i:s',time());
 		$sql_exist='SELECT COUNT(*) AS count FROM '.$tbl_message.' WHERE user_sender_id='.($user_id).' AND user_receiver_id='.($friend_id).' AND msg_status IN(5,6,7);';
 
-		$res_exist=Database::query($sql_exist);
-		$row_exist=Database::fetch_array($res_exist,'ASSOC');
-
+		$res_exist = Database::query($sql_exist);
+		$row_exist = Database::fetch_array($res_exist,'ASSOC');
+		
 		if ($row_exist['count']==0) {
 		    		    
 			$sql='INSERT INTO '.$tbl_message.'(user_sender_id,user_receiver_id,msg_status,send_date,title,content) VALUES('.$user_id.','.$friend_id.','.MESSAGE_STATUS_INVITATION_PENDING.',"'.$current_date.'","'.$message_title.'","'.$message_content.'")';
-			Database::query($sql);			
+			Database::query($sql);	
 			
 			require_once api_get_path(LIBRARY_PATH).'notification.lib.php';
-			$notification = new Notification();
-		    $notification->save_invitation_notifications(array($friend_id), $message_title, $message_content);    		
+			$sender_info = api_get_user_info($user_id);
+			$notification = new Notification(); 
+		    $notification->save_invitation_notifications(array($friend_id), $message_title, $message_content, $sender_info);    		
 		    	
 			return true;
 		} else {
 			//invitation already exist
-			$sql_if_exist='SELECT COUNT(*) AS count, id FROM '.$tbl_message.' WHERE user_sender_id='.$user_id.' AND user_receiver_id='.$friend_id.' AND msg_status=7';
-			$res_if_exist=Database::query($sql_if_exist);
-			$row_if_exist=Database::fetch_array($res_if_exist,'ASSOC');
+			$sql_if_exist ='SELECT COUNT(*) AS count, id FROM '.$tbl_message.' WHERE user_sender_id='.$user_id.' AND user_receiver_id='.$friend_id.' AND msg_status=7';
+			$res_if_exist = Database::query($sql_if_exist);
+			$row_if_exist = Database::fetch_array($res_if_exist,'ASSOC');
 			if ($row_if_exist['count']==1) {
 				$sql_if_exist_up='UPDATE '.$tbl_message.'SET msg_status=5, content = "'.$message_content.'"  WHERE user_sender_id='.$user_id.' AND user_receiver_id='.$friend_id.' AND msg_status = 7 ';
 				//$sql_if_exist_up='UPDATE '.$tbl_message.'SET msg_status=5, set content = '.$message_content.' WHERE id='.$row_if_exist['id'].'';