[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17000] Stable: Merge 16987:16999 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17000] Stable: Merge 16987:16999 from trunk |
|
Date: |
Fri, 25 Aug 2017 04:58:34 -0400 (EDT) |
Revision: 17000
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17000
Author: sigurdne
Date: 2017-08-25 04:58:34 -0400 (Fri, 25 Aug 2017)
Log Message:
-----------
Stable: Merge 16987:16999 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId.php
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uivendor_report.inc.php
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php
branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application_info.xsl
branches/Version-2_0-branch/felamimail/inc/class.egw_db.inc.php
branches/Version-2_0-branch/header.inc.php.template
branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
branches/Version-2_0-branch/hrm/inc/class.socommon.inc.php
branches/Version-2_0-branch/phpgwapi/doc/index.html
branches/Version-2_0-branch/phpgwapi/doc/index.txt
branches/Version-2_0-branch/phpgwapi/inc/class.crypto_libsodium.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.jasper_wrapper.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.setup.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.setup_html.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.setup_process.inc.php
branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-2_0-branch/property/inc/class.bomigrate.inc.php
branches/Version-2_0-branch/property/inc/class.socommon.inc.php
branches/Version-2_0-branch/property/inc/class.uimigrate.inc.php
branches/Version-2_0-branch/property/inc/class.uitenant_claim.inc.php
branches/Version-2_0-branch/property/inc/class.uitts.inc.php
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
branches/Version-2_0-branch/property/setup/phpgw_no.lang
branches/Version-2_0-branch/rental/inc/class.soparty.inc.php
branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php
branches/Version-2_0-branch/rental/inc/class.uifrontpage.inc.php
branches/Version-2_0-branch/rental/inc/class.uiparty.inc.php
branches/Version-2_0-branch/rental/inc/model/class.party.inc.php
branches/Version-2_0-branch/rental/js/rental/contract.index.js
branches/Version-2_0-branch/rental/js/rental/frontpage.index.js
branches/Version-2_0-branch/rental/setup/phpgw_no.lang
branches/Version-2_0-branch/rental/setup/setup.inc.php
branches/Version-2_0-branch/rental/setup/tables_current.inc.php
branches/Version-2_0-branch/rental/setup/tables_update.inc.php
branches/Version-2_0-branch/rental/templates/base/party.xsl
branches/Version-2_0-branch/setup/manageheader.php
branches/Version-2_0-branch/setup/templates/base/manageheader.tpl
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/bookingfrontend/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch 2017-08-25 08:58:34 UTC (rev 17000)
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
\ 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
\ No newline at end of property
Index: branches/Version-2_0-branch/bookingfrontend
===================================================================
--- branches/Version-2_0-branch/bookingfrontend 2017-08-25 08:56:41 UTC (rev
16999)
+++ branches/Version-2_0-branch/bookingfrontend 2017-08-25 08:58:34 UTC (rev
17000)
Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/bookingfrontend:14933-16846
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
-/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847,16908-16909,16946,16948
\ No newline at end of property
+/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847,16908-16909,16946,16948,16988-16999
\ No newline at end of property
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
2017-08-25 08:56:41 UTC (rev 16999)
+++
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -147,7 +147,7 @@
}
$org_option .= <<<HTML
- <option
value='{$org['id']}'{$selected}>{$org['name']}</option>
+ <option value='{$org['id']}'
{$selected}>{$org['name']}</option>
HTML;
}
@@ -174,7 +174,7 @@
}
$html = <<<HTML
- <!DOCTYPE html>
+<!DOCTYPE html>
<html>
<head>
<title>Velg organisasjon</title>
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -105,7 +105,7 @@
$db = createObject('phpgwapi.db', null, null, true);
$db->Host =
$GLOBALS['phpgw_domain']['default']['db_host'];
- $db->Port = '5432';
+ $db->Port =
$GLOBALS['phpgw_domain']['default']['db_port'];//'5432';
$db->Type = 'postgres';
$db->Database = 'breg';
$db->User =
$GLOBALS['phpgw_domain']['default']['db_user'];
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -362,6 +362,19 @@
)
);
+ $list_public_types = array(
+ array(
+ 'id' => 0,
+ 'name' => lang('application public type
public'),
+ 'selected' => $application->non_public == 0 ? 1
: 0
+ ),
+ array('id' => 1,
+ 'name' => lang('application public type non
public'),
+ 'selected' => $application->non_public == 1 ? 1
: 0
+ ),
+
+ );
+
$datatable_def[] = array(
'container' => 'datatable-container_1',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uicalendar.query_relaxed",
@@ -421,6 +434,7 @@
'application' => $application,
'new_vendor_url' =>
self::link(array('menuaction' => "{$this->currentapp}.uivendor.add")),
'list_case_officer' => array('options' =>
$case_officer_options),
+ 'list_public_types' => array('options' =>
$list_public_types),
'cat_select' =>
$this->cats->formatted_xslt_list(array(
'select_name' => 'category_id',
'selected' =>
$application->category_id ? $application->category_id : $default_category,
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -242,6 +242,8 @@
$category =
$this->cats->return_single($application->category_id);
+ $application->public_type = $application->non_public ==
1 ? lang('application public type non public') : lang('application public type
public');
+
$data = array(
'datatable_def' => $datatable_def,
'cancel_url' => self::link(array('menuaction'
=> "{$this->currentapp}.uievents.index",)),
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uivendor_report.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uivendor_report.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uivendor_report.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -314,6 +314,8 @@
'function' => "set_tab('first_tab')"
);
+ $application->public_type = $application->non_public ==
1 ? lang('application public type non public') : lang('application public type
public');
+
$data = array(
'form_action' => self::link(array('menuaction'
=> "{$this->currentapp}.uivendor_report.save")),
'cancel_url' => self::link(array('menuaction'
=> "{$this->currentapp}.uivendor_report.index",)),
Modified:
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -62,6 +62,8 @@
$audience_limit,
$title,
$description,
+ $non_public,
+ $public_type,
$summary,
$remark,
$contact_name,
@@ -181,6 +183,12 @@
'sortable' => false,
'required' => true,
),
+ 'non_public' => array('action'=> PHPGW_ACL_ADD
| PHPGW_ACL_EDIT,
+ 'type' => 'int',
+ 'label' => 'application public type',
+ 'sortable' => false,
+ 'required' => false,
+ ),
'summary' => array('action'=> 0,
'type' => 'html',
'label' => 'summary',
Modified:
branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -64,6 +64,7 @@
$max_events,
$account_number,
$description,
+ $grant_non_public,
$remark,
$comments,
$comment;
@@ -160,6 +161,12 @@
'sortable' => false,
'required' => true
),
+ 'grant_non_public' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+ 'type' => 'int',
+ 'label' => 'want offer for non public',
+ 'sortable' => false,
+ 'required' => false
+ ),
'remark' => array('action'=> PHPGW_ACL_ADD |
PHPGW_ACL_EDIT,
'type' => 'string',
'label' => 'description',
Modified: branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-08-25 08:58:34 UTC (rev 17000)
@@ -154,4 +154,9 @@
canceled subject eventplannerfrontend no Overskrift ved
kansellering
vendor canceled text eventplannerfrontend no Tekst til utøver ved
kansellering
customer canceled text eventplannerfrontend no Tekst til mottakersted
ved kansellering
-default application category eventplannerfrontend no Standard
søknadskategori
\ No newline at end of file
+default application category eventplannerfrontend no Standard
søknadskategori
+want offer for non public eventplanner no Ønsker å motta
nærtilbud
+application public type eventplanner no Nær/Bredde-tilbud
+application public type non public eventplanner no Nærtilbud (et
arrangement der kun noen få brukere/beboere på en institusjon kan delta, f.eks.
et skrivekurs, malekurs)
+application public type public eventplanner no Breddetilbud (et
arrangement der alle brukere/beboere på en institusjon kan delta)
+
Modified: branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -11,7 +11,7 @@
* @version $Id: setup.inc.php 14728 2016-02-11 22:28:46Z sigurdne $
*/
$setup_info['eventplanner']['name'] = 'eventplanner';
- $setup_info['eventplanner']['version'] = '0.9.18.009';
+ $setup_info['eventplanner']['version'] = '0.9.18.010';
$setup_info['eventplanner']['app_order'] = 20;
$setup_info['eventplanner']['enable'] = 1;
$setup_info['eventplanner']['app_group'] = 'office';
Modified: branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -98,6 +98,7 @@
'number_of_users' => array('type' => 'int',
'precision' => '4', 'nullable' => true),
'max_events' => array('type' => 'int',
'precision' => '4', 'nullable' => true),
'description' => array('type' => 'text',
'nullable' => False),
+ 'grant_non_public' => array('type' => 'int',
'precision' => '2', 'nullable' => true),
'remark' => array('type' => 'text', 'nullable'
=> True),
'secret' => array('type' => 'text', 'nullable'
=> False),
'organization_number' => array('type' =>
'varchar', 'precision' => '9','nullable' => True),
@@ -148,6 +149,7 @@
'other_participants' => array('type' => 'text',
'nullable' => True),
'title' => array('type' => 'text', 'nullable'
=> False),
'description' => array('type' => 'text',
'nullable' => False),
+ 'non_public' => array('type' => 'int',
'precision' => '2', 'nullable' => true),
'summary' => array('type' => 'text', 'nullable'
=> true),
'remark' => array('type' => 'text', 'nullable'
=> True),
'contact_name' => array('type' => 'text',
'nullable' => False),
Modified: branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -372,3 +372,27 @@
}
return $GLOBALS['setup_info']['eventplanner']['currentver'];
}
+
+ $test[] = '0.9.18.009';
+ function eventplanner_upgrade0_9_18_009()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_customer',
'grant_non_public', array(
+ 'type' => 'int',
+ 'precision' => 2,
+ 'nullable' => true
+ ));
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_application',
'non_public', array(
+ 'type' => 'int',
+ 'precision' => 2,
+ 'nullable' => true
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['eventplanner']['currentver'] =
'0.9.18.010';
+ }
+ return $GLOBALS['setup_info']['eventplanner']['currentver'];
+ }
Modified:
branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
2017-08-25 08:58:34 UTC (rev 17000)
@@ -282,6 +282,15 @@
</div>
<div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'application public type')"/>
+ </label>
+ <select
id="non_public" name="non_public" class="pure-input-1-2" >
+
<xsl:apply-templates select="list_public_types/options"/>
+ </select>
+ </div>
+
+ <div
class="pure-control-group">
<xsl:variable
name="lang_date_start">
<xsl:value-of select="php:function('lang', 'date start')"/>
</xsl:variable>
Modified: branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
2017-08-25 08:58:34 UTC (rev 17000)
@@ -286,6 +286,16 @@
</div>
<div class="pure-control-group">
<label>
+ <xsl:value-of
select="php:function('lang', 'want offer for non public')"/>
+ </label>
+ <input type="checkbox"
name="grant_non_public" id="grant_non_public" value="1">
+ <xsl:if
test="customer/grant_non_public = 1">
+
<xsl:attribute name="checked" value="checked"/>
+ </xsl:if>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label>
<xsl:value-of
select="php:function('lang', 'remark')"/>
</label>
<textarea cols="47"
rows="7" name="remark">
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
2017-08-25 08:56:41 UTC (rev 16999)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
2017-08-25 08:58:34 UTC (rev 17000)
@@ -273,6 +273,15 @@
</div>
<div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'application public type')"/>
+ </label>
+ <select
id="non_public" name="non_public" class="pure-input-1-2" >
+
<xsl:apply-templates select="list_public_types/options"/>
+ </select>
+ </div>
+
+ <div
class="pure-control-group">
<xsl:variable
name="lang_date_start">
<xsl:value-of select="php:function('lang', 'date start')"/>
</xsl:variable>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application_info.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application_info.xsl
2017-08-25 08:56:41 UTC (rev 16999)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application_info.xsl
2017-08-25 08:58:34 UTC (rev 17000)
@@ -78,6 +78,7 @@
</tbody>
</table>
</div>
+
<div class="pure-control-group">
<label>
<xsl:value-of select="php:function('lang',
'event timespan')"/>
@@ -84,6 +85,12 @@
</label>
<xsl:value-of select="application/timespan"/>
</div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'application public type')"/>
+ </label>
+ <xsl:value-of select="application/public_type"/>
+ </div>
</div>
Modified: branches/Version-2_0-branch/felamimail/inc/class.egw_db.inc.php
===================================================================
--- branches/Version-2_0-branch/felamimail/inc/class.egw_db.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/felamimail/inc/class.egw_db.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -209,6 +209,7 @@
$phpgw_db = & $GLOBALS['phpgw']->db;
$this->Database = & $phpgw_db->Database;
$this->Host = & $phpgw_db->Host;
+ $this->Port = & $phpgw_db->Port;
$this->User = & $phpgw_db->User;
$this->Password = & $phpgw_db->Password;
Modified: branches/Version-2_0-branch/header.inc.php.template
===================================================================
--- branches/Version-2_0-branch/header.inc.php.template 2017-08-25 08:56:41 UTC
(rev 16999)
+++ branches/Version-2_0-branch/header.inc.php.template 2017-08-25 08:58:34 UTC
(rev 17000)
@@ -276,6 +276,7 @@
$GLOBALS['phpgw_domain']['{DB_DOMAIN}'] = array
(
'db_host' => '{DB_HOST}',
+ 'db_port' => '{DB_PORT}',
'db_name' => '{DB_NAME}',
'db_user' => '{DB_USER}',
'db_pass' => '{DB_PASS}',
Modified: branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -947,11 +947,11 @@
</thead>
HTML;
- $table_content .=
"<tr><td>{$i}</td><td>{$entry_date}</td><td>{$user_name}</td><td>{$ticket['details']}</td></tr>";
+ $table_content .= "<tr><td
style='vertical-align:top'>{$i}</td><td
style='vertical-align:top'>{$entry_date}</td><td
style='vertical-align:top'>{$user_name}</td><td style='white-space:
pre-line'>{$ticket['details']}</td></tr>";
foreach ($additional_notes as $value)
{
- $table_content .=
"<tr><td>{$value['value_count']}</td><td>{$value['value_date']}</td><td>{$value['value_user']}</td><td>{$value['value_note']}</td></tr>";
+ $table_content .= "<tr><td
style='vertical-align:top'>{$value['value_count']}</td><td
style='vertical-align:top'>{$value['value_date']}</td><td
style='vertical-align:top'>{$value['value_user']}</td><td style='white-space:
pre-line'>{$value['value_note']}</td></tr>";
}
$body.= "<table border='1' class='pure-table
pure-table-bordered pure-table-striped'>{$table_content}</table>";
$subject .= "::{$i}";
Modified: branches/Version-2_0-branch/hrm/inc/class.socommon.inc.php
===================================================================
--- branches/Version-2_0-branch/hrm/inc/class.socommon.inc.php 2017-08-25
08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/hrm/inc/class.socommon.inc.php 2017-08-25
08:58:34 UTC (rev 17000)
@@ -25,6 +25,7 @@
// $this->db = $GLOBALS['phpgw']->db;
$this->db = CreateObject('phpgwapi.db');
$this->db->Host =
$GLOBALS['phpgw_info']['server']['db_host'];
+ $this->db->Port =
$GLOBALS['phpgw_info']['server']['db_port'];
$this->db->Type =
$GLOBALS['phpgw_info']['server']['db_type'];
$this->db->Database =
$GLOBALS['phpgw_info']['server']['db_name'];
$this->db->User =
$GLOBALS['phpgw_info']['server']['db_user'];
Modified: branches/Version-2_0-branch/phpgwapi/doc/index.html
===================================================================
--- branches/Version-2_0-branch/phpgwapi/doc/index.html 2017-08-25 08:56:41 UTC
(rev 16999)
+++ branches/Version-2_0-branch/phpgwapi/doc/index.html 2017-08-25 08:58:34 UTC
(rev 17000)
@@ -681,6 +681,8 @@
$GLOBALS['phpgw_info']['server']['db_host'] = Address of the database server.
Usually this is set to localhost - but don't assume.
+$GLOBALS['phpgw_info']['server']['db_port'] = Database port.
+
$GLOBALS['phpgw_info']['server']['db_name'] = Database name.
$GLOBALS['phpgw_info']['server']['db_user'] = User name.
Modified: branches/Version-2_0-branch/phpgwapi/doc/index.txt
===================================================================
--- branches/Version-2_0-branch/phpgwapi/doc/index.txt 2017-08-25 08:56:41 UTC
(rev 16999)
+++ branches/Version-2_0-branch/phpgwapi/doc/index.txt 2017-08-25 08:58:34 UTC
(rev 17000)
@@ -572,8 +572,10 @@
Usually this is set to localhost - but don't assume.
- $GLOBALS['phpgw_info']['server']['db_name'] = Database name.
+$GLOBALS['phpgw_info']['server']['db_port'] = Database port.
+$GLOBALS['phpgw_info']['server']['db_name'] = Database name.
+
$GLOBALS['phpgw_info']['server']['db_user'] = User name.
$GLOBALS['phpgw_info']['server']['db_pass'] = Password
@@ -690,7 +692,7 @@
If the current user speaks Italian, the string returned will be:
- il contatore \xE8 42<br />
+ il contatore è 42<br />
The lang function
@@ -834,7 +836,7 @@
9.4 Copyrights and Trademarks
-Copyright \xA9 Free Software Foundarion. Permission is granted to copy,
distribute
+Copyright © Free Software Foundarion. Permission is granted to copy, distribute
and/or modify this document under the terms of the GNU Free Documentation
License, Version 1.1 or any later version published by the Free Software
Foundation.
@@ -846,7 +848,7 @@
Thanks to all the developers and users who contribute to making phpGroupWare
such a success.
The most recent version of this document can be found at docs.phpgroupware.org
-Copyright \xA9 2000-2004 Free_Software_Foundation_Inc, distributed under the
terms
+Copyright © 2000-2004 Free_Software_Foundation_Inc, distributed under the terms
of the GNU_Free_Documentation_License
Source: $Source$
Version: $Revision: 15562 $
Modified:
branches/Version-2_0-branch/phpgwapi/inc/class.crypto_libsodium.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.crypto_libsodium.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.crypto_libsodium.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -28,12 +28,11 @@
{
$key = $vars[0];
- if ($GLOBALS['phpgw_info']['server']['enable_crypto']
== 'libsodium' && extension_loaded('libsodium') && !$this->enabled)
+ if ($GLOBALS['phpgw_info']['server']['enable_crypto']
== 'libsodium' && extension_loaded('sodium') && !$this->enabled)
{
$this->enabled = true;
- $keysize = \Sodium\CRYPTO_SECRETBOX_KEYBYTES;
-
+ $keysize = SODIUM_CRYPTO_SECRETBOX_KEYBYTES;
/* Hack Key to be the correct size */
$x = strlen($key);
@@ -48,7 +47,7 @@
{
if ($this->enabled)
{
- \Sodium\memzero($this->key);
+ sodium_memzero($this->key);
}
}
@@ -201,18 +200,18 @@
*/
function safeEncrypt( $message, $key )
{
- $nonce = \Sodium\randombytes_buf(
- \Sodium\CRYPTO_SECRETBOX_NONCEBYTES
+ $nonce = random_bytes(
+ SODIUM_CRYPTO_SECRETBOX_NONCEBYTES
);
$cipher = base64_encode(
$nonce .
- \Sodium\crypto_secretbox(
+ sodium_crypto_secretbox(
$message, $nonce, $key
)
);
- \Sodium\memzero($message);
- \Sodium\memzero($key);
+ sodium_memzero($message);
+ sodium_memzero($key);
return $cipher;
}
@@ -231,14 +230,15 @@
return false;
// throw new \Exception('Scream bloody murder, the
encoding failed');
}
- if (mb_strlen($decoded, '8bit') <
(\Sodium\CRYPTO_SECRETBOX_NONCEBYTES + \Sodium\CRYPTO_SECRETBOX_MACBYTES))
+ if (mb_strlen($decoded, '8bit') <
(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES))
{
+ return $encrypted;
// throw new \Exception('Scream bloody murder, the
message was truncated');
}
- $nonce = mb_substr($decoded, 0,
\Sodium\CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
- $ciphertext = mb_substr($decoded,
\Sodium\CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
+ $nonce = mb_substr($decoded, 0,
SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
+ $ciphertext = mb_substr($decoded,
SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
- $plain = \Sodium\crypto_secretbox_open(
+ $plain = sodium_crypto_secretbox_open(
$ciphertext, $nonce, $key
);
if ($plain === false)
@@ -245,8 +245,8 @@
{
// throw new \Exception('Scream bloody murder, the
message was tampered with in transit');
}
- \Sodium\memzero($ciphertext);
- \Sodium\memzero($key);
+ sodium_memzero($ciphertext);
+ sodium_memzero($key);
return $plain;
}
}
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php 2017-08-25
08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php 2017-08-25
08:58:34 UTC (rev 17000)
@@ -122,6 +122,7 @@
$this->Database =
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_name']);
$this->Host =
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_host']);
+ $this->Port =
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_port']);
$this->User =
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_user']);
$this->Password =
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_pass']);
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.jasper_wrapper.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.jasper_wrapper.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.jasper_wrapper.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -35,18 +35,21 @@
$crypto = createObject('phpgwapi.crypto',array($_key,
$_iv));
$db_host =
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_host']);
+ $db_port=
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_port']);
$db_name =
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_name']);
$this->db_user =
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_user']);
$this->db_pass =
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_pass']);
$this->connection_string = "";
- if ($GLOBALS['phpgw_info']['server']['db_type'] ==
"postgres")
+ if ($GLOBALS['phpgw_info']['server']['db_type'] ==
"postgres")
{
- $this->connection_string =
"jdbc:postgresql://".$db_host.":5432/".$db_name;
+ $db_port = $db_port ? $db_port : '5432';
+ $this->connection_string =
"jdbc:postgresql://{$db_host}:{$db_port}/{$db_name}";
}
elseif ($GLOBALS['phpgw_info']['server']['db_type'] ==
"mysql")
{
- $this->connection_string =
"jdbc:mysql://".$db_host.":3306/".$db_name;
+ $db_port = $db_port ? $db_port : '3306';
+ $this->connection_string =
"jdbc:mysql://{$db_host}:{$db_port}/{$db_name}";
}
}
Modified:
branches/Version-2_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -37,6 +37,7 @@
if( isset($GLOBALS['phpgw_info']['server']['db_name'])
&& strlen($GLOBALS['phpgw_info']['server']['db_name']) )
{
$temp_db->Host =
$GLOBALS['phpgw_info']['server']['db_host'];
+ $temp_db->Port =
$GLOBALS['phpgw_info']['server']['db_port'];
$temp_db->Type =
$GLOBALS['phpgw_info']['server']['db_type'];
$temp_db->Database =
$GLOBALS['phpgw_info']['server']['db_name'];
$temp_db->User =
$GLOBALS['phpgw_info']['server']['db_user'];
@@ -48,6 +49,7 @@
$phpgw_domain = $GLOBALS['phpgw_domain'];
$temp_db->Host =
$phpgw_domain[$ConfigDomain]['db_host'];
+ $temp_db->Port =
$phpgw_domain[$ConfigDomain]['db_port'];
$temp_db->Database =
$phpgw_domain[$ConfigDomain]['db_name'];
$temp_db->User =
$phpgw_domain[$ConfigDomain]['db_user'];
$temp_db->Password =
$phpgw_domain[$ConfigDomain]['db_pass'];
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.setup.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.setup.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.setup.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -62,6 +62,7 @@
$GLOBALS['phpgw_info']['server']['db_type'] =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_type'];
$GLOBALS['phpgw_info']['server']['db_host'] =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_host'];
+ $GLOBALS['phpgw_info']['server']['db_port'] =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_port'];
$GLOBALS['phpgw_info']['server']['db_name'] =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_name'];
$GLOBALS['phpgw_info']['server']['db_user'] =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_user'];
$GLOBALS['phpgw_info']['server']['db_pass'] =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_pass'];
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.setup_html.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.setup_html.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.setup_html.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -48,7 +48,7 @@
$GLOBALS['header_template']->set_var('DB_DOMAIN',$v);
foreach($dom as $x => $y)
{
- if( ($setting['enable_mcrypt'] ==
'True' || !empty($setting['enable_crypto'])) && ($x == 'db_pass' || $x ==
'db_host' || $x == 'db_name' || $x == 'db_user' || $x == 'config_pass'))
+ if( ($setting['enable_mcrypt'] ==
'True' || !empty($setting['enable_crypto'])) && ($x == 'db_pass' || $x ==
'db_host' || $x == 'db_port' || $x == 'db_name' || $x == 'db_user' || $x ==
'config_pass'))
{
$y =
$GLOBALS['phpgw']->crypto->encrypt($y);
}
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.setup_process.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.setup_process.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.setup_process.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -54,6 +54,7 @@
$GLOBALS['phpgw_setup']->oProc =
createObject('phpgwapi.schema_proc',$phpgw_domain[$ConfigDomain]['db_type']);
$GLOBALS['phpgw_setup']->oProc->m_odb =
$GLOBALS['phpgw_setup']->db;
$GLOBALS['phpgw_setup']->oProc->m_odb->Host =
$crypto->decrypt($phpgw_domain[$ConfigDomain]['db_host']);
+ $GLOBALS['phpgw_setup']->oProc->m_odb->Port =
$crypto->decrypt($phpgw_domain[$ConfigDomain]['db_port']);
$GLOBALS['phpgw_setup']->oProc->m_odb->Database =
$crypto->decrypt($phpgw_domain[$ConfigDomain]['db_name']);
$GLOBALS['phpgw_setup']->oProc->m_odb->User =
$crypto->decrypt($phpgw_domain[$ConfigDomain]['db_user']);
$GLOBALS['phpgw_setup']->oProc->m_odb->Password =
$crypto->decrypt($phpgw_domain[$ConfigDomain]['db_pass']);
Modified: branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2017-08-25
08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2017-08-25
08:58:34 UTC (rev 17000)
@@ -560,6 +560,7 @@
if
(isset($GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]))
{
$GLOBALS['phpgw_info']['server']['db_host']
= $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]['db_host'];
+ $GLOBALS['phpgw_info']['server']['db_port']
= $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]['db_port'];
$GLOBALS['phpgw_info']['server']['db_name']
= $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]['db_name'];
$GLOBALS['phpgw_info']['server']['db_user']
= $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]['db_user'];
$GLOBALS['phpgw_info']['server']['db_pass']
= $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]['db_pass'];
@@ -569,6 +570,7 @@
else
{
$GLOBALS['phpgw_info']['server']['db_host']
=
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['db_host'];
+ $GLOBALS['phpgw_info']['server']['db_port']
=
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['db_port'];
$GLOBALS['phpgw_info']['server']['db_name']
=
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['db_name'];
$GLOBALS['phpgw_info']['server']['db_user']
=
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['db_user'];
$GLOBALS['phpgw_info']['server']['db_pass']
=
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['db_pass'];
Modified: branches/Version-2_0-branch/property/inc/class.bomigrate.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.bomigrate.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/property/inc/class.bomigrate.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -129,6 +129,7 @@
$this->oProc->m_odb =
CreateObject('phpgwapi.db');//$GLOBALS['phpgw']->db;
$this->oProc->m_odb->Type =
$GLOBALS['phpgw_domain'][$domain]['db_type'];
$this->oProc->m_odb->Host =
$GLOBALS['phpgw_domain'][$domain]['db_host'];
+ $this->oProc->m_odb->Port =
$GLOBALS['phpgw_domain'][$domain]['db_port'];
$this->oProc->m_odb->Database =
$GLOBALS['phpgw_domain'][$domain]['db_name'];
$this->oProc->m_odb->User =
$GLOBALS['phpgw_domain'][$domain]['db_user'];
$this->oProc->m_odb->Password =
$GLOBALS['phpgw_domain'][$domain]['db_pass'];
Modified: branches/Version-2_0-branch/property/inc/class.socommon.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.socommon.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/property/inc/class.socommon.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -59,6 +59,7 @@
if
(isset($GLOBALS['phpgw_info']['server']['db_name']) &&
$GLOBALS['phpgw_info']['server']['db_name'])
{
$this->db->Host =
$GLOBALS['phpgw_info']['server']['db_host'];
+ $this->db->Port =
$GLOBALS['phpgw_info']['server']['db_port'];
$this->db->Type =
$GLOBALS['phpgw_info']['server']['db_type'];
$this->db->Database =
$GLOBALS['phpgw_info']['server']['db_name'];
$this->db->User =
$GLOBALS['phpgw_info']['server']['db_user'];
@@ -74,6 +75,7 @@
$GLOBALS['phpgw_info']['user']['domain'] = $ConfigDomain;
$phpgw_domain =
$GLOBALS['phpgw_domain'];
$this->db->Host =
$phpgw_domain[$ConfigDomain]['db_host'];
+ $this->db->Port =
$phpgw_domain[$ConfigDomain]['db_port'];
$this->db->Database =
$phpgw_domain[$ConfigDomain]['db_name'];
$this->db->User =
$phpgw_domain[$ConfigDomain]['db_user'];
$this->db->Password =
$phpgw_domain[$ConfigDomain]['db_pass'];
@@ -420,6 +422,7 @@
if
(isset($GLOBALS['phpgw_info']['server']['db_name']) &&
$GLOBALS['phpgw_info']['server']['db_name'])
{
$db->Host =
$GLOBALS['phpgw_info']['server']['db_host'];
+ $db->Port =
$GLOBALS['phpgw_info']['server']['db_port'];
$db->Type =
$GLOBALS['phpgw_info']['server']['db_type'];
$db->Database =
$GLOBALS['phpgw_info']['server']['db_name'];
$db->User =
$GLOBALS['phpgw_info']['server']['db_user'];
@@ -435,6 +438,7 @@
$phpgw_domain =
$GLOBALS['phpgw_domain'];
$GLOBALS['phpgw_info']['user']['domain'] = $ConfigDomain;
$db->Host =
$phpgw_domain[$ConfigDomain]['db_host'];
+ $db->Port =
$phpgw_domain[$ConfigDomain]['db_port'];
$db->Database =
$phpgw_domain[$ConfigDomain]['db_name'];
$db->User =
$phpgw_domain[$ConfigDomain]['db_user'];
$db->Password =
$phpgw_domain[$ConfigDomain]['db_pass'];
Modified: branches/Version-2_0-branch/property/inc/class.uimigrate.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uimigrate.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/property/inc/class.uimigrate.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -160,6 +160,7 @@
(
'domain' => $domain,
'db_host' => $entry['db_host'],
+ 'db_port' => $entry['db_port'],
'db_name' => $entry['db_name'],
'db_type' => $entry['db_type'],
'lang_select_migrate_text' =>
$lang_select_migrate_text,
@@ -181,6 +182,7 @@
)),
'lang_domain' => lang('domain'),
'lang_db_host' => lang('db_host'),
+ 'lang_db_port' => lang('db_port'),
'lang_db_name' => lang('db_name'),
'lang_db_type' => lang('db_type'),
'lang_select' => (isset($this->acl_edit) ?
lang('select') : ''),
Modified: branches/Version-2_0-branch/property/inc/class.uitenant_claim.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitenant_claim.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/property/inc/class.uitenant_claim.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -181,6 +181,8 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
+ $location1_info =
CreateObject('property.soadmin_location')->read_single(1);
+
$data = array(
'datatable_name' => $appname,
'form' => array(
@@ -219,7 +221,7 @@
),
array(
'key' => 'loc1_name',
- 'label' =>
lang('loc1_name'),
+ 'label' =>
$location1_info['name'],
'sortable' => FALSE
),
array(
Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -3427,6 +3427,8 @@
$pdf->ezText($contact_email, 14);
$pdf->ezText($contact_phone, 14);
$pdf->ezSetDy(-20);
+ $pdf->ezText("Av hensyn til våre ansatte og leietakere
ber vi om at kontakt på bygget blir kontaktet minst 1 dag i forkant av
oppdrag.", 14);
+ $pdf->ezSetDy(-20);
$pdf->selectFont(PHPGW_API_INC .
'/pdf/fonts/Helvetica-Bold.afm');
$pdf->ezText("Faktura må merkes med ordrenummer:
{$ticket['order_id']} og ressursnr.:{$ressursnr}", 14);
Modified:
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
===================================================================
---
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
2017-08-25 08:56:41 UTC (rev 16999)
+++
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -58,6 +58,7 @@
* prosjekt
* tjeneste
*/
+// $fellesdata->update_customer_id();
$fellesdata->update_vendor();
// $fellesdata->update_agresso_prosjekt(); //for mange
treff
// $fellesdata->update_art();
//for mange treff
@@ -73,6 +74,9 @@
//curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/tjeneste?id=88010
//curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/leverandorer?leverandorNr=722920
+ //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/kundeinfo?organisasjonsnummer="998391407";
+
+
if ($this->debug)
{
_debug_array($fellesdata->unit_ids);
@@ -359,6 +363,50 @@
$db->transaction_commit();
}
+ function update_customer_id( )
+ {
+ //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/kundeinfo?organisasjonsnummer="998391407";
+ $sql = "SELECT id, identifier FROM rental_party"
+ . " WHERE (customer_id = 0 OR customer_id IS
NULL)"
+ . " AND (length(identifier) = 9 OR
length(identifier) = 11)";
+
+ $GLOBALS['phpgw']->db->query($sql, __LINE__, __FILE__);
+
+ $parties = array();
+ while ($GLOBALS['phpgw']->db->next_record())
+ {
+ $parties[] = array(
+ 'id' =>
$GLOBALS['phpgw']->db->f('id'),
+ 'identifier' =>
$GLOBALS['phpgw']->db->f('identifier')
+ );
+ }
+
+ foreach ($parties as $party)
+ {
+ // $this->soap_url=
'http://tjenester.usrv.ubergenkom.no/api/agresso'; //test url
+ $url =
"{$this->soap_url}/kundeinfo?organisasjonsnummer='{$party['identifier']}'";
+ $values = array();
+ try
+ {
+ $values =
$this->check_external_register($url);
+ }
+ catch (Exception $exc)
+ {
+ echo $exc->getTraceAsString();
+ }
+
+ if(!empty($values[0]['kundenr']))
+ {
+ $customer_id =
(int)$values[0]['kundenr'];
+ $sql = "UPDATE rental_party"
+ . " SET customer_id =
{$customer_id}"
+ . " WHERE id = " .
(int)$party['id'];
+ _debug_array($sql);
+ $GLOBALS['phpgw']->db->query($sql,
__LINE__, __FILE__);
+ }
+ }
+ }
+
/*
* ansvar
* art
@@ -700,9 +748,13 @@
public function check_external_register($url)
{
- $username = $this->soap_username; //'portico';
- $password = $this->soap_password; //'BgPor790gfol';
+ $username = $this->soap_username;
+ $password = $this->soap_password;
+ /*Test server*/
+// $username = 'portico';
+// $password = 'BgPor790gfol';
+
$ch = curl_init();
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
curl_setopt($ch, CURLOPT_URL, $url);
Modified: branches/Version-2_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-08-25
08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-08-25
08:58:34 UTC (rev 17000)
@@ -246,7 +246,7 @@
bulk update status property no Masseoppdatering av status
branch property no Fag
b - responsible property no Anviser
-bruks nr property no bruks nr
+bruks nr property no Bruksnr.
budget property no Budsjett
budget account property no Kostnadsart
budget account group property no Kontogruppe
@@ -683,7 +683,7 @@
enables help message for this attribute property no
Hjelpetekst for denne attributten
enable start project from this category property no
Aktiviser mulighet for å starte prosjekt herfra
end property no Slutt
-end date property no sluttdato
+end date property no Sluttdato
enter additional remarks to the description - if any property no
gi en merknad - om noen
enter a descr for the custom function property no Angi en
beskrivelse av egendefinert funksjon
enter a description for prerequisitions for this activity - if any
property no gi en beskrivelse av nødvendige grunnlagsarbeid - om
noen - for denne aktiviteten
@@ -1363,7 +1363,7 @@
Project is closed property no Prosjektet er avsluttet.
project name property no Prosjekt navn
.project.request property no Behov
-project start date property no prosjekt startdato
+project start date property no Prosjekt-startdato
.project.workorder property no Bestilling
propagate property no Propager
property common no Eiendom
@@ -1425,7 +1425,7 @@
request description property no Tilstandbeskrivelse
requirement property no Behov/pålegg
resend workorder property no Send ordre på nytt
-reserve property no reserve
+reserve property no Reserve
reserve remainder property no Rest av reserve
reset property no Tilbakestill
residential environment property no Bo-miljø
Modified: branches/Version-2_0-branch/rental/inc/class.soparty.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.soparty.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/rental/inc/class.soparty.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -270,6 +270,7 @@
{
$columns[] = 'party.id AS party_id';
$columns[] = 'party.identifier';
+ $columns[] = 'party.customer_id';
$columns[] = 'party.first_name';
$columns[] = 'party.last_name';
$columns[] = 'party.comment';
@@ -356,6 +357,7 @@
$values = array(
'identifier = ' .
$this->marshal($party->get_identifier(), 'string'),
+ 'customer_id = ' .
$this->marshal($party->get_customer_id(), 'int'),
'first_name = ' .
$this->marshal($party->get_first_name(), 'string'),
'last_name = ' .
$this->marshal($party->get_last_name(), 'string'),
'title = ' .
$this->marshal($party->get_title(), 'string'),
@@ -423,6 +425,7 @@
$party->set_last_name($this->unmarshal($this->db->f('last_name'), 'string'));
$party->set_location_id($this->unmarshal($this->db->f('org_location_id'),
'int'));
$party->set_identifier($this->unmarshal($this->db->f('identifier'), 'string'));
+
$party->set_customer_id($this->unmarshal($this->db->f('customer_id'), 'int'));
$party->set_mobile_phone($this->unmarshal($this->db->f('mobile_phone'),
'string'));
$party->set_place($this->unmarshal($this->db->f('place'), 'string'));
$party->set_postal_code($this->unmarshal($this->db->f('postal_code'),
'string'));
Modified: branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -1168,7 +1168,7 @@
),
array(
'key' => 'total_price',
- 'label' =>
lang('total_price'),
+ 'label' =>
lang('total_price') . " ({$this->currency_suffix})",
'className' => 'right',
'sortable' => false,
'hidden' => false,
@@ -1176,7 +1176,7 @@
),
array(
'key' => 'rented_area',
- 'label' => lang('area'),
+ 'label' => lang('area')
. " ({$this->area_suffix})",
'className' => 'right',
'sortable' => false,
'hidden' => false,
Modified: branches/Version-2_0-branch/rental/inc/class.uifrontpage.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.uifrontpage.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/rental/inc/class.uifrontpage.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -27,9 +27,9 @@
array('key' => 'last_updated', 'label' =>
lang('last_updated'), 'sortable' => true),
array('key' => 'term_label', 'label' =>
lang('billing_term'), 'sortable' => true,
'className' => 'center'),
- array('key' => 'total_price', 'label' =>
lang('total_price'), 'sortable' => false,
+ array('key' => 'total_price', 'label' =>
lang('total_price') . " ({$this->currency_suffix})", 'sortable' => false,
'className' => 'right', 'formatter' =>
'formatterPrice'),
- array('key' => 'rented_area', 'label' =>
lang('area'), 'sortable' => false,
+ array('key' => 'rented_area', 'label' =>
lang('area') . " ({$this->area_suffix})", 'sortable' => false,
'hidden' => false,
'className' => 'right', 'formatter' =>
'formatterArea'),
array('key' => 'contract_status', 'label' =>
lang('contract_status'), 'sortable' => false,
@@ -112,9 +112,9 @@
array('key' => 'date_end', 'label' =>
lang('date_end'), 'sortable' => true, 'className' => 'center'),
array('key' => 'term_label', 'label' =>
lang('billing_term'), 'sortable' => true,
'className' => 'center'),
- array('key' => 'total_price', 'label' =>
lang('total_price'), 'sortable' => false,
+ array('key' => 'total_price', 'label' =>
lang('total_price') . " ({$this->currency_suffix})", 'sortable' => false,
'className' => 'right', 'formatter' =>
'formatterPrice'),
- array('key' => 'rented_area', 'label' =>
lang('area'), 'sortable' => false,
+ array('key' => 'rented_area', 'label' =>
lang('area') . " ({$this->area_suffix})", 'sortable' => false,
'hidden' => false,
'className' => 'right', 'formatter' =>
'formatterArea'),
array('key' => 'contract_status', 'label' =>
lang('contract_status'), 'sortable' => false,
@@ -183,9 +183,9 @@
array('key' => 'date_end', 'label' =>
lang('date_end'), 'sortable' => true, 'className' => 'center'),
array('key' => 'term_label', 'label' =>
lang('billing_term'), 'sortable' => true,
'className' => 'center'),
- array('key' => 'total_price', 'label' =>
lang('total_price'), 'sortable' => false,
+ array('key' => 'total_price', 'label' =>
lang('total_price') . " ({$this->currency_suffix})", 'sortable' => false,
'className' => 'right', 'formatter' =>
'formatterPrice'),
- array('key' => 'rented_area', 'label' =>
lang('area'), 'sortable' => false,
+ array('key' => 'rented_area', 'label' =>
lang('area') . " ({$this->area_suffix})", 'sortable' => false,
'hidden' => false,
'className' => 'right', 'formatter' =>
'formatterArea'),
array('key' => 'contract_status', 'label' =>
lang('contract_status'), 'sortable' => false,
@@ -243,9 +243,9 @@
array('key' => 'date_end', 'label' =>
lang('date_end'), 'sortable' => true, 'className' => 'center'),
array('key' => 'term_label', 'label' =>
lang('billing_term'), 'sortable' => true,
'className' => 'center'),
- array('key' => 'total_price', 'label' =>
lang('total_price'), 'sortable' => false,
+ array('key' => 'total_price', 'label' =>
lang('total_price') . " ({$this->currency_suffix})", 'sortable' => false,
'className' => 'right', 'formatter' =>
'formatterPrice'),
- array('key' => 'rented_area', 'label' =>
lang('area'), 'sortable' => false,
+ array('key' => 'rented_area', 'label' =>
lang('area') . " ({$this->area_suffix})", 'sortable' => false,
'hidden' => false,
'className' => 'right', 'formatter' =>
'formatterArea'),
array('key' => 'contract_status', 'label' =>
lang('contract_status'), 'sortable' => false,
Modified: branches/Version-2_0-branch/rental/inc/class.uiparty.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.uiparty.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/rental/inc/class.uiparty.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -913,6 +913,7 @@
'party_id' => $party_id,
'value_name' => $party->get_name(),
'value_identifier' => $party->get_identifier(),
+ 'value_customer_id' =>
$party->get_customer_id(),
'value_firstname' => $party->get_first_name(),
'value_lastname' => $party->get_last_name(),
'value_job_title' => $party->get_title(),
@@ -975,6 +976,7 @@
{
// ... set all parameters
$party->set_identifier(phpgw::get_var('identifier'));
+
$party->set_customer_id(phpgw::get_var('customer_id', 'int'));
$party->set_first_name(phpgw::get_var('firstname'));
$party->set_last_name(phpgw::get_var('lastname'));
$party->set_title(phpgw::get_var('title'));
Modified: branches/Version-2_0-branch/rental/inc/model/class.party.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/model/class.party.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/rental/inc/model/class.party.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -12,6 +12,7 @@
public static $so;
protected $id;
+ protected $customer_id;
protected $identifier;
protected $first_name;
protected $last_name;
@@ -108,11 +109,26 @@
return $this->id;
}
+ public function set_customer_id( $customer_id )
+ {
+ $this->customer_id = $customer_id;
+ }
+
+ public function get_customer_id()
+ {
+ return $this->customer_id;
+ }
+
public function set_identifier( $identifier )
{
$this->identifier = $identifier;
}
+ public function get_identifier()
+ {
+ return $this->identifier;
+ }
+
public function get_org_enhet_id()
{
return $this->org_enhet_id;
@@ -153,11 +169,6 @@
$this->sync_problems[] = $sync_problem;
}
- public function get_identifier()
- {
- return $this->identifier;
- }
-
public function set_first_name( $first_name )
{
$this->first_name = $first_name;
@@ -443,6 +454,7 @@
return array(
'id' => $this->id,
'name' => $this->get_name(),
+ 'customer_id' => $this->customer_id,
'identifier' => $this->identifier,
'firstname' => $this->first_name,
'lastname' => $this->last_name,
Modified: branches/Version-2_0-branch/rental/js/rental/contract.index.js
===================================================================
--- branches/Version-2_0-branch/rental/js/rental/contract.index.js
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/rental/js/rental/contract.index.js
2017-08-25 08:58:34 UTC (rev 17000)
@@ -7,13 +7,13 @@
function formatterArea(key, oData)
{
- var amount = $.number(oData[key], decimalPlaces, decimalSeparator,
thousandsSeparator) + ' ' + area_suffix;
+ var amount = $.number(oData[key], decimalPlaces, decimalSeparator,
thousandsSeparator);
return amount;
}
function formatterPrice(key, oData)
{
- var amount = $.number(oData[key], decimalPlaces, decimalSeparator,
thousandsSeparator) + ' ' + currency_suffix;
+ var amount = $.number(oData[key], decimalPlaces, decimalSeparator,
thousandsSeparator);
return amount;
}
Modified: branches/Version-2_0-branch/rental/js/rental/frontpage.index.js
===================================================================
--- branches/Version-2_0-branch/rental/js/rental/frontpage.index.js
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/rental/js/rental/frontpage.index.js
2017-08-25 08:58:34 UTC (rev 17000)
@@ -7,13 +7,13 @@
function formatterPrice(key, oData)
{
- var amount = $.number(oData[key], decimalPlaces, decimalSeparator,
thousandsSeparator) + ' ' + currency_suffix;
+ var amount = $.number(oData[key], decimalPlaces, decimalSeparator,
thousandsSeparator);
return amount;
}
function formatterArea(key, oData)
{
- var amount = $.number(oData[key], decimalPlaces, decimalSeparator,
thousandsSeparator) + ' ' + area_suffix;
+ var amount = $.number(oData[key], decimalPlaces, decimalSeparator,
thousandsSeparator);
return amount;
}
Modified: branches/Version-2_0-branch/rental/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/rental/setup/phpgw_no.lang 2017-08-25
08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/rental/setup/phpgw_no.lang 2017-08-25
08:58:34 UTC (rev 17000)
@@ -682,4 +682,5 @@
select date rental no Velg dato
select file to upload rental no Velg fil for opplasting
synchronized: %1 rental no Synkronisert: %1
-syncronize all rental no Synkroniser alle
\ No newline at end of file
+syncronize all rental no Synkroniser alle
+customer id rental no Kundenummer
\ No newline at end of file
Modified: branches/Version-2_0-branch/rental/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/setup/setup.inc.php 2017-08-25
08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/rental/setup/setup.inc.php 2017-08-25
08:58:34 UTC (rev 17000)
@@ -1,6 +1,6 @@
<?php
$setup_info['rental']['name'] = 'rental'; // Module identifier
- $setup_info['rental']['version'] = '0.1.0.37'; // Current module version
+ $setup_info['rental']['version'] = '0.1.0.38'; // Current module version
$setup_info['rental']['app_order'] = 51; // (?)
$setup_info['rental']['tables'] = array(
'rental_party', // All contract participants, tenants etc.
Modified: branches/Version-2_0-branch/rental/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/setup/tables_current.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/rental/setup/tables_current.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -219,6 +219,7 @@
'fd' => array(
'id' => array('type' => 'auto', 'nullable' =>
false),
'identifier' => array('type' => 'varchar',
'precision' => '255', 'nullable' => true),
+ 'customer_id' => array('type' => 'int',
'precision' => '4', 'nullable' => true),
'first_name' => array('type' => 'varchar',
'precision' => '255', 'nullable' => true),
'last_name' => array('type' => 'varchar',
'precision' => '255', 'nullable' => true),
'comment' => array('type' => 'text'),
Modified: branches/Version-2_0-branch/rental/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/setup/tables_update.inc.php
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/rental/setup/tables_update.inc.php
2017-08-25 08:58:34 UTC (rev 17000)
@@ -976,4 +976,22 @@
$GLOBALS['setup_info']['rental']['currentver'] =
'0.1.0.37';
return $GLOBALS['setup_info']['rental']['currentver'];
}
- }
\ No newline at end of file
+ }
+
+ $test[] = '0.1.0.37';
+ function rental_upgrade0_1_0_37()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->AddColumn('rental_party',
'customer_id', array(
+ 'type' => 'int',
+ 'precision' => 4,
+ 'nullable' => true
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['rental']['currentver'] =
'0.1.0.38';
+ return $GLOBALS['setup_info']['rental']['currentver'];
+ }
+ }
Modified: branches/Version-2_0-branch/rental/templates/base/party.xsl
===================================================================
--- branches/Version-2_0-branch/rental/templates/base/party.xsl 2017-08-25
08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/rental/templates/base/party.xsl 2017-08-25
08:58:34 UTC (rev 17000)
@@ -53,6 +53,13 @@
</div>
<div class="pure-control-group">
<label>
+ <xsl:value-of
select="php:function('lang', 'customer id')"/>
+ </label>
+ <input type="text"
name="customer_id" value="{value_customer_id}">
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label>
<xsl:value-of
select="php:function('lang', 'firstname')"/>
</label>
<input type="text"
id="firstname" name="firstname" value="{value_firstname}">
Modified: branches/Version-2_0-branch/setup/manageheader.php
===================================================================
--- branches/Version-2_0-branch/setup/manageheader.php 2017-08-25 08:56:41 UTC
(rev 16999)
+++ branches/Version-2_0-branch/setup/manageheader.php 2017-08-25 08:58:34 UTC
(rev 17000)
@@ -472,10 +472,10 @@
}
$supported_crypto_type = array();
- if(extension_loaded('libsodium') ||
function_exists('\Sodium\version_string()'))
+ if(extension_loaded('libsodium') ||
extension_loaded('sodium'))
{
$supported_crypto_type[] = 'libsodium';
- $detected .= '<li>' . lang('You appear to have
enabled support for libsodium %1', \Sodium\version_string()) . "</li>\n";
+ $detected .= '<li>' . lang('You appear to have
enabled support for libsodium %1', SODIUM_LIBRARY_VERSION) . "</li>\n";
}
else
{
@@ -560,6 +560,7 @@
$setup_tpl->set_var('lang_delete',lang('Delete'));
$setup_tpl->set_var('db_domain',$key);
$setup_tpl->set_var('db_host',$GLOBALS['phpgw']->crypto->decrypt($GLOBALS['phpgw_domain'][$key]['db_host']));
+
$setup_tpl->set_var('db_port',$GLOBALS['phpgw']->crypto->decrypt($GLOBALS['phpgw_domain'][$key]['db_port']));
$setup_tpl->set_var('db_name',$GLOBALS['phpgw']->crypto->decrypt($GLOBALS['phpgw_domain'][$key]['db_name']));
$setup_tpl->set_var('db_user',$GLOBALS['phpgw']->crypto->decrypt($GLOBALS['phpgw_domain'][$key]['db_user']));
$setup_tpl->set_var('db_pass',$GLOBALS['phpgw']->crypto->decrypt($GLOBALS['phpgw_domain'][$key]['db_pass']));
@@ -639,6 +640,7 @@
$setup_tpl->set_var('lang_delete',lang('Delete'));
$setup_tpl->set_var('db_domain','default');
$setup_tpl->set_var('db_host','localhost');
+ $setup_tpl->set_var('db_port','');
$setup_tpl->set_var('db_name','phpgroupware');
$setup_tpl->set_var('db_user','phpgroupware');
$setup_tpl->set_var('db_pass','your_password');
@@ -840,6 +842,8 @@
$setup_tpl->set_var('lang_forgotten_password',lang('url
forgotten password'));
$setup_tpl->set_var('lang_dbhost',lang('DB Host'));
$setup_tpl->set_var('lang_dbhostdescr',lang('Hostname/IP of database server'));
+ $setup_tpl->set_var('lang_dbport',lang('DB port'));
+ $setup_tpl->set_var('lang_dbportdescr',lang('If empty,
default will be used'));
$setup_tpl->set_var('lang_dbname',lang('DB Name'));
$setup_tpl->set_var('lang_dbnamedescr',lang('Name of
database'));
$setup_tpl->set_var('lang_dbuser',lang('DB User'));
Modified: branches/Version-2_0-branch/setup/templates/base/manageheader.tpl
===================================================================
--- branches/Version-2_0-branch/setup/templates/base/manageheader.tpl
2017-08-25 08:56:41 UTC (rev 16999)
+++ branches/Version-2_0-branch/setup/templates/base/manageheader.tpl
2017-08-25 08:58:34 UTC (rev 17000)
@@ -135,6 +135,9 @@
<td><b>{lang_dbhost}</b><br><input type="text"
name="settings[{db_domain}][db_host]"
value="{db_host}"></td><td>{lang_dbhostdescr}</td>
</tr>
<tr>
+ <td><b>{lang_dbport}</b><br><input type="text"
name="settings[{db_domain}][db_port]"
value="{db_port}"></td><td>{lang_dbportdescr}</td>
+ </tr>
+ <tr>
<td><b>{lang_dbname}</b><br><input type="text"
name="settings[{db_domain}][db_name]"
value="{db_name}"></td><td>{lang_dbnamedescr}</td>
</tr>
<tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17000] Stable: Merge 16987:16999 from trunk,
sigurdne <=