[Fmsystem-commits] [11957] bkbooking: stavanger bugfix/clean up uievent

[Kjell Arne Espedal]

Revision: 11957
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11957
Author:   kjell
Date:     2014-05-08 11:59:23 +0000 (Thu, 08 May 2014)
Log Message:
-----------
bkbooking: stavanger bugfix/clean up uievent

Modified Paths:
--------------
    branches/stavangerkommune/booking/inc/class.boevent.inc.php
    branches/stavangerkommune/bookingfrontend/inc/class.uievent.inc.php

Modified: branches/stavangerkommune/booking/inc/class.boevent.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.boevent.inc.php 2014-05-08 
11:51:46 UTC (rev 11956)
+++ branches/stavangerkommune/booking/inc/class.boevent.inc.php 2014-05-08 
11:59:23 UTC (rev 11957)
@@ -106,7 +106,6 @@
 //        $link .= 
$event['building_id'].'&building_name='.urlencode($event['building_name']).'&from_[]=';
 //        $link .= 
urlencode($event['from_']).'&to_[]='.urlencode($event['to_']).'&resource='.implode(",",$event['resources']);
 
-
         $link = 
$external_site_address.'/bookingfrontend/?menuaction=bookingfrontend.uibuilding.schedule&id=';
         $link .= $event['building_id'].'&date='.substr($event['from_'], 0, 10);
         $body = "";
@@ -139,17 +138,6 @@
         $body .= ' - <a href="'.$link.'">'.lang('Check calendar').'</a></p>';
         $body .= 
"<p>".$config->config_data['application_mail_signature']."</p>";
 
-        echo "<pre>\n";
-        print_r($mailadresses);
-        echo "\n";
-        print_r($from);
-        echo "\n";
-        print_r($subject);
-        echo "\n";
-        print_r($body);
-        echo "\n";
-        print_r($event);
-        exit;
         foreach ($mailadresses as $adr)
         {
             try
@@ -207,12 +195,6 @@
         $body .= ' - <a href="'.$link.'">'.lang('Apply for time').'</a></p>';
         $body .= 
"<p>".$config->config_data['application_mail_signature']."</p>";
 
-        echo "admin: ";
-        print_r($subject);
-        print_r($body);
-        print_r($_POST);
-        print_r($event);
-        exit;
         foreach ($mailadresses as $adr)
         {
             try

Modified: branches/stavangerkommune/bookingfrontend/inc/class.uievent.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.uievent.inc.php 
2014-05-08 11:51:46 UTC (rev 11956)
+++ branches/stavangerkommune/bookingfrontend/inc/class.uievent.inc.php 
2014-05-08 11:59:23 UTC (rev 11957)
@@ -160,7 +160,7 @@
             $mailadresses = 
$this->building_users($event['building_id'],$event['organization_id']);
             if($_SERVER['REQUEST_METHOD'] == 'POST')
             {
-                if($cdate > $event['to_']) {
+                if($cdate < $event['to_']) {
                     
if($bouser->is_organization_admin($event['customer_organization_id'])) {
                         $this->bo->send_notification(false, $event, 
$mailadresses);
                         $this->bo->send_admin_notification(false, $event, 
$_POST['message']);