[Phpgroupware-cvs] email addressbook-js.php addressbook.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    email
Branch:         
Changes by:     Dave Hall <address@hidden>      05/12/17 13:24:25

Modified files:
        .              : addressbook-js.php addressbook.php 

Log message:
        merge fixes from 16

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/email/addressbook-js.php.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/email/addressbook.php.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: email/addressbook-js.php
diff -u email/addressbook-js.php:1.4 email/addressbook-js.php:1.5
--- email/addressbook-js.php:1.4        Wed May 11 14:08:27 2005
+++ email/addressbook-js.php    Sat Dec 17 13:24:25 2005
@@ -6,7 +6,7 @@
        * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package email
-       * @version $Id: addressbook-js.php,v 1.4 2005/05/11 14:08:27 powerstat 
Exp $
+       * @version $Id: addressbook-js.php,v 1.5 2005/12/17 13:24:25 skwashd 
Exp $
        * @internal WARNING-> The sheer size of this stupid file is what shows 
why there is a
        * @internal three tiered design in phpgw...sigh.... now im even gonna 
put some php
        * @internal functions in here.... dont be mad, be critical and show me 
how to move to
@@ -50,12 +50,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,10 +118,11 @@
                //to the rest of the code that it should use cached values
                $cachestate="clean";
        }
-/*     This is needed indeed */
-       $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';
        
 /*     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.42 email/addressbook.php:1.43
--- email/addressbook.php:1.42  Wed May 11 14:08:27 2005
+++ email/addressbook.php       Sat Dec 17 13:24:25 2005
@@ -6,7 +6,7 @@
        * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package email
-       * @version $Id: addressbook.php,v 1.42 2005/05/11 14:08:27 powerstat 
Exp $
+       * @version $Id: addressbook.php,v 1.43 2005/12/17 13:24:25 skwashd Exp $
        */
 
        $GLOBALS['phpgw_info']['flags'] = array(
@@ -28,8 +28,11 @@
        
$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;