Skip to content

T
TimeOutAdmin
Commit 063f20d3 by Tobin
Options

dc

parent dc7cdfea
Showing with 16 additions and 4 deletions
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>";
......
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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment