[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14402] booking: corrected some phpgw::get_var-inputs
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14402] booking: corrected some phpgw::get_var-inputs |
|
Date: |
Wed, 18 Nov 2015 13:47:02 +0000 |
Revision: 14402
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14402
Author: sigurdne
Date: 2015-11-18 13:47:01 +0000 (Wed, 18 Nov 2015)
Log Message:
-----------
booking: corrected some phpgw::get_var-inputs
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.boapplication.inc.php
branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
branches/dev-syncromind/booking/inc/class.uibooking.inc.php
branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
branches/dev-syncromind/booking/inc/class.uicontactperson.inc.php
branches/dev-syncromind/booking/inc/class.uidocument.inc.php
branches/dev-syncromind/booking/inc/class.uidocument_view.inc.php
branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
branches/dev-syncromind/booking/inc/class.uievent.inc.php
branches/dev-syncromind/booking/inc/class.uigroup.inc.php
branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
branches/dev-syncromind/booking/inc/class.uipermission.inc.php
branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
branches/dev-syncromind/booking/inc/class.uireports.inc.php
branches/dev-syncromind/booking/inc/class.uiresource.inc.php
branches/dev-syncromind/booking/inc/class.uiseason.inc.php
branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
Modified: branches/dev-syncromind/booking/inc/class.boapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.boapplication.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.boapplication.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -243,7 +243,7 @@
$where_clauses[] = "(%%table%%.case_officer_id
= ".intval($for_case_officer_id[1]).')';
}
- if ($building_id = phpgw::get_var('filter_building_id',
'int', 'GET', false)) {
+ if ($building_id = phpgw::get_var('filter_building_id',
'int', 'REQUEST', 0)) {
$where_clauses[] = "(%%table%%.id IN (SELECT
DISTINCT a.id FROM bb_application a, bb_application_resource ar, bb_resource r
WHERE ar.application_id = a.id AND ar.resource_id = r.id AND r.building_id =
".intval($building_id)."))";
}
Modified: branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -135,7 +135,7 @@
public function show()
{
- $account_code_set =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $account_code_set =
$this->bo->read_single(phpgw::get_var('id', 'int'));
$config = CreateObject('phpgwapi.config','booking');
$config->read();
//$this->add_default_display_data($account_code_set);
@@ -152,7 +152,7 @@
}
public function edit() {
- $account_code_set =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $account_code_set =
$this->bo->read_single(phpgw::get_var('id', 'int'));
$config = CreateObject('phpgwapi.config','booking');
$config->read();
Modified: branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -130,7 +130,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$activity = $this->bo->read_single($id);
$parent_activity =
$this->bo->read_single($activity['parent_id']);
$activities = $this->bo->fetch_activities();
Modified: branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -148,7 +148,7 @@
$errors = array();
$agegroup = array();
- $activity_id = phpgw::get_var('activity_id', int,
'POST');
+ $activity_id = phpgw::get_var('activity_id', 'int',
'POST');
$activities =
$this->activity_bo->get_top_level($activity_id);
if($_SERVER['REQUEST_METHOD'] == 'POST')
@@ -178,7 +178,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$resource = $this->bo->read_single($id);
$activities =
$this->activity_bo->get_top_level($resource['activity_id']);
Modified: branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -248,8 +248,7 @@
public function add()
{
$errors = array();
- $step = phpgw::get_var('step', 'str', 'POST');
- if (! isset($step)) $step = 1;
+ $step = phpgw::get_var('step', 'int', 'REQUEST', 1);
$invalid_dates = array();
$valid_dates = array();
@@ -261,11 +260,11 @@
$allocation['active'] = '1';
$allocation['completed'] = '0';
- if (phpgw::get_var('weekday', 'str', 'GET') !=
'')
+ if (phpgw::get_var('weekday', 'string') != '')
{
- $from_date = phpgw::get_var('from_',
'str', 'GET');
- $to_date = phpgw::get_var('to_', 'str',
'GET');
- $weekday = phpgw::get_var('weekday',
'str', 'GET');
+ $from_date = phpgw::get_var('from_',
'string');
+ $to_date = phpgw::get_var('to_',
'string');
+ $weekday = phpgw::get_var('weekday',
'string');
$datef = explode(' ',$from_date[0]);
$timef = $_POST['from_'];
$datet = explode(' ',$to_date[0]);
@@ -293,7 +292,7 @@
if (($_POST['weekday'] != 'sunday' &&
date('w') > date('w',strtotime($_POST['weekday']))) || (date('w') == 'sunday'
&& date('w') < date('w',strtotime($_POST['weekday'])))) {
- if(phpgw::get_var('weekday', 'str',
'GET') == ''){
+ if(phpgw::get_var('weekday', 'string')
== ''){
$allocation['from_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday']."
".$_POST['from_'])-60*60*24*7);
$allocation['to_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday']."
".$_POST['to_'])-60*60*24*7);
}
@@ -362,31 +361,31 @@
}
}
}
- if(phpgw::get_var('building_name', 'GET') == '')
+ if(phpgw::get_var('building_name', 'string') == '')
{
array_set_default($allocation, 'resources',
array());
$weekday = 'monday';
}
else
{
- $dateTimeFrom = phpgw::get_var('from_', 'GET');
- $dateTimeTo = phpgw::get_var('to_', 'GET');
+ $dateTimeFrom = phpgw::get_var('from_',
'string');
+ $dateTimeTo = phpgw::get_var('to_', 'string');
$dateTimeFromE = explode(" ", $dateTimeFrom[0]);
$dateTimeToE = explode(" ", $dateTimeTo[0]);
- if (phpgw::get_var('from_', 'GET') < 14) {
- $timeFrom[] = phpgw::get_var('from_',
'GET');
- $timeTo[] = phpgw::get_var('to_',
'GET');
+ if (phpgw::get_var('from_', 'string') < 14) {
+ $timeFrom[] = phpgw::get_var('from_',
'string');
+ $timeTo[] = phpgw::get_var('to_',
'string');
}else {
$timeFrom[] = $dateTimeFromE[1];
$timeTo[] = $dateTimeToE[1];
}
- array_set_default($allocation, 'resources',
array(get_var('resource', int, 'GET')));
- array_set_default($allocation, 'building_id',
phpgw::get_var('building_id', 'GET'));
- array_set_default($allocation, 'building_name',
phpgw::get_var('building_name', 'GET'));
+ array_set_default($allocation, 'resources',
array(get_var('resource', 'int')));
+ array_set_default($allocation, 'building_id',
phpgw::get_var('building_id', 'int'));
+ array_set_default($allocation, 'building_name',
phpgw::get_var('building_name', 'string'));
array_set_default($allocation, 'from_',
$timeFrom);
array_set_default($allocation, 'to_', $timeTo);
- $weekday = phpgw::get_var('weekday', 'GET');
+ $weekday = phpgw::get_var('weekday', 'string');
}
$this->flash_form_errors($errors);
@@ -467,7 +466,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$allocation = $this->bo->read_single($id);
$allocation['building'] =
$this->building_bo->so->read_single($allocation['building_id']);
$allocation['building_name'] =
$allocation['building']['name'];
@@ -482,7 +481,7 @@
$_POST['to_'] = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['to_']));
array_set_default($_POST, 'resources', array());
$allocation = array_merge($allocation,
extract_values($_POST, $this->fields));
- $organization =
$this->organization_bo->read_single(intval(phpgw::get_var('organization_id',
'POST')));
+ $organization =
$this->organization_bo->read_single(intval(phpgw::get_var('organization_id',
'int','POST')));
@@ -492,7 +491,7 @@
try {
$receipt =
$this->bo->update($allocation);
$this->bo->so->update_id_string();
-
$this->send_mailnotification_to_organization($organization, lang('Allocation
changed'), phpgw::get_var('mail', 'POST'));
+
$this->send_mailnotification_to_organization($organization, lang('Allocation
changed'), phpgw::get_var('mail', 'string','POST'));
$this->redirect(array('menuaction' => 'booking.uiallocation.show',
'id'=>$allocation['id']));
} catch (booking_unauthorized_exception
$e) {
$errors['global'] = lang('Could
not update object due to insufficient permissions');
@@ -518,15 +517,14 @@
public function delete()
{
- $id = intval(phpgw::get_var('allocation_id', 'GET'));
- $outseason = phpgw::get_var('outseason', 'GET');
- $recurring = phpgw::get_var('recurring', 'GET');
- $repeat_until = phpgw::get_var('repeat_until', 'GET');
- $field_interval =
intval(phpgw::get_var('field_interval', 'GET'));
+ $id = phpgw::get_var('allocation_id', 'int');
+ $outseason = phpgw::get_var('outseason', 'string');
+ $recurring = phpgw::get_var('recurring', 'string');
+ $repeat_until = phpgw::get_var('repeat_until',
'string');
+ $field_interval = phpgw::get_var('field_interval',
'int');
$allocation = $this->bo->read_single($id);
$season =
$this->season_bo->read_single($allocation['season_id']);
- $step = phpgw::get_var('step', 'str', 'POST');
- if (! isset($step)) $step = 1;
+ $step = phpgw::get_var('step', 'string', 'REQUEST', 1);
$errors = array();
$invalid_dates = array();
$valid_dates = array();
@@ -660,7 +658,7 @@
public function show()
{
- $allocation =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $allocation =
$this->bo->read_single(phpgw::get_var('id', 'int'));
$allocation['allocations_link'] =
self::link(array('menuaction' => 'booking.uiallocation.index'));
$allocation['delete_link'] =
self::link(array('menuaction' => 'booking.uiallocation.delete',
'allocation_id'=>$allocation['id'], 'from_'=>$allocation['from_'],
'to_'=>$allocation['to_'], 'resource'=>$allocation['resource']));
$allocation['edit_link'] =
self::link(array('menuaction' => 'booking.uiallocation.edit', 'id' =>
$allocation['id']));
@@ -681,7 +679,7 @@
}
public function info()
{
- $allocation =
$this->bo->read_single(intval(phpgw::get_var('id', 'GET')));
+ $allocation =
$this->bo->read_single(phpgw::get_var('id', 'int'));
$resources =
$this->resource_bo->so->read(array('filters'=>array('id'=>$allocation['resources']),
'sort'=>'name'));
$allocation['resources'] = $resources['results'];
$res_names = array();
@@ -689,7 +687,7 @@
{
$res_names[] = $res['name'];
}
- $allocation['resource'] = phpgw::get_var('resource',
'GET');
+ $allocation['resource'] = phpgw::get_var('resource');
$allocation['resource_info'] = join(', ', $res_names);
$allocation['building_link'] =
self::link(array('menuaction' => 'booking.uibuilding.show', 'id' =>
$allocation['resources'][0]['building_id']));
$allocation['org_link'] = self::link(array('menuaction'
=> 'booking.uiorganization.show', 'id' => $allocation['organization_id']));
Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -647,7 +647,7 @@
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
- $building =
$this->building_bo->so->read(array('filters' => array('id' =>
phpgw::get_var('building_id', 'GET'))));
+ $building =
$this->building_bo->so->read(array('filters' => array('id' =>
phpgw::get_var('building_id', 'int'))));
array_set_default($_POST, 'resources', array());
array_set_default($_POST, 'accepted_documents',
array());
@@ -711,13 +711,13 @@
$this->redirect(array('menuaction' =>
$this->url_prefix . '.show', 'id'=>$receipt['id'],
'secret'=>$application['secret']));
}
}
- if(phpgw::get_var('resource', 'GET') == 'null')
+ if(phpgw::get_var('resource') == 'null' ||
!phpgw::get_var('resource'))
{
array_set_default($application, 'resources',
array());
}
else
{
- $resources =
explode(",",phpgw::get_var('resource', 'GET'));
+ $resources =
explode(",",phpgw::get_var('resource'));
if($resources)
{
$resources_id = $resources[0];
@@ -728,9 +728,9 @@
array_set_default($application, 'resources', $resources);
}
- array_set_default($application, 'building_id',
phpgw::get_var('building_id', 'GET'));
+ array_set_default($application, 'building_id',
phpgw::get_var('building_id', 'int'));
- array_set_default($application, 'building_name',
phpgw::get_var('building_name', 'GET'));
+ array_set_default($application, 'building_name',
phpgw::get_var('building_name', 'string'));
if (strstr($application['building_name'],"%")){
$search = array('%C3%85', '%C3%A5', '%C3%98',
'%C3%B8', '%C3%86', '%C3%A6');
@@ -738,9 +738,9 @@
$application['building_name'] =
str_replace($search, $replace, $application['building_name']);
}
- if(phpgw::get_var('from_', 'GET'))
+ if(phpgw::get_var('from_', 'string'))
{
- $default_dates = array_map(array(self,
'_combine_dates'), phpgw::get_var('from_', '', 'GET'), phpgw::get_var('to_',
'', 'GET'));
+ $default_dates = array_map(array(self,
'_combine_dates'), phpgw::get_var('from_', 'string'), phpgw::get_var('to_',
'string'));
}
else
{
@@ -764,7 +764,7 @@
}
else if ($GLOBALS['phpgw_info']['flags']['currentapp']
== 'bookingfrontend')
{
- $application['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule', 'id' =>
phpgw::get_var('building_id', 'GET')));
+ $application['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule', 'id' =>
phpgw::get_var('building_id', 'int')));
$filter_activity_top = $top_level_activity > 0
? $top_level_activity : 0;
}
array_set_default($application, 'activity_id',
$activity_id);
@@ -824,7 +824,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$application = $this->bo->read_single($id);
$activity_path =
$this->activity_bo->get_path($application['activity_id']);
$top_level_activity = $activity_path ?
$activity_path[0]['id'] : 0;
@@ -978,7 +978,7 @@
$config =
CreateObject('phpgwapi.config','booking');
$config->read();
$application_text = $config->config_data;
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$application = $this->bo->read_single($id);
$activity_path =
$this->activity_bo->get_path($application['activity_id']);
Modified: branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -168,7 +168,7 @@
{
$errors = array();
$audience = array();
- $activity_id = phpgw::get_var('activity_id', int,
'POST');
+ $activity_id = phpgw::get_var('activity_id', 'int',
'POST');
$activities =
$this->activity_bo->get_top_level($activity_id);
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
@@ -197,7 +197,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$audience = $this->bo->read_single($id);
$activities =
$this->activity_bo->get_top_level($audience['activity_id']);
@@ -233,7 +233,7 @@
public function show()
{
- $resource = $this->bo->read_single(phpgw::get_var('id',
'GET'));
+ $resource = $this->bo->read_single(phpgw::get_var('id',
'int'));
$lang['title'] = lang('New audience');
$lang['name'] = lang('Name');
$lang['description'] =
lang('Description');
Modified: branches/dev-syncromind/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-11-18
12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-11-18
13:47:01 UTC (rev 14402)
@@ -315,26 +315,26 @@
$errors = array();
$booking = array();
$booking['cost'] = 0;
- $allocation_id = phpgw::get_var('allocation_id', 'int',
'GET');
+ $allocation_id = phpgw::get_var('allocation_id', 'int');
if (isset($_POST['application_id'])) {
$application_id =
phpgw::get_var('application_id', 'int', 'POST');
}
- $booking['building_id'] = phpgw::get_var('building_id',
'int', 'GET');
- $booking['resources'] = phpgw::get_var('resources',
'int', 'GET');
+ $booking['building_id'] = phpgw::get_var('building_id',
'int');
+ $booking['resources'] = phpgw::get_var('resources',
'int');
#The string replace is a workaround for a problem at
Bergen Kommune
- $booking['from_'] =
str_replace('%3A',':',phpgw::get_var('from_', 'str', 'GET'));
- $booking['to_'] =
str_replace('%3A',':',phpgw::get_var('to_', 'str', 'GET'));
+ $booking['from_'] =
str_replace('%3A',':',phpgw::get_var('from_', 'string'));
+ $booking['to_'] =
str_replace('%3A',':',phpgw::get_var('to_', 'string'));
foreach ($booking['from_'] as $k => $v) {
$booking['from_'][$k] =
pretty_timestamp($booking['from_'][$k]);
$booking['to_'][$k] =
pretty_timestamp($booking['to_'][$k]);
}
- $time_from = explode(" ",phpgw::get_var('from_', 'str',
'GET'));
- $time_to = explode(" ",phpgw::get_var('to_', 'str',
'GET'));
+ $time_from = explode(" ",phpgw::get_var('from_',
'string'));
+ $time_to = explode(" ",phpgw::get_var('to_', 'string'));
- $step = phpgw::get_var('step', 'str', 'POST');
- if (! isset($step)) $step = 1;
+ $step = phpgw::get_var('step', 'int', 'REQUEST', 1);
+
if (! isset($allocation_id)) $noallocation = 1;
$invalid_dates = array();
$valid_dates = array();
@@ -346,7 +346,7 @@
$booking['season_id'] = $season['id'];
$booking['building_id'] = $building['id'];
$booking['building_name'] = $building['name'];
- array_set_default($booking, 'resources',
array(get_var('resource', int, 'GET')));
+ array_set_default($booking, 'resources',
array(get_var('resource', 'int')));
$booking['organization_id'] =
$allocation['organization_id'];
$booking['organization_name'] =
$allocation['organization_name'];
$noallocation = False;
@@ -533,19 +533,19 @@
unset($errors['cost']);
self::add_javascript('booking', 'booking',
'booking.js');
- if(phpgw::get_var('resource', 'GET') == 'null')
+ if(phpgw::get_var('resource') == 'null')
{
array_set_default($application, 'resources',
array());
}
else
{
- $resources =
explode(",",phpgw::get_var('resource', 'GET'));
+ $resources =
explode(",",phpgw::get_var('resource', 'string'));
array_set_default($booking, 'resources',
$resources);
}
- array_set_default($booking, 'season_id',
phpgw::get_var('season_id', 'GET'));
- array_set_default($booking, 'group_id',
phpgw::get_var('group_id', 'GET'));
- array_set_default($booking, 'building_id',
phpgw::get_var('building_id', 'GET'));
- array_set_default($booking, 'building_name',
phpgw::get_var('building_name', 'GET'));
+ array_set_default($booking, 'season_id',
phpgw::get_var('season_id', 'int'));
+ array_set_default($booking, 'group_id',
phpgw::get_var('group_id', 'int'));
+ array_set_default($booking, 'building_id',
phpgw::get_var('building_id', 'int'));
+ array_set_default($booking, 'building_name',
phpgw::get_var('building_name', 'string'));
if (strstr($application['building_name'],"%")){
$search = array('%C3%85', '%C3%A5', '%C3%98',
'%C3%B8', '%C3%86', '%C3%A6');
$replace = array ('Å','å','Ø','ø','Æ','æ');
@@ -652,7 +652,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$booking = $this->bo->read_single($id);
$activity_path =
$this->activity_bo->get_path($booking['activity_id']);
@@ -679,13 +679,13 @@
$booking = array_merge($booking,
extract_values($_POST, $this->fields));
$booking['allocation_id'] =
$booking['allocation_id'] ? $booking['allocation_id'] : null;
$this->agegroup_bo->extract_form_data($booking);
- $group =
$this->group_bo->read_single(intval(phpgw::get_var('group_id', 'GET')));
+ $group =
$this->group_bo->read_single(intval(phpgw::get_var('group_id', 'int')));
$errors = $this->bo->validate($booking);
if(!$errors)
{
try {
$receipt =
$this->bo->update($booking);
-
$this->send_mailnotification_to_group($group, lang('Booking changed'),
phpgw::get_var('mail', 'POST'));
+
$this->send_mailnotification_to_group($group, lang('Booking changed'),
phpgw::get_var('mail', 'string','POST'));
$this->redirect(array('menuaction' => 'booking.uibooking.show',
'id'=>$booking['id']));
} catch (booking_unauthorized_exception
$e) {
$errors['global'] = lang('Could
not update object due to insufficient permissions');
@@ -720,17 +720,16 @@
public function delete()
{
- $id = intval(phpgw::get_var('id', 'GET'));
- $outseason = phpgw::get_var('outseason', 'GET');
- $recurring = phpgw::get_var('recurring', 'GET');
- $repeat_untild = phpgw::get_var('repeat_until', 'GET');
- $field_interval =
intval(phpgw::get_var('field_interval', 'GET'));
- $delete_allocation =
phpgw::get_var('delete_allocation', 'GET');
+ $id = phpgw::get_var('id', 'int');
+ $outseason = phpgw::get_var('outseason', 'string');
+ $recurring = phpgw::get_var('recurring', 'string');
+ $repeat_untild = phpgw::get_var('repeat_until',
'string');
+ $field_interval =
intval(phpgw::get_var('field_interval'));
+ $delete_allocation =
phpgw::get_var('delete_allocation');
$booking = $this->bo->read_single($id);
$allocation =
$this->allocation_bo->read_single($booking['allocation_id']);
$season =
$this->season_bo->read_single($booking['season_id']);
- $step = phpgw::get_var('step', 'str', 'POST');
- if (! isset($step)) $step = 1;
+ $step = phpgw::get_var('step', 'int', 'REQUEST', 1);
$errors = array();
$invalid_dates = array();
$valid_dates = array();
@@ -885,7 +884,7 @@
public function show()
{
- $booking = $this->bo->read_single(phpgw::get_var('id',
'GET'));
+ $booking = $this->bo->read_single(phpgw::get_var('id',
'int'));
$activity_path =
$this->activity_bo->get_path($booking['activity_id']);
$top_level_activity = $activity_path ?
$activity_path[0]['id'] : 0;
@@ -913,7 +912,7 @@
public function info()
{
- $booking =
$this->bo->read_single(intval(phpgw::get_var('id', 'GET')));
+ $booking = $this->bo->read_single(phpgw::get_var('id',
'int'));
$booking['group'] =
$this->group_bo->read_single($booking['group_id']);
$resources =
$this->resource_bo->so->read(array('filters'=>array('id'=>$booking['resources']),
'sort'=>'name'));
$booking['resources'] = $resources['results'];
Modified: branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -59,7 +59,7 @@
public function properties()
{
- $q = phpgw::get_var('query', 'str', 'REQUEST', null);
+ $q = phpgw::get_var('query', 'string', 'REQUEST', null);
$type_id = count(explode('-', $q));
$so = CreateObject('property.solocation');
$ret = $so->read(array('type_id' => $type_id,
'location_code'=>$q));
@@ -202,7 +202,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$building = $this->bo->read_single($id);
$building['id'] = $id;
$building['buildings_link'] =
self::link(array('menuaction' => 'booking.uibuilding.index'));
@@ -247,7 +247,7 @@
public function show()
{
- $building = $this->bo->read_single(phpgw::get_var('id',
'GET'));
+ $building = $this->bo->read_single(phpgw::get_var('id',
'int'));
$building['buildings_link'] =
self::link(array('menuaction' => 'booking.uibuilding.index'));
$building['edit_link'] = self::link(array('menuaction'
=> 'booking.uibuilding.edit', 'id' => $building['id']));
$building['schedule_link'] =
self::link(array('menuaction' => 'booking.uibuilding.schedule', 'id' =>
$building['id']));
@@ -272,7 +272,7 @@
public function schedule()
{
- $building =
$this->bo->get_schedule(phpgw::get_var('id', 'GET'), "booking.uibuilding");
+ $building =
$this->bo->get_schedule(phpgw::get_var('id', 'int'), "booking.uibuilding");
$building['cancel_link'] =
self::link(array('menuaction' => 'booking.uibuilding.show', 'id' =>
$building['id']));
$building['datasource_url'] = self::link(array(
'menuaction' =>
'booking.uibooking.building_schedule',
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -673,7 +673,7 @@
public function show()
{
- $reservation =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $reservation =
$this->bo->read_single(phpgw::get_var('id', 'int'));
$this->add_default_display_data($reservation);
$this->install_customer_identifier_ui($reservation);
$show_edit_button = false;
@@ -734,11 +734,11 @@
//TODO: Display hint to user about primary type of
customer identifier
$building_role =
$this->bo->accessable_buildings($GLOBALS['phpgw_info']['user']['id']);
- $reservation =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $reservation =
$this->bo->read_single(phpgw::get_var('id', 'int'));
if (
!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) &&
!in_array($reservation['building_id'],$building_role))
{
- $this->redirect_to('show', array('id' =>
phpgw::get_var('id', 'GET')));
+ $this->redirect_to('show', array('id' =>
phpgw::get_var('id', 'int')));
}
if (((int)$reservation['exported']) !== 0) {
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
===================================================================
---
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -362,7 +362,7 @@
public function show()
{
- $export = $this->bo->read_single(phpgw::get_var('id',
'GET'));
+ $export = $this->bo->read_single(phpgw::get_var('id',
'int'));
$this->add_default_display_data($export);
$this->add_template_file('helpers');
$export['cancel_link'] = self::link(array('menuaction'
=> 'booking.uicompleted_reservation_export.index'));
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
===================================================================
---
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -249,7 +249,7 @@
public function show()
{
- $export_file =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $export_file =
$this->bo->read_single(phpgw::get_var('id', 'int'));
$export_file['type'] = lang($export_file['type']);
$this->add_default_display_data($export_file);
$tabs = array();
@@ -260,7 +260,7 @@
}
public function download() {
- $export_file =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $export_file =
$this->bo->read_single(phpgw::get_var('id', 'int'));
if (!is_array($export_file)) {
$this->redirect_to('index');
@@ -271,7 +271,7 @@
$this->send_file($file->get_system_identifier(),
array('filename' => $file->get_identifier()));
}
public function log() {
- $export_file =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $export_file =
$this->bo->read_single(phpgw::get_var('id', 'int'));
if (!is_array($export_file)) {
$this->redirect_to('index');
@@ -282,8 +282,8 @@
$this->send_file($file->get_system_identifier(),
array('filename' => $file->get_identifier()));
}
public function upload() {
- $id = phpgw::get_var('id', 'GET');
- $export_file =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
+ $export_file =
$this->bo->read_single(phpgw::get_var('id', 'int'));
if (!is_array($export_file)) {
$this->redirect_to('index');
Modified: branches/dev-syncromind/booking/inc/class.uicontactperson.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uicontactperson.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uicontactperson.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -84,7 +84,7 @@
}
public function index_json()
{
- if ($id = intval(phpgw::get_var('id', 'GET'))) {
+ if ($id = phpgw::get_var('id', 'int')) {
$person = $this->bo->read_single($id);
return
$this->yui_results(array("totalResultsAvailable" => 1, "results" => $person));
}
@@ -95,7 +95,7 @@
}
public function show()
{
- $person = $this->bo->read_single(phpgw::get_var('id',
'GET'));
+ $person = $this->bo->read_single(phpgw::get_var('id',
'int'));
$person['contactpersons_link'] =
self::link(array('menuaction' => 'booking.uicontactperson.index'));
$person['edit_link'] = self::link(array('menuaction' =>
'booking.uicontactperson.edit', 'id' => $person['id']));
@@ -106,7 +106,7 @@
}
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
if ($id) {
$person = $this->bo->read_single($id);
$person['id'] = $id;
Modified: branches/dev-syncromind/booking/inc/class.uidocument.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocument.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uidocument.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -117,12 +117,12 @@
public function get_inline_params()
{
- return array('filter_owner_id' =>
intval(phpgw::get_var('filter_owner_id', 'any', false)));
+ return array('filter_owner_id' =>
phpgw::get_var('filter_owner_id', 'int'));
}
public function is_inline()
{
- return false != phpgw::get_var('filter_owner_id',
'any', false);
+ return false != phpgw::get_var('filter_owner_id',
'int', 'REQUEST', false);
}
public static function generate_inline_link($documentOwnerType,
$documentOwnerId, $action)
@@ -306,7 +306,7 @@
public function show()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$document = $this->bo->read_single($id);
$this->add_default_display_data($document);
self::render_template('document', array('document' =>
$document));
@@ -361,7 +361,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$document = $this->bo->read_single($id);
$errors = array();
@@ -400,7 +400,7 @@
public function download()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$document = $this->bo->read_single($id);
@@ -409,7 +409,7 @@
public function delete()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$this->bo->delete($id);
$this->redirect_to_parent_if_inline();
Modified: branches/dev-syncromind/booking/inc/class.uidocument_view.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocument_view.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uidocument_view.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -46,7 +46,7 @@
}
public function download() {
- if ($id = phpgw::get_var('id', 'string', 'GET')) {
+ if ($id = phpgw::get_var('id', 'string')) {
$document =
$this->bo->read_single(urldecode($id));
self::send_file($document['filename'],
array('filename' => $document['name']));
}
Modified: branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -167,7 +167,7 @@
public function show()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$document = $this->bo->read_single($id);
$this->add_default_display_data($document);
self::render_template('documentation', array('document'
=> $document));
@@ -208,7 +208,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$document = $this->bo->read_single($id);
$errors = array();
@@ -239,7 +239,7 @@
public function download()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$document = $this->bo->read_single($id);
@@ -248,7 +248,7 @@
public function delete()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$this->bo->delete($id);
$this->redirect(array('menuaction'=>'booking.uidocumentation.index'));
Modified: branches/dev-syncromind/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-11-18
12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-11-18
13:47:01 UTC (rev 14402)
@@ -582,7 +582,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$event = $this->bo->read_single($id);
$activity_path =
$this->activity_bo->get_path($event['activity_id']);
@@ -651,7 +651,7 @@
if ($_POST['organization_name']) {
$event['customer_organization_name'] =
$_POST['organization_name'];
$event['customer_organization_id'] =
$_POST['organization_id'];
- $organization =
$this->organization_bo->read_single(intval(phpgw::get_var('organization_id',
'POST')));
+ $organization =
$this->organization_bo->read_single(intval(phpgw::get_var('organization_id',
'int')));
if ($organization['customer_internal'] == 0) {
$event['customer_identifier_type'] =
$organization['customer_identifier_type'];
@@ -922,8 +922,8 @@
}
public function delete()
{
- $event_id = phpgw::get_var('event_id', 'GET');
- $application_id = phpgw::get_var('application_id', 'GET');
+ $event_id = phpgw::get_var('event_id', 'int');
+ $application_id = phpgw::get_var('application_id', 'int');
if ($GLOBALS['phpgw']->acl->check('admin', phpgwapi_acl::ADD,
'booking')) {
$this->bo->so->delete_event($event_id);
@@ -937,7 +937,7 @@
}
public function info()
{
- $event = $this->bo->read_single(intval(phpgw::get_var('id',
'GET')));
+ $event = $this->bo->read_single(phpgw::get_var('id', 'int'));
$resources =
$this->resource_bo->so->read(array('filters'=>array('id'=>$event['resources']),
'sort'=>'name'));
$event['resources'] = $resources['results'];
$res_names = array();
@@ -945,7 +945,7 @@
{
$res_names[] = $res['name'];
}
- $event['resource'] = phpgw::get_var('resource', 'GET');
+ $event['resource'] = phpgw::get_var('resource');
$event['resource_info'] = join(', ', $res_names);
$event['building_link'] = self::link(array('menuaction' =>
'booking.uibuilding.show', 'id' => $event['resources'][0]['building_id']));
$event['org_link'] = self::link(array('menuaction' =>
'booking.uiorganization.show', 'id' => $event['organization_id']));
Modified: branches/dev-syncromind/booking/inc/class.uigroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-11-18
12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-11-18
13:47:01 UTC (rev 14402)
@@ -96,12 +96,12 @@
public function get_inline_params()
{
- return array('filter_organization_id' =>
intval(phpgw::get_var('filter_organization_id', 'any', false)));
+ return array('filter_organization_id' =>
phpgw::get_var('filter_organization_id', 'int', 'REQUEST'));
}
public function is_inline()
{
- return false !=
phpgw::get_var('filter_organization_id', 'any', false);
+ return false !=
phpgw::get_var('filter_organization_id', 'int', 'REQUEST');
}
public function index()
@@ -246,7 +246,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
if ($id)
@@ -344,7 +344,7 @@
public function show()
{
- $group = $this->bo->read_single(phpgw::get_var('id',
'GET'));
+ $group = $this->bo->read_single(phpgw::get_var('id',
'int'));
$group['organizations_link'] =
self::link(array('menuaction' => $this->module . '.uiorganization.index'));
$group['organization_link'] =
self::link(array('menuaction' => $this->module . '.uiorganization.show', 'id'
=> $group['organization_id']));
$group['edit_link'] = self::link(array('menuaction' =>
$this->module . '.uigroup.edit', 'id' => $group['id']));
Modified: branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -118,8 +118,8 @@
public function schedule()
{
- $backend = phpgw::get_var('backend', 'bool', 'GET');
- $building =
$this->bo->get_schedule(phpgw::get_var('id', 'int', 'GET'),
"booking.uimassbooking");
+ $backend = phpgw::get_var('backend', 'bool');
+ $building =
$this->bo->get_schedule(phpgw::get_var('id', 'int'), "booking.uimassbooking");
$building['application_link'] = self::link(array(
'menuaction' => 'booking.uiallocation.add',
'building_id' => $building['id'],
@@ -132,7 +132,7 @@
));
if ($backend)
{
- $building['date'] = phpgw::get_var('date',
'string', 'GET');
+ $building['date'] = phpgw::get_var('date',
'string');
}
$building['picker_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','cal');
Modified: branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -250,7 +250,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$organization = $this->bo->read_single($id);
$organization['id'] = $id;
$organization['organizations_link'] =
self::link(array('menuaction' => 'booking.uiorganization.index'));
@@ -306,7 +306,7 @@
public function show()
{
- $organization =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $organization =
$this->bo->read_single(phpgw::get_var('id', 'int'));
$tabs = array();
$tabs['generic'] = array('label' =>
lang('Organization'), 'link' => '#organization');
Modified: branches/dev-syncromind/booking/inc/class.uipermission.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -88,7 +88,7 @@
public function apply_inline_params(&$params)
{
if($this->is_inline()) {
- $params['filter_object_id'] =
intval(phpgw::get_var('filter_object_id'));
+ $params['filter_object_id'] =
phpgw::get_var('filter_object_id', 'int');
}
return $params;
}
@@ -106,12 +106,12 @@
public function get_inline_params()
{
- return array('filter_object_id' =>
intval(phpgw::get_var('filter_object_id', 'any', false)));
+ return array('filter_object_id' =>
phpgw::get_var('filter_object_id', 'int', 'REQUEST'));
}
public function is_inline()
{
- return false != phpgw::get_var('filter_object_id',
'any', false);
+ return false != phpgw::get_var('filter_object_id',
'int', 'REQUEST');
}
public static function generate_inline_link($object_type,
$permissionObjectId, $action)
@@ -264,7 +264,7 @@
public function show()
{
#$this->check_active('booking.uipermission_building.show');
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$permission = $this->bo->read_single($id);
$this->add_default_display_data($permission);
self::render_template('permission', array('permission'
=> $permission));
@@ -316,7 +316,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$permission = $this->bo->read_single($id);
$errors = array();
@@ -355,7 +355,7 @@
public function delete()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$this->bo->delete($id);
$this->redirect_to_parent_if_inline();
Modified: branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -175,7 +175,7 @@
// public function show()
// {
- // $id = intval(phpgw::get_var('id', 'GET'));
+ // $id = (phpgw::get_var('id', 'int');
// $permission = $this->bo->read_single($id);
// $this->add_default_display_data($permission);
// self::render_template('permission_root',
array('permission' => $permission));
@@ -217,7 +217,7 @@
// public function edit()
// {
- // $id = intval(phpgw::get_var('id', 'GET'));
+ // $id = phpgw::get_var('id', 'int');
// $permission = $this->bo->read_single($id);
//
// $errors = array();
@@ -243,7 +243,7 @@
public function delete()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$this->bo->delete($id);
$this->redirect($this->generate_link_params('index'));
}
Modified: branches/dev-syncromind/booking/inc/class.uireports.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uireports.inc.php 2015-11-18
12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uireports.inc.php 2015-11-18
13:47:01 UTC (rev 14402)
@@ -577,14 +577,14 @@
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
- $to = phpgw::get_var('to', 'POST');
- $from = phpgw::get_var('from', 'POST');
+ $to = phpgw::get_var('to',
'string');
+ $from = phpgw::get_var('from', 'string');
$to_ = date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($to));
$from_ = date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($from));
- $output_type = phpgw::get_var('otype',
'POST');
- $building_list = phpgw::get_var('building',
'POST');
+ $output_type = phpgw::get_var('otype',
'string');
+ $building_list = phpgw::get_var('building');
if(!count($building_list))
{
@@ -643,15 +643,15 @@
$show = '';
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
- $to = phpgw::get_var('to', 'POST');
- $from = phpgw::get_var('from', 'POST');
+ $to = phpgw::get_var('to',
'string');
+ $from = phpgw::get_var('from', 'string');
$to_ = date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($to));
$from_ = date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($from));
$show = 'report';
$allocations = $this->get_free_allocations(
- phpgw::get_var('building', 'POST'), $from_,
$to_, phpgw::get_var('weekdays', 'POST')
+ phpgw::get_var('building'), $from_, $to_,
phpgw::get_var('weekdays')
);
$counter = 0;
Modified: branches/dev-syncromind/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -187,7 +187,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$resource = $this->bo->read_single($id);
$resource['id'] = $id;
$resource['building_link'] =
self::link(array('menuaction' => 'booking.uibuilding.show', 'id' =>
$resource['id']));
@@ -229,7 +229,7 @@
public function show()
{
- $resource = $this->bo->read_single(phpgw::get_var('id',
'GET'));
+ $resource = $this->bo->read_single(phpgw::get_var('id',
'int'));
$resource['edit_link'] = self::link(array('menuaction'
=> 'booking.uiresource.edit', 'id' => $resource['id']));
$resource['building_link'] =
self::link(array('menuaction' => 'booking.uibuilding.show', 'id' =>
$resource['building_id']));
$resource['buildings_link'] =
self::link(array('menuaction' => 'booking.uibuilding.index'));
@@ -254,7 +254,7 @@
public function schedule()
{
- $resource =
$this->bo->get_schedule(phpgw::get_var('id', 'GET'), 'booking.uibuilding',
'booking.uiresource');
+ $resource =
$this->bo->get_schedule(phpgw::get_var('id', 'int'), 'booking.uibuilding',
'booking.uiresource');
$resource['application_link'] = self::link(array(
'menuaction' => 'booking.uiapplication.add',
'building_id' => $resource['building_id'],
Modified: branches/dev-syncromind/booking/inc/class.uiseason.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-11-18
12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-11-18
13:47:01 UTC (rev 14402)
@@ -231,7 +231,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$season = $this->bo->read_single($id);
$season['buildings_link'] =
self::link(array('menuaction' => 'booking.uibuilding.index'));
$season['building_link'] =
self::link(array('menuaction' => 'booking.uibuilding.show', 'id' =>
$season['building_id']));
@@ -278,7 +278,7 @@
public function show()
{
- $season = $this->bo->read_single(phpgw::get_var('id',
'GET'));
+ $season = $this->bo->read_single(phpgw::get_var('id',
'int'));
$season['cancel_link'] = self::link(array('menuaction'
=> 'booking.uiseason.index'));
$season['buildings_link'] =
self::link(array('menuaction' => 'booking.uibuilding.index'));
$season['building_link'] =
self::link(array('menuaction' => 'booking.uibuilding.show', 'id' =>
$season['building_id']));
@@ -310,7 +310,7 @@
public function boundaries()
{
- $season_id = intval(phpgw::get_var('id', 'GET'));
+ $season_id = phpgw::get_var('id', 'int');
$season = $this->bo->read_single($season_id);
$boundaries = $this->bo->get_boundaries($season_id);
@@ -351,7 +351,7 @@
public function delete_boundary()
{
- $boundary_id = intval(phpgw::get_var('id', 'GET'));
+ $boundary_id = phpgw::get_var('id', 'int');
$boundary = $this->bo->read_boundary($boundary_id);
$season_id = $boundary['season_id'];
$this->bo->delete_boundary($boundary);
@@ -360,7 +360,7 @@
public function delete_wtemplate_alloc()
{
- $allocation_id = intval(phpgw::get_var('id', 'POST'));
+ $allocation_id = phpgw::get_var('id', 'int');
$alloc =
$this->bo->so_wtemplate_alloc->read_single($allocation_id);
$this->bo->delete_wtemplate_alloc($alloc);
return 1;
@@ -368,7 +368,7 @@
public function wtemplate()
{
- $season_id = intval(phpgw::get_var('id', 'GET'));
+ $season_id = phpgw::get_var('id', 'int');
$season = $this->bo->read_single($season_id);
$season['season_link'] = self::link(array('menuaction'
=> 'booking.uiseason.show', 'id' => $season_id));
$season['buildings_link'] =
self::link(array('menuaction' => 'booking.uibuilding.index'));
@@ -393,7 +393,7 @@
public function wtemplate_json()
{
- $season_id = intval(phpgw::get_var('id', 'GET'));
+ $season_id = phpgw::get_var('id', 'int');
$allocations =
$this->bo->wtemplate_schedule($season_id);
$data = array
(
@@ -408,14 +408,14 @@
/* Return a single wtemplate allocations as JSON */
public function wtemplate_alloc()
{
- //$season_id = intval(phpgw::get_var('season_id',
'GET'));
+ //$season_id = phpgw::get_var('season_id', 'int');
//$phpgw_return_as = phpgw::get_var('phpgw_return_as');
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
$alloc = extract_values($_POST,
$this->wtemplate_alloc_fields);
//$alloc['season_id'] = $season_id;
- $alloc['season_id'] =
phpgw::get_var('season_id');
+ $alloc['season_id'] =
phpgw::get_var('season_id', 'int');
$errors =
$this->bo->validate_wtemplate_alloc($alloc);
if(!$errors && $alloc['id'])
@@ -437,11 +437,11 @@
return $message;
}
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
- $_from = phpgw::get_var('_from', 'GET');
- $_to = phpgw::get_var('_to', 'GET');
- $wday = phpgw::get_var('wday', 'GET');
+ $_from = phpgw::get_var('_from', 'string');
+ $_to = phpgw::get_var('_to', 'string');
+ $wday = phpgw::get_var('wday', 'string');//int?
if (!empty($id))
{
@@ -463,7 +463,7 @@
$season['to_h'] = $array_to[0];
$season['to_m'] = $array_to[1];
- $resource_ids = phpgw::get_var('filter_id', 'GET');
+ $resource_ids = phpgw::get_var('filter_id', 'int');
$filters = null;
if (count($resource_ids) == 0) {
@@ -503,7 +503,7 @@
public function generate()
{
- $season_id = intval(phpgw::get_var('id', 'GET'));
+ $season_id = phpgw::get_var('id', 'int');
$season = $this->bo->read_single($season_id);
$this->bo->authorize_write($season);
@@ -524,13 +524,13 @@
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
- $step = phpgw::get_var('create', 'POST') ? 3 :
2;
- $from = phpgw::get_var('from_', 'POST');
- $to = phpgw::get_var('to_', 'POST');
+ $step = phpgw::get_var('create') ? 3 : 2;
+ $from = phpgw::get_var('from_', 'string');
+ $to = phpgw::get_var('to_', 'string');
$from_ = date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($from));
$to_ = date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($to));
- $interval = phpgw::get_var('field_interval',
'POST');
+ $interval = phpgw::get_var('field_interval');
if($from_ < $season['from_'])
{
$errors['from_'] = lang('Start date
must be after %1', pretty_timestamp($season['from_']));
Modified: branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -28,20 +28,20 @@
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
- $step = phpgw::get_var('step', 'POST');
+ $step = phpgw::get_var('step', 'int');
$step++;
- $building_id = phpgw::get_var('building_id',
'POST');
- $building_name =
phpgw::get_var('building_name', 'POST');
- if (is_array(phpgw::get_var('seasons', 'POST')))
+ $building_id = phpgw::get_var('building_id',
'int');
+ $building_name =
phpgw::get_var('building_name', 'string');
+ if (is_array(phpgw::get_var('seasons')))
{
- $season = implode(',',
phpgw::get_var('seasons', 'POST'));
+ $season = implode(',',
phpgw::get_var('seasons'));
}
else
{
- $season = phpgw::get_var('seasons',
'POST');
+ $season = phpgw::get_var('seasons');
}
- $mailsubject = phpgw::get_var('mailsubject',
'POST');
- $mailbody = phpgw::get_var('mailbody', 'POST');
+ $mailsubject = phpgw::get_var('mailsubject',
'string');
+ $mailbody = phpgw::get_var('mailbody',
'string');
$contacts = null;
if ($step == 1)
@@ -106,8 +106,8 @@
public function receipt()
{
- $ok_count = phpgw::get_var('ok', 'GET');
- $fail_count = phpgw::get_var('failed', 'GET');
+ $ok_count = phpgw::get_var('ok');
+ $fail_count = phpgw::get_var('failed');
self::render_template('email_receipt',
array('ok_count' => $ok_count, 'fail_count' =>
$fail_count));
}
Modified: branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
+++ branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2015-11-18 13:47:01 UTC (rev 14402)
@@ -171,15 +171,15 @@
} else {
unset($filters['building_name']);
}
- $testdata2 = phpgw::get_var('type', 'str', 'REQUEST');
+ $testdata2 = phpgw::get_var('type', 'string', 'REQUEST');
if ($testdata2 != '') {
- $filters['type'] = phpgw::get_var('type', 'str',
'REQUEST');
+ $filters['type'] = phpgw::get_var('type', 'string',
'REQUEST');
} else {
unset($filters['type']);
}
- $testdata2 = phpgw::get_var('status', 'str', 'REQUEST');
+ $testdata2 = phpgw::get_var('status', 'string', 'REQUEST');
if ($testdata2 != '') {
- $filters['status'] = phpgw::get_var('status', 'str',
'REQUEST');
+ $filters['status'] = phpgw::get_var('status', 'string',
'REQUEST');
} else {
unset($filters['status']);
}
@@ -261,15 +261,15 @@
} else {
unset($filters['building_name']);
}
- $testdata2 = phpgw::get_var('type', 'str', 'REQUEST');
+ $testdata2 = phpgw::get_var('type', 'string', 'REQUEST');
if ($testdata2 != '') {
- $filters['type'] = phpgw::get_var('type', 'str',
'REQUEST');
+ $filters['type'] = phpgw::get_var('type', 'string',
'REQUEST');
} else {
unset($filters['type']);
}
- $testdata2 = phpgw::get_var('status', 'str', 'REQUEST');
+ $testdata2 = phpgw::get_var('status', 'string', 'REQUEST');
if ($testdata2 != '') {
- $filters['status'] = phpgw::get_var('status', 'str',
'REQUEST');
+ $filters['status'] = phpgw::get_var('status', 'string',
'REQUEST');
} else {
unset($filters['status']);
}
@@ -322,7 +322,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
if ($id)
{
@@ -335,7 +335,7 @@
date_default_timezone_set("Europe/Oslo");
$date = new DateTime(phpgw::get_var('date'));
$system_message = array();
- $system_message['building_id'] =
intval(phpgw::get_var('building_id', 'GET'));
+ $system_message['building_id'] =
phpgw::get_var('building_id', 'int');
$system_message['building_name'] =
$this->bo->so->get_building($system_message['building_id']);
$system_message['created'] =
$date->format('Y-m-d H:m');
$system_message['cancel_link'] =
self::link(array('menuaction' => 'booking.uisystem_message.index'));
@@ -386,9 +386,9 @@
public function show()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
- $system_message =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $system_message =
$this->bo->read_single(phpgw::get_var('id', 'int'));
$system_message['system_messages_link'] =
self::link(array('menuaction' => $this->module . '.uisystem_message.index'));
$system_message['system_message_link'] =
self::link(array('menuaction' => $this->module . '.uisystem_message.show', 'id'
=> $system_message['system_message_id']));
$system_message['back_link'] =
self::link(array('menuaction' => $this->module . '.uisystem_message.index'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14402] booking: corrected some phpgw::get_var-inputs,
Sigurd Nes <=