Changeset 1243

Timestamp:

10/12/10 19:55:51 (3 years ago)

Author:

d0nut

Message:

release g-map 2.0.1, with de-informal and use of wcf_n constant

Location:

g-map

Files:

• de-informal.xml (copied) (copied from g-map/de.xml)
• optionals/de.gmap.wbb/files/lib/acp/action/UpdateMapAction.class.php (modified) (6 diffs)
• package.xml (modified) (4 diffs)

g-map/optionals/de.gmap.wbb/files/lib/acp/action/UpdateMapAction.class.php

@@ -5 +5 @@
 /**
  * Updates the map locations
- * 
+ *
  * @package     de.gmap.wbb
  * @author      Torben Brodt
@@ -12 +12 @@
 class UpdateMapAction extends UpdateCounterAction {
         public $action = 'UpdateMap';
-        
+
         /**
          * @see Action::execute()
@@ -18 +18 @@
         public function execute() {
                 parent::execute();
-                
+
                 $col = User::getUserOptionID('location');
                 $api = new GmapApi();
-                
+
                 if(empty($col) || !$api->isActive()) {
                         $this->calcProgress();
                         $this->finish();
                 }
-                
+
                 $col = "userOption".$col;
-                
+
                 // count board
                 $sql = "SELECT          COUNT(*) AS count
@@ -35 +35 @@
                 $row = WCF::getDB()->getFirstRow($sql);
                 $count = $row['count'];
-                
+
                 $i = 0;
-                
+
                 // cleanup disabled users
-                $sql = 'DELETE FROM     wcf1_gmap_user
-                        USING           wcf1_gmap_user
-                        LEFT JOIN       wcf1_user ON wcf1_gmap_user.userID = wcf1_user.userID
-                        WHERE           ISNULL(wcf1_user.userID)';
+                $sql = 'DELETE FROM     wcf'.WCF_N.'_gmap_user
+                        USING           wcf'.WCF_N.'_gmap_user
+                        LEFT JOIN       wcf'.WCF_N.'_user ON wcf'.WCF_N.'_gmap_user.userID = wcf'.WCF_N.'_user.userID
+                        WHERE           ISNULL(wcf'.WCF_N.'_user.userID)';
                 WCF::getDB()->sendQuery($sql);
-                
+
                 // update
                 $sql = "SELECT          userID,
@@ -54 +54 @@
                 while ($row = WCF::getDB()->fetchArray($result)) {
                         $point = $api->search($row['loc']);
-                        
+
                         if($point) {
                                 $sql = "REPLACE INTO    wcf".WCF_N."_gmap_user
@@ -61 +61 @@
                                 WCF::getDB()->sendQuery($sql);
                         }
-                        
+
                         $i++;
                 }
-                
+
                 if ($i == 0) {
                         $this->calcProgress();
                         $this->finish();
                 }
-                
+
                 $this->calcProgress(($this->limit * $this->loop), $count);
                 $this->nextLoop();

g-map/package.xml

@@ -10 +10 @@
                 <packagedescription language="it"><![CDATA[Questo pacchetto aggiunge una mappa di Google sul tuo forum.]]></packagedescription>
                 <isunique>1</isunique>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf</plugin>
@@ -37 +37 @@
                 <pagelocation>pagelocation.xml</pagelocation>
                 <languages languagecode="de">de.xml</languages>
+                <languages languagecode="de-informal">de-informal.xml</languages>
                 <languages languagecode="en">en.xml</languages>
                 <languages languagecode="it">it.xml</languages>
@@ -45 +46 @@
         </instructions>
         
+        <instructions type="update" fromversion="2.0.0">
+                <files>files.tar</files>
+                <languages languagecode="de-informal">de-informal.xml</languages>
+        </instructions>
+        
         <instructions type="update" fromversion="2.0.0 RC 3">
                 <files>files.tar</files>
+                <languages languagecode="de-informal">de-informal.xml</languages>
                 <pagemenu>pagemenu.xml</pagemenu>
                 <languages languagecode="it">it.xml</languages>
@@ -54 +61 @@
         <instructions type="update" fromversion="2.0.0 RC 2">
                 <files>files.tar</files>
+                <languages languagecode="de-informal">de-informal.xml</languages>
                 <pagemenu>pagemenu.xml</pagemenu>
                 <languages languagecode="it">it.xml</languages>