bianchins / JarvisPHP

Plugins/RaspPIVolume_plugin/RaspPIVolume_plugin.php

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);
     }
     
     /**

Plugins/ActualOutsideTemperature_plugin/ActualOutsideTemperature_plugin.php

Spacing +5 added lines, -5 removed lines

@@ -29,15 +29,15 @@ 
         
         $BASE_URL = "http://query.yahooapis.com/v1/public/yql";
         $yql_query = 'select * from weather.forecast where woeid in (select woeid from geo.places(1) where text="'.$this->place.'") and u="c"';
-        $yql_query_url = $BASE_URL . "?q=" . urlencode($yql_query) . "&format=json";
+        $yql_query_url = $BASE_URL."?q=".urlencode($yql_query)."&format=json";
         
         // Make call with cURL
         $session = curl_init($yql_query_url);
-        curl_setopt($session, CURLOPT_RETURNTRANSFER,true);
+        curl_setopt($session, CURLOPT_RETURNTRANSFER, true);
         $json = curl_exec($session);
         // Convert JSON to PHP object
-        $phpObj =  json_decode($json);
-        $answer = sprintf(JarvisLanguage::translate('actual_temperature_outside_is',get_called_class()),$phpObj->query->results->channel->item->condition->temp, $phpObj->query->results->channel->atmosphere->humidity);
+        $phpObj = json_decode($json);
+        $answer = sprintf(JarvisLanguage::translate('actual_temperature_outside_is', get_called_class()), $phpObj->query->results->channel->item->condition->temp, $phpObj->query->results->channel->atmosphere->humidity);
         JarvisTTS::speak($answer);
         $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);
     }
     
     /**

Plugins/Hello_plugin/Hello_plugin.php

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
  * @author Stefano Bianchini
  * @website http://www.stefanobianchini.net
  */
-class Hello_plugin implements \JarvisPHP\Core\JarvisPluginInterface{
+class Hello_plugin implements \JarvisPHP\Core\JarvisPluginInterface {
     /**
      * Priority of plugin
      * @var int  
@@ -27,16 +27,16 @@ 
         $answer = '';
         JarvisPHP::getLogger()->debug('Answering to command: "'.$command.'"');
         $hour = date("H");
-        if($hour>5 && $hour<=13) {
+        if ($hour > 5 && $hour <= 13) {
             //Morning
-            $answer = JarvisLanguage::translate('hello_morning',get_called_class());
+            $answer = JarvisLanguage::translate('hello_morning', get_called_class());
         }
-        else if($hour>13 && $hour<18) {
+        else if ($hour > 13 && $hour < 18) {
             //Afternoon
-            $answer = JarvisLanguage::translate('hello_afternoon',get_called_class());
+            $answer = JarvisLanguage::translate('hello_afternoon', get_called_class());
         } else {
             //Evening (and night, of course)
-            $answer = JarvisLanguage::translate('hello_evening',get_called_class());
+            $answer = JarvisLanguage::translate('hello_evening', get_called_class());
         }
         
 
@@ -59,7 +59,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);
     }
     
     /**

Plugins/Radio_plugin/Radio_plugin.php

Spacing +8 added lines, -8 removed lines

@@ -26,27 +26,27 @@ 
     function answer($command) {
         
         $start_vlc = false;
-        $stream_url='';
-        $answer='nothing done';
+        $stream_url = '';
+        $answer = 'nothing done';
         
         $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
                     
-        if(preg_match(JarvisLanguage::translate('preg_match_relax_music',get_called_class()), $command)) { 
+        if (preg_match(JarvisLanguage::translate('preg_match_relax_music', get_called_class()), $command)) { 
             $stream_url = 'http://pub4.radiotunes.com:80/radiotunes_relaxation_aacplus.flv';
             JarvisPHP::getLogger()->debug('Playing relaxation');
             $start_vlc = true;
         }
-        if(preg_match(JarvisLanguage::translate('preg_match_lounge_music',get_called_class()), $command)) {
+        if (preg_match(JarvisLanguage::translate('preg_match_lounge_music', get_called_class()), $command)) {
             $stream_url = 'http://pub4.radiotunes.com:80/radiotunes_smoothlounge_aacplus.flv';
             JarvisPHP::getLogger()->debug('Playing lounge');
             $start_vlc = true;
         }
-        if(preg_match(JarvisLanguage::translate('preg_match_jazz_music',get_called_class()), $command)) { 
+        if (preg_match(JarvisLanguage::translate('preg_match_jazz_music', get_called_class()), $command)) { 
             $stream_url = 'http://pub4.radiotunes.com:80/radiotunes_smoothjazz_aacplus.flv';
             JarvisPHP::getLogger()->debug('Playing jazz');
             $start_vlc = true;
         }
-        if(preg_match(JarvisLanguage::translate('preg_match_stop',get_called_class()), $command)) {
+        if (preg_match(JarvisLanguage::translate('preg_match_stop', get_called_class()), $command)) {
             $result = @socket_connect($socket, 'localhost', 9999);
             if ($result === false) {
                 //Error handling
@@ -63,7 +63,7 @@ 
             }
             $start_vlc = false;    
         }
-        if($start_vlc) {
+        if ($start_vlc) {
             //Start Vlc on port 9999
             //exec('vlc -I rc --rc-host localhost:9999');
             @exec('/usr/bin/nohup /usr/bin/vlc -I rc --rc-host localhost:9999 &');
@@ -104,7 +104,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);
     }
     
     /**

Plugins/Gcalendar_plugin/cli_createKey.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     $accessToken = $client->authenticate($authCode);
 
     // Store the credentials to disk.
-    if(!file_exists(dirname($credentialsPath))) {
+    if (!file_exists(dirname($credentialsPath))) {
       mkdir(dirname($credentialsPath), 0700, true);
     }
     file_put_contents($credentialsPath, $accessToken);

Plugins/Gcalendar_plugin/Gcalendar_plugin.php

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);
     }
     
     /**

Plugins/Wemo_plugin/Wemo_plugin.php

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);
     }
     
     /**

Plugins/InformationOn_plugin/InformationOn_plugin.php

Spacing +7 added lines, -7 removed lines

@@ -13,7 +13,7 @@ 
  * @website http://www.stefanobianchini.net
  * Based on Wiki_plugin of UgoRaffaele https://github.com/UgoRaffaele/
  */
-class InformationOn_plugin implements \JarvisPHP\Core\JarvisPluginInterface{
+class InformationOn_plugin implements \JarvisPHP\Core\JarvisPluginInterface {
     /**
      * Priority of plugin
      * @var int  
@@ -26,17 +26,17 @@ 
      */
     function answer($command) {
         //Extract search term
-        preg_match(JarvisLanguage::translate('preg_match_activate_plugin',get_called_class()), $command, $matches);
+        preg_match(JarvisLanguage::translate('preg_match_activate_plugin', get_called_class()), $command, $matches);
         $search_term = $matches[2];
-		$wiki_query_url = _WIKI_URL . "?action=opensearch&search=" . urlencode($search_term) . "&format=xml&limit=5";
+		$wiki_query_url = _WIKI_URL."?action=opensearch&search=".urlencode($search_term)."&format=xml&limit=5";
 		$xml = simplexml_load_string(file_get_contents($wiki_query_url));
         $item_array = $xml->Section->Item;
-        $answer = JarvisLanguage::translate('nothing_found',get_called_class());
+        $answer = JarvisLanguage::translate('nothing_found', get_called_class());
         //Have i got results?
-        if(count($item_array)>0) {
+        if (count($item_array) > 0) {
             foreach ($item_array as $item) {
                 if (strlen($item->Description) > 0) {
-                    $answer = sprintf(JarvisLanguage::translate('search_result_is',get_called_class()), $item->Description);
+                    $answer = sprintf(JarvisLanguage::translate('search_result_is', get_called_class()), $item->Description);
                     break;
                 }
             }
@@ -60,7 +60,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);
     }
     
     /**

Core/JarvisLanguage.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
         $_lang = array();
         JarvisLanguage::$data['core'] = array();
         //Loading JarvisPHP Core language
-        if(file_exists('language/JarvisPHP_'._LANGUAGE.'.php')) {
+        if (file_exists('language/JarvisPHP_'._LANGUAGE.'.php')) {
             require 'language/JarvisPHP_'._LANGUAGE.'.php';
             JarvisLanguage::$data['core'] = array_merge(JarvisLanguage::$data['core'], $_lang);
         }
@@ -36,7 +36,7 @@ 
         $language_file = 'Plugins/'.$plugin_class.'/language/'.$plugin_class."_"._LANGUAGE.'.php';
 
         //Check if translation file exists
-        if(file_exists($language_file)) {
+        if (file_exists($language_file)) {
             require $language_file;
             JarvisLanguage::$data[$plugin] = array_merge(JarvisLanguage::$data[$plugin], $_lang);
         }
@@ -48,8 +48,8 @@ 
      * @param string $plugin
      * @return string
      */
-    public static function translate($text, $plugin='core') {
-        if(isset(JarvisLanguage::$data[$plugin][$text])) {
+    public static function translate($text, $plugin = 'core') {
+        if (isset(JarvisLanguage::$data[$plugin][$text])) {
             return JarvisLanguage::$data[$plugin][$text];
         } else {
             return $text;