[Phpgroupware-cvs] CVS: wcm/inc class.uipage.inc.php,1.20,1.21 class.uisite.inc.php,1.14,1.15

[Miles Lott <address@hidden>]

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

Modified Files:
        class.uipage.inc.php class.uisite.inc.php 
Log Message:
Add some langs; make publish return to the site edit page; fix preview links in 
site and page



Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.uipage.inc.php        23 Mar 2002 14:25:06 -0000      1.20
--- class.uipage.inc.php        23 Mar 2002 15:08:50 -0000      1.21
***************
*** 178,182 ****
  
  //                            
$GLOBALS['phpgw']->template->set_var('view',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.view&page_id='
 . $page_id));
!                               
$GLOBALS['phpgw']->template->set_var('view',$GLOBALS['phpgw']->link('/wcm/website','pageid='
 . $page_id));
                                
$GLOBALS['phpgw']->template->set_var('lang_view_entry',lang('View'));
  
--- 178,182 ----
  
  //                            
$GLOBALS['phpgw']->template->set_var('view',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.view&page_id='
 . $page_id));
!                               
$GLOBALS['phpgw']->template->set_var('view',$GLOBALS['phpgw']->link('/wcm/website/','pageid='
 . $page_id));
                                
$GLOBALS['phpgw']->template->set_var('lang_view_entry',lang('View'));
  
***************
*** 346,350 ****
                        
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.delete&page_id='
 . $page_id));
                        
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.index'));
!                       
$GLOBALS['phpgw']->template->set_var('view',$GLOBALS['phpgw']->link('/wcm/website','pageid='
 . $page_id));
  
                        
$GLOBALS['phpgw']->template->set_var('lang_name',lang('Page name'));
--- 346,350 ----
                        
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.delete&page_id='
 . $page_id));
                        
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.index'));
!                       
$GLOBALS['phpgw']->template->set_var('view',$GLOBALS['phpgw']->link('/wcm/website/','pageid='
 . $page_id));
  
                        
$GLOBALS['phpgw']->template->set_var('lang_name',lang('Page name'));

Index: class.uisite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uisite.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.uisite.inc.php        23 Mar 2002 14:25:06 -0000      1.14
--- class.uisite.inc.php        23 Mar 2002 15:08:51 -0000      1.15
***************
*** 175,179 ****
                                ));
  
!                               
$GLOBALS['phpgw']->template->set_var('view',$GLOBALS['phpgw']->link('/wcm/website','sitename='
 . $site['site_name']));
                                
$GLOBALS['phpgw']->template->set_var('lang_view_entry',lang('View'));
  
--- 175,179 ----
                                ));
  
!                               
$GLOBALS['phpgw']->template->set_var('view',$GLOBALS['phpgw']->link('/wcm/website/','sitename='
 . $site['site_name']));
                                
$GLOBALS['phpgw']->template->set_var('lang_view_entry',lang('View'));
  
***************
*** 198,204 ****
                        
$GLOBALS['phpgw']->template->set_block('form','page','pagehandle');
  
!                       $site_id = $GLOBALS['HTTP_POST_VARS']['site_id'] ? 
$GLOBALS['HTTP_POST_VARS']['site_id'] : $GLOBALS['HTTP_GET_VARS']['site_id'];
                        $site = $this->bo->read($site_id);
  
                        if($GLOBALS['HTTP_POST_VARS']['addpage'])
                        {
--- 198,206 ----
                        
$GLOBALS['phpgw']->template->set_block('form','page','pagehandle');
  
!                       $site_id =get_var('site_id',array('POST','GET'));
                        $site = $this->bo->read($site_id);
  
+                       $published = get_var('published',array('GET'));
+ 
                        if($GLOBALS['HTTP_POST_VARS']['addpage'])
                        {
***************
*** 282,286 ****
                                }
                        }
!                       if ((!$GLOBALS['HTTP_POST_VARS']['submit']) && 
(!$error) && (!$errorcount))
                        {
                                
$GLOBALS['phpgw']->template->set_var('message','');
--- 284,292 ----
                                }
                        }
!                       if($published == 'True')
!                       {
!                               
$GLOBALS['phpgw']->template->set_var('message',lang('Site x has been 
published',$site['site_name']));
!                       }
!                       elseif ((!$GLOBALS['HTTP_POST_VARS']['submit']) && 
(!$error) && (!$errorcount))
                        {
                                
$GLOBALS['phpgw']->template->set_var('message','');
***************
*** 294,298 ****
                        
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.delete&site_id='
 . $site_id));
                        
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.index'));
!                       
$GLOBALS['phpgw']->template->set_var('view',$GLOBALS['phpgw']->link('/wcm/website','sitename='
 . $site['site_name']));
                        
$GLOBALS['phpgw']->template->set_var('publishurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.publish&site_id='
 . $site_id));
  
--- 300,304 ----
                        
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.delete&site_id='
 . $site_id));
                        
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.index'));
!                       
$GLOBALS['phpgw']->template->set_var('view',$GLOBALS['phpgw']->link('/wcm/website/','sitename='
 . $site['site_name']));
                        
$GLOBALS['phpgw']->template->set_var('publishurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.publish&site_id='
 . $site_id));
  
***************
*** 417,437 ****
                function publish()
                {
-                       $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
-                       include(PHPGW_APP_INC . SEP . 'header.inc.php');
- 
                        $site_id = $GLOBALS['HTTP_POST_VARS']['site_id'] ? 
$GLOBALS['HTTP_POST_VARS']['site_id'] : $GLOBALS['HTTP_GET_VARS']['site_id'];
  
                        if ($GLOBALS['HTTP_POST_VARS']['confirm'])
                        {
!                               $this->bo->publish($site_id);
!                               /*
!                               echo 'Publish not working yet, but...';
!                               $site = $this->bo->read($site_id);
!                               _debug_array($site);
!                               */
                        }
                        else
                        {
                                
$GLOBALS['phpgw']->template->set_file(array('site_delete' => 
'delete_common.tpl'));
  
--- 423,449 ----
                function publish()
                {
                        $site_id = $GLOBALS['HTTP_POST_VARS']['site_id'] ? 
$GLOBALS['HTTP_POST_VARS']['site_id'] : $GLOBALS['HTTP_GET_VARS']['site_id'];
  
                        if ($GLOBALS['HTTP_POST_VARS']['confirm'])
                        {
!                               if($this->bo->publish($site_id))
!                               {
!                                       Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.edit&site_id=' . 
$site_id . '&published=True'));
!                               }
!                               else
!                               {
!                                       
$GLOBALS['phpgw']->common->phpgw_header();
!                                       echo parse_navbar();
!                                       include(PHPGW_APP_INC . SEP . 
'header.inc.php');
!                                       echo lang('Publishing error!  Please 
check your settings.');
!                                       
$GLOBALS['phpgw']->common->phpgw_footer();
!                               }
                        }
                        else
                        {
+                               $GLOBALS['phpgw']->common->phpgw_header();
+                               echo parse_navbar();
+                               include(PHPGW_APP_INC . SEP . 'header.inc.php');
+ 
                                
$GLOBALS['phpgw']->template->set_file(array('site_delete' => 
'delete_common.tpl'));