[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16639] Stable: Merge 16631:16638 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16639] Stable: Merge 16631:16638 from trunk |
|
Date: |
Thu, 27 Apr 2017 09:58:06 -0400 (EDT) |
Revision: 16639
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16639
Author: sigurdne
Date: 2017-04-27 09:58:06 -0400 (Thu, 27 Apr 2017)
Log Message:
-----------
Stable: Merge 16631:16638 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/inc/class.login.inc.php
branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
branches/Version-2_0-branch/property/inc/class.bogeneric.inc.php
branches/Version-2_0-branch/property/inc/class.sogeneric_.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-04-27 13:57:06 UTC (rev 16638)
+++ branches/Version-2_0-branch 2017-04-27 13:58:06 UTC (rev 16639)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16587
/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,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630
\ 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,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638
\ No newline at end of property
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.login.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.login.inc.php
2017-04-27 13:57:06 UTC (rev 16638)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.login.inc.php
2017-04-27 13:58:06 UTC (rev 16639)
@@ -90,6 +90,11 @@
/* Program starts here */
$uilogin = new phpgw_uilogin($tmpl,
$GLOBALS['phpgw_info']['server']['auth_type'] == 'remoteuser' &&
!isset($GLOBALS['phpgw_remote_user']));
+ if(phpgw::get_var('hide_lightbox', 'bool'))
+ {
+ $uilogin->phpgw_display_login(array());
+ }
+
if ($GLOBALS['phpgw_info']['server']['auth_type'] ==
'remoteuser' && isset($GLOBALS['phpgw_info']['server']['mapping']) &&
!empty($GLOBALS['phpgw_info']['server']['mapping']) &&
isset($_SERVER['REMOTE_USER']))
{
$login =
$GLOBALS['phpgw']->mapping->get_mapping($_SERVER['REMOTE_USER']);
@@ -123,6 +128,7 @@
// remove entities to stop mangling
$passwd =
html_entity_decode(phpgw::get_var('passwd', 'string', 'POST'));
}
+
if ($GLOBALS['phpgw_info']['server']['auth_type'] ==
'http' && isset($_SERVER['PHP_AUTH_USER']))
{
$submit = true;
@@ -225,9 +231,8 @@
unset($sslattributes);
}
- if ($GLOBALS['phpgw_info']['server']['auth_type'] ==
'customsso' && !isset($_GET['cd']))
+ if ($GLOBALS['phpgw_info']['server']['auth_type'] ==
'customsso' && (!isset($_REQUEST['skip_remote']) || !$_REQUEST['skip_remote']))
{
-
//Reset auth object
$GLOBALS['phpgw']->auth =
createObject('phpgwapi.auth');
$login =
$GLOBALS['phpgw']->auth->get_username();
@@ -246,6 +251,11 @@
}
$cd_array['skip_remote'] = true;
+ if ($lightbox)
+ {
+ $cd_array['lightbox'] = true;
+ }
+
$GLOBALS['phpgw']->redirect_link("/{$partial_url}", $cd_array);
exit;
}
@@ -266,18 +276,24 @@
$extra_vars['cd'] = 'yes';
- $GLOBALS['phpgw']->hooks->process('login');
- if ($after)
+// if ($lightbox)
+// {
+//
$GLOBALS['phpgw']->redirect_link("{$frontend}/login.php", array('hide_lightbox'
=> true));
+// }
+// else
{
- $this->redirect_after($frontend);
+
$GLOBALS['phpgw']->hooks->process('login');
+ if ($after)
+ {
+
$this->redirect_after($frontend);
+ }
+ else
+ {
+
$GLOBALS['phpgw']->redirect_link("{$frontend}/home.php", $extra_vars);
+ }
}
- else
- {
-
$GLOBALS['phpgw']->redirect_link("{$frontend}/home.php", $extra_vars);
- }
}
-
if ((isset($_POST['submitit']) ||
isset($_POST['submit_x']) || isset($_POST['submit_y'])))
{
if ($_SERVER['REQUEST_METHOD'] != 'POST' &&
@@ -350,7 +366,6 @@
}
$extra_vars['cd'] = 'yes';
- $GLOBALS['phpgw']->hooks->process('login');
if ($lightbox)
{
@@ -358,6 +373,7 @@
}
else
{
+
$GLOBALS['phpgw']->hooks->process('login');
if ($after)
{
$this->redirect_after($frontend);
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2017-04-27
13:57:06 UTC (rev 16638)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2017-04-27
13:58:06 UTC (rev 16639)
@@ -758,9 +758,58 @@
var oArgs = {lightbox: 1};
var strURL = phpGWLink('login.php', oArgs);
var width = $(window).width() * 0.80;
- TINY.box.show({iframe: strURL, boxid: 'frameless', width: width,
height: 400, fixed: false, maskid: 'darkmask', maskopacity: 40, mask: true,
animate: false, close: false, closejs: false});
+ TINY.box.show({
+ iframe: strURL,
+ boxid: 'frameless',
+ width: width,
+ height: 400,
+ fixed: false,
+ maskid: 'darkmask',
+ maskopacity: 40,
+ mask: true,
+ animate: false,
+ close: false,
+ openjs : function ()
+ {
+ lightboxlogin_check_session();
+ },
+ closejs: false
+ });
};
+/**
+ * In case of SSO
+ *
+ */
+lightboxlogin_check_session = function()
+{
+ var oArgs = {menuaction: 'property.bocommon.confirm_session'};
+ var strURL = phpGWLink('index.php', oArgs, true);
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: strURL,
+ success: function (data)
+ {
+ if (data != null)
+ {
+ if (data['sessionExpired'] == true)
+ {
+ //ntothing
+ }
+ else
+ {
+ TINY.box.hide();
+ }
+ }
+ },
+ failure: function (o)
+ {
+ },
+ timeout: 1000
+ });
+};
+
JqueryPortico.showlightbox_history = function (sUrl)
{
TINY.box.show({iframe: sUrl, boxid: 'frameless', width: 650, height:
400, fixed: false, maskid: 'darkmask', maskopacity: 40, mask: true, animate:
true, close: true});
Modified: branches/Version-2_0-branch/property/inc/class.bogeneric.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.bogeneric.inc.php
2017-04-27 13:57:06 UTC (rev 16638)
+++ branches/Version-2_0-branch/property/inc/class.bogeneric.inc.php
2017-04-27 13:58:06 UTC (rev 16639)
@@ -383,16 +383,21 @@
}
}
$params['custom_filter'] = $custom_filter;
+ $params['disable_id_search'] =
phpgw::get_var('disable_id_search', 'bool');
$values = $this->read($params);
-/*
- foreach ($values as &$entry)
+ $include = phpgw::get_var('include');
+
+ if($include)
{
- if ($entry['parent_id'])
+ foreach ($values as &$entry)
{
- $entry['name'] = "[{$entry['name']}] ::
{$entry['parent_id']}";
+ if ($entry[$include])
+ {
+ $entry['name'] =
"{$entry[$include]} {$entry['name']}";
+ }
}
}
-*/
+
return array('ResultSet' => array('Result' => $values));
}
@@ -399,8 +404,30 @@
public function get_single_name( $data = array() )
{
+ $include = !empty($data['include']) ? $data['include']
: false;
+ $attributes = array();
+ if($include)
+ {
+ $attributes[] = array('column_name' =>
$include);
+ }
+
$this->get_location_info($data['type']);
- $values = $this->so->read_single(array('id' =>
$data['id']));
+ $values = $this->so->read_single(array('id' =>
$data['id']), array('attributes' => $attributes));
+ if($include)
+ {
+ if (!empty($values['attributes']))
+ {
+ foreach ($values['attributes'] as
$entry)
+ {
+ if($entry['column_name'] ==
$include && $entry['value'])
+ {
+ $values['name'] =
"{$entry['value']} {$values['name']}";
+ break;
+ }
+ }
+ }
+ }
+
// $values['path'] = $values['name'];
// if ($values['parent_id'])
// {
Modified: branches/Version-2_0-branch/property/inc/class.sogeneric_.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sogeneric_.inc.php
2017-04-27 13:57:06 UTC (rev 16638)
+++ branches/Version-2_0-branch/property/inc/class.sogeneric_.inc.php
2017-04-27 13:58:06 UTC (rev 16639)
@@ -62,6 +62,7 @@
$query = isset($data['query']) ? $data['query'] : '';
$sort = isset($data['sort']) && $data['sort'] ?
$data['sort'] : 'DESC';
$order = isset($data['order']) ? $data['order'] : '';
+ $disable_id_search = empty($data['disable_id_search'])
? false : true;
$allrows = isset($data['allrows']) ? $data['allrows'] :
'';
$custom_criteria = isset($data['custom_criteria']) &&
$data['custom_criteria'] ? $data['custom_criteria'] : array();
$custom_filter = isset($data['custom_filter']) &&
$data['custom_filter'] ? $data['custom_filter'] : array();
@@ -242,20 +243,28 @@
$_query_end = ')';
}
$query = $this->_db->db_addslashes($query);
- $querymethod = " {$where } {$_query_start}
({$table}.{$this->location_info['id']['name']} = {$id_query}";
- //_debug_array($filtermethod);
- //_debug_array($where);die();
-
- if ($this->location_info['id']['type'] ==
'varchar')
+ if($disable_id_search)
{
- $querymethod .= " OR
{$table}.{$this->location_info['id']['name']} $this->_like '%$query%'";
- $where = 'OR';
+ $querymethod = " {$where }
{$_query_start} (1=0";
}
else
{
- $querymethod .= " OR CAST
({$table}.{$this->location_info['id']['name']} AS TEXT) $this->_like
'%$query%'";
+ $querymethod = " {$where }
{$_query_start} ({$table}.{$this->location_info['id']['name']} = {$id_query}";
+ if ($this->location_info['id']['type']
== 'varchar')
+ {
+ $querymethod .= " OR
{$table}.{$this->location_info['id']['name']} $this->_like '%$query%'";
+ $where = 'OR';
+ }
+ else
+ {
+ $querymethod .= " OR CAST
({$table}.{$this->location_info['id']['name']} AS TEXT) $this->_like
'%$query%'";
+ }
}
+ //_debug_array($filtermethod);
+ //_debug_array($where);die();
+ $where = 'OR';
+
foreach ($this->location_info['fields'] as
$field)
{
if ($field['type'] == 'varchar')
@@ -262,7 +271,6 @@
{
$querymethod .= " OR
{$table}.{$field['name']} $this->_like '%$query%'";
}
- $where = 'OR';
}
$querymethod .= ')';
@@ -282,7 +290,8 @@
{
if (ctype_digit($query))
{
- $_querymethod[]
= "$table." . $this->_db->f('column_name') . '=' . (int)$query;
+ // $_querymethod[]
= "$table." . $this->_db->f('column_name') . '=' . (int)$query;
+ $_querymethod[]
= "CAST ($table." . $this->_db->f('column_name') . " AS TEXT) {$this->_like}
'%" . (int)$query . "%'";
}
}
else
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16639] Stable: Merge 16631:16638 from trunk,
sigurdne <=