diff --git a/application/controllers/Provider.php b/application/controllers/Provider.php
index 47e18e6..3ae36ff 100644
--- a/application/controllers/Provider.php
+++ b/application/controllers/Provider.php
@@ -75,7 +75,8 @@ class Provider extends CI_Controller {
$message .= "<html>
<body>
Your Organizer Account for the username
- <strong>".$providerData->username."</strong> is now activated.<br>
+ <strong>".$providerData->username."</strong> is now activated. Please use this link for access your account
+ <a href='".base_url()."/admin'>".base_url()."/admin</a><br>
".$template['provider_activation_mail']."
</body>
</html>";
diff --git a/application/models/Webservice_model.php b/application/models/Webservice_model.php
index a65fac5..a0548d1 100644
--- a/application/models/Webservice_model.php
+++ b/application/models/Webservice_model.php
@@ -385,7 +385,7 @@ class Webservice_model extends CI_Model {
}
- function event($data) {
+function event($data) {
try {
$user_id = $this->auth_token_get($data['auth_token']);
@@ -458,8 +458,19 @@ class Webservice_model extends CI_Model {
foreach ($dates as $rss) {
list($id,$date,$time) = explode('#', $rss);
- $data_array[$date][] = array('id'=>$id, 'time'=>$time);
- $time_spec[] = array('id'=>$id, 'date'=>$date, 'time'=>$time);
+
+ if($date == date("Y-m-d")){
+ $time_array = explode(':', $time);
+ if($time_array['0'] > date('H')) {
+ $time_spec[] = array('id'=>$id, 'date'=>$date, 'time'=>$time);
+ $data_array[$date][] = array('id'=>$id, 'time'=>$time);
+ }
+ } else {
+ $data_array[$date][] = array('id'=>$id, 'time'=>$time);
+ $time_spec[] = array('id'=>$id, 'date'=>$date, 'time'=>$time);
+ }
+
+
}
$date_list = array();
foreach ($data_array as $key => $value) {