Merge lp:~chamindra/sahana-agasti/sahana-relief-0.1 into lp:~sahana-relief-team/sahana-agasti/trunk

[chamindra]

[chamindra (chamindra)]

1) Modified code to work functionally with the messaging module in windows
2) Implemented a new user-friendly SMS protocol for entering map points

e.g. map N35.26272 W120.27373 hospital 30 patients to be evacuated

Response:

Map point hospital confirmed

3) Implemented confirmation notification of map point and other data
4) Updated the SMS help messaging
5) Automatic assignment of feature class and associated icon on situation map based on SMS message
6) Implemented the sharing of KML feeds between Sahana and mods when the KML does not have .kml extension
7) Updated the backend to support the protocol sent by the android application

A few more tweaks are needed on the above to complete

[Ajay Kumar (ajuonline)]

review: Approve

[Ajay Kumar (ajuonline)]

review: Needs Resubmitting

[Gavin Treadgold (gt)]

From a domain (not code perspective) - very keen to have this merge approved. Very useful functionality.

AJ - why did you suggest a resubmit?

review: Approve

[Ajay Kumar (ajuonline)]

Earlier Approve/Resubmit was done in error :)
OK for merge.

review: Approve

[chamindra (chamindra)]

review: Approve

=== modified file 'inc/lib_gis/plugins/openlayers/openlayers_fns.php' (properties changed: -x to +x)
--- inc/lib_gis/plugins/openlayers/openlayers_fns.php	2009-11-10 23:51:44 +0000
+++ inc/lib_gis/plugins/openlayers/openlayers_fns.php	2009-11-18 18:15:32 +0000
@@ -521,8 +521,12 @@
             if (1==$conf["gis_ol_kml_".$i."_enabled"]) {
                 $name = $conf["gis_ol_kml_".$i."_name"];
                 $url = $conf["gis_ol_kml_".$i."_url"];
-                $file=end(explode('/',$url));
-                $ext=end(explode('.',$url));
+
+                #$file=end(explode('/',$url));
+                # Changed to provide a kml extension by default
+                $file = md5($url).".kml";
+                $ext = "kml"; #end(explode('.',$url));
+
                 $path = $dir."/".$file;
                 $ch = curl_init();
                 curl_setopt($ch, CURLOPT_URL,$url);

=== modified file 'inst/setup_pages.inc'
--- inst/setup_pages.inc	2009-11-10 23:51:44 +0000
+++ inst/setup_pages.inc	2009-11-18 18:15:32 +0000
@@ -65,7 +65,8 @@
 	}
 
 	// Check if php-gettext is loaded
-	$value = (extension_loaded('gettext'));
+	// TODO: Fix this in Portable app
+/*  $value = (extension_loaded('gettext'));
 	$isOK &= $value;
 
 	if ($value) {
@@ -74,7 +75,7 @@
 		shn_form_label(_t('PHP-gettext Library'), $cross_img."is not installed");
 		echo "<p><br/>$oops_img Sahana needs PHP-gettext for to support local languages. Please install PHP-gettext and restart the webserver. To find out how to do this for your operating system see <a href=\"http://www.sahana.lk/wiki/doku.php?id=manual:install\">Sahana WIKI</a></p>";
 	}
-
+*/
 	$value = (extension_loaded('mysql'));
 	$isOK &= $value;
 

=== modified file 'inst/setup_validations.inc'
--- inst/setup_validations.inc	2009-11-10 23:51:44 +0000
+++ inst/setup_validations.inc	2009-11-18 18:15:32 +0000
@@ -48,7 +48,7 @@
 	if (!version_compare(phpversion(), '5', '>')) $continue = false;
 	if (!extension_loaded('gd')) $continue = false;
 	if (!extension_loaded('mysql')) $continue = false;
-	if (!extension_loaded('gettext')) $continue = false;
+	// TODO: fix gettext in potable apps // if (!extension_loaded('gettext')) $continue = false;
 	if (!is_writable($global['approot'].'www/tmp')) $continue = false;
 	if (!is_writable($global['approot'].'conf')) $continue = false;
 	return $continue;

=== modified file 'mod/msg/lib_sms_errors.inc' (properties changed: -x to +x)
--- mod/msg/lib_sms_errors.inc	2009-11-10 23:51:44 +0000
+++ mod/msg/lib_sms_errors.inc	2009-11-18 18:15:32 +0000
@@ -1,1 +1,47 @@
-<?php
/**
 *
 * This is a SMS error handler, you can create and manage a SMS error message container
 * and send the errors via SMS to users accessing Sahana through SMS.
 * Developers should note the fact that, error message length should preferably be less than 160 characters
 * which is the standard SMS length. Text greater than 160 characters should also be supported but should
 * ideally be avoided. Make sure you dont print/echo any message in PHP/HTML as this is supposed to be
 * dealt via an SMS session, so no echoing of messages. Supress all echo strings or use it for debugging only.
 * Echoing any strings will break the SMS message text formation and break the session resulting in user not
 * getting any response to his SMS.
 *
 * PHP version 4 and 5
 *
 * 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
 *
 * @package    moduleAPI
 * @subpackage errors
 * @author     Ajay Kumar <ajuonline at gmail dot com><aj at mindtakers dot com>
 * @copyright  Lanka Software Foundation - http://www.opensource.lk
 * @version    $Id: lib_sms_errors.inc,v 1.3 2008/11/09 10:52:49 ajuonline Exp $
 * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
 */



function _shn_msg_sms_error_code($error_code){

    $error_code_messages = array(

                                '1' => 'Invalid SMS Keyword Sent. Kindly send HELP to get the list of keywords.',

                                '2' => 'Sahana Server Error. Unable to connect to Data base. Please try later or contact Sahana Admin at.',

                                '3' => 'Login Failed : Invalid user name or password.',

                                '4' => 'Login Failed : You have been banned by an administrator of the system.',

                                '5' => 'Login Failed : This account has been locked.  Please contact the Administrator to unlock the account.',

                                '6' => 'Login Failed : Password log attacked.',

                                '7' => 'Login Failed : Account is not active yet. Contact Administrator to activate your account'

                                );

    if(array_key_exists($error_code, $error_code_messages)){

        return $error_code_messages[$error_code];

    }

    else{

        return 0;

    }

}

?>
\ No newline at end of file
+<?php
+/**
+ *
+ * This is a SMS error handler, you can create and manage a SMS error message container
+ * and send the errors via SMS to users accessing Sahana through SMS.
+ * Developers should note the fact that, error message length should preferably be less than 160 characters
+ * which is the standard SMS length. Text greater than 160 characters should also be supported but should
+ * ideally be avoided. Make sure you dont print/echo any message in PHP/HTML as this is supposed to be
+ * dealt via an SMS session, so no echoing of messages. Supress all echo strings or use it for debugging only.
+ * Echoing any strings will break the SMS message text formation and break the session resulting in user not
+ * getting any response to his SMS.
+ *
+ * PHP version 4 and 5
+ *
+ * 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
+ *
+ * @package    moduleAPI
+ * @subpackage errors
+ * @author     Ajay Kumar <ajuonline at gmail dot com><aj at mindtakers dot com>
+ * @copyright  Lanka Software Foundation - http://www.opensource.lk
+ * @version    $Id: lib_sms_errors.inc,v 1.3 2008/11/09 10:52:49 ajuonline Exp $
+ * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
+ */
+function _shn_msg_sms_error_code($error_code){
+
+    $error_code_messages = array(
+
+        '1' => 'Invalid SMS Keyword Sent. Kindly send HELP to get the list of keywords.',
+        'invalid_keyword' => 'Invalid SMS Keyword Sent. Kindly send HELP to get the list of keywords',
+
+        '2' => 'Sahana Server Error. Unable to connect to Data base. Please try later or contact Sahana Admin at.',
+        '3' => 'Login Failed : Invalid user name or password.',
+        '4' => 'Login Failed : You have been banned by an administrator of the system.',
+        '5' => 'Login Failed : This account has been locked.  Please contact the Administrator to unlock the account.',
+        '6' => 'Login Failed : Password log attacked.',
+        '7' => 'Login Failed : Account is not active yet. Contact Administrator to activate your account'
+                                );
+    if(array_key_exists($error_code, $error_code_messages)){
+        return $error_code_messages[$error_code];
+    }
+    else{
+        return 0;
+    }
+}
+?>

=== modified file 'mod/msg/lib_sms_handler.inc' (properties changed: -x to +x)
--- mod/msg/lib_sms_handler.inc	2009-11-10 23:51:44 +0000
+++ mod/msg/lib_sms_handler.inc	2009-11-18 18:15:32 +0000
@@ -1,1 +1,343 @@
-<?php
/**
 *
 * This library helps in parsing and triggering functions based on SMS Input. A vital component of the framework.
 * Developers are required to use this library to facilitate SMS based transactions with the Sahana Core.
 *
 *
 * PHP version 4 and 5
 *
 * 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
 *
 * @package    framework
 * @subpackage messaging
 * @author     Ajay Kumar <ajuonline at gmail dot com><aj at mindtakers dot com>
 * @copyright  Lanka Software Foundation - http://www.opensource.lk
 * @version    $Id: lib_sms_handler.inc,v 1.2 2008/09/15 13:50:13 franboon Exp $
 * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
 *
 */

global $global;
include_once $global['approot']."/mod/msg/lib_sms_errors.inc";
include_once $global['approot']."/mod/msg/lib_sms_keywords.inc";

/**
 * This function will parse the incoming message string sent via GET & POST
 * Currently this function will be used by Kannel and SMSTools
 * It returns the array containing all words/strings, as single array values, sent in the SMS seperated by a SPACE
 * For e.g. For a message string i.e. $message = "login user pass";
 * $parsed_message[0]="login"
 * $parsed_message[1]="user"
 * $parsed_message[2]="pass"
 */

function _shn_msg_parse_short_message($message){

    $parsed_message=array();
    $parsed_message = explode(" ", $message);
    return $parsed_message;
}

/**
 * This function will check the first word of the incoming message string
 * and return the corresponding menu value only.
 * For. e.g. as per our keyword definition file
 */

function _shn_msg_sms_keyword_check($keyword, $sender){

    global $global;
    global $sms_list_keywords;
    if(is_numeric($keyword)){ 
        if(array_key_exists($keyword, $sms_list_keywords)){
            $keyword_check_result = array ('return' => '1', 'type' => 'number');
            //echo " Key word valid and is number";
            return $keyword_check_result;
        }
        else{
            $error_message = _shn_msg_sms_error_code(1);
            include_once $global['approot']."/mod/msg/plugins/"."$plugin_name"."/handler_"."$plugin_name".".inc";
            $recipients = array ($sender);//handler_plugin.inc send sms function accepts array as input for recipients
            shn_msg_plugin_send_sm($recipients, $error_message);
            //shn_msg_store_sent_messages($recipients, $error_message); @todo check the current storage mechanism. smstools_log table
            //echo "<br \>Error SMS: ".$error_message;
            return 0;
        }
    }
    else{
        $bool = array_search($keyword, $sms_list_keywords);
        if(array_search($keyword, $sms_list_keywords)){
            $keyword_check_result = array ('return' => '1', 'type' => 'word');
            //echo " key word is valid and is WORD";
            return $keyword_check_result;
        }
        else{
            $error_message = _shn_msg_sms_error_code(1);
            include_once $global['approot']."/mod/msg/plugins/"."$plugin_name"."/handler_"."$plugin_name".".inc";
            $recipients = array ($sender);//handler_plugin.inc send sms function accepts array as input for recipients
            shn_msg_plugin_send_sm($recipients, $error_message);
            //shn_msg_store_sent_messages($recipients, $error_message); @todo check the current storage mechanism. smstools_log table
            //echo "<br \> Error SMS: ".$error_message;
            return 0;
        }
    }
}

/**
 * This function will check the first word of the incoming message string
 * and return the corresponding menu value only.
 * For. e.g. as per our keyword definition file
 */

function _shn_msg_sms_action($parsed_sms, $sender_phone_number){
   
    global $global;
    if(("help"==$parsed_sms[0]) || ("911"==$parsed_sms[0])){
        _shn_msg_sms_help($parsed_sms, $sender_phone_number);
        } 
        
    elseif(("login"==$parsed_sms[0]) || ("100"==$parsed_sms[0])){
        _shn_msg_sms_login($parsed_sms, $sender_phone_number);
        }
    elseif(("sm"==$parsed_sms[0]) || ("3"==$parsed_sms[0])){
        if("search"==$parsed_sms[1]){
            require_once $global['approot'] . "/inc/lib_gis/gis_fns.inc";
            $keys = array('all' => '1');
            $features = shn_gis_get_features_in_radius($keys, $parsed_sms[2], $parsed_sms[3], $parsed_sms[4]);
            //print_r($features);
            $count = count($features);
            //echo "<br /> $count <br />";
            
            if($count){
                $final_results = array();
                $i = 1;
                $message = "Results Found:\n";
                foreach($features as $a){
            
                
                //$coords = shn_gis_coord_decode($a[f_coords]);
                //print_r($coords); @ returns 2 values for 1 input. needed to check with GIS fns and figure out a way
                array_push($final_results, array("$a[f_name]", "$a[f_description]", "$a[f_coords]", "$a[f_event_date]"));
                $message .= "$i. Name - $a[f_name]\nDescription: $a[f_description]\nGPS Loc: $a[f_coords]\nTimeStamp: $a[f_event_date]\n";
                $i++;
                }
            }
            else{
                $message = "No Situations Found! Please try modifying your search.";
            }
            
            //print_r($final_results);
            
            }
        elseif("add"==$parsed_sms[1]){
                //Valid Input SMS format "sm add <name> <description> <gps_coords>"
                //Sample: "sm add (First Situation) (Description of the first situation) (77,78)"
                //Restructre parsed SMS Text
                
                $full_sms_input_text = implode(" ", $parsed_sms);
                //Re-parsing as per Standard SM ADD format mentioned above
                //$value = "sm add (First Situation) (Description of the first situation) (77,78)";
                if (ereg ("(sm) (add) \((.+)\) \((.+)\) \(([0-9]{2,3}),([0-9]{2,3})\)", $full_sms_input_text, $regs))
                    {
                        //print_r($regs);
                            
                        // Include for the GIS Database API.
                        require_once $global['approot']."/inc/lib_security/lib_sms_auth.inc";
                        print_r($_SESSION);
                        $f_name = $regs[3];
                        $f_description = $regs[4];
                        $f_author = shn_get_user_details($user_data['user_id']);;
                        $f_event_date = date("Y-m-d H:i:s");
                        $marker_x_lat_coordinate = $regs[5];
                        $marker_y_lng_coordinate = $regs[6];
                        require_once $global['approot']."/inc/lib_gis/gis_fns.inc";
                        // Parse the Coordinates to wkt format.
                        $coords_center = array($marker_x_lat_coordinate, $marker_y_lng_coordinate, 0);
                        $coords = array($coords_center, $coords_center);
                        $coordinates = shn_gis_coord_encode($coords, 'point');
  
                        // Register the values that will make the new feature as an array of key => values.
                        $keys_ = array(  
                            'f_type'          =>  'point',
                            'f_projection'    => 'EPSG:900913',
                            'f_coords'        =>  $coordinates,
                            'f_name'          =>  $f_name,
                            'f_description'   =>  $f_description,
                            'f_author'        =>  $f_author,
                            'f_event_date'    =>  $f_event_date,
                        );
                    //    print_r($keys_);
                    // Create the Feature.
                        shn_gis_create_feature($keys_);
                        
                } else {
                    $message = "Invalid Input format for SM Add";
                }

            }    
        else{
        $message = "Invalid Keyword for SM Module sent. Please retry or send HELP SM to get list of valid arguements.";
        }
        include_once $global['approot']."/mod/msg/plugins/"."$plugin_name"."/handler_"."$plugin_name".".inc";
        $recipients = array ($sender_phone_number);//handler_plugin.inc send sms function accepts array as input for recipients
        if($message) shn_msg_plugin_send_sm($recipients, $message);
        //shn_msg_store_sent_messages($recipients, $error_message); @todo check the current storage mechanism. smstools_log table
        //echo "<br \> Error SMS: ".$error_message;
        return 0;    
        }        

    else{
        $error_message = _shn_msg_sms_error_code(1);
        include_once $global['approot']."/mod/msg/plugins/"."$plugin_name"."/handler_"."$plugin_name".".inc";
        $recipients = array ($sender_phone_number);//handler_plugin.inc send sms function accepts array as input for recipients
        shn_msg_plugin_send_sm($recipients, $error_message);
        //shn_msg_store_sent_messages($recipients, $error_message); @todo check the current storage mechanism. smstools_log table
        //echo "<br \> Error SMS: ".$error_message;
        return 0;
        }        
}



/**
* Function calls specific to the keyword sent are listed here. Module writers should write module specific calls 
* modified for the purpose of SMS here.
 * E.g. The function should return values which can later be formatted as plain text. No HTML output should be returned as is the case
 * right now for the Sahana core functions which concentrate on the Web App
  */
 
 
/** Action Building Main Menu ***/

function _shn_msg_sms_menu(){
    
    global $sms_list_keywords;
    $sms_main_menu = "Sahana Main Menu: \nNumeric Code - Word Code\n";
    foreach ($sms_list_keywords as $k => $v) {
        $sms_main_menu .= "[$k] -  $v\n";
    }
    return $sms_main_menu;
}    


/** Action Help - Keyword == help or Numeric Code == 911 **/

function _shn_msg_sms_help($parsed_sms, $sender_phone_number){

    global $global;
    $sms_main_menu = _shn_msg_sms_menu();
    include_once $global['approot']."/mod/msg/plugins/"."$plugin_name"."/handler_"."$plugin_name".".inc";
    $recipients = array ($sender_phone_number);//handler_plugin.inc send sms function accepts array as input for recipients
    shn_msg_plugin_send_sm($recipients, $sms_main_menu);
    //shn_msg_store_sent_messages($recipients, $error_message); @todo check the current storage mechanism. smstools_log table
    //echo "<br \> Error SMS: ".$error_message;
    return 0;    

}   


/** Action Login - Keyword == login or Numeric Code == 100 **/

function _shn_msg_sms_login($parsed_sms, $sender_phone_number){

    global $global;
    require_once $global['approot']."/inc/lib_security/lib_sms_auth.inc";
    $user_data = _shn_authenticate_user($parsed_sms);
    shn_session_change($user_data);
    //print_r($user_data);
    if(!$user_data['error_code']){
    $full_name = shn_get_user_details($user_data['user_id']);
    //echo "<br \>Welcome, <strong>".$full_name."</strong> you are logged in to Sahana System via SMS. yAy!! <br \>";
    $message = "Welcome, ".$full_name." you are logged in to Sahana System via SMS.\n"; 
    $sms_main_menu = _shn_msg_sms_menu();
    $sms_to_send = $message . $sms_main_menu;
    include_once $global['approot']."/mod/msg/plugins/"."$plugin_name"."/handler_"."$plugin_name".".inc";
    $recipients = array ($sender_phone_number);//handler_plugin.inc send sms function accepts array as input for recipients
    shn_msg_plugin_send_sm($recipients, $sms_to_send);
    //shn_msg_store_sent_messages($recipients, $error_message); @todo check the current storage mechanism. smstools_log table
    //echo "<br \> Error SMS: ".$error_message;
    return 0;       
    //print_r($_SESSION);
    $sessid = session_id();
    //echo $sessid;
    }   
    
}

?>
\ No newline at end of file
+<?php
+/**
+ *
+ * This library helps in parsing and triggering functions based on SMS Input. A vital component of the framework.
+ * Developers are required to use this library to facilitate SMS based transactions with the Sahana Core.
+ *
+ *
+ * PHP version 4 and 5
+ *
+ * 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
+ *
+ * @package    framework
+ * @subpackage messaging
+ * @author     Ajay Kumar <ajuonline at gmail dot com><aj at mindtakers dot com>
+ * @copyright  Lanka Software Foundation - http://www.opensource.lk
+ * @version    $Id: lib_sms_handler.inc,v 1.2 2008/09/15 13:50:13 franboon Exp $
+ * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
+ *
+ */
+global $global;
+
+global $sms_list_keywords;
+
+# include_once $global['approot']."/mod/msg/lib_sms_keywords.inc";
+$sms_list_keywords = array(
+    '1' => 'login', 
+    '2' => 'map', 
+    '3' => 'sm', 
+    '100' => 'login', 
+    '911' => 'help'
+);
+
+include_once $global['approot']."/mod/msg/lib_sms_errors.inc";
+include_once $global['approot']."/mod/msg/plugins/"."$plugin_name"."/handler_"."$plugin_name".".inc";
+/**
+ * This function will parse the incoming message string sent via GET & POST
+ * Currently this function will be used by Kannel and SMSTools
+ * It returns the array containing all words/strings, as single array values, sent in the SMS seperated by a SPACE
+ * For e.g. For a message string i.e. $message = "login user pass";
+ * $parsed_message[0]="login"
+ * $parsed_message[1]="user"
+ * $parsed_message[2]="pass"
+ */
+function _shn_msg_parse_short_message($message){
+
+    $parsed_message=array();
+    $parsed_message = explode(" ", $message);
+
+    // convert to lower to handle first letter capitilization
+    $parsed_message[0] = strtolower($parsed_message[0]);
+
+    // DEBUG: parsed message
+    print_r($parsed_message);
+
+    return $parsed_message;
+}
+/**
+ * This function will check the first word of the incoming message string
+ * and return the corresponding menu value only.
+ * For. e.g. as per our keyword definition file
+ */
+function _shn_msg_sms_keyword_check($keyword, $sender){
+
+    global $global;
+    global $sms_list_keywords;
+
+    // check if number entered is a valid keyword
+    if(is_numeric($keyword)){ 
+
+        if(array_key_exists($keyword, $sms_list_keywords)){
+
+            $keyword_check_result = array ('return' => '1', 'type' => 'number');
+            //echo " Key word valid and is number";
+            return $keyword_check_result;
+
+        } else {
+
+            _shn_msg_sms_help("Invalid Number\n", $sender) ;
+            return 0;
+        }
+
+    } else { //check if keyword is a valid one
+
+        $bool = array_search($keyword, $sms_list_keywords);
+        if(array_search($keyword, $sms_list_keywords)){
+            $keyword_check_result = array ('return' => '1', 'type' => 'word');
+            //echo " key word is valid and is WORD";
+            return $keyword_check_result;
+        }
+        else{
+            _shn_msg_sms_help("Invalid Keyword\n", $sender) ;
+            return 0;
+        }
+    }
+}
+/**
+ * This function will check the first word of the incoming message string
+ * and return the corresponding menu value only.
+ * For. e.g. as per our keyword definition file
+ */
+function _shn_msg_sms_action($parsed_sms, $sender_phone_number){
+   
+    global $global;
+
+    $keyword0 = $parsed_sms[0];
+    $keyword1 = strtolower($parsed_sms[1]);
+    $full_sms_input_text = implode(" ", $parsed_sms);
+
+    if (("help"==$keyword0) || ("911"==$keyword0)) {
+
+        _shn_msg_sms_help("", $sender_phone_number);
+    } 
+        
+    elseif (("login"==$keyword0) || ("100"==$keyword0)) {
+
+        _shn_msg_sms_login("", $sender_phone_number);
+
+    }
+
+    elseif ( ("map" == $keyword0) || ("sm" == $keyword0) || ("3" == $keyword0)) {
+
+        if ('help' == $keyword1) {
+
+            $message = "Type the following:\nmap lat long user title. description\nexample:\nmap n35.7153 w120.7640 hospital granada. building evacuated";
+
+        } elseif ("search"==$parsed_sms[1]){
+
+            require_once $global['approot'] . "/inc/lib_gis/gis_fns.inc";
+            $keys = array('all' => '1');
+            $features = shn_gis_get_features_in_radius($keys, $parsed_sms[2], $parsed_sms[3], $parsed_sms[4]);
+            //print_r($features);
+            $count = count($features);
+            //echo "<br /> $count <br />";
+            
+            if($count){
+                $final_results = array();
+                $i = 1;
+                $message = "Results Found:\n";
+                foreach($features as $a){
+            
+                
+                //$coords = shn_gis_coord_decode($a[f_coords]);
+                //print_r($coords); @ returns 2 values for 1 input. needed to check with GIS fns and figure out a way
+                array_push($final_results, array("$a[f_name]", "$a[f_description]", "$a[f_coords]", "$a[f_event_date]"));
+                $message .= "$i. Name - $a[f_name]\nDescription: $a[f_description]\nGPS Loc: $a[f_coords]\nTimeStamp: $a[f_event_date]\n";
+                $i++;
+                }
+            }
+            else{
+                $message = "No Situations Found! Please try modifying your search.";
+            }
+            
+            //print_r($final_results);
+            
+            }
+
+        elseif( "add" == $keyword1 ){
+
+                //Valid Input SMS format "sm add <name> <description> <gps_coords>"
+                #if (ereg ("(sm) (add) \((.+)\) \((.+)\) \(([0-9]{2,3}),([0-9]{2,3})\)", $full_sms_input_text, $regs))
+                if (ereg ("(.+) (add) \((.+):(.+)\) \((.*)\) \(([-+]?([0-9]*\.[0-9]+|[0-9]+)),([-+]?([0-9]*\.[0-9]+|[0-9]+))\)", $full_sms_input_text, $regs))
+                    {
+                        print_r($regs);
+                            
+                        // Include for the GIS Database API.
+                        require_once $global['approot']."/inc/lib_security/lib_sms_auth.inc";
+                        print_r($_SESSION);
+                        $f_name = $regs[4];
+                        $f_description = $regs[5];
+                        $f_author = $regs[3];
+                        #$f_author = shn_get_user_details($user_data['user_id']);;
+                        $f_event_date = date("Y-m-d H:i:s");
+                        $marker_long_coordinate = $regs[6];
+                        $marker_lat_coordinate = $regs[8];
+                        require_once $global['approot']."/inc/lib_gis/gis_fns.inc";
+                        // Parse the Coordinates to wkt format.
+                        $coords_center = array($marker_long_coordinate, $marker_lat_coordinate, 0);
+                        $coords = array($coords_center, $coords_center);
+                        $coordinates = shn_gis_coord_encode($coords, 'point');
+  
+                        // Register the values that will make the new feature as an array of key => values.
+                        $keys_ = array(  
+                            'f_type'          =>  'point',
+                            'f_projection'    => 'EPSG:900913',
+                            'f_coords'        =>  $coordinates,
+                            'f_name'          =>  $f_name,
+                            'f_description'   =>  $f_description,
+                            'f_author'        =>  $f_author,
+                            'f_event_date'    =>  $f_event_date,
+                        );
+                        //print_r($keys_);
+                        // Create the Feature.
+                        shn_gis_create_feature($keys_);
+
+                        $message = "Map point [".$f_name."] added to situation map";
+
+
+                } else {
+                    $message = "Invalid input.\n Use sm add (title) (description) (latitude, longatitude)";
+                }
+
+        } else {
+
+                if (ereg ("(map) ([-+nsNS]?)([0-9]*\.[0-9]+|[0-9]+) ([-+ewEW]?)([0-9]*\.[0-9]+|[0-9]+) ([^ ]+) ([^\.]*)\. ?(.*)", $full_sms_input_text, $regs)) {
+
+                        print_r($regs);
+                        // Include for the GIS Database API.
+                        require_once $global['approot']."/inc/lib_security/lib_sms_auth.inc";
+                        //print_r($_SESSION);
+                        // $f_author = $regs[6];
+                        $f_author = $sender_phone_number;
+                        $f_name = $regs[7];
+                        $f_description = $regs[8];
+                        #$f_author = shn_get_user_details($user_data['user_id']);;
+                        // change the polarity based on NSEW prefix
+                        $f_event_date = date("Y-m-d H:i:s");
+                        $marker_long_coordinate = $regs[3];
+                        if (ereg (strtolower($regs[2]),'s|-')) {
+                           $marker_long_coordinate = -$marker_long_coordinate; 
+                        }
+                        $marker_lat_coordinate = $regs[5];
+                        if (ereg (strtolower($regs[4]),'w|-')) {
+                           $marker_lat_coordinate = -$marker_lat_coordinate; 
+                        }
+
+                        require_once $global['approot']."/inc/lib_gis/gis_fns.inc";
+                        // Parse the Coordinates to wkt format.
+                        $coords_center = array($marker_lat_coordinate, $marker_long_coordinate, 0);
+                        $coords = array($coords_center, $coords_center);
+                        $coordinates = shn_gis_coord_encode($coords, 'point');
+ 
+
+                        // Register the values that will make the new feature as an array of key => values.
+                        $keys_ = array(  
+                            'f_type'          =>  'point',
+                            'f_projection'    => 'EPSG:900913',
+                            'f_coords'        =>  $coordinates,
+                            'f_name'          =>  $f_name,
+                            'f_description'   =>  $f_description,
+                            'f_author'        =>  $f_author,
+                            'f_event_date'    =>  $f_event_date,
+                        );
+
+                        // see if the first keyword can be matched to a class for the marker
+                        $matched_gis_classes = 
+                            $global['db']->Execute("SELECT * FROM `gis_feature_class` WHERE `name` LIKE '".$regs[6]."'"); 
+                        if (null != $matched_gis_classes)
+                            $keys_['f_class'] = $matched_gis_classes->fields('feature_class_uuid');
+
+                        print_r($keys_);
+                        // Create the Feature.
+                        shn_gis_create_feature($keys_);
+
+                        $message = "Map point [".$f_name."] added to situation map";
+                } else {
+
+                    $message = "Type the following:\nmap lat long user title. description\nexample:\nmap n35.7153 w120.7640 hospital granada. building evacuated";
+                }
+        }
+
+        $recipients = array ($sender_phone_number);//handler_plugin.inc send sms function accepts array as input for recipients
+        
+        // if a message is created sent it
+        if($message) shn_msg_plugin_send_sm($recipients, $message);
+        //shn_msg_store_sent_messages($recipients, $error_message); @todo check the current storage mechanism. smstools_log table
+        //echo "<br \> Error SMS: ".$error_message;
+        return 0;    
+
+        }        
+
+    else{
+
+        $error_message = _shn_msg_sms_error_code(1);
+        $recipients = array ($sender_phone_number);//handler_plugin.inc send sms function accepts array as input for recipients
+        shn_msg_plugin_send_sm($recipients, $error_message);
+        //shn_msg_store_sent_messages($recipients, $error_message); @todo check the current storage mechanism. smstools_log table
+        //echo "<br \> Error SMS: ".$error_message;
+        return 0;
+        }        
+}
+/**
+* Function calls specific to the keyword sent are listed here. Module writers should write module specific calls 
+* modified for the purpose of SMS here.
+ * E.g. The function should return values which can later be formatted as plain text. No HTML output should be returned as is the case
+ * right now for the Sahana core functions which concentrate on the Web App
+  */
+ 
+ 
+/** Action Building Main Menu ***/
+function _shn_msg_sms_menu(){
+    
+    global $sms_list_keywords;
+    $sms_main_menu = "Use keywords below:\n";
+#    foreach ($sms_list_keywords as $k => $v) {
+#        $sms_main_menu .= "$k-$v\n";
+#    }
+    $sms_main_menu .= "map - map point\nhelp - general help\n";
+    $sms_main_menu .= "map help - map syntax\n";
+    return $sms_main_menu;
+}    
+
+/** Action Help - Keyword == help or Numeric Code == 911 **/
+function _shn_msg_sms_help($prefix_text, $sender_phone_number){
+
+    global $global;
+
+    $sms_main_menu = _shn_msg_sms_menu();
+    
+    $recipients = array ($sender_phone_number);//handler_plugin.inc send sms function accepts array as input for recipients
+    shn_msg_plugin_send_sm($recipients, $prefix_text.$sms_main_menu);
+    //shn_msg_store_sent_messages($recipients, $error_message); @todo check the current storage mechanism. smstools_log table
+
+    return 0;    
+}   
+
+/** Action Login - Keyword == login or Numeric Code == 100 **/
+function _shn_msg_sms_login($parsed_sms, $sender_phone_number){
+
+    global $global;
+    require_once $global['approot']."/inc/lib_security/lib_sms_auth.inc";
+    $user_data = _shn_authenticate_user($parsed_sms);
+    shn_session_change($user_data);
+    //print_r($user_data);
+    if(!$user_data['error_code']){
+    $full_name = shn_get_user_details($user_data['user_id']);
+    //echo "<br \>Welcome, <strong>".$full_name."</strong> you are logged in to Sahana System via SMS. yAy!! <br \>";
+    $message = "Welcome, ".$full_name." you are logged in to Sahana System via SMS.\n"; 
+    $sms_main_menu = _shn_msg_sms_menu();
+    $sms_to_send = $message . $sms_main_menu;
+    $recipients = array ($sender_phone_number);//handler_plugin.inc send sms function accepts array as input for recipients
+    shn_msg_plugin_send_sm($recipients, $sms_to_send);
+    //shn_msg_store_sent_messages($recipients, $error_message); @todo check the current storage mechanism. smstools_log table
+    //echo "<br \> Error SMS: ".$error_message;
+    return 0;       
+    //print_r($_SESSION);
+    $sessid = session_id();
+    //echo $sessid;
+    }   
+    
+}
+?>

=== modified file 'mod/msg/lib_sms_keywords.inc'
--- mod/msg/lib_sms_keywords.inc	2009-11-10 23:51:44 +0000
+++ mod/msg/lib_sms_keywords.inc	2009-11-18 18:15:32 +0000
@@ -1,5 +1,28 @@
-<?php

-/**
 *
 * This file is a list of valid keywords that the Sahana server will accept through SMS
 * Developers are required to use this file to list keywords and prepare user manuals for it.
 * Any changes or additions to the keywords should go in this file.
 * 
 *
 * PHP version 4 and 5
 *
 * 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
 *
 * @package    framework
 * @subpackage messaging
 * @author     Ajay Kumar <ajuonline at gmail dot com><aj at mindtakers dot com>
 * @copyright  Lanka Software Foundation - http://www.opensource.lk
 * @version    $Id: lib_sms_keywords.inc,v 1.2 2008/09/15 13:50:13 franboon Exp $
 * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
 *
 */

//This needs to be done in a more efficient way. By using the 3 letter module codes from the DB?
-
-
-global $sms_list_keywords;

$sms_list_keywords = array('1' => 'mpr', '2' => 'or', '3' => 'sm', '100' => 'login', '911' => 'help');

?>
\ No newline at end of file
+<?php
+/**
+ *
+ * This file is a list of valid keywords that the Sahana server will accept through SMS
+ * Developers are required to use this file to list keywords and prepare user manuals for it.
+ * Any changes or additions to the keywords should go in this file.
+ * 
+ *
+ * PHP version 4 and 5
+ *
+ * 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
+ *
+ * @package    framework
+ * @subpackage messaging
+ * @author     Ajay Kumar <ajuonline at gmail dot com><aj at mindtakers dot com>
+ * @copyright  Lanka Software Foundation - http://www.opensource.lk
+ * @version    $Id: lib_sms_keywords.inc,v 1.2 2008/09/15 13:50:13 franboon Exp $
+ * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
+ *
+ */
+//This needs to be done in a more efficient way. By using the 3 letter module codes from the DB?
+
+
+global $sms_list_keywords;
+$sms_list_keywords = array('1' => 'mpr', '2' => 'or', '3' => 'sm', '100' => 'login', '911' => 'help');
+?>
\ No newline at end of file

=== modified file 'mod/msg/lib_sms_main.inc'
--- mod/msg/lib_sms_main.inc	2009-11-10 23:51:44 +0000
+++ mod/msg/lib_sms_main.inc	2009-11-18 18:15:32 +0000
@@ -1,3 +1,63 @@
-<?php
/**
 *
* Library functions for implementation independant messaging for SMS
* Main messaging controller functions with modular plugin architecture irrespective of the SMS Gateway application
 *
 *
 * PHP version 4 and 5
 *
 * 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
 *
 * @package    framework
 * @subpackage messaging
 * @author     Ajay Kumar <ajuonline at gmail dot com><aj at mindtakers dot com>
 * @copyright  Lanka Software Foundation - http://www.opensource.lk
 * @version    $Id: lib_sms_main.inc,v 1.2 2008/09/15 13:50:20 franboon Exp $
 * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
 *
 */

global $global;

require_once $global['approot']."/mod/msg/lib_sms_keywords.inc";
require_once $global['approot']."/mod/msg/lib_sms_errors.inc";
require_once $global['approot']."/mod/msg/lib_sms_handler.inc";

-global $sender_phone_number;
global $sms_sent_timestamp;
global $sms_message;

-function shn_msg_push_to_sms_handler($received_message){

    global $global;
    $sender_phone_number = $received_message['sender'];
    $sms_sent_timestamp = $received_message['received'];
    $sms_message = $received_message['message'];
    //echo "<br \>SMS Sent to main SMS Handler. <br \>From: ".$sender_phone_number;
    //shn_msg_sms_authenticate($received_message); add authentication function here
    // if authenticated check keyword
    $parsed_sms = _shn_msg_parse_short_message($sms_message);
    //echo "<br \> SMS Text = ".$sms_message;
    //echo "<br \> Keyword Text = ".$parsed_sms[0];
    //check for valid keyword
    $keyword_check_result = _shn_msg_sms_keyword_check($parsed_sms[0], $sender_phone_number);
    if($keyword_check_result!=0){
        if($keyword_check_result['type'] == 'number'){
            //execute_number_menu_function($parsed_sms);
            //echo "<br \>Key word is Valid and number";
            _shn_msg_sms_action($parsed_sms, $sender_phone_number);
        }
        elseif($keyword_check_result['type'] == 'word'){
            //execute_word_menu_function($parsed_sms);
            //echo "<br \>Key word is Valid and WORD <br \>";
           _shn_msg_sms_action($parsed_sms, $sender_phone_number);
        }
        else{
            //error already sent echo " Keywords is in invalid format";//impossible tho
            exit;
        }
    }
    else{
        //error already sent echo " Keyword does not exists in LIST";
        exit;
    }
}
?>
\ No newline at end of file
+<?php
+/**
+ *
+* Library functions for implementation independant messaging for SMS
+* Main messaging controller functions with modular plugin architecture irrespective of the SMS Gateway application
+ *
+ *
+ * PHP version 4 and 5
+ *
+ * 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
+ *
+ * @package    framework
+ * @subpackage messaging
+ * @author     Ajay Kumar <ajuonline at gmail dot com><aj at mindtakers dot com>
+ * @copyright  Lanka Software Foundation - http://www.opensource.lk
+ * @version    $Id: lib_sms_main.inc,v 1.2 2008/09/15 13:50:20 franboon Exp $
+ * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
+ *
+ */
+global $global;
+require_once $global['approot']."/mod/msg/lib_sms_keywords.inc";
+require_once $global['approot']."/mod/msg/lib_sms_errors.inc";
+require_once $global['approot']."/mod/msg/lib_sms_handler.inc";
+global $sender_phone_number;
+global $sms_sent_timestamp;
+global $sms_message;
+function shn_msg_push_to_sms_handler($received_message){
+    global $global;
+    $sender_phone_number = $received_message['sender'];
+    $sms_sent_timestamp = $received_message['received'];
+    $sms_message = $received_message['message'];
+    //echo "<br \>SMS Sent to main SMS Handler. <br \>From: ".$sender_phone_number;
+    //shn_msg_sms_authenticate($received_message); add authentication function here
+    // if authenticated check keyword
+    $parsed_sms = _shn_msg_parse_short_message($sms_message);
+    //echo "<br \> SMS Text = ".$sms_message;
+    //echo "<br \> Keyword Text = ".$parsed_sms[0];
+    //check for valid keyword
+    $keyword_check_result = _shn_msg_sms_keyword_check($parsed_sms[0], $sender_phone_number);
+    if($keyword_check_result!=0){
+        if($keyword_check_result['type'] == 'number'){
+            //execute_number_menu_function($parsed_sms);
+            //echo "<br \>Key word is Valid and number";
+            _shn_msg_sms_action($parsed_sms, $sender_phone_number);
+        }
+        elseif($keyword_check_result['type'] == 'word'){
+            //execute_word_menu_function($parsed_sms);
+            //echo "<br \>Key word is Valid and WORD <br \>";
+           _shn_msg_sms_action($parsed_sms, $sender_phone_number);
+        }
+        else{
+            //error already sent echo " Keywords is in invalid format";//impossible tho
+            exit;
+        }
+    }
+    else{
+        //error already sent echo " Keyword does not exists in LIST";
+        exit;
+    }
+}
+?>
\ No newline at end of file

=== modified file 'mod/msg/plugins/smstools/handler_smstools.inc' (properties changed: -x to +x)
--- mod/msg/plugins/smstools/handler_smstools.inc	2009-11-10 23:51:44 +0000
+++ mod/msg/plugins/smstools/handler_smstools.inc	2009-11-18 18:15:32 +0000
@@ -29,6 +29,8 @@
 	global $global;
 	global $conf;
 	include_once($global['approot'].'/mod/msg/plugins/smstools/conf.inc');
+
+    echo "Response Message:".$message;
   
     foreach($recipients as $to){
     	//Let system handle tmp directory: change to absolute dir if needed

=== modified file 'mod/msg/plugins/smstools/smsfwd/smsevent' (properties changed: -x to +x)
--- mod/msg/plugins/smstools/smsfwd/smsevent	2009-11-10 23:51:44 +0000
+++ mod/msg/plugins/smstools/smsfwd/smsevent	2009-11-18 18:15:32 +0000
@@ -137,8 +137,8 @@
 echo $RECEIVED;
 
 if [ "$1" == "RECEIVED" ];
-then curl "http://localhost/sahana-phase2/www/index.php?mod=msg&act=receive_message&stream=text&plugin=smstools&From=$FROM&Received=$RECEIVED&message=$URLTEXT";
+then curl "http://localhost/sahana/www/index.php?mod=msg&act=receive_message&stream=text&plugin=smstools&From=$FROM&Received=$RECEIVED&message=$URLTEXT";
 
 echo $'\n\nSMS posting successful from '$FROM' message: '$TEXT $'\n\n';
 fi
-fi
\ No newline at end of file
+fi

=== modified file 'mod/sm/main_fns.inc' (properties changed: -x to +x)
--- mod/sm/main_fns.inc	2009-11-10 23:51:44 +0000
+++ mod/sm/main_fns.inc	2009-11-18 18:15:32 +0000
@@ -59,4 +59,87 @@
     shn_sm_radius_analyse_process();
 }
 
-?>
+function shn_text_sm_kml() {
+
+    global $global;
+    $db = $global['db'];
+    // write the KML content header
+    header("Content-type: application/vnd.google-earth.kml+xml;");
+
+    $layer=$_REQUEST['layer'];
+
+    $query="
+        select coord_y, coord_x,m.name,url,m.description,icon,placement_date
+        from gis_features f 
+        left join gis_feature_class c on 
+                (c.feature_class_uuid=f.feature_class_uuid_ref) 
+        left join gis_feature_class_to_layer cl on 
+                (c.feature_class_uuid=cl.feature_class_uuid_ref)
+        left join gis_layers l on 
+                (cl.layer_uuid_ref=l.layer_uuid)
+        left join gis_feature_metadata m on 
+                (f.metadata_uuid_ref=m.metadata_uuid)
+        ";
+    //--where layer_uuid='$layer'
+    $r = $db->Execute($query);
+#    if (!$rs) {
+#        $message  = 'Invalid query: ' . $query . "\n";
+#        $message .= 'Whole query: ' . $query;
+#        die($message);
+#    }
+//echo "lat	lon	title	description	icon	iconSize	iconOffset\n";
+echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+<Document>
+<flyToView>0</flyToView>
+<? 
+while (!$r->EOF){
+
+    $y=$r->fields['coord_y'];
+    $x=$r->fields['coord_x'];
+    $title=$r->fields['name'];
+    $url = $r->fields['url'];
+    $desc = $r->fields['description'];
+    $icon = $r->fields['icon'];
+    if (strlen($url)>1){
+        if (preg_match('/^http:/',$url)){
+            $url="<br/><a href='".$url."'>Link</a>";
+        } else $url="<br/><a href='/".$url."'>Link</a>";
+    } else $url=$url;
+    $date=date("c",strtotime($r->fields['placement_date']));
+?>
+<Placemark>
+    <name><?=$title?></name>
+    <description><![CDATA[
+ <?=$desc?><?=$url?>]]></description>
+    <Point>
+      <coordinates><?=$x.','.$y?>,0</coordinates>
+    </Point><?if (strlen($icon)>1){?>
+	<Style>
+      <IconStyle>
+        <Icon>
+          <href><?=$icon?></href>
+        </Icon>
+      </IconStyle>
+    </Style><?
+} ?><TimeStamp>
+  <when><?=$date?></when>
+</TimeStamp>
+  </Placemark>
+<?
+//echo join("\t",$r);
+//echo "\n";
+    $r->MoveNext();
+
+    }
+
+?>
+</Document>
+</kml>
+
+<?php 
+} 
+?>
+
+