Merge pull request #53 from Akshay2598/master

QR Code Fix & Grammar Correction
sahana · Mar 14, 2014 · d413343 · d413343
2 parents 6a3a740 + 3a907f6
commit d413343
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 115 deletions.
diff --git a/vesuvius/mod/eap/main.inc b/vesuvius/mod/eap/main.inc
@@ -602,8 +602,8 @@ function shn_eap_edit() {
 	}
 
 	// make goo.gl short url
-	$googl = new goo_gl(makePageUrl());
-	$global['googl'] = $googl->result();
+	$googl = new googlUrl(makePageUrl());
+	$global['googl'] = $googl->short();
 
 	$debug = false;
 	$debugParam = "";

diff --git a/vesuvius/mod/lpf/class.googl.php b/vesuvius/mod/lpf/class.googl.php
@@ -1,127 +1,82 @@
 <?php
-/** ******************************************************************************************************************************************************************
-*********************************************************************************************************************************************************************
-********************************************************************************************************************************************************************
+/*
+* @class              googlUrl
+* @author             Akshay Kalose (http://www.kalose.net/)
+* @release            12/18/2013
+* @version            1.0
 *
-* @class        goo_gl
-* @author       Marcus Nunes - marcusnunes.com - 09/18/2010
-*
-* eg:
-* $googl = new goo_gl('http://marcusnunes.com/api-goo.gl.php');
-* echo $googl->result();
-*
-********************************************************************************************************************************************************************
-*********************************************************************************************************************************************************************
-**********************************************************************************************************************************************************************/
-
-class goo_gl{
-
-	var $url, $resul;
-
-	//goo.gl construct method
-
-	function goo_gl($url){
-
-		$this->url = $url;
-
-        if( function_exists('curl_init') ) {
-            $curl = curl_init();
-            curl_setopt($curl, CURLOPT_URL, 'http://goo.gl/api/url');
-            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($curl, CURLOPT_POST, 1);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, '[email protected]&url='.urlencode($this->url).'&auth_token='.$this->googlToken($url));
-            $saida = curl_exec($curl);
-            curl_close($curl);
-            if($saida){
-                $json = json_decode($saida);
-                $this->resul = isset($json->short_url) ? $json->short_url : null;
-            }
-        } else {
-            add_error(_t('Warning: The cURL extension is not found. Please check your PHP configuration.'));
-        }
-	}
-
-	//show url shorted by goo.gl
-
-	function googlToken($b){
-		$i = $this->tke($b);
-		$i = $i >> 2 & 1073741823;
-		$i = $i >> 4 & 67108800 | $i & 63;
-		$i = $i >> 4 & 4193280 | $i & 1023;
-		$i = $i >> 4 & 245760 | $i & 16383;
-		$j = "7";
-		$h = $this->tkf($b);
-		$k = ($i >> 2 & 15) << 4 | $h & 15;
-		$k |= ($i >> 6 & 15) << 12 | ($h >> 8 & 15) << 8;
-		$k |= ($i >> 10 & 15) << 20 | ($h >> 16 & 15) << 16;
-		$k |= ($i >> 14 & 15) << 28 | ($h >> 24 & 15) << 24;
-		$j .= $this->tkd($k);
-		return $j;
+* Usage:
+* Instantiate:        $googl = new googlUrl('http://google.com/');
+* Recieve Short Link: $short = $googl->short();
+* 
+* Instantiate:        $googl = new googlUrl('http://goo.gl/DE1y3W');
+* Recieve Long Link:  $long = $googl->long();
+*/
+class googlUrl
+{
+	//Key is recommended, but not required.
+	private $key = '';
+	public $short, $long;
+
+	public function __construct($url)
+	{
+		if (strpos($url, 'goo.gl') === false) {
+			$this->long = $url;
+			$this->short = null;
+		} else {
+			$this->long = null;
+			$this->short = $url;
+		}
 	}
 
-	//token code
-
-	function tke($l){
-		$m = 5381;
-		for($o = 0; $o < strlen($l); $o++){
-			$m = $this->tkc($m << 5, $m, ord($l[$o]));
+	public function short()
+	{
+		if (isset($this->short)) {
+			return $this->short;
 		}
-		return $m;
-	}
 
-	function tkc(){
-		$l = 0;
-		foreach(func_get_args() as $val){
-			$val &= 4294967295;
-			$val += $val > 2147483647 ? -4294967296 : ($val < -2147483647 ? 4294967296 : 0);
-			$l   += $val;
-			$l   += $l > 2147483647 ? -4294967296 : ($l < -2147483647 ? 4294967296 : 0);
+		if (isset($this->long)) {
+			if (function_exists('curl_init')) {
+				$curl = curl_init();
+				$sendData = '{"longUrl":"' . $this->long . '"}';
+				curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, !(strpos($config['https'], 'https') === false));
+				curl_setopt($curl, CURLOPT_URL, 'https://www.googleapis.com/urlshortener/v1/url?' . ($this->key ? $this->key . '&' : ''));
+				curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+				curl_setopt($curl, CURLOPT_POST, true);
+				curl_setopt($curl, CURLOPT_POSTFIELDS, $sendData);
+				curl_setopt($curl, CURLOPT_HTTPHEADER, Array('Content-Type: application/json'));
+				$result = json_decode(curl_exec($curl));
+				curl_close($curl);
+				return $result->id;
+			} else {
+				add_error(_t('Warning: The cURL extension is not found. Please check your PHP configuration.'));
+			}
+		} else {
+			return false;
 		}
-		return $l;
 	}
 
-	function tkf($l){
-		$m = 0;
-		for($o = 0; $o < strlen($l); $o++){
-			$m = $this->tkc(ord($l[$o]), $m << 6, $m << 16, -$m);
+	public function long()
+	{
+		if (isset($this->long)) {
+			return $this->long;
 		}
-		return $m;
-	}
 
-	function tkd($l){
-		$l = $l > 0 ? $l : $l + 4294967296;
-		$m = "$l";  //deve ser uma string
-		$o = 0;
-		$n = false;
-		for($p = strlen($m) - 1; $p >= 0; --$p){
-			$q = $m[$p];
-			if($n){
-				$q *= 2;
-				$o += floor($q / 10) + $q % 10;
+		if (isset($this->short)) {
+			if (function_exists('curl_init')) {
+				$curl = curl_init();
+				curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, !(strpos($config['https'], 'https') === false));
+				curl_setopt($curl, CURLOPT_URL, 'https://www.googleapis.com/urlshortener/v1/url?' . ($this->key ? $this->key . '&' : '') . 'shortUrl=' . $this->short);
+				curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+				curl_setopt($curl, CURLOPT_HTTPGET, true);
+				$result = json_decode(curl_exec($curl));
+				curl_close($curl);
+				return $result->longUrl;
 			} else {
-				$o += $q;
-			}
-			$n = !$n;
-		}
-		$m = $o % 10;
-		$o = 0;
-		if($m != 0){
-			$o = 10 - $m;
-			if(strlen($l) % 2 == 1){
-				if ($o % 2 == 1){
-					$o += 9;
-				}
-				$o /= 2;
+				add_error(_t('Warning: The cURL extension is not found. Please check your PHP configuration.'));
 			}
+		} else {
+			return false;
 		}
-		return "$o$l";
 	}
-
-	function result(){
-		return $this->resul;
-	}
-
 }
-
-
-
diff --git a/vesuvius/mod/lpf/lib_helper.inc b/vesuvius/mod/lpf/lib_helper.inc
@@ -327,7 +327,7 @@ function makePersonUrl($uuid) {
 function makePageUrl() {
 
 	global $conf;
-	$link = $conf['https'].$conf['base_uuid'].$_SERVER['REQUEST_URI'];
+	$link = $conf['https'].$conf['base_uuid'] . substr($_SERVER['REQUEST_URI'], 1);
 	return $link;
 }
 

diff --git a/vesuvius/mod/plus/main.inc b/vesuvius/mod/plus/main.inc
@@ -146,7 +146,7 @@ function shn_plus_reported() {
 		$count++;
 	}
 	if($count==0) {
-		echo "<tr><td colspan=3 class=\"odder\">No People Rported Yet!</td></tr>";
+		echo "<tr><td colspan=3 class=\"odder\">No People Reported Yet!</td></tr>";
 	}
 	echo "</table>";
 	echo "</fieldset></form></div>";