[Phpgroupware-cvs] addressbook/inc class.boaddressbook_prefs.inc.php, 1.1.2.2, 1.1.2.3 class.soaddressbook.inc.php, 1.14.2.3.2.9, 1.14.2.3.2.10 class.uiaddressbook_prefs.inc.php, 1.1.2.2, 1.1.2.3

[Alejandro Borges (lex) <address@hidden>]

Update of /cvsroot/phpgroupware/addressbook/inc
In directory subversions:/tmp/cvs-serv20156/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.boaddressbook_prefs.inc.php class.soaddressbook.inc.php 
        class.uiaddressbook_prefs.inc.php 
Log Message:
Forced/default/user Preferences working....i think



Index: class.boaddressbook_prefs.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/addressbook/inc/Attic/class.boaddressbook_prefs.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.boaddressbook_prefs.inc.php   11 Sep 2003 00:15:55 -0000      1.1.2.2
--- class.boaddressbook_prefs.inc.php   30 Sep 2003 19:27:30 -0000      1.1.2.3
***************
*** 24,31 ****
        var $preferences;
        var $person_columns;
-       var $person_comtype_descriptions;
-       var $org_comtype_descriptions;
        var $org_columns;
        var $default_category='__NONE__';
        var $public=array('read_preferences' => True);
        function boaddressbook_prefs()
--- 24,32 ----
        var $preferences;
        var $person_columns;
        var $org_columns;
        var $default_category='__NONE__';
+       var $person_columns_forced=false;
+       var $org_columns_forced=false;
+       var $default_category_forced=false;
        var $public=array('read_preferences' => True);
        function boaddressbook_prefs()
***************
*** 34,75 ****
        }
        
!       function save_preferences() 
        {
                if(is_array($this->person_columns))
                {
!                       
$this->preferences->add('addressbook','person_columns',serialize($this->person_columns));
                }
!               if(is_array($this->org_columns))
                {
!                       
$this->preferences->add('addressbook','org_columns',serialize($this->org_columns));
                }
  
!               if(is_array($this->person_comtype_descriptions))
                {
!                       
$this->preferences->add('addressbook','person_comtype_descriptions',serialize($this->person_comtype_descriptions));
                }
!               if(is_array($this->org_comtype_descriptions))
                {
!                       
$this->preferences->add('addressbook','org_comtype_descriptions',serialize($this->person_comtype_descriptions));
                }
                if($this->default_category!='__NONE__')
                {
!               /*      print "<B>DSASDADSADSADAS</B>";
!                       print $this->default_category; */
  
!                       
$this->preferences->add('addressbook','default_category',$this->default_category);
                }
!               $this->preferences->save_repository();
  
        }
!       function read_preferences() 
        {
                $this->preferences->read();
                $temp=$this->preferences->data['addressbook'];
                $this->person_columns=unserialize($temp['person_columns']);
                $this->org_columns=unserialize($temp['org_columns']);
                $this->default_category=$temp['default_category'];
!               
$this->person_comtype_descriptions=unserialize($temp['person_comtype_descriptions']);
!               
$this->org_comtype_descriptions=unserialize($temp['org_comtype_descriptions']);
        }
  
--- 35,154 ----
        }
        
!       function save_preferences($type='')  
        {
                if(is_array($this->person_columns))
                {
!                       if(count($this->person_columns) >=1 || 
!                          (
!                           isset($this->person_columns['comm_types'])
!                           &&(count($this->person_columns['comm_types'])>0)))
!                       {
!                               //print "<BR><B>count(Person )columns >= 
1".print_r($this->person_columns)."</B><BR>";
!                               
$this->preferences->add('addressbook','person_columns',serialize($this->person_columns),$type);
!                       }
!                       else
!                       {
! 
!                               //print "<BR><B>Deleting person_columns 
$type</B><BR>";
!                               
$this->preferences->delete('addressbook',"person_columns",$type);
!                               $this->remove_from_forced("person_columns");
!                       }
                }
!               else
                {
!                               
$this->preferences->delete('addressbook','person_columns',$type);
!                       $this->remove_from_forced("person_columns");
                }
  
!               if(count($this->org_columns) >=1 || 
!                          (
!                           isset($this->org_columns['comm_types'])
!                           &&(count($this->org_columns['comm_types'])>0)))
                {
!                       if(count($this->org_columns) >=1)
!                       {
! 
!                               
$this->preferences->add('addressbook','org_columns',serialize($this->org_columns),$type);
!                       }
!                       else
!                       {
!                               
$this->preferences->delete('addressbook','org_columns',$type);
! 
!                               //print "<BR><B>Deleting person_columns 
$type</B><BR>";
!                               $this->remove_from_forced("org_columns");
!                               $this->org_columns_forced=false;
!                       }
                }
!               else
                {
!                       
$this->preferences->delete('addressbook','org_columns',$type);
!                       $this->remove_from_forced("org_columns");
!                       $this->org_columns_forced=false;
                }
+ 
                if($this->default_category!='__NONE__')
                {
!                       /*      print "<B>DSASDADSADSADAS</B>";
!                               print $this->default_category; */
  
!                       
$this->preferences->add('addressbook','default_category',$this->default_category,$type);
                }
!               else
!               {
!                               
$this->preferences->delete('addressbook','default_category',$type);
!                               $this->remove_from_forced('default_category');
!               }
!               $this->preferences->save_repository(true,$type);
  
        }
!       function read_preferences($type='') 
        {
                $this->preferences->read();
                $temp=$this->preferences->data['addressbook'];
                $this->person_columns=unserialize($temp['person_columns']);
+               
$this->person_columns_forced=$this->is_forced_value('person_columns');
+               //Check that we dont reflect types that arent asked of us in 
'type'
+               if(!$this->person_columns_forced && $type=='forced')
+               {
+                       
+                       unset($this->person_columns);
+               }
+ 
                $this->org_columns=unserialize($temp['org_columns']);
+               $this->org_columns_forced=$this->is_forced_value('org_columns');
+               if(!$this->org_columns_forced && $type=='forced')
+               {
+ 
+                       //print "<BR><B>GRABLING</B><BR>";
+                       unset($this->org_columns);
+ 
+               }
                $this->default_category=$temp['default_category'];
!               
$this->default_category_forced=$this->is_forced_value('default_category');
! 
!               if($this->default_category_forced && $type!='forced')
!               {
!                       $this->default_category='__NONE__';
!               }
! 
!       }
!       function remove_from_forced($preference_name)
!       {
!               
if(!empty($this->preferences->forced['addressbook'][$preference_name]))
!               {
!                       
unset($this->preferences->forced['addressbook'][$preference_name]);
!                       
!               }
!       }
!       function is_forced_value($preference_name)
!       {
!               if ($this->preferences->forced['addressbook'][$preference_name])
!               {
!                       return True;
!               }
!               else
!               {
!                       return False;
!               }
        }
  

Index: class.uiaddressbook_prefs.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/addressbook/inc/Attic/class.uiaddressbook_prefs.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.uiaddressbook_prefs.inc.php   11 Sep 2003 00:15:56 -0000      1.1.2.2
--- class.uiaddressbook_prefs.inc.php   30 Sep 2003 19:27:31 -0000      1.1.2.3
***************
*** 4,8 ****
    * This file written by Alex Borges <address@hidden>                        *
    * UI for addressbook preferences                                           *
!   * Copyright (C) 2003 Alex Borges                                           *
    * -------------------------------------------------------------------------*
    * This library is part of the phpGroupWare Addressbook app                 *
--- 4,8 ----
    * This file written by Alex Borges <address@hidden>                        *
    * UI for addressbook preferences                                           *
!   * Copyright (C) 2003 Free Software Foundation                              *
    * -------------------------------------------------------------------------*
[...1142 lines suppressed...]
+                                               'link'  => 
$GLOBALS['phpgw']->link('/index.php',array(
+                                                               "menuaction" => 
"addressbook.uiaddressbook_prefs.index",
+                                                                
"adm_pref_type"=>"forced"
+                                                                ))
+                                              );
+ 
+                               switch($this->map_tpl_to_real['adm_pref_type'])
+                               {
+                                       case 'user':    $selected = 0; break;
+                                       case 'default': $selected = 1; break;
+                                       case 'forced':  $selected = 2; break;
+                               }
+                               
$this->map_tpl_to_real['final_admin_tabs']=$GLOBALS['phpgw']->common->create_tabs($tabs,$selected);
+                       }
+               }
+ 
+               
+ 
  }
  

Index: class.soaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.soaddressbook.inc.php,v
retrieving revision 1.14.2.3.2.9
retrieving revision 1.14.2.3.2.10
diff -C2 -d -r1.14.2.3.2.9 -r1.14.2.3.2.10
*** class.soaddressbook.inc.php 26 Sep 2003 19:34:21 -0000      1.14.2.3.2.9
--- class.soaddressbook.inc.php 30 Sep 2003 19:27:30 -0000      1.14.2.3.2.10
***************
*** 464,482 ****
                function read_preferences($contact_type)
                {
!                       static $already=false;
!                       if(!$already)
!                       {
!                               
$prefs=CreateObject('addressbook.boaddressbook_prefs');
!                               $prefs->read_preferences();
!                               $already=true;
!                       }
!                       
                        if($contact_type==$this->tab_main_persons)
                        {
!                               return $prefs->person_columns;
                        }
                        elseif($contact_type==$this->tab_main_organizations)
                        {
!                               return $prefs->org_columns;
                        }       
                }
--- 464,477 ----
                function read_preferences($contact_type)
                {
!                       $prefs=$GLOBALS['phpgw']->preferences;
!                       $prefs=$prefs->data['addressbook'];
                        if($contact_type==$this->tab_main_persons)
                        {
!                               
!                               return unserialize($prefs['person_columns']);
                        }
                        elseif($contact_type==$this->tab_main_organizations)
                        {
!                               return unserialize($prefs['org_columns']);
                        }       
                }