From 8810b3a66c29623306707711825d67880e0411c0 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sun, 08 Jul 2012 19:16:57 +0000
Subject: [PATCH] Dalsze poprawki w module pogoda: - kolejna poprawka błędu związanego ze względną ścieżką do pobieranego obrazka, - przeniesienie pobierania ikony do osobnej metody, - dodanie wywołań w odpowiednich miejscach.
---
modules/80_lang/handler.php | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/modules/80_lang/handler.php b/modules/80_lang/handler.php
index 15bd3b0..5dee1a6 100644
--- a/modules/80_lang/handler.php
+++ b/modules/80_lang/handler.php
@@ -1,5 +1,46 @@
<?php
-require_once(dirname(__FILE__).'/msapi.php');
+require_once(dirname(__FILE__).'/msapi_config.php');
+
+class msapi extends msapi_config {
+ public $url;
+
+ function __construct($url) {
+ $this->url = $url;
+ }
+
+ function execute($params) {
+ if(!is_array($params)) {
+ throw new Exception('Przekazany parametr nie jest tablicą');
+ }
+
+ foreach($params as $name => &$param) {
+ if(substr($name, 0, 1)!='$' && is_string($param)) {
+ $param = '\''.strtr($param, array('\'' => '\'\'')).'\'';
+ }
+ }
+ unset($param);
+ $params['$format'] = 'json';
+
+ $context = stream_context_create(array(
+ 'http' => array(
+ 'request_fulluri' => TRUE,
+ 'header' => 'Authorization: Basic '.base64_encode(':'.$this->accountKey)
+ ),
+ ));
+
+ $content = file_get_contents($this->url.'?'.http_build_query($params, '', '&'), FALSE, $context);
+ if(!$content) {
+ return FALSE;
+ }
+
+ $content = json_decode($content, TRUE);
+ if(!$content) {
+ return FALSE;
+ }
+
+ return $content;
+ }
+}
class bot_lang_module implements BotModule {
function handle($msg, $params) {
@@ -23,7 +64,7 @@
$data = jsarray::parse($data);
if(!$data OR count($data)==0 OR count($data[1])==0) {
- $api = new msapi('https://api.datamarket.azure.com/Bing/MicrosoftTranslator/');
+ $api = new msapi('https://api.datamarket.azure.com/Bing/MicrosoftTranslator/Translate');
$data = $api->execute(array(
'From' => $params[0],
'To' => $params[1],
--
Gitblit v1.9.1