Changeset 1513 for g-map/files/lib/data/gmap/GmapApi.class.php

Timestamp:

02/26/12 10:28:14 (15 months ago)

Author:

Torben Brodt

Message:

no api key needed any longer

Files:

• g-map/files/lib/data/gmap/GmapApi.class.php (modified) (3 diffs)

g-map/files/lib/data/gmap/GmapApi.class.php

@@ -8 +8 @@
  */
 class GmapApi extends DatabaseObject {
-        protected $apikey = null;
         protected $cache_search = array();
 
         /**
-         * creates new instance
-         */
-        public function __construct() {
-                $apikey = GMAP_API_KEY;
-                $apikey = explode("\n", StringUtil::unifyNewlines($apikey));
-                $apikey = $apikey[0];
-                $apikey = explode(":", $apikey);
-                
-                // this is the way, woltlab wants the users to enter their api key
-                if(count($apikey) == 2) {
-                        $this->apikey = $apikey[1];
-                }
-
-                // this is the way, almost all of the woltlab users really enter their api key
-                else if(!empty($apikey)) {
-                        $this->apikey = $apikey[0];
-                }
-        }
-
-        /**
          * is active? api key existent?
-         *
+         * @deprecated no api key needed any longer
          * @return      boolean
          */
         public function isActive() {
-                return !empty($this->apikey);
+                return true;
         }
         
@@ -84 +63 @@
          */
         public function search($location) {
-                if(!$this->isActive()) {
-                        return;
-                }
-
                 if (CHARSET != 'UTF-8') {
                         $location = StringUtil::convertEncoding(CHARSET, 'UTF-8', $location);
@@ -97 +72 @@
                 }
                 
-                $url = "http://maps.google.com/maps/geo?q=".$lookupstring."&key=".$this->apikey."&output=csv";
+                $url = "http://maps.google.com/maps/geo?q=".$lookupstring."&output=csv";
                 
                 require_once(WCF_DIR.'lib/util/FileUtil.class.php');