[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16585] Stable: Merge 16576:16584 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16585] Stable: Merge 16576:16584 from trunk |
|
Date: |
Tue, 18 Apr 2017 04:40:12 -0400 (EDT) |
Revision: 16585
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16585
Author: sigurdne
Date: 2017-04-18 04:40:12 -0400 (Tue, 18 Apr 2017)
Log Message:
-----------
Stable: Merge 16576:16584 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
branches/Version-2_0-branch/booking/js/booking/schedule.js
branches/Version-2_0-branch/phpgwapi/inc/class.cache.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-04-18 08:38:29 UTC (rev 16584)
+++ branches/Version-2_0-branch 2017-04-18 08:40:12 UTC (rev 16585)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16394
/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
\ 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
\ No newline at end of property
Index: branches/Version-2_0-branch/booking
===================================================================
--- branches/Version-2_0-branch/booking 2017-04-18 08:38:29 UTC (rev 16584)
+++ branches/Version-2_0-branch/booking 2017-04-18 08:40:12 UTC (rev 16585)
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/booking:14933-16394
/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
-/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575
\ No newline at end of property
+/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584
\ No newline at end of property
Modified: branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
2017-04-18 08:38:29 UTC (rev 16584)
+++ branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
2017-04-18 08:40:12 UTC (rev 16585)
@@ -419,21 +419,25 @@
}
else
{
-// $dateTimeFrom = phpgw::get_var('from_',
'string', 'POST');
-// $dateTimeTo = phpgw::get_var('to_', 'string',
'POST');
+ $dateformat = phpgw::get_var('dateformat',
'string');
$dateTimeFrom = phpgw::get_var('from_',
'string');
$dateTimeTo = phpgw::get_var('to_', 'string');
- $dateTimeFromE = explode(" ", $dateTimeFrom[0]);
- $dateTimeToE = explode(" ", $dateTimeTo[0]);
- if (phpgw::get_var('from_', 'string') < 14)
+ if(is_array($dateTimeFrom))
{
- $timeFrom[] = phpgw::get_var('from_',
'string', 'POST');
- $timeTo[] = phpgw::get_var('to_',
'string', 'POST');
+ $dateTimeFrom = $dateTimeFrom[0];
+ $dateTimeTo = $dateTimeTo[0];
}
+ $dateTimeFromE = explode(" ", $dateTimeFrom);
+ $dateTimeToE = explode(" ", $dateTimeTo);
+ if ($dateTimeFrom < 14)
+ {
+ $timeFrom = $dateTimeFrom;
+ $timeTo = $dateTimeTo;
+ }
else
{
- $timeFrom[] = $dateTimeFromE[1];
- $timeTo[] = $dateTimeToE[1];
+ $timeFrom = $dateTimeFromE[1];
+ $timeTo = $dateTimeToE[1];
}
array_set_default($allocation, 'resources',
array(phpgw::get_var('resource', 'int')));
@@ -450,11 +454,9 @@
$allocation['cancel_link'] =
self::link(array('menuaction' => 'booking.uiallocation.index'));
array_set_default($allocation, 'cost', '0');
+// $_timeFrom = $timeFrom ? $timeFrom : '';
+ $_timeTo = $timeTo ? $timeTo : '';
-
- $_timeFrom = $timeFrom ? $timeFrom[0] : '';
- $_timeTo = $timeTo ? $timeTo[0] : '';
-
$tabs = array();
$tabs['generic'] = array('label' => lang('Allocation
New'), 'link' => '#allocation_new');
$active_tab = 'generic';
@@ -464,17 +466,25 @@
if ($step < 2)
{
- $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- $allocation['from_'] = date("{$dateformat}
H:i",strtotime($dateTimeFrom[0]));
+ if($dateformat == 'Y-m-d' &&
$_SERVER['REQUEST_METHOD'] == 'GET')
+ {
+ $allocation['from_'] =
date("{$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']}
H:i",strtotime($dateTimeFrom));
+ $_timeFrom = strtotime($dateTimeFrom);
+ }
+ else
+ {
+ $allocation['from_'] = $dateTimeFrom;
+ $_timeFrom =
phpgwapi_datetime::date_to_timestamp($dateTimeFrom);
+ }
if ($_SERVER['REQUEST_METHOD'] == 'POST' &&
$errors)
{
// $allocation['from_'] =
strftime("%H:%M", strtotime($_POST['weekday'] . " " . $_POST['from_']));
// $allocation['to_'] = strftime("%H:%M",
strtotime($_POST['weekday'] . " " . $_POST['to_']));
- $_timeFrom = $allocation['from_'];
- $_timeTo = $allocation['to_'];
+ // $_timeFrom = $allocation['from_'];
+ // $_timeTo = $allocation['to_'];
}
-
$GLOBALS['phpgw']->jqcal2->add_listener('field_from', 'datetime',
strtotime($dateTimeFrom[0]));
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_from', 'datetime', $_timeFrom);
$GLOBALS['phpgw']->jqcal2->add_listener('field_to', 'time', $_timeTo);
self::render_template_xsl('allocation_new',
array('allocation' => $allocation,
@@ -487,9 +497,6 @@
}
else if ($step == 2)
{
-//
$GLOBALS['phpgw']->jqcal2->add_listener('field_from', 'time', $_timeFrom);
-//
$GLOBALS['phpgw']->jqcal2->add_listener('field_to', 'time', $_timeTo);
-
self::render_template_xsl('allocation_new_preview', array('allocation' =>
$allocation,
'step' => $step,
'recurring' => $_POST['recurring'],
Modified: branches/Version-2_0-branch/booking/js/booking/schedule.js
===================================================================
--- branches/Version-2_0-branch/booking/js/booking/schedule.js 2017-04-18
08:38:29 UTC (rev 16584)
+++ branches/Version-2_0-branch/booking/js/booking/schedule.js 2017-04-18
08:40:12 UTC (rev 16585)
@@ -161,7 +161,7 @@
weekday[4] = "thursday";
weekday[5] = "friday";
weekday[6] = "saturday";
- url += '&from_[]=' + state + _from + '&to_[]=' + state + _to +
'&weekday=' + weekday[day];
+ url += '&from_[]=' + state + _from + '&to_[]=' + state + _to +
'&weekday=' + weekday[day] + '&dateformat=Y-m-d';
if (resource)
{
url += '&resource=' + resource;
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.cache.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.cache.inc.php
2017-04-18 08:38:29 UTC (rev 16584)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.cache.inc.php
2017-04-18 08:40:12 UTC (rev 16585)
@@ -143,11 +143,11 @@
* Prepares a value for storage - all values must be run
through here before caching
*
* @param mixed the value to store
+ * @param bool $bypass to skip encryption
* @return value to store as a string
*/
- protected static function _value_prepare($value, $bypass =
false)
+ protected static function _value_prepare($value, $bypass = true)
{
- // return
$GLOBALS['phpgw']->crypto->encrypt(serialize($value));
return $GLOBALS['phpgw']->crypto->encrypt($value,
$bypass);
}
@@ -155,9 +155,10 @@
* Returns a value is a usable form - all values must be run
through here before returning to the user
*
* @param string $str the string to process
+ * @param bool $bypass to skip encryption
* @return mixed the unserialized string
*/
- protected static function _value_return($str, $bypass = false)
+ protected static function _value_return($str, $bypass = true)
{
if ( is_null($str) )
{
@@ -247,7 +248,7 @@
* @param string $id the internal module id for the data
* @return mixed the data from system wide cache
*/
- public static function system_get($module, $id, $bypass =
false, $compress = false)
+ public static function system_get($module, $id, $bypass = true,
$compress = false)
{
$key = self::_gen_key($module, $id);
@@ -284,7 +285,7 @@
* @param mixed $data the data to store
* @return bool was the data stored in the system wide cache?
*/
- public static function system_set($module, $id, $value, $bypass
= false, $compress = false)
+ public static function system_set($module, $id, $value, $bypass
= true, $compress = false)
{
$key = self::_gen_key($module, $id);
$value = self::_value_prepare($value, $bypass);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16585] Stable: Merge 16576:16584 from trunk,
sigurdne <=