Changeset 709
- Timestamp:
- 11/11/08 19:16:03 (5 years ago)
- Location:
- racing.league
- Files:
-
- 5 modified
-
de.xml (modified) (1 diff)
-
files/lib/action/RacingLeagueDeletePunishAction.class.php (modified) (1 diff)
-
files/lib/form/RacingLeaguePunishForm.class.php (modified) (8 diffs)
-
install.sql (modified) (1 diff)
-
templates/racingLeaguePunish.tpl (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
racing.league/de.xml
r708 r709 57 57 <item name="wcf.racing.league.noActiveRaces"><![CDATA[Es sind keine Rennen in der Saison aktiv. Alle Rennen fÃŒr die Saison wurden gefahren, oder es wurde noch kein Renntag angelegt.{if $this->user->getPermission('admin.racing.league.caneditraces')}<br /><br />Wenn Sie einen Renntag fÃŒr die aktive Saison hinzufÃŒgen wollen, <a href="index.php?form=RacingLeagueRaces{@SID_ARG_2ND}&newRaces=1">drÃŒcken Sie hier...</a>{/if}]]></item> 58 58 59 59 <item name="wcf.racing.league.punish.action"><![CDATA[<strong>Funktion</strong>]]></item> 60 <item name="wcf.racing.league.punish.addPunish"><![CDATA[Neue Strafe verhÀngen]]></item> 61 <item name="wcf.racing.league.punish.addPunish.description"><![CDATA[Hier können Sie eine neue Strafe verhÀngen.<br />Als erstes wÀhlen Sie bitte das <strong>gefahrene</strong> Rennen aus, wo die Straftat begangen wurde.]]></item> 62 <item name="wcf.racing.league.punish.addPunish2.description"><![CDATA[Hier wÀhlen Sie nun den Fahrer aus dem die Strafe ausgesprochen werden soll.<br /> 63 Dazu einfach im Dropdown-MenÃŒ hinter "{lang}wcf.racing.league.punish.addPunish.driver{/lang}" den entsprechenden Fahrer wÀhlen.<br /> 64 Bei "{lang}wcf.racing.league.punish.addPunish.minusPoints{/lang}" können Sie die Minuspunkte angeben. Diese werden von der Gesamtpunktzahl des Fahrers abgezogen.<br /> 65 Im Textfeld "{lang}wcf.racing.league.punish.addPunish.punishReason{/lang}" können Sie eine BegrÃŒndung fÃŒr die Strafe eintragen.<br /> 66 Um zu speichern drÃŒcken Sie anschlieÃend auf "Absenden".]]></item> 67 <item name="wcf.racing.league.punish.addPunish.driver"><![CDATA[<strong>Fahrer:</strong>]]></item> 68 <item name="wcf.racing.league.punish.addPunish.minusPoints"><![CDATA[<strong>Minuspunkte:</strong>]]></item> 69 <item name="wcf.racing.league.punish.addPunish.punishReason"><![CDATA[<strong>BegrÃŒndung:</strong>]]></item> 70 <item name="wcf.racing.league.punish.addPunish.racename"><![CDATA[<strong>gefahrenes Rennen:</strong>]]></item> 60 71 <item name="wcf.racing.league.punish.delete"><![CDATA[Strafe löschen]]></item> 61 72 <item name="wcf.racing.league.punish.delete.confirm"><![CDATA[Wollen Sie wirklich die Strafe löschen?]]></item> 62 73 <item name="wcf.racing.league.punish.edit"><![CDATA[Strafe bearbeiten]]></item> 63 74 <item name="wcf.racing.league.punish.minuspoints"><![CDATA[<strong>Strafpunkte</strong>]]></item> 75 <item name="wcf.racing.league.punish.noPunish"><![CDATA[Es wurden noch keine Strafen verhÀngt.]]></item> 64 76 <item name="wcf.racing.league.punish.overview"><![CDATA[Strafen-Ãbersicht]]></item> 65 77 <item name="wcf.racing.league.punish.overview.description"><![CDATA[Hier sehen Sie die Strafen-Ãbersicht.<br /> 66 78 Sie können die Strafe mit dem <img src="{@RELATIVE_WCF_DIR}icon/saisonWarningEditS.png" alt="" title="{lang}wcf.racing.league.punish.edit{/lang}" /> bearbeiten.<br /> 67 79 Mit dem <img src="{@RELATIVE_WCF_DIR}icon/deleteS.png" alt="" title="{lang}wcf.racing.league.punish.delete{/lang}" /> Löschen Sie die Strafe.]]></item> 80 <item name="wcf.racing.league.punish.punishreason"><![CDATA[<strong>StrafbegrÃŒndung</strong>]]></item> 68 81 <item name="wcf.racing.league.punish.racename"><![CDATA[<strong>Rennen</strong>]]></item> 69 <item name="wcf.racing.league.punish.username"><![CDATA[<strong>Fahrer</strong>]]></item> 70 <item name="wcf.racing.league.punish.minuspoints"><![CDATA[<strong>Strafpunkte</strong>]]></item> 71 <item name="wcf.racing.league.punish.punishreason"><![CDATA[<strong>StrafbegrÃŒndung</strong>]]></item> 72 <item name="wcf.racing.league.punish.action"><![CDATA[<strong>Funktion</strong>]]></item> 82 <item name="wcf.racing.league.punish.username"><![CDATA[<strong>Fahrer</strong>]]></item> 73 83 74 84 <item name="wcf.racing.league.point.delete"><![CDATA[Platz/Punkte-Regel löschen]]></item> -
racing.league/files/lib/action/RacingLeagueDeletePunishAction.class.php
r707 r709 21 21 22 22 // hier wird eine Strafe gelöscht 23 if ($this-> raceID > 0) {23 if ($this->punishID > 0) { 24 24 $sql = "DELETE FROM `wcf".WCF_N."_racing_punish` 25 25 WHERE `punishID` = '".escapeString($this->punishID)."' -
racing.league/files/lib/form/RacingLeaguePunishForm.class.php
r707 r709 22 22 public $raceID = 0; 23 23 public $driver = ''; 24 public $minusPoints = '';24 public $minusPoints = 0; 25 25 public $punishReason = ''; 26 public $teamID = 0; 26 27 27 28 public $drivedRaces = array(); … … 84 85 `b`.`userID`, 85 86 `c`.`raceName`, 86 `c`.`raceNo` 87 FROM `wcf".WCF_N."_racing_punish` AS `a` 88 LEFT JOIN `wcf".WCF_N."_user` AS `b` 89 ON (`b`.`userID` = `a`.`userID`) 90 LEFT JOIN `wcf".WCF_N."_racing_races` AS `c` 91 ON (`a`.`raceID` = `c`.`raceID`) 92 WHERE `a`.`saisonID` = '".$this->activeSaisonID."' 93 AND `c`.`saisonID` = '".$this->activeSaisonID."' 94 ORDER BY `raceNo` ASC 95 "; 87 `c`.`raceNo`, 88 `d`.`teamID` 89 FROM `wcf".WCF_N."_racing_punish` AS `a` 90 LEFT JOIN `wcf".WCF_N."_user` AS `b` 91 ON (`b`.`userID` = `a`.`userID`) 92 LEFT JOIN `wcf".WCF_N."_racing_races` AS `c` 93 ON (`c`.`raceID` = `a`.`raceID`) 94 LEFT JOIN `wcf".WCF_N."_racing_user_to_team` AS `d` 95 ON (`d`.`userID` = `a`.`userID`) 96 WHERE `a`.`saisonID` = '".$this->activeSaisonID."' 97 AND `c`.`saisonID` = '".$this->activeSaisonID."' 98 AND `d`.`saisonID` = '".$this->activeSaisonID."' 99 ORDER BY `raceNo` ASC 100 "; 96 101 $res = WCF::getDB()->sendQuery($sql); 97 102 … … 104 109 // Hier werden alle gefahrenen Rennen geladen (drived = 1) 105 110 $sql = "SELECT raceID, raceName 106 FROM `wcf".WCF_N."_racing_races`107 WHERE `saisonID` = '".$this->activeSaisonID."'108 AND `drived` = '1'109 ORDER BY `raceNO` ASC110 ";111 FROM `wcf".WCF_N."_racing_races` 112 WHERE `saisonID` = '".$this->activeSaisonID."' 113 AND `drived` = '1' 114 ORDER BY `raceNO` ASC 115 "; 111 116 112 117 $res = WCF::getDB()->sendQuery($sql); … … 114 119 while ($row = WCF::getDB()->fetchArray($res)) { 115 120 $this->drivedRaces[] = $row; 116 } 121 } 117 122 } 118 123 … … 132 137 if ($this->addPunish == 3 && isset($this->driver) && isset($this->minusPoints) && isset($this->punishReason) && $this->raceID > 0 && $this->activeSaisonID != 0) { 133 138 139 // Hier wird vom jeweiligen Fahrer (=userID) das dazugehörige Team ermittelt 140 $sql = "SELECT `teamID` 141 FROM `wcf".WCF_N."_racing_user_to_team` 142 WHERE `userID` = '".escapeString($this->driver)."' 143 AND `saisonID` = '".escapeString($this->activeSaisonID)."' 144 "; 145 $teamArray = WCF::getDB()->getFirstRow($sql); 146 $this->teamID = implode($teamArray); 147 148 // Hier wird die Strafe in die DB gespeichert 134 149 $sql = "INSERT INTO `wcf".WCF_N."_racing_punish` 135 (`saisonID`, `raceID`, `userID`, `minusPoints`, `punishReason`)136 VALUES ('".escapeString($this->activeSaisonID)."', '".escapeString($this->raceID)."', '".escapeString($this->driver)."', '".escapeString($this-> minusPoints)."', '".escapeString($this->punishReason)."')137 ";150 (`saisonID`, `raceID`, `userID`, `teamID`, `minusPoints`, `punishReason`) 151 VALUES ('".escapeString($this->activeSaisonID)."', '".escapeString($this->raceID)."', '".escapeString($this->driver)."', '".escapeString($this->teamID)."', '".escapeString($this->minusPoints)."', '".escapeString($this->punishReason)."') 152 "; 138 153 139 154 $res = WCF::getDB()->sendQuery($sql); … … 141 156 $row = 0; 142 157 $row = WCF::getDB()->getAffectedRows($res); 143 $this->addPunish = 0; 158 $this->addPunish = ''; 159 $this->minusPoints = ''; 160 $this->punishReason = ''; 144 161 $this->raceID = 0; 145 162 if ($row > 0) { … … 148 165 else { 149 166 WCF::getTPL()->append('userMessages', WCF::getTPL()->fetch('racingLeagueNewError')); 150 } 151 167 } 152 168 } 153 169 } … … 167 183 'raceID' => $this->raceID, 168 184 'driver' => $this->driver, 185 'minusPoints' => $this->minusPoints, 186 'punishReason' => $this->punishReason, 169 187 170 188 'redirect' => $this->redirect -
racing.league/install.sql
r705 r709 83 83 punishID int(10) unsigned NOT NULL auto_increment COMMENT 'ID der Strafe', 84 84 raceID int(10) unsigned NOT NULL COMMENT 'ID des Rennens', 85 userID int(10) unsigned NOT NULL COMMENT 'UserID', 85 userID int(10) unsigned NOT NULL COMMENT 'ID des Fahrers', 86 teamID int(10) unsigned NOT NULL COMMENT 'ID des Teams des Fahrers', 86 87 minusPoints int(10) unsigned NOT NULL COMMENT 'Punkte die abgezogen werden sollen', 87 88 punishReason varchar(255) NOT NULL COMMENT 'Grund für die Strafe', -
racing.league/templates/racingLeaguePunish.tpl
r708 r709 47 47 <div class="formElement{if $errorField == 'punishRace'} formError{/if}"> 48 48 <div class="formFieldLabel"> 49 <label for="punishRace">{lang}wcf.racing.league. addPunish.racename{/lang}</label>49 <label for="punishRace">{lang}wcf.racing.league.punish.addPunish.racename{/lang}</label> 50 50 </div> 51 51 <div class="formField"> … … 81 81 <div class="container-1"> 82 82 <h3 class="subHeadline"><img src="{@RELATIVE_WCF_DIR}icon/saisonWarningAddS.png" alt="" /> {lang}wcf.racing.league.punish.addPunish{/lang}</h3> 83 <p class="description">{lang}wcf.racing.league.punish.addPunish .description{/lang}</p>83 <p class="description">{lang}wcf.racing.league.punish.addPunish2.description{/lang}</p> 84 84 <br /> 85 85 <div class="formElement{if $errorField == 'driver'} formError{/if}"> 86 86 <div class="formFieldLabel"> 87 <label for="driver">{lang}wcf.racing.league. addPunish.driver{/lang}</label>87 <label for="driver">{lang}wcf.racing.league.punish.addPunish.driver{/lang}</label> 88 88 </div> 89 89 <div class="formField"> … … 107 107 <div class="formElement{if $errorField == 'minusPoints'} formError{/if}"> 108 108 <div class="formFieldLabel"> 109 <label for="minusPoints">{lang}wcf.racing.league. addPunish.minusPoints{/lang}</label>110 </div> 111 <div class="formField"> 112 <input type="text" class="inputText" name="minusPoints" id="minusPoints" value=" 0" />109 <label for="minusPoints">{lang}wcf.racing.league.punish.addPunish.minusPoints{/lang}</label> 110 </div> 111 <div class="formField"> 112 <input type="text" class="inputText" name="minusPoints" id="minusPoints" value="{$minusPoints}" /> 113 113 114 114 {if $errorField == 'minusPoints'} … … 122 122 <div class="formElement{if $errorField == 'punishReason'} formError{/if}"> 123 123 <div class="formFieldLabel"> 124 <label for="punishReason">{lang}wcf.racing.league. addPunish.punishReason{/lang}</label>125 </div> 126 <div class="formField"> 127 <textarea rows="8" cols="20" name="punishReason" id="punishReason"> </textarea>124 <label for="punishReason">{lang}wcf.racing.league.punish.addPunish.punishReason{/lang}</label> 125 </div> 126 <div class="formField"> 127 <textarea rows="8" cols="20" name="punishReason" id="punishReason">{$punishReason}</textarea> 128 128 {if $errorField == 'punishReason'} 129 129 <p class="innerError"> … … 239 239 <tr class={cycle}> 240 240 <td></td> 241 <td align='center'><a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&addPunish=1"><span>{lang}wcf.racing.league.button.editSaisons.addPunish{/lang}</span></a></td>242 241 <td></td> 243 242 <td></td> 243 <td align='center'><a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&addPunish=1"><span>{lang}wcf.racing.league.button.editSaisons.addPunish{/lang}</span></a></td> 244 244 <td align='center'><a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&addPunish=1" title="{lang}wcf.racing.league.button.editSaisons.addPunish{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/saisonWarningAddS.png" alt="" /></a></td> 245 245 </tr> … … 257 257 <div class="formField"> 258 258 <p class="info" id="results.noPunish"> 259 {lang}wcf.racing.league. results.noPunish{/lang}259 {lang}wcf.racing.league.punish.noPunish{/lang} 260 260 </p> 261 261 </div>
