[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wcm/inc class.boelement.inc.php,1.1.1.1,1.2 clas
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wcm/inc class.boelement.inc.php,1.1.1.1,1.2 class.bopage.inc.php,1.1.1.1,1.2 class.bowcm.inc.php,1.2,1.3 class.soelement.inc.php,1.2,1.3 class.sopage.inc.php,1.2,1.3 class.sosite.inc.php,1.2,1.3 class.uielement.inc.php,1.1.1.1,1.2 class.uipage.inc.php,1.2,1.3 |
|
Date: |
Sun, 03 Feb 2002 20:42:43 -0500 |
Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv15642
Modified Files:
class.boelement.inc.php class.bopage.inc.php
class.bowcm.inc.php class.soelement.inc.php
class.sopage.inc.php class.sosite.inc.php
class.uielement.inc.php class.uipage.inc.php
Log Message:
Change element list to display type instead of source; decode site pages
and page elements if $full==True (used for display code)
Index: class.boelement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.boelement.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.boelement.inc.php 3 Feb 2002 15:16:33 -0000 1.1.1.1
--- class.boelement.inc.php 4 Feb 2002 01:42:41 -0000 1.2
***************
*** 23,30 ****
var $element_types = array(
! 'html' => 1,
! 'image' => 2,
! 'file' => 3,
! 'hook' => 4
);
--- 23,30 ----
var $element_types = array(
! 1 => 'html',
! 2 => 'image',
! 3 => 'file',
! 4 => 'hook'
);
Index: class.bopage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.bopage.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.bopage.inc.php 3 Feb 2002 15:16:31 -0000 1.1.1.1
--- class.bopage.inc.php 4 Feb 2002 01:42:41 -0000 1.2
***************
*** 99,103 ****
}
! function read($id)
{
if(is_array($id))
--- 99,103 ----
}
! function read($id,$full=False)
{
if(is_array($id))
***************
*** 105,109 ****
$id = $id['page_id'];
}
! return $this->so->read($id);
}
--- 105,109 ----
$id = $id['page_id'];
}
! return $this->so->read($id,$full);
}
Index: class.bowcm.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.bowcm.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.bowcm.inc.php 3 Feb 2002 17:37:38 -0000 1.2
--- class.bowcm.inc.php 4 Feb 2002 01:42:41 -0000 1.3
***************
*** 17,20 ****
--- 17,21 ----
var $site_name = '';
var $site_id = 0;
+ var $site = array();
function bowcm($site_name='')
***************
*** 34,38 ****
if($this->site_id)
{
! return $this->wcm->read($this->site_id,True);
}
}
--- 35,45 ----
if($this->site_id)
{
! $this->site =
$this->wcm->read($this->site_id,True);
! /*
! echo 'in read:';
! _debug_array($data);
! echo 'leaving...';
! */
! return $this->site;
}
}
Index: class.soelement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.soelement.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.soelement.inc.php 3 Feb 2002 17:37:38 -0000 1.2
--- class.soelement.inc.php 4 Feb 2002 01:42:41 -0000 1.3
***************
*** 158,162 ****
$sql = "SELECT * FROM $this->table $whereclause
$orderclause";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
!
while ($GLOBALS['phpgw']->db->next_record())
{
--- 158,162 ----
$sql = "SELECT * FROM $this->table $whereclause
$orderclause";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
!
while ($GLOBALS['phpgw']->db->next_record())
{
Index: class.sopage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sopage.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.sopage.inc.php 3 Feb 2002 17:37:38 -0000 1.2
--- class.sopage.inc.php 4 Feb 2002 01:42:41 -0000 1.3
***************
*** 34,40 ****
}
! function read($id)
{
! return $this->read_repository($id);
}
--- 34,40 ----
}
! function read($id,$full=False)
{
! return $this->read_repository($id,$full);
}
***************
*** 77,81 ****
if($full)
{
! $elements = CreateObject('wcm.element');
while(list($key,$value) =
@each($this->page['page_elements']))
{
--- 77,81 ----
if($full)
{
! $elements = CreateObject('wcm.soelement');
while(list($key,$value) =
@each($this->page['page_elements']))
{
Index: class.sosite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sosite.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.sosite.inc.php 3 Feb 2002 17:37:38 -0000 1.2
--- class.sosite.inc.php 4 Feb 2002 01:42:41 -0000 1.3
***************
*** 34,40 ****
}
! function read($id)
{
! return $this->read_repository($id);
}
--- 34,40 ----
}
! function read($id,$full=False)
{
! return $this->read_repository($id,$full);
}
***************
*** 85,94 ****
{
$pages = CreateObject('wcm.sopage');
while(list($key,$value) =
@each($this->site['site_pages']))
{
! $new[$key] =
$pages->read_repository($value);
}
$this->site['site_pages'] = $new;
}
return $this->site;
}
--- 85,96 ----
{
$pages = CreateObject('wcm.sopage');
+ @reset($this->site['site_pages']);
while(list($key,$value) =
@each($this->site['site_pages']))
{
! $new[$key] =
$pages->read_repository($value,True);
}
$this->site['site_pages'] = $new;
}
+ //_debug_array($this->site);
return $this->site;
}
Index: class.uielement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uielement.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.uielement.inc.php 3 Feb 2002 15:16:20 -0000 1.1.1.1
--- class.uielement.inc.php 4 Feb 2002 01:42:41 -0000 1.2
***************
*** 84,88 ****
$select .= '<option value="">' . lang('Please
Select') . '</option>'."\n";
}
! while (list($val,$key) = @each($list))
{
$select .= '<option value="' . $key . '"';
--- 84,88 ----
$select .= '<option value="">' . lang('Please
Select') . '</option>'."\n";
}
! while (list($key,$val) = @each($list))
{
$select .= '<option value="' . $key . '"';
***************
*** 148,153 ****
$GLOBALS['phpgw']->template->set_var('sort_type',
$this->nextmatchs->show_sort_order($this->sort,'element_type',$this->order,'/index.php',lang('Type'),'&menuaction=wcm.uielement.index'));
- $GLOBALS['phpgw']->template->set_var('sort_source',
-
$this->nextmatchs->show_sort_order($this->sort,'element_source',$this->order,'/index.php',lang('Source'),'&menuaction=wcm.uielement.index'));
$GLOBALS['phpgw']->template->set_var('sort_version',
$this->nextmatchs->show_sort_order($this->sort,'element_version',$this->order,'/index.php',lang('Version'),'&menuaction=wcm.uielement.index'));
--- 148,151 ----
***************
*** 165,170 ****
'element_name' =>
$GLOBALS['phpgw']->strip_html($element['element_name']),
'element_title' =>
$GLOBALS['phpgw']->strip_html($element['element_title']),
! 'element_type' =>
$GLOBALS['phpgw']->strip_html($element['element_type']),
! 'element_source' =>
$element['element_source'],
'element_version' =>
$element['element_version']
));
--- 163,167 ----
'element_name' =>
$GLOBALS['phpgw']->strip_html($element['element_name']),
'element_title' =>
$GLOBALS['phpgw']->strip_html($element['element_title']),
! 'element_type' =>
$this->bo->element_types[$element['element_type']],
'element_version' =>
$element['element_version']
));
Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uipage.inc.php 3 Feb 2002 15:51:01 -0000 1.2
--- class.uipage.inc.php 4 Feb 2002 01:42:41 -0000 1.3
***************
*** 196,203 ****
$page =
$this->bo->read($GLOBALS['HTTP_GET_VARS']['page_id']);
- if($GLOBALS['HTTP_POST_VARS']['addelement'])
- {
- $page['page_elements'][] = '';
- }
if ($GLOBALS['HTTP_POST_VARS']['submit'])
{
--- 196,199 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wcm/inc class.boelement.inc.php,1.1.1.1,1.2 class.bopage.inc.php,1.1.1.1,1.2 class.bowcm.inc.php,1.2,1.3 class.soelement.inc.php,1.2,1.3 class.sopage.inc.php,1.2,1.3 class.sosite.inc.php,1.2,1.3 class.uielement.inc.php,1.1.1.1,1.2 class.uipage.inc.php,1.2,1.3,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: backup/templates/default script_form.tpl,1.23.2.2,1.23.2.3
- Next by Date:
[Phpgroupware-cvs] CVS: wcm/inc class.soelement.inc.php,1.3,1.4 class.uipage.inc.php,1.3,1.4
- Previous by thread:
[Phpgroupware-cvs] CVS: backup/templates/default script_form.tpl,1.23.2.2,1.23.2.3
- Next by thread:
[Phpgroupware-cvs] CVS: wcm/inc class.soelement.inc.php,1.3,1.4 class.uipage.inc.php,1.3,1.4
- Index(es):