[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kolab-commits
Subject:    www/admin
From:       Jeroen van Meeuwen <vanmeeuwen () kolabsys ! com>
Date:       2011-07-14 15:56:37
Message-ID: 201107141556.p6EFubfk011066 () app01 ! kolabsys ! com
[Download RAW message or body]

 www/admin/user/deliver.php  |    7 +++++--
 www/admin/user/forward.php  |   10 +++++++---
 www/admin/user/vacation.php |   15 +++++++++------
 3 files changed, 21 insertions(+), 11 deletions(-)

New commits:
commit 05c0866e9b81eac23171a2e753a3f8fe720757f0
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
Date:   Thu Jul 14 17:56:21 2011 +0200

    Only refer to $handler if $handler is indeed set.

diff --git a/www/admin/user/deliver.php b/www/admin/user/deliver.php
index 93f738c..1c955f1 100644
--- a/www/admin/user/deliver.php
+++ b/www/admin/user/deliver.php
@@ -84,8 +84,11 @@ $smarty->assign( 'menuitems', $menuitems );
 $smarty->assign( 'submenuitems', 
 				 array_key_exists('submenu', 
 								  $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
-$smarty->assign( 'active', $handler->fetchDeliverySegment()->isActive() );
-$smarty->assign( 'inbox', $handler->fetchDeliverySegment()->getDeliveryFolder() );
+if (isset($handler)) {
+    $smarty->assign( 'active', $handler->fetchDeliverySegment()->isActive() );
+    $smarty->assign( 'inbox', $handler->fetchDeliverySegment()->getDeliveryFolder() );
+}
+
 $smarty->assign( 'maincontent', 'deliver.tpl' );
 $smarty->display('page.tpl');
 
diff --git a/www/admin/user/forward.php b/www/admin/user/forward.php
index 789ba44..e470279 100644
--- a/www/admin/user/forward.php
+++ b/www/admin/user/forward.php
@@ -86,9 +86,13 @@ $smarty->assign( 'menuitems', $menuitems );
 $smarty->assign( 'submenuitems', 
 				 array_key_exists('submenu', 
 								  $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
-$smarty->assign( 'active', $handler->fetchForwardSegment()->isActive() );
-$smarty->assign( 'keep', $handler->fetchForwardSegment()->getKeepOnServer() );
-$smarty->assign( 'address', $handler->fetchForwardSegment()->getForwardAddress() );
+
+if (isset($handler)) {
+    $smarty->assign( 'active', $handler->fetchForwardSegment()->isActive() );
+    $smarty->assign( 'keep', $handler->fetchForwardSegment()->getKeepOnServer() );
+    $smarty->assign( 'address', $handler->fetchForwardSegment()->getForwardAddress() );
+}
+
 $smarty->assign( 'maincontent', 'forward.tpl' );
 $smarty->display('page.tpl');
 
diff --git a/www/admin/user/vacation.php b/www/admin/user/vacation.php
index 3076847..f0cbac0 100644
--- a/www/admin/user/vacation.php
+++ b/www/admin/user/vacation.php
@@ -87,12 +87,15 @@ $smarty->assign( 'menuitems', $menuitems );
 $smarty->assign( 'submenuitems', 
 				 array_key_exists('submenu', 
 								  $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
-$smarty->assign( 'active', $handler->fetchVacationSegment()->isActive() );
-$smarty->assign( 'text', $handler->fetchVacationSegment()->getResponse() );
-$smarty->assign( 'addresses', $addresses );
-$smarty->assign( 'maildomain', $handler->fetchVacationSegment()->getDomain() );
-$smarty->assign( 'reacttospam', !$handler->fetchVacationSegment()->getReactToSpam() );
-$smarty->assign( 'days', $handler->fetchVacationSegment()->getResendAfter() );
+if (isset($handler)) {
+    $smarty->assign( 'active', $handler->fetchVacationSegment()->isActive() );
+    $smarty->assign( 'text', $handler->fetchVacationSegment()->getResponse() );
+    $smarty->assign( 'addresses', $addresses );
+    $smarty->assign( 'maildomain', $handler->fetchVacationSegment()->getDomain() );
+    $smarty->assign( 'reacttospam', !$handler->fetchVacationSegment()->getReactToSpam() );
+    $smarty->assign( 'days', $handler->fetchVacationSegment()->getResendAfter() );
+}
+
 $smarty->assign( 'maincontent', 'vacation.tpl' );
 $smarty->display('page.tpl');
 


_______________________________________________
kolab-commits mailing list
kolab-commits@kolab.org
https://kolab.org/mailman/listinfo/kolab-commits
[prev in list] [next in list] [prev in thread] [next in thread]