Skip to content

Commit 84f1318

Browse files
committed
yform 3 fixes
1 parent b394882 commit 84f1318

File tree

8 files changed

+25
-11
lines changed

8 files changed

+25
-11
lines changed

install.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
`clang_id` int(10) NOT NULL,
1111
`rating` tinyint(1) DEFAULT 0,
1212
`recommendation` tinyint(1) DEFAULT 0,
13-
`privacy_policy_accepted` varchar(3) DEFAULT 'no',
13+
`privacy_policy_accepted` tinyint(1) DEFAULT 0,
1414
`online_status` varchar(10) DEFAULT NULL,
1515
`create_date` int(11) NOT NULL,
1616
PRIMARY KEY (`id`)

lib/d2u_guestbook_module_manager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ public static function getModules() {
1313
$modules = [];
1414
$modules[] = new D2UModule("60-1",
1515
"D2U Guestbook - Gästebuch mit Bootstrap 4 Tabs",
16-
7);
16+
8);
1717
$modules[] = new D2UModule("60-2",
1818
"D2U Guestbook - Infobox Bewertung",
1919
2);
2020
$modules[] = new D2UModule("60-3",
2121
"D2U Guestbook - Gästebuch ohne Tabs",
22-
6);
22+
7);
2323
return $modules;
2424
}
2525
}

modules/60/1/output.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ function click_stars(wert) {
146146
text|email|'. $tag_open .'d2u_guestbook_form_email'. $tag_close .'
147147
textarea|description|'. $tag_open .'d2u_guestbook_form_message'. $tag_close .'
148148
radio|recommendation|'. $tag_open .'d2u_guestbook_form_recommendation'. $tag_close .'|'. $tag_open .'d2u_guestbook_no'. $tag_close .'=0,'. $tag_open .'d2u_guestbook_yes'. $tag_close .'=1|1|
149-
checkbox|privacy_policy_accepted|'. $tag_open .'d2u_guestbook_form_privacy_policy'. $tag_close . ' *|no,yes|no
149+
checkbox|privacy_policy_accepted|'. $tag_open .'d2u_guestbook_form_privacy_policy'. $tag_close . ' *|0,1|0
150150
text|rating|'. $tag_open .'d2u_guestbook_form_rating'. $tag_close .' '. $stars.'|0||{"style":"display:none"}
151151
html||<br>* '. $tag_open .'d2u_guestbook_form_required'. $tag_close .'<br><br>
152152
php|validate_timer|Spamprotection|<input name="validate_timer" type="hidden" value="'. microtime(true) .'" />|

modules/60/1/style.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,7 @@ guestbook-page {
111111
background-color: article_color_h;
112112
border: 1px solid article_color_h;
113113
color: article_color_bg;
114+
}
115+
input[type="radio"] {
116+
width: 1em;
114117
}

modules/60/3/output.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function click_stars(wert) {
5151
text|email|'. $tag_open .'d2u_guestbook_form_email'. $tag_close .'
5252
textarea|description|'. $tag_open .'d2u_guestbook_form_message'. $tag_close .'
5353
radio|recommendation|'. $tag_open .'d2u_guestbook_form_recommendation'. $tag_close .'|'. $tag_open .'d2u_guestbook_no'. $tag_close .'=0,'. $tag_open .'d2u_guestbook_yes'. $tag_close .'=1|1|
54-
checkbox|privacy_policy_accepted|'. $tag_open .'d2u_guestbook_form_privacy_policy'. $tag_close . ' *|no,yes|no
54+
checkbox|privacy_policy_accepted|'. $tag_open .'d2u_guestbook_form_privacy_policy'. $tag_close . ' *|0,1|0
5555
text|rating|'. $tag_open .'d2u_guestbook_form_rating'. $tag_close .' '. $stars.'|0||{"style":"display:none"}
5656
html||<br>* '. $tag_open .'d2u_guestbook_form_required'. $tag_close .'<br><br>
5757
php|validate_timer|Spamprotection|<input name="validate_timer" type="hidden" value="'. microtime(true) .'" />|

modules/60/3/style.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,7 @@ guestbook-page {
9797
background-color: article_color_h;
9898
border: 1px solid article_color_h;
9999
color: article_color_bg;
100+
}
101+
input[type="radio"] {
102+
width: 1em;
100103
}

pages/setup.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@
4646
Verzeichnis im Pfad modules/60/<i>Nummer des Moduls</i>/styles.css.</p>
4747
<h2>Beispielseiten</h2>
4848
<ul>
49-
<li>Gästebuch Addon mit Bootstrap 4 Tabs: <a href="https://www.immobiliengaiser.de/home/unser-gaestebuch/" target="_blank">
49+
<li>Gästebuch Addon mit Bootstrap 4 Tabs: <a href="https://immobiliengaiser.de/home/unser-gaestebuch/" target="_blank">
5050
ImmobilienGaiser</a>.</li>
51+
<li>Gästebuch Addon mit Bootstrap 4 Tabs: <a href="https://www.optik-muelhaupt.de/gaestebuch/" target="_blank">
52+
Optik Mülhaupt</a>.</li>
5153
<li>Gästebuch Addon ohne Tabs: <a href="http://www.hotel-albatros.de" target="_blank">
5254
Hotel Albatros</a>.</li>
5355
</ul>
@@ -56,7 +58,7 @@
5658
<h2>Changelog</h2>
5759
<p>1.0.6:</p>
5860
<ul>
59-
<li>...</li>
61+
<li>Anpassungen an YForm 3.</li>
6062
</ul>
6163
<p>1.0.5:</p>
6264
<ul>

update.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,29 @@
1111
$modules = [];
1212
$modules[] = new D2UModule("60-1",
1313
"D2U Guestbook - Gästebuch mit Bootstrap 4 Tabs",
14-
7);
14+
8);
1515
$modules[] = new D2UModule("60-2",
1616
"D2U Guestbook - Infobox Bewertung",
1717
2);
1818
$modules[] = new D2UModule("60-3",
1919
"D2U Guestbook - Gästebuch ohne Tabs",
20-
6);
20+
7);
2121
$d2u_module_manager = new D2UModuleManager($modules, "", "d2u_address");
2222
$d2u_module_manager->autoupdate();
2323
}
2424

25-
// 1.0.3 Update database
2625
$sql = rex_sql::factory();
26+
// 1.0.3 Update database
2727
$sql->setQuery("SHOW COLUMNS FROM ". \rex::getTablePrefix() ."d2u_guestbook LIKE 'privacy_policy_accepted';");
2828
if($sql->getRows() == 0) {
2929
$sql->setQuery("ALTER TABLE ". \rex::getTablePrefix() ."d2u_guestbook "
30-
. "ADD privacy_policy_accepted VARCHAR(3) DEFAULT 'no' AFTER recommendation;");
30+
. "ADD privacy_policy_accepted tinyint(1) DEFAULT 0 AFTER recommendation;");
31+
}
32+
// 1.0.6 Update database
33+
if (rex_string::versionCompare($this->getVersion(), '1.0.6', '<')) {
34+
$sql->setQuery("UPDATE ". \rex::getTablePrefix() ."d2u_guestbook SET privacy_policy_accepted = '0' WHERE privacy_policy_accepted = 'no';");
35+
$sql->setQuery("UPDATE ". \rex::getTablePrefix() ."d2u_guestbook SET privacy_policy_accepted = '1' WHERE privacy_policy_accepted = 'yes';");
36+
$sql->setQuery("ALTER TABLE ". \rex::getTablePrefix() ."d2u_guestbook CHANGE privacy_policy_accepted privacy_policy_accepted tinyint(1) DEFAULT 0;");
3137
}
3238

3339
// remove default lang setting

0 commit comments

Comments
 (0)