[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14563] booking: formatting code
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14563] booking: formatting code |
|
Date: |
Thu, 10 Dec 2015 13:28:02 +0000 |
Revision: 14563
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14563
Author: sigurdne
Date: 2015-12-10 13:28:01 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
booking: formatting code
Modified Paths:
--------------
branches/dev-syncromind/booking/frontend.php
branches/dev-syncromind/booking/index.php
Modified: branches/dev-syncromind/booking/frontend.php
===================================================================
--- branches/dev-syncromind/booking/frontend.php 2015-12-10 13:26:28 UTC
(rev 14562)
+++ branches/dev-syncromind/booking/frontend.php 2015-12-10 13:28:01 UTC
(rev 14563)
@@ -1,44 +1,44 @@
<?php
/**
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package phpgroupware
- * @version $Id$
- */
- $phpgw_info = array();
- $GLOBALS['phpgw_info']['flags'] = array
- (
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @package phpgroupware
+ * @version $Id$
+ */
+ $phpgw_info = array();
+ $GLOBALS['phpgw_info']['flags'] = array
+ (
'disable_template_class' => true,
- 'login' => true,
- 'currentapp' => 'login',
- 'noheader' => true
+ 'login' => true,
+ 'currentapp' => 'login',
+ 'noheader' => true
);
if(file_exists('../header.inc.php'))
{
include_once('../header.inc.php');
$GLOBALS['phpgw']->sessions = createObject('phpgwapi.sessions');
}
- $login = "bookingguest";
- $passwd = "bkbooking";
- $_POST['submitit'] = "";
- if ( (isset($_POST['submitit']) || isset($_POST['submit_x']) ||
isset($_POST['submit_y']) ) )
+ $login = "bookingguest";
+ $passwd = "bkbooking";
+ $_POST['submitit'] = "";
+ if((isset($_POST['submitit']) || isset($_POST['submit_x']) ||
isset($_POST['submit_y'])))
{
$GLOBALS['sessionid'] =
$GLOBALS['phpgw']->session->create($login, $passwd);
-
$GLOBALS['phpgw']->session->appsession('tenant_id','property',$tenant_id);
+ $GLOBALS['phpgw']->session->appsession('tenant_id', 'property',
$tenant_id);
$forward = phpgw::get_var('phpgw_forward', 'int');
if($forward)
{
- $extra_vars['phpgw_forward'] = $forward;
+ $extra_vars['phpgw_forward'] = $forward;
foreach($_GET as $name => $value)
{
- if (preg_match('/phpgw_/',$name))
+ if(preg_match('/phpgw_/', $name))
{
$extra_vars[$name] =
phpgw::clean_value($value);
}
}
}
-
+
$extra_vars['menuaction'] = 'booking.uiorganization.index';
$GLOBALS['phpgw']->hooks->process('login');
@@ -47,24 +47,23 @@
exit;
}
- if( $GLOBALS['phpgw_info']['server']['domain_from_host']
- && !$GLOBALS['phpgw_info']['server']['show_domain_selectbox'] )
+ if($GLOBALS['phpgw_info']['server']['domain_from_host'] &&
!$GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
{
$tmpl->set_var(
- array(
- 'domain_selects' => '',
- 'logindomain' =>
phpgw::get_var('SERVER_NAME', 'string' , 'SERVER')
- )
- );
+ array(
+ 'domain_selects' => '',
+ 'logindomain' => phpgw::get_var('SERVER_NAME',
'string', 'SERVER')
+ )
+ );
$tmpl->parse('domain_from_hosts', 'domain_from_host');
}
- elseif( $GLOBALS['phpgw_info']['server']['show_domain_selectbox'] )
+ elseif($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
{
foreach($GLOBALS['phpgw_domain'] as $domain_name =>
$domain_vars)
{
$tmpl->set_var('domain_name', $domain_name);
- if (isset($_COOKIE['last_domain']) &&
$_COOKIE['last_domain'] == $domain_name)
+ if(isset($_COOKIE['last_domain']) &&
$_COOKIE['last_domain'] == $domain_name)
{
$tmpl->set_var('domain_selected',
'selected="selected"');
}
@@ -76,30 +75,29 @@
}
$tmpl->parse('domain_selects', 'domain_select');
$tmpl->set_var(
- array(
- 'domain_from_hosts' => '',
- 'lang_domain' =>
lang('domain')
- )
- );
+ array(
+ 'domain_from_hosts' => '',
+ 'lang_domain' => lang('domain')
+ )
+ );
}
else
{
$tmpl->set_var(
- array(
- 'domain_selects' => '',
- 'domain_from_hosts' => ''
- )
- );
-
+ array(
+ 'domain_selects' => '',
+ 'domain_from_hosts' => ''
+ )
+ );
}
- $usertypes =
array('tenant'=>lang('tenant'),'internal'=>lang('internal'));
+ $usertypes = array('tenant' => lang('tenant'), 'internal' =>
lang('internal'));
foreach($usertypes as $usertype_id => $usertype_name)
{
$tmpl->set_var('usertype_id', $usertype_id);
$tmpl->set_var('usertype_name', $usertype_name);
- if (isset($_COOKIE['last_usertype']) &&
$_COOKIE['last_usertype']==$usertype_id)
+ if(isset($_COOKIE['last_usertype']) &&
$_COOKIE['last_usertype'] == $usertype_id)
{
$tmpl->set_var('usertype_selected',
'selected="selected"');
}
@@ -111,18 +109,18 @@
}
$tmpl->parse('usertype_selects', 'usertype_select');
$tmpl->set_var(
- array(
- 'usertype_from_hosts' => '',
- 'lang_usertype' => lang('Usertype')
- )
- );
+ array(
+ 'usertype_from_hosts' => '',
+ 'lang_usertype' => lang('Usertype')
+ )
+ );
- if (isset($_COOKIE['last_loginid']))
+ if(isset($_COOKIE['last_loginid']))
{
- $accounts = CreateObject('phpgwapi.accounts');
- $prefs = CreateObject('phpgwapi.preferences',
$accounts->name2id(phpgw::get_var('last_loginid', 'string', 'COOKIE')));
+ $accounts = CreateObject('phpgwapi.accounts');
+ $prefs = CreateObject('phpgwapi.preferences',
$accounts->name2id(phpgw::get_var('last_loginid', 'string', 'COOKIE')));
- if (! $prefs->account_id)
+ if(!$prefs->account_id)
{
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = 'en';
}
@@ -140,32 +138,30 @@
}
$GLOBALS['phpgw']->translation->add_app('login');
$GLOBALS['phpgw']->translation->add_app('loginscreen');
- if ( ($login_msg = lang('loginscreen_message') ) !=
'loginscreen_message*')
+ if(($login_msg = lang('loginscreen_message') ) !=
'loginscreen_message*')
{
- $tmpl->set_var('lang_message', stripslashes($login_msg) );
+ $tmpl->set_var('lang_message', stripslashes($login_msg));
}
else
{
$tmpl->set_var('lang_message', ' ');
}
- if( ( !isset($GLOBALS['phpgw_info']['server']['usecookies']) ||
!$GLOBALS['phpgw_info']['server']['usecookies'] )
- && (isset($_COOKIE) && is_array($_COOKIE) ) )
+ if((!isset($GLOBALS['phpgw_info']['server']['usecookies']) ||
!$GLOBALS['phpgw_info']['server']['usecookies'] ) && (isset($_COOKIE) &&
is_array($_COOKIE) ))
{
- if ( isset($_COOKIE['last_loginid']) )
+ if(isset($_COOKIE['last_loginid']))
{
unset($_COOKIE['last_loginid']);
}
- if ( isset($_COOKIE['last_domain']) )
+ if(isset($_COOKIE['last_domain']))
{
unset($_COOKIE['last_domain']);
}
- if ( isset($_COOKIE['last_usertype']) )
+ if(isset($_COOKIE['last_usertype']))
{
unset($_COOKIE['last_usertype']);
}
-
}
$last_loginid = phpgw::get_var('last_loginid', 'string', 'COOKIE');
@@ -174,7 +170,7 @@
reset($GLOBALS['phpgw_domain']);
list($default_domain) = each($GLOBALS['phpgw_domain']);
- if ($_COOKIE['last_domain'] != $default_domain &&
!empty($_COOKIE['last_domain']))
+ if($_COOKIE['last_domain'] != $default_domain &&
!empty($_COOKIE['last_domain']))
{
$last_loginid .= '@' . phpgw::get_var('last_domain',
'string', 'COOKIE');
}
@@ -184,20 +180,20 @@
$extra_vars = array();
foreach($_GET as $name => $value)
{
- if (preg_match('/phpgw_/',$name))
+ if(preg_match('/phpgw_/', $name))
{
$extra_vars[$name] =
urlencode(phpgw::clean_value($value));
}
}
$cd = 0;
- if ( isset($_GET['cd']) )
+ if(isset($_GET['cd']))
{
- $cd = (int) $_GET['cd'];
+ $cd = (int)$_GET['cd'];
}
- $tmpl->set_var('login_url',
$GLOBALS['phpgw_info']['server']['webserver_url'] . '/property/login.php?' .
http_build_query($extra_vars) );
-
$tmpl->set_var('registration_url',$GLOBALS['phpgw_info']['server']['webserver_url']
. '/registration/');
+ $tmpl->set_var('login_url',
$GLOBALS['phpgw_info']['server']['webserver_url'] . '/property/login.php?' .
http_build_query($extra_vars));
+ $tmpl->set_var('registration_url',
$GLOBALS['phpgw_info']['server']['webserver_url'] . '/registration/');
$tmpl->set_var('version',
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
$tmpl->set_var('last_loginid', $last_loginid);
@@ -205,12 +201,10 @@
$tmpl->set_var('lang_password', lang('password'));
$tmpl->set_var('lang_login', lang('login'));
- $tmpl->set_var('lang_testjs', lang('Your browser does not support
javascript and/or css, please use a modern standards compliant browser. If you
have disabled either of these features please enable them for this site.') );
+ $tmpl->set_var('lang_testjs', lang('Your browser does not support
javascript and/or css, please use a modern standards compliant browser. If you
have disabled either of these features please enable them for this site.'));
- $tmpl->set_var('website_title',
isset($GLOBALS['phpgw_info']['server']['site_title'])
- ?
$GLOBALS['phpgw_info']['server']['site_title']
- : 'phpGroupWare'
- );
+ $tmpl->set_var('website_title',
isset($GLOBALS['phpgw_info']['server']['site_title']) ?
$GLOBALS['phpgw_info']['server']['site_title'] : 'phpGroupWare'
+ );
$tmpl->set_var('template_set',
$GLOBALS['phpgw_info']['login_template_set']);
@@ -221,5 +215,4 @@
$tmpl->set_var('autocomplete', $autocomplete);
unset($autocomplete);
- $tmpl->pfp('loginout','login_form');
-
+ $tmpl->pfp('loginout', 'login_form');
Modified: branches/dev-syncromind/booking/index.php
===================================================================
--- branches/dev-syncromind/booking/index.php 2015-12-10 13:26:28 UTC (rev
14562)
+++ branches/dev-syncromind/booking/index.php 2015-12-10 13:28:01 UTC (rev
14563)
@@ -1,25 +1,24 @@
<?php
# TESTING
- $currentapp='booking';
+ $currentapp = 'booking';
$GLOBALS['phpgw_info']['flags'] = array(
- 'noheader' => True,
- 'nonavbar' => True,
- 'currentapp' => $currentapp
- );
+ 'noheader' => True,
+ 'nonavbar' => True,
+ 'currentapp' => $currentapp
+ );
include('../header.inc.php');
-
$start_page=(isset($GLOBALS['phpgw_info']['user']['preferences'][$currentapp]['default_start_page'])?$GLOBALS['phpgw_info']['user']['preferences'][$currentapp]['default_start_page']:'');
+ $start_page =
(isset($GLOBALS['phpgw_info']['user']['preferences'][$currentapp]['default_start_page'])
?
$GLOBALS['phpgw_info']['user']['preferences'][$currentapp]['default_start_page']
: '');
- if ($start_page)
+ if($start_page)
{
- $start_page =array('menuaction'=>
$currentapp.'.ui'.$start_page.'.index');
+ $start_page = array('menuaction' => $currentapp . '.ui' .
$start_page . '.index');
}
else
{
- $start_page = array('menuaction'=>
$currentapp.'.uibooking.index');
+ $start_page = array('menuaction' => $currentapp .
'.uibooking.index');
}
- $GLOBALS['phpgw']->redirect_link('/index.php',$start_page);
-?>
+ $GLOBALS['phpgw']->redirect_link('/index.php', $start_page);
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14563] booking: formatting code,
Sigurd Nes <=