[Phpgroupware-cvs] CVS: wcm/inc class.soelement.inc.php,1.3,1.4 class.uipage.inc.php,1.3,1.4

[Miles Lott <address@hidden>]

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

Modified Files:
        class.soelement.inc.php class.uipage.inc.php 
Log Message:
Fix saving of page_elements array, and display in the page editor



Index: class.soelement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.soelement.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.soelement.inc.php     4 Feb 2002 01:42:41 -0000       1.3
--- class.soelement.inc.php     4 Feb 2002 02:08:06 -0000       1.4
***************
*** 24,28 ****
                }
  
!               function list_elements($data='',&$total)
                {
                        if(gettype($data) == 'array')
--- 24,28 ----
                }
  
!               function list_elements($data='',&$total,$simple=False)
                {
                        if(gettype($data) == 'array')
***************
*** 31,35 ****
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total);
                }
  
--- 31,35 ----
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple);
                }
  
***************
*** 151,155 ****
                                $orderclause = 'ORDER BY ' . $order . ' ' . 
$sort;
                        }
!                       else
                        {
                                $orderclause = 'ORDER BY element_name ASC';
--- 151,155 ----
                                $orderclause = 'ORDER BY ' . $order . ' ' . 
$sort;
                        }
!                       elseif(!$order || $simple)
                        {
                                $orderclause = 'ORDER BY element_name ASC';

Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uipage.inc.php        4 Feb 2002 01:42:41 -0000       1.3
--- class.uipage.inc.php        4 Feb 2002 02:08:06 -0000       1.4
***************
*** 87,91 ****
                                $select .= '<option value="">' . $def . 
'</option>'."\n";
                        }
!                       while (list($val,$key) = @each($list))
                        {
                                $select .= '<option value="' . $key . '"';
--- 87,91 ----
                                $select .= '<option value="">' . $def . 
'</option>'."\n";
                        }
!                       while (list($key,$val) = @each($list))
                        {
                                $select .= '<option value="' . $key . '"';
***************
*** 225,229 ****
                                                'admin_name'    => 
addslashes($GLOBALS['HTTP_POST_VARS']['admin_name']),
                                                'admin_email'   => 
addslashes($GLOBALS['HTTP_POST_VARS']['admin_email']),
!                                               'page_elements' => 
$GLOBALS['HTTP_POST_VARS']['page_elements'],
                                                'page_header'   => 
addslashes($GLOBALS['HTTP_POST_VARS']['page_header']),
                                                'page_footer'   => 
addslashes($GLOBALS['HTTP_POST_VARS']['page_footer']),
--- 225,233 ----
                                                'admin_name'    => 
addslashes($GLOBALS['HTTP_POST_VARS']['admin_name']),
                                                'admin_email'   => 
addslashes($GLOBALS['HTTP_POST_VARS']['admin_email']),
!                                               'page_elements' => array(
!                                                       'left'  => 
$GLOBALS['HTTP_POST_VARS']['page_element_left'],
!                                                       'mid'   => 
$GLOBALS['HTTP_POST_VARS']['page_element_mid'],
!                                                       'right' => 
$GLOBALS['HTTP_POST_VARS']['page_element_right']
!                                               ),
                                                'page_header'   => 
addslashes($GLOBALS['HTTP_POST_VARS']['page_header']),
                                                'page_footer'   => 
addslashes($GLOBALS['HTTP_POST_VARS']['page_footer']),
***************
*** 283,287 ****
  
                        
$GLOBALS['phpgw']->template->set_var('lang_left',lang('Left'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_middle',lang('Middle'));
                        
$GLOBALS['phpgw']->template->set_var('lang_right',lang('Right'));
  
--- 287,291 ----
  
                        
$GLOBALS['phpgw']->template->set_var('lang_left',lang('Left'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_mid',lang('Middle'));
                        
$GLOBALS['phpgw']->template->set_var('lang_right',lang('Right'));
  
***************
*** 306,313 ****
                        for($i=0;$i<8;$i++)
                        {
!                               
$GLOBALS['phpgw']->template->set_var('element_left',$this->formatted_list('page_element_left['
 . $i . ']',$list_elements,$value,'---'));
!                               
$GLOBALS['phpgw']->template->set_var('element_middle',$this->formatted_list('page_element_middle['
 . $i . ']',$list_elements,$value,'---'));
!                               
$GLOBALS['phpgw']->template->set_var('element_right',$this->formatted_list('page_element_right['
 . $i . ']',$list_elements,$value,'---'));
!                               
$GLOBALS['phpgw']->template->pfp('elements','elem',True);
                        }
                        /*
--- 310,317 ----
                        for($i=0;$i<8;$i++)
                        {
!                               
$GLOBALS['phpgw']->template->set_var('element_left',$this->formatted_list('page_element_left['
 . $i . ']',$list_elements,$page['page_elements']['left'][$i],'---'));
!                               
$GLOBALS['phpgw']->template->set_var('element_mid',$this->formatted_list('page_element_mid['
 . $i . ']',$list_elements,$page['page_elements']['mid'][$i],'---'));
!                               
$GLOBALS['phpgw']->template->set_var('element_right',$this->formatted_list('page_element_right['
 . $i . ']',$list_elements,$page['page_elements']['right'][$i],'---'));
!                               
$GLOBALS['phpgw']->template->fp('elements','elem',True);
                        }
                        /*