[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6763] Merge 6757:6762 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6763] Merge 6757:6762 from trunk |
|
Date: |
Thu, 13 Jan 2011 14:14:06 +0000 |
Revision: 6763
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6763
Author: sigurdne
Date: 2011-01-13 14:14:05 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
Merge 6757:6762 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
branches/Version-1_0-branch/booking/jasper/templates/application.jrxml
branches/Version-1_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
branches/Version-1_0-branch/bookingfrontend/logout.php
branches/Version-1_0-branch/bookingfrontend/templates/base/config.tpl
branches/Version-1_0-branch/property/inc/class.boproject.inc.php
branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762
Modified: branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
2011-01-13 13:40:51 UTC (rev 6762)
+++ branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
2011-01-13 14:14:05 UTC (rev 6763)
@@ -210,7 +210,7 @@
}
}
}
- if(phpgw::get_var('resource', 'GET') == '')
+ if(phpgw::get_var('building_name', 'GET') == '')
{
array_set_default($allocation, 'resources',
array());
$weekday = 'monday';
Modified: branches/Version-1_0-branch/booking/jasper/templates/application.jrxml
===================================================================
--- branches/Version-1_0-branch/booking/jasper/templates/application.jrxml
2011-01-13 13:40:51 UTC (rev 6762)
+++ branches/Version-1_0-branch/booking/jasper/templates/application.jrxml
2011-01-13 14:14:05 UTC (rev 6763)
@@ -20,11 +20,11 @@
<pen lineWidth="0.5" lineColor="#000000"/>
</box>
</style>
- <style name="headers" forecolor="#808080" fontName="FreeSerif"
fontSize="14"/>
- <style name="Sans_Normal" isDefault="true" fontName="FreeSerif"
fontSize="10" isBold="false" isItalic="false" isUnderline="false"
isStrikeThrough="false"/>
- <style name="Sans_Bold" fontName="FreeSerif" fontSize="10"
isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
- <style name="Sans_Italic" fontName="FreeSerif" fontSize="10"
isBold="false" isItalic="true" isUnderline="false" isStrikeThrough="false"/>
- <style name="Sans_Bold_Italic" fontName="FreeSerif" fontSize="10"
isBold="true" isItalic="true" isUnderline="false" isStrikeThrough="false"/>
+ <style name="headers" isDefault="false" forecolor="#808080"
fontName="Serif" fontSize="14"/>
+ <style name="Sans_Normal" isDefault="true" fontName="Serif"
fontSize="10" isBold="false" isItalic="false" isUnderline="false"
isStrikeThrough="false"/>
+ <style name="Sans_Bold" isDefault="false" fontName="Serif"
fontSize="10" isBold="true" isItalic="false" isUnderline="false"
isStrikeThrough="false"/>
+ <style name="Sans_Italic" isDefault="false" fontName="Serif"
fontSize="10" isBold="false" isItalic="true" isUnderline="false"
isStrikeThrough="false"/>
+ <style name="Sans_Bold_Italic" isDefault="false" fontName="Serif"
fontSize="10" isBold="true" isItalic="true" isUnderline="false"
isStrikeThrough="false"/>
<subDataset name="resources">
<parameter name="APPLICATION_ID" class="java.lang.Integer"/>
<queryString>
@@ -61,7 +61,6 @@
</subDataset>
<parameter name="BK_APPLICATION_ID" class="java.lang.String"/>
<parameter name="BK_BUILDING_NAME" class="java.lang.String"/>
- <parameter name="BK_PATH" class="java.lang.String"/>
<queryString>
<![CDATA[SELECT bb_application.id AS application_id,
bb_application.status AS application_status, to_char(bb_application.created,
'DD/MM/YYYY HH24:MI') AS application_created, to_char(bb_application.modified,
'DD/MM/YYYY HH24:MI') AS application_modified,bb_application.contact_name,
bb_application.contact_email,
bb_application.contact_phone,bb_application.description,
to_char(bb_application_date.from_, 'DD/MM/YYYY HH24:MI') AS from,
to_char(bb_application_date.to_, 'DD/MM/YYYY HH24:MI') AS to, bb_activity.name
AS activity_name, bb_event.cost AS price,bb_application_comment.comment AS
comment FROM bb_application, bb_application_date,bb_activity, bb_event,
bb_application_comment WHERE bb_application.id = ANY
(string_to_array($P{BK_APPLICATION_ID}, ',')::int4[]) AND bb_application.id =
bb_application_date.application_id AND bb_application.activity_id =
bb_activity.id AND bb_application.id = bb_event.application_id AND
bb_application.id = bb_application_comment.application_id LIMIT 1]]>
</queryString>
@@ -85,11 +84,11 @@
<band height="107" splitType="Stretch">
<image>
<reportElement x="0" y="11" width="102"
height="74"/>
- <imageExpression
class="java.lang.String"><![CDATA[$P{BK_PATH} +
"/booking/jasper/templates/logo.png"]]></imageExpression>
+ <imageExpression
class="java.lang.String"><![CDATA["../../../../booking/jasper/templates/logo.png"]]></imageExpression>
</image>
<image>
<reportElement x="405" y="0" width="150"
height="100"/>
- <imageExpression
class="java.lang.String"><![CDATA[$P{BK_PATH} +
"/booking/jasper/templates/aktivby.png"]]></imageExpression>
+ <imageExpression
class="java.lang.String"><![CDATA["../../../../booking/jasper/templates/aktivby.png"]]></imageExpression>
</image>
</band>
</title>
Modified:
branches/Version-1_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
2011-01-13 13:40:51 UTC (rev 6762)
+++ branches/Version-1_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
2011-01-13 14:14:05 UTC (rev 6763)
@@ -37,10 +37,9 @@
if ($_SERVER['REQUEST_METHOD'] == 'POST' &&
$_POST['print'])
{
$output_type = 'PDF';
- $jasper_parameters =
sprintf("\"BK_BUILDING_NAME|%s;BK_APPLICATION_ID|%s;BK_PATH|%s\"",
+ $jasper_parameters =
sprintf("\"BK_BUILDING_NAME|%s;BK_APPLICATION_ID|%s\"",
$application['building_name'],
- $id,
- $GLOBALS['_SERVER']['DOCUMENT_ROOT']);
+ $id);
// DEBUG
// print_r($jasper_parameters);
// exit(0);
Modified: branches/Version-1_0-branch/bookingfrontend/logout.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/logout.php 2011-01-13
13:40:51 UTC (rev 6762)
+++ branches/Version-1_0-branch/bookingfrontend/logout.php 2011-01-13
14:14:05 UTC (rev 6763)
@@ -21,11 +21,43 @@
$verified = $GLOBALS['phpgw']->session->verify();
+ $external_logout = '';
if ($verified)
{
+ $config =
CreateObject('phpgwapi.config','bookingfrontend');
+ $config->read();
+
+ $external_logout =
isset($config->config_data['external_logout']) &&
$config->config_data['external_logout'] ?
$config->config_data['external_logout'] : '';
+// $external_logout =
"https://login-vip.bergen.kommune.no/SSO/logout?p_done_url=";//https://www.bergen.kommune.no";
+
$frontend_user = CreateObject('bookingfrontend.bouser');
$frontend_user->log_off();
+/*
+ // testing external logout
+
+ $arguments = array('p_done_url' =>
'https://www.bergen.kommune.no');
+ $query = http_build_query($arguments);
+ $auth_url = $_integration_config['auth_url'];
+ $request =
"https://login-vip.bergen.kommune.no/SSO/logout?{$query}";;
+
+ $aContext = array
+ (
+ 'https' => array
+ (
+ 'request_fulluri' => true,
+ ),
+ );
+
+ if(isset($GLOBALS['phpgw_info']['server']['httpproxy_server']))
+ {
+ $aContext['http']['proxy'] =
"{$GLOBALS['phpgw_info']['server']['httpproxy_server']}:{$GLOBALS['phpgw_info']['server']['httpproxy_port']}";
+ }
+
+ $cxContext = stream_context_create($aContext);
+ $response = file_get_contents($request, False, $cxContext);
+*/
+
execMethod('phpgwapi.menu.clear');
$GLOBALS['phpgw']->hooks->process('logout');
$GLOBALS['phpgw']->session->destroy($sessionid);
@@ -47,19 +79,36 @@
$redirect = phpgw::get_var('redirect_menuaction', 'string');
- if($redirect) {
+ if($redirect)
+ {
$matches = array();
$extra_vars['menuaction'] = $redirect;
- foreach($_GET as $name => $value) {
- if (preg_match('/^redirect_([\w\_\-]+)/', $name,
$matches) && $matches[1] != 'menuaction') {
+ foreach($_GET as $name => $value)
+ {
+ if (preg_match('/^redirect_([\w\_\-]+)/', $name,
$matches) && $matches[1] != 'menuaction')
+ {
$extra_vars[$matches[1]] =
phpgw::clean_value($value);
}
}
}
- if (!isset($extra_vars['menuaction'])) {
+ if (!isset($extra_vars['menuaction']))
+ {
$extra_vars['menuaction'] = 'bookingfrontend.uisearch.index';
}
- $GLOBALS['phpgw']->redirect_link('/bookingfrontend/', $extra_vars);
+ if(!$external_logout)
+ {
+ $GLOBALS['phpgw']->redirect_link('/bookingfrontend/',
$extra_vars);
+ }
+ else
+ {
+ $result_redirect = '';
+ if(substr($external_logout,-1) == '=')
+ {
+ $result_redirect =
$GLOBALS['phpgw']->link('/bookingfrontend/', $extra_vars, true);
+ }
+ $external_logout_url = "{$external_logout}{$result_redirect}";
+ Header("Location: {$external_logout_url}");
+ }
exit;
Modified: branches/Version-1_0-branch/bookingfrontend/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/templates/base/config.tpl
2011-01-13 13:40:51 UTC (rev 6762)
+++ branches/Version-1_0-branch/bookingfrontend/templates/base/config.tpl
2011-01-13 14:14:05 UTC (rev 6763)
@@ -81,6 +81,12 @@
<td>{lang_google_tracker_id}:</td>
<td><input name="newsettings[tracker_id]"
value="{value_tracker_id}"></td>
</tr>
+ <tr class="row_off">
+ <td>{lang_url_to_external_logout}:
+ <br/> Redirect is computed if url ends with '='
+ </td>
+ <td><input name="newsettings[external_logout]"
value="{value_external_logout}"></td>
+ </tr>
<!-- END body -->
<!-- BEGIN footer -->
Modified: branches/Version-1_0-branch/property/inc/class.boproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2011-01-13 13:40:51 UTC (rev 6762)
+++ branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2011-01-13 14:14:05 UTC (rev 6763)
@@ -266,8 +266,14 @@
(
'id' => '7',
'name' => lang('accounting dim
b')
+ ),
+ array
+ (
+ 'id' => '8',
+ 'name' => lang('budget account
group')
)
);
+
return
$this->bocommon->select_list($selected,$criteria);
}
@@ -331,6 +337,14 @@
'front' => '',
'back' => ''
);
+ $criteria[8] = array
+ (
+ 'field' => 'fm_project.account_group',
+ 'type' => 'int',
+ 'matchtype' => 'exact',
+ 'front' => '',
+ 'back' => ''
+ );
if($id)
{
Modified: branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
2011-01-13 13:40:51 UTC (rev 6762)
+++ branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
2011-01-13 14:14:05 UTC (rev 6763)
@@ -323,6 +323,11 @@
(
'id' => '9',
'name' => lang('accounting dim
b')
+ ),
+ array
+ (
+ 'id' => '10',
+ 'name' => lang('budget account
group')
)
);
return
$this->bocommon->select_list($selected,$criteria);
@@ -404,6 +409,14 @@
'front' => '',
'back' => ''
);
+ $criteria[10] = array
+ (
+ 'field' => 'fm_project.account_group',
+ 'type' => 'int',
+ 'matchtype' => 'exact',
+ 'front' => '',
+ 'back' => ''
+ );
if($id)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6763] Merge 6757:6762 from trunk,
Sigurd Nes <=