Changeset 18463

Timestamp:

Oct 4, 2012, 6:03:25 PM (12 years ago)

Author:

mistic100

Message:

feature 2761: Pass all kind of messages through session on admin

Location:

trunk

Files:

• admin.php (modified) (3 diffs)
• include/common.inc.php (modified) (1 diff)
• include/page_messages.php (modified) (1 diff)

trunk/admin.php

@@ -155 +155 @@
 {
   $page['page'] = 'intro';
-}
-
-$page['errors'] = array();
-$page['infos']  = array();
-$page['warnings']  = array();
-
-if (isset($_SESSION['page_infos']))
-{
-  $page['infos'] = array_merge($page['infos'], $_SESSION['page_infos']);
-  unset($_SESSION['page_infos']);
 }
 
@@ -291 +281 @@
 include(PHPWG_ROOT_PATH.'admin/'.$page['page'].'.php');
 
-// +-----------------------------------------------------------------------+
-// | Errors, Infos & Warnings                                              |
-// +-----------------------------------------------------------------------+
-
 $template->assign('ACTIVE_MENU', get_active_menu($page['page']));
-
-if (count($page['errors']) != 0)
-{
-  $template->assign('errors', $page['errors']);
-}
-
-if (count($page['infos']) != 0)
-{
-  $template->assign('infos', $page['infos']);
-}
-
-if (count($page['warnings']) != 0)
-{
-  $template->assign('warnings', $page['warnings']);
-}
 
 // +-----------------------------------------------------------------------+
@@ -323 +294 @@
 trigger_action('loc_end_admin');
 
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
+
 $template->pparse('admin');
 

trunk/include/common.inc.php

@@ -65 +65 @@
   'infos' => array(),
   'errors' => array(),
+  'warnings' => array(),
   );
 $user = array();

trunk/include/page_messages.php

@@ -25 +25 @@
 if ($template->get_template_vars('page_refresh') === null)
 {
-  foreach (array('errors','infos') as $mode)
+  foreach (array('errors','infos','warnings') as $mode)
   {
     if (isset($_SESSION['page_'.$mode]))