gama.io
/
lobli
mirror of https://github.com/gamaio/lobli.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor mod to API, make chrome extension work with beta 

@Doridian recommended being able to change expiring time, so I did that
Chrome extension now shortens links with the beta right in the browser
This commit is contained in:
alopexc0de 2014-08-29 17:54:26 -04:00
parent 26d460b173
commit 6eb32ed84f
No known key found for this signature in database
GPG Key ID: 48E847F18074C953
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Website/ch/index.php
View File

@ -12,6 +12,8 @@
if(isset($_GET['shorten'])){
$short = $_GET['url'];
$expire = 2;
if(!empty($_GET['time']) && is_numeric($_GET['time'])) $expire = $_GET['time'];
if(strpos($short, "http://") === false && strpos($short, "https://") === false){ $short = "http://$short"; }
$apip = $redis->get("api:ip:$ip");
@ -22,7 +24,7 @@
die("Too many requests too fast!");
}
$reShort = shorten($redis, $short, 2, $seperator);
$reShort = shorten($redis, $short, $expire, $seperator);
$reShort = explode($seperator, $reShort);
$retCode = $reShort[0];
@ -52,7 +54,7 @@
break;
}
exit;
}elseif(isset($_GET['resolve'])){ die("Not ready"); }
else{ die("Improper Call."); }
}elseif(isset($_GET['resolve'])){ die("Not ready");
}else{ die("Improper Call."); }
?>
?>

8
lob.li crx/js/background.js
View File

@ -45,7 +45,7 @@ function shortenTabURL(tabid){ // Use just a tab id to shorten its url
function shortenURL(url){ // Creates a short url and copies it to clipboard
if(testURL(url)){
sendAPIRequest("shorten&url=" + url, function(req){
sendAPIRequest("?shorten&url=" + url, function(req){
var res = req.responseText.trim();
switch(res){
case "dead":
@ -58,7 +58,7 @@ function shortenURL(url){ // Creates a short url and copies it to clipboard
showAlert("General Error.");
break;
default:
copyToClipboard("http://lob.li/" + res);
copyToClipboard("http://b.lob.li/?"+res);
showAlert("Link shortened. Short link copied to clipboard!");
break;
}
@ -68,7 +68,7 @@ function shortenURL(url){ // Creates a short url and copies it to clipboard
function resolveURL(url){ // For when/if I decide to add the ability to resolve links through the extension
if(testURL(url)){
sendAPIRequest("resolve&url=" + url, function(req){
sendAPIRequest("?resolve&url=" + url, function(req){
var res = req.responseText.trim();
copyToClipboard(res);
showAlert("Link Resolved!\n" + res);
@ -79,7 +79,7 @@ function resolveURL(url){ // For when/if I decide to add the ability to resolve
function sendAPIRequest(url, callback){ // Sends a GET request to the server, response is expected to be text and only short id, or resolved link
var method = "GET";
var req = new XMLHttpRequest();
req.open(method, "http://lob.li/ch/" + url, true);
req.open(method, "http://b.lob.li/ch/" + url, true);
req.onload = function(){
callback(req);
};