[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.9,1.10 class.s
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wcm/inc class.soelement.inc.php,1.9,1.10 class.sopage.inc.php,1.8,1.9 class.sosite.inc.php,1.5,1.6 class.uielement.inc.php,1.7,1.8 class.uipage.inc.php,1.10,1.11 class.uisite.inc.php,1.4,1.5 |
|
Date: |
Sat, 16 Feb 2002 10:09:42 -0500 |
Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv13248
Modified Files:
class.soelement.inc.php class.sopage.inc.php
class.sosite.inc.php class.uielement.inc.php
class.uipage.inc.php class.uisite.inc.php
Log Message:
slash cleanup
Index: class.soelement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.soelement.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.soelement.inc.php 15 Feb 2002 14:09:17 -0000 1.9
--- class.soelement.inc.php 16 Feb 2002 15:09:40 -0000 1.10
***************
*** 119,126 ****
{
$this->element['element_id'] =
$GLOBALS['phpgw']->db->f('element_id');
! $this->element['element_name'] =
$GLOBALS['phpgw']->db->f('element_name');
! $this->element['element_title'] =
$GLOBALS['phpgw']->db->f('element_title');
$this->element['element_type'] =
$GLOBALS['phpgw']->db->f('element_type');
! $this->element['element_source'] =
$GLOBALS['phpgw']->db->f('element_source');
$this->element['element_hf'] =
$GLOBALS['phpgw']->db->f('element_hf');
$this->element['element_version'] =
$GLOBALS['phpgw']->db->f('element_version');
--- 119,126 ----
{
$this->element['element_id'] =
$GLOBALS['phpgw']->db->f('element_id');
! $this->element['element_name'] =
stripslashes($GLOBALS['phpgw']->db->f('element_name'));
! $this->element['element_title'] =
stripslashes($GLOBALS['phpgw']->db->f('element_title'));
$this->element['element_type'] =
$GLOBALS['phpgw']->db->f('element_type');
! $this->element['element_source'] =
stripslashes($GLOBALS['phpgw']->db->f('element_source'));
$this->element['element_hf'] =
$GLOBALS['phpgw']->db->f('element_hf');
$this->element['element_version'] =
$GLOBALS['phpgw']->db->f('element_version');
***************
*** 138,145 ****
{
$sql = "UPDATE $this->table SET "
! . "element_name='" .
$this->element['element_name'] . "',"
! . "element_title='" .
$this->element['element_title'] . "',"
. "element_type='" .
$this->element['element_type'] . "',"
! . "element_source='" .
$this->element['element_source'] . "',"
. "element_hf='" .
$this->element['element_hf'] . "',"
. "element_version='" .
$this->element['element_version'] . "' "
--- 138,145 ----
{
$sql = "UPDATE $this->table SET "
! . "element_name='" .
$GLOBALS['phpgw']->db->db_addslashes($this->element['element_name']) . "',"
! . "element_title='" .
$GLOBALS['phpgw']->db->db_addslashes($this->element['element_title']) . "',"
. "element_type='" .
$this->element['element_type'] . "',"
! . "element_source='" .
$GLOBALS['phpgw']->db->db_addslashes($this->element['element_source']) . "',"
. "element_hf='" .
$this->element['element_hf'] . "',"
. "element_version='" .
$this->element['element_version'] . "' "
***************
*** 159,165 ****
$sql = "INSERT INTO $this->table
(element_name,element_title,"
.
"element_type,element_source,element_version,element_hf) VALUES('"
! . $element_info['element_name'] . "','" .
$element_info['element_title'] . "','"
. $element_info['element_type'] . "','"
! . $element_info['element_source'] . "','" .
$element_info['element_version'] . "','"
. $element_info['element_hf'] . "')";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
--- 159,167 ----
$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__);
***************
*** 251,255 ****
$this->elements[$GLOBALS['phpgw']->db->f('element_name')]['element_title'] =
$GLOBALS['phpgw']->db->f('element_title');
$this->elements[$GLOBALS['phpgw']->db->f('element_name')]['element_type'] =
$GLOBALS['phpgw']->db->f('element_type');
!
$this->elements[$GLOBALS['phpgw']->db->f('element_name')]['element_source'] =
$GLOBALS['phpgw']->db->f('element_source');
$this->elements[$GLOBALS['phpgw']->db->f('element_name')]['element_hf'] =
$GLOBALS['phpgw']->db->f('element_hf');
$this->elements[$GLOBALS['phpgw']->db->f('element_name')]['element_version'] =
$GLOBALS['phpgw']->db->f('element_version');
--- 253,257 ----
$this->elements[$GLOBALS['phpgw']->db->f('element_name')]['element_title'] =
$GLOBALS['phpgw']->db->f('element_title');
$this->elements[$GLOBALS['phpgw']->db->f('element_name')]['element_type'] =
$GLOBALS['phpgw']->db->f('element_type');
!
$this->elements[$GLOBALS['phpgw']->db->f('element_name')]['element_source'] =
stripslashes($GLOBALS['phpgw']->db->f('element_source'));
$this->elements[$GLOBALS['phpgw']->db->f('element_name')]['element_hf'] =
$GLOBALS['phpgw']->db->f('element_hf');
$this->elements[$GLOBALS['phpgw']->db->f('element_name')]['element_version'] =
$GLOBALS['phpgw']->db->f('element_version');
Index: class.sopage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sopage.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.sopage.inc.php 14 Feb 2002 01:04:13 -0000 1.8
--- class.sopage.inc.php 16 Feb 2002 15:09:40 -0000 1.9
***************
*** 68,73 ****
{
$this->page['page_id'] =
$GLOBALS['phpgw']->db->f('page_id');
! $this->page['page_name'] =
$GLOBALS['phpgw']->db->f('page_name');
! $this->page['page_title'] =
$GLOBALS['phpgw']->db->f('page_title');
$this->page['page_url'] =
$GLOBALS['phpgw']->db->f('page_url');
$tmp =
unserialize($GLOBALS['phpgw']->db->f('page_elements'));
--- 68,73 ----
{
$this->page['page_id'] =
$GLOBALS['phpgw']->db->f('page_id');
! $this->page['page_name'] =
stripslashes($GLOBALS['phpgw']->db->f('page_name'));
! $this->page['page_title'] =
stripslashes($GLOBALS['phpgw']->db->f('page_title'));
$this->page['page_url'] =
$GLOBALS['phpgw']->db->f('page_url');
$tmp =
unserialize($GLOBALS['phpgw']->db->f('page_elements'));
***************
*** 111,116 ****
$sql = "UPDATE $this->table SET "
! . "page_name='" .
$this->page['page_name'] . "',"
! . "page_title='" .
$this->page['page_title'] . "',"
. "page_url='" .
$this->page['page_url'] . "',"
. "page_elements='" . $tmp . "',"
--- 111,116 ----
$sql = "UPDATE $this->table SET "
! . "page_name='" .
$GLOBALS['phpgw']->db->db_addslashes($this->page['page_name']) . "',"
! . "page_title='" .
$GLOBALS['phpgw']->db->db_addslashes($this->page['page_title']) . "',"
. "page_url='" .
$this->page['page_url'] . "',"
. "page_elements='" . $tmp . "',"
***************
*** 135,139 ****
$sql = "INSERT INTO $this->table
(page_name,page_title,page_url,page_elements,"
. "page_header,page_footer,page_version)
VALUES('"
! . $page_info['page_name'] . "','" .
$page_info['page_title'] . "','"
. $page_info['page_url'] . "','" . $tmp .
"','"
. $page_info['page_header'] . "','" .
$page_info['page_footer'] . "','"
--- 135,140 ----
$sql = "INSERT INTO $this->table
(page_name,page_title,page_url,page_elements,"
. "page_header,page_footer,page_version)
VALUES('"
! .
$GLOBALS['phpgw']->db->db_addslashes($page_info['page_name']) . "','"
! .
$GLOBALS['phpgw']->db->db_addslashes($page_info['page_title']) . "','"
. $page_info['page_url'] . "','" . $tmp .
"','"
. $page_info['page_header'] . "','" .
$page_info['page_footer'] . "','"
***************
*** 202,212 ****
else
{
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_id'] =
$GLOBALS['phpgw']->db->f('page_id');
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_name'] =
$GLOBALS['phpgw']->db->f('page_name');
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_title'] =
$GLOBALS['phpgw']->db->f('page_title');
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_url'] =
$GLOBALS['phpgw']->db->f('page_url');
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_elements'] =
$GLOBALS['phpgw']->db->f('page_elements');
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_header'] =
$GLOBALS['phpgw']->db->f('page_header');
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_footer'] =
$GLOBALS['phpgw']->db->f('page_footer');
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_version'] =
$GLOBALS['phpgw']->db->f('page_version');
}
--- 203,213 ----
else
{
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_id'] =
$GLOBALS['phpgw']->db->f('page_id');
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_name'] =
stripslashes($GLOBALS['phpgw']->db->f('page_name'));
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_title'] =
stripslashes($GLOBALS['phpgw']->db->f('page_title'));
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_url'] =
$GLOBALS['phpgw']->db->f('page_url');
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_elements'] =
$GLOBALS['phpgw']->db->f('page_elements');
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_header'] =
$GLOBALS['phpgw']->db->f('page_header');
!
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_footer'] =
$GLOBALS['phpgw']->db->f('page_footer');
$this->pages[$GLOBALS['phpgw']->db->f('page_name')]['page_version'] =
$GLOBALS['phpgw']->db->f('page_version');
}
Index: class.sosite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sosite.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.sosite.inc.php 10 Feb 2002 18:21:10 -0000 1.5
--- class.sosite.inc.php 16 Feb 2002 15:09:40 -0000 1.6
***************
*** 69,81 ****
{
$this->site['site_id'] =
$GLOBALS['phpgw']->db->f('site_id');
! $this->site['site_name'] =
$GLOBALS['phpgw']->db->f('site_name');
! $this->site['site_title'] =
$GLOBALS['phpgw']->db->f('site_title');
$this->site['site_url'] =
$GLOBALS['phpgw']->db->f('site_url');
$this->site['site_root'] =
$GLOBALS['phpgw']->db->f('site_root');
$this->site['site_security'] =
$GLOBALS['phpgw']->db->f('site_security');
! $this->site['username'] =
$GLOBALS['phpgw']->db->f('username');
! $this->site['password'] =
$GLOBALS['phpgw']->db->f('password');
! $this->site['admin_name'] =
$GLOBALS['phpgw']->db->f('admin_name');
! $this->site['admin_email'] =
$GLOBALS['phpgw']->db->f('admin_email');
$tmp =
unserialize($GLOBALS['phpgw']->db->f('site_pages'));
$this->site['site_pages'] = is_array($tmp) ?
$tmp : array();
--- 69,81 ----
{
$this->site['site_id'] =
$GLOBALS['phpgw']->db->f('site_id');
! $this->site['site_name'] =
stripslashes($GLOBALS['phpgw']->db->f('site_name'));
! $this->site['site_title'] =
stripslashes($GLOBALS['phpgw']->db->f('site_title'));
$this->site['site_url'] =
$GLOBALS['phpgw']->db->f('site_url');
$this->site['site_root'] =
$GLOBALS['phpgw']->db->f('site_root');
$this->site['site_security'] =
$GLOBALS['phpgw']->db->f('site_security');
! $this->site['username'] =
stripslashes($GLOBALS['phpgw']->db->f('username'));
! $this->site['password'] =
stripslashes($GLOBALS['phpgw']->db->f('password'));
! $this->site['admin_name'] =
stripslashes($GLOBALS['phpgw']->db->f('admin_name'));
! $this->site['admin_email'] =
stripslashes($GLOBALS['phpgw']->db->f('admin_email'));
$tmp =
unserialize($GLOBALS['phpgw']->db->f('site_pages'));
$this->site['site_pages'] = is_array($tmp) ?
$tmp : array();
***************
*** 111,123 ****
$sql = "UPDATE $this->table SET "
! . "site_name='" .
$this->site['site_name'] . "',"
! . "site_title='" .
$this->site['site_title'] . "',"
. "site_root='" .
$this->site['site_root'] . "',"
. "site_url='" .
$this->site['site_url'] . "',"
. "site_security='" .
$this->site['site_security'] . "',"
! . "username='" .
$this->site['username'] . "',"
! . "password='" .
$this->site['password'] . "',"
! . "admin_name='" .
$this->site['admin_name'] . "',"
! . "admin_email='" .
$this->site['admin_email'] . "',"
. "site_pages='" . $tmp . "',"
. "site_header='" .
$this->site['site_header'] . "',"
--- 111,123 ----
$sql = "UPDATE $this->table SET "
! . "site_name='" .
$GLOBALS['phpgw']->db->db_addslashes($this->site['site_name']) . "',"
! . "site_title='" .
$GLOBALS['phpgw']->db->db_addslashes($this->site['site_title']) . "',"
. "site_root='" .
$this->site['site_root'] . "',"
. "site_url='" .
$this->site['site_url'] . "',"
. "site_security='" .
$this->site['site_security'] . "',"
! . "username='" .
$GLOBALS['phpgw']->db->db_addslashes($this->site['username']) . "',"
! . "password='" .
$GLOBALS['phpgw']->db->db_addslashes($this->site['password']) . "',"
! . "admin_name='" .
$GLOBALS['phpgw']->db->db_addslashes($this->site['admin_name']) . "',"
! . "admin_email='" .
$GLOBALS['phpgw']->db->db_addslashes($this->site['admin_email']) . "',"
. "site_pages='" . $tmp . "',"
. "site_header='" .
$this->site['site_header'] . "',"
***************
*** 140,148 ****
$sql = "INSERT INTO $this->table
(site_name,site_title,site_url,site_root,site_security,"
.
"username,password,admin_name,admin_email,site_pages,site_header,site_footer,site_version)
VALUES('"
! . $site_info['site_name'] . "','" .
$site_info['site_title'] . "','"
. $site_info['site_root'] . "','"
. $site_info['site_url'] . "','" .
$site_info['site_security'] . "','"
! . $site_info['username'] . "','" .
$site_info['password'] . "','"
! . $site_info['admin_name'] . "','" .
$site_info['admin_email'] . "','"
. $tmp . "','"
. $site_info['site_header'] . "','"
--- 140,151 ----
$sql = "INSERT INTO $this->table
(site_name,site_title,site_url,site_root,site_security,"
.
"username,password,admin_name,admin_email,site_pages,site_header,site_footer,site_version)
VALUES('"
! .
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_name']) . "','"
! .
$GLOBALS['phpgw']->db->db_addslashes($site_info['site_title']) . "','"
. $site_info['site_root'] . "','"
. $site_info['site_url'] . "','" .
$site_info['site_security'] . "','"
! .
$GLOBALS['phpgw']->db->db_addslashes($site_info['username']) . "','"
! .
$GLOBALS['phpgw']->db->db_addslashes($site_info['password']) . "','"
! .
$GLOBALS['phpgw']->db->db_addslashes($site_info['admin_name']) . "','"
! .
$GLOBALS['phpgw']->db->db_addslashes($site_info['admin_email']) . "','"
. $tmp . "','"
. $site_info['site_header'] . "','"
***************
*** 208,218 ****
{
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_id'] =
$GLOBALS['phpgw']->db->f('site_id');
!
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_name'] =
$GLOBALS['phpgw']->db->f('site_name');
!
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_title'] =
$GLOBALS['phpgw']->db->f('site_title');
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_url'] =
$GLOBALS['phpgw']->db->f('site_url');
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_root'] =
$GLOBALS['phpgw']->db->f('site_root');
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_security'] =
$GLOBALS['phpgw']->db->f('site_security');
!
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['admin_name'] =
$GLOBALS['phpgw']->db->f('admin_name');
!
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['admin_email'] =
$GLOBALS['phpgw']->db->f('admin_email');
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_header'] =
$GLOBALS['phpgw']->db->f('site_header');
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_footer'] =
$GLOBALS['phpgw']->db->f('site_footer');
--- 211,221 ----
{
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_id'] =
$GLOBALS['phpgw']->db->f('site_id');
!
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_name'] =
stripslashes($GLOBALS['phpgw']->db->f('site_name'));
!
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_title'] =
stripslashes($GLOBALS['phpgw']->db->f('site_title'));
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_url'] =
$GLOBALS['phpgw']->db->f('site_url');
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_root'] =
$GLOBALS['phpgw']->db->f('site_root');
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_security'] =
$GLOBALS['phpgw']->db->f('site_security');
!
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['admin_name'] =
stripslashes($GLOBALS['phpgw']->db->f('admin_name'));
!
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['admin_email'] =
stripslashes($GLOBALS['phpgw']->db->f('admin_email'));
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_header'] =
$GLOBALS['phpgw']->db->f('site_header');
$this->sites[$GLOBALS['phpgw']->db->f('site_name')]['site_footer'] =
$GLOBALS['phpgw']->db->f('site_footer');
Index: class.uielement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uielement.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uielement.inc.php 15 Feb 2002 14:09:17 -0000 1.7
--- class.uielement.inc.php 16 Feb 2002 15:09:40 -0000 1.8
***************
*** 237,244 ****
{
$element_info = array(
! 'element_name' =>
addslashes($GLOBALS['HTTP_POST_VARS']['element_name']),
! 'element_title' =>
addslashes($GLOBALS['HTTP_POST_VARS']['element_title']),
'element_type' =>
$GLOBALS['HTTP_POST_VARS']['element_type'],
! 'element_source' =>
addslashes($GLOBALS['HTTP_POST_VARS']['element_source']),
'element_hf' =>
$GLOBALS['HTTP_POST_VARS']['element_hf'],
'element_version' =>
$element['element_version']
--- 237,244 ----
{
$element_info = array(
! 'element_name' =>
$GLOBALS['HTTP_POST_VARS']['element_name'],
! 'element_title' =>
$GLOBALS['HTTP_POST_VARS']['element_title'],
'element_type' =>
$GLOBALS['HTTP_POST_VARS']['element_type'],
! 'element_source' =>
$GLOBALS['HTTP_POST_VARS']['element_source'],
'element_hf' =>
$GLOBALS['HTTP_POST_VARS']['element_hf'],
'element_version' =>
$element['element_version']
Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uipage.inc.php 15 Feb 2002 14:09:17 -0000 1.10
--- class.uipage.inc.php 16 Feb 2002 15:09:40 -0000 1.11
***************
*** 262,275 ****
{
$page_info = array(
! 'page_name' =>
addslashes($GLOBALS['HTTP_POST_VARS']['page_name']),
! 'page_title' =>
addslashes($GLOBALS['HTTP_POST_VARS']['page_title']),
! 'page_url' =>
addslashes($GLOBALS['HTTP_POST_VARS']['page_url']),
! 'page_root' =>
addslashes($GLOBALS['HTTP_POST_VARS']['page_root']),
! 'username' =>
addslashes($GLOBALS['HTTP_POST_VARS']['page_username']),
'password' =>
$GLOBALS['HTTP_POST_VARS']['page_password'] ?
$GLOBALS['HTTP_POST_VARS']['page_password'] : $page['password'],
! 'page_mode' =>
addslashes($GLOBALS['HTTP_POST_VARS']['page_mode']),
! 'page_security' =>
addslashes($GLOBALS['HTTP_POST_VARS']['page_security']),
! 'admin_name' =>
addslashes($GLOBALS['HTTP_POST_VARS']['admin_name']),
! 'admin_email' =>
addslashes($GLOBALS['HTTP_POST_VARS']['admin_email']),
'page_elements' => array(
'top' =>
$GLOBALS['HTTP_POST_VARS']['page_element_top'],
--- 262,275 ----
{
$page_info = array(
! 'page_name' =>
$GLOBALS['HTTP_POST_VARS']['page_name'],
! 'page_title' =>
$GLOBALS['HTTP_POST_VARS']['page_title'],
! 'page_url' =>
$GLOBALS['HTTP_POST_VARS']['page_url'],
! 'page_root' =>
$GLOBALS['HTTP_POST_VARS']['page_root'],
! 'username' =>
$GLOBALS['HTTP_POST_VARS']['page_username'],
'password' =>
$GLOBALS['HTTP_POST_VARS']['page_password'] ?
$GLOBALS['HTTP_POST_VARS']['page_password'] : $page['password'],
! 'page_mode' =>
$GLOBALS['HTTP_POST_VARS']['page_mode'],
! 'page_security' =>
$GLOBALS['HTTP_POST_VARS']['page_security'],
! 'admin_name' =>
$GLOBALS['HTTP_POST_VARS']['admin_name'],
! 'admin_email' =>
$GLOBALS['HTTP_POST_VARS']['admin_email'],
'page_elements' => array(
'top' =>
$GLOBALS['HTTP_POST_VARS']['page_element_top'],
***************
*** 279,284 ****
'bottom' =>
$GLOBALS['HTTP_POST_VARS']['page_element_bottom']
),
! 'page_header' =>
addslashes($GLOBALS['HTTP_POST_VARS']['page_header']),
! 'page_footer' =>
addslashes($GLOBALS['HTTP_POST_VARS']['page_footer']),
'page_version' =>
$page['page_version']
);
--- 279,284 ----
'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']
);
Index: class.uisite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uisite.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uisite.inc.php 14 Feb 2002 01:04:13 -0000 1.4
--- class.uisite.inc.php 16 Feb 2002 15:09:40 -0000 1.5
***************
*** 229,244 ****
{
$site_info = array(
! 'site_name' =>
addslashes($GLOBALS['HTTP_POST_VARS']['site_name']),
! 'site_url' =>
addslashes($GLOBALS['HTTP_POST_VARS']['site_url']),
! 'site_root' =>
addslashes($GLOBALS['HTTP_POST_VARS']['site_root']),
! 'username' =>
addslashes($GLOBALS['HTTP_POST_VARS']['site_username']),
'password' =>
$GLOBALS['HTTP_POST_VARS']['site_password'] ?
$GLOBALS['HTTP_POST_VARS']['site_password'] : $site['password'],
! 'site_mode' =>
addslashes($GLOBALS['HTTP_POST_VARS']['site_mode']),
! 'site_security' =>
addslashes($GLOBALS['HTTP_POST_VARS']['site_security']),
! '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']),
'site_version' =>
$site['site_version']
);
--- 229,244 ----
{
$site_info = array(
! 'site_name' =>
$GLOBALS['HTTP_POST_VARS']['site_name'],
! 'site_url' =>
$GLOBALS['HTTP_POST_VARS']['site_url'],
! 'site_root' =>
$GLOBALS['HTTP_POST_VARS']['site_root'],
! 'username' =>
$GLOBALS['HTTP_POST_VARS']['site_username'],
'password' =>
$GLOBALS['HTTP_POST_VARS']['site_password'] ?
$GLOBALS['HTTP_POST_VARS']['site_password'] : $site['password'],
! 'site_mode' =>
$GLOBALS['HTTP_POST_VARS']['site_mode'],
! 'site_security' =>
$GLOBALS['HTTP_POST_VARS']['site_security'],
! 'admin_name' =>
$GLOBALS['HTTP_POST_VARS']['admin_name'],
! 'admin_email' =>
$GLOBALS['HTTP_POST_VARS']['admin_email'],
'site_pages' => $pages,
! 'site_header' =>
$GLOBALS['HTTP_POST_VARS']['site_header'],
! 'site_footer' =>
$GLOBALS['HTTP_POST_VARS']['site_footer'],
'site_version' =>
$site['site_version']
);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wcm/inc class.soelement.inc.php,1.9,1.10 class.sopage.inc.php,1.8,1.9 class.sosite.inc.php,1.5,1.6 class.uielement.inc.php,1.7,1.8 class.uipage.inc.php,1.10,1.11 class.uisite.inc.php,1.4,1.5,
Miles Lott <address@hidden> <=