[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17331] Merge 17320:17330 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17331] Merge 17320:17330 from trunk |
|
Date: |
Sat, 18 Nov 2017 11:27:00 -0500 (EST) |
Revision: 17331
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17331
Author: sigurdne
Date: 2017-11-18 11:26:59 -0500 (Sat, 18 Nov 2017)
Log Message:
-----------
Merge 17320:17330 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/admin/inc/class.uiconfig.inc.php
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
branches/Version-2_0-branch/felamimail/inc/class.bofelamimail.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.menu.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.login.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
branches/Version-2_0-branch/phpgwapi/templates/portico/js/jqtree_jsmenu.js
branches/Version-2_0-branch/property/inc/class.menu.inc.php
branches/Version-2_0-branch/registration/inc/class.boreg.inc.php
branches/Version-2_0-branch/registration/inc/class.soreg.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-11-18 16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch 2017-11-18 16:26:59 UTC (rev 17331)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/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,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319
\ 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,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330
\ No newline at end of property
Modified: branches/Version-2_0-branch/admin/inc/class.uiconfig.inc.php
===================================================================
--- branches/Version-2_0-branch/admin/inc/class.uiconfig.inc.php
2017-11-18 16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch/admin/inc/class.uiconfig.inc.php
2017-11-18 16:26:59 UTC (rev 17331)
@@ -59,7 +59,7 @@
case 'phpgwapi':
case '':
/* This keeps the admin from getting
into what is a setup-only config */
- Header('Location: ' . $_redir);
+ Header('Location: ' .
str_replace('&', '&', $_redir) );
break;
default:
$config_appname = $appname;
@@ -137,9 +137,9 @@
if(!$errors)
{
+//
$GLOBALS['phpgw_info']['flags']['nodisplay'] = true;
$GLOBALS['phpgw']->session->appsession('session_data','admin_config',-1);
- Header('Location: ' . $_redir);
-
$GLOBALS['phpgw_info']['flags']['nodisplay'] = true;
+ Header('Location: ' .
str_replace('&', '&', $_redir) );
exit;
}
}
Modified:
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
2017-11-18 16:24:27 UTC (rev 17330)
+++
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
2017-11-18 16:26:59 UTC (rev 17331)
@@ -258,6 +258,13 @@
function addaccount()
{
$account_id =
(int)$GLOBALS['hook_values']['account_id'];
+
+ $GLOBALS['phpgw']->db->query("SELECT account_id FROM
phpgw_accounts_data WHERE account_id = {$account_id}",__LINE__,__FILE__);
+ if ($this->db->next_record())
+ {
+ return;
+ }
+
$headers = getallheaders();
$ssn = $headers['uid'];
Modified: branches/Version-2_0-branch/felamimail/inc/class.bofelamimail.inc.php
===================================================================
--- branches/Version-2_0-branch/felamimail/inc/class.bofelamimail.inc.php
2017-11-18 16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch/felamimail/inc/class.bofelamimail.inc.php
2017-11-18 16:26:59 UTC (rev 17331)
@@ -178,6 +178,11 @@
*/
function addAccount($_hookValues)
{
+ if(!$this->mailPreferences)
+ {
+
phpgwapi_cache::message_set('bofelamimail::mailPreferences not set', 'error');
+ return;
+ }
$icServer =
$this->mailPreferences->getIncomingServer(0);
if(is_a($icServer,'defaultimap')) {
$icServer->addAccount($_hookValues);
Modified: branches/Version-2_0-branch/helpdesk/inc/class.menu.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.menu.inc.php 2017-11-18
16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch/helpdesk/inc/class.menu.inc.php 2017-11-18
16:26:59 UTC (rev 17331)
@@ -242,6 +242,10 @@
);
foreach ($custom_menu_items as $item)
{
+ if(empty($item['local_files']))
+ {
+ $item['url'] .= '&' .
get_phpgw_session_url();
+ }
$menus['navigation']['report']['children'][] = $item;
}
}
Modified: branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-11-18 16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-11-18 16:26:59 UTC (rev 17331)
@@ -849,6 +849,7 @@
if($subs && (int)$this->parent_cat_id <= 0)
{
+
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
"helpdesk::helpdesk_{$_cat['main']}"; // to expand the menu
$GLOBALS['phpgw_info']['flags']['app_header'] =
$this->lang_app_name . ': ' . lang('choose a section from the menu');
self::render_template_xsl('datatable_jquery',
array());
return;
@@ -895,6 +896,7 @@
'datatable_name' => $appname . ': ' .
$function_msg,
'form' => array(
'toolbar' => array(
+ 'show_filter_group' => true,
'item' => array(
array
(
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.login.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.login.inc.php
2017-11-18 16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.login.inc.php
2017-11-18 16:26:59 UTC (rev 17331)
@@ -189,6 +189,16 @@
}
$cd_array['skip_remote'] = true;
+ if ($lightbox)
+ {
+ $cd_array['lightbox'] = true;
+ }
+
+ if ($logindomain)
+ {
+ $cd_array['domain'] =
$logindomain;
+ }
+
$GLOBALS['phpgw']->redirect_link("/{$partial_url}", $cd_array);
exit;
}
@@ -269,6 +279,7 @@
//Reset auth object
$GLOBALS['phpgw']->auth =
createObject('phpgwapi.auth');
$login =
$GLOBALS['phpgw']->auth->get_username();
+ $logindomain = phpgw::get_var('domain',
'string', 'GET');
if($login)
{
@@ -278,7 +289,6 @@
);
$GLOBALS['phpgw']->hooks->process('auto_addaccount', array('frontend',
'helpdesk'));
- $logindomain = phpgw::get_var('domain',
'string', 'GET');
if (strstr($login, '#') === false &&
$logindomain)
{
$login .= "#{$logindomain}";
@@ -300,6 +310,10 @@
{
$cd_array['lightbox'] = true;
}
+ if ($logindomain)
+ {
+ $cd_array['domain'] =
$logindomain;
+ }
$GLOBALS['phpgw']->redirect_link("/{$partial_url}", $cd_array);
exit;
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
2017-11-18 16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
2017-11-18 16:26:59 UTC (rev 17331)
@@ -142,11 +142,16 @@
protected $_sessionid;
/**
- * @var string $sessionid current user session id
+ * @var string $_sessionid current user session id
*/
protected $_use_cookies;
/**
+ * @var bool $_verified current has a verified session
+ */
+ protected $_verified;
+
+ /**
* Constructor just loads up some defaults from cookies
*/
public function __construct()
@@ -162,9 +167,15 @@
$this->_phpgw_set_cookie_params();
}
+ else if (!empty($_GET[session_name()]))
+ {
+ $this->_sessionid =
phpgw::get_var(session_name(),'string', 'GET');
+ ini_set("session.use_trans_sid", 1);
+ }
else
{
- $this->_sessionid =
phpgw::get_var(session_name()); // GET or POST
+ $this->_sessionid =
phpgw::get_var(session_name(), 'string', 'POST');
+ ini_set("session.use_trans_sid", 1);
}
@@ -345,6 +356,7 @@
$GLOBALS['phpgw']->auth->update_lastlogin($this->_account_id, $user_ip);
$GLOBALS['phpgw']->db->transaction_commit();
+ $this->_verified = true;
return $this->_sessionid;
}
@@ -671,7 +683,7 @@
{
if ( is_array($extravars) )
{
- $extravars =
array_merge($extravars, $this->_get_session_vars());
+ $extravars =
array_merge($this->_get_session_vars(), $extravars);
}
else
{
@@ -1380,6 +1392,7 @@
}
return false;
}
+ $this->_verified = true;
return true;
}
@@ -1498,7 +1511,7 @@
{
return array
(
- session_name() => $this->_sessionid,
+ session_name() => $this->_verified ?
$this->_sessionid : null,
'domain' =>
$this->_account_domain
);
}
Modified: branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2017-11-18
16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2017-11-18
16:26:59 UTC (rev 17331)
@@ -824,8 +824,9 @@
{
unset($_GET['click_history']);
unset($_GET['sessionid']);
+ unset($_GET[session_name()]);
unset($_GET['kp3']);
-
$GLOBALS['phpgw']->session->phpgw_setcookie('redirect',serialize($_GET),$cookietime=0);
+
$GLOBALS['phpgw']->session->phpgw_setcookie('redirect',serialize($_GET),$cookietime=
time()+60);
}
$cd_array = array();
if ( isset($GLOBALS['phpgw']->session->cd_reason) &&
$GLOBALS['phpgw']->session->cd_reason )
Modified:
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2017-11-18 16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2017-11-18 16:26:59 UTC (rev 17331)
@@ -31,8 +31,13 @@
<xsl:template name="datatable">
<script type="text/javascript">
- var number_of_toolbar_items = 0;
- var filter_selects = {};
+ var show_filter_group = false;
+ <xsl:if test="form/toolbar/show_filter_group = '1'">
+ show_filter_group = true;
+ </xsl:if>
+
+ var number_of_toolbar_items = 0;
+ var filter_selects = {};
</script>
<xsl:call-template name="jquery_phpgw_i18n"/>
<xsl:apply-templates select="form" />
@@ -1267,7 +1272,7 @@
});
}
- if(number_of_toolbar_items < 4)
+ if(number_of_toolbar_items < 5 || show_filter_group ==
true)
{
$('#header1').prop("checked", true);
}
Modified:
branches/Version-2_0-branch/phpgwapi/templates/portico/js/jqtree_jsmenu.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/portico/js/jqtree_jsmenu.js
2017-11-18 16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch/phpgwapi/templates/portico/js/jqtree_jsmenu.js
2017-11-18 16:26:59 UTC (rev 17331)
@@ -23,13 +23,13 @@
while (typeof (parent.element) !==
'undefined')
{
tree.tree('openNode', parent,
false);
- //
tree.tree('addToSelection', parent);
+ // tree.tree('addToSelection',
parent);
parent = parent.parent;
}
}
}
});
- }, 50);
+ }, 100);
});
//$(document).ready(function () {
Modified: branches/Version-2_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.menu.inc.php 2017-11-18
16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch/property/inc/class.menu.inc.php 2017-11-18
16:26:59 UTC (rev 17331)
@@ -1340,12 +1340,13 @@
{
$menus['navigation']['documentation']['children'][] = array
(
- 'url' => $item['url'],
+ 'url' => $item['url'] .=
!empty($item['local_files']) ? '' : '&' . get_phpgw_session_url(),
'text' => $item['text'],
'target' => $item['target'] ?
$item['target'] : '_blank',
'local_files' =>
$item['local_files']
);
}
+ unset($item);
}
if ($acl->check('.custom', PHPGW_ACL_READ, 'property'))
@@ -1386,8 +1387,14 @@
{
foreach
($custom_menu_items as $item)
{
+
if(empty($item['local_files']))
+ {
+
$item['url'] .= '&' . get_phpgw_session_url();
+ }
+
$menus['navigation']["entity_{$entry['id']}"]['children'][] = $item;
}
+ unset($item);
}
/*
Modified: branches/Version-2_0-branch/registration/inc/class.boreg.inc.php
===================================================================
--- branches/Version-2_0-branch/registration/inc/class.boreg.inc.php
2017-11-18 16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch/registration/inc/class.boreg.inc.php
2017-11-18 16:26:59 UTC (rev 17331)
@@ -268,6 +268,14 @@
if (!$errors)
{
+ $headers = getallheaders();
+ $ssn = $headers['uid'];
+ if($ssn)
+ {
+ $ssn_hash = "{SHA}" .
base64_encode(phpgwapi_common::hex2bin(sha1($ssn)));
+ $fields['ssn_hash'] =
$GLOBALS['phpgw']->db->db_addslashes($ssn_hash); // just to be safe :)
+ }
+
$so = createobject('registration.soreg');
$reg_id = $so->step2($fields);
}
Modified: branches/Version-2_0-branch/registration/inc/class.soreg.inc.php
===================================================================
--- branches/Version-2_0-branch/registration/inc/class.soreg.inc.php
2017-11-18 16:24:27 UTC (rev 17330)
+++ branches/Version-2_0-branch/registration/inc/class.soreg.inc.php
2017-11-18 16:26:59 UTC (rev 17331)
@@ -445,6 +445,17 @@
{
$GLOBALS['phpgw']->log->write(array('text' => 'I-Notification, user created %1',
'p1' => $account_lid));
+
+ if(!empty($fields['ssn_hash']))
+ {
+
$GLOBALS['phpgw']->db->query("SELECT account_id FROM phpgw_accounts_data WHERE
account_id = " . (int)$account_id,__LINE__,__FILE__);
+ if (!$this->db->next_record())
+ {
+ $data =
json_encode(array('ssn_hash' => $fields['ssn_hash']));
+ $sql = "INSERT INTO
phpgw_accounts_data (account_id, account_data) VALUES ({$account_id},
'{$data}')";
+
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
+ }
+ }
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17331] Merge 17320:17330 from trunk,
sigurdne <=