Added some missing comments and minor cleanup

diff --git a/wcfsetup/install/files/lib/data/contact/option/ContactOptionAction.class.php b/wcfsetup/install/files/lib/data/contact/option/ContactOptionAction.class.php
index 5686bfe5262c6638faf50659b4fb20ca572e0df1..88e09db585d6e5fc24cc3e2f61b7604cc7ac7f5e 100644 (file)
--- a/wcfsetup/install/files/lib/data/contact/option/ContactOptionAction.class.php
+++ b/wcfsetup/install/files/lib/data/contact/option/ContactOptionAction.class.php
@@ -2,12 +2,11 @@
 namespace wcf\data\contact\option;
 use wcf\data\contact\recipient\ContactRecipient;
 use wcf\data\custom\option\CustomOptionAction;
-use wcf\system\email\Email;
-use wcf\system\email\Mailbox;
 use wcf\system\email\mime\MimePartFacade;
 use wcf\system\email\mime\RecipientAwareTextMimePart;
+use wcf\system\email\Email;
+use wcf\system\email\Mailbox;
 use wcf\system\language\LanguageFactory;
-use wcf\system\mail\Mail;
 use wcf\system\option\ContactOptionHandler;
 
 /**

diff --git a/wcfsetup/install/files/lib/form/ContactForm.class.php b/wcfsetup/install/files/lib/form/ContactForm.class.php
index 586064633102f630aacde9394ada884c3f32e350..746cabf532e87482c673b251a21569be5f6c95fe 100644 (file)
--- a/wcfsetup/install/files/lib/form/ContactForm.class.php
+++ b/wcfsetup/install/files/lib/form/ContactForm.class.php
@@ -20,8 +20,16 @@ use wcf\util\StringUtil;
  * @package    WoltLabSuite\Core\Form
  */
 class ContactForm extends AbstractCaptchaForm {
+       /**
+        * sender email address
+        * @var string
+        */
        public $email = '';
        
+       /**
+        * sender name
+        * @var string
+        */
        public $name = '';
        
        /**
@@ -63,6 +71,9 @@ class ContactForm extends AbstractCaptchaForm {
                }
        }
        
+       /**
+        * @inheritDoc
+        */
        public function readFormParameters() {
                parent::readFormParameters();
                

diff --git a/wcfsetup/install/files/lib/system/option/ContactOptionHandler.class.php b/wcfsetup/install/files/lib/system/option/ContactOptionHandler.class.php
index b49dac862d1ce98f9198284a98d2c24d4d8d5270..ac77347a91d7fdd935d470d9de51afef964e2155 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/ContactOptionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/option/ContactOptionHandler.class.php
@@ -2,6 +2,14 @@
 namespace wcf\system\option;
 use wcf\system\cache\builder\ContactOptionCacheBuilder;
 
+/**
+ * Option handler implementation for the contact form.
+ * 
+ * @author     Alexander Ebert
+ * @copyright  2001-2017 WoltLab GmbH
+ * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package    WoltLabSuite\Core\System\Option
+ */
 class ContactOptionHandler extends CustomOptionHandler {
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/system/option/CustomOptionHandler.class.php b/wcfsetup/install/files/lib/system/option/CustomOptionHandler.class.php
index 948b3317552cdb5ae96927901fcd5482c73674cd..38d8b37fb11d5d9989820efce14f98503bf332db 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/CustomOptionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/option/CustomOptionHandler.class.php
@@ -5,14 +5,20 @@ use wcf\data\option\Option;
 use wcf\system\exception\NotImplementedException;
 use wcf\system\exception\UserInputException;
 
+/**
+ * Default implementation for custom option handling.
+ * 
+ * @author     Alexander Ebert
+ * @copyright  2001-2017 WoltLab GmbH
+ * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package    WoltLabSuite\Core\System\Option
+ */
 abstract class CustomOptionHandler extends OptionHandler {
        /**
         * Gets all options and option categories from cache.
         */
        protected function readCache() {
                throw new NotImplementedException();
-               
-               $this->cachedOptions = FileOptionCacheBuilder::getInstance()->getData();
        }
        
        /**