[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16205] more on eventplanner
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16205] more on eventplanner |
|
Date: |
Sat, 28 Jan 2017 13:24:19 -0500 (EST) |
Revision: 16205
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16205
Author: sigurdne
Date: 2017-01-28 13:24:18 -0500 (Sat, 28 Jan 2017)
Log Message:
-----------
more on eventplanner
Modified Paths:
--------------
trunk/admin/inc/class.uiaccounts.inc.php
trunk/eventplannerfrontend/inc/class.hook_helper.inc.php
trunk/eventplannerfrontend/inc/class.menu.inc.php
trunk/eventplannerfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
trunk/eventplannerfrontend/setup/setup.inc.php
trunk/eventplannerfrontend/templates/base/home.xsl
trunk/phpgwapi/templates/base/datatable_jquery.xsl
trunk/phpgwapi/templates/frontend/css/frontend.css
trunk/phpgwapi/templates/frontend/navbar.inc.php
trunk/phpgwapi/templates/pure/head.tpl
trunk/registration/inc/class.boreg.inc.php
trunk/registration/inc/class.uireg.inc.php
trunk/registration/setup/phpgw_no.lang
trunk/registration/setup/setup.inc.php
trunk/registration/templates/base/config.tpl
trunk/registration/templates/base/tos.tpl
Modified: trunk/admin/inc/class.uiaccounts.inc.php
===================================================================
--- trunk/admin/inc/class.uiaccounts.inc.php 2017-01-27 19:13:21 UTC (rev
16204)
+++ trunk/admin/inc/class.uiaccounts.inc.php 2017-01-28 18:24:18 UTC (rev
16205)
@@ -108,7 +108,7 @@
&&
!$GLOBALS['phpgw']->acl->check('group_access', phpgwapi_acl::EDIT, 'admin')
&&
!$GLOBALS['phpgw']->acl->check('group_access', phpgwapi_acl::PRIV, 'admin') )
{
- return;
+ return $this->jquery_results(array('results' =>
array(), 'total_records' => 0));
}
$type = phpgw::get_var('type');
Modified: trunk/eventplannerfrontend/inc/class.hook_helper.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/class.hook_helper.inc.php 2017-01-27
19:13:21 UTC (rev 16204)
+++ trunk/eventplannerfrontend/inc/class.hook_helper.inc.php 2017-01-28
18:24:18 UTC (rev 16205)
@@ -124,13 +124,24 @@
{
return;
}
- //parent::__construct();
+
+ $session_org_id = phpgw::get_var('session_org_id','int'
, 'POST');
+ if($session_org_id)
+ {
+ try
+ {
+ $_SESSION['org_id'] =
createObject('booking.sfValidatorNorwegianOrganizationNumber')->clean($session_org_id);
+ }
+ catch (sfValidatorError $e)
+ {
+ $_SESSION['org_id'] = '';
+ }
+ }
-
if(!empty($_SESSION['orgs']) &&
is_array($_SESSION['orgs']))
{
- $orgs = $_SESSION['orgs'];
- $org_id = !empty($_SESSION['org_id']) ?
$_SESSION['org_id'] : '';
+ $orgs = phpgw::get_var('orgs', 'string',
'SESSION');
+ $org_id = phpgw::get_var('org_id','int' ,
'SESSION');
}
else
{
@@ -137,13 +148,14 @@
return;
}
- $org_option ='';
+ $lang_none = lang('none');
+ $org_option ="<option value='-1'>{$lang_none}</option>";
foreach ($orgs as $org)
{
$selected = '';
- if ($org_id == $org['id'])
+ if ($org_id == (int)$org['id'])
{
- $selected = 'selected = "selected"';
+ $selected = ' selected="selected"';
}
$org_option .= <<<HTML
@@ -153,41 +165,51 @@
HTML;
}
-
-// _debug_array($_SERVER);
-
if ($orgs)
{
-// $action =
$GLOBALS['phpgw']->link('/eventplannerfrontend/login.php', array('stage' => 2));
$action =
"{$_SERVER['REQUEST_SCHEME']}://{$_SERVER['SERVER_NAME']}{$_SERVER['REQUEST_URI']}";
$message = 'Velg organisasjon';
$org_select = <<<HTML
- <p>
- <label
for="org_id">Velg Organisasjon:</label>
- <select
name="org_id" id="org_id">
-
{$org_option}
- </select>
- </p>
+ <p>
+ <label for="org_id">Velg
Organisasjon:</label>
+ <select name="session_org_id"
id="org_id" onChange="this.form.submit();">
+ {$org_option}
+ </select>
+ </p>
HTML;
}
$html = <<<HTML
- <!DOCTYPE html>
- <h2>{$message}</h2>
- <form action="{$action}" method="POST">
- <fieldset>
- <legend>
- Organisasjon
- </legend>
- $org_select
- <p>
- <input
type="submit" name="submit" value="Fortsett" />
- </p>
- </fieldset>
- </form>
+ <form action="{$action}" method="POST">
+ $org_select
+ </form>
HTML;
echo $html;
}
+
+ /**
+ * hook to add account
+ *
+ * this function is a wrapper function for emailadmin
+ *
+ * @param _hookValues contains the hook values as array
+ * @returns nothing
+ */
+ function addaccount()
+ {
+ $account_id =
(int)$GLOBALS['hook_values']['account_id'];
+ $headers = getallheaders();
+ $ssn = $headers['uid'];
+ $auth = createObject('phpgwapi.auth');
+ $ssn_hash = $auth->create_hash($ssn);
+ $hash_safe =
$GLOBALS['phpgw']->db->db_addslashes($ssn_hash); // just to be safe :)
+
+ $data = json_encode(array('ssn_hash' => $hash_safe));
+
+ $sql = "INSERT INTO phpgw_accounts_data (account_id,
account_data) VALUES ({$account_id}, '{$data}')";
+ $GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
+ }
+
}
\ No newline at end of file
Modified: trunk/eventplannerfrontend/inc/class.menu.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/class.menu.inc.php 2017-01-27 19:13:21 UTC
(rev 16204)
+++ trunk/eventplannerfrontend/inc/class.menu.inc.php 2017-01-28 18:24:18 UTC
(rev 16205)
@@ -70,7 +70,12 @@
'text' => lang('metasettings'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'eventplannerfrontend.uimetasettings.index',
'appname' =>
'eventplannerfrontend'))
- )
+ ),
+ 'acl' => array(
+ 'text' =>
$GLOBALS['phpgw']->translation->translate('Configure Access Permissions',
array(), true),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'preferences.uiadmin_acl.list_acl',
+ 'acl_app' =>
'eventplannerfrontend'))
+ ),
);
}
Modified:
trunk/eventplannerfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
===================================================================
--- trunk/eventplannerfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
2017-01-27 19:13:21 UTC (rev 16204)
+++ trunk/eventplannerfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
2017-01-28 18:24:18 UTC (rev 16205)
@@ -118,7 +118,7 @@
}
catch (SoapFault $exception)
{
- echo "Dette gikk ikke så bra.";
+ echo "Feilet på oppslag mot soaptjeneste.";
var_dump(get_class($exception));
var_dump($exception);
}
@@ -125,7 +125,8 @@
if ($this->debug)
{
- $orgs[] = array('id' => '123456789', 'name' =>
'Bergen kommune');
+ $orgs[] = array('id' => '964338531', 'name' =>
'Bergen kommune');
+ $_org_id = 964338531;
}
$_SESSION['orgs'] = $orgs;
$_SESSION['org_id'] = $_org_id; // one of them..
Modified: trunk/eventplannerfrontend/setup/setup.inc.php
===================================================================
--- trunk/eventplannerfrontend/setup/setup.inc.php 2017-01-27 19:13:21 UTC
(rev 16204)
+++ trunk/eventplannerfrontend/setup/setup.inc.php 2017-01-28 18:24:18 UTC
(rev 16205)
@@ -44,5 +44,6 @@
'home' =>
'eventplannerfrontend.hook_helper.home',
'login' =>
'eventplannerfrontend.hook_helper.login',
'after_navbar' =>
'eventplannerfrontend.hook_helper.after_navbar',
+ 'addaccount' =>
'eventplannerfrontend.hook_helper.addaccount',
'config',
);
Modified: trunk/eventplannerfrontend/templates/base/home.xsl
===================================================================
--- trunk/eventplannerfrontend/templates/base/home.xsl 2017-01-27 19:13:21 UTC
(rev 16204)
+++ trunk/eventplannerfrontend/templates/base/home.xsl 2017-01-28 18:24:18 UTC
(rev 16205)
@@ -20,7 +20,8 @@
<xsl:variable name="mode">
<xsl:value-of select="mode"/>
</xsl:variable>
- <div class="splash-container">
+ <div class="content"></div>
+ <!--div class="splash-container">
<div class="splash">
<h1 class="splash-head">
@@ -34,7 +35,7 @@
<xsl:value-of disable-output-escaping="yes"
select="config/frontpage_text"/>
</div>
- </div>
+ </div-->
</xsl:template>
Modified: trunk/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_jquery.xsl 2017-01-27 19:13:21 UTC
(rev 16204)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl 2017-01-28 18:24:18 UTC
(rev 16205)
@@ -16,6 +16,7 @@
</func:function>
<xsl:template match="data">
+ <div class="content">
<xsl:choose>
<xsl:when test="datatable_name">
<h3>
@@ -24,24 +25,23 @@
</xsl:when>
</xsl:choose>
<xsl:call-template name="datatable" />
+ </div>
</xsl:template>
<xsl:template name="datatable">
- <div class="content">
- <script type="text/javascript">
+ <script type="text/javascript">
var number_of_toolbar_items = 0;
var filter_selects = {};
- </script>
- <xsl:call-template name="jquery_phpgw_i18n"/>
- <xsl:apply-templates select="form" />
- <div id="list_flash">
- <xsl:call-template name="msgbox"/>
- </div>
- <div id="message" class='message'/>
- <xsl:apply-templates select="datatable"/>
- <xsl:apply-templates select="form/list_actions"/>
+ </script>
+ <xsl:call-template name="jquery_phpgw_i18n"/>
+ <xsl:apply-templates select="form" />
+ <div id="list_flash">
+ <xsl:call-template name="msgbox"/>
</div>
+ <div id="message" class='message'/>
+ <xsl:apply-templates select="datatable"/>
+ <xsl:apply-templates select="form/list_actions"/>
</xsl:template>
Modified: trunk/phpgwapi/templates/frontend/css/frontend.css
===================================================================
--- trunk/phpgwapi/templates/frontend/css/frontend.css 2017-01-27 19:13:21 UTC
(rev 16204)
+++ trunk/phpgwapi/templates/frontend/css/frontend.css 2017-01-28 18:24:18 UTC
(rev 16205)
@@ -182,6 +182,16 @@
letter-spacing: 0.05em;
opacity: 0.8;
}
+.error {
+ padding: 1em;
+ padding-top: 3em;
+ background: #DD7777;
+}
+.msg_good {
+ padding: 1em;
+ padding-top: 3em;
+ background: #66cd00;
+}
/*
* -- CONTENT STYLES --
Modified: trunk/phpgwapi/templates/frontend/navbar.inc.php
===================================================================
--- trunk/phpgwapi/templates/frontend/navbar.inc.php 2017-01-27 19:13:21 UTC
(rev 16204)
+++ trunk/phpgwapi/templates/frontend/navbar.inc.php 2017-01-28 18:24:18 UTC
(rev 16205)
@@ -13,7 +13,7 @@
if (true)
{
- $bookmarks = phpgwapi_cache::user_get('phpgwapi',
"bookmark_menu", $GLOBALS['phpgw_info']['user']['id']);
+// $bookmarks = phpgwapi_cache::user_get('phpgwapi',
"bookmark_menu", $GLOBALS['phpgw_info']['user']['id']);
$lang_bookmarks = lang('bookmarks');
$navigation = execMethod('phpgwapi.menu.get',
'navigation');
@@ -22,7 +22,7 @@
{
if($app ==
$GLOBALS['phpgw_info']['flags']['currentapp'])
{
- $submenu = isset($navigation[$app]) ?
render_submenu($app, $navigation[$app], $bookmarks) : '';
+ $submenu = isset($navigation[$app]) ?
render_submenu($app, $navigation[$app], array()) : '';
// $treemenu .= render_item($app_data,
"navbar::{$app}", $submenu, $bookmarks);
}
}
@@ -38,6 +38,8 @@
$GLOBALS['phpgw']->template->set_var($var);
$GLOBALS['phpgw']->template->pfp('out','navbar');
+ $GLOBALS['phpgw']->hooks->process('after_navbar');
+
if( phpgw::get_var('phpgw_return_as') != 'json' && $receipt =
phpgwapi_cache::session_get('phpgwapi', 'phpgw_messages'))
{
phpgwapi_cache::session_clear('phpgwapi',
'phpgw_messages');
@@ -51,7 +53,6 @@
}
}
- $GLOBALS['phpgw']->hooks->process('after_navbar');
register_shutdown_function('parse_footer_end');
}
Modified: trunk/phpgwapi/templates/pure/head.tpl
===================================================================
--- trunk/phpgwapi/templates/pure/head.tpl 2017-01-27 19:13:21 UTC (rev
16204)
+++ trunk/phpgwapi/templates/pure/head.tpl 2017-01-28 18:24:18 UTC (rev
16205)
@@ -1,6 +1,6 @@
<!DOCTYPE HTML>
+<html>
<!-- BEGIN head -->
-<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
Modified: trunk/registration/inc/class.boreg.inc.php
===================================================================
--- trunk/registration/inc/class.boreg.inc.php 2017-01-27 19:13:21 UTC (rev
16204)
+++ trunk/registration/inc/class.boreg.inc.php 2017-01-28 18:24:18 UTC (rev
16205)
@@ -68,8 +68,13 @@
}
else
{
- if ($this->config['username_is'] != 'email')
+ if ($this->config['username_is'] == 'email')
{
+
$GLOBALS['phpgw']->session->appsession('loginid', 'registration',
$r_reg['email']);
+ $r_reg['loginid'] = $r_reg['email'];
+ }
+ else
+ {
$GLOBALS['phpgw']->session->appsession('loginid', 'registration',
$r_reg['loginid']);
}
$ui->step2();
@@ -93,19 +98,19 @@
//-------
if ($this->config['username_is'] == 'email')
{
- $this->fields['loginid'] = array
- (
- 'field_name' => 'loginid',
- 'field_text' => lang('username'),
- 'field_type' => 'email',
- 'field_values' => '',
- 'field_required' => 'Y',
- 'field_order' => 1
- );
+// $this->fields['loginid'] = array
+// (
+// 'field_name' => 'loginid',
+// 'field_text' => lang('username'),
+// 'field_type' => 'email',
+// 'field_values' => '',
+// 'field_required' => 'Y',
+// 'field_order' => 1
+// );
- if (!$r_reg['loginid'])
+ if (!$r_reg['email'])
{
- $missing_fields[] = 'loginid';
+ $missing_fields[] = 'email';
$errors[] = lang('you must enter a
username');
}
else
@@ -112,15 +117,15 @@
{
$loginid =
$GLOBALS['phpgw']->session->appsession('loginid', 'registration');
- if ($r_reg['loginid'] != $loginid)
+ if ($r_reg['email'] != $loginid)
{
-
$GLOBALS['phpgw']->session->appsession('loginid', 'registration',
$r_reg['loginid']);
+
$GLOBALS['phpgw']->session->appsession('loginid', 'registration',
$r_reg['email']);
$loginid = false;
}
if (!$loginid)
{
- if
(execMethod('registration.soreg.account_exists', $r_reg['loginid']))
+ if
(execMethod('registration.soreg.account_exists', $r_reg['email']))
{
$errors[] =
lang('Sorry, that username is already taken.');
}
Modified: trunk/registration/inc/class.uireg.inc.php
===================================================================
--- trunk/registration/inc/class.uireg.inc.php 2017-01-27 19:13:21 UTC (rev
16204)
+++ trunk/registration/inc/class.uireg.inc.php 2017-01-28 18:24:18 UTC (rev
16205)
@@ -237,7 +237,7 @@
}
//----
- if ($this->config['username_is'] == 'email')
+ if ($this->config['username_is'] != 'email')
{
$this->template->set_var('message',
lang('username as email'));
$username_fields = $this->get_username_fields();
@@ -573,8 +573,11 @@
$this->template->set_file(array(
'screen' => 'welcome_message.tpl'
));
- $this->template->set_var('login_url',
$GLOBALS['phpgw_info']['server']['webserver_url']);
+ $login_url = $this->config['login_url'] ?
$this->config['login_url'] : $GLOBALS['phpgw_info']['server']['webserver_url'];
+
+ $this->template->set_var('login_url', $login_url);
+
$this->template->pfp('out', 'screen');
$this->footer();
}
@@ -581,6 +584,7 @@
function tos()
{
- $this->simple_screen('tos.tpl');
+ $text = $this->config['terms_of_service'] ?
$this->config['terms_of_service'] : '[ Put your real TOS here :) ]';
+ $this->simple_screen('tos.tpl', $text);
}
}
\ No newline at end of file
Modified: trunk/registration/setup/phpgw_no.lang
===================================================================
--- trunk/registration/setup/phpgw_no.lang 2017-01-27 19:13:21 UTC (rev
16204)
+++ trunk/registration/setup/phpgw_no.lang 2017-01-28 18:24:18 UTC (rev
16205)
@@ -43,3 +43,4 @@
you must fill in all of the required fields registration no Alle
obligatoriske felt må fylles ut
you specified a value for registration no Du anga en verdi for
zip/postal registration no PostNr
+terms of service registration no Vilkår for tjenesten
Modified: trunk/registration/setup/setup.inc.php
===================================================================
--- trunk/registration/setup/setup.inc.php 2017-01-27 19:13:21 UTC (rev
16204)
+++ trunk/registration/setup/setup.inc.php 2017-01-28 18:24:18 UTC (rev
16205)
@@ -18,7 +18,7 @@
$setup_info['registration']['name'] = 'registration';
$setup_info['registration']['version'] = '0.8.5';
$setup_info['registration']['app_order'] = '90';
- $setup_info['registration']['enable'] = 2;
+ $setup_info['registration']['enable'] = 1;
$setup_info['registration']['app_group'] = 'other';
/* The tables this app creates */
Modified: trunk/registration/templates/base/config.tpl
===================================================================
--- trunk/registration/templates/base/config.tpl 2017-01-27 19:13:21 UTC
(rev 16204)
+++ trunk/registration/templates/base/config.tpl 2017-01-28 18:24:18 UTC
(rev 16205)
@@ -7,14 +7,14 @@
<!-- END header -->
<!-- BEGIN body -->
- <tr bgcolor="{row_on}">
+ <tr>
<td colspan="2"> </td>
</tr>
- <tr bgcolor="{row_off}">
+ <tr>
<td colspan="2"><b>{lang_Registration_settings}</b></td>
</tr>
- <tr bgcolor="{row_on}">
+ <tr>
<td>{lang_Use_trial_accounts?}</td>
<td>
<select name="newsettings[trial_accounts]">
@@ -23,11 +23,11 @@
</select>
</td>
</tr>
- <tr bgcolor="{row_off}">
+ <tr>
<td>{lang_Days_until_trial_accounts_expire}:</td>
<td><input
name="newsettings[days_until_trial_account_expires]"
value="{value_days_until_trial_account_expires}"></td>
</tr>
- <tr bgcolor="{row_on}">
+ <tr>
<td>{lang_Display_Terms_of_Service?}</td>
<td>
<select name="newsettings[display_tos]">
@@ -37,6 +37,12 @@
</td>
</tr>
<tr>
+ <td>{lang_terms_of_service}</td>
+ <td>
+ <textarea cols="40" rows="4"
name="newsettings[terms_of_service]"
wrap="virtual">{value_terms_of_service}</textarea>
+ </td>
+ </tr>
+ <tr>
<tr class="row_on">
<td>{lang_default_group}:</td>
<td>
@@ -45,7 +51,7 @@
</select>
</td>
</tr>
- <tr bgcolor="{row_off}">
+ <tr>
<td>{lang_Activate_account}:</td>
<td>
<select name="newsettings[activate_account]">
@@ -55,7 +61,7 @@
</select>
</td>
</tr>
- <tr bgcolor="{row_on}">
+ <tr>
<td>{lang_Username_is}:</td>
<td>
<select name="newsettings[username_is]">
@@ -65,7 +71,7 @@
</select>
</td>
</tr>
- <tr bgcolor="{row_off}">
+ <tr>
<td>{lang_Password_is}:</td>
<td>
<select name="newsettings[password_is]">
@@ -74,39 +80,43 @@
</select>
</td>
</tr>
- <tr bgcolor="{row_on}">
+ <tr>
<td>{lang_Anonymous_user}:</td>
<td><input name="newsettings[anonymous_user]"
value="{value_anonymous_user}"></td>
</tr>
- <tr bgcolor="{row_off}">
+ <tr>
<td>{lang_Anonymous_password}:</td>
<td><input type="password"
name="newsettings[anonymous_pass]" value="{value_anonymous_pass}"></td>
</tr>
- <tr bgcolor="{row_on}">
+ <tr>
<td>{lang_Email_address_registration_admin}:</td>
<td><input name="newsettings[registration_admin]"
value="{value_registration_admin}"></td>
</tr>
- <tr bgcolor="{row_on}">
+ <tr>
<td>{lang_Email_address_to_send_notices_from}:</td>
<td><input name="newsettings[mail_nobody]"
value="{value_mail_nobody}"></td>
</tr>
- <tr bgcolor="{row_off}">
+ <tr>
<td>{lang_Email_address_to_display_for_support}:</td>
<td><input name="newsettings[support_email]"
value="{value_support_email}"></td>
</tr>
- <tr bgcolor="{row_on}">
+ <tr>
<td>{lang_Subject_for_confirmation_email}:</td>
<td><input name="newsettings[subject_confirm]"
value="{value_subject_confirm}"></td>
</tr>
- <tr class="row_off">
+ <tr>
<td>{lang_messenger_welcome_message}</td>
<td>
<textarea cols="40" rows="4"
name="newsettings[messenger_welcome_message]"
wrap="virtual">{value_messenger_welcome_message}</textarea>
</td>
</tr>
- <tr bgcolor="{row_on}">
+ <tr>
+ <td>{lang_login_url}:</td>
+ <td><input name="newsettings[login_url]"
value="{value_login_url}"></td>
+ </tr>
+ <tr>
<!-- END body -->
Modified: trunk/registration/templates/base/tos.tpl
===================================================================
--- trunk/registration/templates/base/tos.tpl 2017-01-27 19:13:21 UTC (rev
16204)
+++ trunk/registration/templates/base/tos.tpl 2017-01-28 18:24:18 UTC (rev
16205)
@@ -1 +1 @@
-<p><center>[ Put your real TOS here :) ]</center>
+<p><center>{extra_text}</center>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16205] more on eventplanner,
sigurdne <=