[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17023] validation of parametres
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17023] validation of parametres |
|
Date: |
Fri, 1 Sep 2017 08:28:15 -0400 (EDT) |
Revision: 17023
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17023
Author: sigurdne
Date: 2017-09-01 08:28:15 -0400 (Fri, 01 Sep 2017)
Log Message:
-----------
validation of parametres
Modified Paths:
--------------
trunk/booking/inc/class.boaccount_code_set.inc.php
trunk/booking/inc/class.boallocation.inc.php
trunk/booking/inc/class.bobooking.inc.php
trunk/booking/inc/class.bobuilding.inc.php
trunk/booking/inc/class.bocommon_authorized.inc.php
trunk/booking/inc/class.bocommon_global_manager_authorized.inc.php
trunk/booking/inc/class.bodocument.inc.php
trunk/booking/inc/class.bodocument_resource.inc.php
trunk/booking/inc/class.boevent.inc.php
trunk/booking/inc/class.bogroup.inc.php
trunk/booking/inc/class.boorganization.inc.php
trunk/booking/inc/class.bopermission.inc.php
trunk/booking/inc/class.bopermission_resource.inc.php
trunk/booking/inc/class.bopermission_season.inc.php
trunk/booking/inc/class.boresource.inc.php
trunk/booking/inc/class.boseason.inc.php
trunk/booking/inc/class.soallocation.inc.php
trunk/booking/inc/class.sobooking.inc.php
trunk/booking/inc/class.sopermission_permission_document_building.inc.php
trunk/booking/inc/class.uicompleted_reservation_export.inc.php
trunk/booking/templates/base/event_new.xsl
trunk/booking/templates/base/group_edit.xsl
trunk/controller/inc/class.uicontrol_item.inc.php
trunk/eventplanner/inc/class.bocalendar.inc.php
trunk/eventplanner/inc/class.sobooking.inc.php
trunk/eventplanner/inc/class.socalendar.inc.php
trunk/eventplanner/inc/class.uibooking.inc.php
Modified: trunk/booking/inc/class.boaccount_code_set.inc.php
===================================================================
--- trunk/booking/inc/class.boaccount_code_set.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/booking/inc/class.boaccount_code_set.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -10,7 +10,7 @@
$this->so = CreateObject('booking.soaccount_code_set');
}
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: trunk/booking/inc/class.boallocation.inc.php
===================================================================
--- trunk/booking/inc/class.boallocation.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/booking/inc/class.boallocation.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -200,7 +200,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: trunk/booking/inc/class.bobooking.inc.php
===================================================================
--- trunk/booking/inc/class.bobooking.inc.php 2017-08-31 17:35:57 UTC (rev
17022)
+++ trunk/booking/inc/class.bobooking.inc.php 2017-09-01 12:28:15 UTC (rev
17023)
@@ -340,7 +340,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
if ($this->current_app() == 'bookingfrontend')
{
Modified: trunk/booking/inc/class.bobuilding.inc.php
===================================================================
--- trunk/booking/inc/class.bobuilding.inc.php 2017-08-31 17:35:57 UTC (rev
17022)
+++ trunk/booking/inc/class.bobuilding.inc.php 2017-09-01 12:28:15 UTC (rev
17023)
@@ -10,7 +10,7 @@
$this->so = CreateObject('booking.sobuilding');
}
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: trunk/booking/inc/class.bocommon_authorized.inc.php
===================================================================
--- trunk/booking/inc/class.bocommon_authorized.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/booking/inc/class.bocommon_authorized.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -226,7 +226,7 @@
return is_null($for_object) ?
$this->collection_role_permissions() :
$this->object_role_permissions($for_object);
}
- public function object_role_permissions( array $forObject )
+ public function object_role_permissions( $forObject )
{
return $this->get_object_role_permissions($forObject,
$this->defaultObjectPermissions);
}
@@ -264,7 +264,7 @@
// return true;
// }
- protected abstract function get_object_role_permissions( array
$forObject, $defaultPermissions );
+ protected abstract function get_object_role_permissions(
$forObject, $defaultPermissions );
protected abstract function get_collection_role_permissions(
$defaultPermissions );
Modified: trunk/booking/inc/class.bocommon_global_manager_authorized.inc.php
===================================================================
--- trunk/booking/inc/class.bocommon_global_manager_authorized.inc.php
2017-08-31 17:35:57 UTC (rev 17022)
+++ trunk/booking/inc/class.bocommon_global_manager_authorized.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
@@ -7,7 +7,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: trunk/booking/inc/class.bodocument.inc.php
===================================================================
--- trunk/booking/inc/class.bodocument.inc.php 2017-08-31 17:35:57 UTC (rev
17022)
+++ trunk/booking/inc/class.bodocument.inc.php 2017-09-01 12:28:15 UTC (rev
17023)
@@ -43,7 +43,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: trunk/booking/inc/class.bodocument_resource.inc.php
===================================================================
--- trunk/booking/inc/class.bodocument_resource.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/booking/inc/class.bodocument_resource.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -4,7 +4,7 @@
class booking_bodocument_resource extends booking_bodocument
{
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
$role_permissions =
parent::get_object_role_permissions($forObject, $defaultPermissions);
$role_permissions['parent_role_permissions']['owner']['parent_role_permissions']['building']
= array
Modified: trunk/booking/inc/class.boevent.inc.php
===================================================================
--- trunk/booking/inc/class.boevent.inc.php 2017-08-31 17:35:57 UTC (rev
17022)
+++ trunk/booking/inc/class.boevent.inc.php 2017-09-01 12:28:15 UTC (rev
17023)
@@ -41,7 +41,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
if ($this->current_app() == 'booking')
{
Modified: trunk/booking/inc/class.bogroup.inc.php
===================================================================
--- trunk/booking/inc/class.bogroup.inc.php 2017-08-31 17:35:57 UTC (rev
17022)
+++ trunk/booking/inc/class.bogroup.inc.php 2017-09-01 12:28:15 UTC (rev
17023)
@@ -40,7 +40,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
if ($this->current_app() == 'booking')
{
Modified: trunk/booking/inc/class.boorganization.inc.php
===================================================================
--- trunk/booking/inc/class.boorganization.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/booking/inc/class.boorganization.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -40,7 +40,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
if ($this->current_app() == 'booking')
{
Modified: trunk/booking/inc/class.bopermission.inc.php
===================================================================
--- trunk/booking/inc/class.bopermission.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/booking/inc/class.bopermission.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -44,7 +44,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: trunk/booking/inc/class.bopermission_resource.inc.php
===================================================================
--- trunk/booking/inc/class.bopermission_resource.inc.php 2017-08-31
17:35:57 UTC (rev 17022)
+++ trunk/booking/inc/class.bopermission_resource.inc.php 2017-09-01
12:28:15 UTC (rev 17023)
@@ -4,7 +4,7 @@
class booking_bopermission_resource extends booking_bopermission
{
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
$role_permissions =
parent::get_object_role_permissions($forObject, $defaultPermissions);
$role_permissions['parent_role_permissions']['object']['parent_role_permissions']['building']
= array
Modified: trunk/booking/inc/class.bopermission_season.inc.php
===================================================================
--- trunk/booking/inc/class.bopermission_season.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/booking/inc/class.bopermission_season.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -4,7 +4,7 @@
class booking_bopermission_season extends booking_bopermission
{
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
$role_permissions =
parent::get_object_role_permissions($forObject, $defaultPermissions);
$role_permissions['parent_role_permissions']['object']['parent_role_permissions']['building']
= array
Modified: trunk/booking/inc/class.boresource.inc.php
===================================================================
--- trunk/booking/inc/class.boresource.inc.php 2017-08-31 17:35:57 UTC (rev
17022)
+++ trunk/booking/inc/class.boresource.inc.php 2017-09-01 12:28:15 UTC (rev
17023)
@@ -51,7 +51,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: trunk/booking/inc/class.boseason.inc.php
===================================================================
--- trunk/booking/inc/class.boseason.inc.php 2017-08-31 17:35:57 UTC (rev
17022)
+++ trunk/booking/inc/class.boseason.inc.php 2017-09-01 12:28:15 UTC (rev
17023)
@@ -42,7 +42,7 @@
return $parent_roles;
}
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: trunk/booking/inc/class.soallocation.inc.php
===================================================================
--- trunk/booking/inc/class.soallocation.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/booking/inc/class.soallocation.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -254,10 +254,15 @@
$from = "'" . $allocation['from_'] . "'";
$to = "'" . $allocation['to_'] . "'";
- $org_id = $allocation['organization_id'];
+ $org_id = (int)$allocation['organization_id'];
$season_id = $allocation['season_id'];
$resources = implode(",", $allocation['resources']);
+ if(empty($allocation['resources']))
+ {
+ return false;
+ }
+
$sql = "SELECT id FROM bb_allocation ba2 JOIN
bb_allocation_resource bar2 ON (ba2.id = bar2.allocation_id) WHERE ba2.from_ =
($from) AND ba2.to_ = ($to) AND ba2.organization_id = ($org_id) AND
ba2.season_id = ($season_id) AND bar2.resource_id IN ($resources)";
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
Modified: trunk/booking/inc/class.sobooking.inc.php
===================================================================
--- trunk/booking/inc/class.sobooking.inc.php 2017-08-31 17:35:57 UTC (rev
17022)
+++ trunk/booking/inc/class.sobooking.inc.php 2017-09-01 12:28:15 UTC (rev
17023)
@@ -392,10 +392,15 @@
{
$from = "'" . $booking['from_'] . "'";
$to = "'" . $booking['to_'] . "'";
- $gid = $booking['group_id'];
- $season_id = $booking['season_id'];
+ $gid = (int)$booking['group_id'];
+ $season_id = (int)$booking['season_id'];
$resources = implode(",", $booking['resources']);
+ if(empty($booking['resources']))
+ {
+ return false;
+ }
+
$sql = "SELECT bb.id,bbr.resource_id FROM bb_booking
bb,bb_booking_resource bbr WHERE bb.from_ = ($from) AND bb.to_ = ($to) AND
bb.group_id = ($gid) AND bb.season_id = ($season_id) AND bb.id = bbr.booking_id
AND EXISTS (SELECT 1 FROM bb_booking_resource bbr2 WHERE bbr2.resource_id IN
($resources) AND bbr2.resource_id = bbr.resource_id)";
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
@@ -476,10 +481,15 @@
$from = "'" . $booking['from_'] . "'";
$to = "'" . $booking['to_'] . "'";
- $org_id = $booking['organization_id'];
- $season_id = $booking['season_id'];
+ $org_id = (int)$booking['organization_id'];
+ $season_id = (int)$booking['season_id'];
$resources = implode(",", $booking['resources']);
+ if(empty($booking['resources']))
+ {
+ return True;
+ }
+
$sql = "SELECT id FROM bb_allocation ba2 WHERE
ba2.from_ = ($from) AND ba2.to_ = ($to) AND ba2.organization_id = ($org_id) AND
ba2.season_id = ($season_id) AND EXISTS ( SELECT 1 FROM bb_allocation
a,bb_allocation_resource b WHERE a.id = b.allocation_id AND b.resource_id IN
($resources))";
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
if (!$this->db->next_record())
Modified:
trunk/booking/inc/class.sopermission_permission_document_building.inc.php
===================================================================
--- trunk/booking/inc/class.sopermission_permission_document_building.inc.php
2017-08-31 17:35:57 UTC (rev 17022)
+++ trunk/booking/inc/class.sopermission_permission_document_building.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
@@ -4,7 +4,7 @@
class booking_sopermission_permission_document_building extends
booking_sopermission_permission
{
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
$role_permissions =
parent::get_object_role_permissions($forObject, $defaultPermissions);
$role_permissions['parent_role_permissions']['object']['parent_role_permissions']['building']
= array
Modified: trunk/booking/inc/class.uicompleted_reservation_export.inc.php
===================================================================
--- trunk/booking/inc/class.uicompleted_reservation_export.inc.php
2017-08-31 17:35:57 UTC (rev 17022)
+++ trunk/booking/inc/class.uicompleted_reservation_export.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
@@ -269,7 +269,7 @@
if ($filter_to)
{
- $filter_to2 = split("/", $filter_to);
+ $filter_to2 = explode("/", $filter_to);
$filter_to = $filter_to2[1] . "/" .
$filter_to2[0] . "/" . $filter_to2[2];
$filters['where'][] = "%%table%%" .
sprintf(".to_ <= '%s 23:59:59'",
$GLOBALS['phpgw']->db->db_addslashes($filter_to));
}
Modified: trunk/booking/templates/base/event_new.xsl
===================================================================
--- trunk/booking/templates/base/event_new.xsl 2017-08-31 17:35:57 UTC (rev
17022)
+++ trunk/booking/templates/base/event_new.xsl 2017-09-01 12:28:15 UTC (rev
17023)
@@ -24,17 +24,17 @@
<xsl:value-of select="php:function('lang', 'Activity')" />
</label>
<select
name="activity_id" id="field_activity" class="pure-u-1 pure-u-sm-1-2
pure-u-lg-1-3">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="php:function('lang', 'Please select an activity')" />
+
</xsl:attribute>
<option
value="">
<xsl:value-of select="php:function('lang', '-- select an activity --')" />
</option>
<xsl:for-each select="activities">
<option>
-
<xsl:attribute name="data-validation">
-
<xsl:text>required</xsl:text>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-error-msg">
-
<xsl:value-of select="php:function('lang', 'Please select an
activity')" />
-
</xsl:attribute>
<xsl:if test="../event/activity_id = id">
<xsl:attribute name="selected">selected</xsl:attribute>
</xsl:if>
Modified: trunk/booking/templates/base/group_edit.xsl
===================================================================
--- trunk/booking/templates/base/group_edit.xsl 2017-08-31 17:35:57 UTC (rev
17022)
+++ trunk/booking/templates/base/group_edit.xsl 2017-09-01 12:28:15 UTC (rev
17023)
@@ -60,6 +60,12 @@
<xsl:value-of
select="php:function('lang', 'Activity')" />
</label>
<select name="activity_id"
id="field_activity">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of
select="php:function('lang', 'Please select an activity')" />
+ </xsl:attribute>
<option value="">
<xsl:value-of
select="php:function('lang', '-- select an activity --')" />
</option>
Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/controller/inc/class.uicontrol_item.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -422,7 +422,7 @@
$search_for = $params['query'];
$start_index = $params['start'];
- $num_of_objects = $params['results'] > 0 ?
$params['results'] : null;
+ $num_of_objects = $params['results'] > 0 ?
$params['results'] : 0;
$sort_field = $params['order'];
$search_type = '';
Modified: trunk/eventplanner/inc/class.bocalendar.inc.php
===================================================================
--- trunk/eventplanner/inc/class.bocalendar.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/eventplanner/inc/class.bocalendar.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -174,20 +174,26 @@
$_ids = $ids;
}
+ if($action == 'disconnect' && $_ids)
+ {
+ $mail_info =
$this->create_disconnect_email($_ids);
+ }
+
$ret =
eventplanner_socalendar::get_instance()->update_active_status($_ids, $action);
if($ret && $action == 'disconnect')
{
- $this->send_disconnect_email($_ids);
+ $this->send_disconnect_email($mail_info);
}
return $ret;
}
- function send_disconnect_email($ids)
+ function create_disconnect_email($ids)
{
$config = CreateObject('phpgwapi.config',
'eventplanner')->read();
$sobooking = createObject('eventplanner.sobooking');
+ $mail_info = array();
foreach ($ids as $calendar_id)
{
$booking_id =
$sobooking->get_booking_id_from_calendar( $calendar_id );
@@ -217,8 +223,6 @@
$subject = !empty($config['canceled_subject'])
? $config['canceled_subject'] : $event_title;
$event_title = $application->title;
- $send = CreateObject('phpgwapi.send');
-
$lang_when = lang('when');
$lang_where = lang('where');
@@ -373,9 +377,31 @@
$from_email =
!empty($config['receipt_blind_copy']) ? $config['receipt_blind_copy'] :
$customer_contact_email;
$from_name =
!empty($config['receipt_blind_copy']) ? $config['receipt_blind_copy'] :
$customer_contact_name;
+ $mail_info[] = array(
+ 'to_email' => $to_email,
+ 'subject' => $subject,
+ 'content' => stripslashes($content),
+ 'cc' => $cc,
+ 'bcc' => $bcc,
+ 'from_email' => $from_email,
+ 'from_name' => $from_name,
+ );
+
+
+ }
+
+ return $mail_info;
+ }
+
+
+ private function send_disconnect_email($mail_info)
+ {
+ $send = CreateObject('phpgwapi.send');
+ foreach ($mail_info as $entry)
+ {
try
{
- $rcpt = $send->msg('email', $to_email,
$subject, stripslashes($content), '', $cc, $bcc, $from_email, $from_name,
'html');
+ $rcpt = $send->msg('email',
$entry['to_email'], $entry['subject'], $entry['content'], '', $entry['cc'],
$entry['bcc'], $entry['from_email'], $entry['from_name'], 'html');
}
catch (phpmailerException $e)
{
@@ -383,7 +409,6 @@
}
phpgwapi_cache::message_set("Email: $to_email,
$cc", 'message');
-
}
}
Modified: trunk/eventplanner/inc/class.sobooking.inc.php
===================================================================
--- trunk/eventplanner/inc/class.sobooking.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/eventplanner/inc/class.sobooking.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -27,6 +27,7 @@
* @version $Id: $
*/
phpgw::import_class('phpgwapi.socommon');
+ include_class('eventplanner', 'booking', 'inc/model/');
class eventplanner_sobooking extends phpgwapi_socommon
{
Modified: trunk/eventplanner/inc/class.socalendar.inc.php
===================================================================
--- trunk/eventplanner/inc/class.socalendar.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/eventplanner/inc/class.socalendar.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -158,6 +158,21 @@
break;
case 'disconnect':
+ $sql = "SELECT id AS booking_id FROM
eventplanner_booking WHERE calendar_id IN(". implode(',', $ids) . ')';
+
$this->db->query($sql,__LINE__,__FILE__);
+ $bookings = array();
+ while ($this->db->next_record())
+ {
+ $bookings[] =
$this->db->f('booking_id');
+ }
+
+ $sql = "DELETE FROM
eventplanner_booking_comment WHERE booking_id IN(". implode(',', $bookings) .
')';
+
$this->db->query($sql,__LINE__,__FILE__);
+ $sql = "DELETE FROM
eventplanner_booking_customer_report WHERE booking_id IN(". implode(',',
$bookings) . ')';
+
$this->db->query($sql,__LINE__,__FILE__);
+ $sql = "DELETE FROM
eventplanner_booking_vendor_report WHERE booking_id IN(". implode(',',
$bookings) . ')';
+
$this->db->query($sql,__LINE__,__FILE__);
+
$sql = "DELETE FROM
eventplanner_booking WHERE calendar_id IN(". implode(',', $ids) . ')';
return
$this->db->query($sql,__LINE__,__FILE__);
Modified: trunk/eventplanner/inc/class.uibooking.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uibooking.inc.php 2017-08-31 17:35:57 UTC
(rev 17022)
+++ trunk/eventplanner/inc/class.uibooking.inc.php 2017-09-01 12:28:15 UTC
(rev 17023)
@@ -248,7 +248,7 @@
$datatable_def[] = array(
'container' => 'datatable-container_1',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uivendor_report.query",
- 'filter_booking_id' => $id,
+ 'filter_booking_id' => $id ? $id : -1,
'phpgw_return_as' => 'json'))),
'ColumnDefs' => $vendor_report_def,
'data' => json_encode($vendor_report),
@@ -278,7 +278,7 @@
$datatable_def[] = array(
'container' => 'datatable-container_2',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uicustomer_report.query",
- 'filter_booking_id' => $id,
+ 'filter_booking_id' => $id ? $id : -1,
'phpgw_return_as' => 'json'))),
'ColumnDefs' => $customer_report_def,
'data' => json_encode($customer_report),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17023] validation of parametres,
sigurdne <=