Changeset 1326

Timestamp:

03/18/11 21:34:09 (2 years ago)

Author:

Torben Brodt

Message:

fixes for custom gmap input

Location:

g-map

Files:

• files/lib/data/gmap/GmapApi.class.php (modified) (2 diffs)
• optionals/de.easy-coding.wcf.map.custominput/acptemplates/mapCustomInput.tpl (modified) (1 diff)
• optionals/de.easy-coding.wcf.map.custominput/files/lib/system/event/listener/MapCustomInputListener.class.php (modified) (4 diffs)

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

@@ -40 +40 @@
         }
         
+        /**
+         * @var array<string>
+         */
         public function getFields() {
                 if(defined('GMAP_CUSTOMINPUT') && $const = GMAP_CUSTOMINPUT && !empty($const)) {
-                        $cols = explode(",", GMAP_CUSTOMINPUT);
+                        $tmp = explode(",", GMAP_CUSTOMINPUT);
+                        $cols = array();
+                        foreach($tmp as $field) {
+                                $col = User::getUserOptionID($field);
+                                if($col) {
+                                        $cols[] = $field;
+                                }
+                        }
                 } else {
                         $cols = array('location');
@@ -49 +59 @@
         }
         
+        /**
+         * @var string
+         */
         public function getColumn() {
                 $cols = array();

g-map/optionals/de.easy-coding.wcf.map.custominput/acptemplates/mapCustomInput.tpl

@@ -8 +8 @@
                         <a href="#" onclick="return changeCustomInput('{$opt.optionName}')">
                                 <h3 class="itemListTitle">
-                                        {$opt.optionName}
+                                        {lang}wcf.user.option.{$opt.optionName}{/lang}
                                 </h3>
                         </a>

g-map/optionals/de.easy-coding.wcf.map.custominput/files/lib/system/event/listener/MapCustomInputListener.class.php

@@ -2 +2 @@
 // wcf imports
 require_once(WCF_DIR.'lib/system/event/EventListener.class.php');
+require_once(WCF_DIR.'lib/data/gmap/GmapApi.class.php');
 
 /**
@@ -12 +13 @@
  */
 class MapCustomInputListener implements EventListener {
+
+        public function validate($tmp) {
+                $cols = array();
+                foreach($tmp as $field) {
+                        $col = User::getUserOptionID($field);
+                        if($col) {
+                                $cols[] = $col;
+                        }
+                }
+                return $cols;
+        }
+
         /**
          * @see EventListener::execute()
@@ -23 +36 @@
                 switch($eventName) {
                         case 'readData':
+                                
                                 $this->current = explode(",", $eventObj->activeOptions['gmap_custominput']['optionValue']);
+                                $this->current = $this->validate($this->current);
+                                $eventObj->activeOptions['gmap_custominput']['optionValue'] = implode(",", $this->current);
                                 $this->getOptionIDs();
                                 $this->readOptions();
@@ -59 +75 @@
                                         document.getElementById("gmap_custominputDiv").appendChild(d);
                                         
+                                        var d = document.getElementById("gmap_custominput").value = "";
                                         document.getElementById("gmap_custominput").style.display = "none";
                                 });