[Phpgroupware-cvs] CVS: wcm/inc class.uielement.inc.php,1.18,1.19 class.uipage.inc.php,1.22,1.23 class.uisite.inc.php,1.19,1.20 class.uiwcm.inc.php,1.2,1.3

[Miles Lott <address@hidden>]

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

Modified Files:
        class.uielement.inc.php class.uipage.inc.php 
        class.uisite.inc.php class.uiwcm.inc.php 
Log Message:
Adjust for new navbar methods



Index: class.uielement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uielement.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.uielement.inc.php     24 Mar 2002 13:08:14 -0000      1.18
--- class.uielement.inc.php     24 May 2002 12:03:52 -0000      1.19
***************
*** 160,164 ****
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
                        include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
--- 160,163 ----
***************
*** 351,355 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        
$GLOBALS['phpgw']->template->set_var('title_elements',$GLOBALS['HTTP_GET_VARS']['element_id']
 ? lang('Edit Element') : lang('Add Element'));
--- 350,353 ----
***************
*** 499,503 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
                                include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
--- 497,500 ----

Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uipage.inc.php        24 Mar 2002 12:32:21 -0000      1.22
--- class.uipage.inc.php        24 May 2002 12:03:52 -0000      1.23
***************
*** 108,112 ****
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
                        include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
--- 108,111 ----
***************
*** 338,342 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        //_debug_array($page_info);
--- 337,340 ----
***************
*** 474,478 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
                                include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
--- 472,475 ----

Index: class.uisite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uisite.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uisite.inc.php        25 Mar 2002 12:05:49 -0000      1.19
--- class.uisite.inc.php        24 May 2002 12:03:52 -0000      1.20
***************
*** 20,24 ****
                        'add'     => True,
                        'delete'  => True,
!                       'publish' => True
                );
  
--- 20,25 ----
                        'add'     => True,
                        'delete'  => True,
!                       'publish' => True,
!                       'stats'   => True
                );
  
***************
*** 71,74 ****
--- 72,115 ----
                }
  
+               function stats()
+               {
+                       $site_id = get_var('site_id',array('POST','GET'));
+ 
+                       $update = False;
+                       if(get_var('update',array('POST')))
+                       {
+                               echo '<br>update, eh?';
+                               $update = True;
+                       }
+ 
+                       $GLOBALS['phpgw']->common->phpgw_header();
+                       include(PHPGW_APP_INC . SEP . 'header.inc.php');
+ 
+                       $sites = $this->bo->list_sites();
+ 
+                       while(list(,$data) = @each($sites))
+                       {
+                               $site_id = $data['site_id'];
+ 
+                               $site = $this->bo->read($site_id,True);
+                               while(list(,$page) = @each($site['site_pages']))
+                               {
+                                       while(list($section,$x) = 
@each($page['page_elements']))
+                                       {
+                                               while(list(,$elem) = @each($x))
+                                               {
+                                                       if(@$elem['element_id'])
+                                                       {
+                                                               
@$statsout[$site_id][$page['page_id']][$section][] = $elem['element_id'];
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+                       echo '<pre>';
+                       print_r($statsout);
+                       echo '</pre>';
+               }
+ 
                function 
formatted_list($name,$list,$id='',$default=False,$java=False,$lang=True)
                {
***************
*** 108,112 ****
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
                        include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
--- 149,152 ----
***************
*** 312,316 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        
$GLOBALS['phpgw']->template->set_var('title_sites',$GLOBALS['HTTP_GET_VARS']['site_id']
 ? lang('Edit Website') : lang('Add Website'));
--- 352,355 ----
***************
*** 420,424 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
                                include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
--- 459,462 ----
***************
*** 453,457 ****
                                {
                                        
$GLOBALS['phpgw']->common->phpgw_header();
-                                       echo parse_navbar();
                                        include(PHPGW_APP_INC . SEP . 
'header.inc.php');
                                        echo lang('Publishing error!  Please 
check your settings.');
--- 491,494 ----
***************
*** 462,466 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
                                include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
--- 499,502 ----

Index: class.uiwcm.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uiwcm.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uiwcm.inc.php 21 Feb 2002 12:26:24 -0000      1.2
--- class.uiwcm.inc.php 24 May 2002 12:03:52 -0000      1.3
***************
*** 27,31 ****
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        
$GLOBALS['phpgw']->template->set_file(array('app_header' => 'header.tpl'));
--- 27,30 ----
***************
*** 38,41 ****
--- 37,42 ----
                        $GLOBALS['phpgw']->template->set_var('link_sites','<a 
href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.index') . 
'">' . lang('Edit Sites'));
  
+                       $GLOBALS['phpgw']->template->set_var('link_update','<a 
href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.stats') . 
'">' . lang('Update Stats'));
+ 
                        $_referer = 
urlencode($GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uiwcm.index'));
  
***************
*** 48,52 ****
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
                        include(PHPGW_APP_INC . SEP . 'header.inc.php');
                }
--- 49,52 ----