[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.socustom.inc.php inc/class.u...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.socustom.inc.php inc/class.u... |
|
Date: |
Thu, 19 Jan 2006 14:31:09 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/01/19 14:31:09
Modified files:
inc : class.socustom.inc.php class.uicustom.inc.php
setup : default_records.inc.php tables_current.inc.php
templates/base : custom.xsl
templates/default: custom.xsl
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.socustom.inc.php.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uicustom.inc.php.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/default_records.inc.php.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_current.inc.php.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/base/custom.xsl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/default/custom.xsl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: property/inc/class.socustom.inc.php
diff -u property/inc/class.socustom.inc.php:1.5
property/inc/class.socustom.inc.php:1.6
--- property/inc/class.socustom.inc.php:1.5 Thu May 12 21:26:28 2005
+++ property/inc/class.socustom.inc.php Thu Jan 19 14:31:08 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage custom
- * @version $Id: class.socustom.inc.php,v 1.5 2005/05/12 21:26:28
sigurdne Exp $
+ * @version $Id: class.socustom.inc.php,v 1.6 2006/01/19 14:31:08
sigurdne Exp $
*/
/**
@@ -106,7 +106,7 @@
{
$custom['id'] =
(int)$this->db->f('id');
$custom['name'] =
stripslashes($this->db->f('name'));
- $custom['sql'] =
stripslashes($this->db->f('sql'));
+ $custom['sql_text'] =
stripslashes($this->db->f('sql_text'));
$custom['entry_date'] =
$this->db->f('entry_date');
$custom['cols'] =
$this->read_cols($custom_id);
}
@@ -148,14 +148,14 @@
function add($custom)
{
$custom['name'] =
$this->db->db_addslashes($custom['name']);
- $custom['sql'] =
$this->db->db_addslashes($custom['sql']);
+ $custom['sql_text'] =
$this->db->db_addslashes($custom['sql_text']);
$this->db->transaction_begin();
$id = $this->bocommon->next_id('fm_custom');
- $this->db->query("INSERT INTO fm_custom
(id,entry_date,sql,name,user_id) "
- . "VALUES ($id,'" . time() . "','" .
$custom['sql'] . "','" . $custom['name'] . "'," . $this->account .
")",__LINE__,__FILE__);
+ $this->db->query("INSERT INTO fm_custom
(id,entry_date,sql_text,name,user_id) "
+ . "VALUES ($id,'" . time() . "','" .
$custom['sql_text'] . "','" . $custom['name'] . "'," . $this->account .
")",__LINE__,__FILE__);
$receipt['custom_id']= $id;
@@ -169,9 +169,9 @@
function edit($custom)
{
$custom['name'] =
$this->db->db_addslashes($custom['name']);
- $custom['sql'] =
$this->db->db_addslashes($custom['sql']);
+ $custom['sql_text'] =
$this->db->db_addslashes($custom['sql_text']);
- $this->db->query("UPDATE fm_custom set sql='" .
$custom['sql'] . "', entry_date='" . time() . "', name='" . $custom['name'] .
"' WHERE id=" . intval($custom['custom_id']),__LINE__,__FILE__);
+ $this->db->query("UPDATE fm_custom set sql_text='" .
$custom['sql_text'] . "', entry_date='" . time() . "', name='" .
$custom['name'] . "' WHERE id=" .
intval($custom['custom_id']),__LINE__,__FILE__);
if($custom['new_name'])
{
@@ -287,9 +287,9 @@
}
- $this->db->query("select sql from fm_custom where
id='$custom_id'",__LINE__,__FILE__);
+ $this->db->query("select sql_text from fm_custom where
id='$custom_id'",__LINE__,__FILE__);
$this->db->next_record();
- $sql = stripslashes($this->db->f('sql'));
+ $sql = stripslashes($this->db->f('sql_text'));
$uicols = $this->read_cols($custom_id);
$this->uicols = $uicols;
Index: property/inc/class.uicustom.inc.php
diff -u property/inc/class.uicustom.inc.php:1.10
property/inc/class.uicustom.inc.php:1.11
--- property/inc/class.uicustom.inc.php:1.10 Wed Nov 9 22:49:12 2005
+++ property/inc/class.uicustom.inc.php Thu Jan 19 14:31:09 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage custom
- * @version $Id: class.uicustom.inc.php,v 1.10 2005/11/09 22:49:12
sigurdne Exp $
+ * @version $Id: class.uicustom.inc.php,v 1.11 2006/01/19 14:31:09
sigurdne Exp $
*/
/**
@@ -314,7 +314,7 @@
$receipt['error'][]=array('msg'=>lang('Please enter a name !'));
}
- if(!$values['sql'])
+ if(!$values['sql_text'])
{
$receipt['error'][]=array('msg'=>lang('Please enter a sql query !'));
}
@@ -376,12 +376,12 @@
'edit_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_custom_id'
=> lang('ID'),
'value_custom_id'
=> $custom_id,
- 'lang_sql'
=> lang('sql'),
+ 'lang_sql_text'
=> lang('sql'),
'lang_name'
=> lang('name'),
'lang_save'
=> lang('save'),
'lang_cancel'
=> lang('cancel'),
'lang_apply'
=> lang('apply'),
- 'value_sql'
=> $custom['sql'],
+ 'value_sql_text'
=> $custom['sql_text'],
'value_name'
=> $custom['name'],
'lang_name_statustext' =>
lang('Enter a name for the query'),
'lang_sql_statustext' =>
lang('Enter a sql query'),
Index: property/setup/default_records.inc.php
diff -u property/setup/default_records.inc.php:1.18
property/setup/default_records.inc.php:1.19
--- property/setup/default_records.inc.php:1.18 Wed Sep 21 14:18:15 2005
+++ property/setup/default_records.inc.php Thu Jan 19 14:31:09 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: default_records.inc.php,v 1.18 2005/09/21 14:18:15
sigurdne Exp $
+ * @version $Id: default_records.inc.php,v 1.19 2006/01/19 14:31:09
sigurdne Exp $
*/
@@ -397,7 +397,7 @@
# Dumping data for table fm_custom
#
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_custom (id, name, sql)
VALUES (1, 'test query', 'select * from phpgw_accounts')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_custom (id, name,
sql_text) VALUES (1, 'test query', 'select * from phpgw_accounts')");
#
# Dumping data for table fm_custom_cols
Index: property/setup/tables_current.inc.php
diff -u property/setup/tables_current.inc.php:1.37
property/setup/tables_current.inc.php:1.38
--- property/setup/tables_current.inc.php:1.37 Sun Nov 13 17:21:54 2005
+++ property/setup/tables_current.inc.php Thu Jan 19 14:31:09 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: tables_current.inc.php,v 1.37 2005/11/13 17:21:54
sigurdne Exp $
+ * @version $Id: tables_current.inc.php,v 1.38 2006/01/19 14:31:09
sigurdne Exp $
*/
$phpgw_baseline = array(
@@ -1762,7 +1762,7 @@
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
'name' => array('type' => 'varchar','precision'
=> '100','nullable' => False),
- 'sql' => array('type' => 'text','nullable' =>
False),
+ 'sql_text' => array('type' => 'text','nullable'
=> False),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
'user_id' => array('type' => 'int','precision'
=> '4','nullable' => True)
),
Index: property/templates/base/custom.xsl
diff -u property/templates/base/custom.xsl:1.1
property/templates/base/custom.xsl:1.2
--- property/templates/base/custom.xsl:1.1 Mon Jan 17 10:03:18 2005
+++ property/templates/base/custom.xsl Thu Jan 19 14:31:09 2006
@@ -160,17 +160,17 @@
</tr>
<tr align="left">
<td valign="top" >
- <xsl:value-of select="lang_sql"/>
+ <xsl:value-of select="lang_sql_text"/>
</td>
<td align="left">
- <textarea cols="60" rows="6"
name="values[sql]" wrap="virtual" onMouseout="window.status='';return true;">
+ <textarea cols="60" rows="6"
name="values[sql_text]" wrap="virtual" onMouseout="window.status='';return
true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_sql_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
- <xsl:value-of
select="value_sql"/>
+ <xsl:value-of
select="value_sql_text"/>
</textarea>
</td>
</tr>
Index: property/templates/default/custom.xsl
diff -u property/templates/default/custom.xsl:1.2
property/templates/default/custom.xsl:1.3
--- property/templates/default/custom.xsl:1.2 Wed Jun 2 19:09:46 2004
+++ property/templates/default/custom.xsl Thu Jan 19 14:31:09 2006
@@ -160,17 +160,17 @@
</tr>
<tr align="left">
<td valign="top" >
- <xsl:value-of select="lang_sql"/>
+ <xsl:value-of select="lang_sql_text"/>
</td>
<td align="left">
- <textarea cols="60" rows="6"
name="values[sql]" wrap="virtual" onMouseout="window.status='';return true;">
+ <textarea cols="60" rows="6"
name="values[sql_text]" wrap="virtual" onMouseout="window.status='';return
true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_sql_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
- <xsl:value-of
select="value_sql"/>
+ <xsl:value-of
select="value_sql_text"/>
</textarea>
</td>
</tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.socustom.inc.php inc/class.u...,
Sigurd Nes <=