Changeset 299

Timestamp:

03/08/08 22:25:09 (5 years ago)

Author:

d0nut

Message:

bugfixes

Location:

application.register

Files:

• de-informal.xml (modified) (1 diff)
• de.xml (modified) (1 diff)
• en.xml (modified) (1 diff)
• files/lib/action/UserGroupOptionsAction.class.php (modified) (3 diffs)
• files/lib/system/event/listener/ApplicationRegisterListener.class.php (modified) (1 diff)
• files/lib/system/event/listener/UserGroupAdministrateMailListener.class.php (modified) (1 diff)
• files/lib/system/event/listener/UserGroupApplyMailListener.class.php (modified) (1 diff)
• install.sql (modified) (2 diffs)

application.register/de-informal.xml

@@ -37 +37 @@
                 <item name="wcf.groupapplymail.enableEmailNotification.6"><![CDATA[E-Mail-Benachrichtigung bei Bewerbungen]]></item>
                 <item name="wcf.groupapplymail.enableEmailNotification.6.description"><![CDATA[]]></item>
+                <item name="wcf.groupapplymail.enableDisplayNotification.5"><![CDATA[Hinweisbox bei Neuaufnahmen]]></item>
+                <item name="wcf.groupapplymail.enableDisplayNotification.5.description"><![CDATA[]]></item>
+                <item name="wcf.groupapplymail.enableDisplayNotification.6"><![CDATA[Hinweisbox bei Bewerbungen]]></item>
+                <item name="wcf.groupapplymail.enableDisplayNotification.6.description"><![CDATA[]]></item>
         </category>
 </language>

application.register/de.xml

@@ -37 +37 @@
                 <item name="wcf.groupapplymail.enableEmailNotification.6"><![CDATA[E-Mail-Benachrichtigung bei Bewerbungen]]></item>
                 <item name="wcf.groupapplymail.enableEmailNotification.6.description"><![CDATA[]]></item>
+                <item name="wcf.groupapplymail.enableDisplayNotification.5"><![CDATA[Hinweisbox bei Neuaufnahmen]]></item>
+                <item name="wcf.groupapplymail.enableDisplayNotification.5.description"><![CDATA[]]></item>
+                <item name="wcf.groupapplymail.enableDisplayNotification.6"><![CDATA[Hinweisbox bei Bewerbungen]]></item>
+                <item name="wcf.groupapplymail.enableDisplayNotification.6.description"><![CDATA[]]></item>
         </category>
 </language>

application.register/en.xml

@@ -37 +37 @@
                 <item name="wcf.groupapplymail.enableEmailNotification.6"><![CDATA[E-Mail-Notification after application]]></item>
                 <item name="wcf.groupapplymail.enableEmailNotification.6.description"><![CDATA[]]></item>
+                <item name="wcf.groupapplymail.enableDisplayNotification.5"><![CDATA[Infobox after join]]></item>
+                <item name="wcf.groupapplymail.enableDisplayNotification.5.description"><![CDATA[]]></item>
+                <item name="wcf.groupapplymail.enableDisplayNotification.6"><![CDATA[Infobox after application]]></item>
+                <item name="wcf.groupapplymail.enableDisplayNotification.6.description"><![CDATA[]]></item>
         </category>
 </language>

application.register/files/lib/action/UserGroupOptionsAction.class.php

@@ -6 +6 @@
  * saves group options
  *
- * @author      Torben Brodt
- * @package     de.easy-coding.wcf.groupapplymail
+ * @author      Markus Gerdelmann, Torben Brodt
+ * @package     de.mdman.application.register
  * @license     GNU General Public License <http://opensource.org/licenses/gpl-3.0.html>
  */
@@ -46 +46 @@
                 if($this->displayNotification || $this->emailNotification) {
                         $sql = "INSERT
-                                INTO            wcf".WCF_N."_groupapplymail
+                                INTO            wcf".WCF_N."_group_application_mail
                                                 (userID, groupID, displayNotification, emailNotification)
                                 VALUES
@@ -56 +56 @@
                 } else {
                         $sql = "DELETE FROM 
-                                                wcf".WCF_N."_groupapplymail
+                                                wcf".WCF_N."_group_application_mail
                                 WHERE           userID = ".WCF::getUser()->userID."
                                 AND             groupID = ".intval($this->groupID);

application.register/files/lib/system/event/listener/ApplicationRegisterListener.class.php

@@ -24 +24 @@
 
                 $sql = "SELECT                  COUNT(*) AS c
-                        FROM                    wcf".WCF_N."_group_application_notification
+                        FROM                    wcf".WCF_N."_group_application_notification notification
                         NATURAL JOIN            wcf".WCF_N."_group_application application
                         WHERE                   application.groupID IN (

application.register/files/lib/system/event/listener/UserGroupAdministrateMailListener.class.php

@@ -56 +56 @@
                 WCF::getTPL()->assign(array(
                         'groupID' => $this->eventObj->groupID,
-                        'displayl' => $this->displayNotification,
+                        'display' => $this->displayNotification,
                         'email' => $this->emailNotification,
                         'groupType' => $this->eventObj->group->groupType

application.register/files/lib/system/event/listener/UserGroupApplyMailListener.class.php

@@ -11 +11 @@
  */
 class UserGroupApplyMailListener implements EventListener {
-        protected $this->eventObj;
+        protected $eventObj;
 
         /**

application.register/install.sql

@@ -1 +1 @@
 DROP TABLE IF EXISTS wcf1_group_application_mail;
-CREATE TABLE IF NOT EXISTS wcf1_group_application_mail (
+CREATE TABLE wcf1_group_application_mail (
   userID int(10) unsigned NOT NULL,
   groupID int(10) unsigned NOT NULL,
@@ -9 +9 @@
 
 DROP TABLE IF EXISTS wcf1_group_application_notification;
-CREATE TABLE IF NOT EXISTS wcf1_group_application_notification (
+CREATE TABLE wcf1_group_application_notification (
   applicationID int(11) unsigned NOT NULL,
   userID int(10) unsigned NOT NULL,