Store shortened bit.ly hashes locally. Implemented site menu's shorten link, context menu's not working yet.

3.1/modules/bitly/controllers/admin_bitly.php

@@ -81,9 +81,14 @@ class Admin_Bitly_Controller extends Admin_Controller {
     $view->content->domain = $form->configure_bitly->domain->value;
     $view->content->valid_config = $valid_config;
     $view->content->form = $form;
+
     if ($valid_config) {
-      // @todo Store/get G3's root bit.ly url, only shorten if it hasn't been stored.
-      $view->content->g3_url = bitly::shorten_url(bitly::build_link());
+      $link = ORM::factory("bitly_link")->where("item_id", "=", 1)->find();
+      if ($link->loaded()) {
+        $view->content->g3_url = "http://" . module::get_var("bitly", "domain") . "/$link->hash";
+      } else {
+        $view->content->g3_url = bitly::shorten_url(1);
+      }
     }
     print $view;
   }

3.1/modules/bitly/helpers/bitly.php

@@ -165,19 +165,17 @@ class bitly_Core {
     return $response;
   }
 
-  static function build_link($path='/') {
-    $protocol = strtolower(substr($_SERVER["SERVER_PROTOCOL"], 0, 5)) == 'https' ? 'https' : 'http';
-    return url::site($path, $protocol);
-  }
-
   /**
    * Shorten a Gallery URL
-   * @param  string $long_url
+   * @param  int    $item_id
    * @param  string $format
-   * @return string
+   * @return mixed  string|false
    */
-  static function shorten_url($long_url, $format='json') {
+  static function shorten_url($item_id, $format='json') {
+    $item = ORM::factory("item", $item_id);
     $short_url = '';
+    $long_url = url::abs_site($item->relative_url_cache);
+
     $parameters = array(
       "login" => module::get_var("bitly", "login"),
       'apiKey' => module::get_var("bitly", "api_key"),
@@ -185,73 +183,31 @@ class bitly_Core {
       'domain' => module::get_var("bitly", "domain"),
       'format' => $format,
       );
+    
     $request = self::_build_http_request('shorten', $parameters);    
     $response = self::_http_post($request, self::$api_host);
-    $json_decoded = json_decode($response->body[0]);
-    if ('OK' == $json_decoded->status_txt) {
-      // Save the original item id, the hash, and possibly the global hash, to the database
-      $short_url = $json_decoded->data->url;
-      $hash = $json_decoded->data->hash;
-      $global_hash = $json_decoded->data->global_hash;
-      $new_hash = $json_decoded->data->new_hash;
-      message::success("The $long_url has been shortened to $short_url");
+    $json_response = json_decode($response->body[0]);
+
+    if ('OK' == $json_response->status_txt) {
+      $short_url = $json_response->data->url;
+      // Save the link hash to the database
+      $link = ORM::factory("bitly_link");
+      $link->item_id = $item_id;
+      $link->hash = $json_response->data->hash;
+      //$link->global_hash = $json_response->data->global_hash;
+      //$new_hash = $json_response->data->new_hash;
+      $link->owner_id = $item->owner_id;
+      $link->save();
+
+      message::success("$long_url has been shortened to $short_url");
+      
+      return $json_response->data->url;
+      
     } else {
-      message::error("Unable to shorten the url");
+      message::error("Unable to shorten $long_url");
       // @todo log the error
+      return false;
     }
-    return $short_url;
   }
 
-  /**
-   *  returns expanded url
-   * {
-        "status_code": 200,
-        "data": {
-          "expand": [
-            {
-              "short_url": "http://tcrn.ch/a4MSUH",
-              "global_hash": "bWw49z",
-              "long_url": "http://www.techcrunch.com/2010/01/29/windows-mobile-foursquare/",
-              "user_hash": "a4MSUH"
-            },
-            {
-              "short_url": "http://bit.ly/1YKMfY",
-              "global_hash": "1YKMfY",
-              "long_url": "http://betaworks.com/",
-              "user_hash": "1YKMfY"
-            },
-            {
-              "long_url": "http://www.scotster.com/qf/?1152",
-              "global_hash": "lLWr",
-              "hash": "j3",
-              "user_hash": "j3"
-            },
-            {
-              "hash": "a35.",
-              "error": "NOT_FOUND"
-            }
-          ]
-        },
-        "status_txt": "OK"
-      }
-   */
-  /**
-   *
-   * @param <type> $short_url
-   * @param <type> $hash
-   * @param <type> $format
-   * @return <type> 
-   */
-  static function expand_url($short_url, $hash=null, $format='json') {
-    $parameters = array(
-      "login" => module::get_var("bitly", "login"),
-      'apiKey' => module::get_var("bitly", "api_key"),
-      'shortUrl' => $short_url,
-      'hash' => $hash,
-      );
-    $request = self::_build_http_request('expand', $parameters);
-    $response = self::_http_post($http_request, self::$api_host);
-    return $response;
-  }
-  
 }

3.1/modules/bitly/helpers/bitly_event.php

@@ -28,15 +28,13 @@ class bitly_event_Core {
 
   static function site_menu($menu, $theme) {
     $item = $theme->item();
-    if ($item && $item->type == "photo") {
-      $menu->get("options_menu")
-        ->append(Menu::factory("link")
-                    ->id("bitly")
-                    ->label(t("Shorten Link with bit.ly"))
-                    ->url(url::site("bitly/shorten_link/$item->id?csrf=$theme->csrf"))
-                    ->css_id("g-bitly-link")
-                    ->css_class("g-print-bitly-link ui-icon-print"));
-    }
+    $menu->get("options_menu")
+      ->append(Menu::factory("link")
+                  ->id("bitly")
+                  ->label(t("Shorten Link with bit.ly"))
+                  ->url(url::site("bitly/shorten/$item->id?csrf=$theme->csrf"))
+                  ->css_id("g-bitly-link")
+                  ->css_class("g-bitly-shorten ui-icon-link"));
   }
 
   static function context_menu($menu, $theme, $item) {
@@ -44,7 +42,7 @@ class bitly_event_Core {
       ->append(Menu::factory("link")
                ->id("bitly")
                ->label(t("Shorten Link with bit.ly"))
-               ->url(url::site("bitly/shorten_link/$item->id?csrf=$theme->csrf"))
-               ->css_class("g-bitly-link ui-icon-link"));
+               ->url(url::site("bitly/shorten/$item->id?csrf=$theme->csrf"))
+               ->css_class("g-bitly-shorten ui-icon-link"));
   }
 }

3.1/modules/bitly/models/bitly.php

@@ -1,29 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class Bitly_Model_Core extends ORM {
-
-  /**
-   * @see ORM::save()
-   */
-  static function save() {
-
-  }
-  
-}