bianchins / JarvisPHP

TelegramBot/TelegramBot.php

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

TelegramBot/GenericCurl.php

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

Plugins/Gcalendar_plugin/cli_createKey.php

Indentation +16 added lines, -16 removed lines

@@ -5,20 +5,20 @@ 
 define('CREDENTIALS_PATH', 'api-key.json');
 define('CLIENT_SECRET_PATH', 'secret-client-key.json');
 define('SCOPES', implode(' ', array(
-  \Google_Service_Calendar::CALENDAR_READONLY)
+    \Google_Service_Calendar::CALENDAR_READONLY)
 ));
 
-  $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 = expandHomeDirectory(CREDENTIALS_PATH);
-  if (file_exists($credentialsPath)) {
+    // Load previously authorized credentials from a file.
+    $credentialsPath = expandHomeDirectory(CREDENTIALS_PATH);
+    if (file_exists($credentialsPath)) {
     $accessToken = file_get_contents($credentialsPath);
-  } else {
+    } else {
     // Request authorization from the user.
     $authUrl = $client->createAuthUrl();
     printf("Open the following link in your browser:\n%s\n", $authUrl);
@@ -30,15 +30,15 @@ 
 
     // Store the credentials to disk.
     if(!file_exists(dirname($credentialsPath))) {
-      mkdir(dirname($credentialsPath), 0700, true);
+        mkdir(dirname($credentialsPath), 0700, true);
     }
     file_put_contents($credentialsPath, $accessToken);
     printf("Credentials saved to %s\n", $credentialsPath);
-  }
-  $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());
-  }
+    }

Plugins/Gcalendar_plugin/Gcalendar_plugin.php

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;
     }
 
 }

Plugins/InformationOn_plugin/InformationOn_plugin.php

Indentation +2 added lines, -2 removed lines

@@ -28,8 +28,8 @@
         //Extract search term
         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";
-		$xml = simplexml_load_string(file_get_contents($wiki_query_url));
+        $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());
         //Have i got results?

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);

Core/JarvisBehaviourLanguage.php

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

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');
     }

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