ENH: Added log tab in admin page

Author: Charles Marion

core/AppController.php

@@ -17,7 +17,12 @@ public function preDispatch()
     $this->view->setEncoding('iso-8859-1');
 
     $fc=Zend_Controller_Front::getInstance();
-    $this->getLogger()->setEventItem('module',$fc->getRequest()->getModuleName());
+    $module=$fc->getRequest()->getModuleName();
+    if($module=='default')
+      {
+      $module='core';
+      }
+    $this->getLogger()->setEventItem('module',$module);
     $this->view->webroot=$fc->getBaseUrl();
     $this->coreWebroot=$this->view->webroot.'/core';
     $this->view->coreWebroot=$this->coreWebroot;
@@ -146,82 +151,87 @@ protected function t($text)
   /**completion eclipse*/
   /**
    * Assetstrore Model
-   * @var AssetstoreModel
+   * @var AssetstoreModelBase
    */
   var $Assetstore;
   /**
    * Bitstream Model
-   * @var BitstreamModel
+   * @var BitstreamModelBase
    */
   var $Bitstream;
   /**
    * Community Model
-   * @var CommunityModel
+   * @var CommunityModelBase
    */
   var $Community;
+  /**
+   * Errorlog Model
+   * @var ErrorlogModelBase
+   */
+  var $Errorlog;
   /**
    * Feed Model
-   * @var FeedModel
+   * @var FeedModelBase
    */
   var $Feed;
   /**
    * Feedpolicygroup Model
-   * @var FeedpolicygroupModel
+   * @var FeedpolicygroupModelBase
    */
   var $Feedpolicygroup;
     /**
    * Feedpolicyuser Model
-   * @var FeedpolicyuserModel
+   * @var FeedpolicyuserModelBase
    */
   var $Feedpolicyuser;
   /**
    * Folder Model
-   * @var FolderModel
+   * @var FolderModelBase
    */
   var $Folder;
   /**
    * Folderpolicygroup Model
-   * @var FolderpolicygroupModel
+   * @var FolderpolicygroupModelBase
    */
   var $Folderpolicygroup;
     /**
    * Folderpolicyuser Model
-   * @var FolderpolicyuserModel
+   * @var FolderpolicyuserModelBase
    */
   var $Folderpolicyuser;
   /**
    * Group Model
-   * @var GroupModel
+   * @var GroupModelBase
    */
   var $Group;
    /**
    * ItemKeyword Model
-   * @var ItemKeywordModel
+   * @var ItemKeywordModelBase
    */
   var $ItemKeyword;
   /**
    * Item Model
-   * @var ItemModel
+   * @var ItemModelBase
    */
   var $Item;
   /**
    * Itempolicygroup Model
-   * @var ItempolicygroupModel
+   * @var ItempolicygroupModelBase
    */
   var $Itempolicygroup;
     /**
    * Itempolicyuser Model
-   * @var ItempolicyuserModel
+   * @var ItempolicyuserModelBase
    */
   var $Itempolicyuser;
   /**
    * ItemRevision Model
-   * @var ItemRevisionModel
+   * @var ItemRevisionModelBase
    */
   var $ItemRevision;
     /**
    * User Model
-   * @var UserModel
+   * @var UserModelBase
    */
   var $User;
 

core/controllers/AdminController.php

@@ -5,7 +5,7 @@
  */
 class AdminController extends AppController
 {
-  public $_models=array();
+  public $_models=array('Errorlog');
   public $_daos=array();
   public $_components=array('Upgrade','Utility');
   public $_forms=array('Admin');
@@ -54,7 +54,87 @@ function indexAction()
       }
     }//end indexAction
 
-   
+ 
+  /** show logs*/
+  function showlogAction()
+    {
+    if(!$this->logged||!$this->userSession->Dao->getAdmin()==1)
+      {
+      throw new Zend_Exception("You should be an administrator");
+      }
+    if(!$this->getRequest()->isXmlHttpRequest())
+     {
+     throw new Zend_Exception("Why are you here ? Should be ajax.");
+     }
+    $this->_helper->layout->disableLayout();
+    
+    $start=$this->_getParam("startlog");
+    $end=$this->_getParam("endlog");
+    $module=$this->_getParam("modulelog");
+    $priority=$this->_getParam("prioritylog");
+    if(!isset($start))
+      {
+      $start=date('c',strtotime("-24 hour"));
+      }
+    else
+      {
+      $start=date('c',  strtotime($start));
+      }
+    if(!isset($end))
+      {
+      $end= date('c');
+      }
+    else
+      {
+      $end=date('c',  strtotime($end));
+      }
+    if(!isset($module))
+      {
+      $module='all';
+      }
+    if(!isset($priority))
+      {
+      $priority='all';
+      }
+      
+    $logs=$this->Errorlog->getLog($start, $end,$module,$priority);
+    foreach ($logs as $key=>$log)
+      {
+      $logs[$key]=$log->_toArray();
+      if(substr($log->getMessage(), 0, 5)=='Fatal')
+        {
+        $shortMessage=substr($log->getMessage(), strpos($log->getMessage(), "[message]")+10,40);
+        }
+      elseif(substr($log->getMessage(), 0, 6)=='Server')
+        {
+        $shortMessage=substr($log->getMessage(), strpos($log->getMessage(), "Message:")+9,40);
+        }
+      else
+        {
+        $shortMessage=substr($log->getMessage(), 0,40);
+        }
+      $logs[$key]['shortMessage']=$shortMessage.' ...';
+      }
+    $this->view->jsonLogs=JsonComponent::encode($logs);
+    $this->view->jsonLogs=htmlentities($this->view->jsonLogs);
+    
+    if($this->_request->isPost())
+      {
+      $this->_helper->viewRenderer->setNoRender();
+      echo $this->view->jsonLogs;
+      return;
+      }
+      
+    $modulesConfig=Zend_Registry::get('configsModules');
+      
+    $modules=array('all','core');
+    foreach($modulesConfig as $key=>$module)
+      {
+      $modules[]=$key;
+      }    
+    $this->view->modulesLog=$modules;
+    }//showlogAction
+    
   /** upgrade database*/
   function upgradeAction()
     {

core/models/base/ErrorlogModelBase.php

@@ -11,9 +11,12 @@ public function __construct()
       'module'=> array('type'=>MIDAS_DATA),
       'message'=> array('type'=>MIDAS_DATA),
       'datetime'=> array('type'=>MIDAS_DATA),
+      'priority'=> array('type'=>MIDAS_DATA),
       );
     $this->initialize(); // required
     } // end __construct()
 
+  abstract function getLog($startDate,$endDate,$module='all',$priority='all',$limit=99999);
+  
 } // end class FeedModelBase
 ?>

core/models/dao/ErrorlogDao.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * \class ErrorlogDao
+ */
+class ErrorlogDao extends AppDao
+{
+  public $_model='Errorlog';
+
+  
+} // end class
+?>

core/models/pdo/ErrorlogModel.php

@@ -0,0 +1,47 @@
+<?php
+require_once BASE_PATH.'/core/models/base/ErrorlogModelBase.php';
+
+/**
+ * \class ErrorlogModel
+ * \brief Pdo Model
+ */
+class ErrorlogModel extends ErrorlogModelBase
+{ 
+    
+  /**
+   *  Return a list of log
+   * @param type $startDate
+   * @param type $endDate
+   * @param type $module
+   * @param type $priority
+   * @param type $limit
+   * @return array ErrorlogDao
+   */
+  function getLog($startDate,$endDate,$module='all',$priority='all',$limit=99999)
+    {
+    $result=array();
+    $sql= $this->database->select()
+            ->setIntegrityCheck(false)
+            ->from(array('e' => 'errorlog'))
+            ->where('datetime >= ?', $startDate)
+            ->where('datetime <= ?', $endDate)
+            ->order('datetime DESC')
+            ->limit($limit);
+    if($module!='all')
+      {
+      $sql->where('module = ?', $module);
+      }
+    if($priority!='all')
+      {
+      $sql->where('priority = ?', $priority);
+      }
+    $rowset = $this->database->fetchAll($sql);
+    foreach ($rowset as $keyRow=>$row)
+      {
+      $result[]= $this->initDao('Errorlog', $row);
+      }
+    return $result;
+    }//getLog
+    
+} // end class
+?>

core/public/css/admin/admin.index.css

@@ -1,3 +1,8 @@
 div.viewSideBar input.globalButton{
   margin-left: 0px!important;
+}
+
+
+div.viewWrapper {
+  padding-right: 40px !important;
 }

core/public/css/admin/admin.showlog.css

@@ -0,0 +1,3 @@
+tr.logSum{
+  cursor: pointer;
+}

core/public/js/admin/admin.showlog.js

@@ -0,0 +1,83 @@
+jsonLogs = jQuery.parseJSON($('div#jsonLogs').html());
+
+initLogs();
+
+function initLogs()
+{
+  $('table#listLogs').hide();
+  $('.logsLoading').show();
+  $('table#listLogs tr.logSum').remove();
+  $('table#listLogs tr.logDetail').remove();
+  $.each(jsonLogs, function(index, value) { 
+  var html='';
+  html+='<tr class="logSum">';
+  html+=' <td>'+value.datetime+'</td>';
+  if(value.priority==2)
+    {
+      html+=' <td><b>Critical</b></td>';
+    }
+  if(value.priority==4)
+    {
+      html+=' <td>Warning</td>';
+    }
+  if(value.priority==6)
+    {
+      html+=' <td>Info</td>';
+    }
+  html+=' <td>'+value.module+'</td>';
+  html+=' <td>'+value.shortMessage+'</td>';
+  html+='</tr>';
+  html+='<tr class="logDetail" style="display:none;">';
+  html+=' <td colspan="4"><pre>'+value.message+'</pre></td>';
+  html+='</tr>';
+  $('table#listLogs').append(html);
+  });
+  
+  $('table#listLogs').show();
+  $('.logsLoading').hide();
+  
+  $('table#listLogs tr.logSum').click(function()
+  {
+    showDialogWithContent('Log', $(this).next().html(),true);
+  });
+}
+
+
+var dates = $( "#startlog, #endlog" ).datepicker({
+			defaultDate: "-1w",
+			changeMonth: true,
+			numberOfMonths: 1,
+			onSelect: function( selectedDate ) {
+				var option = this.id == "startlog" ? "minDate" : "maxDate",
+					instance = $( this ).data( "datepicker" ),
+					date = $.datepicker.parseDate(
+						instance.settings.dateFormat ||
+						$.datepicker._defaults.dateFormat,
+						selectedDate, instance.settings );
+				dates.not( this ).datepicker( "option", option, date );
+			}
+		});
+    
+    
+$('#logSelector').ajaxForm( {beforeSubmit: validateShowlog, success:       successShowlog} );
+  
+
+
+function validateShowlog(formData, jqForm, options) { 
+ $('table#listLogs').hide();
+ $('.logsLoading').show();
+}
+
+function successShowlog(responseText, statusText, xhr, form) 
+{
+  $('div#jsonLogs').html(responseText);
+  
+  try {
+       jsonLogs = jQuery.parseJSON($('div#jsonLogs').html());
+    } catch (e) {
+      console.log(e);
+      alert("An error occured.");
+        return false;
+    }
+  initLogs();
+}