diff --git a/ajax/update_next_image.html b/ajax/update_next_image.html index 60359b9..a16090f 100755 --- a/ajax/update_next_image.html +++ b/ajax/update_next_image.html @@ -74,17 +74,17 @@ {{vtSet:charset=""}} {{vtEndIf}} - {{vtSet: ImagePath = "{vtGet:LoresPath}" }} + {{vtSet: ImagePath = "{vtGet:LoresPath,raw}" }} {{vtIf: {vtSession:update_iptc_source} .eq. hires }} {{vtCalc: file_exists( '{vtGet:HiresPath}' ) ? 1 : 0 }} {{vtIf: {vtResult} .eq. 1 }} - {{vtSet: ImagePath = "{vtGet:HiresPath}" }} + {{vtSet: ImagePath = "{vtGet:HiresPath,raw}" }} {{vtEndIf}} {{vtEndIf}} {{vtRepeat: Category, Keywords, ReferenceNumber, CreationDate, CreationTime, Photographer, City, State, CountryCode, Country, Title, Credit, Copyright, Description, Instructions }} - {{vtCalc: getIPTCHeader('{vtGet:ImagePath,raw}', '{vtItem}', '{vtGet:charset}' ) }} + {{vtCalc: getIPTCHeader('{vtGet:ImagePath,escaped}', '{vtItem}', '{vtGet:charset}' ) }} {{vtSet: {vtItem}="{vtResult}"}} {{vtEndRepeat}} diff --git a/contact.send.html b/contact.send.html index 494ad8a..b448a41 100644 --- a/contact.send.html +++ b/contact.send.html @@ -4,8 +4,13 @@ {{vtSet: PageTitle = "{vtGet:s_title_request_sent} | {vtGlobal:siteName}" }} {{vtSet: PageBodyId = "pxtc_page_{vtID}" }} {{vtSet: PageBodyClass = "pxtc_class_contact_send" }} + {{vtSet: PostFields = "Bemerkungen, Registrierung"}} + + {{vtRepeat: {vtGet: RequestFields} }} + {{vtSet: PostFields = "{vtGet:PostFields}, {vtItem:value}" }} + {{vtEndRepeat}} - {{vtDo: -act="updateSession", -postvalues="Name, Vorname, Anrede, Firma, Email, Telefon, Handy, Bemerkungen, Registrierung" }} + {{vtDo: -act="updateSession", -postvalues="{vtGet:PostFields}" }} {{vtIf: {Captcha} .eq. 1 .and. {vtPostValue:-captcha} .neq. {vtCaptchaSecret} }} {{vtSet: FalseCaptcha="1"}} @@ -67,16 +72,7 @@ .and. {vtGet:NoJavaScript} .neq. 1 .and. {vtGet:SpamTrap} .neq. 1 }} {{vtDo:-act="create",-target="{vtGet:ID_Anfragen}",-template="request", - -properties[name]="{vtSession:Name}", - Name="{vtSession:Name}", - Vorname="{vtSession:Vorname}", - Anrede="{vtSession:Anrede}", - Firma="{vtSession:Firma}", - Email="{vtSession:Email}", - Telefon="{vtSession:Telefon}", - Handy="{vtSession:Handy}", - Bemerkungen="{vtSession:Bemerkungen}", - Registrierung="{vtSession:Registrierung}", + -properties[name]="{vtSession:Name}", -postvalues="{vtGet:PostFields}", Lightbox="{vtGet:Lightbox}" }} {{vtIf: {vtSession:Registrierung} .eq. 1 .and. {vtGlobal:pxtcCleverreachId} .gt. 0 .and. {vtGlobal:pxtcCleverreachApiKey} .neq. .and. {vtGlobal:pxtcCleverreachListId} .gt. 0}} diff --git a/mails/request.html b/mails/request.html index 4758fbe..ac4d92c 100644 --- a/mails/request.html +++ b/mails/request.html @@ -29,22 +29,19 @@
{{vtSession:Anrede}} {{vtSession:Vorname}} {{vtSession:Name}}
-
-
- {{vtSession:Firma}}
-
-
-
- Tel.: {{vtSession:Telefon}}
-
-
-
- Handy: {{vtSession:Handy}}
-
-
-
- {{vtSession:Email}}
-
+
+ {{vtSession: {vtItem:value} }}
+
+
+
+ {{vtItem:label}}:
+
+ {{vtResult}}
+
+ {{vtResult}}
+
+
+
Anrede | -{{Anrede}} | -||
Vorname | -{{Vorname}} | -||
Name | -{{Name}} | -||
Firma | -{{Firma}} | -||
{{vtItem:label}} | - {{Email}} - | -||
Telefon | -{{Telefon}} | -||
Handy | -{{Handy}} | + + + {{vtResult}} + + {{vtResult}} + +||
Bemerkungen | {{Bemerkungen}} | diff --git a/requestlist.html b/requestlist.html index 721df2a..bb1d3c6 100644 --- a/requestlist.html +++ b/requestlist.html @@ -162,7 +162,7 @@ {{vtCreationDate}}- {{Name}} + {{Vorname}} {{Name}} | {{Firma}} |