Changeset 661

Timestamp:

09/26/08 22:49:53 (5 years ago)

Author:

Tatzelwurm

Message:

New try, need help optimising/cleaning code.

Location:

de.inside.Gewinnspiel

Files:

• files/acp/images/acpLogo.png (modified) (previous)
• files/lib/acp/action/GewinnspielDeleteAction.class.php (modified) (3 diffs)
• files/lib/acp/form/GewinnspielAddForm.class.php (modified) (2 diffs)
• files/lib/acp/form/GewinnspielEditForm.class.php (modified) (7 diffs)
• files/lib/form/GewinnspielForm.class.php (modified) (17 diffs)
• files/lib/page/IndexPage.class.php (modified) (5 diffs)
• files/lib/system/cache/CacheBuilderGWSPGames.class.php (modified) (2 diffs)
• files/lib/system/cache/CacheBuilderGWSPUser.class.php (modified) (1 diff)
• files/style/competition.css (modified) (1 diff)
• package.xml (modified) (1 diff)
• templates/footer.tpl (modified) (1 diff)
• templates/gewinnspiel.tpl (modified) (4 diffs)
• templates/index.tpl (modified) (5 diffs)

de.inside.Gewinnspiel/files/lib/acp/action/GewinnspielDeleteAction.class.php

@@ -12 +12 @@
 
 class GewinnspielDeleteAction extends AbstractAction {
-        public $gwsID = 0;
+        public $gwspID = 0;
         
         /**
@@ -20 +20 @@
                 parent::readParameters();
                 
-                if (isset($_REQUEST['gwsID'])) $this->gwsID = intval($_REQUEST['gwsID']);
+                if (isset($_REQUEST['gwspID'])) $this->gwspID = intval($_REQUEST['gwspID']);
         }
         
@@ -31 +31 @@
                 // delete game
                 $sql = "DELETE FROM     gwsp".GWSP_N."_game
-                        WHERE           gwsID = ".$this->gwsID;
+                        WHERE           gwsID = ".$this->gwspID;
                 WCF::getDB()->sendQuery($sql);
                 $sql = "DELETE FROM     gwsp".GWSP_N."_options
-                        WHERE           gwsID = ".$this->gwsID;
+                        WHERE           gwsID = ".$this->gwspID;
                 WCF::getDB()->sendQuery($sql);
                 $sql = "DELETE FROM     gwsp".GWSP_N."_spiel
-                        WHERE           gwsID = ".$this->gwsID;
+                        WHERE           gwsID = ".$this->gwspID;
                 WCF::getDB()->sendQuery($sql);
+                // reset cache
+                GWSPACP::getCache()->clear(GWSP_DIR.'cache/', 'competition.games-'.PACKAGE_ID.'.php');
+                GWSPACP::getCache()->clear(GWSP_DIR.'cache/', 'competition.user-'.PACKAGE_ID.'.php');
                 // forward to list page
-                header('Location: index.php?page=GewinnspielList&deletedgwsID='.$this->gwsID.'&packageID='.PACKAGE_ID.SID_ARG_2ND_NOT_ENCODED);
+                header('Location: index.php?page=GewinnspielList&deletedgwsID='.$this->gwspID.'&packageID='.PACKAGE_ID.SID_ARG_2ND_NOT_ENCODED);
                 exit;
         }

de.inside.Gewinnspiel/files/lib/acp/form/GewinnspielAddForm.class.php

@@ -53 +53 @@
         public function show() {
                 // enable menu item
-                WCFACP::getMenu()->setActiveMenuItem('gws.acp.menu.link.content.games');
+                GWSPACP::getMenu()->setActiveMenuItem('gws.acp.menu.link.content.games');
 
                 // check permission
@@ -193 +193 @@
                         }
                 }
+                // reset cache
+                GWSPACP::getCache()->clear(GWSP_DIR.'cache/', 'competition.games-'.PACKAGE_ID.'.php');
                 // forward to list page
                 header('Location: index.php?page=GewinnspielList&packageID='.PACKAGE_ID.SID_ARG_2ND_NOT_ENCODED);

de.inside.Gewinnspiel/files/lib/acp/form/GewinnspielEditForm.class.php

@@ -43 +43 @@
                                         FROM            gwsp".GWSP_N."_game
                                         WHERE           gwsID = '".$this->gwsID."'";
-                        $result = WCF::getDB()->sendQuery($sql);
-                        while ($row = WCF::getDB()->fetchArray($result)) {
+                        $result = GWSPACP::getDB()->sendQuery($sql);
+                        while ($row = GWSPACP::getDB()->fetchArray($result)) {
                                 $games =array('gwsID'           => $row['gwsID'],
                                                           'gwsTitel'    => $row['gwsTitel'],
@@ -64 +64 @@
                                         WHERE           gwsID = ".$this->gwsID."
                                         ORDER BY        showOrder";
-                        $result = WCF::getDB()->sendQuery($sql);
-                        while ($row = WCF::getDB()->fetchArray($result)) {
+                        $result = GWSPACP::getDB()->sendQuery($sql);
+                        while ($row = GWSPACP::getDB()->fetchArray($result)) {
                                 $this->gwsOptionsArray[] .= "$row[gwsOption]";
                         }
@@ -103 +103 @@
                 parent::assignVariables();
 
-                WCF::getTPL()->assign(array(
+                GWSPACP::getTPL()->assign(array(
                         'gwsID' => $this->gwsID,
                         'action' => 'edit',
@@ -128 +128 @@
                                 WHERE           gwsID = ".$this->gwsID."
                                 ORDER BY        showOrder";
-                $result = WCF::getDB()->sendQuery($sql);
-                while ($row = WCF::getDB()->fetchArray($result)) {
+                $result = GWSPACP::getDB()->sendQuery($sql);
+                while ($row = GWSPACP::getDB()->fetchArray($result)) {
                         $this->gwsOldOptionsArray[] .= "$row[gwsOption]";
                 }
@@ -141 +141 @@
                                                                 '".escapeString($this->gwsOptionsArray[$showOrder])."',
                                                                 ".$showOrder.")";
-                                WCF::getDB()->registerShutdownUpdate($sql);
+                                GWSPACP::getDB()->registerShutdownUpdate($sql);
                         // wenn noch alt Optionen vorhanden sind dann lschen
                         } elseif(empty($this->gwsOptionsArray[$showOrder]) && $this->gwsOldOptionsArray[$showOrder]) {
                                 $sql = "DELETE FROM     gwsp".GWSP_N."_options
                                                 WHERE   gwsID = ".$this->gwsID." AND showOrder = ".$showOrder;
-                                WCF::getDB()->registerShutdownUpdate($sql);
+                                GWSPACP::getDB()->registerShutdownUpdate($sql);
                         // wenn alte Optione nicht gleich der neuen dann UPDATE
                         } elseif ($this->gwsOptionsArray[$showOrder] != $this->gwsOldOptionsArray[$showOrder]){
@@ -152 +152 @@
                                                 SET     gwsOption = '".escapeString($this->gwsOptionsArray[$showOrder])."'
                                                 WHERE   gwsID = ".$this->gwsID." AND showOrder = ".$showOrder;
-                                WCF::getDB()->registerShutdownUpdate($sql);
+                                GWSPACP::getDB()->registerShutdownUpdate($sql);
                         }
                 }
@@ -167 +167 @@
                                 money           = '".intval($this->money)."'
                                 WHERE   gwsID   = " .$this->gwsID;
-                        WCF::getDB()->registerShutdownUpdate($sql);
+                        GWSPACP::getDB()->registerShutdownUpdate($sql);
+                        // reset cache
+                        GWSPACP::getCache()->clear(GWSP_DIR.'cache/', 'competition.games-'.PACKAGE_ID.'.php');
                         // forward to list page
                         header('Location: index.php?page=GewinnspielList&packageID='.PACKAGE_ID.SID_ARG_2ND_NOT_ENCODED);

de.inside.Gewinnspiel/files/lib/form/GewinnspielForm.class.php

@@ -61 +61 @@
                 if (!$this->gwsID){
                         require_once(WCF_DIR.'lib/system/exception/NamedUserException.class.php');
-                        throw new NamedUserException(WCF::getLanguage()->get('gws.gewinnspiel.wrongid'));
+                        throw new NamedUserException(GWSPCore::getLanguage()->get('gws.gewinnspiel.wrongid'));
                         exit;
                 }
@@ -131 +131 @@
                 //              parent::validate();
                 // Kontrolle ob Gast schon teilgenommen hat
-                $id = WCF::getUser()->userID;
+                $id = GWSPCore::getUser()->userID;
                 if (!$id){
                         $sql = "SELECT  `ipaddress`, `email`, `realName`
                                         FROM    gwsp".GWSP_N."_spiel
                                         WHERE   `gwsID` = $this->gwsID AND `userID` = 0";
-                        $result = WCF::getDB()->sendQuery($sql);
-                        while ($row = WCF::getDB()->fetchArray($result)) {
+                        $result = GWSPCore::getDB()->sendQuery($sql);
+                        while ($row = GWSPCore::getDB()->fetchArray($result)) {
                                         $ipArray[]              = "$row[ipaddress]";
                                         $mailArray[]    = "$row[email]";
@@ -146 +146 @@
                                         if (StringUtil::toLowerCase($mailArray[$key]) == StringUtil::toLowerCase($this->useremail) || StringUtil::toLowerCase($rnArray[$key]) == StringUtil::toLowerCase($this->userreal)){
                                                 require_once(WCF_DIR.'lib/system/exception/NamedUserException.class.php');
-                                                throw new NamedUserException(WCF::getLanguage()->get('gws.gewinnspiel.alreadyplayed'));
+                                                throw new NamedUserException(GWSPCore::getLanguage()->get('gws.gewinnspiel.alreadyplayed'));
                                                 exit;
                                         }
@@ -166 +166 @@
                                         (gwsID, userID, ipaddress, email, realName)
                                         VALUES  (".intval($this->gwsID).",
-                                                        ".intval(WCF::getUser()->userID).",
-                                                        '".escapeString(WCF::getSession()->ipAddress)."',
+                                                        ".intval(GWSPCore::getUser()->userID).",
+                                                        '".escapeString(GWSPCore::getSession()->ipAddress)."',
                                                         '".$this->useremail."',
                                                         '".$this->userreal."')";
-                        WCF::getDB()->sendQuery($sql);
-
-                        // E-Mail des Empfngers holen.
+                        GWSPCore::getDB()->sendQuery($sql);
+
+                        // Competition Mod E-Mail.
                         $sql = "SELECT  `recipient`
                                         FROM    gwsp".GWSP_N."_game
                                         WHERE   gwsID = $this->gwsID";
-                        $result = WCF::getDB()->getFirstRow($sql);
+                        $result = GWSPCore::getDB()->getFirstRow($sql);
                         $this->empfnger = $result['recipient'];
                         // E-Mail vorbeiten und senden
@@ -185 +185 @@
                                         WHERE           gwsID = ".$this->gwsID."
                                         ORDER BY        showOrder";
-                        $result = WCF::getDB()->sendQuery($sql);
-                        while ($row = WCF::getDB()->fetchArray($result)) {
+                        $result = GWSPCore::getDB()->sendQuery($sql);
+                        while ($row = GWSPCore::getDB()->fetchArray($result)) {
                                 $this->gwsOptionsArray[] .= "$row[gwsOption]";
                         }
-                        $frage = WCF::getLanguage()->get('gws.gewinnspiel.frage');
-                        $antwort = WCF::getLanguage()->get('gws.gewinnspiel.antwort');
+                        $frage = GWSPCore::getLanguage()->get('gws.gewinnspiel.frage');
+                        $antwort = GWSPCore::getLanguage()->get('gws.gewinnspiel.antwort');
                         foreach ($this->gwsOptionsArray as $key =>$option){
                                 $this->frageantwort .= $frage.": "."$option"."\n".$antwort.": ".$this->answer[$key]."\n"."\n";
                         }
-                        $languages = array(0 => WCF::getLanguage(), WCF::getLanguage()->getLanguageID() => WCF::getLanguage());
+                        $languages = array(0 => GWSPCore::getLanguage(), GWSPCore::getLanguage()->getLanguageID() => GWSPCore::getLanguage());
                         require_once(WCF_DIR.'lib/data/mail/Mail.class.php');
                         require_once(WCF_DIR.'lib/data/user/User.class.php');
                         // get language
                         // enable language
-                        $languages[WCF::getLanguage()->getLanguageID()]->setLocale();
+                        $languages[GWSPCore::getLanguage()->getLanguageID()]->setLocale();
                         
                         $subjectData = array('PAGE_TITLE' => PAGE_TITLE);
@@ -214 +214 @@
                         // Mail an den User
                         $mail = new Mail(       array($this->userreal => $this->useremail),
-                                                                $languages[WCF::getLanguage()->getLanguageID()]->get('gws.gewinnspiel.mail.subject', $subjectData),
-                                                                $languages[WCF::getLanguage()->getLanguageID()]->get('gws.gewinnspiel.mail.message', $messageData));
+                                                                $languages[GWSPCore::getLanguage()->getLanguageID()]->get('gws.gewinnspiel.mail.subject', $subjectData),
+                                                                $languages[GWSPCore::getLanguage()->getLanguageID()]->get('gws.gewinnspiel.mail.message', $messageData));
                         $mail->send();
                         // Mail an den Veranstalter
                         $mail = new Mail(       $this->empfnger,
-                                                                $languages[WCF::getLanguage()->getLanguageID()]->get('gws.gewinnspiel.mail.subject.recipient', $subjectData),
-                                                                $languages[WCF::getLanguage()->getLanguageID()]->get('gws.gewinnspiel.mail.message.recipient', $messageData));
+                                                                $languages[GWSPCore::getLanguage()->getLanguageID()]->get('gws.gewinnspiel.mail.subject.recipient', $subjectData),
+                                                                $languages[GWSPCore::getLanguage()->getLanguageID()]->get('gws.gewinnspiel.mail.message.recipient', $messageData));
                         $mail->send();
                         
                         // enable user language
-                        WCF::getLanguage()->setLocale();
-                        
+                        GWSPCore::getLanguage()->setLocale();
+                        // reset cache
+                        GWSPCore::getCache()->clear(GWSP_DIR.'cache/', 'competition.user-'.PACKAGE_ID.'.php');
                         // forward to index page
-                        WCF::getTPL()->assign(array(
-                                'url' => 'index.php?page=Gewinnspiel'.SID_ARG_1ST,
-                                'message' => WCF::getLanguage()->get(WCF::getLanguage()->get('gws.gewinnspiel.ok_redirect'), array('$userreal' => $this->username, '$uemail' => $this->useremail))
+                        GWSPCore::getTPL()->assign(array(
+                                'url' => 'index.php?page=Index'.SID_ARG_1ST,
+                                'message' => GWSPCore::getLanguage()->get(GWSPCore::getLanguage()->get('gws.gewinnspiel.ok_redirect'), array('$userreal' => $this->username, '$uemail' => $this->useremail))
                         ));
-                        WCF::getTPL()->display('redirect');
+                        GWSPCore::getTPL()->display('redirect');
                         exit;
                 }
@@ -241 +242 @@
         public function readData() {
                 parent::readData();
-                if ((WCF::getUser()->userID) > 0){
-                        $this->username         = WCF::getUser()->username;
-                        $this->useremail = $this->useremailconfirm      = WCF::getUser()->email;
+                if ((GWSPCore::getUser()->userID) > 0){
+                        $this->username         = GWSPCore::getUser()->username;
+                        $this->useremail = $this->useremailconfirm      = GWSPCore::getUser()->email;
                 }else{
                         if (!count($_POST)) {
-                                $this->username = WCF::getLanguage()->get('gws.gewinnspiel.username.gast');
+                                $this->username = GWSPCore::getLanguage()->get('gws.gewinnspiel.username.gast');
                                 $this->useremail = $this->useremailconfirm = '';
                         }
@@ -283 +284 @@
         public function show() {
                 // get the default langauge id
-                $this->languageID = WCF::getLanguage()->getLanguageID();
+                $this->languageID = GWSPCore::getLanguage()->getLanguageID();
                 // show form
                 parent::show();
@@ -290 +291 @@
         protected function checkPermissions() {
                 // Kontrolle ob User schon teilgenommen hat (nicht bei Gsten)
-                $id = WCF::getUser()->userID;
+                $id = GWSPCore::getUser()->userID;
                 if ($id){
                         $sql = "SELECT  COUNT(userID) AS users
                                         FROM    gwsp".GWSP_N."_spiel
                                         WHERE   gwsID = '.$this->gwsID.'  AND userID = '.$id.'";
-                        $row = WCF::getDB()->getFirstRow($sql);
+                        $row = GWSPCore::getDB()->getFirstRow($sql);
                         if ($row['users'])      {               
                                 require_once(WCF_DIR.'lib/system/exception/NamedUserException.class.php');
-                                throw new NamedUserException(WCF::getLanguage()->get('gws.gewinnspiel.alreadyplayed'));
+                                throw new NamedUserException(GWSPCore::getLanguage()->get('gws.gewinnspiel.alreadyplayed'));
                                 exit;
                         }
@@ -306 +307 @@
                                 FROM    gwsp".GWSP_N."_game
                                 WHERE   gwsID = $this->gwsID";
-                $result = WCF::getDB()->sendQuery($sql);
-                $row = WCF::getDB()->fetchArray($result);
+                $result = GWSPCore::getDB()->sendQuery($sql);
+                $row = GWSPCore::getDB()->fetchArray($result);
                 // Keine gltige GameID angegeben ?
                 if(empty($row)){
                         require_once(WCF_DIR.'lib/system/exception/NamedUserException.class.php');
-                        throw new NamedUserException(WCF::getLanguage()->get('gws.gewinnspiel.wrongid'));
+                        throw new NamedUserException(GWSPCore::getLanguage()->get('gws.gewinnspiel.wrongid'));
                         exit;
                 }
@@ -323 +324 @@
                 if (!$canplay) {
                         require_once(WCF_DIR.'lib/system/exception/NamedUserException.class.php');
-                        throw new NamedUserException(WCF::getLanguage()->get('gws.gewinnspiel.nogroupe'));
+                        throw new NamedUserException(GWSPCore::getLanguage()->get('gws.gewinnspiel.nogroupe'));
                 }
         }
@@ -332 +333 @@
                                 FROM            gwsp".GWSP_N."_game gewinnspiel
                                 WHERE           gwsID = ".$this->gwsID;
-                $row = WCF::getDB()->getFirstRow($sql);
+                $row = GWSPCore::getDB()->getFirstRow($sql);
                 $this->gwsID            = $row['gwsID'];
                 $this->gwsTitel         = $row['gwsTitel'];
@@ -345 +346 @@
                 
                 if (defined('GUTHABEN_ENABLE_GLOBAL')){
-                        if(WCF::getUser()->userID && $this->money >= 1) {
+                        if(GWSPCore::getUser()->userID && $this->money >= 1) {
                                 require_once(WCF_DIR.'lib/data/user/UserGuthaben.class.php');
-                                $um = new UserGuthaben(WCF::getUser()->userID);
+                                $um = new UserGuthaben(GWSPCore::getUser()->userID);
                                 if (!$um->subGuthaben($this->money,'gws.gewinnspiel.kosten')) {
                                         require_once(WCF_DIR.'lib/system/exception/NamedUserException.class.php');
-                                        throw new NamedUserException(WCF::getLanguage()->get('gws.gewinnspiel.errormoney'));
+                                        throw new NamedUserException(GWSPCore::getLanguage()->get('gws.gewinnspiel.errormoney'));
                                 }
                         }
@@ -357 +358 @@
                 if ($this->gwsStart > TIME_NOW) {
                         require_once(WCF_DIR.'lib/system/exception/NamedUserException.class.php');
-                        throw new NamedUserException(WCF::getLanguage()->get('gws.gewinnspiel.statustocome'));
+                        throw new NamedUserException(GWSPCore::getLanguage()->get('gws.gewinnspiel.statustocome'));
                         exit;
                 }
@@ -363 +364 @@
                 if ($this->gwsEnde < TIME_NOW) {
                         require_once(WCF_DIR.'lib/system/exception/NamedUserException.class.php');
-                        throw new NamedUserException(WCF::getLanguage()->get('gws.gewinnspiel.statusended'));
+                        throw new NamedUserException(GWSPCore::getLanguage()->get('gws.gewinnspiel.statusended'));
                         exit;
                 }
@@ -371 +372 @@
                                 WHERE           gwsID = ".$this->gwsID."
                                 ORDER BY        showOrder";
-                $result = WCF::getDB()->sendQuery($sql);
-                while ($row = WCF::getDB()->fetchArray($result)) {
+                $result = GWSPCore::getDB()->sendQuery($sql);
+                while ($row = GWSPCore::getDB()->fetchArray($result)) {
                         $titel = $this->getFormattedMessage($row['gwsOption'], true);
                         $this->gwsOptionsArray[] .= "$titel";
@@ -385 +386 @@
                                 FROM            gwsp".GWSP_N."_spiel
                                 WHERE           gwsID = ".$this->gwsID;
-                $row = WCF::getDB()->getFirstRow($sql);
+                $row = GWSPCore::getDB()->getFirstRow($sql);
                 $this->usercount = $row['userID'];
         }

de.inside.Gewinnspiel/files/lib/page/IndexPage.class.php

@@ -10 +10 @@
  * denen man keine Berechtigung hat werden entsprechend gekennzeichnet.
  * @author              Robert "Tatzelwurm" Hempel
- * @copyright   2007/2008 INSIDE das Hrspiel
+ * @copyright   2007/2008 INSIDE das Hörspiel
  * @license     GNU LGPL http://www.gnu.org/licenses/lgpl.txt
  * @package             de.inside.Gewinnspiel
@@ -28 +28 @@
         public $highlight = '';
 
+        private $gamesCache = array();
         private $enableSmilies = true;
         private $enableBBCodes = true;
@@ -44 +45 @@
                 if (isset($_REQUEST['action'])) $this->action = $_REQUEST['action'];
 
-                // Hier Code fÃŒr Action !!!!
-                if ($this->action == 'go' && $this->gwsID) {
-                        $sql = "SELECT  `groupIDs`
-                                        FROM    gwsp".GWSP_N."_game
-                                        WHERE   gwsID = ".$this->gwsID."";
-                        $result = GWSPCore::getDB()->sendQuery($sql);
-                        $row = GWSPCore::getDB()->fetchArray($result);
-                        $this->gwsGroupIDs = explode(',',$row['groupIDs']);
-                        require_once(WCF_DIR.'lib/data/user/group/Group.class.php');
-                        $canplay = false;
-                        foreach ($this->gwsGroupIDs as $groupID){
-                                if (Group::isMember($groupID)) $canplay = true;
-                        }
-                        if (!$canplay) {
-                                require_once(WCF_DIR.'lib/system/exception/NamedUserException.class.php');
-                                throw new NamedUserException(GWSPCore::getLanguage()->get('gws.gewinnspiel.nogroupe'));
-                        }
+                GWSPCore::getCache()->addResource('competition-games-'.PACKAGE_ID,
+                        GWSP_DIR.'cache/competition.games-'.PACKAGE_ID.'.php',
+                        GWSP_DIR.'lib/system/cache/CacheBuilderGWSPGames.class.php');
+                GWSPCore::getCache()->addResource('competition-user-'.PACKAGE_ID,
+                        GWSP_DIR.'cache/competition.user-'.PACKAGE_ID.'.php',
+                        GWSP_DIR.'lib/system/cache/CacheBuilderGWSPUser.class.php');
                         
-                }
+                // Action !!!!
+                if ($this->action == 'go' && $this->gwsID) $this->startGame();
         }
 
         public function readData() {
                 parent::readData();
+                $this->gamesCache = GWSPCore::getCache()->get('competition-games-'.PACKAGE_ID);
+                $this->userCache = GWSPCore::getCache()->get('competition-user-'.PACKAGE_ID);
                 $this->readGewinnspiele();
         }
@@ -113 +106 @@
         
         protected function readGewinnspiele() {
-                $sql = "SELECT          `gwsID`, `gwsTitel`, `starttime`, `timeout`, `groupIDs`, `money`
-                                FROM            gwsp".GWSP_N."_game gewinnspiele
-                                ORDER BY        timeout ASC
-                                LIMIT           ".$this->itemsPerPage."
-                                OFFSET          ".(($this->pageNo - 1) * $this->itemsPerPage);
-                $result = GWSPCore::getDB()->sendQuery($sql);
-                while ($row = GWSPCore::getDB()->fetchArray($result)) {
-                        $gewinnspiele =array(
-                                                        'gwsID'         => $row['gwsID'],
-                                                        'groupIDs'      => $row['groupIDs'],
-                                                        'permission' => '',
-                                                        'done'          => '',
-                                                        );
+                foreach ($this->gamesCache as $gewinnspiel ) {
+                        // Check for Guthaben Plugin
                         if (!defined('GUTHABEN_ENABLE_GLOBAL')){
-                                $row['money'] = 0;
+                                $gewinnspiel['money'] = 0;
                         }
-                        // Kontrolle ob Gruppe berechtigt ist
-                        $row['permission'] = 'nein';
-                        $IDs = explode(',',$row['groupIDs']);
+                        // Check gruppe permission
+                        $gewinnspiel['permission'] = 'nein';
+                        $IDs = explode(',', $gewinnspiel['groupIDs']);
                         require_once(WCF_DIR.'lib/data/user/group/Group.class.php');
                         foreach ($IDs as $gruppe) {
-                                if (Group::isMember($gruppe)) $row['permission'] = 'ok';
+                                $gewinnspiel['permission'] = false;
+                                if (Group::isMember($gruppe)) {
+                                        $gewinnspiel['permission'] = true;
+                                        break;
+                                } 
                         }
-                        // Kontrolle ob User schon teilgenommen hat (nicht bei Gsten)
+                        // Kontrolle ob User schon teilgenommen hat (nicht bei GÀsten)
                         $id = GWSPCore::getUser()->userID;
-                        $row['done'] = 'notdone';
+                        $gewinnspiel['done'] = 'notdone';
                         if ($id){
-                                $sql1 = "SELECT COUNT(`userID`) AS users
+                                $sql = "SELECT  COUNT(`userID`) AS users
                                                 FROM    gwsp".GWSP_N."_spiel
-                                                WHERE   `gwsID` = ".$row['gwsID']." AND `userID`=".$id;
-                                $row1 = GWSPCore::getDB()->getFirstRow($sql1);
-                                if ($row1['users'])     {               
-                                        $row['done'] = 'done';
+                                                WHERE   `gwsID` = ".$gewinnspiel['gwsID']." AND `userID`=".$id;
+                                $row = GWSPCore::getDB()->getFirstRow($sql);
+                                if ($row['users'])      {               
+                                        $gewinnspiel['done'] = 'done';
                                 }
                         }
-                        $this->gewinnspiele[] = $row;
+                        $this->gewinnspiele[] = $gewinnspiel;
                 }
         }
@@ -156 +142 @@
                 return $datumzeit;
         }
+
+        protected function startGame() {
+                $sql = "SELECT  `groupIDs`
+                                FROM    gwsp".GWSP_N."_game
+                                WHERE   gwsID = ".$this->gwsID."";
+                $result = GWSPCore::getDB()->sendQuery($sql);
+                $row = GWSPCore::getDB()->fetchArray($result);
+                $this->gwsGroupIDs = explode(',',$row['groupIDs']);
+                require_once(WCF_DIR.'lib/data/user/group/Group.class.php');
+                $canplay = false;
+                foreach ($this->gwsGroupIDs as $groupID){
+                        if (Group::isMember($groupID)) $canplay = true;
+                }
+                if (!$canplay) {
+                        require_once(WCF_DIR.'lib/system/exception/NamedUserException.class.php');
+                        throw new NamedUserException(GWSPCore::getLanguage()->get('gws.gewinnspiel.nogroupe'));
+                }
+        }
 }
 

de.inside.Gewinnspiel/files/lib/system/cache/CacheBuilderGWSPGames.class.php

@@ -16 +16 @@
         public function getData($cacheResource) {
                 $data = array();
+                $questions = array();
                 
                 $sql = "SELECT  t1.gwsID AS gwsID, t1.gwsTitel AS gwsTitel,
                                                 t1.starttime AS starttime, t1.timeout AS timeout,
-                                                t1.recipient AS recipient, t1.regeln AS regeln,
+                                                t1.recipient AS recipient, t1.regeln AS rules,
                                                 t1.discl AS disclaimer, t1.beschreib AS description,
                                                 t1.groupIDs AS groupIDs, t1.money AS money,
@@ -25 +26 @@
                                                         FROM    gwsp".GWSP_N."_spiel as t2
                                                         WHERE   t2.gwsID = t1.`gwsID`)
-                                                AS userCount,
+                                                AS userCount, 1 AS questions
                                 FROM gwsp".GWSP_N."_game AS t1
                                 ORDER BY t1.`gwsID` DESC";
                 $result = GWSPCore::getDB()->sendQuery($sql);
                 while ($row = GWSPCore::getDB()->fetchArray($result)) {
-                        $data[] = $row;
                         $sql = "SELECT * 
                                         FROM    gwsp".GWSP_N."_options
                                         WHERE   gwsID = ".$row['gwsID']."
-                                        ORDER   showOrder ASC";
+                                        ORDER BY  showOrder ASC";
                         $questions = GWSPCore::getDB()->sendQuery($sql);
-                        $data['questions'] = GWSPCore::getDB()->getFirstRow($questions);
+                        $row['questions'] = GWSPCore::getDB()->fetchArray($questions);
+                        $data[] = $row;
                 }
                 return $data;

de.inside.Gewinnspiel/files/lib/system/cache/CacheBuilderGWSPUser.class.php

@@ -17 +17 @@
                 $data = array();
                 
-                $sql = "SELECT  t1.gwsID, t1.userID, t2.username
+                $sql = "SELECT  t1.gwsID, t1.userID, t2.username,
                                                 t1.ipaddress, t1.email, t1.realName
                                 FROM gwsp".GWSP_N."_spiel AS t1 left join wcf".WCF_N."_user AS t2 ON t2.userID = t1.userID

de.inside.Gewinnspiel/files/style/competition.css

@@ -1 +1 @@
 
-/* ### -- -- -- -- -- Special Burning Board 3 Styles -- -- -- -- -- ### */
+/* ### -- -- -- -- -- Competition / Gewinnspiel Styles -- -- -- -- -- ### */
 
 /* 
 
-File: burningBoard.css 
-Copyright 2006 by WoltLab GmbH. 
+File: competition.css 
+Copyright 2008 by INSIDE das Hörspiel. 
 
 */
 
-/* ### -- -- -- -- -- Miscellaneous -- -- -- -- -- ### */
+/* ### -- -- -- -- -- general -- -- -- -- -- ### */
 
-.hot {
-        font-weight: bold;
+.gwspCopyHint {
+
 }
 
-.interesting a {
-        font-style: italic;
+/* ### -- -- -- -- -- Index / Competition list -- -- -- -- -- ### */
+
+/* Icons */
+.tableList th.gwspColumnIcon { 
+        white-space: nowrap;
+        width:1%;
+}
+.tableList td.gwspColumnIcon { 
+        white-space: nowrap;
+        width:1%;
 }
 
-.threadStarter {
-        font-style: italic;
+/* date & time */
+.tableList th.gwspColumnDatum {
+        text-align: center;
+        white-space: nowrap; 
+        min-width: 150px;
 }
-
-.topicQuickEdit {
-        display: none;
-        width: 50%;
-}
-
-.prefix strong {
-        font-weight: normal;
-}
-
-.headlineContainer h1 .prefix {
-        font-size: .7em;
-}
-
-.smallPages {
-        float: right;
-        height: 24px;
-}
-
-.goToNewPost {
-        margin-right: 3px;
-        float: left;
-}
-
-.topic input, .headlineContainer h1 input  {
-        width: 70%;
-}
-
-.threadSort:after {
-        content: "";
-        height: 0;
-        display: block;
-        clear: both;
-}
-
-.breadCrumbs .prefix {
-        text-decoration: none;
-}
-
-/* ### -- -- -- -- -- Quick Jump -- -- -- -- -- ### */
-
-.quickJump {
-        white-space: nowrap;
-        width: auto;
-}
-
-.quickJump select {
-        width: auto;
-}
-
-/* ### -- -- -- -- -- Page Options -- -- -- -- -- ### */
-
-.pageOptions {
-        float: right;
-}
-
-.pageOptions form, .pageOptions div {
-        display: inline;
-}
-
-.pageOptions a, .pageOptions form {
-        text-decoration: none;
-        margin-left: 10px;
-}
-
-.pageOptions a span {
-        text-decoration: underline;
-}
-
-.pageOptions a:hover span {
-        text-decoration: none;
-}
-
-/* ### -- -- -- -- -- Board List -- -- -- -- -- ### */
-
-#boardlist, #boardlist ul {
-        list-style: none;
-        padding: 0;
-        margin: 0;
-}
-
-#boardlist {
-        margin-bottom: 20px;
-}
-
-#boardlist .boardlistInner {
-        min-height: 16px;
-}
-
-#boardlist .container-1, #boardlist .container-2  {
-        background-repeat: no-repeat;
-        background-position: center left;
-}
-
-#boardlist li ul .boardlistInner {
-        padding-left: 30px;
-}
-
-#boardlist li ul li ul .boardlistInner {
-        padding-left: 60px;
-}
-
-#boardlist li ul li ul li ul .boardlistInner {
-        padding-left: 90px;
-}
-
-#boardlist li {
-        min-height: 0;
-}
-
-#boardlist .containerContent:after {
-        content: "";
-        height: 0;
-        display: block;
-        clear: both;
-}
-
-#boardlist .container-1, #boardlist .container-2 {
-        padding: 4px;
-}
-
-.boardlistLastPost {
-        margin: -1.5em 3em 0 3em;
-        float: right;
-        width: 40%;
-        overflow: hidden;
-}
-
-#boardlist .boardTitle {
-        width: 45%;
-}
-
-#boardlist .containerHead .boardTitle {
-        width: 99.5%;
-}
-
-#boardlist .boardlistSubboards {
-        margin: 3px 0 0 0;
-        padding: 0;
-        min-height: 0;
-}
-
-#boardlist .boardlistSubboards {
-        margin: 3px 0 0 0;
-}
-
-#boardlist .boardlistSubboards h4, #boardlist .boardlistSubboards h5, #boardlist .boardlistSubboards h6 {
-        display: inline;
-}
-
-.boardlistUserOnline, .moderators {
-        margin-top: 3px;
-}
-
-.boardlistDescription {
-        margin-bottom: 3px;
-}
-
-.boardlistCounter {
-        margin-bottom: 3px;
-}
-
-/* ### -- -- -- Thread List -- -- -- ###*/
-
-.tableList .columnLastPost {
-        width: 30%;
-}
-
-.tableList .columnLastPost p {
+.tableList td.gwspColumnDatum {
+        white-space: nowrap; 
+        min-width: 150px;
         text-align: center;
 }
 
-.tableList .columnLastPost .containerContentSmall p {
+/* competition description */
+.tableList th.gwspColumnMarkContent { 
+        text-align: center;
+}
+.tableList td.gwspColumnMarkContent { 
         text-align: left;
+        padding-left: 5px;
 }
 
-.tableList .columnTopic {
-        width: 70%;
-}
 
-.tableList .columnTopic div.topic {
-        overflow: hidden;
-}
-
-.tableList .columnViews, .tableList .columnReplies {
-        text-align: center;
-}
-
-.tableList .columnRating, .tableList .columnLastActivity {
-        white-space: nowrap;
-}
-
-/* todo: find a better solution, because this makes problems, when more than 
-only one image is in that td, e.g. delete and enable action
--> maybe apply this via javascript, as it is only needed for drop down menus
- */
-.tableList td.columnIcon img {
+.gwspContainerIcon {
+        padding-top:5px;
         display: block;
-}
-
-/* ### -- -- -- Similar Threads -- -- -- ###*/
-
-.similarThreads {
-        list-style: none;
-        margin-top: 10px;
-        padding: 0;
-}
-
-.similarThreads li {
-        min-height: 0;
-}
-
-.similarThreads .breadCrumbs {
-        margin: 0;
-}
-
-/* ### -- -- -- Moderation Overview -- -- -- ###*/
-
-.moderationOverview {
-        list-style: none;
-        margin: 15px 0 5px 0 !important;
-        padding: 0;
-}
-
-.moderationOverview:after {
-        content: "";
-        height: 0;
-        display: block;
-        clear: both;
-}
-
-.moderationOverview ul {
-        list-style: none;
-        margin: 0;
-        padding: 0;
-}
-
-.moderationOverview img {
-        margin-right: 5px;
-        float: left;
-}
-
-.moderationOverview li {
-        margin: 0 5% 10px 0;
-        float: left;
-        width: 40%;
-        min-height: 48px;
-}
-
-.moderationOverview li ul li {
-        margin: 3px 0 3px 0;
-        float: none;
-        width: auto;
-        min-height: 0;
-}
-
-/* ### -- -- -- -- -- Delete Post -- -- -- -- -- ### */
-
-.deletePost input[type="submit"] {
-        float: right;
-}
-
-.deletePost .formField {
-        float: left;
-}
-
-.deletePost:after {
-        content: "";
-        height: 0;
-        display: block;
-        clear: both;
+        float:left;
+        margin-left:8px;
+        text-align:center;
+        width:30px;
 }
 

de.inside.Gewinnspiel/package.xml

@@ -34 +34 @@
                 <requiredpackage minversion="1.0.7">com.woltlab.wcf.page.user.profile</requiredpackage>
 
-<!-- Pakete unter Woltlab Lizenz
-                <requiredpackage minversion="1.0.6">com.woltlab.wcf.data.message.pm</requiredpackage>
-                <requiredpackage minversion="1.0.2">com.woltlab.wcf.data.user.messenger</requiredpackage>
-                <requiredpackage minversion="1.0.3">com.woltlab.wcf.acp.user.avatar</requiredpackage>
-                <requiredpackage minversion="1.0.2">com.woltlab.wcf.acp.user.rank</requiredpackage>
-                <requiredpackage minversion="1.0.4">com.woltlab.wcf.acp.content.smiley</requiredpackage>
-                <requiredpackage minversion="1.0.2">com.woltlab.wcf.acp.content.bbcode</requiredpackage>
-                <requiredpackage minversion="1.0.5">com.woltlab.wcf.acp.user.option</requiredpackage>
-                <requiredpackage minversion="1.0.3">com.woltlab.wcf.acp.display.language</requiredpackage>
-                <requiredpackage minversion="1.0.3">com.woltlab.wcf.acp.system.db</requiredpackage>
-                <requiredpackage minversion="1.0.4">com.woltlab.wcf.acp.display.template</requiredpackage> -->
+<!-- Pakete unter Woltlab Lizenz -->
                 <requiredpackage minversion="1.0.6">com.woltlab.wcf.acp.display.style</requiredpackage>
                 <requiredpackage minversion="1.0.5">com.woltlab.wcf.form.user.signature</requiredpackage>
-<!--            <requiredpackage minversion="1.0.4">com.woltlab.wcf.form.user.group</requiredpackage>
-                <requiredpackage minversion="1.0.3 pl 1">com.woltlab.wcf.page.user.membersList</requiredpackage>
-                <requiredpackage minversion="1.0.4">com.woltlab.wcf.page.user.usersOnline</requiredpackage>
-                <requiredpackage minversion="1.0.3">com.woltlab.wcf.page.user.membersList.team</requiredpackage>
--->
 
         </requiredpackages>

de.inside.Gewinnspiel/templates/footer.tpl

@@ -1 @@
-        <p class="copyright">{lang}gws.gewinnspiel.copyhint{/lang}</p>
+        <p class="copyright gwspCopyHint">{lang}gws.gewinnspiel.copyhint{/lang}</p>
 </div>

de.inside.Gewinnspiel/templates/gewinnspiel.tpl

@@ -11 +11 @@
 <div id="main">
         <ul class="breadCrumbs">
-                <li><a href="index.php?page=Gewinnspiel{@SID_ARG_2ND}"><img src="{@RELATIVE_GWSP_DIR}icon/gewinnspielS.png" alt="" /> <span>{lang}gws.gewinnspiel.title{/lang}</span></a> &raquo;</li>
+                <li><a href="index.php?page=Index{@SID_ARG_2ND}"><img src="{@RELATIVE_GWSP_DIR}icon/gewinnspielS.png" alt="" /> <span>{lang}gws.gewinnspiel.title{/lang}</span></a> &raquo;</li>
                 <li><a href="index.php?form=Gewinnspiel&gwsID={$gwsID}{@SID_ARG_2ND}"><img src="{@RELATIVE_GWSP_DIR}icon/gewinnspielS.png" alt="" /> <span>{@$gwsTitel}</span></a> &raquo;</li>
         </ul>
@@ -23 +23 @@
         </div>
         {if $errorField}
-                <p class="error">{lang}gws.global.form.error{/lang}</p>
+                <p class="error">{lang}wcf.global.form.error{/lang}</p>
         {/if}
 
@@ -176 +176 @@
                                 {if $errorField == 'akzept'}
                                         <p class="innerError">
-                                                {if $errorType == 'empty'}{lang}gws.global.error.empty{/lang}{/if}
+                                                {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
                                         </p>
                                 {/if}
@@ -182 +182 @@
                 </div>
                 <div class="formSubmit">
-                        <input type="submit" name="send" accesskey="s" value="{lang}gws.global.button.submit{/lang}" />
-                        <input type="reset" name="reset" accesskey="r" value="{lang}gws.global.button.reset{/lang}" />
+                        <input type="submit" name="send" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
+                        <input type="reset" name="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
                         <input type="hidden" name="gwsID" value="{@$gwsID}" />
                 </div>

de.inside.Gewinnspiel/templates/index.tpl

@@ -24 +24 @@
                 <div class="container-1">
                                 <div class="contentHeader">
-                                        {assign var=multiplePagesLink value="index.php?page=Gewinnspiel&pageNo=%d"}
+                                        {assign var=multiplePagesLink value="index.php?page=Index&pageNo=%d"}
                                         {pages print=true assign=pagesOutput link=$multiplePagesLink|concat:SID_ARG_2ND_NOT_ENCODED}
                                 </div>
@@ -32 +32 @@
                                         <thead>
                                                 <tr class="tableHead">
-                                                        <th class="columnIcon"><div>{lang}gws.acp.gwsID{/lang}</div></th>
-                                                        <th class="columnBoxname"><div>{lang}gws.acp.titelname{/lang}</div></th>
-                                                        <th class="columnBoxname"><div>{lang}gws.gewinnspiel.start{/lang}</div></th>
-                                                        <th class="columnBoxname"><div>{lang}gws.gewinnspiel.timeout{/lang}</div></th>
-                                                        <th class="columnIcon"><div>{lang}gws.gewinnspiel.statusmain{/lang}</div></th>
+                                                        <th class="gwspColumnIcon"><div>{lang}gws.acp.gwsID{/lang}</div></th>
+                                                        <th class="gwspColumnMarkContent"><div>{lang}gws.acp.titelname{/lang}</div></th>
+                                                        <th class="gwspColumnDatum"><div>{lang}gws.gewinnspiel.start{/lang}</div></th>
+                                                        <th class="gwspColumnDatum"><div>{lang}gws.gewinnspiel.timeout{/lang}</div></th>
+                                                        <th class="gwspColumnIcon"><div>{lang}gws.gewinnspiel.statusmain{/lang}</div></th>
                                                 </tr>
                                         </thead>
-                                        <tbody>
-                                                {foreach from=$gewinnspiele item=gewinnspiel}
-                                                        <tr class="{cycle values="container-1,container-2" advance=false} id="{@$gewinnspiel.gwsID}"">
-                                                                <td class="columnIcon">
+                                        {foreach from=$gewinnspiele item=gewinnspiel}
+                                                <tbody>
+                                                        {cycle values='container-1,container-2' name='className' print=false advance=false}
+                                                        <tr class="{cycle name='className'}" id="gwsp{$gewinnspiel.gwsID}">
+                                                                <td class="gwspColumnIcon">
                                                                         <b>{@$gewinnspiel.gwsID}</b>
                                                                 </td>
-                                                                <td class="columnname columnText">
+                                                                <td class="gwspColumnMarkContent">
                                                                         <b>{@$gewinnspiel.gwsTitel}</b>
                                                                         {if $gewinnspiel.money}
@@ -52 +53 @@
                                                                         {/if}
                                                                 </td>
-                                                                <td class="columnMarkUsers" align="center">
+                                                                <td class="gwspColumnDatum">
                                                                         {@$gewinnspiel.starttime|shorttime}
                                                                 </td>
-                                                                <td class="columnMarkUsers" align="center">
+                                                                <td class="gwspColumnDatum">
                                                                         {@$gewinnspiel.timeout|shorttime}
                                                                 </td>
-                                                                <td class="columnIcon">
+                                                                <td class="gwspColumnIcon">
                                                                         {if $gewinnspiel.timeout < TIME_NOW}
                                                                                 <img src="{@RELATIVE_GWSP_DIR}icon/gewinnspielEndeS.png" alt="{lang}gws.gewinnspiel.statusended{/lang}" title="{lang}gws.gewinnspiel.statusended{/lang}" />
@@ -66 +67 @@
                                                                         {/if}
                                                                         {if $gewinnspiel.starttime < TIME_NOW && $gewinnspiel.timeout > TIME_NOW}
-                                                                                {if $gewinnspiel.permission == "ok" && $gewinnspiel.done == "notdone"}
+                                                                                {if $gewinnspiel.permission == true && $gewinnspiel.done == "notdone"}
                                                                                 <a href="index.php?form=Gewinnspiel&amp;gwsID={@$gewinnspiel.gwsID}{@SID_ARG_2ND}" alt='{lang}gws.gewinnspiel.statusspielen{/lang}'><img src="{@RELATIVE_GWSP_DIR}icon/gewinnspielGoS.png" alt="{lang}gws.gewinnspiel.statusspielen{/lang}" title="{lang}gws.gewinnspiel.statusspielen{/lang}" /></a>
                                                                                 {/if}
-                                                                                {if $gewinnspiel.permission == "ok" && $gewinnspiel.done == "done"}
+                                                                                {if $gewinnspiel.permission == true && $gewinnspiel.done == "done"}
                                                                                 <img src="{@RELATIVE_GWSP_DIR}icon/gewinnspielNotokS.png" alt="{lang}gws.gewinnspiel.statusgespielt{/lang}" title="{lang}gws.gewinnspiel.statusgespielt{/lang}" />
                                                                                 {/if}
-                                                                                {if $gewinnspiel.permission == "nein" && $gewinnspiel.done == "notdone"}
+                                                                                {if !$gewinnspiel.permission && $gewinnspiel.done == "notdone"}
                                                                                 <img src="{@RELATIVE_GWSP_DIR}icon/gewinnspielNotokS.png" alt="{lang}gws.gewinnspiel.statusnotok{/lang}" title="{lang}gws.gewinnspiel.statusnotok{/lang}" />
                                                                                 {/if}
@@ -83 +84 @@
                         </fieldset>
                         <div class="contentHeader">
-                                {assign var=multiplePagesLink value="index.php?page=Gewinnspiel&pageNo=%d"}
+                                {assign var=multiplePagesLink value="index.php?page=Index&pageNo=%d"}
                                 {pages print=true assign=pagesOutput link=$multiplePagesLink|concat:SID_ARG_2ND_NOT_ENCODED}
                         </div>