[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16808] Stable: Merge 16803:16807 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16808] Stable: Merge 16803:16807 from trunk |
|
Date: |
Wed, 31 May 2017 11:52:49 -0400 (EDT) |
Revision: 16808
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16808
Author: sigurdne
Date: 2017-05-31 11:52:49 -0400 (Wed, 31 May 2017)
Log Message:
-----------
Stable: Merge 16803:16807 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/admin/inc/class.boaccounts.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.cache.inc.php
branches/Version-2_0-branch/phpgwapi/setup/setup.inc.php
branches/Version-2_0-branch/phpgwapi/setup/tables_update.inc.php
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-05-31 15:48:15 UTC (rev 16807)
+++ branches/Version-2_0-branch 2017-05-31 15:52:49 UTC (rev 16808)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16787
/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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/admin/inc/class.boaccounts.inc.php
===================================================================
--- branches/Version-2_0-branch/admin/inc/class.boaccounts.inc.php
2017-05-31 15:48:15 UTC (rev 16807)
+++ branches/Version-2_0-branch/admin/inc/class.boaccounts.inc.php
2017-05-31 15:52:49 UTC (rev 16808)
@@ -226,7 +226,7 @@
if ( $values['id'] )
{
- $user =
$GLOBALS['phpgw']->accounts->get($values['id']);
+ $user =
$GLOBALS['phpgw']->accounts->get($values['id'], $use_cache = false);
}
else
{
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.cache.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.cache.inc.php
2017-05-31 15:48:15 UTC (rev 16807)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.cache.inc.php
2017-05-31 15:52:49 UTC (rev 16808)
@@ -38,6 +38,22 @@
class phpgwapi_cache
{
/**
+ * Decide whether to use database for caching - or not
+ *
+ * @param string $module the module name the data belongs to
+ * @param string $id the internal module id for the data
+ * @return bool use database
+ */
+ protected static function _use_database($module, $id)
+ {
+ $use_database = array(
+ 'controller' => array('location_bookmark' =>
true),
+ 'phpgwapi' => array('bookmark_menu' => true)
+ );
+ return !!$use_database[$module][$id];
+ }
+
+ /**
* Clear stored data from shared memory
*
* @param string $key the data identifier
@@ -312,7 +328,7 @@
*/
public static function user_clear($module, $id, $uid)
{
- $db = false;
+ $db = self::_use_database($module, $id);
if($db)
{
return self::_user_clear_db($module, $id, $uid);
@@ -333,7 +349,7 @@
*/
public static function user_get($module, $id, $uid, $bypass =
true, $compress = false)
{
- $db = false;
+ $db = self::_use_database($module, $id);
if($db)
{
return self::_user_get_db($module, $id, $uid,
$bypass, $compress);
@@ -355,7 +371,7 @@
*/
public static function user_set($module, $id, $value, $uid,
$bypass = true, $compress = false)
{
- $db = false;
+ $db = self::_use_database($module, $id);
if($db)
{
return self::_user_set_db($module, $id, $value,
$uid, $bypass, $compress);
@@ -498,7 +514,7 @@
* @param int $uid the user id to the data is stored for
* @return mixed the data from user cache
*/
- protected static function _user_get($module, $id, $uid, $bypass
= true, $compress = false)
+ static function _user_get($module, $id, $uid, $bypass = true,
$compress = false)
{
$uid = (int) $uid;
$module = $module . '_' . $uid;
Modified: branches/Version-2_0-branch/phpgwapi/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/setup/setup.inc.php 2017-05-31
15:48:15 UTC (rev 16807)
+++ branches/Version-2_0-branch/phpgwapi/setup/setup.inc.php 2017-05-31
15:52:49 UTC (rev 16808)
@@ -12,7 +12,7 @@
// Basic information about this app
$setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'phpgwapi';
- $setup_info['phpgwapi']['version'] = '0.9.17.555';
+ $setup_info['phpgwapi']['version'] = '0.9.17.556';
$setup_info['phpgwapi']['versions']['current_header'] = '1.31';
$setup_info['phpgwapi']['versions']['system'] = '2.0';
$setup_info['phpgwapi']['enable'] = 3;
Modified: branches/Version-2_0-branch/phpgwapi/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/setup/tables_update.inc.php
2017-05-31 15:48:15 UTC (rev 16807)
+++ branches/Version-2_0-branch/phpgwapi/setup/tables_update.inc.php
2017-05-31 15:52:49 UTC (rev 16808)
@@ -3520,3 +3520,55 @@
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
}
}
+
+
+ /**
+ * Use database for user cache
+ * @return string the new version number
+ */
+
+ $test[] = '0.9.17.555';
+ function phpgwapi_upgrade0_9_17_555()
+ {
+ phpgw::import_class('phpgwapi.cache');
+ $GLOBALS['phpgw']->db = & $GLOBALS['phpgw_setup']->oProc->m_odb;
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT config_value FROM
phpgw_config WHERE config_app = 'phpgwapi' AND config_name = 'temp_dir'");
+ $GLOBALS['phpgw_setup']->oProc->next_record();
+ $GLOBALS['phpgw_info']['server']['temp_dir'] =
$GLOBALS['phpgw_setup']->oProc->f('config_value');
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT config_value FROM
phpgw_config WHERE config_app = 'phpgwapi' AND config_name = 'install_id'");
+ $GLOBALS['phpgw_setup']->oProc->next_record();
+ $GLOBALS['phpgw_info']['server']['install_id'] =
$GLOBALS['phpgw_setup']->oProc->f('config_value');
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT account_id FROM
phpgw_accounts WHERE account_id = 7 AND account_type = 'u' AND account_status =
'A'");
+
+ $users = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $users[] =
$GLOBALS['phpgw_setup']->oProc->f('account_id');
+ }
+
+ foreach ($users as $user_id)
+ {
+ //from file
+ if($bookmarks = phpgwapi_cache::_user_get('controller',
"location_bookmark", $user_id))
+ {
+ //to database
+ phpgwapi_cache::user_set('controller',
"location_bookmark", $bookmarks, $user_id);
+ }
+
+ //from file
+ if($bookmarks = phpgwapi_cache::_user_get('phpgwapi',
"bookmark_menu", $user_id))
+ {
+ //to database
+ phpgwapi_cache::user_set('phpgwapi',
"bookmark_menu", $bookmarks, $user_id);
+ }
+ }
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['phpgwapi']['currentver'] =
'0.9.17.556';
+ return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+ }
+ }
Modified:
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
2017-05-31 15:48:15 UTC (rev 16807)
+++
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
2017-05-31 15:52:49 UTC (rev 16808)
@@ -22,8 +22,8 @@
h3,
h4,
h5,
-h6,
-label {
+h6
+{
color: #2d6d8f;
letter-spacing: 0.1em;
font-weight: normal;
@@ -33,9 +33,6 @@
.pure-g [class*="pure-u"] {
font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;
}
-.pure-g [class*="pure-u"] {
- font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;
-}
.l-box-lrg {
padding: 2em;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16808] Stable: Merge 16803:16807 from trunk,
sigurdne <=