[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7488] Merge 7484:7487 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7488] Merge 7484:7487 from trunk |
|
Date: |
Wed, 10 Aug 2011 18:26:50 +0000 |
Revision: 7488
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7488
Author: sigurdne
Date: 2011-08-10 18:26:48 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
Merge 7484:7487 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/inc/class.phpgw.inc.php
branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
branches/Version-1_0-branch/property/inc/class.uiadmin_location.inc.php
branches/Version-1_0-branch/property/inc/class.uientity.inc.php
branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
branches/Version-1_0-branch/property/templates/base/admin_location.xsl
branches/Version-1_0-branch/property/templates/base/entity.xsl
branches/Version-1_0-branch/property/templates/base/location.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.phpgw.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.phpgw.inc.php
2011-08-10 15:53:05 UTC (rev 7487)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.phpgw.inc.php
2011-08-10 18:26:48 UTC (rev 7488)
@@ -393,8 +393,8 @@
// Trim whitespace so it doesn't trip us up
$value = trim($value);
- // This won't be needed in PHP6 as GPC magic
quotes are being removed
- if ( get_magic_quotes_gpc() )
+ // This won't be needed in PHP 5.4 and later as
GPC magic quotes are being removed
+ if ( version_compare(PHP_VERSION, '5.3.7') <= 0
&& get_magic_quotes_gpc() )
{
$value = stripslashes($value);
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php 2011-08-10
15:53:05 UTC (rev 7487)
+++ branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php 2011-08-10
18:26:48 UTC (rev 7488)
@@ -305,7 +305,7 @@
case E_DEPRECATED:
case E_USER_DEPRECATED:
$log_args['severity'] = 'DP';
- $log->deprecated_($log_args);
+ $log->deprecated($log_args);
echo '<p class="msg">' . lang('deprecated: %1
in %2 at line %3', $error_msg, $error_file, $error_line) . "</p>\n";
echo '<pre>' . phpgw_parse_backtrace($bt) .
"</pre>\n";
break;
@@ -370,11 +370,11 @@
/* Load main class */
$GLOBALS['phpgw'] = createObject('phpgwapi.phpgw');
-
- if(get_magic_quotes_runtime())
+ // get_magic_quotes_runtime() is deprecated in php 5.4.0
+ if( version_compare(PHP_VERSION, '5.3.7') <= 0 &&
get_magic_quotes_runtime())
{
- echo '<center><b>The magic_quotes_runtime has to set to Off in
php.ini</b></center>';
- exit;
+ echo '<center><b>The magic_quotes_runtime has to set to
Off in php.ini</b></center>';
+ exit;
}
Modified: branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
2011-08-10 15:53:05 UTC (rev 7487)
+++ branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
2011-08-10 18:26:48 UTC (rev 7488)
@@ -2444,23 +2444,10 @@
'lang_lookup_form'
=> lang('show in lookup forms'),
'lang_lookup_form_statustext'
=> lang('check to show this attribue in lookup forms'),
'value_list'
=> $values['list'],
- 'lang_list'
=> lang('show in list'),
- 'lang_list_statustext'
=> lang('check to show this attribute in entity list'),
'value_search'
=> $values['search'],
- 'lang_include_search'
=> lang('Include in search'),
- 'lang_include_search_statustext'
=> lang('check to show this attribute in location list'),
-
'value_history'
=> $values['history'],
- 'lang_history'
=> lang('history'),
- 'lang_history_statustext'
=> lang('Enable history for this attribute'),
-
'value_disabled'
=> $values['disabled'],
- 'lang_disabled'
=> lang('disabled'),
- 'lang_disabled_statustext'
=> lang('This attribute turn up as disabled in the form'),
-
'value_helpmsg'
=> $values['helpmsg'],
- 'lang_helpmsg'
=> lang('help message'),
- 'lang_helpmsg_statustext'
=> lang('Enables help message for this attribute'),
);
//_debug_array($values);
Modified:
branches/Version-1_0-branch/property/inc/class.uiadmin_location.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiadmin_location.inc.php
2011-08-10 15:53:05 UTC (rev 7487)
+++ branches/Version-1_0-branch/property/inc/class.uiadmin_location.inc.php
2011-08-10 18:26:48 UTC (rev 7488)
@@ -1615,6 +1615,7 @@
'lang_datatype_statustext'
=> lang('Select a datatype'),
'lang_no_datatype'
=> lang('No datatype'),
'datatype_list'
=> $this->bocommon->select_datatype($values['column_info']['type']),
+ 'value_search'
=> $values['search'],
'lang_group'
=> lang('group'),
'lang_group_statustext'
=> lang('Select a group'),
Modified: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2011-08-10 15:53:05 UTC (rev 7487)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2011-08-10 18:26:48 UTC (rev 7488)
@@ -1654,6 +1654,7 @@
// required settings:
/*
integration_tab
+ integration_height
integration_url
integration_parametres
integration_action
@@ -1698,7 +1699,12 @@
$cxContext =
stream_context_create($aContext);
$response =
trim(file_get_contents($request, False, $cxContext));
- $integration[] = array('section' =>
$_config_section);
+ $integration[] = array
+ (
+ 'section' => $_config_section,
+ 'height' =>
isset($_config_section_data['height']) && $_config_section_data['height'] ?
$_config_section_data['height'] : 500
+ );
+
$_config_section_data['url']
= htmlspecialchars_decode($_config_section_data['url']);
$_config_section_data['parametres']
= htmlspecialchars_decode($_config_section_data['parametres']);
Modified: branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
2011-08-10 15:53:05 UTC (rev 7487)
+++ branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
2011-08-10 18:26:48 UTC (rev 7488)
@@ -2274,6 +2274,7 @@
// required settings:
/*
integration_tab
+ integration_height
integration_url
integration_parametres
integration_action
@@ -2319,7 +2320,11 @@
$_config_section_name =
str_replace(' ', '_',$_config_section);
- $integration[] =
array('section' => $_config_section_name);
+ $integration[] = array
+ (
+ 'section' =>
$_config_section_name,
+ 'height' =>
isset($_config_section_data['height']) && $_config_section_data['height'] ?
$_config_section_data['height'] : 500
+ );
$_config_section_data['url']
= htmlspecialchars_decode($_config_section_data['url']);
$_config_section_data['parametres'] =
htmlspecialchars_decode($_config_section_data['parametres']);
Modified: branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
2011-08-10 15:53:05 UTC (rev 7487)
+++ branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
2011-08-10 18:26:48 UTC (rev 7488)
@@ -1166,7 +1166,7 @@
</xsl:template>
<!-- add attribute / edit attribute -->
- <xsl:template match="edit_attrib">
+ <xsl:template match="edit_attrib" xmlns:php="http://php.net/xsl";>
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
@@ -1334,123 +1334,80 @@
</tr>
<tr>
<td>
- <xsl:value-of
select="lang_list"/>
+ <xsl:value-of
select="php:function('lang', 'show in list')" />
</td>
<td>
- <xsl:choose>
- <xsl:when
test="value_list = 1">
- <input
type="checkbox" name="values[list]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_list_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input
type="checkbox" name="values[list]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_list_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
+ <input type="checkbox"
name="values[list]" value="1">
+ <xsl:if
test="value_list = 1">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'check to show this attribute in
entity list')" />
+ </xsl:attribute>
+ </input>
</td>
</tr>
<tr>
<td>
- <xsl:value-of
select="lang_include_search"/>
+ <xsl:value-of
select="php:function('lang', 'include in search')" />
</td>
<td>
- <xsl:choose>
- <xsl:when
test="value_search = 1">
- <input
type="checkbox" name="values[search]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_include_search_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input
type="checkbox" name="values[search]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_include_search_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
+ <input type="checkbox"
name="values[search]" value="1">
+ <xsl:if
test="value_search = 1">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'check to show this attribute in
location list')" />
+ </xsl:attribute>
+ </input>
</td>
</tr>
<tr>
<td>
- <xsl:value-of
select="lang_history"/>
+ <xsl:value-of
select="php:function('lang', 'history')" />
</td>
<td>
- <xsl:choose>
- <xsl:when
test="value_history = 1">
- <input
type="checkbox" name="values[history]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_history_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input
type="checkbox" name="values[history]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_history_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
+ <input type="checkbox"
name="values[history]" value="1">
+ <xsl:if
test="value_history = 1">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'enable history for this
attribute')" />
+ </xsl:attribute>
+ </input>
</td>
</tr>
<tr>
<td>
- <xsl:value-of
select="lang_disabled"/>
+ <xsl:value-of
select="php:function('lang', 'disabled')" />
</td>
<td>
- <xsl:choose>
- <xsl:when
test="value_disabled = 1">
- <input
type="checkbox" name="values[disabled]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_disabled_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input
type="checkbox" name="values[disabled]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_disabled_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
+ <input type="checkbox"
name="values[disabled]" value="1">
+ <xsl:if
test="value_disabled = 1">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'this attribute turn up as disabled
in the form')" />
+ </xsl:attribute>
+ </input>
</td>
</tr>
-
<tr>
<td valign="top">
- <xsl:value-of
select="lang_helpmsg"/>
+ <xsl:value-of
select="php:function('lang', 'help message')" />
</td>
<td>
- <textarea cols="60"
rows="10" name="values[helpmsg]" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_helpmsg_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <textarea cols="60"
rows="10" name="values[helpmsg]">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'enables help message for this
attribute')" />
</xsl:attribute>
<xsl:value-of
select="value_helpmsg"/>
</textarea>
Modified: branches/Version-1_0-branch/property/templates/base/admin_location.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/admin_location.xsl
2011-08-10 15:53:05 UTC (rev 7487)
+++ branches/Version-1_0-branch/property/templates/base/admin_location.xsl
2011-08-10 18:26:48 UTC (rev 7488)
@@ -577,7 +577,7 @@
<!-- add attribute / edit attribute -->
- <xsl:template match="edit_attrib">
+ <xsl:template match="edit_attrib" xmlns:php="http://php.net/xsl";>
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
@@ -804,6 +804,24 @@
</xsl:choose>
</td>
</tr>
+ <tr>
+ <td>
+ <xsl:value-of
select="php:function('lang', 'include in search')" />
+ </td>
+ <td>
+ <input type="checkbox"
name="values[search]" value="1">
+ <xsl:if
test="value_search = 1">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'check to show this attribute in
location list')" />
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+
<xsl:choose>
<xsl:when test="multiple_choice
!= ''">
<tr>
Modified: branches/Version-1_0-branch/property/templates/base/entity.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/entity.xsl
2011-08-10 15:53:05 UTC (rev 7487)
+++ branches/Version-1_0-branch/property/templates/base/entity.xsl
2011-08-10 18:26:48 UTC (rev 7488)
@@ -249,7 +249,7 @@
<xsl:for-each select="integration">
<div id="{section}">
- <iframe id =
"{section}_content" width="100%" height="500">
+ <iframe id =
"{section}_content" width="100%" height="{height}">
<p>Your browser
does not support iframes.</p>
</iframe>
</div>
Modified: branches/Version-1_0-branch/property/templates/base/location.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/location.xsl
2011-08-10 15:53:05 UTC (rev 7487)
+++ branches/Version-1_0-branch/property/templates/base/location.xsl
2011-08-10 18:26:48 UTC (rev 7488)
@@ -559,7 +559,7 @@
</xsl:choose>
<xsl:for-each select="integration">
<div id="{section}">
- <iframe id =
"{section}_content" width="100%" height="500">
+ <iframe id =
"{section}_content" width="100%" height="{height}">
<p>Your browser
does not support iframes.</p>
</iframe>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7488] Merge 7484:7487 from trunk,
Sigurd Nes <=