[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14401] bookingfrontend: corrected some phpgw::get_va
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14401] bookingfrontend: corrected some phpgw::get_var-inputs |
|
Date: |
Wed, 18 Nov 2015 12:34:26 +0000 |
Revision: 14401
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14401
Author: sigurdne
Date: 2015-11-18 12:34:25 +0000 (Wed, 18 Nov 2015)
Log Message:
-----------
bookingfrontend: corrected some phpgw::get_var-inputs
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
branches/dev-syncromind/booking/templates/base/massbooking_schedule.xsl
branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uibuilding.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uicontactperson.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uigroup.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uiorganization.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
@@ -1067,7 +1067,7 @@
$cal_date =
strtotime($application['dates'][0]['from_']);
$cal_date = date('Y-m-d', $cal_date);
- $application['schedule_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule', 'id' =>
$building_info['id'], 'backend' => 'true', 'date' => $cal_date));
+ $application['schedule_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule', 'id' =>
$building_info['id'], 'backend' => true, 'date' => $cal_date));
//manipulating the link. we want to use the frontend
module instead of backend for displaying the schedule
$pos = strpos($application['schedule_link'],
'/index.php');
Modified: branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
@@ -118,8 +118,8 @@
public function schedule()
{
- $backend = phpgw::get_var('backend', 'GET');
- $building =
$this->bo->get_schedule(phpgw::get_var('id', 'GET'), "booking.uimassbooking");
+ $backend = phpgw::get_var('backend', 'bool', 'GET');
+ $building =
$this->bo->get_schedule(phpgw::get_var('id', 'int', 'GET'),
"booking.uimassbooking");
$building['application_link'] = self::link(array(
'menuaction' => 'booking.uiallocation.add',
'building_id' => $building['id'],
@@ -130,9 +130,9 @@
'building_id' => $building['id'],
'phpgw_return_as' => 'json',
));
- if ($backend == 'true')
+ if ($backend)
{
- $building['date'] = phpgw::get_var('date',
'GET');
+ $building['date'] = phpgw::get_var('date',
'string', 'GET');
}
$building['picker_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','cal');
Modified:
branches/dev-syncromind/booking/templates/base/massbooking_schedule.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/massbooking_schedule.xsl
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/booking/templates/base/massbooking_schedule.xsl
2015-11-18 12:34:25 UTC (rev 14401)
@@ -110,7 +110,7 @@
YAHOO.util.History.initialize("yui-history-field",
"yui-history-iframe");
});
*/
- <xsl:if test="backend = 'true'">
+ <xsl:if test="backend = '1'">
$('#header').hide();
/*YAHOO.util.Dom.setStyle(('header'), 'display', 'none');*/
</xsl:if>
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
@@ -57,7 +57,7 @@
if ($config->config_data['user_can_delete_allocations']
!= 'yes') {
- $allocation =
$this->bo->read_single(intval(phpgw::get_var('allocation_id', 'GET')));
+ $allocation =
$this->bo->read_single(intval(phpgw::get_var('allocation_id', 'int')));
$organization =
$this->organization_bo->read_single($allocation['organization_id']);
$errors = array();
if($_SERVER['REQUEST_METHOD'] == 'POST')
@@ -116,17 +116,17 @@
} else {
- $id = intval(phpgw::get_var('allocation_id',
'GET'));
- $from_date = phpgw::get_var('from_', 'GET');
- $to_date = phpgw::get_var('to_', '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');
+ $from_date = phpgw::get_var('from_', 'string');
+ $to_date = phpgw::get_var('to_', 'string');
+ $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);
$organization =
$this->organization_bo->read_single($allocation['organization_id']);
$season =
$this->season_bo->read_single($allocation['season_id']);
- $step = phpgw::get_var('step', 'str', 'POST');
+ $step = phpgw::get_var('step', 'string',
'POST');
if (! isset($step)) $step = 1;
$errors = array();
$invalid_dates = array();
@@ -249,9 +249,9 @@
if ($step == 3)
{
$maildata = array();
- $maildata['outseason'] =
phpgw::get_var('outseason','GET');
- $maildata['recurring'] =
phpgw::get_var('recurring', 'GET');
- $maildata['repeat_until'] =
phpgw::get_var('repeat_until', 'GET');
+ $maildata['outseason'] =
phpgw::get_var('outseason','string');
+ $maildata['recurring'] =
phpgw::get_var('recurring', 'string');
+ $maildata['repeat_until'] =
phpgw::get_var('repeat_until', 'string');
$maildata['delete'] =
$valid_dates;
$res_names = '';
@@ -342,7 +342,7 @@
$user_can_delete_allocations = 2;
}
- $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();
@@ -350,7 +350,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' => 'bookingfrontend.uibuilding.show', 'id' =>
$allocation['resources'][0]['building_id']));
$allocation['org_link'] = self::link(array('menuaction'
=> 'bookingfrontend.uiorganization.show', 'id' =>
$allocation['organization_id']));
Modified:
branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
@@ -18,10 +18,10 @@
function show()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$application = $this->bo->read_single($id);
- if($application['secret'] != phpgw::get_var('secret',
'GET'))
+ if($application['secret'] != phpgw::get_var('secret',
'string'))
{
$this->redirect(array('menuaction' =>
'bookingfrontend.uisearch.index'));
}
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
@@ -96,15 +96,15 @@
{
$errors = array();
$booking = array();
- $booking['building_id'] = phpgw::get_var('building_id',
'int', 'GET');
- $allocation_id = phpgw::get_var('allocation_id', 'int',
'GET');
+ $booking['building_id'] = phpgw::get_var('building_id',
'int');
+ $allocation_id = phpgw::get_var('allocation_id', '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'));
- $time_from = explode(" ",phpgw::get_var('from_', 'str',
'GET'));
- $time_to = explode(" ",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'));
+ $time_from = explode(" ",phpgw::get_var('from_',
'string'));
+ $time_to = explode(" ",phpgw::get_var('to_', 'string'));
- $step = phpgw::get_var('step', 'str', 'POST');
+ $step = phpgw::get_var('step', 'string', 'POST');
if (! isset($step)) $step = 1;
$invalid_dates = array();
$valid_dates = array();
@@ -117,7 +117,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(
phpgw::get_var('resource')));
} else {
$season =
$this->season_bo->read_single($_POST['season_id']);
}
@@ -131,10 +131,10 @@
$booking = extract_values($_POST,
$this->fields);
if(strlen($_POST['from_']) < 6)
{
- $date_from = array($time_from[0],
$_POST['from_']);
+ $date_from = array($time_from[0],
phpgw::get_var('from_'));
$booking['from_'] = join("
",$date_from);
$_POST['from_'] = join(" ",$date_from);
- $date_to = array($time_to[0],
$_POST['to_']);
+ $date_to = array($time_to[0],
phpgw::get_var('to_'));
$booking['to_'] = join(" ",$date_to);
$_POST['to_'] = join(" ",$date_to);
}
@@ -308,7 +308,7 @@
public function report_numbers()
{
$step = 1;
- $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']);
@@ -318,7 +318,7 @@
$agegroups = $agegroups['results'];
$building =
$this->building_bo->read_single($booking['building_id']);
- if ($booking['secret'] != phpgw::get_var('secret',
'GET'))
+ if ($booking['secret'] != phpgw::get_var('secret',
'string'))
{
$step = -1; // indicates that an error message
should be displayed in the template
self::render_template('report_numbers',
array('event_object' => $booking, 'agegroups' => $agegroups, 'building' =>
$building, 'step' => $step));
@@ -333,7 +333,7 @@
foreach($sexes as $sex)
{
$i = 0;
- foreach(phpgw::get_var($sex, 'POST') as
$agegroup_id => $value)
+ foreach(phpgw::get_var($sex,
'string','POST') as $agegroup_id => $value)
{
$temp_agegroup[$i]['agegroup_id'] = $agegroup_id;
$temp_agegroup[$i][$sex] =
$value;
@@ -355,7 +355,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$booking = $this->bo->read_single($id);
$booking['building'] =
$this->building_bo->so->read_single($booking['building_id']);
$booking['building_name'] =
$booking['building']['name'];
@@ -363,7 +363,7 @@
$errors = array();
$update_count = 0;
$today = getdate();
- $step = intval(phpgw::get_var('step', 'POST'));
+ $step = intval(phpgw::get_var('step', 'int'));
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
@@ -547,7 +547,7 @@
public function massupdate()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$booking = $this->bo->read_single($id);
$booking['building'] =
$this->building_bo->so->read_single($booking['building_id']);
$booking['building_name'] =
$booking['building']['name'];
@@ -556,7 +556,7 @@
$update_count = 0;
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
- $step = intval(phpgw::get_var('step', 'POST'));
+ $step = phpgw::get_var('step', 'int', 'POST');
$step++;
$season =
$this->season_bo->read_single($booking['season_id']);
@@ -750,7 +750,7 @@
if ($config->config_data['user_can_delete_bookings'] !=
'yes') {
- $booking =
$this->bo->read_single(intval(phpgw::get_var('id', 'GET')));
+ $booking = $this->bo->read_single(phpgw::get_var('id',
'int'));
$errors = array();
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
@@ -811,17 +811,20 @@
} else {
- $id = intval(phpgw::get_var('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'));
- $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_until = phpgw::get_var('repeat_until',
'string');
+ $field_interval =
phpgw::get_var('field_interval', 'int');
+ $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', 'POST');
+ if ($step)
+ {
+ $step = 1;
+ }
$errors = array();
$invalid_dates = array();
$valid_dates = array();
@@ -831,7 +834,9 @@
if ($config->config_data['split_pool'] == 'yes')
{
$split = 1;
- } else {
+ }
+ else
+ {
$split = 0;
}
$resources = $booking['resources'];
@@ -981,10 +986,10 @@
if ($step == 3)
{
$maildata = array();
- $maildata['outseason'] =
phpgw::get_var('outseason','GET');
- $maildata['recurring'] =
phpgw::get_var('recurring', 'GET');
- $maildata['repeat_until'] =
phpgw::get_var('repeat_until', 'GET');
- $maildata['delete_allocation'] =
phpgw::get_var('delete_allocation', 'GET');
+ $maildata['outseason'] =
phpgw::get_var('outseason','string');
+ $maildata['recurring'] =
phpgw::get_var('recurring', 'string');
+ $maildata['repeat_until'] =
phpgw::get_var('repeat_until', 'string');
+ $maildata['delete_allocation'] =
phpgw::get_var('delete_allocation');
$maildata['keep'] =
$allocation_keep;
$maildata['delete'] =
$allocation_delete;
@@ -1085,7 +1090,7 @@
} else {
$user_can_delete_bookings = 1;
}
- $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/bookingfrontend/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibuilding.inc.php
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibuilding.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
@@ -304,8 +304,8 @@
public function schedule()
{
- $backend = phpgw::get_var('backend', 'GET');
- $building = $this->bo->get_schedule(phpgw::get_var('id', 'GET'),
'bookingfrontend.uibuilding');
+ $backend = phpgw::get_var('backend', 'bool','GET');
+ $building = $this->bo->get_schedule(phpgw::get_var('id', 'int',
'GET'), 'bookingfrontend.uibuilding');
if ($building['deactivate_application'] == 0) {
$building['application_link'] = self::link(array(
'menuaction' => 'bookingfrontend.uiapplication.add',
@@ -328,8 +328,8 @@
// the schedule can also be used from backend
// if so we want to change default date shown in the calendar
- if ($backend == 'true') {
- $building['date'] = phpgw::get_var('date', 'GET');
+ if ($backend) {
+ $building['date'] = phpgw::get_var('date', 'string', 'GET');
}
self::add_javascript('bookingfrontend', 'bookingfrontend',
'schedule.js');
@@ -342,8 +342,8 @@
public function extraschedule()
{
- $backend = phpgw::get_var('backend', 'GET');
- $building = $this->bo->get_schedule(phpgw::get_var('id', 'GET'),
'bookingfrontend.uibuilding');
+ $backend = phpgw::get_var('backend', 'bool', 'GET');
+ $building = $this->bo->get_schedule(phpgw::get_var('id', 'int',
'GET'), 'bookingfrontend.uibuilding');
$building['application_link'] = self::link(array('menuaction' =>
'bookingfrontend.uibuilding.extraschedule', 'id' => $building['id']));
$building['datasource_url'] = self::link(array(
'menuaction' => 'bookingfrontend.uibooking.building_extraschedule',
@@ -353,8 +353,8 @@
// the schedule can also be used from backend
// if so we want to change default date shown in the calendar
- if ($backend == 'true') {
- $building['date'] = phpgw::get_var('date', 'GET');
+ if ($backend) {
+ $building['date'] = phpgw::get_var('date', 'string', 'GET');
}
$building['deactivate_application'] = 1;
self::add_javascript('bookingfrontend', 'bookingfrontend',
'schedule.js');
@@ -366,7 +366,7 @@
public function show()
{
$this->check_active('booking.uibuilding.show');
- $building = $this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $building = $this->bo->read_single(phpgw::get_var('id', 'int','GET'));
$building['schedule_link'] = self::link(array('menuaction' =>
'bookingfrontend.uibuilding.schedule', 'id' => $building['id']));
$building['extra_link'] = self::link(array('menuaction' =>
'bookingfrontend.uibuilding.extraschedule', 'id' => $building['id']));
$building['message_link'] = self::link(array('menuaction' =>
'bookingfrontend.uisystem_message.edit', 'building_id' => $building['id'],
'building_name' => $building['name']));
Modified:
branches/dev-syncromind/bookingfrontend/inc/class.uicontactperson.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uicontactperson.inc.php
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uicontactperson.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
@@ -25,7 +25,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));
}
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
@@ -23,7 +23,7 @@
public function edit()
{
- $id = intval(phpgw::get_var('id', 'GET'));
+ $id = phpgw::get_var('id', 'int');
$event = $this->bo->read_single($id);
$building_info = $this->bo->so->get_building_info($id);
$event['building_id'] = $building_info['id'];
@@ -165,7 +165,7 @@
$config = CreateObject('phpgwapi.config','booking');
$config->read();
- $event = $this->bo->read_single(intval(phpgw::get_var('id',
'GET')));
+ $event = $this->bo->read_single(phpgw::get_var('id', 'int'));
$bouser = CreateObject('bookingfrontend.bouser');
$errors = array();
@@ -317,7 +317,7 @@
} else {
$user_can_delete_bookings = 1;
}
- $event = $this->bo->read_single(intval(phpgw::get_var('id',
'GET')));
+ $event = $this->bo->read_single(phpgw::get_var('id', 'int'));
unset($event['comments']);
$resources =
$this->resource_bo->so->read(array('filters'=>array('id'=>$event['resources']),
'sort'=>'name'));
if ($event['customer_organization_number'] != '')
@@ -355,7 +355,7 @@
public function report_numbers()
{
$step = 1;
- $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']);
@@ -367,7 +367,7 @@
$building_info = $this->bo->so->get_building_info($id);
$building =
$this->building_bo->read_single($building_info['id']);
- if ($event['secret'] != phpgw::get_var('secret', 'GET'))
+ if ($event['secret'] != phpgw::get_var('secret',
'string'))
{
$step = -1; // indicates that an error message
should be displayed in the template
self::render_template('report_numbers',
array('event_object' => $event, 'agegroups' => $agegroups, 'building' =>
$building, 'step' => $step));
@@ -382,7 +382,7 @@
foreach($sexes as $sex)
{
$i = 0;
- foreach(phpgw::get_var($sex, 'POST') as
$agegroup_id => $value)
+ foreach(phpgw::get_var($sex) as
$agegroup_id => $value)
{
$temp_agegroup[$i]['agegroup_id'] = $agegroup_id;
$temp_agegroup[$i][$sex] =
$value;
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uigroup.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uigroup.inc.php
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uigroup.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
@@ -19,7 +19,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/bookingfrontend/inc/class.uiorganization.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uiorganization.inc.php
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uiorganization.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
@@ -29,7 +29,7 @@
}
public function edit()
{
- $organization =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $organization =
$this->bo->read_single(phpgw::get_var('id', 'int'));
if (isset($organization['permission']['write']))
{
@@ -43,7 +43,7 @@
public function show()
{
- $organization =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+ $organization =
$this->bo->read_single(phpgw::get_var('id', 'int'));
$organization['organizations_link'] =
self::link(array('menuaction' => $this->module.'.uiorganization.index'));
$organization['edit_link'] =
self::link(array('menuaction' => $this->module.'.uiorganization.edit', 'id' =>
$organization['id']));
$organization['start'] = self::link(array('menuaction'
=> 'bookingfrontend.uisearch.index', 'type' => "organization"));
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
@@ -25,8 +25,8 @@
self::add_javascript('bookingfrontend',
'bookingfrontend', 'search.js');
$config = CreateObject('phpgwapi.config','booking');
$config->read();
- $searchterm = trim(phpgw::get_var('searchterm',
'string', null));
- $type = phpgw::get_var('type','string', 'GET', null);
+ $searchterm = trim(phpgw::get_var('searchterm',
'string', 'REQUEST', null));
+ $type = phpgw::get_var('type','string', 'REQUEST',
null);
$activity_top_level =
phpgw::get_var('activity_top_level', 'int', 'REQUEST', null);
$building_id = phpgw::get_var('building_id', 'int',
'REQUEST', null);
Modified:
branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
2015-11-18 11:26:07 UTC (rev 14400)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
2015-11-18 12:34:25 UTC (rev 14401)
@@ -27,8 +27,8 @@
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_name'] =
phpgw::get_var('building_name', 'GET');
+ $system_message['building_id'] =
phpgw::get_var('building_id', 'int');
+ $system_message['building_name'] =
phpgw::get_var('building_name', 'string');
$system_message['cancel_link'] =
self::link(array('menuaction' => $this->module . '.uisearch.index'));
$system_message['created'] = $date->format('Y-m-d
H:m');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14401] bookingfrontend: corrected some phpgw::get_var-inputs,
Sigurd Nes <=