[Phpgroupware-cvs] email addressbook-js.php, 1.2.2.2 addressbook.php, 1.38.2.4

[skwashd]

Update of email

Modified Files:
     Branch: Version-0_9_16-branch
            addressbook-js.php lines: +10 -7
            addressbook.php lines: +6 -3

Log Message:
fix bug #14829, also present in jsaddy and some globals/php5 issues in the 
jsaddy popup

====================================================
Index: email/addressbook-js.php
diff -u email/addressbook-js.php:1.2.2.1 email/addressbook-js.php:1.2.2.2
--- email/addressbook-js.php:1.2.2.1    Sat Nov  6 16:13:42 2004
+++ email/addressbook-js.php    Thu Dec  8 09:35:56 2005
@@ -48,12 +48,12 @@
        they something was selected on them and we, for example, clicked on a 
name and, thus, submited the form.
        We need to keep all values in this boxes. This is why the js code 
autoselects all of the options
        just before submiting. BTW, this should come in post allways but its a 
good practice to allways try and
-       get from both. Good thing about get_var in 0.9.15.
+       get from both.
 */
-       $toselectbox=$GLOBALS['HTTP_POST_VARS']['toselectbox']? 
$GLOBALS['HTTP_POST_VARS']['toselectbox'] : 
$GLOBALS['HTTP_GET_VARS']['toselectbox'];
-       $ccselectbox=$GLOBALS['HTTP_POST_VARS']['ccselectbox']? 
$GLOBALS['HTTP_POST_VARS']['ccselectbox'] : 
$GLOBALS['HTTP_GET_VARS']['ccselectbox'];
-       $bccselectbox=$GLOBALS['HTTP_POST_VARS']['bccselectbox']? 
$GLOBALS['HTTP_POST_VARS']['bccselectbox'] : 
$GLOBALS['HTTP_GET_VARS']['bccselectbox'];
-       $nameselect  = $GLOBALS['HTTP_POST_VARS']['nameselect'] ? 
$GLOBALS['HTTP_POST_VARS']['nameselect'] : 
$GLOBALS['HTTP_GET_VARS']['nameselect'];
+       $toselectbox    = $_REQUEST['toselectbox'];
+       $ccselectbox    = $_REQUEST['ccselectbox'];
+       $bccselectbox   = $_REQUEST['bccselectbox'];
+       $nameselect     = $_REQUEST['nameselect'];

 /*     Block initialization... u see why i got the previous variables first 
dont you? */
        
$GLOBALS['phpgw']->template->set_block('addressbook_names_t','addressbook_names','list');
@@ -118,8 +118,11 @@
        }
 /*     This is needed indeed */
        $d = CreateObject('phpgwapi.contacts');
+
+       //We do it this way so the cats class gets the right rights, alright? - 
skwashd Dec-2005
+       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'addressbook';
        $c = CreateObject('phpgwapi.categories');
-       $c->app_name = 'addressbook';
+       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'email';

 /*     I honestly dont know where this comes from but its strangely familiar */
        // (angles) the original address book didnot xfer the persson's name 
AND email address, only their email address

====================================================
Index: email/addressbook.php
diff -u email/addressbook.php:1.38.2.3 email/addressbook.php:1.38.2.4
--- email/addressbook.php:1.38.2.3      Fri Oct 17 05:21:12 2003
+++ email/addressbook.php       Thu Dec  8 09:35:56 2005
@@ -28,9 +28,12 @@
        
$GLOBALS['phpgw']->template->set_block('addressbook_list_t','addressbook_list','list');

        $d = CreateObject('phpgwapi.contacts');
-       $c = CreateObject('phpgwapi.categories');
-       $c->app_name = 'addressbook';

+       //We do it this way so the cats class gets the right rights, alright? - 
skwashd Dec-2005
+       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'addressbook';
+       $c = CreateObject('phpgwapi.categories');
+       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'email';
+
        $include_personal = True;

        $charset = $GLOBALS['phpgw']->translation->translate('charset');