Changeset 1054

Timestamp:

10/03/09 21:55:55 (4 years ago)

Author:

MDMAN

Message:

Webdisk Importer IT4All Filebase Platinum --> neue Version 1.1.0 --> kompatibel zum WBB 3.1 und Webdisk 1.1.0 --> files/lib/data/database/importer/IT4AllFilebase11xExporter.class.php angepasst. Bugfix in der Kategory-Sortierung

Location:

de.wbb-security.database.importer.it4allfb.11x

Files:

• files/lib/data/database/importer/IT4AllFilebase11xExporter.class.php (modified) (4 diffs)
• package.xml (modified) (3 diffs)

de.wbb-security.database.importer.it4allfb.11x/files/lib/data/database/importer/IT4AllFilebase11xExporter.class.php

@@ -152 +152 @@
         * @param        Integer $right                  RightID of category
         */
-        protected function getParentID($categoryID,$left,$right) {
-                $parent = $this->getDB()->getFirstRow("SELECT * FROM ".$this->dbPrefix."fp".$this->settings['dbNumber']."_cats WHERE left_id < ".$left." AND right_id > ".$right." ORDER BY `left_id` DESC");
+        protected function getParentID($left,$right,$root) {
+                
+                $parent = $this->getDB()->getFirstRow("SELECT cat_id FROM ".$this->dbPrefix."fp".$this->settings['dbNumber']."_cats WHERE left_id < ".$left." AND right_id > ".$right." AND root_id = ".$root." ORDER BY `left_id` DESC");      
+                
                 if($parent['cat_id'] > 0) {
                         return $parent['cat_id'] ;
@@ -166 +168 @@
          */
         public function exportCategories($offset,$limit) {
-                $result = $this->getDB()->sendQuery("SELECT * FROM ".$this->dbPrefix."fp".$this->settings['dbNumber']."_cats",$limit,$offset);
-                while($row = $this->getDB()->fetchArray($result)) {
-                        $this->getImporter()->importCategory("c".$row['cat_id'],$row['cat_name'],$row['cat_desc'],"c".$this->getParentID($row['cat_id'],$row['left_id'],$row['right_id']),$row['cat_order'],1,"",0);
+                $result = $this->getDB()->sendQuery("SELECT * FROM ".$this->dbPrefix."fp".$this->settings['dbNumber']."_cats ORDER BY root_id, left_id ASC",$limit,$offset);
+                
+                while($row = $this->getDB()->fetchArray($result)) {
+                        $this->getImporter()->importCategory("c".$row['cat_id'],$row['cat_name'],$row['cat_desc'],"c".$this->getParentID($row['left_id'],$row['right_id'],$row['root_id']),$row['cat_order'],1,"",0);
                 }
         }
@@ -262 +265 @@
                                         "isBinary" => 1,
                                         "isImage" => 1,
-                                        "messageID" => $item['value'],
-                                        "messageType" => "database",
-                                        "packageID" => PACKAGE_ID,
+                                        "containerID" => $item['value'],
+                                        "containerType" => "database",
+                                        "packageID" => WCF::getPackageID("de.wbb-security.database"),
                                         "idHash" => StringUtil::getRandomID(),
                                         "userID" => $row['userid'],
@@ -278 +281 @@
                                 
                                 AttachmentsEditor::saveThumbnail($attachment);
+                                
+                                //update inline attachments - its dirty!
+                                $sql = "SELECT  itemID, content
+                                        FROM    wcf".WCF_N."_database_item
+                                        WHERE   itemID='".$item['value']."'";
+
+                                $databaseItem = WCF::getDB()->getFirstRow($sql);
+                                $message = str_replace("[attach=".$row['file_id']."][/attach]","[attach=".$attachment['attachmentID']."][/attach]", $databaseItem['content']);
+
+                                if($message != $databaseItem['content']) {
+                                        $sql = "UPDATE
+                                                wcf".WCF_N."_database_item
+                                                SET             content='".escapeString($message)."'
+                                                WHERE   itemID='".$item['value']."'";
+
+                                        WCF::getDB()->sendQuery($sql);
+
+                                }
                         }
                         

de.wbb-security.database.importer.it4allfb.11x/package.xml

@@ -7 +7 @@
                 <standalone>0</standalone>
                 <isUnique>1</isUnique>
-                <version>1.0.0 pl 1</version>
+                <version>1.1.0</version>
                 <plugin>de.wbb-security.database</plugin>
-                <date>2009-03-24</date>
+                <date>2009-10-01</date>
         </packageInformation>
 
@@ -18 +18 @@
 
         <requiredPackages>
-                <requiredPackage minversion="1.0.0">com.woltlab.wcf</requiredPackage>
+                <requiredPackage minversion="1.1.0 RC 2">com.woltlab.wcf</requiredPackage>
                 <requiredPackage minversion="1.0.0">de.wbb-security.database</requiredPackage>  
                 <requiredPackage minversion="1.0.0">de.wbb-security.database.importer</requiredPackage>
@@ -33 +33 @@
         </instructions>
         
-        <instructions type="update" fromversion="1.0.0 RC *">
-                <files>files.tar</files>
-        </instructions>
-        
         <instructions type="update" fromversion="1.0.0">
                 <files>files.tar</files>
         </instructions>
         
+        <instructions type="update" fromversion="1.0.0 *">
+                <files>files.tar</files>
+        </instructions> 
+        
 </package>