[Fmsystem-commits] [6671] merge 6667:6669 from trunk

[Sigurd Nes]

Revision: 6671
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6671
Author:   sigurdne
Date:     2010-12-14 08:27:53 +0000 (Tue, 14 Dec 2010)
Log Message:
-----------
merge 6667:6669 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/booking/inc/class.bomassbooking.inc.php
    branches/Version-1_0-branch/booking/inc/class.uimassbooking.inc.php
    branches/Version-1_0-branch/logout.php
    branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669

Modified: branches/Version-1_0-branch/booking/inc/class.bomassbooking.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.bomassbooking.inc.php 
2010-12-13 14:11:17 UTC (rev 6670)
+++ branches/Version-1_0-branch/booking/inc/class.bomassbooking.inc.php 
2010-12-14 08:27:53 UTC (rev 6671)
@@ -1,7 +1,7 @@
 <?php
-       phpgw::import_class('booking.bocommon_authorized');
+       phpgw::import_class('booking.bocommon');
        
-       class booking_bomassbooking extends booking_bocommon_authorized
+       class booking_bomassbooking extends booking_bocommon
        {
                function __construct()
                {
@@ -9,50 +9,6 @@
                        $this->so = CreateObject('booking.somassbooking');
                }
                
-               protected function get_object_role_permissions(array 
$forObject, $defaultPermissions)
-               {
-                       return array_merge(
-                               array
-                               (
-                                       booking_sopermission::ROLE_MANAGER => 
array
-                                       (
-                                               'write' => true,
-                                       ),
-                                       booking_sopermission::ROLE_CASE_OFFICER 
=> array
-                                       (
-                                               'write' => 
array_fill_keys(array('name', 'homepage', 'description', 'email', 'phone', 
'street', 'zip_code', 'city', 'district'), true),
-                                       ),
-                                       'global' => array
-                                       (
-                                               
booking_sopermission::ROLE_MANAGER => array
-                                               (
-                                                       'read' => true,
-                                                       'write' => true,
-                                                       'create' => true,
-                                                       'delete' => true,
-                                               ),
-                                       )
-                               ),
-                               $defaultPermissions
-                       );
-               }
-               
-               protected function 
get_collection_role_permissions($defaultPermissions)
-               {
-                       return array_merge(
-                               array(
-                                       'global' => array
-                                       (
-                                               
booking_sopermission::ROLE_MANAGER => array
-                                               (
-                                                       'create' => true, 
#means that this role may create new objects of the present type
-                                                       'delete' => true,
-                                               ),
-                                       ),
-                               ),
-                               $defaultPermissions
-                       );
-               }
 
                public function get_schedule($id, $module)
                {

Modified: branches/Version-1_0-branch/booking/inc/class.uimassbooking.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uimassbooking.inc.php 
2010-12-13 14:11:17 UTC (rev 6670)
+++ branches/Version-1_0-branch/booking/inc/class.uimassbooking.inc.php 
2010-12-14 08:27:53 UTC (rev 6671)
@@ -22,11 +22,9 @@
                {
                        parent::__construct();
                        
-                       self::process_booking_unauthorized_exceptions();
                        
                        $this->bo = CreateObject('booking.bomassbooking');
                        
self::set_active_menu('booking::applications::massboooking');
-                       $this->fields = array('name', 'homepage', 
'description', 'email', 'street', 'zip_code', 'city', 'district', 'phone', 
'active', 'location_code');
                }
                                
                public function index()

Modified: branches/Version-1_0-branch/logout.php
===================================================================
--- branches/Version-1_0-branch/logout.php      2010-12-13 14:11:17 UTC (rev 
6670)
+++ branches/Version-1_0-branch/logout.php      2010-12-14 08:27:53 UTC (rev 
6671)
@@ -44,7 +44,7 @@
                        
rmdir("{$GLOBALS['phpgw_info']['server']['temp_dir']}/{$sessionid}");
                        $dh->close();
                }
-               execMethod('phpgwapi.menu.clear');
+//             execMethod('phpgwapi.menu.clear'); // moved to hook for login
                $GLOBALS['phpgw']->hooks->process('logout');
                $GLOBALS['phpgw']->session->destroy($sessionid);
        }

Modified: branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php    2010-12-13 
14:11:17 UTC (rev 6670)
+++ branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php    2010-12-14 
08:27:53 UTC (rev 6671)
@@ -71,10 +71,10 @@
 
        $setup_info['phpgwapi']['hooks'] = array
        (
-               'menu'  => 'phpgwapi.menu_apps.get_menu'
+               'menu'  => 'phpgwapi.menu_apps.get_menu',
+               'login' => 'phpgwapi.menu.clear'
        );
 
-
        // Basic information about this app
        $setup_info['notifywindow']['name']                     = 
'notifywindow';
        $setup_info['notifywindow']['title']            = 'Notify Window';