gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user deliver.php.in, 1.4, 1.5
cvs at kolab.org
cvs at kolab.org
Tue Apr 6 11:00:36 CEST 2010
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv24547/kolab-webadmin/www/admin/user
Modified Files:
deliver.php.in
Log Message:
The new handler reads the old delivery script just fine.
Index: deliver.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- deliver.php.in 31 Mar 2010 19:55:10 -0000 1.4
+++ deliver.php.in 6 Apr 2010 09:00:34 -0000 1.5
@@ -21,7 +21,12 @@
require_once '@kolab_php_module_prefix at admin/include/mysmarty.php';
require_once '@kolab_php_module_prefix at admin/include/headers.php';
require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
+require_once 'KolabAdmin/Sieve.php';
require_once 'KolabAdmin/Sieve/Script.php';
+require_once 'KolabAdmin/Sieve/Segment.php';
+require_once 'KolabAdmin/Sieve/Segment/Delivery.php';
+require_once 'KolabAdmin/Sieve/Segment/Forward.php';
+require_once 'KolabAdmin/Sieve/Segment/Vacation.php';
// Funny multiline string escaping in Sieve
function dotstuff( $str ) {
@@ -79,15 +84,7 @@
}
}
- $scripts = $sieve->listScripts();
- $inbox = false;
- if( in_array( $scriptname, $scripts ) ) {
- // Fetch script data from server
- $script = $sieve->getScript($scriptname);
- $inbox = KolabAdmin_Sieve_Script::getDeliverFolder( $script );
- }
- if( $inbox === false ) $inbox = 'Inbox';
- $active = ( $sieve->getActive() === $scriptname );
+ $handler = new KolabAdmin_Sieve($sieve);
}
/**** Insert into template and output ***/
@@ -101,8 +98,8 @@
$smarty->assign( 'submenuitems',
array_key_exists('submenu',
$menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
-$smarty->assign( 'active', $active );
-$smarty->assign( 'inbox', $inbox );
+$smarty->assign( 'active', $handler->fetchDeliverySegment()->isActive() );
+$smarty->assign( 'inbox', $handler->fetchDeliverySegment()->getDeliveryFolder() );
$smarty->assign( 'maincontent', 'deliver.tpl' );
$smarty->display('page.tpl');
More information about the commits
mailing list