Browse Source

Converting event into a class

Julio Montoya 10 years ago
parent
commit
623e9e0c01

+ 1 - 0
main/inc/global.inc.php

@@ -0,0 +1 @@
+<?php

+ 3 - 3
main/inc/lib/career.lib.php

@@ -183,13 +183,13 @@ class Career extends Model
     public function save($params, $show_query = false) {
 	    $id = parent::save($params, $show_query);
 	    if (!empty($id)) {
-	    	event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+	    	Event::addEvent(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
    		}
    		return $id;
     }
 
     public function delete($id) {
 	    parent::delete($id);
-	    event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+	    Event::addEvent(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
     }
-}
+}

+ 10 - 1
main/inc/lib/chamilo_session.class.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ChamiloSession class definition
+ * ChamiloSession class
   */
 class ChamiloSession
 {
@@ -17,6 +17,7 @@ class ChamiloSession
     public static $dataDir;
     public static $courseDir;
     public static $configDir;
+    public static $assets;
 
     public static function getConfigDir()
     {
@@ -88,6 +89,14 @@ class ChamiloSession
         self::$session = $session;
     }
 
+    /**
+     * @return Symfony\Component\Templating\Helper\CoreAssetsHelper
+     */
+    public static function getAsset()
+    {
+        return self::$assets;
+    }
+
     /**
      * @param $variable
      * @param null $default

+ 11 - 9
main/inc/lib/course.lib.php

@@ -474,11 +474,11 @@ class CourseManager
 
             // add event to system log
             $user_id = api_get_user_id();
-            event_system(LOG_UNSUBSCRIBE_USER_FROM_COURSE, LOG_COURSE_CODE, $courseCode, api_get_utc_datetime(), $user_id);
+            Event::addEvent(LOG_UNSUBSCRIBE_USER_FROM_COURSE, LOG_COURSE_CODE, $courseCode, api_get_utc_datetime(), $user_id);
 
             foreach ($user_list as $user_id_to_delete) {
                 $user_info = api_get_user_info($user_id_to_delete);
-                event_system(LOG_UNSUBSCRIBE_USER_FROM_COURSE, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), $user_id);
+                Event::addEvent(LOG_UNSUBSCRIBE_USER_FROM_COURSE, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), $user_id);
             }
         }
     }
@@ -582,10 +582,10 @@ class CourseManager
                         sort        = '". ($course_sort)."'");
 
             // Add event to the system log
-            event_system(LOG_SUBSCRIBE_USER_TO_COURSE, LOG_COURSE_CODE, $course_code, api_get_utc_datetime(), api_get_user_id());
+            Event::addEvent(LOG_SUBSCRIBE_USER_TO_COURSE, LOG_COURSE_CODE, $course_code, api_get_utc_datetime(), api_get_user_id());
 
             $user_info = api_get_user_info($user_id);
-            event_system(LOG_SUBSCRIBE_USER_TO_COURSE, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), api_get_user_id());
+            Event::addEvent(LOG_SUBSCRIBE_USER_TO_COURSE, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), api_get_user_id());
         }
         return (bool)$result;
     }
@@ -1348,10 +1348,12 @@ class CourseManager
         $courseId = Database::escape_string($courseId);
         $teachers = array();
         $sql = "SELECT DISTINCT u.user_id, u.lastname, u.firstname, u.email, u.username, u.status
-                FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)." cu INNER JOIN ".Database::get_main_table(TABLE_MAIN_USER)." u
+                FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)." cu
+                INNER JOIN ".Database::get_main_table(TABLE_MAIN_USER)." u
                 ON (cu.user_id = u.user_id)
-                WHERE   cu.c_id = '$courseId' AND
-                        cu.status = 1 ";
+                WHERE
+                    cu.c_id = '$courseId' AND
+                    cu.status = 1 ";
         $rs = Database::query($sql);
         while ($teacher = Database::fetch_array($rs)) {
             $teachers[$teacher['user_id']] = $teacher;
@@ -1711,7 +1713,7 @@ class CourseManager
 
         // Add event to system log
         $user_id = api_get_user_id();
-        event_system(LOG_COURSE_DELETE, LOG_COURSE_CODE, $code, api_get_utc_datetime(), $user_id, $code);
+        Event::addEvent(LOG_COURSE_DELETE, LOG_COURSE_CODE, $code, api_get_utc_datetime(), $user_id, $code);
     }
 
     /**
@@ -4837,7 +4839,7 @@ class CourseManager
 
                 // Add event to the system log.
                 $user_id = api_get_user_id();
-                event_system(LOG_COURSE_CREATE, LOG_COURSE_CODE, $code, api_get_utc_datetime(), $user_id, $code);
+                Event::addEvent(LOG_COURSE_CREATE, LOG_COURSE_CODE, $code, api_get_utc_datetime(), $user_id, $code);
 
                 $send_mail_to_admin = api_get_setting('send_email_to_admin_when_create_course');
 

+ 9 - 4
main/inc/lib/display.lib.php

@@ -1,6 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use ChamiloSession as Session;
+
 /**
  * Class Display
  *
@@ -803,16 +805,19 @@ class Display
 
         // Checking the theme icons folder example: main/css/chamilo/icons/XXX
         if (is_file($code_path.$theme.$size_extra.$image)) {
-            $icon = $w_code_path.$theme.$size_extra.$image;
+            $icon = $theme.$size_extra.$image;
         } elseif (is_file($code_path.'icons/'.$size_extra.$image)) {
             //Checking the main/img/icons/XXX/ folder
-            $icon = $w_code_path.'icons/'.$size_extra.$image;
+            $icon = 'icons/'.$size_extra.$image;
         } else {
             //Checking the img/ folder
-            $icon = $w_code_path.$image;
+            $icon = $image;
         }
 
-        $icon = api_get_cdn_path($icon);
+        $icon = 'ChamiloLMS/img/'.$icon;
+
+        $icon = Session::getAsset()->getUrl($icon);
+        //$icon = api_get_cdn_path($icon);
         if ($return_only_path) {
             return $icon;
         }

+ 2 - 2
main/inc/lib/event_email_template.class.php

@@ -106,13 +106,13 @@ class EventEmailTemplate extends Model {
     public function save($params) {
 	    $id = parent::save($params);
 	    if (!empty($id)) {
-	    	event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+	    	Event::addEvent(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
    		}
    		return $id;
     }
 
     public function delete($id) {
 	    parent::delete($id);
-	    event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+	    Event::addEvent(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
     } */
 }

File diff suppressed because it is too large
+ 1146 - 999
main/inc/lib/events.lib.inc.php


+ 2 - 2
main/inc/lib/grade_model.lib.php

@@ -249,7 +249,7 @@ class GradeModel extends Model
             }
         }
 
-        //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+        //Event::addEvent(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
         return $id;
     }
 
@@ -282,7 +282,7 @@ class GradeModel extends Model
     public function delete($id)
     {
         parent::delete($id);
-        //event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+        //Event::addEvent(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
     }
 
     public function fill_grade_model_select_in_form(&$form, $name = 'gradebook_model_id', $default_value = null)

+ 2 - 2
main/inc/lib/promotion.lib.php

@@ -205,7 +205,7 @@ class Promotion extends Model
     public function save($params, $show_query = false) {
     	$id = parent::save($params, $show_query);
     	if (!empty($id)) {
-    		event_system(LOG_PROMOTION_CREATE, LOG_PROMOTION_ID, $id, api_get_utc_datetime(), api_get_user_id());
+    		Event::addEvent(LOG_PROMOTION_CREATE, LOG_PROMOTION_ID, $id, api_get_utc_datetime(), api_get_user_id());
     	}
     	return $id;
     }
@@ -214,7 +214,7 @@ class Promotion extends Model
     {
     	if (parent::delete($id)) {
             SessionManager::clear_session_ref_promotion($id);
-    	    event_system(LOG_PROMOTION_DELETE, LOG_PROMOTION_ID, $id, api_get_utc_datetime(), api_get_user_id());
+    	    Event::addEvent(LOG_PROMOTION_DELETE, LOG_PROMOTION_ID, $id, api_get_utc_datetime(), api_get_user_id());
         } else {
             return false;
         }

+ 4 - 4
main/inc/lib/sessionmanager.lib.php

@@ -100,7 +100,7 @@ class SessionManager
             UrlManager::add_session_to_url($session_id, $access_url_id);
 
             // Add event to system log
-            event_system(LOG_SESSION_CREATE, LOG_SESSION_ID, $session_id, api_get_utc_datetime(), api_get_user_id());
+            Event::addEvent(LOG_SESSION_CREATE, LOG_SESSION_ID, $session_id, api_get_utc_datetime(), api_get_user_id());
 
             if (isset($params['course_code'])) {
                 $courseInfo = api_get_course_info($params['course_code']);
@@ -755,7 +755,7 @@ class SessionManager
         */
         // Add event to system log
         $user_id = api_get_user_id();
-        event_system(LOG_SESSION_DELETE, LOG_SESSION_ID, $id_checked, api_get_utc_datetime(), $user_id);
+        Event::addEvent(LOG_SESSION_DELETE, LOG_SESSION_ID, $id_checked, api_get_utc_datetime(), $user_id);
     }
 
      /**
@@ -1305,7 +1305,7 @@ class SessionManager
         $id_session = Database::insert_id();
         // Add event to system log
         $user_id = api_get_user_id();
-        event_system(LOG_SESSION_CATEGORY_CREATE, LOG_SESSION_CATEGORY_ID, $id_session, api_get_utc_datetime(), $user_id);
+        Event::addEvent(LOG_SESSION_CATEGORY_CREATE, LOG_SESSION_CATEGORY_ID, $id_session, api_get_utc_datetime(), $user_id);
         return $id_session;
     }
 
@@ -1404,7 +1404,7 @@ class SessionManager
         // Add event to system log
         $user_id = api_get_user_id();
 
-        event_system(LOG_SESSION_CATEGORY_DELETE, LOG_SESSION_CATEGORY_ID, $id_checked, api_get_utc_datetime(), $user_id);
+        Event::addEvent(LOG_SESSION_CATEGORY_DELETE, LOG_SESSION_CATEGORY_ID, $id_checked, api_get_utc_datetime(), $user_id);
 
 
         // delete extra session fields where field variable is "PERIODO"

+ 18 - 14
main/inc/lib/social.lib.php

@@ -352,15 +352,13 @@ class SocialManager extends UserManager
      */
     public static function get_user_feeds($user, $limit = 5)
     {
-        if (!function_exists('fetch_rss')) {
-            return '';
-        }
-        $feeds = array();
-        $feed = UserManager::get_extra_user_data_by_field($user,'rssfeeds');
+        $feed = UserManager::get_extra_user_data_by_field($user, 'rssfeeds');
+
         if (empty($feed)) {
             return '';
         }
-        $feeds = explode(';',$feed['rssfeeds']);
+        $feeds = explode(';', $feed['rssfeeds']);
+
         if (count($feeds) == 0) {
             return '';
         }
@@ -369,22 +367,28 @@ class SocialManager extends UserManager
             if (empty($url)) {
                 continue;
             }
-            $rss = @fetch_rss($url);
+
+            $rss = Zend\Feed\Reader\Reader::import($url);
+
             $i = 1;
-            if (!empty($rss->items)) {
+            if (!empty($rss)) {
                 $icon_rss = '';
                 if (!empty($feed)) {
-                    $icon_rss = Display::url(Display::return_icon('rss.png', '', array(), 32), Security::remove_XSS($feed['rssfeeds']), array('target'=>'_blank'));
+                    $icon_rss = Display::url(
+                        Display::return_icon('rss.png', '', array(), 32),
+                        Security::remove_XSS($feed['rssfeeds']), array('target'=>'_blank')
+                    );
                 }
-                $res .= '<h2>'.$rss->channel['title'].''.$icon_rss.'</h2>';
+                $res .= '<h2>'.$rss->getTitle().''.$icon_rss.'</h2>';
                 $res .= '<div class="social-rss-channel-items">';
-                foreach ($rss->items as $item) {
+                /** @var Zend\Feed\Reader\Extension\Atom\Entry $item */
+                foreach ($rss as $item) {
                     if ($limit >= 0 and $i > $limit) {
                         break;
                     }
-                    $res .= '<h3><a href="'.$item['link'].'">'.$item['title'].'</a></h3>';
-                    $res .= '<div class="social-rss-item-date">'.api_get_datetime($item['date_timestamp']).'</div>';
-                    $res .= '<div class="social-rss-item-content">'.$item['description'].'</div><br />';
+                    $res .= '<h3><a href="'.$item->getTitle().'">'.$item->getTitle().'</a></h3>';
+                    $res .= '<div class="social-rss-item-date">'.$item->getDateCreated()->format('Y-m-d').'</div>';
+                    $res .= '<div class="social-rss-item-content">'.$item->getDescription().'</div><br />';
                     $i++;
                 }
                 $res .= '</div>';

+ 63 - 63
main/inc/lib/timeline.lib.php

@@ -13,82 +13,82 @@ define('TIMELINE_STATUS_INACTIVE', '2');
 /**
  * Timeline model class definition
  */
-class Timeline extends Model {    
+class Timeline extends Model {
     var $table;
     var $columns = array('headline', 'type', 'start_date', 'end_date', 'text', 'media', 'media_credit', 'media_caption', 'title_slide', 'parent_id', 'status','c_id');
     var $is_course_model = true;
-    
+
 	public function __construct() {
         $this->table =  Database::get_course_table(TABLE_TIMELINE);
-	}    
-    
+	}
+
     /**
      * Get the count of elements
      */
-    public function get_count() {        
+    public function get_count() {
         $course_id = api_get_course_int_id();
         $row = Database::select('count(*) as count', $this->table, array('where' => array('parent_id = ? AND c_id = ?' => array('0', $course_id))), 'first');
         return $row['count'];
-    }     
-    
-    public function get_all($where_conditions = array()) {        
+    }
+
+    public function get_all($where_conditions = array()) {
         return Database::select('*',$this->table, array('where'=>$where_conditions,'order' =>'headline ASC'));
     }
-    
+
     /**
      * Displays the title + grid
      */
 	public function listing() {
 		// action links
 		$html .= '<div class="actions">';
-        //$html .= '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';     	
-		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';        				
+        //$html .= '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';
+		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
 		$html .= '</div>';
-        $html .= Display::grid_html('timelines');  
+        $html .= Display::grid_html('timelines');
         return $html;
 	}
-    
+
     public function get_status_list() {
         return array(TIMELINE_STATUS_ACTIVE => get_lang('Active'), TIMELINE_STATUS_INACTIVE => get_lang('Inactive'));
     }
-    
+
     /**
      * Returns a Form validator Obj
      * @todo the form should be auto generated
      * @param   string  url
      * @param   string  action add, edit
-     * @return  obj     form validator obj 
+     * @return  obj     form validator obj
      */
     public function return_form($url, $action) {
         $form = new FormValidator('timeline', 'post', $url);
         // Setting the form elements
-        $header = get_lang('Add');        
+        $header = get_lang('Add');
         if ($action == 'edit') {
             $header = get_lang('Modify');
-        }        
+        }
         $form->addElement('header', $header);
         $id = isset($_GET['id']) ? intval($_GET['id']) : '';
         $form->addElement('hidden', 'id', $id);
-        
+
         $form->addElement('text', 'headline', get_lang('Name'), array('size' => '70'));
-        //$form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'careers','Width' => '100%', 'Height' => '250'));	   
-	    $status_list = $this->get_status_list();         
+        //$form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'careers','Width' => '100%', 'Height' => '250'));
+	    $status_list = $this->get_status_list();
         $form->addElement('select', 'status', get_lang('Status'), $status_list);
         if ($action == 'edit') {
             //$form->addElement('text', 'created_at', get_lang('CreatedAt'));
             //$form->freeze('created_at');
-        }                
+        }
         if ($action == 'edit') {
         	$form->addElement('style_submit_button', 'submit', get_lang('Modify'), 'class="save"');
         } else {
         	$form->addElement('style_submit_button', 'submit', get_lang('Add'), 'class="save"');
         }
-        
+
         $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required');
-    
+
         // Setting the defaults
         $defaults = $this->get($id);
-        
+
         /*if (!empty($defaults['created_at'])) {
         	$defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
         }
@@ -96,27 +96,27 @@ class Timeline extends Model {
         	$defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
         }*/
         $form->setDefaults($defaults);
-    
+
         // Setting the rules
-        $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required');               
-		return $form;                                
+        $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required');
+		return $form;
     }
-    
-    public function return_item_form($url, $action) {	
-        
+
+    public function return_item_form($url, $action) {
+
         $form = new FormValidator('item_form', 'post', $url);
         // Settting the form elements
-        $header = get_lang('Add');        
+        $header = get_lang('Add');
         if ($action == 'edit') {
             $header = get_lang('Modify');
-        }        
+        }
         $form->addElement('header', $header);
         $id = isset($_GET['id']) ? intval($_GET['id']) : '';
         $parent_id = isset($_GET['parent_id']) ? intval($_GET['parent_id']) : '';
-        $form->addElement('hidden', 'parent_id', $parent_id);      
+        $form->addElement('hidden', 'parent_id', $parent_id);
         $form->addElement('hidden', 'id', $id);
         $form->addElement('text', 'headline', get_lang('Name'), array('class' => 'span4'));
-        
+
         //@todo fix this
         $form->addElement('text', 'start_date', get_lang('StartDate'), array('size' => '70'));
         $form->addElement('text', 'end_date', get_lang('EndDate'), array('size' => '70'));
@@ -125,13 +125,13 @@ class Timeline extends Model {
         $form->addElement('text', 'media_caption', get_lang('TimelineItemMediaCaption'), array('size' => '70'));
         $form->addElement('text', 'media_credit', get_lang('TimelineItemMediaCredit'), array('size' => '70'));
         $form->addElement('text', 'title_slide', get_lang('TimelineItemTitleSlide'), array('size' => '70'));
-        
+
         $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required');
         $form->addRule('start_date', get_lang('ThisFieldIsRequired'), 'required');
-       
-        
-        //$form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'careers','Width' => '100%', 'Height' => '250'));	   
-	    
+
+
+        //$form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'careers','Width' => '100%', 'Height' => '250'));
+
         if ($action == 'edit') {
             // Setting the defaults
             $defaults = $this->get($id);
@@ -139,7 +139,7 @@ class Timeline extends Model {
         } else {
         	$form->addElement('style_submit_button', 'submit', get_lang('Add'), 'class="save"');
         }
-        
+
         /*if (!empty($defaults['created_at'])) {
         	$defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
         }
@@ -147,51 +147,51 @@ class Timeline extends Model {
         	$defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
         }*/
         $form->setDefaults($defaults);
-    
+
         // Setting the rules
-        $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required');               
-		return $form; 
-        
+        $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required');
+		return $form;
+
     }
-    
+
     public function save_item($params) {
-        $params['c_id'] = api_get_course_int_id();        
+        $params['c_id'] = api_get_course_int_id();
 	    $id = parent::save($params);
 	    if (!empty($id)) {
-	    	//event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+	    	//Event::addEvent(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
    		}
-   		return $id;   
+   		return $id;
     }
-    
+
     public function save($params) {
         $params['c_id'] = api_get_course_int_id();
         $params['parent_id'] = '0';
         $params['type'] = 'default';
 	    $id = parent::save($params);
 	    if (!empty($id)) {
-	    	//event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+	    	//Event::addEvent(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
    		}
    		return $id;
     }
-    
+
     public function delete($id) {
 	    parent::delete($id);
-	    //event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+	    //Event::addEvent(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
     }
-    
+
     public function get_url($id) {
         return api_get_path(WEB_AJAX_PATH).'timeline.ajax.php?a=get_timeline_content&id='.intval($id);
     }
-    
+
     public function get_timeline_content($id) {
         $timeline = array();
         $course_id = api_get_course_int_id();
-        $timeline['timeline'] = $this->process_item($this->get($id));        
-        $items = $this->process_items($this->get_all(array('parent_id = ? AND c_id = ? ' =>array($id, $course_id))));                
+        $timeline['timeline'] = $this->process_item($this->get($id));
+        $items = $this->process_items($this->get_all(array('parent_id = ? AND c_id = ? ' =>array($id, $course_id))));
         $timeline['timeline']['date'] = $items;
         return $timeline;
     }
-    
+
     function process_items($items) {
         foreach ($items as &$item) {
             $item = $this->process_item($item);
@@ -208,15 +208,15 @@ class Timeline extends Model {
         if (!empty($item['end_date'])) {
             $item['endDate'] = $item['end_date'];
         } else {
-            unset($item['endDate']);            
+            unset($item['endDate']);
         }
         unset($item['end_date']);
         // Assets
         $item['asset'] = array( 'media'     => $item['media'],
-                                'credit'    => $item['media_credit'],  
-                                'caption'   => $item['media_caption'],  
+                                'credit'    => $item['media_credit'],
+                                'caption'   => $item['media_caption'],
          );
-        
+
         //Cleaning items
         unset($item['id']);
         if (empty($item['type'])) {
@@ -227,8 +227,8 @@ class Timeline extends Model {
         unset($item['media_caption']);
         unset($item['status']);
         unset($item['title_slide']);
-        unset($item['parent_id']);        
+        unset($item['parent_id']);
         unset($item['c_id']);
-        return $item;        
+        return $item;
     }
 }

+ 10 - 10
main/inc/lib/usermanager.lib.php

@@ -174,8 +174,8 @@ class UserManager
             // Add event to system log
             $user_id_manager = api_get_user_id();
             $user_info = api_get_user_info($user_id);
-            event_system(LOG_USER_CREATE, LOG_USER_ID, $user_id, api_get_utc_datetime(), $user_id_manager);
-            event_system(LOG_USER_CREATE, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), $user_id_manager);
+            Event::addEvent(LOG_USER_CREATE, LOG_USER_ID, $user_id, api_get_utc_datetime(), $user_id_manager);
+            Event::addEvent(LOG_USER_CREATE, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), $user_id_manager);
             return $user_info;
         } else {
             return api_set_failure('error inserting in Database');
@@ -379,8 +379,8 @@ class UserManager
             // Add event to system log
             $user_id_manager = api_get_user_id();
             $user_info = api_get_user_info($return);
-            event_system(LOG_USER_CREATE, LOG_USER_ID, $return, api_get_utc_datetime(), $user_id_manager);
-            event_system(LOG_USER_CREATE, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), $user_id_manager);
+            Event::addEvent(LOG_USER_CREATE, LOG_USER_ID, $return, api_get_utc_datetime(), $user_id_manager);
+            Event::addEvent(LOG_USER_CREATE, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), $user_id_manager);
         } else {
             return api_set_failure('error inserting in Database');
         }
@@ -567,8 +567,8 @@ class UserManager
         unset($sqlw);
         // Add event to system log
         $user_id_manager = api_get_user_id();
-        event_system(LOG_USER_DELETE, LOG_USER_ID, $user_id, api_get_utc_datetime(), $user_id_manager, null, $user_info);
-        event_system(LOG_USER_DELETE, LOG_USER_OBJECT, implode(';',$user_info), api_get_utc_datetime(), $user_id_manager, null, $user_info);
+        Event::addEvent(LOG_USER_DELETE, LOG_USER_ID, $user_id, api_get_utc_datetime(), $user_id_manager, null, $user_info);
+        Event::addEvent(LOG_USER_DELETE, LOG_USER_OBJECT, implode(';',$user_info), api_get_utc_datetime(), $user_id_manager, null, $user_info);
         return true;
     }
 
@@ -817,8 +817,8 @@ class UserManager
         }
 
         $user_info = api_get_user_info($user_id);
-        event_system(LOG_USER_UPDATED, LOG_USER_ID, $user_id, api_get_utc_datetime(), api_get_user_id());
-        event_system(LOG_USER_UPDATED, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), api_get_user_id());
+        Event::addEvent(LOG_USER_UPDATED, LOG_USER_ID, $user_id, api_get_utc_datetime(), api_get_user_id());
+        Event::addEvent(LOG_USER_UPDATED, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), api_get_user_id());
         return $return;
     }
 
@@ -860,8 +860,8 @@ class UserManager
         }
 
         $user_info = api_get_user_info($user_id);
-        event_system($log_event, LOG_USER_ID, $user_id, api_get_utc_datetime(), api_get_user_id());
-        event_system($log_event, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), api_get_user_id());
+        Event::addEvent($log_event, LOG_USER_ID, $user_id, api_get_utc_datetime(), api_get_user_id());
+        Event::addEvent($log_event, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), api_get_user_id());
     }
 
     /**

Some files were not shown because too many files changed in this diff