bianchins / JarvisPHP

Core/JarvisPHP.php

Indentation +11 added lines, -11 removed lines

@@ -125,16 +125,16 @@ 
             $choosen_plugin = null;
             //Cycling plugins
             foreach(JarvisPHP::$active_plugins as $plugin_class) {
-               $plugin = new $plugin_class();
-               //Load plugin's languages
-               JarvisLanguage::loadPluginTranslation($plugin_class);
-               if($plugin->isLikely($command)) {
-                   JarvisPHP::getLogger()->debug('Maybe '.JarvisPHP::getRealClassName($plugin_class).', check priority');
-                   if($plugin->getPriority() > $max_priority_found) {
-                       $max_priority_found = $plugin->getPriority();
-                       $choosen_plugin = $plugin;
-                   }
-               }
+                $plugin = new $plugin_class();
+                //Load plugin's languages
+                JarvisLanguage::loadPluginTranslation($plugin_class);
+                if($plugin->isLikely($command)) {
+                    JarvisPHP::getLogger()->debug('Maybe '.JarvisPHP::getRealClassName($plugin_class).', check priority');
+                    if($plugin->getPriority() > $max_priority_found) {
+                        $max_priority_found = $plugin->getPriority();
+                        $choosen_plugin = $plugin;
+                    }
+                }
             }
             if(!is_null($choosen_plugin)) {
                 JarvisPHP::getLogger()->debug('Choosen plugin: '.JarvisPHP::getRealClassName(get_class($choosen_plugin)));
@@ -188,7 +188,7 @@ 
     }
     
     public static function getNameSpace($fullClassName) {
-       //Explode class name
+        //Explode class name
         $classNameArray = explode('\\',$fullClassName);
         //Remove the pure class name
         array_pop($classNameArray);

Spacing +19 added lines, -19 removed lines

@@ -26,7 +26,7 @@ 
             $pureClassName = JarvisPHP::getRealClassName($className);
             //Build the path
             $namespace = JarvisPHP::getNameSpace($className);
-            if(file_exists($namespace.'/'.$pureClassName.'.php')) {
+            if (file_exists($namespace.'/'.$pureClassName.'.php')) {
                 include_once($namespace.'/'.$pureClassName.'.php');
             }
         });
@@ -47,10 +47,10 @@ 
         JarvisPHP::$slim = new \Slim\Slim(array('debug' => false));
                 
         //POST /answer route
-        JarvisPHP::$slim->post('/answer/', function () {
+        JarvisPHP::$slim->post('/answer/', function() {
             //Detect if the request forces a TTS
             $ttsFromPostRequest = JarvisPHP::$slim->request->post('tts');
-            if(!empty($ttsFromPostRequest) && file_exists('Speakers\\'.JarvisPHP::$slim->request->post('tts').'.php')) {
+            if (!empty($ttsFromPostRequest) && file_exists('Speakers\\'.JarvisPHP::$slim->request->post('tts').'.php')) {
                 $forcedTTS = JarvisPHP::$slim->request->post('tts');
             } else {
                 $forcedTTS = _JARVIS_TTS;
@@ -59,12 +59,12 @@ 
         });
 
         //POST /answer route
-        JarvisPHP::$slim->post('/say/', function () {         
+        JarvisPHP::$slim->post('/say/', function() {         
             JarvisPHP::say(mb_strtolower(preg_replace("/\s+/", " ", JarvisPHP::$slim->request->post('sentence')), 'UTF-8'));
         });
 
         //Slim Framework Custom Error handler
-        JarvisPHP::$slim->error(function (\Exception $e) {
+        JarvisPHP::$slim->error(function(\Exception $e) {
             JarvisPHP::getLogger()->error('Code: '.$e->getCode().' - '.$e->getMessage().' in '.$e->getFile().' on line '.$e->getLine().'');
         });
         
@@ -104,13 +104,13 @@ 
         JarvisPHP::$TTS_name = $forcedTTS;
 
         //Jarvis tries to understand if the magic words that stop the session were pronounced
-        if(preg_match(JarvisLanguage::translate('preg_match_magic_words_to_stop_session'),$command)) {
+        if (preg_match(JarvisLanguage::translate('preg_match_magic_words_to_stop_session'), $command)) {
             JarvisSession::terminate();
         }
 
         //Verify if there is an active plugin and the command session timeout
-        if(JarvisSession::sessionInProgress() && (time() < (JarvisSession::get('last_command_timestamp')+_COMMAND_SESSION_TIMEOUT))) {
-            JarvisPHP::getLogger()->debug('Detected active session: '.JarvisSession::getActivePlugin() . ' - last command '.JarvisSession::get('last_command_timestamp').', now is '.time());
+        if (JarvisSession::sessionInProgress() && (time() < (JarvisSession::get('last_command_timestamp')+_COMMAND_SESSION_TIMEOUT))) {
+            JarvisPHP::getLogger()->debug('Detected active session: '.JarvisSession::getActivePlugin().' - last command '.JarvisSession::get('last_command_timestamp').', now is '.time());
             $plugin_class = JarvisSession::getActivePlugin();
             //Load plugin's languages
             JarvisLanguage::loadPluginTranslation($plugin_class);
@@ -121,29 +121,29 @@ 
             //Clear all session variable
             JarvisSession::reset();
             JarvisPHP::getLogger()->debug('Active session not detected or expired');
-            $max_priority_found=-9999;
+            $max_priority_found = -9999;
             $choosen_plugin = null;
             //Cycling plugins
-            foreach(JarvisPHP::$active_plugins as $plugin_class) {
+            foreach (JarvisPHP::$active_plugins as $plugin_class) {
                $plugin = new $plugin_class();
                //Load plugin's languages
                JarvisLanguage::loadPluginTranslation($plugin_class);
-               if($plugin->isLikely($command)) {
+               if ($plugin->isLikely($command)) {
                    JarvisPHP::getLogger()->debug('Maybe '.JarvisPHP::getRealClassName($plugin_class).', check priority');
-                   if($plugin->getPriority() > $max_priority_found) {
+                   if ($plugin->getPriority() > $max_priority_found) {
                        $max_priority_found = $plugin->getPriority();
                        $choosen_plugin = $plugin;
                    }
                }
             }
-            if(!is_null($choosen_plugin)) {
+            if (!is_null($choosen_plugin)) {
                 JarvisPHP::getLogger()->debug('Choosen plugin: '.JarvisPHP::getRealClassName(get_class($choosen_plugin)));
-                if($choosen_plugin->hasSession()) {
+                if ($choosen_plugin->hasSession()) {
                     JarvisSession::setActivePlugin(get_class($choosen_plugin));
                 }
                 $choosen_plugin->answer($command);
             } else {
-                if(preg_match(JarvisLanguage::translate('preg_match_magic_words_to_stop_session'),$command)) {
+                if (preg_match(JarvisLanguage::translate('preg_match_magic_words_to_stop_session'), $command)) {
                     JarvisTTS::speak(JarvisLanguage::translate('response_to_magic_words_to_stop_session'));
                     $response = new \JarvisPHP\Core\JarvisResponse(JarvisLanguage::translate('response_to_magic_words_to_stop_session'));
                     $response->send();
@@ -151,14 +151,14 @@ 
                 else {
                     JarvisBehaviourLanguage::loadBehaviourLanguage();
                     $answer = JarvisBehaviourLanguage::answer($command);
-                    if($answer) {
+                    if ($answer) {
                         $response = new \JarvisPHP\Core\JarvisResponse($answer, 'none', true);
                         JarvisTTS::speak($answer);
                     } else {
                         JarvisPHP::getLogger()->debug('No plugin found for command: '.$command);
                         JarvisTTS::speak(JarvisLanguage::translate('core_command_not_understand'));
                         //Log the command
-                        file_put_contents('notUnderstandCommands.log', '['.date('Y-m-d H:i:s').'] Command:'.$command. PHP_EOL , FILE_APPEND | LOCK_EX);
+                        file_put_contents('notUnderstandCommands.log', '['.date('Y-m-d H:i:s').'] Command:'.$command.PHP_EOL, FILE_APPEND | LOCK_EX);
                         $response = new \JarvisPHP\Core\JarvisResponse(JarvisLanguage::translate('core_command_not_understand'));
                     }
                     $response->send();
@@ -182,14 +182,14 @@ 
 
     public static function getRealClassName($fullClassName) {
         //Explode class name
-        $classNameArray = explode('\\',$fullClassName);
+        $classNameArray = explode('\\', $fullClassName);
         //Obtain the pure class name
         return end($classNameArray);
     }
     
     public static function getNameSpace($fullClassName) {
        //Explode class name
-        $classNameArray = explode('\\',$fullClassName);
+        $classNameArray = explode('\\', $fullClassName);
         //Remove the pure class name
         array_pop($classNameArray);
         //Remove the JarvisPHP main namespace

Braces +2 added lines, -4 removed lines

@@ -116,8 +116,7 @@ 
             JarvisLanguage::loadPluginTranslation($plugin_class);
             $plugin = new $plugin_class();
             $plugin->answer($command);
-        }
-        else {
+        } else {
             //Clear all session variable
             JarvisSession::reset();
             JarvisPHP::getLogger()->debug('Active session not detected or expired');
@@ -147,8 +146,7 @@ 
                     JarvisTTS::speak(JarvisLanguage::translate('response_to_magic_words_to_stop_session'));
                     $response = new \JarvisPHP\Core\JarvisResponse(JarvisLanguage::translate('response_to_magic_words_to_stop_session'));
                     $response->send();
-                }
-                else {
+                } else {
                     JarvisBehaviourLanguage::loadBehaviourLanguage();
                     $answer = JarvisBehaviourLanguage::answer($command);
                     if($answer) {

Core/JarvisResponse.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     private $answer = '';
     private $choosen_plugin = 'none';
     
-    public function __construct($answer, $choosen_plugin='none', $success=false) {
+    public function __construct($answer, $choosen_plugin = 'none', $success = false) {
         $this->answer = $answer;
         $this->choosen_plugin = $choosen_plugin;
         $this->success = $success;

Speakers/Google_tts.php

Indentation +13 added lines, -13 removed lines

@@ -12,23 +12,23 @@
     
     public static function speak($sentence) {
 
-    	//Do not request a new mp3 if it exists in cache folder
-    	if(!file_exists(_JARVISPHP_ROOT_PATH.'/Speakers/cache/'.md5($sentence).'.mp3')) {
-			$curl = curl_init();
+        //Do not request a new mp3 if it exists in cache folder
+        if(!file_exists(_JARVISPHP_ROOT_PATH.'/Speakers/cache/'.md5($sentence).'.mp3')) {
+            $curl = curl_init();
 			
-			curl_setopt_array($curl, array(
-			    CURLOPT_RETURNTRANSFER => 1,
-			    CURLOPT_URL => 'http://translate.google.com/translate_tts?ie=UTF-8&client=t&tl='._LANGUAGE.'&q='.urlencode($sentence),
-			    CURLOPT_USERAGENT => 'stagefright/1.2 (Linux;Android 5.0)',
-			    CURLOPT_REFERER => 'http://translate.google.com/'
-			));
+            curl_setopt_array($curl, array(
+                CURLOPT_RETURNTRANSFER => 1,
+                CURLOPT_URL => 'http://translate.google.com/translate_tts?ie=UTF-8&client=t&tl='._LANGUAGE.'&q='.urlencode($sentence),
+                CURLOPT_USERAGENT => 'stagefright/1.2 (Linux;Android 5.0)',
+                CURLOPT_REFERER => 'http://translate.google.com/'
+            ));
 
-			$resp = curl_exec($curl);
+            $resp = curl_exec($curl);
 
-			curl_close($curl);
+            curl_close($curl);
 
-	        file_put_contents(_JARVISPHP_ROOT_PATH.'/Speakers/cache/'.md5($sentence).'.mp3', $resp);
-    	}
+            file_put_contents(_JARVISPHP_ROOT_PATH.'/Speakers/cache/'.md5($sentence).'.mp3', $resp);
+        }
 
         exec('aplay '._JARVISPHP_ROOT_PATH.'/Speakers/cache/'.md5($sentence).'.mp3');
     }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     public static function speak($sentence) {
 
     	//Do not request a new mp3 if it exists in cache folder
-    	if(!file_exists(_JARVISPHP_ROOT_PATH.'/Speakers/cache/'.md5($sentence).'.mp3')) {
+    	if (!file_exists(_JARVISPHP_ROOT_PATH.'/Speakers/cache/'.md5($sentence).'.mp3')) {
 			$curl = curl_init();
 			
 			curl_setopt_array($curl, array(

JarvisPHPBot.php

Indentation +2 added lines, -2 removed lines

@@ -14,6 +14,6 @@
 }
 
 if($json_config) {
-	//Let's start the bot
-	JarvisPHPTelegramBot::run($json_config->allowedClientIdList);
+    //Let's start the bot
+    JarvisPHPTelegramBot::run($json_config->allowedClientIdList);
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -9,11 +9,11 @@
 use JarvisPHP\TelegramBot\JarvisPHPTelegramBot;
 
 //Load allowedClientIdList
-if(file_exists('TelegramBot/allowedClientIdList.json')) {
+if (file_exists('TelegramBot/allowedClientIdList.json')) {
     $json_config = json_decode(file_get_contents('TelegramBot/allowedClientIdList.json'));
 }
 
-if($json_config) {
+if ($json_config) {
 	//Let's start the bot
 	JarvisPHPTelegramBot::run($json_config->allowedClientIdList);
 }
\ No newline at end of file