[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wcm/inc class.soelement.inc.php,1.11,1.12 class.
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wcm/inc class.soelement.inc.php,1.11,1.12 class.sopage.inc.php,1.12,1.13 class.uielement.inc.php,1.13,1.14 class.uipage.inc.php,1.16,1.17 |
|
Date: |
Sun, 24 Feb 2002 19:09:05 -0500 |
Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv2669/inc
Modified Files:
class.soelement.inc.php class.sopage.inc.php
class.uielement.inc.php class.uipage.inc.php
Log Message:
Now editing and using expire freq for elements and pages. This gets parsed
into the
published page. Display code will later check these values and rebuild as
needed.
Index: class.soelement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.soelement.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.soelement.inc.php 17 Feb 2002 17:56:22 -0000 1.11
--- class.soelement.inc.php 25 Feb 2002 00:09:00 -0000 1.12
***************
*** 132,135 ****
--- 132,136 ----
$this->element['element_hf'] =
$GLOBALS['phpgw']->db->f('element_hf');
$this->element['element_version'] =
$GLOBALS['phpgw']->db->f('element_version');
+ $this->element['element_expire'] =
$GLOBALS['phpgw']->db->f('element_expire');
}
return $this->element;
***************
*** 150,155 ****
. "element_source='" .
$GLOBALS['phpgw']->db->db_addslashes($this->element['element_source']) . "',"
. "element_hf='" .
$this->element['element_hf'] . "',"
! . "element_version='" .
$this->element['element_version'] . "' "
! . "WHERE element_id=" .
intval($elementid);
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
return True;
--- 151,157 ----
. "element_source='" .
$GLOBALS['phpgw']->db->db_addslashes($this->element['element_source']) . "',"
. "element_hf='" .
$this->element['element_hf'] . "',"
! . "element_version='" .
$this->element['element_version'] . "', "
! . "element_expire=" .
intval($this->element['element_expire'])
! . " WHERE element_id=" .
intval($elementid);
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
return True;
***************
*** 165,174 ****
}
$sql = "INSERT INTO $this->table
(element_name,element_title,"
! .
"element_type,element_source,element_version,element_hf) VALUES('"
.
$GLOBALS['phpgw']->db->db_addslashes($element_info['element_name']) . "','"
.
$GLOBALS['phpgw']->db->db_addslashes($element_info['element_title']) . "','"
. $element_info['element_type'] . "','"
! .
$GLOBALS['phpgw']->db->db_addslashes($element_info['element_source'])
! . "','" . $element_info['element_version'] .
"','"
. $element_info['element_hf'] . "')";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
--- 167,177 ----
}
$sql = "INSERT INTO $this->table
(element_name,element_title,"
! .
"element_type,element_source,element_version,element_expire,element_hf)
VALUES('"
.
$GLOBALS['phpgw']->db->db_addslashes($element_info['element_name']) . "','"
.
$GLOBALS['phpgw']->db->db_addslashes($element_info['element_title']) . "','"
. $element_info['element_type'] . "','"
! .
$GLOBALS['phpgw']->db->db_addslashes($element_info['element_source']) . "','"
! . $element_info['element_version'] . "',"
! . intval($element_info['element_expire']) . ","
. $element_info['element_hf'] . "')";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
Index: class.sopage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sopage.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.sopage.inc.php 24 Feb 2002 05:33:25 -0000 1.12
--- class.sopage.inc.php 25 Feb 2002 00:09:00 -0000 1.13
***************
*** 76,79 ****
--- 76,80 ----
$this->page['page_footer'] =
$GLOBALS['phpgw']->db->f('page_footer');
$this->page['page_version'] =
$GLOBALS['phpgw']->db->f('page_version');
+ $this->page['page_expire'] =
$GLOBALS['phpgw']->db->f('page_expire');
}
if($full)
***************
*** 120,125 ****
. "page_mid=" .
intval($this->page['page_mid']) . ","
. "page_right=" .
intval($this->page['page_right']) . ","
! . "page_version='" .
$this->page['page_version'] . "' "
! . "WHERE page_id=" . intval($pageid);
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
return $pageid;
--- 121,127 ----
. "page_mid=" .
intval($this->page['page_mid']) . ","
. "page_right=" .
intval($this->page['page_right']) . ","
! . "page_version='" .
$this->page['page_version'] . "',"
! . "page_expire=" .
intval($this->page['page_expire'])
! . " WHERE page_id=" . intval($pageid);
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
return $pageid;
***************
*** 137,141 ****
$sql = "INSERT INTO $this->table
(page_name,page_title,page_url,page_elements,"
! .
"page_header,page_footer,page_left,page_mid,page_right,page_version) VALUES('"
.
$GLOBALS['phpgw']->db->db_addslashes($page_info['page_name']) . "','"
.
$GLOBALS['phpgw']->db->db_addslashes($page_info['page_title']) . "','"
--- 139,143 ----
$sql = "INSERT INTO $this->table
(page_name,page_title,page_url,page_elements,"
! .
"page_header,page_footer,page_left,page_mid,page_right,page_version,page_expire)
VALUES('"
.
$GLOBALS['phpgw']->db->db_addslashes($page_info['page_name']) . "','"
.
$GLOBALS['phpgw']->db->db_addslashes($page_info['page_title']) . "','"
***************
*** 145,149 ****
. intval($page_info['page_mid']) . ","
. intval($page_info['page_right']) . ",'"
! . $page_info['page_version'] . "')";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
--- 147,152 ----
. intval($page_info['page_mid']) . ","
. intval($page_info['page_right']) . ",'"
! . $page_info['page_version'] . "',"
! . intval($page_info['page_expire']) . "')";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
Index: class.uielement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uielement.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uielement.inc.php 24 Feb 2002 04:12:55 -0000 1.13
--- class.uielement.inc.php 25 Feb 2002 00:09:00 -0000 1.14
***************
*** 256,259 ****
--- 256,261 ----
$GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
$GLOBALS['phpgw']->template->set_block('form','file','filehandle');
+
$GLOBALS['phpgw']->template->set_block('form','expire_select','expire_select');
+ $GLOBALS['phpgw']->template->set_unknowns('remove');
$element_id = $GLOBALS['HTTP_POST_VARS']['element_id']
? $GLOBALS['HTTP_POST_VARS']['element_id'] :
$GLOBALS['HTTP_GET_VARS']['element_id'];
***************
*** 286,290 ****
'element_source' =>
$GLOBALS['HTTP_POST_VARS']['element_source'],
'element_hf' =>
$GLOBALS['HTTP_POST_VARS']['element_hf'],
! 'element_version' =>
$element['element_version']
);
if($element_id)
--- 288,293 ----
'element_source' =>
$GLOBALS['HTTP_POST_VARS']['element_source'],
'element_hf' =>
$GLOBALS['HTTP_POST_VARS']['element_hf'],
! 'element_version' =>
$element['element_version'],
! 'element_expire' =>
$GLOBALS['HTTP_POST_VARS']['element_expire']
);
if($element_id)
***************
*** 410,413 ****
--- 413,434 ----
$GLOBALS['phpgw']->template->set_var('element_file',$_file);
+
$GLOBALS['phpgw']->template->set_var('lang_expire',lang('Expire Frequency'));
+
$GLOBALS['phpgw']->template->set_var('lang_never',lang('Never'));
+
$GLOBALS['phpgw']->template->set_var('lang_always',lang('Always'));
+ $GLOBALS['phpgw']->template->set_var('lang_one','1');
+ $GLOBALS['phpgw']->template->set_var('lang_two','2');
+ $GLOBALS['phpgw']->template->set_var('lang_five','5');
+ $GLOBALS['phpgw']->template->set_var('lang_ten','10');
+
$GLOBALS['phpgw']->template->set_var('lang_twenty','20');
+
$GLOBALS['phpgw']->template->set_var('lang_thirty','30');
+
$GLOBALS['phpgw']->template->set_var('lang_minute',lang('Minute'));
+
$GLOBALS['phpgw']->template->set_var('lang_minutes',lang('Minutes'));
+
$GLOBALS['phpgw']->template->set_var('lang_hour',lang('Hour'));
+
$GLOBALS['phpgw']->template->set_var('lang_hours',lang('Hours'));
+
$GLOBALS['phpgw']->template->set_var('lang_day',lang('Day'));
+
$GLOBALS['phpgw']->template->set_var('expire_name','element_expire');
+ $GLOBALS['phpgw']->template->set_var('expire_selected_'
. intval($element['element_expire']), ' selected');
+
$GLOBALS['phpgw']->template->fp('element_expire','expire_select');
+
$GLOBALS['phpgw']->template->set_var('element_id',$element_id);
$GLOBALS['phpgw']->template->set_var('element_version',$element['element_version']);
***************
*** 417,430 ****
$GLOBALS['phpgw']->template->set_var('addhandle','');
$GLOBALS['phpgw']->template->set_var('filehandle','');
if(isset($element['element_id']) || $element_id)
{
!
$GLOBALS['phpgw']->template->parse('end','edit',True);
}
else
{
!
$GLOBALS['phpgw']->template->parse('end','add',True);
}
! $GLOBALS['phpgw']->template->pparse('out','form');
}
--- 438,452 ----
$GLOBALS['phpgw']->template->set_var('addhandle','');
$GLOBALS['phpgw']->template->set_var('filehandle','');
+
$GLOBALS['phpgw']->template->set_var('expire_select','');
if(isset($element['element_id']) || $element_id)
{
!
$GLOBALS['phpgw']->template->fp('end','edit',True);
}
else
{
!
$GLOBALS['phpgw']->template->fp('end','add',True);
}
! $GLOBALS['phpgw']->template->pfp('out','form');
}
Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.uipage.inc.php 24 Feb 2002 03:42:43 -0000 1.16
--- class.uipage.inc.php 25 Feb 2002 00:09:00 -0000 1.17
***************
*** 241,244 ****
--- 241,246 ----
$GLOBALS['phpgw']->template->set_block('form','top_elem','topelementhandle');
$GLOBALS['phpgw']->template->set_block('form','bottom_elem','botelementhandle');
+
$GLOBALS['phpgw']->template->set_block('form','expire_select','expire_select');
+ $GLOBALS['phpgw']->template->set_unknowns('remove');
$page_id = $GLOBALS['HTTP_POST_VARS']['page_id'] ?
$GLOBALS['HTTP_POST_VARS']['page_id'] : $GLOBALS['HTTP_GET_VARS']['page_id'];
***************
*** 281,290 ****
'bottom' =>
$GLOBALS['HTTP_POST_VARS']['page_element_bottom']
),
! 'page_header' =>
$GLOBALS['HTTP_POST_VARS']['page_header'],
! 'page_footer' =>
$GLOBALS['HTTP_POST_VARS']['page_footer'],
! 'page_version' =>
$page['page_version'],
! 'page_left' =>
$GLOBALS['HTTP_POST_VARS']['page_left'],
! 'page_mid' =>
$GLOBALS['HTTP_POST_VARS']['page_mid'],
! 'page_right' =>
$GLOBALS['HTTP_POST_VARS']['page_right']
);
if($page_id)
--- 283,293 ----
'bottom' =>
$GLOBALS['HTTP_POST_VARS']['page_element_bottom']
),
! 'page_header' =>
$GLOBALS['HTTP_POST_VARS']['page_header'],
! 'page_footer' =>
$GLOBALS['HTTP_POST_VARS']['page_footer'],
! 'page_version' =>
$page['page_version'],
! 'page_expire' =>
$GLOBALS['HTTP_POST_VARS']['page_expire'],
! 'page_left' =>
$GLOBALS['HTTP_POST_VARS']['page_left'],
! 'page_mid' =>
$GLOBALS['HTTP_POST_VARS']['page_mid'],
! 'page_right' =>
$GLOBALS['HTTP_POST_VARS']['page_right']
);
if($page_id)
***************
*** 404,407 ****
--- 407,428 ----
}
+
$GLOBALS['phpgw']->template->set_var('lang_expire',lang('Expire Frequency'));
+
$GLOBALS['phpgw']->template->set_var('lang_never',lang('Never'));
+
$GLOBALS['phpgw']->template->set_var('lang_always',lang('Always'));
+ $GLOBALS['phpgw']->template->set_var('lang_one','1');
+ $GLOBALS['phpgw']->template->set_var('lang_two','2');
+ $GLOBALS['phpgw']->template->set_var('lang_five','5');
+ $GLOBALS['phpgw']->template->set_var('lang_ten','10');
+
$GLOBALS['phpgw']->template->set_var('lang_twenty','20');
+
$GLOBALS['phpgw']->template->set_var('lang_thirty','30');
+
$GLOBALS['phpgw']->template->set_var('lang_minute',lang('Minute'));
+
$GLOBALS['phpgw']->template->set_var('lang_minutes',lang('Minutes'));
+
$GLOBALS['phpgw']->template->set_var('lang_hour',lang('Hour'));
+
$GLOBALS['phpgw']->template->set_var('lang_hours',lang('Hours'));
+
$GLOBALS['phpgw']->template->set_var('lang_day',lang('Day'));
+
$GLOBALS['phpgw']->template->set_var('expire_name','page_expire');
+ $GLOBALS['phpgw']->template->set_var('expire_selected_'
. intval($page['page_expire']), ' selected');
+
$GLOBALS['phpgw']->template->fp('element_expire','expire_select');
+
$GLOBALS['phpgw']->template->set_var('edithandle','');
$GLOBALS['phpgw']->template->set_var('addhandle','');
***************
*** 409,422 ****
$GLOBALS['phpgw']->template->set_var('topelementhandle','');
$GLOBALS['phpgw']->template->set_var('botelementhandle','');
if(isset($page['page_id']) || $page_id)
{
!
$GLOBALS['phpgw']->template->parse('end','edit',True);
}
else
{
!
$GLOBALS['phpgw']->template->parse('end','add',True);
}
! $GLOBALS['phpgw']->template->pparse('out','form');
}
--- 430,444 ----
$GLOBALS['phpgw']->template->set_var('topelementhandle','');
$GLOBALS['phpgw']->template->set_var('botelementhandle','');
+
$GLOBALS['phpgw']->template->set_var('expire_select','');
if(isset($page['page_id']) || $page_id)
{
!
$GLOBALS['phpgw']->template->fp('end','edit',True);
}
else
{
!
$GLOBALS['phpgw']->template->fp('end','add',True);
}
! $GLOBALS['phpgw']->template->pfp('out','form');
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wcm/inc class.soelement.inc.php,1.11,1.12 class.sopage.inc.php,1.12,1.13 class.uielement.inc.php,1.13,1.14 class.uipage.inc.php,1.16,1.17,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: wcm/inc class.bosite.inc.php,1.5,1.6
- Next by Date:
[Phpgroupware-cvs] CVS: wcm/templates/default element_form.tpl,1.5,1.6 page_form.tpl,1.10,1.11
- Previous by thread:
[Phpgroupware-cvs] CVS: wcm/inc class.bosite.inc.php,1.5,1.6
- Next by thread:
[Phpgroupware-cvs] CVS: wcm/templates/default element_form.tpl,1.5,1.6 page_form.tpl,1.10,1.11
- Index(es):