Context Navigation

← Previous Changeset
Next Changeset →

Changeset 729

Timestamp:

11/29/08 19:48:08 (4 years ago)

Author:

Tatzelwurm

Message:

New Icons
Captcha added
Need help for english translation!!!

Location:

de.inside.Gewinnspiel

Files:

: 3 added
: 20 modified

acptemplates/gewinnspielAdd.tpl (modified) (6 diffs)
de-informal.xml (modified) (1 diff)
de.xml (modified) (1 diff)
en.xml (modified) (1 diff)
files/global.php (modified) (1 diff)
files/icon/gewinnspielAnswerM.png (added)
files/icon/gewinnspielDoneS.png (modified) (previous)
files/icon/gewinnspielEndeS.png (modified) (previous)
files/icon/gewinnspielGoS.png (modified) (previous)
files/icon/gewinnspielNotokS.png (modified) (previous)
files/icon/gewinnspielQuestionM.png (modified) (previous)
files/icon/gewinnspielTocomeS.png (modified) (previous)
files/index.php (modified) (1 diff)
files/lib/acp/action/GewinnspielDeleteAction.class.php (modified) (1 diff)
files/lib/acp/form/GewinnspielAddForm.class.php (modified) (9 diffs)
files/lib/acp/form/GewinnspielEditForm.class.php (modified) (2 diffs)
files/lib/data/competition/CompetitionGame.class.php (added)
files/lib/system/GWSPCore.class.php (modified) (1 diff)
options.xml (modified) (1 diff)
package.tmp (added)
package.xml (modified) (2 diffs)
templates/gewinnspiel.tpl (modified) (3 diffs)
templates/index.tpl (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

de.inside.Gewinnspiel/acptemplates/gewinnspielAdd.tpl

r720	r729
5	5	//<![CDATA[
6	6	var tabMenu = new TabMenu();
7		~~{if $menOptions\|count}onloadEvents.push(function() { tabMenu.showSubTabMenu('{@$menOptions.0.menname}') });{/if}~~
	7	onloadEvents.push(function() { tabMenu.showSubTabMenu("{$activeTabMenuItem}") });
8	8	//]]>
9	9	</script>
…	…
76	76	</fieldset>
77	77	<fieldset class="noJavaScript">
78		<legend class="noJavaScript">{lang}gws.acp.dauer{/lang}</legend>
	78	<legend class="noJavaScript">{lang}gws.acp.dauer{/lang}</legend>
79	79	<div class="formGroup{if $errorField == 'start'} formError{/if}">
80	80	<div class="formGroupLabel">
…	…
85	85	<legend><label>{lang}gws.gewinnspiel.start{/lang}</label></legend>
86	86	<div class="formField">
87		{if $action == 'add' \|\| $starttime >= TIME_NOW}
88		<div class="floatedElement">
89		<label for="startDay">{lang}wcf.global.date.day{/lang}</label>
90		{htmlOptions options=$dayOptions selected=$startDay id=startDay name=startDay}
91		</div>
92		<div class="floatedElement">
93		<label for="startMonth">{lang}wcf.global.date.month{/lang}</label>
94		{htmlOptions options=$monthOptions selected=$startMonth id=startMonth name=startMonth}
95		</div>
96		<div class="floatedElement">
97		<label for="startYear">{lang}wcf.global.date.year{/lang}</label>
98		<input id="startYear" class="inputText fourDigitInput" type="text" name="startYear" value="{@$startYear}" maxlength="4" />
99		</div>
100		<div class="floatedElement">
101		<label for="startHour">{lang}wcf.global.date.hour{/lang}</label>
102		<input id="startHour" class="inputText fourDigitInput" type="text" name="startHour" value="{@$startHour}" maxlength="2" />
103		</div>
104		<div class="floatedElement">
105		<label for="startMinutes">{lang}wcf.global.date.minutes{/lang}</label>
106		<input id="startMinutes" class="inputText fourDigitInput" type="text" name="startMinutes" value="{@$startMinutes}" maxlength="2" />
107		</div>
108		<div class="floatedElement">
109		<a id="startButton"><img src="{@RELATIVE_WCF_DIR}icon/datePickerOptionsM.png" alt="" /></a>
110		<div id="startCalendar" class="inlineCalendar">
111		</div>
112		<script type="text/javascript">
113		//<![CDATA[
114		calendar.init('start');
115		//]]>
116		</script>
117		</div>
118		{if $errorField == 'start'}
119		<p class="innerError">
120		{if $errorType == 'invalid'}{lang}gws.acp.start.error{/lang}{/if}
121		</p>
	87	{if $action == 'add' \|\| $starttime >= TIME_NOW}
	88	<div class="floatedElement">
	89	<label for="startDay">{lang}wcf.global.date.day{/lang}</label>
	90	{htmlOptions options=$dayOptions selected=$startDay id=startDay name=startDay}
	91	</div>
	92	<div class="floatedElement">
	93	<label for="startMonth">{lang}wcf.global.date.month{/lang}</label>
	94	{htmlOptions options=$monthOptions selected=$startMonth id=startMonth name=startMonth}
	95	</div>
	96	<div class="floatedElement">
	97	<label for="startYear">{lang}wcf.global.date.year{/lang}</label>
	98	<input id="startYear" class="inputText fourDigitInput" type="text" name="startYear" value="{@$startYear}" maxlength="4" />
	99	</div>
	100	<div class="floatedElement">
	101	<label for="startHour">{lang}wcf.global.date.hour{/lang}</label>
	102	<input id="startHour" class="inputText fourDigitInput" type="text" name="startHour" value="{@$startHour}" maxlength="2" />
	103	</div>
	104	<div class="floatedElement">
	105	<label for="startMinutes">{lang}wcf.global.date.minutes{/lang}</label>
	106	<input id="startMinutes" class="inputText fourDigitInput" type="text" name="startMinutes" value="{@$startMinutes}" maxlength="2" />
	107	</div>
	108	<div class="floatedElement">
	109	<a id="startButton"><img src="{@RELATIVE_WCF_DIR}icon/datePickerOptionsM.png" alt="" /></a>
	110	<div id="startCalendar" class="inlineCalendar"></div>
	111	<script type="text/javascript">
	112	//<![CDATA[
	113	calendar.init('start');
	114	//]]>
	115	</script>
	116	{if $errorField == 'start'}
	117	<p class="innerError">
	118	{if $errorType == 'invalid'}{lang}gws.acp.start.error{/lang}{/if}
	119	</p>
	120	{/if}
	121	</div>
	122	{else}
	123	<div class="floatedElement">
	124	<input id="starttime" class="text" type="hidden" name="starttime" value="{@$starttime}" readonly="readonly" />{@$starttime\|shorttime}
	125	</div>
122	126	{/if}
123		~~{else}~~
124		~~<div class="floatedElement">~~
125		~~<input id="starttime" class="text" type="hidden" name="starttime" value="{@$starttime}" readonly="readonly" />{@$starttime\|shorttime}~~
126		~~</div>~~
127		~~{/if}~~
128	127	</div>
129	128	</fieldset>
…	…
166	165	//]]>
167	166	</script>
168		~~</div>~~
169		~~{if $errorField == 'timeout'}~~
170		~~<p class="innerError">~~
171		~~{if $errorType == 'invalid'}{lang}gws.acp.timeout.error{/lang}{/if}~~
172		~~</p>~~
173		~~{/if}~~
	167	{if $errorField == 'timeout'}
	168	<p class="innerError">
	169	{if $errorType == 'invalid'}{lang}gws.acp.timeout.error{/lang}{/if}
	170	</p>
	171	{/if}
	172	</div>
174	173	</div>
175	174	</fieldset>
…	…
227	226	<div class="formElement">
228	227	<div class="formField">
229		<textarea name="regeln" id="text" rows="8" cols="80">{$regeln}</textarea>
	228	<textarea name="regeln" id="text" rows="8" cols="40">{$regeln}</textarea>
230	229	</div>
231	230	</div>
…	…
284	283	<input type="hidden" name="action" value="{@$action}" />
285	284	{if $gwsID\|isset}<input type="hidden" name="gwsID" value="{@$gwsID}" />{/if}
	285	<input type="hidden" id="activeTabMenuItem" name="activeTabMenuItem" value="{$activeTabMenuItem}" />
286	286	</div>
287	287	</form>

de.inside.Gewinnspiel/de-informal.xml

r720	r729
27	27
28	28	<category name="wcf.acp.option">
	29	<item name="wcf.acp.option.use_captcha"><![CDATA[Captcha bei Teilnahme benutzen]]></item>
	30	<item name="wcf.acp.option.use_captcha.description"><![CDATA[Durch Aktivierung dieser Option wird bei der Teilnahme ein Sicherheitsbild verwendet.]]></item>
29	31	<item name="wcf.acp.option.show_clock"><![CDATA[Aktuelle Uhrzeit im Kopf der Seite anzeigen]]></item>
30	32	<item name="wcf.acp.option.show_clock.description"><![CDATA[Im Seitenkopf wird die aktuelle Uhrzeit angezeigt, wenn diese Option aktiviert ist.]]></item>

de.inside.Gewinnspiel/de.xml

r720	r729
27	27
28	28	<category name="wcf.acp.option">
	29	<item name="wcf.acp.option.use_captcha"><![CDATA[Captcha bei Teilnahme benutzen]]></item>
	30	<item name="wcf.acp.option.use_captcha.description"><![CDATA[Durch Aktivierung dieser Option wird bei der Teilnahme ein Sicherheitsbild verwendet.]]></item>
29	31	<item name="wcf.acp.option.show_clock"><![CDATA[Aktuelle Uhrzeit im Kopf der Seite anzeigen]]></item>
30	32	<item name="wcf.acp.option.show_clock.description"><![CDATA[Im Seitenkopf wird die aktuelle Uhrzeit angezeigt, wenn diese Option aktiviert ist.]]></item>

de.inside.Gewinnspiel/en.xml

r720	r729
23	23	</category>
24	24	<category name="wcf.acp.option">
	25	<item name="wcf.acp.option.use_captcha"><![CDATA[Use captcha at attendance]]></item>
	26	<item name="wcf.acp.option.use_captcha.description"><![CDATA[Enable this option to display a security image at competition attendance.]]></item>
25	27	<item name="wcf.acp.option.show_clock"><![CDATA[Aktuelle Uhrzeit im Kopf der Seite anzeigen]]></item>
26	28	<item name="wcf.acp.option.show_clock.description"><![CDATA[Im Seitenkopf wird die aktuelle Uhrzeit angezeigt, wenn diese Option aktiviert ist.]]></item>

de.inside.Gewinnspiel/files/global.php

r579	r729
1	1	<?php
2	2	/**
3		* @author Marcel Werk
4		* @copyright 2001-2007 WoltLab GmbH
5		* @license WoltLab Burning Board License <http://www.woltlab.com/products/burning_board/license.php>
	3	* @author Robert "Tatzelwurm" Hempel
	4	* @copyright 2007/2007 INSIDE das HÃ¶rspiel
	5	* @license GNU LGPL http://www.gnu.org/licenses/lgpl.txt
	6	* @package de.inside.Gewinnspiel
6	7	*/
7	8	// include config

de.inside.Gewinnspiel/files/index.php

r563	r729
1	1	<?php
2	2	/**
3		* @author Marcel Werk
4		* @copyright 2001-2007 WoltLab GmbH
5		* @license WoltLab Burning Board License <http://www.woltlab.com/products/burning_board/license.php>
	3	* @author Robert "Tatzelwurm" Hempel
	4	* @copyright 2007/2007 INSIDE das HÃ¶rspiel
	5	* @license GNU LGPL http://www.gnu.org/licenses/lgpl.txt
	6	* @package de.inside.Gewinnspiel
6	7	*/
7	8	require_once('./global.php');

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

r720	r729
10	10	* @author Robert "Tatzelwurm" Hempel
11	11	* @copyright 2007 INSIDE das HÃ¶rspiel
	12	* @license GNU LGPL http://www.gnu.org/licenses/lgpl.txt
12	13	* @package de.inside.Gewinnspiel
13	14	*/

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

r718	r729
10	10	* @copyright 2007/2008 INSIDE das HÃ¶rspiel
11	11	* @license GNU LGPL http://www.gnu.org/licenses/lgpl.txt
12		* @package de.inside.~~Gewinnspiel~~
	12	* @package de.inside.gwsp
13	13	*/
14	14
…	…
37	37	public $timeoutMinutes;
38	38	public $menOptions = array('regeln','datenschutz','beschreibung');
	39	public $activeTabMenuItem = '';
39	40
40	41	public $email = '';
…	…
73	74	parent::readFormParameters();
74	75
75		if (isset($_POST['gwsTitel'])) $this->gwsTitel = ~~escapeString~~($_REQUEST['gwsTitel']);
	76	if (isset($_POST['gwsTitel'])) $this->gwsTitel = StringUtil::trim($_REQUEST['gwsTitel']);
76	77	if (isset($_POST['gwsOptions'])) $this->gwsOptionsText = StringUtil::unifyNewlines(StringUtil::trim($_POST['gwsOptions']));
77	78	if (isset($_POST['starttime'])) $this->start = intval($_POST['starttime']);
…	…
88	89	if (isset($_POST['email'])) $this->email = StringUtil::trim($_POST['email']);
89	90	if (isset($_POST['confirmEmail'])) $this->confirmEmail = StringUtil::trim($_POST['confirmEmail']);
90		if (isset($_POST['regeln'])) $this->regeln = ~~escapeString(StringUtil::trim($_POST['regeln'])~~);
91		if (isset($_POST['datenschutz'])) $this->discl = ~~escapeString(StringUtil::trim($_POST['datenschutz'])~~);
92		if (isset($_POST['beschreibung'])) $this->beschreibung = ~~escapeString(StringUtil::trim($_POST['beschreibung'])~~);
	91	if (isset($_POST['regeln'])) $this->regeln = StringUtil::trim($_POST['regeln']);
	92	if (isset($_POST['datenschutz'])) $this->discl = StringUtil::trim($_POST['datenschutz']);
	93	if (isset($_POST['beschreibung'])) $this->beschreibung = StringUtil::trim($_POST['beschreibung']);
93	94	if (isset($_POST['money'])) $this->money = intval($_POST['money']);
94	95	if (isset($_POST['groupIDs'])) $this->groupIDs = ArrayUtil::toIntegerArray($_POST['groupIDs']);
95	96	if (isset($_POST['action'])) $this->action = escapeString($_POST['action']);
	97	if (isset($_POST['activeTabMenuItem'])) $this->activeTabMenuItem = $_POST['activeTabMenuItem'];
96	98
97	99	$this->gwsOptionsArray = array_unique(ArrayUtil::trim(explode("\n", $this->gwsOptionsText)));
…	…
102	104	*/
103	105	public function validate() {
104		// Startdatum/zeit prfen und wandeln
	106	// Startdatum/zeit prï¿œfen und wandeln
105	107	if ($this->action != 'edit') {
106		$this->start = $this->convertDateTime($this->startDay, $this->startMonth, $this->startYear, $this->startHour, $this->startMinutes, $this->action, 'start');
107		}
108		$this->timeout = $this->convertDateTime($this->timeoutDay, $this->timeoutMonth, $this->timeoutYear, $this->timeoutHour, $this->timeoutMinutes, $this->action, 'timeout');
	108	$this->start = $this->convertDateTime($this->startDay, $this->startMonth, $this->startYear, $this->startHour, $this->startMinutes, $this->action, 'start');
	109	}
	110	$this->timeout = $this->convertDateTime($this->timeoutDay, $this->timeoutMonth, $this->timeoutYear, $this->timeoutHour, $this->timeoutMinutes, $this->action, 'timeout');
109	111	// start VOR ende ?
110	112	if ($this->timeout <= $this->start) {
…	…
168	170	".intval($this->timeout).",
169	171	'".escapeString($this->email)."',
170		'".~~$this->regeln~~."',
171		'".~~$this->discl~~."',
172		'".~~$this->beschreibung~~."',
	172	'".escapeString($this->regeln)."',
	173	'".escapeString($this->discl)."',
	174	'".escapeString($this->beschreibung)."',
173	175	'".implode(",",$this->groupIDs)."',
174	176	".intval($this->money).")";
…	…
206	208	public function readData() {
207	209	parent::readData();
	210
	211	$this->activeTabMenuItem = 'beschreibung';
208	212	}
209	213
…	…
271	275	'menOptions' => $this->menOptions,
272	276	'GUTHABEN_ENABLE_GLOBAL' => $this->GUTHABEN_ENABLE_GLOBAL,
273		'action' => 'add'
	277	'action' => 'add',
	278	'activeTabMenuItem' => $this->activeTabMenuItem,
274	279	));
275	280	}
…	…
285	290	}
286	291
287		p~~rivate~~ function convertDateTime($day, $month, $year, $hour, $minutes, $action, $startend) {
	292	public function convertDateTime($day, $month, $year, $hour, $minutes, $action, $startend) {
288	293	// Datum/zeit prfen und wandeln
289	294	if ($day \|\| $month \|\| $year \|\| $hour \|\| $minutes) {

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

r718	r729
122	122	*/
123	123	public function save() {
	124	if (!$this->start) {
	125	$this->start = parent::convertDateTime($this->startDay, $this->startMonth, $this->startYear, $this->startHour, $this->startMinutes, $this->action, 'start');
	126	}
124	127	$this->gwsOptionsArray = array_unique(ArrayUtil::trim(explode("\n", $this->gwsOptionsText)));
125	128	// get game options
…	…
157	160	if ($this->valid && $this->gwsID) {
158	161	$sql = "UPDATE gwsp".GWSP_N."_game
159		SET gwsTitel = '".escapeString($this->gwsTitel)."',
160		starttime = ".$this->start.",
161		timeout = ".$this->timeout.",
162		recipient = '".escapeString($this->email)."',
163		regeln = '".$this->regeln."',
164		discl = '".$this->discl."',
165		beschreib = '".$this->beschreibung."',
166		groupIDs = '".implode(",",$this->groupIDs)."',
167		money = '".intval($this->money)."'
168		WHERE gwsID = " .$this->gwsID;
169		GWSPACP::getDB()->registerShutdownUpdate($sql);
	162	SET gwsTitel = '".escapeString($this->gwsTitel)."',
	163	starttime = ".$this->start.",
	164	timeout = ".$this->timeout.",
	165	recipient = '".escapeString($this->email)."',
	166	regeln = '".escapeString($this->regeln)."',
	167	discl = '".escapeString($this->discl)."',
	168	beschreib = '".escapeString($this->beschreibung)."',
	169	groupIDs = '".implode(",",$this->groupIDs)."',
	170	money = ".intval($this->money)."
	171	WHERE gwsID = ".$this->gwsID;
	172	//GWSPACP::getDB()->registerShutdownUpdate($sql);
	173	GWSPACP::getDB()->sendQuery($sql);
170	174	// reset cache
171	175	GWSPACP::getCache()->clearResource('competition-games-'.PACKAGE_ID);

de.inside.Gewinnspiel/files/lib/system/GWSPCore.class.php

r718	r729
8	8	*
9	9	* @author Robert "Tatzelwurm" Hempel
10		* @copyright 2007/2008 INSIDE das Hrspiel
	10	* @copyright 2007/2008 INSIDE das Hoerspiel
11	11	* @license GNU LGPL http://www.gnu.org/licenses/lgpl.txt
12	12	* @package de.inside.Gewinnspiel

de.inside.Gewinnspiel/options.xml

r579	r729
50	50	<defaultvalue>1</defaultvalue>
51	51	</option>
52
	52	<option name="use_captcha">
	53	<categoryname>general.page</categoryname>
	54	<optiontype>boolean</optiontype>
	55	<defaultvalue>1</defaultvalue>
	56	</option>
53	57	<!-- general -->
54	58	<option name="install_date">

de.inside.Gewinnspiel/package.xml

r720	r729
11	11	<packageurl><![CDATA[http://community.woltlab.com/db/index.php?page=Project&projectID=593]]></packageurl>
12	12	<standalone>1</standalone>
13		<version>2.0.0 RC 1</version>
14		<date>2008-11-17</date>
	13	<version>2.0.0 RC 2</version>
	14	<date>2008-11-29</date>
15	15	</packageinformation>
16	16
…	…
57	57	<script>acp/install.php</script>
58	58	</instructions>
	59	<instructions type="update" fromversion="2.0.0 RC 1">
	60	<templates>templates.tar</templates>
	61	<files>files.tar</files>
	62	<options>options.xml</options>
	63	<languages languagecode="de">de.xml</languages>
	64	<languages languagecode="de-informal">de-informal.xml</languages>
	65	<!-- <languages languagecode="en">en.xml</languages> -->
	66	<!-- <languages languagecode="hr">hr.xml</languages> -->
	67	<!-- <languages languagecode="fr">fr.xml</languages> -->
	68	</instructions>
59	69	</package>

de.inside.Gewinnspiel/templates/gewinnspiel.tpl

r720	r729
3	3	<title>{@$game->gwsTitel} - {lang}gws.gewinnspiel.title{/lang} - {PAGE_TITLE}</title>
4	4	{include file='headInclude' sandbox=false}
5		~~<link rel="alternate" type="application/rss+xml" href="index.php?page=Feed&type=RSS2" title="RSS2" />~~
6		~~<link rel="alternate" type="application/atom+xml" href="index.php?page=Feed&type=Atom" title="Atom" />~~
7	5	</head>
8	6	<body>
…	…
127	125	<div class="border content">
128	126	<div class="containerHead" align="left">
129		<img src="{@RELATIVE_~~WCF_DIR}icon/help~~M.png" alt="" /> <b>{@$order+1}. {lang}gws.gewinnspiel.frage{/lang}</b>: {@$option}
	127	<img src="{@RELATIVE_GWSP_DIR}icon/gewinnspielQuestionM.png" alt="" /> <b>{@$order+1}. {lang}gws.gewinnspiel.frage{/lang}</b>: {@$option}
130	128	</div>
131	129	<div class="container-1">
132	130	<div class="containerIcon">
133		<img src="{@RELATIVE_GWSP_DIR}icon/gewinnspiel~~Question~~M.png" alt="" />
	131	<img src="{@RELATIVE_GWSP_DIR}icon/gewinnspielAnswerM.png" alt="" />
134	132	</div>
135	133	<div class="formElement{if $errorField == "answer[$order]"} formError{/if}">
…	…
177	175	</div>
178	176	</div>
	177	{if $errorType.captchaString\|isset}
	178	{assign var='captchaErrorField' value='captchaString'}
	179	{assign var='captchaErrorType' value=$errorType.captchaString}
	180	{else}
	181	{assign var='captchaErrorField' value=''}
	182	{assign var='captchaErrorType' value=''}
	183	{/if}
	184
	185	{include file='captcha' errorField=$captchaErrorField errorType=$captchaErrorType}
179	186	<div class="formSubmit">
180	187	<input type="submit" name="send" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />

de.inside.Gewinnspiel/templates/index.tpl

r720	r729
3	3	<title>{lang}gws.gewinnspiel.title{/lang} - {PAGE_TITLE}</title>
4	4	{include file='headInclude' sandbox=false}
5		~~<link rel="alternate" type="application/rss+xml" href="index.php?page=Feed&type=RSS2" title="RSS2" />~~
6		~~<link rel="alternate" type="application/atom+xml" href="index.php?page=Feed&type=Atom" title="Atom" />~~
7	5	</head>
8	6	<body>

Context Navigation

Changeset 729

Legend:

Download in other formats: