[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17104] property: email validation and phone numbers
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17104] property: email validation and phone numbers |
|
Date: |
Thu, 21 Sep 2017 06:50:07 -0400 (EDT) |
Revision: 17104
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17104
Author: sigurdne
Date: 2017-09-21 06:50:07 -0400 (Thu, 21 Sep 2017)
Log Message:
-----------
property: email validation and phone numbers
Modified Paths:
--------------
trunk/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.dataTables.css
trunk/phpgwapi/templates/base/datatable_jquery.xsl
trunk/phpgwapi/templates/frontend/head.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/templates/base/contact_form.xsl
Modified:
trunk/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.dataTables.css
===================================================================
--- trunk/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.dataTables.css
2017-09-20 19:23:36 UTC (rev 17103)
+++ trunk/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.dataTables.css
2017-09-21 10:50:07 UTC (rev 17104)
@@ -292,7 +292,7 @@
@media screen and (max-width: 640px) {
div.dt-buttons {
- float: none !important;
- text-align: center;
+/* float: none !important;*/
+ /* text-align: left;*/
}
}
Modified: trunk/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_jquery.xsl 2017-09-20 19:23:36 UTC
(rev 17103)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl 2017-09-21 10:50:07 UTC
(rev 17104)
@@ -674,12 +674,13 @@
});
</xsl:when>
</xsl:choose>
- button_def.push({
+ /* button_def.push({
extend: 'csvHtml5',
titleAttr: "<xsl:value-of
select="php:function('lang', 'download visible data')"/>",
fieldSeparator: ';',
bom:true
});
+*/
<xsl:choose>
<xsl:when test="download">
button_def.push({
Modified: trunk/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/frontend/head.inc.php 2017-09-20 19:23:36 UTC
(rev 17103)
+++ trunk/phpgwapi/templates/frontend/head.inc.php 2017-09-21 10:50:07 UTC
(rev 17104)
@@ -207,6 +207,7 @@
}
}
+
$header = <<<HTML
<div class="home-menu custom-menu-wrapper">
<div class="home-menu pure-menu pure-menu-horizontal
pure-menu-fixed">
@@ -213,7 +214,14 @@
<a href="{$site_url}"
class="pure-menu-heading">{$site_title}</a>
<ul class="pure-menu-list">
<li class="pure-menu-item
pure-menu-selected"><a href="{$site_url}"
class="pure-menu-link">{$home_text}</a></li>
+HTML;
+ if (!empty($manual))
+ {
+ $header .= <<<HTML
<li class="pure-menu-item
pure-menu-selected"><a href="{$manual}"
class="pure-menu-link">{$manual_text}</a></li>
+HTML;
+ }
+ $header .= <<<HTML
<li class="pure-menu-item
pure-menu-selected"><a href="{$login_url}"
class="pure-menu-link">{$login_text}</a></li>
</ul>
</div>
@@ -248,12 +256,7 @@
'logofile' => $logofile_frontend,
'header_search_class' =>
'hidden'//(isset($_GET['menuaction']) && $_GET['menuaction'] ==
'bookingfrontend.uisearch.index' ? 'hidden' : '')
);
- if ($manual !== null)
- {
- $tpl_vars['manual_text'] = $manual_text;
- $tpl_vars['manual_url'] = $manual;
- }
$user = $GLOBALS['phpgw']->accounts->get(
$GLOBALS['phpgw_info']['user']['id'] );
if($user && isset($_SESSION['phpgw_session']['session_flags']) &&
$_SESSION['phpgw_session']['session_flags'] == 'N')
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2017-09-20 19:23:36 UTC (rev
17103)
+++ trunk/property/inc/class.uitts.inc.php 2017-09-21 10:50:07 UTC (rev
17104)
@@ -3522,15 +3522,15 @@
if( preg_match( '/^(\d{2})(\d{2})(\d{2})(\d{2})$/',
$user_phone, $matches ) )
{
- $user_phone = "{$matches[1]} $matches[2]
$matches[2] $matches[4]";
+ $user_phone = "{$matches[1]} $matches[2]
$matches[3] $matches[4]";
}
if( preg_match( '/^(\d{2})(\d{2})(\d{2})(\d{2})$/',
$contact_phone, $matches ) )
{
- $contact_phone = "{$matches[1]} $matches[2]
$matches[2] $matches[4]";
+ $contact_phone = "{$matches[1]} $matches[2]
$matches[3] $matches[4]";
}
if( preg_match( '/^(\d{2})(\d{2})(\d{2})(\d{2})$/',
$contact_phone2, $matches ) )
{
- $contact_phone2 = "{$matches[1]} $matches[2]
$matches[2] $matches[4]";
+ $contact_phone2 = "{$matches[1]} $matches[2]
$matches[3] $matches[4]";
}
if($contact_name)
@@ -3806,15 +3806,15 @@
if( preg_match( '/^(\d{2})(\d{2})(\d{2})(\d{2})$/',
$user_phone, $matches ) )
{
- $user_phone = "{$matches[1]} $matches[2]
$matches[2] $matches[4]";
+ $user_phone = "{$matches[1]} $matches[2]
$matches[3] $matches[4]";
}
if( preg_match( '/^(\d{2})(\d{2})(\d{2})(\d{2})$/',
$contact_phone, $matches ) )
{
- $contact_phone = "{$matches[1]} $matches[2]
$matches[2] $matches[4]";
+ $contact_phone = "{$matches[1]} $matches[2]
$matches[3] $matches[4]";
}
if( preg_match( '/^(\d{2})(\d{2})(\d{2})(\d{2})$/',
$contact_phone2, $matches ) )
{
- $contact_phone2 = "{$matches[1]} $matches[2]
$matches[2] $matches[4]";
+ $contact_phone2 = "{$matches[1]} $matches[2]
$matches[3] $matches[4]";
}
function nl2br2($string)
@@ -4278,7 +4278,7 @@
$validator =
CreateObject('phpgwapi.EmailAddressValidator');
- if
($validator->check_email_address($GLOBALS['phpgw_info']['user']['preferences']['property']['email']))
+ if
(!$validator->check_email_address($GLOBALS['phpgw_info']['user']['preferences']['property']['email']))
{
$bcc = '';
phpgwapi_cache::message_set(lang('please update
<a href="%1">your email address here</a>',
$GLOBALS['phpgw']->link('/preferences/preferences.php',
array('appname'=>'property','type'=> 'user') )),'error' );
Modified: trunk/property/templates/base/contact_form.xsl
===================================================================
--- trunk/property/templates/base/contact_form.xsl 2017-09-20 19:23:36 UTC
(rev 17103)
+++ trunk/property/templates/base/contact_form.xsl 2017-09-21 10:50:07 UTC
(rev 17104)
@@ -49,13 +49,13 @@
</div>
</xsl:when>
</xsl:choose>
- <a onClick="{field}_contact_clear('{field}');">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'clear contact')"/>
- </xsl:attribute>
- <xsl:value-of select="php:function('lang',
'delete')"/>
- </a>
</div>
+ <a onClick="{field}_contact_clear('{field}');">
+ <xsl:attribute name="title">
+ <xsl:value-of select="php:function('lang',
'clear contact')"/>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'delete')"/>
+ </a>
<!--input type="checkbox" id="{field}_clear_contact"
name="clear_contact" value="0" onClick="{field}_contact_clear('{field}');"
readonly="readonly">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang',
'clear contact')"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17104] property: email validation and phone numbers,
sigurdne <=