diff --git a/_serp.html b/_serp.html
index 1d14d27..1d81835 100644
--- a/_serp.html
+++ b/_serp.html
@@ -71,11 +71,6 @@
{{vtCalc: analyzeSearchString() }}
{{vtSet: Search}}
- {{vtIf: {vtGlobal:pxtcSearchScope} .eq. keywords .and. {vtGet:Search[keywords]} .eq. }}
- {{vtSet: Search[keywords]="{vtGet:Search[all]}" }}
- {{vtSet: Search[all]="" }}
- {{vtEndIf}}
-
{{vtIf: {vtGlobal:pxtcSearchSortfield} .eq.}}
{{vtSet: SortField="name"}}
{{vtElseIf: {vtGlobal:pxtcSearchSortfield} .cn. .}}
diff --git a/ajax/update_next_image.html b/ajax/update_next_image.html
old mode 100644
new mode 100755
index 7ddf88b..43bd064
--- a/ajax/update_next_image.html
+++ b/ajax/update_next_image.html
@@ -36,11 +36,13 @@
{{vtSet: Result[status_lores]="{vtResult}"}}
{{vtIf: {vtResult} .gt. 0 }}
{{vtDo: -act="update", -obj="{vtID}", lores_timestamp="{vtDate}", LastCheck="{vtSession:update_timestamp}" }}
+ {{vtElse}}
+ {{vtSet: Result[error]="2"}}
{{vtEndIf}}
{{vtEndIf}}
{{vtCalc: file_exists('{vtGet:ImagePath,raw|utf8_encode}') ? '1' : '0' }}
- {{vtIf: {vtResult} .eq. 0}}
+ {{vtIf: {vtResult} .eq. 0 .and. {vtGet:Result[error]} .eq. }}
{{vtSet: Result[error]="1"}}
{{vtExit}}
{{vtEndIf}}
diff --git a/checkout.summary.html b/checkout.summary.html
index 0958791..e4450ae 100644
--- a/checkout.summary.html
+++ b/checkout.summary.html
@@ -499,10 +499,10 @@
-
+
-
+
diff --git a/contact.html b/contact.html
old mode 100644
new mode 100755
index 7308cb2..8d8ff05
--- a/contact.html
+++ b/contact.html
@@ -62,6 +62,13 @@
return false;
}
+ if( f.Datenschutz && ! f.Datenschutz.checked )
+ {
+ alert( '{{vtGet:s_msg_0055,escaped}}' );
+ f.Datenschutz.focus();
+ return false;
+ }
+
f.jstest.value = '1';
return true;
}
@@ -167,6 +174,15 @@
+
+
+
+
+
+ ({{vtGet:s_btn_read}})*
+ |
+
+
Blindfeld: |
diff --git a/contact.vtedit.html b/contact.vtedit.html
old mode 100644
new mode 100755
index c313445..fbe872c
--- a/contact.vtedit.html
+++ b/contact.vtedit.html
@@ -129,6 +129,16 @@
|
|
+ Datenschutzerklärung |
+
+
+ |
+
+ Tragen Sie hier ggf. die Nummer der Seite ein, auf der Ihre Datenschutzerklärung zu finden ist.
+ |
+
+ |
+
Abonnieren-Text |
diff --git a/imagelist.update_images.html b/imagelist.update_images.html
index b3318f1..68fdee6 100644
--- a/imagelist.update_images.html
+++ b/imagelist.update_images.html
@@ -104,6 +104,9 @@
theResponse = JSON.parse( http.responseText );
if( theResponse['error'] == '1' ){
theMessage = 'FEHLER - Low-res-Datei nicht gefunden';
+ }
+ else if( theResponse['error'] == '2' ){
+ theMessage = 'FEHLER - Low-res-Datei konnte nicht erzeugt werden ' + theResponse['status_lores'] + ' ';
} else {
if( theResponse['status_format'] == '1' ){
theMessage += 'Format aktualisiert. ';
diff --git a/languages/de.txt b/languages/de.txt
index 7070caa..48ea4f6 100644
--- a/languages/de.txt
+++ b/languages/de.txt
@@ -171,6 +171,7 @@
{{vtSet: s_msg_0054 = 'Ihre Zugriffsrechte reichen nicht aus, um die Inhalte dieses Ordners zu sehen.'}}
{{vtSet: s_msg_0055 = "Bitte bestätigen Sie, dass Sie die Datenschutzerklärung zur Kenntnis genommen haben."}}
{{vtSet: s_msg_0056 = "Bitte bestätigen Sie, dass Sie auf Ihr Widerrufsrecht verzichten."}}
+{{vtSet: s_msg_0057 = "Der Benutzername darf nur Buchstaben und Ziffern sowie Punkte, Unter- und Bindestriche enthalten."}}
{{vtSet: s_meta_photographer = "Fotograf"}}
{{vtSet: s_meta_creation_date = "Aufnahmedatum"}}
diff --git a/languages/en.txt b/languages/en.txt
index 5b449da..9ddc007 100644
--- a/languages/en.txt
+++ b/languages/en.txt
@@ -171,6 +171,7 @@
{{vtSet: s_msg_0054 = 'You have not the neccessary privileges to view the content of this folder.'}}
{{vtSet: s_msg_0055 = "Please confirm that you have read our privacy statement."}}
{{vtSet: s_msg_0056 = "Please confirm that you waive your right of revocation."}}
+{{vtSet: s_msg_0057 = "The user name may only contain letters, numbers, periods, hyphens and underscore characters."}}
{{vtSet: s_meta_photographer = "Photographer"}}
{{vtSet: s_meta_creation_date = "Creation Date"}}
diff --git a/register.html b/register.html
old mode 100644
new mode 100755
index fcee74d..ad636ff
--- a/register.html
+++ b/register.html
@@ -86,6 +86,12 @@
return false;
}
+ if( ! f.username.value.match(/^[a-zA-Z0-9._-]+$/) ){
+ alert('{{vtGet:s_msg_0057}}');
+ f.username.focus();
+ return false;
+ }
+
if( f.password.value == '' ){
alert( '{{vtGet:s_msg_0048}}' );
f.password.focus();
@@ -124,6 +130,13 @@
return false;
}
+ if( f.Datenschutz && ! f.Datenschutz.checked )
+ {
+ alert( '{{vtGet:s_msg_0055,escaped}}' );
+ f.Datenschutz.focus();
+ return false;
+ }
+
if( f.elements['-captcha'] && f.elements['-captcha'].value == '' )
{
alert( '{{vtGet:s_msg_0041}}' );
@@ -364,6 +377,15 @@
| {{vtGet:s_fld_message}}: |
|
+
+
+
+
+
+ ({{vtGet:s_btn_read}})*
+ |
+
+
{{vtGet:s_fld_captcha_code}}: |
diff --git a/register.vtedit.html b/register.vtedit.html
old mode 100644
new mode 100755
index a902042..28d412f
--- a/register.vtedit.html
+++ b/register.vtedit.html
@@ -166,6 +166,16 @@
|
+ Datenschutzerklärung |
+
+
+ |
+
+ Tragen Sie hier ggf. die Nummer der Seite ein, auf der Ihre Datenschutzerklärung zu finden ist.
+ |
+
+ |
+
Blacklist |
diff --git a/resources/functions.php b/resources/functions.php
index 509d8c6..9de2549 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -854,15 +854,29 @@ function analyzeSearchString()
$result['all'] .= utf8_encode( $criteria ) . ' ';
}
}
+
+ $scope = v::vtglobal('pxtcSearchScope');
- if ( v::vtglobal('pxtcSearchFtMode') == '' )
+ if ( $scope != '' && empty( $result[ $scope ] ) )
{
- foreach ( $result as $key => $value )
- {
- $result[ $key ] = str_replace( '*', '%', $value );
- }
+ $result[ $scope ] = $result['all'];
+ unset( $result['all'] );
}
+
+ $fields = v::vtglobal('pxtcSearchAllowedFields');
+ if ( $fields )
+ {
+ $fields = array_map( 'trim', explode( ',', strtolower( $fields ) ) );
+ $fields = array_flip( $fields ) + array ( $scope => $result[ $scope ] );
+ $result = array_intersect_key( $result, $fields );
+ }
+
+ if ( v::vtglobal('pxtcSearchFtMode') == '' )
+ {
+ $result = array_map( function( $v ){ return str_replace( '*', '%', $v ); }, $result );
+ }
+
return $result;
}
diff --git a/setup_search.html b/setup_search.html
index 029b967..f150018 100644
--- a/setup_search.html
+++ b/setup_search.html
@@ -20,6 +20,8 @@
|
Stichwortsuche
+
+ {{pxtcSearchScope}}
Volltextsuche
|