[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16204] more on eventplanner
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16204] more on eventplanner |
|
Date: |
Fri, 27 Jan 2017 14:13:21 -0500 (EST) |
Revision: 16204
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16204
Author: sigurdne
Date: 2017-01-27 14:13:21 -0500 (Fri, 27 Jan 2017)
Log Message:
-----------
more on eventplanner
Modified Paths:
--------------
trunk/eventplannerfrontend/inc/class.bouser.inc.php
trunk/eventplannerfrontend/inc/hook_config.inc.php
trunk/eventplannerfrontend/templates/base/config.tpl
Modified: trunk/eventplannerfrontend/inc/class.bouser.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/class.bouser.inc.php 2017-01-27 19:12:48 UTC
(rev 16203)
+++ trunk/eventplannerfrontend/inc/class.bouser.inc.php 2017-01-27 19:13:21 UTC
(rev 16204)
@@ -24,7 +24,7 @@
{
$this->set_module();
$this->orgnr = $this->get_user_orgnr_from_session();
- $this->orgname =
$this->get_orgname_from_db($this->get_user_orgnr_from_session());
+// $this->orgname =
$this->get_orgname_from_db($this->get_user_orgnr_from_session());
$this->config = CreateObject('phpgwapi.config',
'eventplannerfrontend');
$this->config->read();
}
@@ -85,7 +85,7 @@
$external_user = new
eventplannerfrontend_external_user();
$this->orgnr = $external_user->get_user_org_id();
- $this->orgname =
$this->get_orgname_from_db($this->orgnr);
+ // $this->orgname =
$this->get_orgname_from_db($this->orgnr);
if ($this->is_logged_in())
{
@@ -116,7 +116,7 @@
{
$this->orgnr = $orgnumber;
- $this->orgname =
$this->get_orgname_from_db($this->orgnr);
+ // $this->orgname =
$this->get_orgname_from_db($this->orgnr);
if ($this->is_logged_in())
{
Modified: trunk/eventplannerfrontend/inc/hook_config.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/hook_config.inc.php 2017-01-27 19:12:48 UTC
(rev 16203)
+++ trunk/eventplannerfrontend/inc/hook_config.inc.php 2017-01-27 19:13:21 UTC
(rev 16204)
@@ -35,8 +35,8 @@
{
$selected = $config['authentication_method'];
- $dirname = PHPGW_SERVER_ROOT .
"/bookingfrontend/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}";
- $dirname = PHPGW_SERVER_ROOT .
"/bookingfrontend/inc/custom/default";
+ $dirname = PHPGW_SERVER_ROOT .
"/eventplannerfrontend/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}";
+ $dirname = PHPGW_SERVER_ROOT .
"/eventplannerfrontend/inc/custom/default";
$find = array('/_/', '/\.php$/');
$replace = array(' ', '');
Modified: trunk/eventplannerfrontend/templates/base/config.tpl
===================================================================
--- trunk/eventplannerfrontend/templates/base/config.tpl 2017-01-27
19:12:48 UTC (rev 16203)
+++ trunk/eventplannerfrontend/templates/base/config.tpl 2017-01-27
19:13:21 UTC (rev 16204)
@@ -6,21 +6,31 @@
</tr>
<!-- END header -->
<!-- BEGIN body -->
- <tr class="row_on">
+ <tr>
<td colspan="2"> </td>
</tr>
- <tr class="row_off">
+ <tr>
<td
colspan="2"> <b>{lang_bookingfrontend_settings}</b></td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_site_title}</td>
<td><input name="newsettings[site_title]"
value="{value_site_title}"></td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_footer_info}</td>
<td><input name="newsettings[footer_info]"
value="{value_footer_info}"></td>
</tr>
- <tr class="row_off">
+ <tr>
+ <td>{lang_auth_type}:</td>
+ <td>
+ <select name="newsettings[auth_type]">
+ <option value="0"
{selected_auth_type_0}>Same as framework</option>
+ <option value="sql"
{selected_auth_type_sql}>SQL</option>
+ <option value="customsso"
{selected_auth_type_customsso}>Custom SSO</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
<td>{lang_remote_authentication}:</td>
<td>
<select
name="newsettings[authentication_method]">
@@ -28,67 +38,67 @@
</select>
</td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_cookie_domain_for_sessions_-_if_Same_as_framework_leave_empty}</td>
<td><input name="newsettings[cookie_domain]"
value="{value_cookie_domain}"></td>
</tr>
- <tr class="row_off">
+ <tr>
<td>{lang_Anonymous_user}:</td>
<td><input name="newsettings[anonymous_user]"
value="{value_anonymous_user}"></td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_Anonymous_password}:</td>
<td><input type="password"
name="newsettings[anonymous_passwd]" value="{value_anonymous_passwd}"></td>
</tr>
- <tr class="row_off">
+ <tr>
<td>{lang_custom_login_url}:</td>
<td><input name="newsettings[custom_login_url]"
value="{value_custom_login_url}"></td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_custom_login_url_parameter}:</td>
<td><input name="newsettings[login_parameter]"
value="{value_login_parameter}"></td>
</tr>
- <tr class="row_off">
+ <tr>
<td>{lang_login_header_key}:</td>
<td><input name="newsettings[header_key]"
value="{value_header_key}"></td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_login_header_regular_expression}:</td>
<td><input
name="newsettings[header_regular_expression]"
value="{value_header_regular_expression}"></td>
</tr>
- <tr class="row_off">
+ <tr>
<td>{lang_login_soap_client_location}:</td>
<td><input name="newsettings[soap_location]"
value="{value_soap_location}"></td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_login_soap_client_uri}:</td>
<td><input name="newsettings[soap_uri]"
value="{value_soap_uri}"></td>
</tr>
- <tr class="row_off">
+ <tr>
<td>{lang_login_soap_client_proxy_host}:</td>
<td><input name="newsettings[soap_proxy_host]"
value="{value_soap_proxy_host}"></td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_login_soap_client_proxy_port}:</td>
<td><input name="newsettings[soap_proxy_port]"
value="{value_soap_proxy_port}"></td>
</tr>
- <tr class="row_off">
+ <tr>
<td>{lang_login_soap_client_encoding}:</td>
<td><input name="newsettings[soap_encoding]"
value="{value_soap_encoding}"></td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_login_soap_client_login}:</td>
<td><input name="newsettings[soap_login]"
value="{value_soap_login}"></td>
</tr>
- <tr class="row_off">
+ <tr>
<td>{lang_login_soap_client_password}:</td>
<td><input type ="password"
name="newsettings[soap_password]" value="{value_soap_password}"></td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_login_soap_client_wsdl}:</td>
<td><input name="newsettings[soap_wsdl]"
value="{value_soap_wsdl}"></td>
</tr>
- <tr class="row_off">
+ <tr>
<td>{lang_Debug}:</td>
<td>
<select name="newsettings[debug]">
@@ -97,17 +107,17 @@
</select>
</td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_google_tracker_id}:</td>
<td><input name="newsettings[tracker_id]"
value="{value_tracker_id}"></td>
</tr>
- <tr class="row_off">
+ <tr>
<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>
- <tr class="row_off">
+ <tr>
<td>{lang_bookingfrontend_host}:
<br/> Needed for the return from the
external_logout
</td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16204] more on eventplanner,
sigurdne <=