Changeset 2328:7a47f5c5909c for inc/admin/lib.dc.page.php

Timestamp:

10/10/13 14:11:56 (12 years ago)

Author:

Dsls

Branch:

default

Message:

Display notifications chronologically, add options to methods (timestamp or not, div or p)

File:

• inc/admin/lib.dc.page.php (modified) (3 diffs)

inc/admin/lib.dc.page.php

@@ -17 +17 @@
 {
      private static $loaded_js=array();
+     private static $N_TYPES = array(
+          "success" => "success", 
+          "warning" => "warning-msg", 
+          "error" => "error", 
+          "message" => "message", 
+          "static" => "static-msg");
 
      # Auth check
@@ -186 +192 @@
           $res = '';
           if (isset($_SESSION['notifications'])) {
-               $types = array("success" => "success", "warning" => "warning-msg", "error" => "error");
                $notifications = $_SESSION['notifications'];
-               foreach ($types as $type => $class) {
-                    if (isset($notifications[$type])) {
-                         foreach ($notifications[$type] as $n) {
-                              $res .= self::getNotification($n,$class);
-                         }
-                    }
+               foreach ($_SESSION['notifications'] as $notification) {
+                    $res .= self::getNotification($notification);
                }
                unset($_SESSION['notifications']);
@@ -200 +201 @@
      }
 
-     public static function addNotice($type,$message)
-     {
-          $notification = isset($_SESSION['notifications']) ? $_SESSION['notifications'] : array();
-          $notification[$type][] = array('ts' => time(), 'text' => $message);
-          $_SESSION['notifications'] = $notification;
-     }
-
-     public static function addSuccessNotice($message)
-     {
-          self::addNotice("success",$message);
-     }
-
-     public static function addWarningNotice($message)
-     {
-          self::addNotice("warning",$message);
-     }
-
-     public static function addErrorNotice($message)
-     {
-          self::addNotice("error",$message);
-     }
-
-     protected static function getNotification($msg,$class)
+     public static function addNotice($type,$message,$options=array())
+     {
+          if (isset(self::$N_TYPES[$type])){
+               $class = self::$N_TYPES[$type];
+          } else {
+               $class=$type;
+          }
+          if (isset($_SESSION['notifications']) && is_array($_SESSION['notifications'])) {
+               $notifications = $_SESSION['notifications'];
+          } else {
+               $notifications = array();
+          }
+          
+          $n = array_merge($options,array('class' => $class,'ts' => time(), 'text' => $message));
+          if ($type != "static") {
+               $notifications[] = $n;
+          } else {
+               array_unshift($notifications, $n);
+          }
+          $_SESSION['notifications'] = $notifications;
+     }
+
+     public static function addSuccessNotice($message,$options=array())
+     {
+          self::addNotice("success",$message,$options);
+     }
+
+     public static function addWarningNotice($message,$options=array())
+     {
+          self::addNotice("warning",$message,$options);
+     }
+
+     public static function addErrorNotice($message,$options=array())
+     {
+          self::addNotice("error",$message,$options);
+     }
+
+     protected static function getNotification($n)
      {
           global $core;
-
-          $res = '<p class="'.$class.'">'.dt::str(__('[%H:%M:%S]'),$msg['ts'],$core->auth->getInfo('user_tz')).' '.$msg['text'].'</p>';
+          $tag = (isset($n['divtag'])&& $n['divtag'])?'div':'p';
+          $ts = '';
+          if (!isset($n['with_ts']) || ($n['with_ts'] == true)) {
+               $ts = dt::str(__('[%H:%M:%S]'),$n['ts'],$core->auth->getInfo('user_tz')).' ';
+          }
+          $res = '<'.$tag.' class="'.$n['class'].'">'.$ts.$n['text'].'</'.$tag.'>';
           return $res;
      }