application/controllers/admin/feedback.php application/views/admin/feedback.php application/views/admin/form_utils_js.php @@ -6,85 +6,84 @@ * LICENSE: This source file is subject to LGPL license * that is available through the world-wide-web at the following URI: * http://www.gnu.org/copyleft/lesser.html - * @author Ushahidi Team <team@ushahidi.com> + * @author Ushahidi Team <team@ushahidi.com> * @package Ushahidi - http://source.ushahididev.com - * @module Admin Controller + * @module Admin Controller * @copyright Ushahidi - http://www.ushahidi.com * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) */ -class Admin_Controller extends Template_Controller { - - public $auto_render = TRUE; +class Admin_Controller extends Template_Controller +{ + public $auto_render = TRUE; - // Main template - public $template = 'admin/layout'; + // Main template + public $template = 'admin/layout'; - // Cache instance - protected $cache; + // Cache instance + protected $cache; - // Enable auth - protected $auth_required = FALSE; + // Enable auth + protected $auth_required = FALSE; - protected $user; - + protected $user; - public function __construct() - { - parent::__construct(); + public function __construct() + { + parent::__construct(); - // Load cache - $this->cache = new Cache; + // Load cache + $this->cache = new Cache; - // Load session - $this->session = new Session; + // Load session + $this->session = new Session; - // Load database - $this->db = new Database(); + // Load database + $this->db = new Database(); - $this->auth = new Auth(); - $this->session = Session::instance(); - $this->auth->auto_login(); - if (!$this->auth->logged_in('admin') - && !$this->auth->logged_in('login')) - { - url::redirect('login'); - } + $this->auth = new Auth(); + $this->session = Session::instance(); + $this->auth->auto_login(); + if (!$this->auth->logged_in('admin') + && !$this->auth->logged_in('login')) + { + url::redirect('login'); + } - // Get Session Information - $user = new User_Model($_SESSION['auth_user']->id); + // Get Session Information + $user = new User_Model($_SESSION['auth_user']->id); - $this->template->admin_name = $user->name; + $this->template->admin_name = $user->name; - // Retrieve Default Settings - $this->template->site_name = Kohana::config('settings.site_name'); - $this->template->mapstraction = Kohana::config('settings.mapstraction'); - $this->template->api_url = Kohana::config('settings.api_url'); + // Retrieve Default Settings + $this->template->site_name = Kohana::config('settings.site_name'); + $this->template->mapstraction = Kohana::config('settings.mapstraction'); + $this->template->api_url = Kohana::config('settings.api_url'); - // Javascript Header - $this->template->map_enabled = FALSE; + // Javascript Header + $this->template->map_enabled = FALSE; $this->template->flot_enabled = FALSE; - $this->template->colorpicker_enabled = FALSE; - $this->template->js = ''; + $this->template->colorpicker_enabled = FALSE; + $this->template->js = ''; - // Load profiler - // $profiler = new Profiler; + // Load profiler + // $profiler = new Profiler; - } + } - public function index() - { - // Send them to the right page - url::redirect('admin/dashboard'); - } + public function index() + { + // Send them to the right page + url::redirect('admin/dashboard'); + } - public function log_out() - { - $auth = new Auth; - $auth->logout(TRUE); + public function log_out() + { + $auth = new Auth; + $auth->logout(TRUE); - url::redirect('login'); - } + url::redirect('login'); + } } // End Admin application/controllers/admin.php @@ -183,4 +183,4 @@ class Comments_Controller extends Admin_Controller $this->template->js = new View('admin/comments_js'); } -} \ No newline at end of file +} application/controllers/admin/comments.php @@ -36,8 +36,16 @@ class Messages_Controller extends Admin_Controller $this->template->content->title = $service->service_name; //So far this assumes that selected 'message_id's are for deleting - if (isset($_POST['message_id'])) - $this->deleteMessages($_POST['message_id']); + if (isset($_POST['message_id'])) + { + if ($_POST['action'] == 'rank') + { + $this->rankMessages($_POST['message_id'], $_POST['level']); + } else + { + $this->deleteMessages($_POST['message_id']); + } + } // Is this an Inbox or Outbox Filter? if (!empty($_GET['type'])) @@ -59,12 +67,38 @@ class Messages_Controller extends Admin_Controller $type = "1"; $filter = 'message_type = 1'; } + + // Any time period filter? + $period = 'a'; + if (!empty($_GET['period'])) + { + $period = $_GET['period']; + + if ($period == 'd') + { + $message_date = date("Y-m-d 00:00:00", mktime(0, 0, 0,date("m"),date("d")-1,date("Y"))); + $end_date = date("Y-m-d 00:00:00", mktime(0, 0, 0, date("m"), date("d"), date("Y"))); + } elseif ($period == 'm') + { + $message_date = date("Y-m-01 00:00:00", mktime(0, 0, 0, date("m")-1, date("d"), date("Y"))); + $end_date = date("Y-m-01 00:00:00", mktime(0, 0, 0, date("m"), date("d"), date("Y"))); + } elseif ($period == 'y') + { + $message_date = date("Y-01-01 00:00:00", mktime(0, 0, 0, date("m"), date("d"), date("Y")-1)); + $end_date = date("Y-01-01 00:00:00", mktime(0, 0, 0, date("m"), date("d"), date("Y"))); + } + + if (isset($message_date)) + { + $filter .= " AND message_date >= '" . $message_date . "' AND message_date < '" . $end_date ."'"; + } + } // check, has the form been submitted? $form_error = FALSE; $form_saved = FALSE; $form_action = ""; - + // Pagination $pagination = new Pagination(array( 'query_string' => 'page', @@ -90,13 +124,17 @@ class Messages_Controller extends Admin_Controller $this->template->content->form_error = $form_error; $this->template->content->form_saved = $form_saved; $this->template->content->form_action = $form_action; + + $levels = ORM::factory('level')->orderby('level_weight')->find_all(); + $this->template->content->levels = $levels; // Total Reports $this->template->content->total_items = $pagination->total_items; // Message Type Tab - Inbox/Outbox $this->template->content->type = $type; - + $this->template->content->period = $period; + // Javascript Header $this->template->js = new View('admin/messages_js'); } @@ -280,6 +318,23 @@ class Messages_Controller extends Admin_Controller } /** + * Rank selected messages + */ + function rankMessages($ids,$level,$dbtable='message') + { + //XXX:get the current page number + foreach($ids as $id) + { + $msg = ORM::factory($dbtable)->find($id); + $msg->message_level = $level; + $msg->save(); + } + $extradir = ''; + // url::redirect('admin/messages/'.$extradir); + + } + + /** * Lists the Twitter messages. */ function twitter() application/controllers/admin/messages.php @@ -13,14 +13,11 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) */ -class Alerts_Controller extends Main_Controller { - +class Alerts_Controller extends Main_Controller +{ const MOBILE_ALERT = 1; const EMAIL_ALERT = 2; - const CODE_LENGTH = 6; - private $code_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; - function __construct() { parent::__construct(); @@ -44,17 +41,17 @@ class Alerts_Controller extends Main_Controller { // Retrieve Country Cities $this->template->content->cities = $this->_get_cities($default_country); - // setup and initialize form field names + // Setup and initialize form field names $form = array ( - 'alert_mobile' => '', - 'alert_mobile_yes' => '', - 'alert_email' => '', - 'alert_email_yes' => '', - 'alert_lat' => '', - 'alert_lon' => '' - ); + 'alert_mobile' => '', + 'alert_mobile_yes' => '', + 'alert_email' => '', + 'alert_email_yes' => '', + 'alert_lat' => '', + 'alert_lon' => '' + ); - // copy the form as errors, so the errors will be stored with keys + // Copy the form as errors, so the errors will be stored with keys // corresponding to the form field names $errors = $form; $form_error = FALSE; @@ -63,31 +60,36 @@ class Alerts_Controller extends Main_Controller { // check, has the form been submitted, if so, setup validation if ($_POST) { - // Instantiate Validation, use $post, so we don't overwrite $_POST fields with our own things + // Instantiate Validation, use $post, so we don't overwrite + // $_POST fields with our own things $post = new Validation($_POST); // Add some filters $post->pre_filter('trim', TRUE); - // Add some rules, the input field, followed by a list of checks, carried out in order - if ( !empty($_POST['alert_mobile']) || isset($_POST['alert_mobile_yes']) ) + // Add some rules, the input field, followed by a list of checks, + // carried out in order + if (!empty($_POST['alert_mobile']) || isset($_POST['alert_mobile_yes'])) { $post->add_rules('alert_mobile', 'required', 'numeric', 'length[6,20]'); } - if ( !empty($_POST['alert_email']) || isset($_POST['alert_email_yes']) ) + if (!empty($_POST['alert_email']) || isset($_POST['alert_email_yes'])) { $post->add_rules('alert_email', 'required', 'email', 'length[3,64]'); } - if ( empty($_POST['alert_email']) && empty($_POST['alert_mobile']) ) + if (empty($_POST['alert_email']) && empty($_POST['alert_mobile'])) { - $post->add_error('alert_mobile','one_required'); - $post->add_error('alert_email','one_required'); + $post->add_error('alert_mobile', 'one_required'); + $post->add_error('alert_email', 'one_required'); } - $post->add_rules('alert_lat','required','between[-90,90]'); // Validate for maximum and minimum latitude values - $post->add_rules('alert_lon','required','between[-180,180]'); // Validate for maximum and minimum longitude values + // Validate for maximum and minimum latitude values + $post->add_rules('alert_lat', 'required', 'between[-90,90]'); + + // Validate for maximum and minimum longitude values + $post->add_rules('alert_lon', 'required', 'between[-180,180]'); // Add a callback, to validate the mobile phone/email (See the methods below) $post->add_callbacks('alert_mobile', array($this, 'mobile_check')); @@ -104,74 +106,16 @@ class Alerts_Controller extends Main_Controller { if (!empty($post->alert_mobile)) { - $alert_code = $this->_mk_code(); - - $settings = ORM::factory('settings', 1); - if ($settings->loaded == true) - { - // Get SMS Numbers - if (!empty($settings->sms_no3)) { - $sms_from = $settings->sms_no3; - }elseif (!empty($settings->sms_no2)) { - $sms_from = $settings->sms_no2; - }elseif (!empty($settings->sms_no1)) { - $sms_from = $settings->sms_no1; - }else{ - $sms_from = "000";// User needs to set up an SMS number - } - - $sms = new Clickatell(); - $sms->api_id = $settings->clickatell_api; - $sms->user = $settings->clickatell_username; - $sms->password = $settings->clickatell_password; - $sms->use_ssl = false; - $sms->sms(); - $message = "Your alerts confirmation code - is: ".$alert_code." This code is NOT case sensitive"; - - if ($sms->send ($post->alert_mobile, $sms_from, $message) == "OK") - { - $alert = ORM::factory('alert'); - $alert->alert_type = self::MOBILE_ALERT; - $alert->alert_recipient = $post->alert_mobile; - $alert->alert_code = $alert_code; - $alert->alert_lon = $post->alert_lon; - $alert->alert_lat = $post->alert_lat; - $alert->save(); - - if ($alert->saved == TRUE) - $sms_confirmation_saved = TRUE; - } - } + $sms_confirmation_saved = + $this->_send_mobile_alert($post->alert_mobile, + $post->alert_lon, $post->alert_lat); } if (!empty($post->alert_email)) { - $alert_code = $this->_mk_code(); - - //Send verification email - $config = kohana::config('alerts'); - $settings = kohana::config('settings'); - - $to = $post->alert_email; - $from = $config['alerts_email']; - $subject = $settings['site_name'].' alerts - verification'; - $message = 'Please follow '.url::site().'alerts/verify/'.$alert_code. - ' to confirm your alert request'; - - if (email::send($to, $from, $subject, $message, TRUE) == 1) - { - $alert = ORM::factory('alert'); - $alert->alert_type = self::EMAIL_ALERT; - $alert->alert_recipient = $post->alert_email; - $alert->alert_code = $alert_code; - $alert->alert_lon = $post->alert_lon; - $alert->alert_lat = $post->alert_lat; - $alert->save(); - - if ($alert->saved == TRUE) - $email_confirmation_saved = TRUE; - } + $email_confirmation_saved = + $this->_send_email_alert($post->alert_email, + $post->alert_lon, $post->alert_lat); } $this->session->set('alert_mobile', $post->alert_mobile); @@ -180,9 +124,8 @@ class Alerts_Controller extends Main_Controller { $sms_confirmation_saved); $this->session->set('email_confirmation_saved', $email_confirmation_saved); - - - url::redirect('alerts/confirm'); + + url::redirect('alerts/confirm'); } // No! We have validation errors, we need to show the form again, with the errors else @@ -220,65 +163,68 @@ class Alerts_Controller extends Main_Controller { */ function confirm () { - //$this->template->header->this_page = 'alerts'; $this->template->content = new View('alerts_confirm'); - if (isset($_SESSION['alert_mobile']) && isset($_SESSION['alert_email'])) { + + if (isset($_SESSION['alert_mobile']) && isset($_SESSION['alert_email'])) + { $this->template->content->alert_mobile = $_SESSION['alert_mobile']; $this->template->content->alert_email = $_SESSION['alert_email']; } $this->template->content->email_confirmation_saved = - isset($_SESSION['email_confirmation_saved']) ? $_SESSION['email_confirmation_saved'] : FALSE; + isset($_SESSION['email_confirmation_saved']) + ? $_SESSION['email_confirmation_saved'] : FALSE; $this->template->content->sms_confirmation_saved = - isset($_SESSION['sms_confirmation_saved']) ? $_SESSION['sms_confirmation_saved'] : FALSE; - + isset($_SESSION['sms_confirmation_saved']) + ? $_SESSION['sms_confirmation_saved'] : FALSE; } - + + /** * Verifies a previously sent alert confirmation code + * + * @param string $code */ - function verify($code=NULL) - { - $errno = NULL; - define("ER_CODE_VERIFIED", 0); - define("ER_CODE_NOT_FOUND", 1); - define("ER_CODE_ALREADY_VERIFIED", 2); - - if (isset($_POST['alert_code'])) - $code = trim($_POST['alert_code']); - - if ($code != NULL) - { - $code = ORM::factory('alert') - ->where('alert_code', $code)->find(); - - if (!$code->id) - { - $errno = ER_CODE_NOT_FOUND; - } - - elseif ($code->alert_confirmed == 1) - { - $errno = ER_CODE_ALREADY_VERIFIED; - } - - else - { - $code->alert_confirmed = 1; - $code->save($code->id); - - if ($code->saved == true) - $errno = ER_CODE_VERIFIED; - } - } - - else - $errno = ER_CODE_NOT_FOUND; - - $this->template->header->this_page = 'alerts'; + public function verify ( ) + { // INITIALIZE the content's section of the view $this->template->content = new View('alerts_verify'); - $this->template->content->errno = $errno; - } + $this->template->header->this_page = 'alerts'; + + // IF data has been posted to the request ... + if ($post = $this->input->post()) + { // TRY to update the model and save it + try + { // CREATE a local variable representing the alert identified with _POST + $Code = ORM::factory('alert', $post['alert_code']); + + // IF the code couldn't be loaded ... + if (! $Code->loaded) + { // THROW an exception + throw new Kohana_Exception('Code not found'); + } + + if ($Code->alert_confirmed) + { // SET the errno message to previously confirmed + $this->template->content->errno = Alert_Model::ER_CODE_ALREADY_VERIFIED; + } + + // SET the alert as confirmed, and save it + $Code->set('alert_confirmed', 1)->save(); + } + // CATCH any exceptions that might occur ... + catch (Exception $e) + { // SET the errno var to not found, indicating the likley error + $this->template->content->errno = Alert_Model::ER_CODE_NOT_FOUND; + } + } + // ELSE, no data was posted to the request ... + else + { // SET the errno var to not found, indicating the likley error + $this->template->content->errno = Alert_Model::ER_CODE_NOT_FOUND; + } + + } // END function ccverify + /* * Retrieves Previously Cached Geonames Cities @@ -287,8 +233,9 @@ class Alerts_Controller extends Main_Controller { { $cities = ORM::factory('city')->orderby('city', 'asc')->find_all(); $city_select = array('' => Kohana::lang('ui_main.alerts_select_city')); - foreach ($cities as $city) { - $city_select[$city->city_lon . "," . $city->city_lat] = $city->city; + foreach ($cities as $city) + { + $city_select[$city->city_lon.",".$city->city_lat] = $city->city; } return $city_select; } @@ -306,12 +253,13 @@ class Alerts_Controller extends Main_Controller { // Now check for similar alert in system $mobile_check = ORM::factory('alert') - ->where('alert_type', self::MOBILE_ALERT) - ->where('alert_recipient', $post->alert_mobile) - ->where('alert_lat', $post->alert_lat) - ->where('alert_lon', $post->alert_lon)->find(); + ->where('alert_type', self::MOBILE_ALERT) + ->where('alert_recipient', $post->alert_mobile) + ->where('alert_lat', $post->alert_lat) + ->where('alert_lon', $post->alert_lon) + ->find(); - if ( $mobile_check->id ) + if ($mobile_check->id) { // Add a validation error, this will cause $post->validate() to return FALSE $post->add_error( 'alert_mobile', 'mobile_check'); @@ -331,12 +279,13 @@ class Alerts_Controller extends Main_Controller { // Now check for similar alert in system $email_check = ORM::factory('alert') - ->where('alert_type', self::EMAIL_ALERT) - ->where('alert_recipient', $post->alert_email) - ->where('alert_lat', $post->alert_lat) - ->where('alert_lon', $post->alert_lon)->find(); + ->where('alert_type', self::EMAIL_ALERT) + ->where('alert_recipient', $post->alert_email) + ->where('alert_lat', $post->alert_lat) + ->where('alert_lon', $post->alert_lon) + ->find(); - if ( $email_check->id ) + if ($email_check->id) { // Add a validation error, this will cause $post->validate() to return FALSE $post->add_error( 'alert_email', 'email_check'); @@ -348,23 +297,115 @@ class Alerts_Controller extends Main_Controller { */ private function _mk_code() { - $max_char_pos = strlen($this->code_chars)-1; + $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; + $max = strlen($chars)-1; + $code_length = 6; $code = NULL; - for($i = 0; $i < self::CODE_LENGTH; $i++) - { - $pos = mt_rand(0, $max_char_pos); - $code.=$this->code_chars[$pos]; + // Generate unique codes only + while(1) + { + for($i = 0; $i < $code_length; $i++) + { + $code.=$chars[mt_rand(0, $max)]; + } + + $code_check = ORM::factory('alert') + ->where('alert_code', $code)->find(); + + if (!$code_check->id) + break; } - // Only generate unique codes. If a code has been used before, generate - // a new one. - $code_check = ORM::factory('alert') - ->where('alert_code', $code)->find(); + return $code; + } - if (!$code_check->id) - return $code; - - $this->_mk_code(); + private function _send_mobile_alert($alert_mobile, $alert_lon, $alert_lat) + { + // Instantiate Validation, use $post, so we don't overwrite + // $_POST fields with our own things + $post = new Validation($_POST); + + $alert_code = $this->_mk_code(); + + $settings = ORM::factory('settings', 1); + + if (!$settings->loaded) + return FALSE; + + // Get SMS Numbers + if (!empty($settings->sms_no3)) + { + $sms_from = $settings->sms_no3; + } + elseif (!empty($settings->sms_no2)) + { + $sms_from = $settings->sms_no2; + } + elseif (!empty($settings->sms_no1)) + { + $sms_from = $settings->sms_no1; + } + else + { + $sms_from = "000";// User needs to set up an SMS number + } + + $sms = new Clickatell(); + $sms->api_id = $settings->clickatell_api; + $sms->user = $settings->clickatell_username; + $sms->password = $settings->clickatell_password; + $sms->use_ssl = false; + $sms->sms(); + $message = "Your alerts confirmation code + is: ".$alert_code." This code is NOT case sensitive"; + + if ($sms->send($alert_mobile, $sms_from, $message) == "OK") + { + $alert = ORM::factory('alert'); + $alert->alert_type = self::MOBILE_ALERT; + $alert->alert_recipient = $alert_mobile; + $alert->alert_code = $alert_code; + $alert->alert_lon = $alert_lon; + $alert->alert_lat = $alert_lat; + $alert->save(); + + return TRUE; + } + + return FALSE; } + + private function _send_email_alert($alert_email, $alert_lon, $alert_lat) + { + // Instantiate Validation, use $post, so we don't overwrite + // $_POST fields with our own things + $post = new Validation($_POST); + + $alert_code = $this->_mk_code(); + + $config = kohana::config('alerts'); + $settings = kohana::config('settings'); + + $to = $alert_email; + $from = $config['alerts_email']; + $subject = $settings['site_name'].' alerts - verification'; + $message = 'Please follow '.url::site().'alerts/verify/'.$alert_code. + ' to confirm your alert request'; + + if (email::send($to, $from, $subject, $message, TRUE) == 1) + { + $alert = ORM::factory('alert'); + $alert->alert_type = self::EMAIL_ALERT; + $alert->alert_recipient = $alert_email; + $alert->alert_code = $alert_code; + $alert->alert_lon = $alert_lon; + $alert->alert_lat = $alert_lat; + $alert->save(); + + return TRUE; + } + + return FALSE; + } } application/controllers/alerts.php @@ -27,137 +27,139 @@ class Api_Controller extends Controller { function switchTask(){ $task = ""; //holds the task to perform as requested $ret = ""; //return value - $request = array(); + $request = array(); $error = array(); - //determine if we are using GET or POST - if($_SERVER['REQUEST_METHOD'] == 'GET'){ - $request =& $_GET; - } else { - $request =& $_POST; - } + //determine if we are using GET or POST + if($_SERVER['REQUEST_METHOD'] == 'GET'){ + $request =& $_GET; + } else { + $request =& $_POST; + } - //make sure we have a task to work with - if(!$this->_verifyArrayIndex($request, 'task')){ - $error = array("error" => $this->_getErrorMsg(001, 'task')); - $task = ""; - } else { - $task = $request['task']; - } + //make sure we have a task to work with + if(!$this->_verifyArrayIndex($request, 'task')){ + $error = array("error" => $this->_getErrorMsg(001, 'task')); + $task = ""; + } else { + $task = $request['task']; + } - //response type - if(!$this->_verifyArrayIndex($request, 'resp')){ - $this->responseType = 'json'; + //response type + if(!$this->_verifyArrayIndex($request, 'resp')){ + $this->responseType = 'json'; } else { - $this->responseType = $request['resp']; - } + $this->responseType = $request['resp']; + } - switch($task){ - case "report": //report/add an incident - $ret = $this->_report(); - break; - - case "tagnews": //tag a news item to an incident - case "tagvideo": //report/add an incident - case "tagphoto": //report/add an incident - $incidentid = ''; + switch($task){ + case "report": //report/add an incident + $ret = $this->_report(); + break; - if(!$this->_verifyArrayIndex($request, 'id')){ - $error = array("error" => $this->_getErrorMsg(001, 'id')); - } else { - break; - $incidentid = $request['id']; - } + case "tagnews": //tag a news item to an incident + case "tagvideo": //report/add an incident + case "tagphoto": //report/add an incident + $incidentid = ''; + if(!$this->_verifyArrayIndex($request, 'id')) { + $error = array("error" => $this->_getErrorMsg(001, 'id')); + break; + } else { + $incidentid = $request['id']; + } - $mediatype = 0; - if($task == "tagnews") - $mediatype = 4; + $mediatype = 0; + + if($task == "tagnews") + $mediatype = 4; - if($task == "tagvideo") - $mediatype = 2; + if($task == "tagvideo") + $mediatype = 2; - if($task == "tagphoto") - $mediatype = 1; + if($task == "tagphoto") + $mediatype = 1; - $ret = $this->_tagMedia($incidentid, $mediatype); + $ret = $this->_tagMedia($incidentid, $mediatype); - break; - case "apikeys": + break; + + case "apikeys": - $by = ''; - if(!$this->_verifyArrayIndex($request, 'by')) { - $error = array("error" => $this->_getErrorMsg(001, 'by')); - break; - }else { - $by = $request['by']; - } + $by = ''; + if(!$this->_verifyArrayIndex($request, 'by')) { + $error = array("error" => $this->_getErrorMsg(001, 'by')); + break; + }else { + $by = $request['by']; + } - switch($by) { + switch($by) { - case "google": - $ret = $this->_apiKey('api_google'); + case "google": + $ret = $this->_apiKey('api_google'); - break; + break; - case "yahoo": - $ret = $this->_apiKey('api_yahoo'); - break; + case "yahoo": + $ret = $this->_apiKey('api_yahoo'); + break; - case "microsoft": - $ret = $this->_apiKey('api_live'); + case "microsoft": + $ret = $this->_apiKey('api_live'); break; - default: - $error = array("error" =>$this->_getErrorMsg(002)); - } - break; + default: + $error = array("error" =>$this->_getErrorMsg(002)); + } + break; - case "categories": //retrieve categories - $ret = $this->_categories(); - break; + case "categories": //retrieve categories + $ret = $this->_categories(); + break; - case "category": //retrieve categories - $id = 0; + case "category": //retrieve categories + $id = 0; - if(!$this->_verifyArrayIndex($request, 'id')){ - $error = array("error" => $this->_getErrorMsg(001, 'id')); - break; - } else { - $id = $request['id']; - } + if(!$this->_verifyArrayIndex($request, 'id')){ + $error = array("error" => $this->_getErrorMsg(001, 'id')); + break; + } else { + $id = $request['id']; + } - $ret = $this->_category($id); - break; + $ret = $this->_category($id); + break; - case "locations": //retrieve locations + case "locations": //retrieve locations $ret = $this->_locations(); - break; + break; - case "location": //retrieve locations - $by = ''; + case "location": //retrieve locations + $by = ''; - if(!$this->_verifyArrayIndex($request, 'by')){ - $error = array("error" => $this->_getErrorMsg(001, 'by')); - break; - } else { - $by = $request['by']; - } + if(!$this->_verifyArrayIndex($request, 'by')){ + $error = array("error" => $this->_getErrorMsg(001, 'by')); + break; + } else { + $by = $request['by']; + } - switch ($by){ - case "latlon": //latitude and longitude + switch ($by){ + case "latlon": //latitude and longitude // - break; - case "locid": //id - if(($this->_verifyArrayIndex($request, 'id'))){ - $ret = $this->_locationById($request['id']); - } else { - $error = array("error" => $this->_getErrorMsg(001, 'id')); - } - break; + break; + case "locid": //id + if(($this->_verifyArrayIndex($request, 'id'))){ + $ret = $this->_locationById($request['id']); + } else { + $error = array("error" => $this->_getErrorMsg(001, 'id')); + } + break; + case "country": //id if(($this->_verifyArrayIndex($request, 'id'))){ $ret = $this->_locationByCountryId($request['id']); @@ -263,12 +265,12 @@ class Api_Controller extends Controller { break; case "latlon": //latitude and longitude - if(($this->_verifyArrayIndex($request, 'latitude')) && ($this->_verifyArrayIndex($request, 'longitude'))){ + if(($this->_verifyArrayIndex($request, 'latitude')) && ($this->_verifyArrayIndex($request, 'longitude'))){ $ret = $this->_incidentsByLatLon($request['latitude'], $request['longitude']); - } else { - $error = array("error" => $this->_getErrorMsg(001, 'latitude or longitude')); - } + } else { + $error = array("error" => $this->_getErrorMsg(001, 'latitude or longitude')); + } break; case "address": //address if(($this->_verifyArrayIndex($request, 'address'))){ @@ -574,203 +576,202 @@ class Api_Controller extends Controller { ); // copy the form as errors, so the errors will be stored with keys corresponding to the form field names $this->messages = $form; - // check, has the form been submitted, if so, setup validation - if ($_POST) { - // Instantiate Validation, use $post, so we don't overwrite $_POST fields with our own things - $post = Validation::factory(array_merge($_POST,$_FILES)); + // check, has the form been submitted, if so, setup validation + if ($_POST) { + // Instantiate Validation, use $post, so we don't overwrite $_POST fields with our own things + $post = Validation::factory(array_merge($_POST,$_FILES)); - // Add some filters - $post->pre_filter('trim', TRUE); + // Add some filters + $post->pre_filter('trim', TRUE); - // Add some rules, the input field, followed by a list of checks, carried out in order - $post->add_rules('incident_title','required', 'length[3,200]'); - $post->add_rules('incident_description','required'); - $post->add_rules('incident_date','required','date_mmddyyyy'); - $post->add_rules('incident_hour','required','between[1,12]'); - //$post->add_rules('incident_minute','required','between[0,59]'); + // Add some rules, the input field, followed by a list of checks, carried out in order + $post->add_rules('incident_title','required', 'length[3,200]'); + $post->add_rules('incident_description','required'); + $post->add_rules('incident_date','required','date_mmddyyyy'); + $post->add_rules('incident_hour','required','between[1,12]'); + //$post->add_rules('incident_minute','required','between[0,59]'); - if($this->_verifyArrayIndex($_POST, 'incident_ampm')){ - if ($_POST['incident_ampm'] != "am" && $_POST['incident_ampm'] != "pm") { - $post->add_error('incident_ampm','values'); - } - } + if($this->_verifyArrayIndex($_POST, 'incident_ampm')) { + if ($_POST['incident_ampm'] != "am" && $_POST['incident_ampm'] != + "pm") { + $post->add_error('incident_ampm','values'); + } + } - $post->add_rules('latitude','required','between[-90,90]'); // Validate for maximum and minimum latitude values - $post->add_rules('longitude','required','between[-180,180]');// Validate for maximum and minimum longitude values - $post->add_rules('location_name','required', 'length[3,200]'); - $post->add_rules('incident_category','required','length[1,100]'); + $post->add_rules('latitude','required','between[-90,90]'); // Validate for maximum and minimum latitude values + $post->add_rules('longitude','required','between[-180,180]');// Validate for maximum and minimum longitude values + $post->add_rules('location_name','required', 'length[3,200]'); + $post->add_rules('incident_category','required','length[1,100]'); - // Validate Personal Information - if (!empty($post->person_first)) - { - $post->add_rules('person_first', 'length[3,100]'); - } + // Validate Personal Information + if (!empty($post->person_first)) { + $post->add_rules('person_first', 'length[3,100]'); + } - if (!empty($post->person_last)) - { - $post->add_rules('person_last', 'length[3,100]'); - } + if (!empty($post->person_last)) { + $post->add_rules('person_last', 'length[3,100]'); + } - if (!empty($post->person_email)) - { - $post->add_rules('person_email', 'email', 'length[3,100]'); - } + if (!empty($post->person_email)) { + $post->add_rules('person_email', 'email', 'length[3,100]'); + } - // Test to see if things passed the rule checks - if ($post->validate()) // - { - // SAVE LOCATION (***IF IT DOES NOT EXIST***) - $location = new Location_Model(); - $location->location_name = $post->location_name; - $location->latitude = $post->latitude; - $location->longitude = $post->longitude; - $location->location_date = date("Y-m-d H:i:s",time()); - $location->save(); + // Test to see if things passed the rule checks + if ($post->validate()) { + // SAVE LOCATION (***IF IT DOES NOT EXIST***) + $location = new Location_Model(); + $location->location_name = $post->location_name; + $location->latitude = $post->latitude; + $location->longitude = $post->longitude; + $location->location_date = date("Y-m-d H:i:s",time()); + $location->save(); - // SAVE INCIDENT - $incident = new Incident_Model(); - $incident->location_id = $location->id; - $incident->user_id = 0; - $incident->incident_title = $post->incident_title; - $incident->incident_description = $post->incident_description; + // SAVE INCIDENT + $incident = new Incident_Model(); + $incident->location_id = $location->id; + $incident->user_id = 0; + $incident->incident_title = $post->incident_title; + $incident->incident_description = $post->incident_description; - $incident_date=split("/",$post->incident_date); - // where the $_POST['date'] is a value posted by form in mm/dd/yyyy format - $incident_date=$incident_date[2]."-".$incident_date[0]."-".$incident_date[1]; + $incident_date=split("/",$post->incident_date); + /** + * where the $_POST['date'] is a value posted by form in + * mm/dd/yyyy format + */ + $incident_date=$incident_date[2]."-".$incident_date[0]."-" + .$incident_date[1]; - $incident_time = $post->incident_hour . ":" . $post->incident_minute . ":00 " . $post->incident_ampm; - $incident->incident_date = $incident_date . " " . $incident_time; - $incident->incident_dateadd = date("Y-m-d H:i:s",time()); - $incident->save(); + $incident_time = $post->incident_hour . ":" . $post->incident_minute . ":00 " . $post->incident_ampm; + $incident->incident_date = $incident_date . " " . $incident_time; + $incident->incident_dateadd = date("Y-m-d H:i:s",time()); + $incident->save(); - // SAVE CATEGORIES - //check if data is csv or a single value. - $pos = strpos($post->incident_category,","); - if( $pos === false ) { - //for backward compactibility. will drop support for it in the future. - if( @unserialize( $post->incident_category) ) { - $categories = unserialize( $post->incident_category); - } else { - $categories = array( $post->incident_category ); - } + // SAVE CATEGORIES + //check if data is csv or a single value. + $pos = strpos($post->incident_category,","); + if( $pos === false ) { + //for backward compactibility. will drop support for it in the future. + if( @unserialize( $post->incident_category) ) { + $categories = unserialize( $post->incident_category); + } else { + $categories = array( $post->incident_category ); + } - } else { - $categories = explode(",",$post->incident_category); - } - if(!empty($categories) && is_array($categories)){ - foreach($categories as $item){ - $incident_category = new Incident_Category_Model(); - $incident_category->incident_id = $incident->id; - $incident_category->category_id = $item; - $incident_category->save(); - } - } + } else { + $categories = explode(",",$post->incident_category); + } + + if(!empty($categories) && is_array($categories)) { + foreach($categories as $item){ + $incident_category = new Incident_Category_Model(); + $incident_category->incident_id = $incident->id; + $incident_category->category_id = $item; + $incident_category->save(); + } + } - // STEP 4: SAVE MEDIA - // a. News - if(!empty( $post->incident_news ) && - is_array($post->incident_news)){ - foreach($post->incident_news as $item) { - if(!empty($item)) - { - $news = new Media_Model(); - $news->location_id = $location->id; - $news->incident_id = $incident->id; - $news->media_type = 4; // News - $news->media_link = $item; - $news->media_date = date("Y-m-d H:i:s",time()); - $news->save(); - } - } - } + // STEP 4: SAVE MEDIA + // a. News + if(!empty( $post->incident_news ) && + is_array($post->incident_news)) { + foreach($post->incident_news as $item) { + if(!empty($item)) { + $news = new Media_Model(); + $news->location_id = $location->id; + $news->incident_id = $incident->id; + $news->media_type = 4; // News + $news->media_link = $item; + $news->media_date = date("Y-m-d H:i:s",time()); + $news->save(); + } + } + } - // b. Video - if( !empty( $post->incident_video) && - is_array( $post->incident_video)){ + // b. Video + if( !empty( $post->incident_video) && + is_array( $post->incident_video)){ - foreach($post->incident_video as $item) - { - if(!empty($item)) - { - $video = new Media_Model(); - $video->location_id = $location->id; - $video->incident_id = $incident->id; - $video->media_type = 2; // Video - $video->media_link = $item; - $video->media_date = date("Y-m-d H:i:s",time()); - $video->save(); - } - } - } + foreach($post->incident_video as $item) { + if(!empty($item)) { + $video = new Media_Model(); + $video->location_id = $location->id; + $video->incident_id = $incident->id; + $video->media_type = 2; // Video + $video->media_link = $item; + $video->media_date = date("Y-m-d H:i:s",time()); + $video->save(); + } + } + } // c. Photos if( !empty($post->incident_photo)){ - $filenames = upload::save('incident_photo'); - $i = 1; - foreach ($filenames as $filename) { - $new_filename = $incident->id . "_" . $i . "_" . time(); + $filenames = upload::save('incident_photo'); + $i = 1; + foreach ($filenames as $filename) { + $new_filename = $incident->id . "_" . $i . "_" . time(); - // Resize original file... make sure its max 408px wide - Image::factory($filename)->resize(408,248,Image::AUTO) - ->save(Kohana::config('upload.directory', TRUE) . $new_filename . ".jpg"); + // Resize original file... make sure its max 408px wide + Image::factory($filename)->resize(408,248,Image::AUTO) + ->save(Kohana::config('upload.directory', TRUE) . + $new_filename . ".jpg"); - // Create thumbnail - Image::factory($filename)->resize(70,41,Image::HEIGHT) - ->save(Kohana::config('upload.directory', TRUE) . $new_filename . "_t.jpg"); + // Create thumbnail + Image::factory($filename)->resize(70,41,Image::HEIGHT) + ->save(Kohana::config('upload.directory', TRUE) . + $new_filename . "_t.jpg"); - // Remove the temporary file - unlink($filename); + // Remove the temporary file + unlink($filename); - // Save to DB - $photo = new Media_Model(); - $photo->location_id = $location->id; - $photo->incident_id = $incident->id; - $photo->media_type = 1; // Images - $photo->media_link = $new_filename . ".jpg"; - $photo->media_thumb = $new_filename . "_t.jpg"; - $photo->media_date = date("Y-m-d H:i:s",time()); - $photo->save(); - $i++; - } + // Save to DB + $photo = new Media_Model(); + $photo->location_id = $location->id; + $photo->incident_id = $incident->id; + $photo->media_type = 1; // Images + $photo->media_link = $new_filename . ".jpg"; + $photo->media_thumb = $new_filename . "_t.jpg"; + $photo->media_date = date("Y-m-d H:i:s",time()); + $photo->save(); + $i++; + } } // SAVE PERSONAL INFORMATION IF ITS FILLED UP if(!empty($post->person_first) || - !empty($post->person_last)){ + !empty($post->person_last)){ - $person = new Incident_Person_Model(); - $person->location_id = $location->id; - $person->incident_id = $incident->id; - $person->person_first = $post->person_first; - $person->person_last = $post->person_last; - $person->person_email = $post->person_email; - $person->person_date = date("Y-m-d H:i:s",time()); - $person->save(); + $person = new Incident_Person_Model(); + $person->location_id = $location->id; + $person->incident_id = $incident->id; + $person->person_first = $post->person_first; + $person->person_last = $post->person_last; + $person->person_email = $post->person_email; + $person->person_date = date("Y-m-d H:i:s",time()); + $person->save(); } return 0; //success - } - - // No! We have validation errors, we need to show the form again, with the errors - else - { - // populate the error fields, if any - $this->messages = arr::overwrite($this->messages, $post->errors('report')); + } + // No! We have validation errors, we need to show the form again, with the errors + else { + // populate the error fields, if any + $this->messages = arr::overwrite($this->messages, + $post->errors('report')); - foreach ($this->messages as $error_item => $error_description) - { - if( !is_array( $error_description ) ) { - $this->error_messages .= $error_description; - if( $error_description != end( $this->messages ) ) { - $this->error_messages .= " - "; - } - } - } + foreach ($this->messages as $error_item => $error_description) { + if( !is_array( $error_description ) ) { + $this->error_messages .= $error_description; + if( $error_description != end( $this->messages ) ) { + $this->error_messages .= " - "; + } + } + } //FAILED!!! return 1; //validation error - } + } } else { @@ -779,10 +780,10 @@ class Api_Controller extends Controller { } - /* - Tag a news item to an incident - */ - function _tagMedia($incidentid, $mediatype){ + /** + * Tag a news item to an incident + */ + function _tagMedia($incidentid, $mediatype) { if ($_POST) // { @@ -807,9 +808,13 @@ class Api_Controller extends Controller { //require a url if(!$this->_verifyArrayIndex($_POST, 'url')){ if($this->responseType == 'json'){ - json_encode(array("error" => $this->_getErrorMsg(001, 'url'))); + json_encode(array("error" => $this->_getErrorMsg(001, + 'url'))); + } else { - $err = array("error" => $this->_getErrorMsg(001, 'url')); + $err = array("error" => $this->_getErrorMsg(001, + 'url')); + return $this->_arrayAsXML($err, array()); } } else { @@ -905,7 +910,9 @@ class Api_Controller extends Controller { $retJsonOrXml = ''; //will hold the json/xml string to return //find incidents - $query = "SELECT id, category_title AS title, category_description AS description, category_color AS color FROM `category` WHERE category_visible = 1 ORDER BY id DESC"; + $query = "SELECT id, category_title AS title, category_description AS + description, category_color AS color FROM `category` WHERE + category_visible = 1 ORDER BY id DESC"; $items = $this->db->query($query); $i = 0; @@ -951,7 +958,9 @@ class Api_Controller extends Controller { $retJsonOrXml = ''; //will hold the json/xml string to return //find incidents - $query = "SELECT id, category_title, category_description, category_color FROM `category` WHERE category_visible = 1 AND id=$id ORDER BY id DESC"; + $query = "SELECT id, category_title, category_description, + category_color FROM `category` WHERE category_visible = 1 + AND id=$id ORDER BY id DESC"; $items = $this->db->query($query); $i = 0; @@ -991,20 +1000,21 @@ class Api_Controller extends Controller { */ function _getLocations($where = '', $limit = ''){ $items = array(); //will hold the items from the query - $data = array(); //items to parse to json - $json_locations = array(); //incidents to parse to json + $data = array(); //items to parse to json + $json_locations = array(); //incidents to parse to json - $retJsonOrXml = ''; //will hold the json/xml string to return + $retJsonOrXml = ''; //will hold the json/xml string to return - //find incidents - $query = "SELECT id, location_name AS name, country_id , latitude, longitude FROM `location` $where $limit "; + //find incidents + $query = "SELECT id, location_name AS name, country_id , latitude, + longitude FROM `location` $where $limit "; - $items = $this->db->query($query); - $i = 0; + $items = $this->db->query($query); + $i = 0; - $replar = array(); //assists in proper xml generation + $replar = array(); //assists in proper xml generation - foreach ($items as $item){ + foreach ($items as $item){ //needs different treatment depending on the output if($this->responseType == 'json'){ $json_locations[] = array("location" => $item); @@ -1013,7 +1023,7 @@ class Api_Controller extends Controller { $replar[] = 'location'.$i; } - $i++; + $i++; } //create the json array @@ -1108,9 +1118,9 @@ class Api_Controller extends Controller { return $this->_getLocations($where, $limit); } - /* - country query abstraction - */ + /** + * country query abstraction + */ function _getCountries($where = '', $limit = ''){ $items = array(); //will hold the items from the query $data = array(); //items to parse to json @@ -1119,7 +1129,8 @@ class Api_Controller extends Controller { $retJsonOrXml = ''; //will hold the json/xml string to return //find incidents - $query = "SELECT id, iso, country as `name`, capital FROM `country` $where $limit"; + $query = "SELECT id, iso, country as `name`, capital + FROM `country` $where $limit"; $items = $this->db->query($query); $i = 0; @@ -1198,15 +1209,15 @@ class Api_Controller extends Controller { */ function _incidentsByAll($orderfield,$sort) { $where = "\nWHERE i.incident_active = 1"; - $sortby = "\nORDER BY i.id DESC"; - $limit = "\nLIMIT 0, $this->list_limit"; - /* Not elegant but works */ - return $this->_getIncidents($where.$sortby, $limit); + $sortby = "\nORDER BY i.id DESC"; + $limit = "\nLIMIT 0, $this->list_limit"; + /* Not elegant but works */ + return $this->_getIncidents($where.$sortby, $limit); } - /* - get incident by id - */ + /** + * get incident by id + */ function _incidentById($id){ $where = "\nWHERE i.id = $id AND i.incident_active = 1 "; $where .= "ORDER BY i.id DESC "; @@ -1214,23 +1225,25 @@ class Api_Controller extends Controller { return $this->_getIncidents($where, $limit); } - /* - get the incidents by latitude and longitude - */ + /** + * get the incidents by latitude and longitude. + * TODO // write necessary codes to achieve this. + */ function _incidentsByLatLon($lat, $long){ } - /* - get the incidents by address - */ + /** + * get the incidents by address. + * TODO // write necessary code to achieve this. + */ function _incidentsByAddress($address){ } - /* - get the incidents by location id - */ + /** + * get the incidents by location id + */ function _incidentsByLocitionId($locid,$orderfield,$sort){ $where = "\nWHERE i.location_id = $locid AND i.incident_active = 1"; $sortby = "\nORDER BY $orderfield $sort"; @@ -1238,19 +1251,20 @@ class Api_Controller extends Controller { return $this->_getIncidents($where.$sortby, $limit); } - /* - get the incidents by location name - */ + /** + * get the incidents by location name + */ function _incidentsByLocationName($locname,$orderfield,$sort){ - $where = "\nWHERE l.location_name = '$locname' AND i.incident_active = 1"; + $where = "\nWHERE l.location_name = '$locname' AND + i.incident_active = 1"; $sortby = "\nORDER BY $orderfield $sort"; $limit = "\nLIMIT 0, $this->list_limit"; return $this->_getIncidents($where.$sortby, $limit); } - /* - get the incidents by category id - */ + /** + * get the incidents by category id + */ function _incidentsByCategoryId($catid,$orderfield,$sort){ $where = "\nWHERE c.id = $catid AND i.incident_active = 1"; $sortby = "\nORDER BY $orderfield $sort"; @@ -1265,39 +1279,40 @@ class Api_Controller extends Controller { // Needs Extra Join $join = "\nINNER JOIN incident_category AS ic ON ic.incident_id = i.id"; $join .= "\nINNER JOIN category AS c ON c.id = ic.category_id"; - $where = $join."\nWHERE c.category_title = '$catname' AND i.incident_active = 1"; + $where = $join."\nWHERE c.category_title = '$catname' AND + i.incident_active = 1"; $sortby = "\nORDER BY $orderfield $sort"; $limit = "\nLIMIT 0, $this->list_limit"; return $this->_getIncidents($where.$sortby, $limit); } - /* - constructor - */ + /** + * constructor + */ function __construct(){ $this->db = new Database; $this->list_limit = '20'; $this->responseType = 'json'; } - /* - starting point - */ + /** + * starting point + */ public function index(){ //switch task $this->switchTask(); } - /* - Creates a JSON response given an array - */ + /** + * Creates a JSON response given an array + */ function _arrayAsJSON($data){ return json_encode($data); } - /* - converts an object to an array - */ + /** + * converts an object to an array + */ function _object2array($object) { if (is_object($object)) { foreach ($object as $key => $value) { @@ -1310,10 +1325,10 @@ class Api_Controller extends Controller { return $array; } - /* - Creates a XML response given an array - CREDIT TO: http://snippets.dzone.com/posts/show/3391 - */ + /** + * Creates a XML response given an array + * CREDIT TO: http://snippets.dzone.com/posts/show/3391 + */ function _write(XMLWriter $xml, $data, $replar = ""){ foreach($data as $key => $value){ if(is_a($value, 'stdClass')){ @@ -1344,20 +1359,20 @@ class Api_Controller extends Controller { } } - /* - Creates a XML response given an array - CREDIT TO: http://snippets.dzone.com/posts/show/3391 - */ + /** + * Creates a XML response given an array + * CREDIT TO: http://snippets.dzone.com/posts/show/3391 + */ function _arrayAsXML($data, $replar = array()){ $xml = new XMLWriter(); - $xml->openMemory(); - $xml->startDocument('1.0', 'UTF-8'); - $xml->startElement('response'); + $xml->openMemory(); + $xml->startDocument('1.0', 'UTF-8'); + $xml->startElement('response'); - $this->_write($xml, $data, $replar); + $this->_write($xml, $data, $replar); - $xml->endElement(); - return $xml->outputMemory(true); + $xml->endElement(); + return $xml->outputMemory(true); } } \ No newline at end of file application/controllers/api.php @@ -13,8 +13,8 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) */ -class Error_Controller extends Controller { - +class Error_Controller extends Controller +{ function __construct() { parent::__construct(); application/controllers/error.php @@ -6,9 +6,9 @@ * LICENSE: This source file is subject to LGPL license * that is available through the world-wide-web at the following URI: * http://www.gnu.org/copyleft/lesser.html - * @author Ushahidi Team <team@ushahidi.com> + * @author Ushahidi Team <team@ushahidi.com> * @package Ushahidi - http://source.ushahididev.com - * @module Feed Controller + * @module Feed Controller * @copyright Ushahidi - http://www.ushahidi.com * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) * @@ -17,33 +17,43 @@ class Feed_Controller extends Controller { function __construct() - { - parent::__construct(); - } + { + parent::__construct(); + } public function index($feedtype = 'rss2') -{ + { if(!Kohana::config('settings.allow_feed')) { throw new Kohana_404_Exception(); } if($feedtype!='atom' AND $feedtype!= 'rss2') { throw new Kohana_404_Exception(); } - $feedpath = $feedtype == 'atom' ? 'feed/atom/' : 'feed/'; - $site_url = "http://" . $_SERVER['SERVER_NAME'] . "/"; - $incidents = ORM::factory('incident')->where('incident_active', '1')->orderby('incident_date', 'desc')->limit(20)->find_all(); + $feedpath = $feedtype == 'atom' ? 'feed/atom/' : 'feed/'; + $site_url = "http://".$_SERVER['SERVER_NAME']."/"; + $incidents = ORM::factory('incident') + ->where('incident_active', '1') + ->orderby('incident_date', 'desc') + ->limit(20)->find_all(); $items = array(); - foreach($incidents as $incident) { + + foreach($incidents as $incident) + { $item = array(); $item['title'] = $incident->incident_title; $item['link'] = $site_url.'reports/view/'.$incident->id; $item['description'] = $incident->incident_description; $item['date'] = $incident->incident_date; - if($incident->location_id != 0 AND $incident->location->longitude AND $incident->location->latitude) - $item['point'] = array($incident->location->latitude,$incident->location->longitude); - $items[] = $item; + + if($incident->location_id != 0 + AND $incident->location->longitude + AND $incident->location->latitude) + { + $item['point'] = array($incident->location->latitude, + $incident->location->longitude); + $items[] = $item; + } } - header("Content-Type: text/xml; charset=utf-8"); $view = new View('feed_'.$feedtype); application/controllers/feed.php @@ -7,9 +7,9 @@ * LICENSE: This source file is subject to LGPL license * that is available through the world-wide-web at the following URI: * http://www.gnu.org/copyleft/lesser.html - * @author Ushahidi Team <team@ushahidi.com> + * @author Ushahidi Team <team@ushahidi.com> * @package Ushahidi - http://source.ushahididev.com - * @module FrontlineSMS Controller + * @module FrontlineSMS Controller * @copyright Ushahidi - http://www.ushahidi.com * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) */ @@ -32,61 +32,65 @@ class Frontlinesms_Controller extends Controller $message_description = $_GET['m']; } - if (!empty($frontlinesms_key) && !empty($message_from) && !empty($message_description)) + if (!empty($frontlinesms_key) + && !empty($message_from) + && !empty($message_description)) { // Is this a valid FrontlineSMS Key? - $keycheck = ORM::factory('settings', 1)->where('frontlinesms_key', $frontlinesms_key)->find(); - if ($keycheck->loaded==true) + $keycheck = ORM::factory('settings', 1) + ->where('frontlinesms_key', $frontlinesms_key) + ->find(); + + if ($keycheck->loaded == TRUE) { $services = new Service_Model(); - $service = $services->where('service_name', 'SMS')->find(); - if (!$service) { - return; - } + $service = $services->where('service_name', 'SMS')->find(); + if (!$service) + return; $reporter_check = ORM::factory('reporter') - ->where('service_id', $service->id) - ->where('service_account', $message_from) - ->find(); + ->where('service_id', $service->id) + ->where('service_account', $message_from) + ->find(); - if ($reporter_check->loaded == true) + if ($reporter_check->loaded == TRUE) { $reporter_id = $reporter_check->id; } else { // get default reporter level (Untrusted) - $levels = new Level_Model(); - $default_level = $levels->where('level_weight', 0)->find(); + $levels = new Level_Model(); + $default_level = $levels->where('level_weight', 0)->find(); - $reporter = new Reporter_Model(); - $reporter->service_id = $service->id; - $reporter->service_userid = null; - $reporter->service_account = $message_from; - $reporter->reporter_level = $default_level; - $reporter->reporter_first = null; - $reporter->reporter_last = null; - $reporter->reporter_email = null; - $reporter->reporter_phone = null; - $reporter->reporter_ip = null; - $reporter->reporter_date = date('Y-m-d'); - $reporter->save(); + $reporter = new Reporter_Model(); + $reporter->service_id = $service->id; + $reporter->service_userid = null; + $reporter->service_account = $message_from; + $reporter->reporter_level = $default_level; + $reporter->reporter_first = null; + $reporter->reporter_last = null; + $reporter->reporter_email = null; + $reporter->reporter_phone = null; + $reporter->reporter_ip = null; + $reporter->reporter_date = date('Y-m-d'); + $reporter->save(); $reporter_id = $reporter->id; } // Save Message - $message = new Message_Model(); - $message->parent_id = 0; - $message->incident_id = 0; - $message->user_id = 0; - $message->reporter_id = $reporter_id; - $message->message_from = $message_from; - $message->message_to = null; - $message->message = $message_description; - $message->message_type = 1; // Inbox - $message->message_date = date("Y-m-d H:i:s",time()); - $message->service_messageid = null; - $message->save(); + $message = new Message_Model(); + $message->parent_id = 0; + $message->incident_id = 0; + $message->user_id = 0; + $message->reporter_id = $reporter_id; + $message->message_from = $message_from; + $message->message_to = null; + $message->message = $message_description; + $message->message_type = 1; // Inbox + $message->message_date = date("Y-m-d H:i:s",time()); + $message->service_messageid = null; + $message->save(); } } } application/controllers/frontlinesms.php @@ -6,163 +6,172 @@ * LICENSE: This source file is subject to LGPL license * that is available through the world-wide-web at the following URI: * http://www.gnu.org/copyleft/lesser.html - * @author Ushahidi Team <team@ushahidi.com> + * @author Ushahidi Team <team@ushahidi.com> * @package Ushahidi - http://source.ushahididev.com - * @module Help Controller + * @module Help Controller * @copyright Ushahidi - http://www.ushahidi.com * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) */ -class Help_Controller extends Main_Controller { - - function __construct() - { - parent::__construct(); +class Help_Controller extends Main_Controller +{ + function __construct() + { + parent::__construct(); // Javascript Header $this->template->header->validator_enabled = TRUE; - } + } - /** - * Displays all Organizations. - */ - public function index() + /** + * Displays all Organizations. + */ + public function index() { $this->template->header->this_page = 'help'; $this->template->content = new View('help'); + $items_per_page = (int) Kohana::config('settings.items_per_page'); // Pagination $pagination = new Pagination(array( - 'query_string' => 'page', - 'items_per_page' => (int) Kohana::config('settings.items_per_page'), - 'total_items' => ORM::factory('organization')->where('organization_active', '1')->count_all() + 'query_string' => 'page', + 'items_per_page' => $items_per_page, + 'total_items' => ORM::factory('organization')->where('organization_active', '1')->count_all() )); $organizations = ORM::factory('organization') - ->where('organization_active', '1') - ->orderby('organization_name', 'asc') - ->find_all((int) Kohana::config('settings.items_per_page'), $pagination->sql_offset); + ->where('organization_active', '1') + ->orderby('organization_name', 'asc') + ->find_all($items_per_page, $pagination->sql_offset); $this->template->content->organizations = $organizations; $this->template->content->pagination = $pagination; - - //Only display stats when there are reports to display - if ($pagination->total_items > 0) - { - $this->template->content->pagination_stats = "(Showing " - . (($pagination->sql_offset/(int) Kohana::config('settings.items_per_page')) + 1) - . " of " . ceil($pagination->total_items/(int) Kohana::config('settings.items_per_page')) . " pages)"; - } - else - { - $this->template->content->pagination_stats = ""; - } + + //Only display stats when there are reports to display + if ($pagination->total_items > 0) + { + $this->template->content->pagination_stats = "(Showing " + .(($pagination->sql_offset/$items_per_page) + 1) + ." of ".ceil($pagination->total_items/$items_per_page) + ." pages)"; + } + else + { + $this->template->content->pagination_stats = ""; + } } /** - * Displays a organization - * @param boolean $id If id is supplied, an organization with that id will be - * retrieved. - */ - public function view( $id = false ) + * Displays a organization + * @param boolean $id If id is supplied, an organization with that id will be + * retrieved. + */ + public function view($id = FALSE) { $this->template->header->this_page = 'help'; $this->template->content = new View('help_view'); - if ( !$id ) - { - url::redirect('main'); - } - else - { - $organization = ORM::factory('organization', $id); + if (!$id) + { + url::redirect('main'); + } + else + { + $organization = ORM::factory('organization', $id); - if ( $organization->loaded == false ) // Not Found - { - url::redirect('main'); - } + if ($organization->loaded == FALSE) // Not Found + { + url::redirect('main'); + } // Comment Post? // setup and initialize form field names $form = array - ( - 'name' => '', - 'email' => '', - 'phone' => '', - 'message' => '', - 'captcha' => '' - ); + ( + 'name' => '', + 'email' => '', + 'phone' => '', + 'message' => '', + 'captcha' => '' + ); $captcha = Captcha::factory(); $errors = $form; $form_error = FALSE; - // check, has the form been submitted, if so, setup validation - if ($_POST) - { - // Instantiate Validation, use $post, so we don't overwrite $_POST fields with our own things + // Check, has the form been submitted, if so, setup validation + if ($_POST) + { + // Instantiate Validation, use $post, so we don't overwrite + // $_POST fields with our own things $post = Validation::factory($_POST); - // Add some filters - $post->pre_filter('trim', TRUE); + // Add some filters + $post->pre_filter('trim', TRUE); - // Add some rules, the input field, followed by a list of checks, carried out in order - $post->add_rules('name','required', 'length[3,100]'); - $post->add_rules('email','required','email', 'length[4,100]'); - $post->add_rules('phone', 'length[3,100]'); - $post->add_rules('message','required'); + // Add some rules, the input field, followed by a list of checks, + // carried out in order + $post->add_rules('name', 'required', 'length[3, 100]'); + $post->add_rules('email', 'required', 'email', 'length[4, 100]'); + $post->add_rules('phone', 'length[3, 100]'); + $post->add_rules('message', 'required'); $post->add_rules('captcha', 'required', 'Captcha::valid'); // Test to see if things passed the rule checks - if ($post->validate()) - { - // Yes! everything is valid - Send Message + if ($post->validate()) + { + // Yes! everything is valid - Send Message if (!empty($organization->organization_email)) { - $to = $organization->organization_email; - $from = $post->email; - $subject = "New Message From " . Kohana::config('settings.site_name'); + $to = $organization->organization_email; + $from = $post->email; + $subject = "New Message From ".Kohana::config('settings.site_name'); $message = ""; - $message.= "Name: " . $post->name . "\n"; - $message.= "Email: " . $post->email . "\n"; - $message.= "Phone: " . $post->phone . "\n\n"; - $message.= "Message:\n" . $post->message . "\n"; + $message.= "Name: ".$post->name."\n"; + $message.= "Email: ".$post->email."\n"; + $message.= "Phone: ".$post->phone."\n\n"; + $message.= "Message:\n".$post->message."\n"; email::send($to, $from, $subject, $message, FALSE); } - // Redirect url::redirect('help/view/' . $id); } - // No! We have validation errors, we need to show the form again, with the errors - else + // No! We have validation errors, we need to show the form again, + // with the errors + else { - // repopulate the form fields - $form = arr::overwrite($form, $post->as_array()); + // repopulate the form fields + $form = arr::overwrite($form, $post->as_array()); - // populate the error fields, if any - $errors = arr::overwrite($errors, $post->errors('message')); + // populate the error fields, if any + $errors = arr::overwrite($errors, $post->errors('message')); $form_error = TRUE; - } + } } - $this->template->content->organization_id = $organization->id; - $this->template->content->organization_name = $organization->organization_name; - $this->template->content->organization_description = nl2br($organization->organization_description); - $this->template->content->organization_website = text::auto_link($organization->organization_website); - $this->template->content->organization_email = $organization->organization_email; - $this->template->content->organization_phone1 = $organization->organization_phone1; - $this->template->content->organization_phone2 = $organization->organization_phone2; + $this->template->content->organization_id = $organization->id; + $this->template->content->organization_name + = $organization->organization_name; + $this->template->content->organization_description + = nl2br($organization->organization_description); + $this->template->content->organization_website + = text::auto_link($organization->organization_website); + $this->template->content->organization_email + = $organization->organization_email; + $this->template->content->organization_phone1 + = $organization->organization_phone1; + $this->template->content->organization_phone2 + = $organization->organization_phone2; // Forms $this->template->content->form = $form; $this->template->content->captcha = $captcha; - $this->template->content->errors = $errors; + $this->template->content->errors = $errors; $this->template->content->form_error = $form_error; // Javascript Header $this->template->header->js = new View('help_view_js'); - } + } } - } application/controllers/help.php @@ -607,6 +607,9 @@ class Reports_Controller extends Main_Controller { // Video links $this->template->content->incident_videos = $incident_video; + //images + $this->template->content->incident_photos = $incident_photo; + // Create object of the video embed class $video_embed = new VideoEmbed(); $this->template->content->videos_embed = $video_embed; application/controllers/reports.php @@ -71,7 +71,7 @@ class Scheduler_Controller extends Controller if (!($scheduler_last > ($cronRan-45)) || $scheduler_last == 0) { // within 45 secs of cronRan time, so Execute control - $site_url = "http://" . $_SERVER['SERVER_NAME'] . "/"; + $site_url = url::base(); $scheduler_status = remote::status( $site_url . "scheduler/" . $scheduler_controller ); // Set last time of last execution application/controllers/scheduler.php @@ -14,10 +14,49 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) */ -class Alert_Model extends ORM +class Alert_Model +extends ORM { - protected $has_many = array('incident' => 'alert_sent'); - - // Database table name - protected $table_name = 'alert'; -} + protected $has_many = array('incident' => 'alert_sent'); + + // Database table name + protected $table_name = 'alert'; + + + /** + * Method that provides the functionality of the magic method, __set, without the overhead + * of having to instantiate a Reflection class to realize it, and provides for object chaining + * + * @param string $column + * @param mixed $value + * @return Alert_Model $this for a fluent interface + */ + public function set ($column, $value) + { // CALL the magic method __set, with the parameters provided + $this->__set($column, $value); + + // RETURN $this for a fluent interface + return $this; + + } // END function set + + + /** + * Method that allows for the use of the set method, en masse + * + * @param array $params + * @return Alert_Model $this for a fluent interface + */ + public function assign (array $params = array()) + { // ITERATE through all of the column/value pairs provided ... + foreach ($params as $column => $value) + { // CALL the set method with the column/value pair + $this->set($column, $value); + } + + // RETURN $this for a fluent interface + return $this; + + } // END function assign + +} // END class Alert_Model application/models/alert.php @@ -15,19 +15,8 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) */ ?> - $(document).ready(function() - { - $(".hide").click(function () { - $("#submitStatus").hide(); - return false; - }); - }); - // Check All / Check None - function CheckAll( id, name ) - { - $("INPUT[@name='" + name + "'][type='checkbox']").attr('checked', $('#' + id).is(':checked')); - } +<?php require SYSPATH.'../application/views/admin/form_utils_js.php' ?> // Ajax Submission function commentAction ( action, confirmAction, comment_id ) @@ -67,14 +56,4 @@ } } - //check if a checkbox has been ticked. - function isChecked( id ) - { - var checked = $("input[@id="+id+"]:checked").length - - if( checked == 0 ) - return false - - else - return true - } \ No newline at end of file + application/views/admin/comments_js.php @@ -90,6 +90,7 @@ <li><a href="<?php echo url::base() ?>admin/comments" <?php if($this_page=="comments") echo "class=\"active\"" ;?>>Comments</a></li> <li><a href="<?php echo url::base() ?>admin/messages" <?php if($this_page=="messages") echo "class=\"active\"" ;?>>Messages</a></li> <?php if ($this->auth->logged_in('admin')){ ?><li><a href="<?php echo url::base() ?>admin/manage" <?php if($this_page=="manage") echo "class=\"active\"" ;?>>Manage</a></li><?php } ?> + <li><a href="<?php echo url::base() ?>admin/feedback" <?php if($this_page=="feedback") echo "class=\"active\"" ;?>>Feedback</a></li> </ul>  <ul class="sub-nav"> application/views/admin/layout.php @@ -33,11 +33,18 @@ ?><li><a href="?type=2" <?php if ($type == '2') echo "class=\"active\""; ?>>Outbox</a></li><?php } ?> + <li><a href="?type=<?php echo $type ?>&period=a" <?php if ($period == 'a') echo "class=\"active\""; ?>>All</a></li> + <li><a href="?type=<?php echo $type ?>&period=d" <?php if ($period == 'd') echo "class=\"active\""; ?>>Yesterday</a></li> + <li><a href="?type=<?php echo $type ?>&period=m" <?php if ($period == 'm') echo "class=\"active\""; ?>>Last Month</a></li> + <li><a href="?type=<?php echo $type ?>&period=y" <?php if ($period == 'y') echo "class=\"active\""; ?>>Last Year</a></li> </ul>  <div class="tab"> <ul> <li><a href="#" onClick="submitIds()">DELETE</a></li> + <?php foreach($levels as $level) { ?> + <li><a href="#" onClick="itemAction('rank', 'Mark As <?php echo $level->level_title?>', '', <?php echo $level->id?>)"><?php echo $level->level_title?></a></li> + <?php } ?> </ul> </div> </div> @@ -64,6 +71,7 @@  <?php print form::open(NULL, array('id' => 'messagesMain', 'name' => 'messagesMain')); ?> <input type="hidden" name="action" id="action" value=""> + <input type="hidden" name="level" id="level" value=""> <div class="table-holder"> <table class="table"> <thead> @@ -105,7 +113,7 @@ $message_type = $message->message_type; ?> <tr> - <td class="col-1"><input name="message_id[]" id="message_id" value="<?php echo $message_id; ?>" type="checkbox" class="check-box"/></td> + <td class="col-1"><input name="message_id[]" value="<?php echo $message_id; ?>" type="checkbox" class="check-box"/></td> <td class="col-2"> <div class="post"> <p><?php echo $message_description; ?></p> @@ -170,4 +178,4 @@ </table> </div> <?php print form::close(); ?> - </div> \ No newline at end of file + </div> application/views/admin/messages.php @@ -14,6 +14,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) */ +<?php require SYSPATH.'../application/views/admin/form_utils_js.php' ?> function limitChars(textid, limit, infodiv) { @@ -72,5 +73,46 @@ if (confirm("Delete cannot be undone. Are you sure you want to continue?")) $('#messagesMain').submit(); } - + + // Ajax Submission + function itemAction ( action, confirmAction, item_id, level ) + { + var statusMessage; + if( !isChecked( "message" ) && item_id=='' ) + { + alert('Please select at least one report.'); + } else { + var answer = confirm('Are You Sure You Want To ' + confirmAction + ' items?') + if (answer){ + // Set Submit Type + $("#action").attr("value", action); + + if (item_id != '') + { + // Submit Form For Single Item + $("#item_single").attr("value", item_id); + $("#messagesMain").submit(); + } + else + { + // Set Hidden form item to 000 so that it doesn't return server side error for blank value + $("#item_single").attr("value", "000"); + $("#level").attr("value", level); + // Submit Form For Multiple Items + $('#messagesMain').submit(); +/* + $("input[name='incident_id[]'][checked]").each( + function() + { + $("#messageMain").submit(); + } + ); +*/ + } + + } else { + return false; + } + } + } application/views/admin/messages_js.php @@ -13,21 +13,9 @@ * @copyright Ushahidi - http://www.ushahidi.com * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) */ - - $(document).ready(function() - { - $(".hide").click(function () { - $("#submitStatus").hide(); - return false; - }); - }); - - // Check All / Check None - function CheckAll( id, name ) - { - $("INPUT[name='" + name + "'][type='checkbox']").attr('checked', $('#' + id).is(':checked')); - } - + +<?php require SYSPATH.'../application/views/admin/form_utils_js.php' ?> + // Ajax Submission function reportAction ( action, confirmAction, incident_id ) { @@ -66,14 +54,4 @@ } } - //check if a checkbox has been ticked. - function isChecked( id ) - { - var checked = $("input[id="+id+"]:checked").length - - if( checked == 0 ) - return false - - else - return true - } + application/views/admin/reports_js.php @@ -20,7 +20,6 @@ <div class="report-form"> <?php if ($form_error) { - print_r($errors); ?>  <div class="red-box"> application/views/admin/settings.php @@ -68,10 +68,9 @@ <p> FrontlineSMS is free open source software that turns a laptop and a mobile phone into a central communications hub. Once installed, the program enables users to send and receive text messages with large groups of people through mobile phones. Click on the grey box to request a download from FrontlineSMS.com. </p> - <a href="http://www.frontlinesms.com/download/" target="_blank" class="no_border"> + <a href="http://www.frontlinesms.com/download/" class="no_border"> <img src="<?php echo url::base() ?>media/img/admin/download_frontline_engine.gif" /> </a> - </td> </tr> <tr> application/views/admin/sms.php @@ -21,43 +21,50 @@ <div class="big-block-bottom"> <h1>Get Alerts</h1>  - <?php - if ($errno == ER_CODE_NOT_FOUND) - { - echo "<div class=\"red-box\">"; - echo "<div class=\"alert_response\">"; - echo Kohana::lang('alerts.code_not_found'); - echo "</div>"; - - echo "<div class=\"alert_confirm\">"; - - print form::open('/alerts/verify'); - print form::input('alert_code', ''); - print "  "; - print form::submit('button', 'Confirm', ' class="btn_blue"'); - print form::close(); - echo "</div>"; - echo "</div>"; - } - elseif ($errno == ER_CODE_ALREADY_VERIFIED) - { - echo "<div class=\"red-box\">"; - echo "<div class=\"alert_response\" align=\"center\">"; - echo Kohana::lang('alerts.code_already_verified'); - echo "</div>"; - echo "</div>"; - } - - elseif ($errno == ER_CODE_VERIFIED) - { - echo "<div class=\"green-box\">"; - echo "<div class=\"alert_response\" align=\"center\">"; - echo Kohana::lang('alerts.code_verified'); - echo "</div>"; - echo "</div>"; - } - - ?> +<?php + // SWITCH based on the value of the $errno + switch ($errno) : + + // IF the code provided was not found ... + case Alert_Model::ER_CODE_NOT_FOUND: +?> + <div class="red-box"> + <div class="alert_response"> + <?php echo Kohana::lang('alerts.code_not_found'); ?> + </div> + <div class="alert_confirm"> + <?php echo form::open('/alerts/verify'); ?> + <?php echo form::input('alert_code', ''); ?> + <?php echo form::submit('button', 'Confirm', ' class="btn_blue"'); ?> + <?php echo form::close(); ?> + </div> + </div> +<?php + break; + + // IF the code provided means the alert has already been verified ... + case Alert_Model::ER_CODE_ALREADY_VERIFIED +?> + <div class="red-box"> + <div class="alert_response" align="center"> + <?php echo Kohana::lang('alerts.code_already_verified'); ?> + </div> + </div> +<?php + // IF the code provided means the code is now verified ... + case Alert_Model::ER_CODE_VERIFIED; +?> + <div class="green-box"> + <div class="alert_response" align="center"> + <?php echo Kohana::lang('alerts.code_verified'); ?> + </div> + </div> +<?php + break; + + // END the conditional regarding the status of the $errno passed to the view + endswitch; +?> </div> </div> </div> application/views/alerts_verify.php @@ -50,7 +50,7 @@ </form> </div> <div id="graph" class="graph-holder"></div> - <a href="#"><div class="btn-more" onclick="gTimeline.resetPlay().play()">(Re-)Play</div></a> + <a href="#"><div class="btn-more" id="playTimeline">(Re-)Play</div></a> </div> <div class="category"> <strong class="title">CATEGORY FILTER</strong> application/views/main.php @@ -18,7 +18,7 @@ // Map JS jQuery(function() { var map_layer; - var markers; + markers = null; var catID = ''; /* @@ -78,13 +78,14 @@ map.addControl(new OpenLayers.Control.PanZoomBar()); map.addControl(new OpenLayers.Control.MousePosition()); map.addControl(new OpenLayers.Control.LayerSwitcher()); + gMap = map; // Create the markers layer function addMarkers(catID,startDate,endDate, currZoom, currCenter, mediaType){ - + // Set Feature Styles - var style = new OpenLayers.Style({ + style = new OpenLayers.Style({ 'externalGraphic': "${icon}", pointRadius: "${radius}", fillColor: "${color}", @@ -124,8 +125,8 @@ color: function(feature) { if ( typeof(feature.cluster) != 'undefined' && - feature.cluster.length < 2 || - (typeof(catID) != 'undefined' && catID.length > 0 && catID != 0)) + (feature.cluster.length < 2 || + (typeof(catID) != 'undefined' && catID.length > 0 && catID != 0))) { return "#" + feature.cluster[0].data.color; } @@ -245,6 +246,8 @@ }; map.setCenter(myPoint, myZoom); } + + gAddMarkers = addMarkers; addMarkers(); function onMapStartLoad(event) { @@ -348,20 +351,21 @@ if (!currentCat || currentCat == '0') { currentCat = 'ALL'; } - $.timeline({categoryId: currentCat, startTime: new Date(startDate * 1000), + gTimeline = $.timeline({categoryId: currentCat, startTime: new Date(startDate * 1000), endTime: new Date(endDate * 1000), mediaType: gMediaType, graphData: allGraphData[0][currentCat], url: "<?php echo url::base() . 'json/timeline/' ?>" - }).plot(); + }); + gTimeline.plot(); } } - }); //.hide(); + }); // Graph var allGraphData = [<?php echo $all_graphs ?>]; var plotPeriod = $.timelinePeriod(allGraphData[0]['ALL'].data); var startTime = $.monthStartTime(plotPeriod[0]) / 1000; - var endTime = $.monthEndTime(plotPeriod[1]) / 1000; + var endTime = $.monthEndDateTime(plotPeriod[1]) / 1000; $("#startDate").val(startTime); $("#endDate").val(endTime); gCategoryId = 'ALL'; @@ -381,11 +385,12 @@ var startTime = new Date($("#startDate").val() * 1000); var endTime = new Date($("#endDate").val() * 1000); - $.timeline({categoryId: catId, startTime: startTime, endTime: endTime, + gTimeline = $.timeline({categoryId: catId, startTime: startTime, endTime: endTime, graphData: graphData, url: "<?php echo url::base() . 'json/timeline/' ?>", mediaType: gMediaType - }).plot(); + }); + gTimeline.plot(); }); } @@ -409,9 +414,14 @@ $('.filter a').attr('class', ''); $(this).addClass('active'); - $.timeline({categoryId: gCategoryId, startTime: startTime, + gTimeline = $.timeline({categoryId: gCategoryId, startTime: startTime, endTime: endTime, mediaType: gMediaType, url: "<?php echo url::base() . 'json/timeline/' ?>" - }).plot(); + }); + gTimeline.plot(); + }); + + $('#playTimeline').click(function() { + gTimeline.resetPlay().play(); }); }); application/views/main_cluster_js.php @@ -239,7 +239,7 @@ allGraphData = [<?php echo $all_graphs ?>]; var plotPeriod = $.timelinePeriod(allGraphData[0]['ALL'].data); var startTime = $.monthStartTime(plotPeriod[0]) / 1000; - var endTime = $.monthEndTime(plotPeriod[1]) / 1000; + var endTime = $.monthEndDateTime(plotPeriod[1]) / 1000; $("#startDate").val(startTime); $("#endDate").val(endTime); gCategoryId = 'ALL'; @@ -295,4 +295,8 @@ }); gTimeline.plot(); }); + + $('#playTimeline').click(function() { + gTimeline.resetPlay().play(); + }); }); application/views/main_js.php @@ -119,6 +119,10 @@ </div>  <div class="blocks-holder"> + <?php + if( count($incident_photos) > 0 ) + { + ?>  <div class="small-block images"> <h3>Images</h3> @@ -131,6 +135,48 @@ </div> </div>  + <?php } else {?> +  + <div class="small-block images"> + <h3>Related Mainstream News of Incident</h3> + <div class="block-bg"> + <div class="block-top"> + <div class="block-bottom"> + <ul> + <li> + <ul class="title"> + <li class="w-01">TITLE</li> + <li class="w-02">SOURCE</li> + <li class="w-03">DATE</li> + </ul> + </li> + <?php + foreach ($feeds as $feed) + { + $feed_id = $feed->id; + $feed_title = text::limit_chars($feed->item_title, 40, '...', True); + $feed_link = $feed->item_link; + $feed_date = date('M j Y', strtotime($feed->item_date)); + $feed_source = text::limit_chars($feed->feed->feed_name, 15, "..."); + ?> + <li> + <ul> + <li class="w-01"> + <a href="<?php echo $feed_link; ?>" target="_blank"> + <?php echo $feed_title ?></a></li> + <li class="w-02"><?php echo $feed_source; ?></li> + <li class="w-03"><?php echo $feed_date; ?></li> + </ul> + </li> + <?php + } + ?> + </ul> + </div> + </div> + </div> + </div> + <?php } ?> <div class="side-block"> <div class="small-block"> <h3>Incident Report(s)</h3> @@ -163,6 +209,10 @@ </div> </div> </div> + <?php + if( $incident_photos <= 0) + { + ?> <div class="small-block"> <h3>Related Mainstream News of Incident</h3> <div class="block-bg"> @@ -203,9 +253,9 @@ </div> </div> </div> + <?php } ?>  </div> - <br />  <?php if( count($incident_videos) > 0 ) @@ -213,6 +263,7 @@ ?> <div class="small-block images"> + <br /> <h3>Videos</h3> <div class="block-bg"> <div class="block-top"> application/views/reports_view.php @@ -14,7 +14,6 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) */ - (function($) { // hide the namespace function Timeline(options) { @@ -38,6 +37,10 @@ this.graphData = []; this.playCount = 0; + this.addMarkers = null; + if (typeof(gAddMarkers) != 'undefined') { + this.addMarkers = gAddMarkers; + } if (options) { if (options.categoryId == '0') { @@ -157,15 +160,24 @@ playTimeline.plot(); gStartTime = new Date(plotData.data[0][0]); gPlayEndDate = playTimeline.graphData[playTimeline.graphData.length-1][0] / 1000; + playTimeline.plotMarkers(style, markers, gPlayEndDate); this.playCount++; gTimeline = this; - gTimelinePlayHandle = window.setTimeout("gTimeline.play(); playTimeline.plotMarkers(style, markers, gPlayEndDate)",1000); + gTimelinePlayHandle = window.setTimeout("gTimeline.play()",2000); return this; }; this.plotMarkers = function(style, markers, endDate) { var startDate = this.startTime.getTime() / 1000; var endDate = endDate || this.endTime.getTime() / 1000; + + // XXX NOTE: Change this for intervals other than monthly if supported + endDate = $.monthEndTime(endDate * 1000) / 1000; + + if (this.addMarkers) { + this.addMarkers(gCategoryId, '', endDate, gMap.getZoom(), gMap.getCenter(), gMediaType); + return this; + } var sliderfilter = new OpenLayers.Rule({ filter: new OpenLayers.Filter.Comparison( @@ -217,26 +229,31 @@ * Returns timestamp of the first day of Month of the given timestamp */ $.monthStartTime = function(timestamp) { - var startTime = new Date(timestamp - - ((new Date(timestamp).getDate()-1) * 24*60*60*1000)).getTime(); - var startDate = new Date(startTime); - return startTime - (startDate.getHours() * 60*60*1000) - - (startDate.getMinutes() * 60*1000) - - (startDate.getSeconds() * 1000); + var startDate = new Date(timestamp); + startDate.setDate(1); + startDate.setHours(0); + startDate.setMinutes(0); + startDate.setSeconds(0); + return startDate.getTime(); }; /* * Returns timestamp of the last day of month of the given timestamp */ + $.monthEndDateTime = function(timestamp) { + endDate = new Date(timestamp); + endDate.setDate($.monthDays(endDate.getYear(), endDate.getMonth())); + endDate.setHours(0); + endDate.setMinutes(0); + endDate.setSeconds(0); + return endDate.getTime(); + }; + + /* + * Returns timestamp of the last second in the month of given timestamp + */ $.monthEndTime = function(timestamp) { - var givenDate = new Date(timestamp); - var endTime = timestamp + - (($.monthDays(givenDate.getYear(), givenDate.getMonth()) - - new Date(timestamp).getDate()) * 24*60*60*1000); - var endDate = new Date(endTime); - return endTime - (endDate.getHours() * 60*60*1000) - - (endDate.getMinutes() * 60*1000) - - (endDate.getSeconds() * 1000); + return $.monthEndDateTime(timestamp) + (59*1000)+(59*60*1000)+(23*60*60*1000); }; })(jQuery); media/js/timeline.js @@ -654,6 +654,7 @@ CREATE TABLE IF NOT EXISTS `message` `message_detail` text default NULL, `message_type` TINYINT default 1 COMMENT '1 - INBOX, 2 - OUTBOX (From Admin)', `message_date` DATETIME default NULL, +`message_level` TINYINT NULL DEFAULT 0, PRIMARY KEY (`id`) ); sql/ushahidi.sql @@ -13,4 +13,4 @@ $lang = array E_USER_WARNING => array( 1, 'Warning Message', ''), E_STRICT => array( 2, 'Strict Mode Error', ''), E_NOTICE => array( 2, 'Runtime Message', ''), -); \ No newline at end of file +); system/i18n/en_US/errors.php 2d8c076357df6670889cf735194c63d0cdfe794a David Kobia david@ushahidi.com http://github.com/ushahidi/Ushahidi_Web/commit/f57b0e14e820680417a51ad3503f37166bfcd33e f57b0e14e820680417a51ad3503f37166bfcd33e

2009-07-10T04:58:45-07:00

* Fixed Merge Conflict 091d8d9c404fd2b0ca133557aaa74bb217e905fd David Kobia david@ushahidi.com