Changeset 1386

Timestamp:

11/30/08 07:28:57 (6 weeks ago)

Author:

ayunyan

Message:

plugin:dropiosilo added guest password support, better error handling

Files:

• plugins/dropiosilo/trunk/dropiosilo.plugin.php (modified) (8 diffs)

plugins/dropiosilo/trunk/dropiosilo.plugin.php

@@ -47 +47 @@
         Options::set('dropiosilo__api_key', '');
         Options::set('dropiosilo__drop_name', '');
+        Options::set('dropiosilo__password', '');
     }
 
@@ -87 +88 @@
             $form->append('label', 'api_key_get_label', '<a href="http://api.drop.io/" target="_blank">doesn\'t have API Key?</a>');
             $form->append('text', 'drop_name', 'dropiosilo__drop_name', _t('Drop Name: ', 'dropiosilo'));
+            $form->append('password', 'password', 'dropiosilo__password', _t('Guest Password (optional): ', 'dropiosilo'));
             $form->append('submit', 'save', _t('Save'));
             $form->out();
@@ -135 +137 @@
     public function silo_info()
     {
-        $dropio = new DropioAPI(Options::get('dropiosilo__api_key'), Options::get('dropiosilo__drop_name'));
-        if ($dropio->check()) {
+        $dropio = new DropioAPI(Options::get('dropiosilo__api_key'), Options::get('dropiosilo__drop_name'), Options::get('dropiosilo__password'));
+        try {
+            $dropio->check();
             return array(
                 'name' => self::SILO_NAME,
                 'icon' => $this->get_url() . '/img/icon.png'
                 );
-        } else {
-            Session::error(_t('drop.io Silo: Invalid API Key or Drop Name', 'dropiosilo'));
+        } catch (Exception $e) {
+            Session::error(sprintf(_t('drop.io Silo: %s', 'dropiosilo'), $e->getMessage()));
             return array();
         }
@@ -158 +161 @@
         $results = array();
 
-        $dropio = new DropioAPI(Options::get('dropiosilo__api_key'), Options::get('dropiosilo__drop_name'));
-        $assets = $dropio->get_assets();
+        $dropio = new DropioAPI(Options::get('dropiosilo__api_key'), Options::get('dropiosilo__drop_name'), Options::get('dropiosilo__password'));
+        try {
+            $assets = $dropio->get_assets();
+        } catch (Exception $e) {
+            return array();
+        }
 
         for ($i = 0; $i < count($assets); $i++) {
@@ -247 +254 @@
     private $api_key;
     private $drop_name;
+    private $token;
     private $base_url = 'http://api.drop.io/drops/';
 
@@ -256 +264 @@
      * @param string $drop_name
      */
-    public function __construct($api_key, $drop_name)
+    public function __construct($api_key, $drop_name, $token = '')
     {
         $this->api_key = $api_key;
         $this->drop_name = $drop_name;
+        $this->token = $token;
     }
 
@@ -269 +278 @@
     public function check()
     {
-        $request = new RemoteRequest($this->base_url . $this->drop_name . '?api_key=' . $this->api_key . '&version=1.0&format=json', 'GET' );
+        $request = new RemoteRequest($this->base_url . $this->drop_name . '?api_key=' . $this->api_key . '&token=' . $this->token . '&version=1.0&format=json', 'GET');
         $result = $request->execute();
-        if ($result !== true) return false;
-                $drop = json_decode($request->get_response_body());
-                if (isset($drop->name) && $drop->name == $this->drop_name) return true;
-                return false;
+        if ($result !== true) throw new Exception('Invalid API Key, Drop Name or Password.');
+                $respose = json_decode($request->get_response_body());
+                if (isset($response->result) && $response->result == 'Failure') {
+            throw new Exception($response->message);
+        }
+                return true;
     }
 
@@ -284 +295 @@
     public function get_assets()
     {
-        $request = new RemoteRequest($this->base_url . $this->drop_name . '/assets?api_key=' . $this->api_key . '&version=1.0&format=json', 'GET' );
+        $request = new RemoteRequest($this->base_url . $this->drop_name . '/assets?api_key=' . $this->api_key . '&token=' . $this->token . '&version=1.0&format=json', 'GET');
         $result = $request->execute();
-        if ($result !== true) return false;
-                $assets = json_decode($request->get_response_body());
-        return $assets;
+        if ($result !== true) throw new Exception('Invalid API Key, Drop Name or Password.');
+                $response = json_decode($request->get_response_body());
+                if (isset($response->result) && $response->result == 'Failure') {
+            throw new Exception($response->message);
+        }
+        return $response;
     }
 }