Changeset 1321

Timestamp:

03/06/11 19:13:48 (2 years ago)

Author:

Torben Brodt

Message:

users registering with twitter need to accept the rules

Location:

twitter

Files:

• eventlistener.xml (modified) (1 diff)
• files/lib/system/event/listener/UserLoginTwitterListener.class.php (modified) (3 diffs)
• files/lib/util/TwitterUtil.class.php (modified) (1 diff)
• package.xml (modified) (1 diff)
• useroptions.xml (modified) (1 diff)

twitter/eventlistener.xml

@@ -6 +6 @@
                         <eventclassname>SessionFactory</eventclassname>
                         <eventname>didInit</eventname>
+                        <inherit>1</inherit>
                         <listenerclassfile>lib/system/event/listener/UserLoginTwitterListener.class.php</listenerclassfile>
                 </eventlistener>

twitter/files/lib/system/event/listener/UserLoginTwitterListener.class.php

@@ -30 +30 @@
                         
                         // did agree with rules?
-                        case 'SessionFactory':
+                        default:
                                 // didInit
-                                $this->validateRuleAgree($eventObj->session);
+                                if($eventObj instanceof SessionFactory) $this->validateRuleAgree($eventObj->session);
                         break;
                 
@@ -96 +96 @@
                 
                 // if the modul activate and the user is twitter user he must agree the rules after a change, and the user is not a guest.
-                if ($session->getUser()->userID && TwitterUtil::hasTwitterUser($session->getUser()->userID)) {
+                if ($session->getUser()->userID && $session->getUser()->didSkipRulesTwitter) {
                         // select all packageids of the packages where the user is agree with the rules.
                         $packageIDs = $session->getVar('package_agrees');
@@ -104 +104 @@
                                 // we check the agreement, is the user agree with the rules, we put the package id in to the array and leave the event.
                                 if (Ruleset::isUserAgree($session->getUser()->userID, PACKAGE_ID)) {
-                                        if (is_null($packageIDs) || !is_array($packageIDs)) 
+                                        if (is_null($packageIDs) || !is_array($packageIDs)) {
                                                 $packageIDs = array(PACKAGE_ID);
-                                        else $packageIDs[] = PACKAGE_ID;
-                                                $session->register('package_agrees', $packageIDs);
+                                        } else {
+                                                $packageIDs[] = PACKAGE_ID;
+                                        }
+                                        $session->register('package_agrees', $packageIDs);
+                                        
+                                        $session->getUser()->getEditor()->update(null, null, null, null, array(
+                                                array(
+                                                        'optionID' => User::getUserOptionID('didSkipRulesTwitter'),
+                                                        'optionValue' => 0
+                                                )
+                                        ));
                                         return;
                                 }

twitter/files/lib/util/TwitterUtil.class.php

@@ -380 +380 @@
                 $groups = array();
                 $activeOptions = array();
+                
+                // did skip the rules
+                if (MODULE_RULE && $session->getUser()->getPermission('admin.general.canIgnoreRules') == false) {
+                        $activeOptions[] = array(
+                                'optionID' => User::getUserOptionID('didSkipRulesTwitter'),
+                                'optionValue' => 1
+                        );
+                }
 
                 $additionalFields = array();

twitter/package.xml

@@ -45 +45 @@
                 <languages languagecode="de">de.xml</languages>
                 <languages languagecode="de-informal">de.xml</languages>
+                <useroptions>useroptions.xml</useroptions>
         </instructions>
         <instructions type="update" fromversion="1.1.2">

twitter/useroptions.xml

@@ -10 +10 @@
                                 <outputclass>UserOptionOutputTwitter</outputclass>
                         </option>
+                        <option name="didSkipRulesTwitter">
+                                <categoryname>hidden</categoryname>
+                                <optiontype>boolean</optiontype>
+                                <defaultValue>0</defaultValue>
+                        </option>
                 </options>
         </import>