bianchins / JarvisPHP

Core/JarvisBehaviourLanguage.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
 		}
 	}
 
+	/**
+	 * @param string $sentence
+	 */
 	public function answer($sentence) {
 		foreach(JarvisBehaviourLanguage::$jbl_set->rules as $rule) {
 			foreach($rule->matches as $match) {

Indentation +16 added lines, -16 removed lines

@@ -9,23 +9,23 @@
  */
 class JarvisBehaviourLanguage {
 
-	public static $jbl_set = array();
+    public static $jbl_set = array();
 
-	public function loadBehaviourLanguage() {
-		if(file_exists('language/jbl_'._LANGUAGE.'.jbl')) {
-			JarvisBehaviourLanguage::$jbl_set = json_decode(file_get_contents('language/jbl_'._LANGUAGE.'.jbl'));
-		}
-	}
+    public function loadBehaviourLanguage() {
+        if(file_exists('language/jbl_'._LANGUAGE.'.jbl')) {
+            JarvisBehaviourLanguage::$jbl_set = json_decode(file_get_contents('language/jbl_'._LANGUAGE.'.jbl'));
+        }
+    }
 
-	public function answer($sentence) {
-		foreach(JarvisBehaviourLanguage::$jbl_set->rules as $rule) {
-			foreach($rule->matches as $match) {
-				if(preg_match($match, $sentence)) {
-					return $rule->responses[array_rand($rule->responses)];
-				}
-			}
-		}
-		return false;
-	}
+    public function answer($sentence) {
+        foreach(JarvisBehaviourLanguage::$jbl_set->rules as $rule) {
+            foreach($rule->matches as $match) {
+                if(preg_match($match, $sentence)) {
+                    return $rule->responses[array_rand($rule->responses)];
+                }
+            }
+        }
+        return false;
+    }
 
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -12,15 +12,15 @@
 	public static $jbl_set = array();
 
 	public function loadBehaviourLanguage() {
-		if(file_exists('language/jbl_'._LANGUAGE.'.jbl')) {
+		if (file_exists('language/jbl_'._LANGUAGE.'.jbl')) {
 			JarvisBehaviourLanguage::$jbl_set = json_decode(file_get_contents('language/jbl_'._LANGUAGE.'.jbl'));
 		}
 	}
 
 	public function answer($sentence) {
-		foreach(JarvisBehaviourLanguage::$jbl_set->rules as $rule) {
-			foreach($rule->matches as $match) {
-				if(preg_match($match, $sentence)) {
+		foreach (JarvisBehaviourLanguage::$jbl_set->rules as $rule) {
+			foreach ($rule->matches as $match) {
+				if (preg_match($match, $sentence)) {
 					return $rule->responses[array_rand($rule->responses)];
 				}
 			}

Plugins/Gcalendar_plugin/Gcalendar_plugin.php

Doc Comments +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
     /**
      * Is it the right plugin for the command?
      * @param string $command
-     * @return boolean
+     * @return integer
      */
     function isLikely($command) {
         return preg_match(JarvisLanguage::translate('preg_match_activate_plugin',get_called_class()), $command);
@@ -99,7 +99,7 @@ 
 
     /**
      * Returns an authorized API client.
-     * @return Google_Client the authorized client object
+     * @return null|\Google_Client the authorized client object
      */
     function getClient() {
       $client = new \Google_Client();

Indentation +24 added lines, -24 removed lines

@@ -11,7 +11,7 @@ 
 define('CREDENTIALS_PATH', 'Plugins/Gcalendar_plugin/api-key.json');
 define('CLIENT_SECRET_PATH', 'Plugins/Gcalendar_plugin/secret-client-key.json');
 define('SCOPES', implode(' ', array(
-  \Google_Service_Calendar::CALENDAR_READONLY)
+    \Google_Service_Calendar::CALENDAR_READONLY)
 ));
 define('_MAX_EVENTS', 4);
 
@@ -46,26 +46,26 @@ 
         // Print the next _MAX_EVENTS events on the user's calendar.
         $calendarId = 'primary';
         $optParams = array(
-          'maxResults' => _MAX_EVENTS,
-          'orderBy' => 'startTime',
-          'singleEvents' => TRUE,
-          'timeMin' => date('c'),
+            'maxResults' => _MAX_EVENTS,
+            'orderBy' => 'startTime',
+            'singleEvents' => TRUE,
+            'timeMin' => date('c'),
         );
         $results = $service->events->listEvents($calendarId, $optParams);
 
         if (count($results->getItems()) == 0) {
-          $answer = JarvisLanguage::translate('no_appointments',get_called_class());
+            $answer = JarvisLanguage::translate('no_appointments',get_called_class());
         } else {
           
-          foreach ($results->getItems() as $event) {
+            foreach ($results->getItems() as $event) {
             $start = $event->start->dateTime;
             if (empty($start)) {
-              $start = $event->start->date;
+                $start = $event->start->date;
             }
 
             $date = new \DateTime($start);
             $answer.= sprintf(JarvisLanguage::translate('list_events',get_called_class()), $date->format('j'), JarvisLanguage::translate('month_'.$date->format('n'),get_called_class()), $date->format('H'), $date->format('i'), $event->getSummary())."\n";
-          }
+            }
         }
 
         JarvisTTS::speak($answer);
@@ -102,27 +102,27 @@ 
      * @return Google_Client the authorized client object
      */
     function getClient() {
-      $client = new \Google_Client();
-      $client->setApplicationName(APPLICATION_NAME);
-      $client->setScopes(SCOPES);
-      $client->setAuthConfigFile(CLIENT_SECRET_PATH);
-      $client->setAccessType('offline');
+        $client = new \Google_Client();
+        $client->setApplicationName(APPLICATION_NAME);
+        $client->setScopes(SCOPES);
+        $client->setAuthConfigFile(CLIENT_SECRET_PATH);
+        $client->setAccessType('offline');
 
-      // Load previously authorized credentials from a file.
-      $credentialsPath = CREDENTIALS_PATH;
-      if (file_exists($credentialsPath)) {
+        // Load previously authorized credentials from a file.
+        $credentialsPath = CREDENTIALS_PATH;
+        if (file_exists($credentialsPath)) {
         $accessToken = file_get_contents($credentialsPath);
-      } else {
+        } else {
         return null;
-      }
-      $client->setAccessToken($accessToken);
+        }
+        $client->setAccessToken($accessToken);
 
-      // Refresh the token if it's expired.
-      if ($client->isAccessTokenExpired()) {
+        // Refresh the token if it's expired.
+        if ($client->isAccessTokenExpired()) {
         $client->refreshToken($client->getRefreshToken());
         file_put_contents($credentialsPath, $client->getAccessToken());
-      }
-      return $client;
+        }
+        return $client;
     }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
  * @author Stefano Bianchini
  * @website http://www.stefanobianchini.net
  */
-class Gcalendar_plugin implements \JarvisPHP\Core\JarvisPluginInterface{
+class Gcalendar_plugin implements \JarvisPHP\Core\JarvisPluginInterface {
     /**
      * Priority of plugin
      * @var int  
@@ -39,7 +39,7 @@ 
         // Get the API client and construct the service object.
         $client = Gcalendar_plugin::getClient();
         
-        if($client==null) return null;
+        if ($client == null) return null;
 
         $service = new \Google_Service_Calendar($client);
 
@@ -54,7 +54,7 @@ 
         $results = $service->events->listEvents($calendarId, $optParams);
 
         if (count($results->getItems()) == 0) {
-          $answer = JarvisLanguage::translate('no_appointments',get_called_class());
+          $answer = JarvisLanguage::translate('no_appointments', get_called_class());
         } else {
           
           foreach ($results->getItems() as $event) {
@@ -64,7 +64,7 @@ 
             }
 
             $date = new \DateTime($start);
-            $answer.= sprintf(JarvisLanguage::translate('list_events',get_called_class()), $date->format('j'), JarvisLanguage::translate('month_'.$date->format('n'),get_called_class()), $date->format('H'), $date->format('i'), $event->getSummary())."\n";
+            $answer .= sprintf(JarvisLanguage::translate('list_events', get_called_class()), $date->format('j'), JarvisLanguage::translate('month_'.$date->format('n'), get_called_class()), $date->format('H'), $date->format('i'), $event->getSummary())."\n";
           }
         }
 
@@ -86,7 +86,7 @@ 
      * @return boolean
      */
     function isLikely($command) {
-        return preg_match(JarvisLanguage::translate('preg_match_activate_plugin',get_called_class()), $command);
+        return preg_match(JarvisLanguage::translate('preg_match_activate_plugin', get_called_class()), $command);
     }
     
     /**

Braces +3 added lines, -1 removed lines

@@ -39,7 +39,9 @@
         // Get the API client and construct the service object.
         $client = Gcalendar_plugin::getClient();
         
-        if($client==null) return null;
+        if($client==null) {
+            return null;
+        }
 
         $service = new \Google_Service_Calendar($client);
 

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace JarvisPHP\Plugins\Wemo_plugin;
 
-use JarvisPHP\Core\JarvisSession;
 use JarvisPHP\Core\JarvisPHP;
 use JarvisPHP\Core\JarvisLanguage;
 use JarvisPHP\Core\JarvisTTS;

Plugins/RaspPIVolume_plugin/RaspPIVolume_plugin.php

Unused Use Statements -2 removed lines

@@ -2,10 +2,8 @@
 
 namespace JarvisPHP\Plugins\RaspPIVolume_plugin;
 
-use JarvisPHP\Core\JarvisSession;
 use JarvisPHP\Core\JarvisPHP;
 use JarvisPHP\Core\JarvisLanguage;
-use JarvisPHP\Core\JarvisTTS;
 
 /**
  * RaspberryPI Volume Control Plugin

Spacing +7 added lines, -7 removed lines

@@ -13,7 +13,7 @@ 
  * @website http://www.stefanobianchini.net
  * Bash script from http://www.dronkert.net/rpi/vol.html
  */
-class RaspPIVolume_plugin implements \JarvisPHP\Core\JarvisPluginInterface{
+class RaspPIVolume_plugin implements \JarvisPHP\Core\JarvisPluginInterface {
     /**
      * Priority of plugin
      * @var int  
@@ -27,20 +27,20 @@ 
     function answer($command) {
         $answer = '';
 
-        if(preg_match(JarvisLanguage::translate('preg_match_mute',get_called_class()), $command)) {
+        if (preg_match(JarvisLanguage::translate('preg_match_mute', get_called_class()), $command)) {
             //Mute command
             exec(_JARVISPHP_ROOT_PATH.'/Plugins/RaspPIVolume_plugin/vol.sh 0');
-        } else if(preg_match(JarvisLanguage::translate('preg_match_unmute',get_called_class()), $command)) {
+        } else if (preg_match(JarvisLanguage::translate('preg_match_unmute', get_called_class()), $command)) {
             //Unmute command
             exec(_JARVISPHP_ROOT_PATH.'/Plugins/RaspPIVolume_plugin/vol.sh 65');
-        } else if(preg_match(JarvisLanguage::translate('preg_match_volume_up',get_called_class()), $command)) {
+        } else if (preg_match(JarvisLanguage::translate('preg_match_volume_up', get_called_class()), $command)) {
             //Volume up command
             exec(_JARVISPHP_ROOT_PATH.'/Plugins/RaspPIVolume_plugin/vol.sh +');
-        } else if(preg_match(JarvisLanguage::translate('preg_match_volume_down',get_called_class()), $command)) {
+        } else if (preg_match(JarvisLanguage::translate('preg_match_volume_down', get_called_class()), $command)) {
             //Volume down
             exec(_JARVISPHP_ROOT_PATH.'/Plugins/RaspPIVolume_plugin/vol.sh -');
         }
-        $answer = JarvisLanguage::translate('command_executed',get_called_class());
+        $answer = JarvisLanguage::translate('command_executed', get_called_class());
         $response = new \JarvisPHP\Core\JarvisResponse($answer, JarvisPHP::getRealClassName(get_called_class()), true);
         $response->send();
     }
@@ -58,7 +58,7 @@ 
      * @return boolean
      */
     function isLikely($command) {
-        return preg_match(JarvisLanguage::translate('preg_match_activate_plugin',get_called_class()), $command);
+        return preg_match(JarvisLanguage::translate('preg_match_activate_plugin', get_called_class()), $command);
     }
     
     /**

Doc Comments +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
     /**
      * Is it the right plugin for the command?
      * @param string $command
-     * @return boolean
+     * @return integer
      */
     function isLikely($command) {
         return preg_match(JarvisLanguage::translate('preg_match_activate_plugin',get_called_class()), $command);

Plugins/Wemo_plugin/Wemo_plugin.php

Doc Comments +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
     /**
      * Is it the right plugin for the command?
      * @param string $command
-     * @return boolean
+     * @return integer
      */
     function isLikely($command) {
         return preg_match(JarvisLanguage::translate('preg_match_activate_plugin',get_called_class()), $command);

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace JarvisPHP\Plugins\Wemo_plugin;
 
-use JarvisPHP\Core\JarvisSession;
 use JarvisPHP\Core\JarvisPHP;
 use JarvisPHP\Core\JarvisLanguage;
 use JarvisPHP\Core\JarvisTTS;

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
  * @author Stefano Bianchini
  * @website http://www.stefanobianchini.net
  */
-class Wemo_plugin implements \JarvisPHP\Core\JarvisPluginInterface{
+class Wemo_plugin implements \JarvisPHP\Core\JarvisPluginInterface {
     /**
      * Priority of plugin
      * @var int  
@@ -31,7 +31,7 @@ 
         $_IFTTT_MAKER_EVENT = '';
 
         //Load API key from json config
-        if(file_exists('Plugins/Wemo_plugin/api-key.json')) {
+        if (file_exists('Plugins/Wemo_plugin/api-key.json')) {
             //Create your own api key and put it in api-key.json
             $json_config = json_decode(file_get_contents('Plugins/Wemo_plugin/api-key.json'));
             $_IFTTT_MAKER_KEY = $json_config->ifttt_key;
@@ -60,12 +60,12 @@ 
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); 
         $result = curl_exec($ch);
         
-        if(!$result) {
+        if (!$result) {
             JarvisPHP::getLogger()->error('Curl error: '.curl_error($ch));
-            $answer = JarvisLanguage::translate('command_not_sent',get_called_class());  
+            $answer = JarvisLanguage::translate('command_not_sent', get_called_class());  
         }
         else {
-            $answer = JarvisLanguage::translate('command_sent_to_light_switch',get_called_class());    
+            $answer = JarvisLanguage::translate('command_sent_to_light_switch', get_called_class());    
         }
         
         curl_close($ch);
@@ -89,7 +89,7 @@ 
      * @return boolean
      */
     function isLikely($command) {
-        return preg_match(JarvisLanguage::translate('preg_match_activate_plugin',get_called_class()), $command);
+        return preg_match(JarvisLanguage::translate('preg_match_activate_plugin', get_called_class()), $command);
     }
     
     /**

Braces +1 added lines, -2 removed lines

@@ -63,8 +63,7 @@
         if(!$result) {
             JarvisPHP::getLogger()->error('Curl error: '.curl_error($ch));
             $answer = JarvisLanguage::translate('command_not_sent',get_called_class());  
-        }
-        else {
+        } else {
             $answer = JarvisLanguage::translate('command_sent_to_light_switch',get_called_class());    
         }
         

TelegramBot/GenericCurl.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
  */
 class GenericCurl {
 
+	/**
+	 * @param string $url
+	 */
 	static function exec($url, $fields) {
 
 

Indentation +24 added lines, -24 removed lines

@@ -8,38 +8,38 @@
  */
 class GenericCurl {
 
-	static function exec($url, $fields) {
+    static function exec($url, $fields) {
 
 
-		$fields_string = "";
-		//url-ify the data for the POST
-		if(count($fields)>0) {
-			foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-			rtrim($fields_string, '&');
-		} 
+        $fields_string = "";
+        //url-ify the data for the POST
+        if(count($fields)>0) {
+            foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+            rtrim($fields_string, '&');
+        } 
 		
-		//echo $fields_string;
-		//open connection
-		$ch = curl_init();
+        //echo $fields_string;
+        //open connection
+        $ch = curl_init();
 
-		//set the url, number of POST vars, POST data
-		curl_setopt($ch,CURLOPT_URL, $url);
-		curl_setopt($ch,CURLOPT_POST, count($fields));
-		curl_setopt($ch,CURLOPT_POSTFIELDS, $fields_string);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt ($ch, CURLOPT_COOKIEFILE, "TelegramBot/JarvisPHPSession.cookie");
-		curl_setopt($ch, CURLOPT_COOKIEJAR, "TelegramBot/JarvisPHPSession.cookie"); 
+        //set the url, number of POST vars, POST data
+        curl_setopt($ch,CURLOPT_URL, $url);
+        curl_setopt($ch,CURLOPT_POST, count($fields));
+        curl_setopt($ch,CURLOPT_POSTFIELDS, $fields_string);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt ($ch, CURLOPT_COOKIEFILE, "TelegramBot/JarvisPHPSession.cookie");
+        curl_setopt($ch, CURLOPT_COOKIEJAR, "TelegramBot/JarvisPHPSession.cookie"); 
 
-		//execute post
-		$result = @curl_exec($ch);
+        //execute post
+        $result = @curl_exec($ch);
 
-		$http_response_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $http_response_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 
-		//close connection
-		curl_close($ch);
+        //close connection
+        curl_close($ch);
 
 
 
-		return ($http_response_code==200) ? json_decode($result) : false;
-	}
+        return ($http_response_code==200) ? json_decode($result) : false;
+    }
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -13,8 +13,8 @@ 
 
 		$fields_string = "";
 		//url-ify the data for the POST
-		if(count($fields)>0) {
-			foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+		if (count($fields) > 0) {
+			foreach ($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
 			rtrim($fields_string, '&');
 		} 
 		
@@ -23,11 +23,11 @@ 
 		$ch = curl_init();
 
 		//set the url, number of POST vars, POST data
-		curl_setopt($ch,CURLOPT_URL, $url);
-		curl_setopt($ch,CURLOPT_POST, count($fields));
-		curl_setopt($ch,CURLOPT_POSTFIELDS, $fields_string);
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_POST, count($fields));
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt ($ch, CURLOPT_COOKIEFILE, "TelegramBot/JarvisPHPSession.cookie");
+		curl_setopt($ch, CURLOPT_COOKIEFILE, "TelegramBot/JarvisPHPSession.cookie");
 		curl_setopt($ch, CURLOPT_COOKIEJAR, "TelegramBot/JarvisPHPSession.cookie"); 
 
 		//execute post
@@ -40,6 +40,6 @@ 
 
 
 
-		return ($http_response_code==200) ? json_decode($result) : false;
+		return ($http_response_code == 200) ? json_decode($result) : false;
 	}
 }
\ No newline at end of file

TelegramBot/TelegramBot.php

Doc Comments +6 added lines

@@ -9,6 +9,9 @@ 
  */
 class TelegramBotApiWrapper {
 
+	/**
+	 * @param resource $handle
+	 */
 	function exec_curl_request($handle) {
 	  $response = curl_exec($handle);
 
@@ -45,6 +48,9 @@ 
 	  return $response;
 	}
 
+	/**
+	 * @param string $method
+	 */
 	function apiRequestJson($method, $parameters) {
 	  if (!is_string($method)) {
 	    echo("Method name must be a string\n");

Indentation +60 added lines, -60 removed lines

@@ -9,75 +9,75 @@
  */
 class TelegramBotApiWrapper {
 
-	function exec_curl_request($handle) {
-	  $response = curl_exec($handle);
+    function exec_curl_request($handle) {
+        $response = curl_exec($handle);
 
-	  if ($response === false) {
-	    $errno = curl_errno($handle);
-	    $error = curl_error($handle);
-	    echo("Curl returned error $errno: $error\n");
-	    curl_close($handle);
-	    return false;
-	  }
+        if ($response === false) {
+        $errno = curl_errno($handle);
+        $error = curl_error($handle);
+        echo("Curl returned error $errno: $error\n");
+        curl_close($handle);
+        return false;
+        }
 
-	  $http_code = intval(curl_getinfo($handle, CURLINFO_HTTP_CODE));
-	  curl_close($handle);
+        $http_code = intval(curl_getinfo($handle, CURLINFO_HTTP_CODE));
+        curl_close($handle);
 
-	  if ($http_code >= 500) {
-	    // do not want to DDOS server if something goes wrong
-	    sleep(10);
-	    return false;
-	  } else if ($http_code != 200) {
-	    $response = json_decode($response, false);
-	    echo("Request has failed with error ".$response->error_code." : ".$response->description."\n");
-	    if ($http_code == 401) {
-	      throw new Exception('Invalid access token provided');
-	    }
-	    return false;
-	  } else {
-	    $response = json_decode($response, false);
-	    if (isset($response->description)) {
-	      echo("Request was successfull: ".$response->description."\n");
-	    }
-	    $response = $response->result;
-	  }
+        if ($http_code >= 500) {
+        // do not want to DDOS server if something goes wrong
+        sleep(10);
+        return false;
+        } else if ($http_code != 200) {
+        $response = json_decode($response, false);
+        echo("Request has failed with error ".$response->error_code." : ".$response->description."\n");
+        if ($http_code == 401) {
+            throw new Exception('Invalid access token provided');
+        }
+        return false;
+        } else {
+        $response = json_decode($response, false);
+        if (isset($response->description)) {
+            echo("Request was successfull: ".$response->description."\n");
+        }
+        $response = $response->result;
+        }
 
-	  return $response;
-	}
+        return $response;
+    }
 
-	function apiRequestJson($method, $parameters) {
-	  if (!is_string($method)) {
-	    echo("Method name must be a string\n");
-	    return false;
-	  }
+    function apiRequestJson($method, $parameters) {
+        if (!is_string($method)) {
+        echo("Method name must be a string\n");
+        return false;
+        }
 
-	  if (!$parameters) {
-	    $parameters = array();
-	  } else if (!is_array($parameters)) {
-	    error_log("Parameters must be an array\n");
-	    return false;
-	  }
+        if (!$parameters) {
+        $parameters = array();
+        } else if (!is_array($parameters)) {
+        error_log("Parameters must be an array\n");
+        return false;
+        }
 
-	  $parameters["method"] = $method;
+        $parameters["method"] = $method;
 
-	  $_BOT_TOKEN = '';
-	  //Load API key from json config
-      if(file_exists('TelegramBot/api-key.json')) {
-          //Create your own bot token and put it in api-key.json
-          // like {"bot_token": "<your-bot-token>"}
-          $json_config = json_decode(file_get_contents('TelegramBot/api-key.json'));
-          $_BOT_TOKEN = $json_config->bot_token;
-      }
+        $_BOT_TOKEN = '';
+        //Load API key from json config
+        if(file_exists('TelegramBot/api-key.json')) {
+            //Create your own bot token and put it in api-key.json
+            // like {"bot_token": "<your-bot-token>"}
+            $json_config = json_decode(file_get_contents('TelegramBot/api-key.json'));
+            $_BOT_TOKEN = $json_config->bot_token;
+        }
 
-	  $handle = curl_init('https://api.telegram.org/bot'.$_BOT_TOKEN.'/');
-	  curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
-	  curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
-	  curl_setopt($handle, CURLOPT_TIMEOUT, 60);
-	  curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, false);
-	  curl_setopt($handle, CURLOPT_POSTFIELDS, json_encode($parameters));
-	  curl_setopt($handle, CURLOPT_HTTPHEADER, array("Content-Type: application/json"));
+        $handle = curl_init('https://api.telegram.org/bot'.$_BOT_TOKEN.'/');
+        curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
+        curl_setopt($handle, CURLOPT_TIMEOUT, 60);
+        curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($handle, CURLOPT_POSTFIELDS, json_encode($parameters));
+        curl_setopt($handle, CURLOPT_HTTPHEADER, array("Content-Type: application/json"));
 
-	  return $this->exec_curl_request($handle);
-	}
+        return $this->exec_curl_request($handle);
+    }
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 
 	  $_BOT_TOKEN = '';
 	  //Load API key from json config
-      if(file_exists('TelegramBot/api-key.json')) {
+      if (file_exists('TelegramBot/api-key.json')) {
           //Create your own bot token and put it in api-key.json
           // like {"bot_token": "<your-bot-token>"}
           $json_config = json_decode(file_get_contents('TelegramBot/api-key.json'));

TelegramBot/JarvisPHPTelegramBot.php

Spacing +19 added lines, -19 removed lines

@@ -5,7 +5,7 @@ 
 use JarvisPHP\TelegramBot\GenericCurl;
 
 //Very important!
-define('_JARVISPHP_URL','http://localhost:8000');
+define('_JARVISPHP_URL', 'http://localhost:8000');
 
 /**
  * A TelegramBot for JarvisPHP
@@ -23,14 +23,14 @@ 
 		echo "JarvisPHP Telegram Bot started at ".date('Y-m-d H:i:s')."\n";
 		echo "-----------------------------------------------------\n";
 
-		while(true) {
+		while (true) {
 
 			$updates = $bot->apiRequestJson("getUpdates", array('offset'=>$offset));
 			
-			if($updates) {
-				foreach($updates as $update) {
+			if ($updates) {
+				foreach ($updates as $update) {
 
-					if(isset($update->message->text)) {
+					if (isset($update->message->text)) {
 
 						//TODO check if $update->message->chat->id is in enabled list
 
@@ -40,28 +40,28 @@ 
 
 						$message = $update->message->text;
 
-						$offset = $update->update_id + 1;
+						$offset = $update->update_id+1;
 
 						$response = '';
 
 						//Understand if the message is a telegram command (begins with "/")
-						if(preg_match('$^/(.+)$', $message)) {
+						if (preg_match('$^/(.+)$', $message)) {
 							
 							//Telegram command
-							switch($message) {
-								case '/start': $response='I am JarvisPHP, a private bot. \u1F510'; break;
-								case '/info': $response='I am JarvisPHP, a private bot. \u1F510'; break;
+							switch ($message) {
+								case '/start': $response = 'I am JarvisPHP, a private bot. \u1F510'; break;
+								case '/info': $response = 'I am JarvisPHP, a private bot. \u1F510'; break;
 								case '/register': 
-												$response='Ok, i registered your ID in registerIdLog.log'; 
-												file_put_contents('TelegramBot/registerIdLog.log', '['.date('Y-m-d H:i:s').'] ID:'.$update->message->from->id . '; FIRSTNAME:'. $update->message->from->first_name . '; LASTNAME:'. $update->message->from->last_name. '; USERNAME:'. $update->message->from->username.PHP_EOL , FILE_APPEND | LOCK_EX);
+												$response = 'Ok, i registered your ID in registerIdLog.log'; 
+												file_put_contents('TelegramBot/registerIdLog.log', '['.date('Y-m-d H:i:s').'] ID:'.$update->message->from->id.'; FIRSTNAME:'.$update->message->from->first_name.'; LASTNAME:'.$update->message->from->last_name.'; USERNAME:'.$update->message->from->username.PHP_EOL, FILE_APPEND | LOCK_EX);
 												break;	
-								case '/say': $response='Use /say "sentence" (without quotes) to make JarvisPHP speak a sentence.'; break;	
+								case '/say': $response = 'Use /say "sentence" (without quotes) to make JarvisPHP speak a sentence.'; break;	
 							}
 
 							//"Say" Telegram command
-							if(preg_match('$^/say (.+)$', $message, $matches)) {
-								if($matches) {
-									if(in_array($update->message->chat->id, $allowedClientIdList)) {
+							if (preg_match('$^/say (.+)$', $message, $matches)) {
+								if ($matches) {
+									if (in_array($update->message->chat->id, $allowedClientIdList)) {
 										//Redirect message to JarvisPhp
 										$JarvisResponse = GenericCurl::exec(_JARVISPHP_URL.'/answer', array('sentence'=>$matches[0]));
 
@@ -73,12 +73,12 @@ 
 							}
 
 							//Encode emoji
-							$response = preg_replace_callback('/\\\\u([0-9a-fA-F]+)/', function ($match) {
+							$response = preg_replace_callback('/\\\\u([0-9a-fA-F]+)/', function($match) {
 							    return iconv('UCS-4LE', 'UTF-8', pack('V', hexdec($match[1])));
 							}, $response);
 
 						} else {
-							if(in_array($update->message->chat->id, $allowedClientIdList)) {
+							if (in_array($update->message->chat->id, $allowedClientIdList)) {
 								//Redirect message to JarvisPhp
 								$JarvisResponse = GenericCurl::exec(_JARVISPHP_URL.'/answer', array('command'=>$message, 'tts' => 'None_tts'));
 
@@ -88,7 +88,7 @@ 
 							}
 
 						}
-						if($response) {
+						if ($response) {
 							$bot->apiRequestJson("sendMessage", array('chat_id' => $update->message->chat->id, "text" => $response));
 						}
 					}

Indentation +68 added lines, -68 removed lines

@@ -14,87 +14,87 @@
  */
 class JarvisPHPTelegramBot {
 	
-	public static function run($allowedClientIdList) {
+    public static function run($allowedClientIdList) {
 
-		$bot = new TelegramBotApiWrapper();
+        $bot = new TelegramBotApiWrapper();
 
-		$offset = 0;
+        $offset = 0;
 
-		echo "JarvisPHP Telegram Bot started at ".date('Y-m-d H:i:s')."\n";
-		echo "-----------------------------------------------------\n";
+        echo "JarvisPHP Telegram Bot started at ".date('Y-m-d H:i:s')."\n";
+        echo "-----------------------------------------------------\n";
 
-		while(true) {
+        while(true) {
 
-			$updates = $bot->apiRequestJson("getUpdates", array('offset'=>$offset));
+            $updates = $bot->apiRequestJson("getUpdates", array('offset'=>$offset));
 			
-			if($updates) {
-				foreach($updates as $update) {
+            if($updates) {
+                foreach($updates as $update) {
 
-					if(isset($update->message->text)) {
+                    if(isset($update->message->text)) {
 
-						//TODO check if $update->message->chat->id is in enabled list
+                        //TODO check if $update->message->chat->id is in enabled list
 
-						$bot->apiRequestJson("sendChatAction", array('chat_id' => $update->message->chat->id, 'action' => 'typing'));
+                        $bot->apiRequestJson("sendChatAction", array('chat_id' => $update->message->chat->id, 'action' => 'typing'));
 
-						echo "Processing message ->".$update->message->text."\n";
+                        echo "Processing message ->".$update->message->text."\n";
 
-						$message = $update->message->text;
+                        $message = $update->message->text;
 
-						$offset = $update->update_id + 1;
+                        $offset = $update->update_id + 1;
 
-						$response = '';
+                        $response = '';
 
-						//Understand if the message is a telegram command (begins with "/")
-						if(preg_match('$^/(.+)$', $message)) {
+                        //Understand if the message is a telegram command (begins with "/")
+                        if(preg_match('$^/(.+)$', $message)) {
 							
-							//Telegram command
-							switch($message) {
-								case '/start': $response='I am JarvisPHP, a private bot. \u1F510'; break;
-								case '/info': $response='I am JarvisPHP, a private bot. \u1F510'; break;
-								case '/register': 
-												$response='Ok, i registered your ID in registerIdLog.log'; 
-												file_put_contents('TelegramBot/registerIdLog.log', '['.date('Y-m-d H:i:s').'] ID:'.$update->message->from->id . '; FIRSTNAME:'. $update->message->from->first_name . '; LASTNAME:'. $update->message->from->last_name. '; USERNAME:'. $update->message->from->username.PHP_EOL , FILE_APPEND | LOCK_EX);
-												break;	
-								case '/say': $response='Use /say "sentence" (without quotes) to make JarvisPHP speak a sentence.'; break;	
-							}
-
-							//"Say" Telegram command
-							if(preg_match('$^/say (.+)$', $message, $matches)) {
-								if($matches) {
-									if(in_array($update->message->chat->id, $allowedClientIdList)) {
-										//Redirect message to JarvisPhp
-										$JarvisResponse = GenericCurl::exec(_JARVISPHP_URL.'/say', array('sentence'=>$matches[1]));
-
-										$response = $JarvisResponse->answer;
-									} else {
-										$response = 'You are not allowed to speak with me.';
-									}
-								}
-							}
-
-							//Encode emoji
-							$response = preg_replace_callback('/\\\\u([0-9a-fA-F]+)/', function ($match) {
-							    return iconv('UCS-4LE', 'UTF-8', pack('V', hexdec($match[1])));
-							}, $response);
-
-						} else {
-							if(in_array($update->message->chat->id, $allowedClientIdList)) {
-								//Redirect message to JarvisPhp
-								$JarvisResponse = GenericCurl::exec(_JARVISPHP_URL.'/answer', array('command'=>$message, 'tts' => 'None_tts'));
-
-								$response = $JarvisResponse->answer;
-							} else {
-								$response = 'You are not allowed to speak with me.';
-							}
-
-						}
-						if($response) {
-							$bot->apiRequestJson("sendMessage", array('chat_id' => $update->message->chat->id, "text" => $response));
-						}
-					}
-				}
-			}
-			sleep(1);
-		}
-	}
+                            //Telegram command
+                            switch($message) {
+                                case '/start': $response='I am JarvisPHP, a private bot. \u1F510'; break;
+                                case '/info': $response='I am JarvisPHP, a private bot. \u1F510'; break;
+                                case '/register': 
+                                                $response='Ok, i registered your ID in registerIdLog.log'; 
+                                                file_put_contents('TelegramBot/registerIdLog.log', '['.date('Y-m-d H:i:s').'] ID:'.$update->message->from->id . '; FIRSTNAME:'. $update->message->from->first_name . '; LASTNAME:'. $update->message->from->last_name. '; USERNAME:'. $update->message->from->username.PHP_EOL , FILE_APPEND | LOCK_EX);
+                                                break;	
+                                case '/say': $response='Use /say "sentence" (without quotes) to make JarvisPHP speak a sentence.'; break;	
+                            }
+
+                            //"Say" Telegram command
+                            if(preg_match('$^/say (.+)$', $message, $matches)) {
+                                if($matches) {
+                                    if(in_array($update->message->chat->id, $allowedClientIdList)) {
+                                        //Redirect message to JarvisPhp
+                                        $JarvisResponse = GenericCurl::exec(_JARVISPHP_URL.'/say', array('sentence'=>$matches[1]));
+
+                                        $response = $JarvisResponse->answer;
+                                    } else {
+                                        $response = 'You are not allowed to speak with me.';
+                                    }
+                                }
+                            }
+
+                            //Encode emoji
+                            $response = preg_replace_callback('/\\\\u([0-9a-fA-F]+)/', function ($match) {
+                                return iconv('UCS-4LE', 'UTF-8', pack('V', hexdec($match[1])));
+                            }, $response);
+
+                        } else {
+                            if(in_array($update->message->chat->id, $allowedClientIdList)) {
+                                //Redirect message to JarvisPhp
+                                $JarvisResponse = GenericCurl::exec(_JARVISPHP_URL.'/answer', array('command'=>$message, 'tts' => 'None_tts'));
+
+                                $response = $JarvisResponse->answer;
+                            } else {
+                                $response = 'You are not allowed to speak with me.';
+                            }
+
+                        }
+                        if($response) {
+                            $bot->apiRequestJson("sendMessage", array('chat_id' => $update->message->chat->id, "text" => $response));
+                        }
+                    }
+                }
+            }
+            sleep(1);
+        }
+    }
 }
\ No newline at end of file

config/Espeak_config.php

Spacing +2 added lines, -2 removed lines

@@ -5,10 +5,10 @@
  * m1, m2, ... m8 male voices
  * f1, f2, f3, f4 female voices
  */
-define('_ESPEAK_VOICE','m2');
+define('_ESPEAK_VOICE', 'm2');
 
 //Language of text-to-speech
 define('_ESPEAK_LANGUAGE', _LANGUAGE);
 
 //Amplitude (espeak -a <amplitude>)
-define('_ESPEAK_AMPLITUDE','100');
\ No newline at end of file
+define('_ESPEAK_AMPLITUDE', '100');
\ No newline at end of file

config/Jarvis.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
  */
 
 //Set locale
-define('_LANGUAGE','en');
+define('_LANGUAGE', 'en');
 
 //Command session timeout, in seconds
 define('_COMMAND_SESSION_TIMEOUT', 30);
@@ -13,4 +13,4 @@ 
 define('_JARVIS_TTS', 'None_tts');
 
 //Define system's name
-define('_SYSTEM_NAME','JarvisPhp');
\ No newline at end of file
+define('_SYSTEM_NAME', 'JarvisPhp');
\ No newline at end of file