[Fmsystem-commits] [10534] Move messages from admin to public

[Sigurd Nes]

Revision: 10534
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10534
Author:   sigurdne
Date:     2012-11-25 20:53:51 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
Move messages from admin to public

Modified Paths:
--------------
    trunk/admin/inc/hook_after_navbar.inc.php
    trunk/phpgwapi/templates/portico/navbar.inc.php

Modified: trunk/admin/inc/hook_after_navbar.inc.php
===================================================================
--- trunk/admin/inc/hook_after_navbar.inc.php   2012-11-25 20:51:43 UTC (rev 
10533)
+++ trunk/admin/inc/hook_after_navbar.inc.php   2012-11-25 20:53:51 UTC (rev 
10534)
@@ -97,6 +97,7 @@
                }
        }
        
+/*
        if( phpgw::get_var('phpgw_return_as') != 'json' && $receipt = 
phpgwapi_cache::session_get('phpgwapi', 'phpgw_messages'))
        {
                phpgwapi_cache::session_clear('phpgwapi', 'phpgw_messages');
@@ -105,8 +106,8 @@
                foreach($msgbox_data as & $message)
                {
                        echo "<div class='{$message['msgbox_class']}'>";
-//                     echo "<img src='{$message['msgbox_img']}' 
alt='{$message['msgbox_img_alt']}' title='{$message['msgbox_img_alt']}'/>";
                        echo $message['msgbox_text'];
                        echo '</div>';
                }
        }
+*/

Modified: trunk/phpgwapi/templates/portico/navbar.inc.php
===================================================================
--- trunk/phpgwapi/templates/portico/navbar.inc.php     2012-11-25 20:51:43 UTC 
(rev 10533)
+++ trunk/phpgwapi/templates/portico/navbar.inc.php     2012-11-25 20:53:51 UTC 
(rev 10534)
@@ -150,6 +150,19 @@
                }
 
 
+               if( phpgw::get_var('phpgw_return_as') != 'json' && $receipt = 
phpgwapi_cache::session_get('phpgwapi', 'phpgw_messages'))
+               {
+                       phpgwapi_cache::session_clear('phpgwapi', 
'phpgw_messages');
+                       $msgbox_data = 
$GLOBALS['phpgw']->common->msgbox_data($receipt);
+                       $msgbox_data = 
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
+                       foreach($msgbox_data as & $message)
+                       {
+                               echo "<div class='{$message['msgbox_class']}'>";
+                               echo $message['msgbox_text'];
+                               echo '</div>';
+                       }
+               }
+
                $GLOBALS['phpgw']->hooks->process('after_navbar');
                register_shutdown_function('parse_footer_end');
        }