[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16747] Stable: Merge 16742:16746 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16747] Stable: Merge 16742:16746 from trunk |
|
Date: |
Wed, 17 May 2017 13:52:53 -0400 (EDT) |
Revision: 16747
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16747
Author: sigurdne
Date: 2017-05-17 13:52:53 -0400 (Wed, 17 May 2017)
Log Message:
-----------
Stable: Merge 16742:16746 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/admin/inc/class.bolog.inc.php
branches/Version-2_0-branch/frontend/setup/setup.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.log.inc.php
branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-2_0-branch/property/setup/setup.inc.php
branches/Version-2_0-branch/property/setup/tables_current.inc.php
branches/Version-2_0-branch/property/setup/tables_update.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-05-17 17:50:33 UTC (rev 16746)
+++ branches/Version-2_0-branch 2017-05-17 17:52:53 UTC (rev 16747)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16738
/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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/admin/inc/class.bolog.inc.php
===================================================================
--- branches/Version-2_0-branch/admin/inc/class.bolog.inc.php 2017-05-17
17:50:33 UTC (rev 16746)
+++ branches/Version-2_0-branch/admin/inc/class.bolog.inc.php 2017-05-17
17:52:53 UTC (rev 16747)
@@ -33,6 +33,12 @@
$_records = array();
$records = $this->so->list_log($account_id, $start,
$order, $sort);
+ if ( !isset($GLOBALS['phpgw']->log)
+ || !is_object($GLOBALS['phpgw']->log) )
+ {
+ $GLOBALS['phpgw']->log =
createObject('phpgwapi.log');
+ }
+ $log =& $GLOBALS['phpgw']->log;
foreach ( $records as $record )
{
// build and pass the format by hand as we want
to show the seconds
@@ -46,13 +52,13 @@
$record['log_account_lid'] = $t[0];
}
- $record['log_severity'] =
lang($GLOBALS['phpgw']->log->get_level_name($record['log_severity']));
+ $level_name =
$log->get_level_name($record['log_severity']);
$_records[] = array(
'log_date' =>
$record['log_date'],
'log_account_lid' =>
$record['log_account_lid'],
'log_app' =>
$record['log_app'],
- 'log_severity' =>
$record['log_severity'],
+ 'log_severity' =>
lang($level_name),
'log_file' =>
$record['log_file'],
'log_line' =>
$record['log_line'],
'log_msg' =>
$record['log_msg']
Modified: branches/Version-2_0-branch/frontend/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/frontend/setup/setup.inc.php 2017-05-17
17:50:33 UTC (rev 16746)
+++ branches/Version-2_0-branch/frontend/setup/setup.inc.php 2017-05-17
17:52:53 UTC (rev 16747)
@@ -36,11 +36,6 @@
'versions' => array('0.1.0')
);
- $setup_info['frontend']['depends'][] = array(
- 'appname' => 'messenger',
- 'versions' => array('0.9.17.500')
- );
-
/* The hooks this app includes, needed for hooks registration */
$setup_info['frontend']['hooks'] = array
(
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.log.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.log.inc.php 2017-05-17
17:50:33 UTC (rev 16746)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.log.inc.php 2017-05-17
17:52:53 UTC (rev 16747)
@@ -88,6 +88,7 @@
function get_level_name($level)
{
+ $level = trim($level);
return $this->log_level_names[$level];
}
@@ -297,7 +298,7 @@
else
{
echo $message;
- $call_footer = true;
+ $call_footer = false;
}
// phpgwapi_cache::message_set($message, 'error');
Modified: branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2017-05-17
17:50:33 UTC (rev 16746)
+++ branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2017-05-17
17:52:53 UTC (rev 16747)
@@ -421,6 +421,33 @@
*/
function phpgw_handle_exception($e)
{
+ if ( !isset($GLOBALS['phpgw']->log)
+ || !is_object($GLOBALS['phpgw']->log) )
+ {
+ $GLOBALS['phpgw']->log = createObject('phpgwapi.log');
+ }
+ $log =& $GLOBALS['phpgw']->log;
+
+// $log_args = array
+// (
+// 'file' => $e->getfile(),
+// 'line' => $e->getline(),
+// 'text' => "Uncaught Exception:\n". $e->getMessage() .
"\n" . $e->getTraceAsString(),
+// 'severity' => 'F'
+// );
+
+ if ($GLOBALS['phpgw']->db->get_transaction())
+ {
+ $GLOBALS['phpgw']->db->transaction_abort();
+ }
+
+// $log->fatal($log_args);
+
+ $log->error(array(
+ 'text' => "<b>Uncaught Exception:</b>\n".
$e->getMessage() . "\n" . $e->getTraceAsString(),
+ 'line' => $e->getline(),
+ 'file' => $e->getfile()
+ ));
$help = 'Please contact your administrator for assistance';
if (!ini_get('display_errors'))
@@ -428,6 +455,7 @@
echo <<<HTML
<h1>Uncaught Exception</h1>
<p>{$help}</p>
+ <p>Error is logged</p>
HTML;
exit;
}
@@ -438,6 +466,7 @@
echo <<<HTML
<h1>Uncaught Exception: {$msg}</h1>
<p>{$help}</p>
+ <p>Error is logged</p>
<h2>Backtrace:</h2>
<pre>
{$trace}
Modified: branches/Version-2_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/setup.inc.php 2017-05-17
17:50:33 UTC (rev 16746)
+++ branches/Version-2_0-branch/property/setup/setup.inc.php 2017-05-17
17:52:53 UTC (rev 16747)
@@ -11,7 +11,7 @@
* @version $Id$
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.712';
+ $setup_info['property']['version'] = '0.9.17.713';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
@@ -68,6 +68,7 @@
$setup_info['property']['tables'] = array(
+ 'fm_district',
'fm_part_of_town',
'fm_gab_location',
'fm_streetaddress',
@@ -75,7 +76,6 @@
'fm_tenant_category',
'fm_vendor',
'fm_vendor_category',
- 'fm_district',
'fm_locations',
'fm_location1_category',
'fm_location1',
Modified: branches/Version-2_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/tables_current.inc.php
2017-05-17 17:50:33 UTC (rev 16746)
+++ branches/Version-2_0-branch/property/setup/tables_current.inc.php
2017-05-17 17:52:53 UTC (rev 16747)
@@ -11,14 +11,24 @@
* @version $Id$
*/
$phpgw_baseline = array(
+ 'fm_district' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'int', 'precision' =>
'2', 'nullable' => False),
+ 'descr' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
'fm_part_of_town' => array(
'fd' => array(
'id' => array('type' => 'auto', 'precision' =>
'2', 'nullable' => False),
- 'name' => array('type' => 'varchar',
'precision' => '20', 'nullable' => True),
- 'district_id' => array('type' => 'int',
'precision' => '2', 'nullable' => True)
+ 'name' => array('type' => 'varchar',
'precision' => '150', 'nullable' => false),
+ 'district_id' => array('type' => 'int',
'precision' => '2', 'nullable' => false)
),
'pk' => array('id'),
- 'fk' => array(),
+ 'fk' => array('fm_district' => array('district_id' =>
'id')),
'ix' => array(),
'uc' => array()
),
@@ -114,16 +124,6 @@
'ix' => array(),
'uc' => array()
),
- 'fm_district' => array(
- 'fd' => array(
- 'id' => array('type' => 'int', 'precision' =>
'2', 'nullable' => False),
- 'descr' => array('type' => 'varchar',
'precision' => '20', 'nullable' => True)
- ),
- 'pk' => array('id'),
- 'fk' => array(),
- 'ix' => array(),
- 'uc' => array()
- ),
'fm_standard_unit' => array(
'fd' => array(
'id' => array('type' => 'int', 'precision' =>
4, 'nullable' => False),
Modified: branches/Version-2_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/tables_update.inc.php
2017-05-17 17:50:33 UTC (rev 16746)
+++ branches/Version-2_0-branch/property/setup/tables_update.inc.php
2017-05-17 17:52:53 UTC (rev 16747)
@@ -9545,3 +9545,22 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+ /**
+ * Update property version from 0.9.17.712 to 0.9.17.713
+ *
+ */
+ $test[] = '0.9.17.712';
+
+ function property_upgrade0_9_17_712()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_part_of_town',
'name', array('type' => 'varchar', 'precision' => '150', 'nullable' => false));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.713';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16747] Stable: Merge 16742:16746 from trunk,
sigurdne <=