[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16323] Stable: Merge 16319:16322 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16323] Stable: Merge 16319:16322 from trunk |
|
Date: |
Thu, 16 Feb 2017 11:03:45 -0500 (EST) |
Revision: 16323
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16323
Author: sigurdne
Date: 2017-02-16 11:03:45 -0500 (Thu, 16 Feb 2017)
Log Message:
-----------
Stable: Merge 16319:16322 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
branches/Version-2_0-branch/property/inc/class.soadmin_entity.inc.php
branches/Version-2_0-branch/property/templates/base/entity.xsl
branches/Version-2_0-branch/property/templates/base/tts.xsl
branches/Version-2_0-branch/registration/inc/class.uireg.inc.php
branches/Version-2_0-branch/registration/templates/base/lostpw_change.tpl
branches/Version-2_0-branch/registration/templates/base/personal_info.tpl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-16 15:59:49 UTC (rev 16322)
+++ branches/Version-2_0-branch 2017-02-16 16:03:45 UTC (rev 16323)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16300
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322
\ No newline at end of property
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php 2017-02-16
15:59:49 UTC (rev 16322)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php 2017-02-16
16:03:45 UTC (rev 16323)
@@ -408,8 +408,12 @@
$insert_value = array();
foreach ( $values as $value )
{
- if($value || (is_numeric($value) && $value ==
0) )
+ if($value && $this->isJson($value))
{
+ $insert_value[] = "'" .
$this->db_addslashes($value) . "'";
+ }
+ else if($value || (is_numeric($value) && $value
== 0) )
+ {
if ( is_numeric($value) )
{
$insert_value[] = "'{$value}'";
@@ -419,10 +423,6 @@
$insert_value[] = "'" .
$this->db_addslashes(stripslashes($value)) . "'"; //in case slashes are already
added.
}
}
- else if($value && $this->isJson($value))
- {
- $insert_value[] = "'{$value}'";
- }
else
{
$insert_value[] = 'NULL';
@@ -433,6 +433,10 @@
final public function isJson($string)
{
+ if(!preg_match('/^{/', $string))
+ {
+ return false;
+ }
json_decode($string);
return (json_last_error() == JSON_ERROR_NONE);
}
@@ -453,8 +457,12 @@
$value_entry = array();
foreach ( $value_set as $field => $value )
{
- if($value || (is_numeric($value) && $value ==
0) )
+ if($value && $this->isJson($value))
{
+ $value_entry[]= "{$field}='" .
$this->db_addslashes($value) . "'";
+ }
+ else if($value || (is_numeric($value) && $value
== 0) )
+ {
if ( is_numeric($value) )
{
if((strlen($value) > 1 &&
strpos($value,'0') === 0))
@@ -468,13 +476,9 @@
}
else
{
- $value_entry[]=
"{$field}='{$value}'";
+ $value_entry[]= "{$field}='" .
$this->db_addslashes(stripslashes($value)) . "'"; //in case slashes are already
added.
}
}
- else if($value && $this->isJson($value))
- {
- $value_entry[]= "{$field}='{$value}'";
- }
else
{
$value_entry[]= "{$field}=NULL";
@@ -483,6 +487,15 @@
return implode(',', $value_entry);
}
+ final public function stripslashes( $value )
+ {
+ $str = preg_replace_callback('/u([0-9a-fA-F]{4})/',
function ($match)
+ {
+ return mb_convert_encoding(pack('H*',
$match[1]), 'UTF-8', 'UTF-16BE');
+ }, $value);
+
+ return
htmlspecialchars_decode(stripslashes(str_replace(array('&','(',
')', '=','−−',';'), array('&','(', ')', '=', '--',';'),
$str)),ENT_QUOTES);
+ }
/**
* Get the number of rows affected by last update
*
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2017-02-16 15:59:49 UTC (rev 16322)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2017-02-16 16:03:45 UTC (rev 16323)
@@ -831,11 +831,7 @@
{
if ($strip_slashes ||
($this->auto_stripslashes && ! $strip_slashes))
{
- // $str =
preg_replace_callback('/\\\\u([0-9a-fA-F]{4})/', function ($match){
- $str =
preg_replace_callback('/u([0-9a-fA-F]{4})/', function ($match){
- return
mb_convert_encoding(pack('H*', $match[1]), 'UTF-8', 'UTF-16BE');
- }, $this->Record[$name]);
- return
htmlspecialchars_decode(stripslashes(str_replace(array('&','(',
')', '=','−−',';'), array('&','(', ')', '=', '--',';'),
$str)),ENT_QUOTES);
+ return
parent::stripslashes($this->Record[$name]);
}
else
{
Modified: branches/Version-2_0-branch/property/inc/class.soadmin_entity.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soadmin_entity.inc.php
2017-02-16 15:59:49 UTC (rev 16322)
+++ branches/Version-2_0-branch/property/inc/class.soadmin_entity.inc.php
2017-02-16 16:03:45 UTC (rev 16323)
@@ -1190,6 +1190,14 @@
{
$data =
$this->db2->Record;
+ if($data)
+ {
+ foreach ($data
as $key => &$value)
+ {
+ $value
= $value === null ? null : $this->db->stripslashes($value);
+ }
+ }
+
$p_location_id = '';
if ($data['p_cat_id'])
{
Modified: branches/Version-2_0-branch/property/templates/base/entity.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/entity.xsl
2017-02-16 15:59:49 UTC (rev 16322)
+++ branches/Version-2_0-branch/property/templates/base/entity.xsl
2017-02-16 16:03:45 UTC (rev 16323)
@@ -489,20 +489,18 @@
<fieldset>
<xsl:choose>
<xsl:when test="mode='edit'">
-
<tr>
+
<div class="pure-control-group">
<xsl:variable name="lang_entity_group">
<xsl:value-of select="php:function('lang', 'entity group')"/>
</xsl:variable>
-
<td>
+
<label>
<xsl:value-of select="$lang_entity_group"/>
-
</td>
-
<td valign="top">
-
<select name="values[entity_group_id]"
title="$lang_entity_group">
-
<xsl:apply-templates
select="entity_group_list/options"/>
-
</select>
-
<xsl:value-of select="entity_group_name"/>
-
</td>
-
</tr>
+
</label>
+
<select name="values[entity_group_id]" title="$lang_entity_group">
+
<xsl:apply-templates select="entity_group_list/options"/>
+
</select>
+
<xsl:value-of select="entity_group_name"/>
+
</div>
<xsl:choose>
<xsl:when test="org_unit='1'">
@@ -741,8 +739,8 @@
</div>
</xsl:for-each>
- <xsl:choose>
- <xsl:when test="value_id!='' and documents =1">
+ <xsl:choose>
+ <xsl:when test="value_id!='' and
documents =1">
<div id="document">
<div
class="pure-control-group">
<label>
@@ -753,21 +751,21 @@
</select>
</div>
- <xsl:for-each
select="datatable_def">
- <xsl:if
test="container = 'datatable-container_7'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="tabletools" select ='tabletools' />
-
<xsl:with-param name="data" select ='data' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
-
</xsl:if>
- </xsl:for-each>
+ <xsl:for-each
select="datatable_def">
+ <xsl:if
test="container = 'datatable-container_7'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl' />
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="config" select ='config' />
+
</xsl:call-template>
+ </xsl:if>
+ </xsl:for-each>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<xsl:choose>
<xsl:when test="value_id !='' and
enable_bulk = 0">
Modified: branches/Version-2_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/tts.xsl 2017-02-16
15:59:49 UTC (rev 16322)
+++ branches/Version-2_0-branch/property/templates/base/tts.xsl 2017-02-16
16:03:45 UTC (rev 16323)
@@ -1327,17 +1327,17 @@
<xsl:if test="simple !='1'">
<hr noshade="noshade" width="100%" align="center" size="1"/>
- <div class="proplist-col">
+ <div class="pure-g">
<xsl:choose>
<xsl:when test="request_link != ''">
<xsl:variable name="request_link">
<xsl:value-of
select="request_link"/>
</xsl:variable>
- <form method="post"
action="{$request_link}">
+ <form method="post"
action="{$request_link}" class="pure-u-1-1 pure-u-md-1-2">
<xsl:variable
name="lang_generate_request">
<xsl:value-of
select="php:function('lang', 'Generate Request')"/>
</xsl:variable>
- <input type="submit"
class="pure-button pure-button-primary" name="location"
value="{$lang_generate_request}">
+ <input type="submit"
class="pure-button pure-button-primary pure-u-24-24" name="location"
value="{$lang_generate_request}">
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'click this to generate a request with this
information')"/>
</xsl:attribute>
@@ -1350,11 +1350,11 @@
<xsl:variable name="order_link">
<xsl:value-of
select="order_link"/>
</xsl:variable>
- <form method="post"
action="{$order_link}">
+ <form method="post"
action="{$order_link}" class="pure-u-1-1 pure-u-md-1-2">
<xsl:variable
name="lang_generate_project">
<xsl:value-of
select="php:function('lang', 'generate new project')"/>
</xsl:variable>
- <input type="submit"
class="pure-button pure-button-primary" name="location"
value="{$lang_generate_project}">
+ <input type="submit"
class="pure-button pure-button-primary pure-u-24-24" name="location"
value="{$lang_generate_project}">
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'click this to generate a project with this
information')"/>
</xsl:attribute>
@@ -1364,11 +1364,11 @@
<xsl:variable
name="add_to_project_link">
<xsl:value-of
select="add_to_project_link"/>
</xsl:variable>
- <form method="post"
action="{$add_to_project_link}">
+ <form method="post"
action="{$add_to_project_link}" class="pure-u-1-1 pure-u-md-1-2">
<xsl:variable
name="lang_add_to_project">
<xsl:value-of
select="php:function('lang', 'add to project')"/>
</xsl:variable>
- <input type="submit"
class="pure-button pure-button-primary" name="location"
value="{$lang_add_to_project}">
+ <input type="submit"
class="pure-button pure-button-primary pure-u-24-24" name="location"
value="{$lang_add_to_project}">
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'click this to add an order to an existing
project')"/>
</xsl:attribute>
@@ -1382,11 +1382,11 @@
<xsl:variable name="link">
<xsl:value-of
select="link"/>
</xsl:variable>
- <form method="post"
action="{$link}">
+ <form method="post"
action="{$link}" class="pure-u-1-1 pure-u-md-1-2">
<xsl:variable
name="name">
<xsl:value-of
select="name"/>
</xsl:variable>
- <input type="submit"
class="pure-button pure-button-primary" name="location" value="{$name}"
onMouseout="window.status='';return true;">
+ <input type="submit"
class="pure-button pure-button-primary pure-u-24-24" name="location"
value="{$name}">
<xsl:attribute
name="title">
<xsl:value-of select="lang_start_statustext"/>
</xsl:attribute>
Modified: branches/Version-2_0-branch/registration/inc/class.uireg.inc.php
===================================================================
--- branches/Version-2_0-branch/registration/inc/class.uireg.inc.php
2017-02-16 15:59:49 UTC (rev 16322)
+++ branches/Version-2_0-branch/registration/inc/class.uireg.inc.php
2017-02-16 16:03:45 UTC (rev 16323)
@@ -273,6 +273,7 @@
$this->template->set_var('lang_password',
lang('Password'));
$this->template->set_var('lang_reenter_password',
lang('Re-enter password'));
$this->template->set_var('lang_submit', lang('Submit'));
+ $this->template->set_var('lang_error_match', lang('The
two passwords are not the same'));
if (!$show_password_prompt)
{
@@ -380,6 +381,7 @@
$this->template->set_var('lang_enter_password',
lang('Enter your new password'));
$this->template->set_var('lang_reenter_password',
lang('Re-enter your password'));
$this->template->set_var('lang_change', lang('Change'));
+ $this->template->set_var('lang_error_match', lang('The
two passwords are not the same'));
$this->template->pfp('out', 'form');
$this->footer();
Modified:
branches/Version-2_0-branch/registration/templates/base/lostpw_change.tpl
===================================================================
--- branches/Version-2_0-branch/registration/templates/base/lostpw_change.tpl
2017-02-16 15:59:49 UTC (rev 16322)
+++ branches/Version-2_0-branch/registration/templates/base/lostpw_change.tpl
2017-02-16 16:03:45 UTC (rev 16323)
@@ -3,31 +3,39 @@
<center>{errors}</center>
-<form method="POST" action="{form_action}">
- <table border="0">
- <tr>
- <td>
+<form method="POST" action="{form_action}" class="pure-form pure-form-aligned">
+ <fieldset>
+ <div class="pure-control-group">
+ <label>
{lang_enter_password}
- </td>
- <td>
- <input type="password" name="r_reg[passwd]">
- </td>
- </tr>
- <tr>
- <td>
+ </label>
+ <input type="password" name="r_reg[passwd]"
required="required" id="password">
+ </div>
+ <div class="pure-control-group">
+ <label>
{lang_reenter_password}
- </td>
- <td>
- <input type="password" name="r_reg[passwd_2]">
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <input type="submit" name="submit"
value="{lang_change}">
- </td>
- </tr>
- </table>
+ </label>
+ <input type="password" name="r_reg[passwd_2]"
required="required" id="password_confirm" oninput="check(this)">
+ </div>
+ <div class="pure-controls">
+ <button type="submit" class="pure-button
pure-button-primary" name="submit">{lang_change}</button>
+ </div>
+ </fieldset>
</form>
+<script language='javascript' type='text/javascript'>
+ function check(input)
+ {
+ if (input.value != document.getElementById('password').value)
+ {
+ input.setCustomValidity('{lang_error_match}');
+ }
+ else
+ {
+ // input is valid -- reset the error message
+ input.setCustomValidity('');
+ }
+ }
+</script>
<br>
<pre>{sql_message}</pre>
<!-- END form -->
Modified:
branches/Version-2_0-branch/registration/templates/base/personal_info.tpl
===================================================================
--- branches/Version-2_0-branch/registration/templates/base/personal_info.tpl
2017-02-16 15:59:49 UTC (rev 16322)
+++ branches/Version-2_0-branch/registration/templates/base/personal_info.tpl
2017-02-16 16:03:45 UTC (rev 16323)
@@ -47,7 +47,7 @@
<div class="pure-control-group">
<label
for="password2">{missing_passwd_confirm}{lang_reenter_password}</label>
- <input type="password" id="password2" type="text"
placeholder="{lang_password}" name="r_reg[passwd_confirm]"
value="{value_passwd_confirm}" required>
+ <input type="password" id="password2" type="text"
placeholder="{lang_password}" name="r_reg[passwd_confirm]"
value="{value_passwd_confirm}" required oninput="check(this)">
</div>
<!-- END password -->
@@ -73,5 +73,19 @@
</fieldset>
</form>
+<script language='javascript' type='text/javascript'>
+ function check(input)
+ {
+ if (input.value != document.getElementById('password').value)
+ {
+ input.setCustomValidity('{lang_error_match}');
+ }
+ else
+ {
+ // input is valid -- reset the error message
+ input.setCustomValidity('');
+ }
+ }
+</script>
<!-- END form -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16323] Stable: Merge 16319:16322 from trunk,
sigurdne <=