Changeset 204

Timestamp:

02/04/08 20:38:33 (5 years ago)

Author:

d0nut

Message:

fontcolor is read from style

Location:

taggingreloaded

Files:

• files/acp (added)
• files/acp/update.php (moved) (moved from taggingreloaded/files/update.php)
• files/lib/system/event/listener/TaggingReloadedMessageFormListener.class.php (modified) (3 diffs)
• files/lib/system/event/listener/TaggingReloadedPageListener.class.php (modified) (3 diffs)
• files/lib/util/TaggingReloadedUtil.class.php (modified) (2 diffs)
• optionals/de.easy-coding.wbb.taggingreloaded/package.xml (modified) (2 diffs)
• package.xml (modified) (2 diffs)
• templates/messageFormTaggingReloaded.tpl (modified) (1 diff)

taggingreloaded/files/lib/system/event/listener/TaggingReloadedMessageFormListener.class.php

@@ -11 +11 @@
  */
 class TaggingReloadedMessageFormListener implements EventListener {
+        protected static $constructed = false;
+
         protected $eventObj;
         protected $className;
@@ -25 +27 @@
                 
                 // abort if the user does not have permissions to use tagging
-                if(!WCF::getUser()->getPermission('user.message.tagging')) {
+                if(!WCF::getUser()->getPermission('user.message.tagging'))
                         return;
+                        
+                // is style black?
+                if(!self::$constructed) {
+                        require_once(WCF_DIR.'lib/system/style/Style.class.php');
+                        $style = new Style(WCF::getUser()->styleID);
+                        $check = !in_array($style->getVariable('page.background.color'),array('#000','#000000'));
+                        TaggingReloadedUtil::setBlack($check);
+                        self::$constructed = false;
                 }
 
@@ -77 +87 @@
          */
         protected function assignVariables () {
+                // is style black?
+                WCF::getTPL()->assign('taggingBlack', TaggingReloadedUtil::getBlack());
+
                 switch(WCF::getUser()->getUserOption('tagging_style')) {
                         case 1:

taggingreloaded/files/lib/system/event/listener/TaggingReloadedPageListener.class.php

@@ -17 +17 @@
  */
 class TaggingReloadedPageListener implements EventListener {
+        protected static $constructed = false;
+
         protected $userID=0; // params
         
@@ -33 +35 @@
                 if(!WCF::getUser()->getUserOption('tagging_enable'))
                         return;
+                        
+                // is style black?
+                if(!self::$constructed) {
+                        require_once(WCF_DIR.'lib/system/style/Style.class.php');
+                        $style = new Style(WCF::getUser()->styleID);
+                        $check = !in_array($style->getVariable('page.background.color'),array('#000','#000000'));
+                        TaggingReloadedUtil::setBlack($check);
+                        self::$constructed = false;
+                }
         
                 $this->eventObj = $eventObj;
@@ -91 +102 @@
                                 );
                 }
-                
+
                 $this->tags = TaggingReloadedUtil::beautify($this->tags);
         }

taggingreloaded/files/lib/util/TaggingReloadedUtil.class.php

@@ -1 +1 @@
 <?php
-
 /**
  * Util for Tagging Operations
@@ -143 +142 @@
         
         /**
+         * sets color
+         */
+        public static function getBlack() {
+                return self::$black;
+        }
+        
+        /**
          * beautify tags with size and color
          * @param tags

taggingreloaded/optionals/de.easy-coding.wbb.taggingreloaded/package.xml

@@ -5 +5 @@
                 <packagename>Tagging Reloaded for WBB</packagename>
                 <packagedescription>Tagging Reloaded does not mean just tagging. It's much more!</packagedescription>
-                <version>0.7.0</version>
+                <version>0.7.1</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wbb</plugin>
@@ -30 +30 @@
                 <languages languagecode="de-informal">de-informal.xml</languages>
                 <languages languagecode="en">en.xml</languages>
+        </instructions>
+        
+        <instructions type="update" fromversion="0.7.0">
+                <files>files.tar</files>
         </instructions>
         

taggingreloaded/package.xml

@@ -17 +17 @@
         <requiredpackages>
                 <requiredpackage minversion="1.0.0">com.woltlab.wcf</requiredpackage>
+                <requiredpackage minversion="1.0.0">com.woltlab.wcf.acp.user.option</requiredpackage>
                 <requiredpackage file="requirements/de.easy-coding.wcf.data.page.publicseorewriter.tar.gz" minversion="1.1.4">de.easy-coding.wcf.data.page.publicseorewriter</requiredpackage>
         </requiredpackages>
@@ -44 +45 @@
                 <files>files.tar</files>
                 <templates>templates.tar</templates>
-                <script>update.php</script>
                 <useroptions>useroptions.xml</useroptions>
         </instructions>

taggingreloaded/templates/messageFormTaggingReloaded.tpl

@@ -10 +10 @@
                 var tagging = new TaggingReloaded(taggingdom);
                 tagging.setLimits(30,500);
-                {if false}tagging.setBlack(false);{/if}
+                tagging.setBlack({if $taggingBlack}true{else}false{/if});
         //]]>
         </script>