[Phpgroupware-cvs] CVS: wcm/inc class.sopage.inc.php,1.3,1.4 class.uipage.inc.php,1.4,1.5 class.uisite.inc.php,1.2,1.3

[Miles Lott <address@hidden>]

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

Modified Files:
        class.sopage.inc.php class.uipage.inc.php class.uisite.inc.php 
Log Message:
Allow site pages to be removed



Index: class.sopage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sopage.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sopage.inc.php        4 Feb 2002 01:42:41 -0000       1.3
--- class.sopage.inc.php        4 Feb 2002 02:32:51 -0000       1.4
***************
*** 183,187 ****
                                if($simple)
                                {
!                                       
$this->pages[$GLOBALS['phpgw']->db->f('page_id')] = 
$GLOBALS['phpgw']->db->f('page_title');
                                }
                                else
--- 183,187 ----
                                if($simple)
                                {
!                                       
$this->pages[$GLOBALS['phpgw']->db->f('page_id')] = 
$GLOBALS['phpgw']->db->f('page_name');
                                }
                                else

Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uipage.inc.php        4 Feb 2002 02:08:06 -0000       1.4
--- class.uipage.inc.php        4 Feb 2002 02:32:51 -0000       1.5
***************
*** 266,269 ****
--- 266,272 ----
                        echo parse_navbar();
  
+                       //_debug_array($page_info);
+                       //_debug_array($page);
+ 
                        
$GLOBALS['phpgw']->template->set_var('title_pages',$GLOBALS['HTTP_GET_VARS']['page_id']
 ? lang('Edit Webpage') : lang('Add Webpage'));
                        
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.edit&page_id='
 . $GLOBALS['HTTP_GET_VARS']['page_id']));
***************
*** 307,313 ****
  
                        $list_elements = $this->boelements->list_elements(True);
- 
                        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],'---'));
--- 310,316 ----
  
                        $list_elements = $this->boelements->list_elements(True);
                        for($i=0;$i<8;$i++)
                        {
+                               $GLOBALS['phpgw']->template->set_var('num',$i + 
1);
                                
$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],'---'));
***************
*** 315,327 ****
                                
$GLOBALS['phpgw']->template->fp('elements','elem',True);
                        }
-                       /*
-                       while(list($value,$x) = @each($page['page_elements']))
-                       {
-                               @reset($list_elements);
-                               
$GLOBALS['phpgw']->template->set_var('element_select',$this->formatted_list('page_element['
 . $i . ']',$list_elements,$value));
-                               
$GLOBALS['phpgw']->template->parse('elements','elem',True);
-                               $i++;
-                       }
-                       */
  
                        $GLOBALS['phpgw']->template->set_var('edithandle','');
--- 318,321 ----

Index: class.uisite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uisite.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uisite.inc.php        3 Feb 2002 17:37:38 -0000       1.2
--- class.uisite.inc.php        4 Feb 2002 02:32:51 -0000       1.3
***************
*** 77,81 ****
                        if($default)
                        {
!                               $select .= '<option value="">' . lang('Please 
Select') . '</option>'."\n";
                        }
                        while (list($key,$val) = @each($list))
--- 77,89 ----
                        if($default)
                        {
!                               if(is_bool($default))
!                               {
!                                       $def = lang('please select');
!                               }
!                               else
!                               {
!                                       $def = $default;
!                               }
!                               $select .= '<option value="">' . $def . 
'</option>'."\n";
                        }
                        while (list($key,$val) = @each($list))
***************
*** 209,212 ****
--- 217,228 ----
                                }
  
+                               while(list($x,$y) = 
@each($GLOBALS['HTTP_POST_VARS']['site_pages']))
+                               {
+                                       if($y)
+                                       {
+                                               $pages[] = $y;
+                                       }
+                               }
+ 
                                if (!$error)
                                {
***************
*** 221,225 ****
                                                'admin_name'    => 
addslashes($GLOBALS['HTTP_POST_VARS']['admin_name']),
                                                'admin_email'   => 
addslashes($GLOBALS['HTTP_POST_VARS']['admin_email']),
!                                               'site_pages'    => 
$GLOBALS['HTTP_POST_VARS']['site_pages'],
                                                'site_header'   => 
addslashes($GLOBALS['HTTP_POST_VARS']['site_header']),
                                                'site_footer'   => 
addslashes($GLOBALS['HTTP_POST_VARS']['site_footer']),
--- 237,241 ----
                                                'admin_name'    => 
addslashes($GLOBALS['HTTP_POST_VARS']['admin_name']),
                                                'admin_email'   => 
addslashes($GLOBALS['HTTP_POST_VARS']['admin_email']),
!                                               'site_pages'    => $pages,
                                                'site_header'   => 
addslashes($GLOBALS['HTTP_POST_VARS']['site_header']),
                                                'site_footer'   => 
addslashes($GLOBALS['HTTP_POST_VARS']['site_footer']),
***************
*** 299,307 ****
  
                        $list_pages = $this->bopages->list_pages(True);
                        $i = 0;
                        while(list($x,$value) = @each($site['site_pages']))
                        {
                                @reset($list_pages);
!                               
$GLOBALS['phpgw']->template->set_var('page_select',$this->formatted_list('site_pages['
 . $i . ']',$list_pages,$value,False,False,False));
                                
$GLOBALS['phpgw']->template->parse('pages','page',True);
                                $i++;
--- 315,326 ----
  
                        $list_pages = $this->bopages->list_pages(True);
+                       //_debug_array($list_pages);
                        $i = 0;
                        while(list($x,$value) = @each($site['site_pages']))
                        {
                                @reset($list_pages);
!                               $GLOBALS['phpgw']->template->set_var('num',$x);
!                               
$GLOBALS['phpgw']->template->set_var('page_select',$this->formatted_list('site_pages['
 . $i . ']',$list_pages,$value,lang('-remove-'),False,False));
!                               
$GLOBALS['phpgw']->template->set_var('remove',lang('Remove') . ' ' . 
lang('page') . ' ' . $x);
                                
$GLOBALS['phpgw']->template->parse('pages','page',True);
                                $i++;