From 350403447789009978bad89b40ec1d7cbef2ea1f Mon Sep 17 00:00:00 2001 From: Elio Gavlinski Date: Sun, 13 Jan 2013 20:50:33 -0200 Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"Atualiza=C3=A7=C3=A3o=20da?= =?UTF-8?q?=20data,=20licen=C3=A7a=20e=20chaves""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 70c03b4e62a836de99f2d15376cd33a018dcf0da. --- CsvToArray.Class.php | 1 + FoursquareAPI.Class.php | 8 +++++--- edit.php | 3 ++- edit_csv.php | 3 ++- flag_csv.php | 1 + index.php | 10 +++++++--- js/4sq.js | 2 +- js/4sq_csv.js | 2 +- load.php | 1 + load_csv.php | 1 + main.php | 1 + search.php | 7 +++++-- 12 files changed, 28 insertions(+), 12 deletions(-) diff --git a/CsvToArray.Class.php b/CsvToArray.Class.php index 4c35843..9f78009 100644 --- a/CsvToArray.Class.php +++ b/CsvToArray.Class.php @@ -18,6 +18,7 @@ * @package CsvToArray * @copyright Copyleft (c) 2009-2010 . (http://www.pontophp.com.br) * @version 1.1 + * @license GPLv3 */ final class CsvToArray { diff --git a/FoursquareAPI.Class.php b/FoursquareAPI.Class.php index c48f79f..0ad6e79 100644 --- a/FoursquareAPI.Class.php +++ b/FoursquareAPI.Class.php @@ -4,8 +4,8 @@ * A PHP-based Foursquare client library with a focus on simplicity and ease of integration * * @package php-foursquare - * @author Stephen Young , @stephenyoungdev - * @version 1.0.0 + * @author Stephen Young , @stephenyoungdev, @gavlinski + * @version 1.1.0 * @license GPLv3 */ @@ -33,7 +33,7 @@ class FoursquareApi { // Edited Petr Babicka (babcca@gmail.com) https://developer.foursquare.com/overview/versioning /** @var String $Version YYYYMMDD */ - private $Version = '20130105'; + private $Version = '20130113'; /** @var String $ClientID */ private $ClientID; @@ -120,6 +120,7 @@ public function GetMulti($requests=false,$POST=false){ $endpoint = $request['endpoint']; unset($request['endpoint']); $query = '/' . $endpoint; + // Edited Elio Gavlinski (gavlinski@gmail.com) if (!empty($request)) $query .= '?' . htmlentities(urlencode(http_build_query($request))); $request_queries[] = $query; } @@ -221,6 +222,7 @@ public function GeoLocate($addr){ if ($json->status != "OK") { return NULL; } else { + // Edited Elio Gavlinski (gavlinski@gmail.com) return array('latitude' => $json->results[0]->geometry->location->lat, 'longitude' => $json->results[0]->geometry->location->lng, 'southwest' => $json->results[0]->geometry->viewport->southwest->lat . "," . $json->results[0]->geometry->viewport->southwest->lng, diff --git a/edit.php b/edit.php index 898c11f..5f770e7 100644 --- a/edit.php +++ b/edit.php @@ -9,9 +9,10 @@ * @package Foursquare-Mass-Editor-Tools * @author Elio Gavlinski * @copyright Copyleft (c) 2011-2012 - * @version 1.2 + * @version 1.3 * @link https://github.com/gavlinski/Foursquare-Mass-Editor-Tools/blob/master/edit.php * @since File available since Release 0.5 + * @license GPLv3 */ session_start(); diff --git a/edit_csv.php b/edit_csv.php index f02c344..61494c8 100644 --- a/edit_csv.php +++ b/edit_csv.php @@ -9,9 +9,10 @@ * @package Foursquare-Mass-Editor-Tools * @author Elio Gavlinski * @copyright Copyleft (c) 2011-2012 - * @version 1.2 + * @version 1.3 * @link https://github.com/gavlinski/Foursquare-Mass-Editor-Tools/blob/master/edit_csv.php * @since File available since Release 0.3 + * @license GPLv3 */ session_start(); diff --git a/flag_csv.php b/flag_csv.php index 7c05f83..6748fde 100644 --- a/flag_csv.php +++ b/flag_csv.php @@ -12,6 +12,7 @@ * @version 1.1 * @link https://github.com/gavlinski/Foursquare-Mass-Editor-Tools/blob/master/flag_csv.php * @since File available since Release 1.1 + * @license GPLv3 */ session_start(); diff --git a/index.php b/index.php index 36aab89..4a13ab6 100755 --- a/index.php +++ b/index.php @@ -12,14 +12,18 @@ * @version 1.0 * @link https://github.com/gavlinski/Foursquare-Mass-Editor-Tools/blob/master/index.php * @since File available since Release 1.5 + * @license GPLv3 */ require_once("FoursquareAPI.Class.php"); // Set client key and secret - $client_key = "3EZPQCWMPTP0TLV4SJNPOLMWJB4UVCBGMADXWQCYFU3MPIQZ"; - $client_secret = "J2310KS05Z50PU44DUC0T0HPEYM2CEQKBBPROAGXMBACZRZG"; - $redirect_uri = "http://localhost/4sqmet/index.php"; + //$client_key = "3EZPQCWMPTP0TLV4SJNPOLMWJB4UVCBGMADXWQCYFU3MPIQZ"; + //$client_secret = "J2310KS05Z50PU44DUC0T0HPEYM2CEQKBBPROAGXMBACZRZG"; + //$redirect_uri = "http://localhost/4sqmet/index.php"; + $client_key = "LFWOW3NHC1MINMYZY4UUHHPCC5Z2LWZ0DZHYH3XBXYJBPGDO"; + $client_secret = "QIG3AB5SFSAE5TP00QZSHLRSMCKQHTN5EAMAOLHNSNJJDQDL"; + $redirect_uri = "http://4sq.gcp.net.br/index.php"; // Load the Foursquare API library $foursquare = new FoursquareAPI($client_key, $client_secret); diff --git a/js/4sq.js b/js/4sq.js index f010c5b..9bd8647 100644 --- a/js/4sq.js +++ b/js/4sq.js @@ -10,7 +10,7 @@ dojo.require("dijit.Tree"); dojo.require("dijit.Menu"); dojo.require("dojo.cookie"); -var DATA_VERSIONAMENTO = "20120924"; +var DATA_VERSIONAMENTO = "20130113"; var MESES = new Array("01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"); var modo; diff --git a/js/4sq_csv.js b/js/4sq_csv.js index 8674eba..12f8981 100644 --- a/js/4sq_csv.js +++ b/js/4sq_csv.js @@ -5,7 +5,7 @@ dojo.require("dijit.Tooltip"); dojo.require("dijit.Menu"); dojo.require("dojo.cookie"); -var DATA_VERSIONAMENTO = "20120924"; +var DATA_VERSIONAMENTO = "20130113"; var MESES = new Array("01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"); var oauth_token = dojo.cookie("oauth_token"); diff --git a/load.php b/load.php index b91153c..ec7422e 100644 --- a/load.php +++ b/load.php @@ -12,6 +12,7 @@ * @version 1.4 * @link https://github.com/gavlinski/Foursquare-Mass-Editor-Tools/blob/master/load.php * @since File available since Release 1.1 + * @license GPLv3 */ session_start(); diff --git a/load_csv.php b/load_csv.php index 4b4fcd9..3cfa118 100755 --- a/load_csv.php +++ b/load_csv.php @@ -12,6 +12,7 @@ * @version 1.3 * @link https://github.com/gavlinski/Foursquare-Mass-Editor-Tools/blob/master/load_csv.php * @since File available since Release 1.1 + * @license GPLv3 */ session_start(); diff --git a/main.php b/main.php index 75d5966..76f7286 100644 --- a/main.php +++ b/main.php @@ -12,6 +12,7 @@ * @version 1.0 * @link https://github.com/gavlinski/Foursquare-Mass-Editor-Tools/blob/master/main.php * @since File available since Release 1.5 + * @license GPLv3 */ session_start(); diff --git a/search.php b/search.php index a47ea47..0e72c8a 100644 --- a/search.php +++ b/search.php @@ -12,6 +12,7 @@ * @version 1.0 * @link https://github.com/gavlinski/Foursquare-Mass-Editor-Tools/blob/master/search.php * @since File available since Release 1.5 + * @license GPLv3