[Phpgroupware-cvs] CVS: wcm/inc class.sosite.inc.php,1.6,1.7 class.uisite.inc.php,1.5,1.6

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv26006/inc

Modified Files:
        class.sosite.inc.php class.uisite.inc.php 
Log Message:
Add setting for site left/mid/right pane widths



Index: class.sosite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sosite.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.sosite.inc.php        16 Feb 2002 15:09:40 -0000      1.6
--- class.sosite.inc.php        16 Feb 2002 23:05:44 -0000      1.7
***************
*** 83,86 ****
--- 83,89 ----
                                $this->site['site_footer']   = 
$GLOBALS['phpgw']->db->f('site_footer');
                                $this->site['site_version']  = 
$GLOBALS['phpgw']->db->f('site_version');
+                               $this->site['site_left']     = 
$GLOBALS['phpgw']->db->f('site_left');
+                               $this->site['site_mid']      = 
$GLOBALS['phpgw']->db->f('site_mid');
+                               $this->site['site_right']    = 
$GLOBALS['phpgw']->db->f('site_right');
                        }
                        if($full)
***************
*** 123,126 ****
--- 126,132 ----
                                        . "site_header='"   . 
$this->site['site_header'] . "',"
                                        . "site_footer='"   . 
$this->site['site_footer'] . "',"
+                                       . "site_left="      . 
intval($this->site['site_left']) . ","
+                                       . "site_mid="       . 
intval($this->site['site_mid']) . ","
+                                       . "site_right="     . 
intval($this->site['site_right']) . ","
                                        . "site_version='"  . 
$this->site['site_version'] . "' "
                                        . "WHERE site_id="  . intval($siteid);
***************
*** 139,143 ****
                        $tmp = is_array($site_info['site_pages']) ? 
serialize($site_info['site_pages']) : serialize(array('none'));
                        $sql = "INSERT INTO $this->table 
(site_name,site_title,site_url,site_root,site_security,"
!                               . 
"username,password,admin_name,admin_email,site_pages,site_header,site_footer,site_version)
 VALUES('"
                                . 
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_name']) . "','"
                                . 
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_title']) . "','"
--- 145,150 ----
                        $tmp = is_array($site_info['site_pages']) ? 
serialize($site_info['site_pages']) : serialize(array('none'));
                        $sql = "INSERT INTO $this->table 
(site_name,site_title,site_url,site_root,site_security,"
!                               . 
"username,password,admin_name,admin_email,site_left,site_mid,site_right,"
!                               . 
"site_pages,site_header,site_footer,site_version) VALUES('"
                                . 
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_name']) . "','"
                                . 
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_title']) . "','"
***************
*** 147,151 ****
                                . 
$GLOBALS['phpgw']->db->db_addslashes($site_info['password']) . "','"
                                . 
$GLOBALS['phpgw']->db->db_addslashes($site_info['admin_name']) . "','"
!                               . 
$GLOBALS['phpgw']->db->db_addslashes($site_info['admin_email']) . "','"
                                . $tmp . "','"
                                . $site_info['site_header'] . "','"
--- 154,161 ----
                                . 
$GLOBALS['phpgw']->db->db_addslashes($site_info['password']) . "','"
                                . 
$GLOBALS['phpgw']->db->db_addslashes($site_info['admin_name']) . "','"
!                               . 
$GLOBALS['phpgw']->db->db_addslashes($site_info['admin_email']) . "',"
!                               . intval($site_info['site_left'])  . ","
!                               . intval($site_info['site_mid'])   . ","
!                               . intval($site_info['site_right']) . ",'"
                                . $tmp . "','"
                                . $site_info['site_header'] . "','"
***************
*** 221,224 ****
--- 231,237 ----
                                
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_footer']   = 
$GLOBALS['phpgw']->db->f('site_footer');
                                
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_version']  = 
$GLOBALS['phpgw']->db->f('site_version');
+                               
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_left']     = 
$GLOBALS['phpgw']->db->f('site_left');
+                               
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_mid']      = 
$GLOBALS['phpgw']->db->f('site_mid');
+                               
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_right']    = 
$GLOBALS['phpgw']->db->f('site_right');
                        }
                        $this->total = $GLOBALS['phpgw']->db->num_rows();

Index: class.uisite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uisite.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uisite.inc.php        16 Feb 2002 15:09:40 -0000      1.5
--- class.uisite.inc.php        16 Feb 2002 23:05:44 -0000      1.6
***************
*** 241,245 ****
                                                'site_header'   => 
$GLOBALS['HTTP_POST_VARS']['site_header'],
                                                'site_footer'   => 
$GLOBALS['HTTP_POST_VARS']['site_footer'],
!                                               'site_version'  => 
$site['site_version']
                                        );
                                        if($GLOBALS['HTTP_GET_VARS']['site_id'])
--- 241,248 ----
                                                'site_header'   => 
$GLOBALS['HTTP_POST_VARS']['site_header'],
                                                'site_footer'   => 
$GLOBALS['HTTP_POST_VARS']['site_footer'],
!                                               'site_version'  => 
$GLOBALS['HTTP_POST_VARS']['site_version'],
!                                               'site_left'     => 
$GLOBALS['HTTP_POST_VARS']['site_left'],
!                                               'site_mid'      => 
$GLOBALS['HTTP_POST_VARS']['site_mid'],
!                                               'site_right'    => 
$GLOBALS['HTTP_POST_VARS']['site_right']
                                        );
                                        if($GLOBALS['HTTP_GET_VARS']['site_id'])
***************
*** 300,303 ****
--- 303,314 ----
                        
$GLOBALS['phpgw']->template->set_var('lang_version',lang('Version'));
                        
$GLOBALS['phpgw']->template->set_var('lang_add_page',lang('Add Page'));
+ 
+                       
$GLOBALS['phpgw']->template->set_var('site_left',$site['site_left']   ? 
$site['site_left']  : '130');
+                       
$GLOBALS['phpgw']->template->set_var('site_mid',$site['site_mid']     ? 
$site['site_mid']   : '*');
+                       
$GLOBALS['phpgw']->template->set_var('site_right',$site['site_right'] ? 
$site['site_right'] : '120');
+                       
$GLOBALS['phpgw']->template->set_var('lang_left_pane',lang('Left Pane Width'));
+                       
$GLOBALS['phpgw']->template->set_var('lang_mid_pane',lang('Middle Pane Width'));
+                       
$GLOBALS['phpgw']->template->set_var('lang_right_pane',lang('Right Pane 
Width'));
+                       
$GLOBALS['phpgw']->template->set_var('lang_pixels',lang('Pixels'));
  
                        
$GLOBALS['phpgw']->template->set_var('site_name',$site['site_name']);