Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1653) +++ branches/2.8.x/CHANGELOG (revision 1654) @@ -11,6 +11,9 @@ ! = Update/Change =============================================================================== +01 Apr-2012 Build 1654 Dietmar Woellbrink (Luisehahne) +# Fixed SERVER_EMAIL in languages, needs double brackets +! Installer redesign Step 2 28 Mar-2012 Build 1653 Werner v.d.Decken(DarkViper) # fixed change_mode() against a very old problem with invalid calling arguments @@ -45,7 +48,7 @@ 22 Mar-2012 Build 1640 Dietmar Woellbrink (Luisehahne) ! optimize modules WYSIWYG for editors 22 Mar-2012 Build 1639 Dietmar Woellbrink (Luisehahne) -+ Installer add const DEBUG to config.php ++ Installer add const DEBUG to config.php (see DEVINFOS) ! move const DEBUG and var $starttime from index.php to initialize.php 14 Mar-2012 Build 1638 Werner v.d.Decken(DarkViper) + config.php added define to set admin-directory Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1653) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1654) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1653'); +if(!defined('REVISION')) define('REVISION', '1654'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/account/signup2.php =================================================================== --- branches/2.8.x/wb/account/signup2.php (revision 1653) +++ branches/2.8.x/wb/account/signup2.php (revision 1654) @@ -21,7 +21,7 @@ // require_once(WB_PATH.'/framework/class.wb.php'); $wb = new wb('Start', 'start', false, false); - +include_once (WB_PATH.'/framework/functions.php'); // Get details entered $groups_id = FRONTEND_SIGNUP; $active = 1; @@ -59,7 +59,9 @@ $replace = array( SERVER_EMAIL); // Captcha if(ENABLED_CAPTCHA) { - $MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = str_replace($search,$replace,$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA']); + $aServerEmail = (defined('SERVER_EMAIL') && SERVER_EMAIL != '' ? SERVER_EMAIL : $_SERVER['SERVER_NAME']); + $replace = array('SERVER_EMAIL' => $aServerEmail ); + $MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = replace_vars($MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'], $replace); if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){ // Check for a mismatch if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) { Index: branches/2.8.x/wb/install/index.php =================================================================== --- branches/2.8.x/wb/install/index.php (revision 1653) +++ branches/2.8.x/wb/install/index.php (revision 1654) @@ -188,7 +188,7 @@ - + Writeable'; @@ -206,7 +206,7 @@ if ( filesize($wb_path.$configFile) > 128) { $installFlag = false; - $config = 'Not empty!!?'; + $config = 'Already installed? Check!'; // try to open and to write } elseif( !$handle = fopen($wb_path.$configFile, 'w') ) { @@ -241,26 +241,28 @@ } ?> - - + + + + - - - + - + - + - + - + + + + -

Step 2

 Please check the following files/folders are writeable before continuing...

Step 2

 Please check the following files/folders are writeable before continuing...
/pages/Writeable'; } elseif(!file_exists('../pages/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
/pages/Writeable'; } elseif(!file_exists('../pages/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>/media//media/ Writeable'; } elseif(!file_exists('../media/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>/templates//templates/ Writeable'; } elseif(!file_exists('../templates/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
/modules//modules/ Writeable'; } elseif(!file_exists('../modules/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>/languages//languages/ Writeable'; } elseif(!file_exists('../languages/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>/temp/
/temp/ Writeable'; } elseif(!file_exists('../temp/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>    
Index: branches/2.8.x/wb/languages/FI.php =================================================================== --- branches/2.8.x/wb/languages/FI.php (revision 1653) +++ branches/2.8.x/wb/languages/FI.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Merkkiä ../ ei voi käyttää '; $MESSAGE['MEDIA_UPLOADED'] = ' tiedostot ladattu'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Rajoitus voimassa, yritä tunnin kuluttua uudelleen'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Täytä kentät'; $MESSAGE['PAGES_ADDED'] = 'Sivu lisätty'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Otsikko lisätty'; Index: branches/2.8.x/wb/languages/EN.php =================================================================== --- branches/2.8.x/wb/languages/EN.php (revision 1653) +++ branches/2.8.x/wb/languages/EN.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Cannot have ../ in the folder target'; $MESSAGE['MEDIA_UPLOADED'] = ' files were successfully uploaded'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'You must enter details for the following fields'; $MESSAGE['PAGES_ADDED'] = 'Page added successfully'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Page heading added successfully'; Index: branches/2.8.x/wb/languages/CS.php =================================================================== --- branches/2.8.x/wb/languages/CS.php (revision 1653) +++ branches/2.8.x/wb/languages/CS.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Nelze použít ../ v cílovém adresáři'; $MESSAGE['MEDIA_UPLOADED'] = ' soubory byly úspěšně nahrány'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Omlouváme se, ale tento formulář dosáhl limitu povolených odeslání pro tuto hodinu. Prosím zkuste to znovu v další hodině..'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Kontrolní kód (známý jako Captcha) neodpovídá. Pokud máte problémy s přečtením tohoto kódu, kontaktujte {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Kontrolní kód (známý jako Captcha) neodpovídá. Pokud máte problémy s přečtením tohoto kódu, kontaktujte {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Musíte vyplnit následující pole'; $MESSAGE['PAGES_ADDED'] = 'Stránka byla úspěšně přidána'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Záhlaví stránky bylo úspěšně přidáno'; Index: branches/2.8.x/wb/languages/SE.php =================================================================== --- branches/2.8.x/wb/languages/SE.php (revision 1653) +++ branches/2.8.x/wb/languages/SE.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Kan inte ha ../ i mappens mål'; $MESSAGE['MEDIA_UPLOADED'] = ' filerna laddades upp'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Tyvärr, detta formulär har skickats för många gånger inom denna timme. Försök igen om ett tag.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Verifieringsnumret (också känt som Captcha) som du angav är felaktigt. Om du har problem med att läsa ut Captcha, vänligen sänd email till: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Verifieringsnumret (också känt som Captcha) som du angav är felaktigt. Om du har problem med att läsa ut Captcha, vänligen sänd email till: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Du måste fylla i följande fält'; $MESSAGE['PAGES_ADDED'] = 'Sidan lades till'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Sidans huvud lades till'; Index: branches/2.8.x/wb/languages/ES.php =================================================================== --- branches/2.8.x/wb/languages/ES.php (revision 1653) +++ branches/2.8.x/wb/languages/ES.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'No puede tener ../ en el nombre de carpeta'; $MESSAGE['MEDIA_UPLOADED'] = ' archivos recibidos correctamente'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Disculpe este formulario ha sido enviado demasiadas veces seguidas. Vuelva a intentarlo en una hora.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'El número de verificación que ha introducido es incorrecto. Si estás teniendo problemas leyéndolo, por favor, envíe un e-mail a: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'El número de verificación que ha introducido es incorrecto. Si estás teniendo problemas leyéndolo, por favor, envíe un e-mail a: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Debe completar los siguiente campos'; $MESSAGE['PAGES_ADDED'] = 'Página agregada'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Encabezado de Página agregado'; Index: branches/2.8.x/wb/languages/FR.php =================================================================== --- branches/2.8.x/wb/languages/FR.php (revision 1653) +++ branches/2.8.x/wb/languages/FR.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Impossible d'avoir ../ dans le nom du dossier cible'; $MESSAGE['MEDIA_UPLOADED'] = 'Les fichiers ont été uploadés avec succès'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Désolé mais ce formulaire est utilisé trop fréquemment en ce moment. Afin de nous aider à lutter contre le spam, merci de réessayer plus tard'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Le numéro de vérification (Captcha) que vous avez entré est incorrect. Si vous rencontrez des problèmes quant à la lecture de ce numéro, merci d'envoyer un email à : {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Le numéro de vérification (Captcha) que vous avez entré est incorrect. Si vous rencontrez des problèmes quant à la lecture de ce numéro, merci d'envoyer un email à : {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Vous devez renseigner les champs suivants'; $MESSAGE['PAGES_ADDED'] = 'Page ajoutée avec succès'; $MESSAGE['PAGES_ADDED_HEADING'] = 'L'entête de la page a été ajouté avec succès'; Index: branches/2.8.x/wb/languages/ET.php =================================================================== --- branches/2.8.x/wb/languages/ET.php (revision 1653) +++ branches/2.8.x/wb/languages/ET.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Cannot have ../ in the folder target'; $MESSAGE['MEDIA_UPLOADED'] = ' failid edukalt üles laetud'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Vabandame, see vorm on juba liiga palju kordi selle tunni jooksul saadetud. Palun proovi järgmine tund uuesti.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Sa pead detailid sisestama järgnevatesse lahtritesse'; $MESSAGE['PAGES_ADDED'] = 'Lehekülg edukalt lisatud'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Lehekülje päis edukalt lisatud'; Index: branches/2.8.x/wb/languages/HR.php =================================================================== --- branches/2.8.x/wb/languages/HR.php (revision 1653) +++ branches/2.8.x/wb/languages/HR.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Ne može ../ u cilj direktorija'; $MESSAGE['MEDIA_UPLOADED'] = ' fileovi su supješno nasnimljeni'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Ova forma je pregledavana previše puta u jednom satu. Molimo pokušajte slijedeæi sat.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Broj provjere (poznat kao Captcha) netoèno je unešen. Ako imate problema s èitanjem Captcha, molimo pošaljite email: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Broj provjere (poznat kao Captcha) netoèno je unešen. Ako imate problema s èitanjem Captcha, molimo pošaljite email: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Morate unjeti detaljen podatke u nadoilazeæa polja'; $MESSAGE['PAGES_ADDED'] = 'Stranica je uspješno dodana'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Zaglavlje stranice uspješno je dodano'; Index: branches/2.8.x/wb/languages/NL.php =================================================================== --- branches/2.8.x/wb/languages/NL.php (revision 1653) +++ branches/2.8.x/wb/languages/NL.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Gebruik van ../ in de map is niet toegestaan'; $MESSAGE['MEDIA_UPLOADED'] = ' geupload'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Dit formulier is te vaak verstuurd binnen dit uur. Probeert u het over een uur nog eens.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Het verificatienummer (ook wel Captcha genoemd) dat u hebt ingevoerd is incorrect. Als u de Captcha niet goed kunt lezen, stuur dan een e-mail naar: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Het verificatienummer (ook wel Captcha genoemd) dat u hebt ingevoerd is incorrect. Als u de Captcha niet goed kunt lezen, stuur dan een e-mail naar: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'De volgende velden zijn verplicht'; $MESSAGE['PAGES_ADDED'] = 'Pagina toegevoegd'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Paginatitel opgeslagen'; Index: branches/2.8.x/wb/languages/PL.php =================================================================== --- branches/2.8.x/wb/languages/PL.php (revision 1653) +++ branches/2.8.x/wb/languages/PL.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Folder docelowy nie moze zawierac ../'; $MESSAGE['MEDIA_UPLOADED'] = ' pliki zostaly pomyslnie zaladowane'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Niestety, ten formularz zostal wyslany zbyt wiele razy w ciagu tej godziny. Prosimy spróbowac ponownie za godzine.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Wprowadzony numer weryfikacyjny (tzw. Captcha) jest nieprawidlowy. Jesli masz problemy z odczytaniem Captcha, napisz do: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Wprowadzony numer weryfikacyjny (tzw. Captcha) jest nieprawidlowy. Jesli masz problemy z odczytaniem Captcha, napisz do: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Nalezy wprowadzic szczególy dla nastepujacych pól'; $MESSAGE['PAGES_ADDED'] = 'Strona zostala dodana'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Naglówek strony zostal dodany'; Index: branches/2.8.x/wb/languages/HU.php =================================================================== --- branches/2.8.x/wb/languages/HU.php (revision 1653) +++ branches/2.8.x/wb/languages/HU.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Nem lehet ../ in könyvtár névben'; $MESSAGE['MEDIA_UPLOADED'] = ' file sikeresen feltöltve'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Sajnáljuk, de ez az -?-¦rlap túl sokszor lett kitöltve egy óran belül! Kérem próbálja meg egy óra múlva'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'A megadott ellenörzàkód (vagy más néven Captcha) hibás. Ha problémád van elolvasni a Captcha kódot, kümailt ide: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'A megadott ellenörzàkód (vagy más néven Captcha) hibás. Ha problémád van elolvasni a Captcha kódot, kümailt ide: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'A következàmez-?-?et kötelezàkitöltenie'; $MESSAGE['PAGES_ADDED'] = 'Lap sikeresen hozzáadva'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Lap címsor sikeresen hozzáadva'; Index: branches/2.8.x/wb/languages/IT.php =================================================================== --- branches/2.8.x/wb/languages/IT.php (revision 1653) +++ branches/2.8.x/wb/languages/IT.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Impossibile avere ../ nella cartella di destinazione'; $MESSAGE['MEDIA_UPLOADED'] = ' file sono stati caricati con successo'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Spiacente: hai compilato questa form troppe volte nell\'ultima ora.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Il numero di controllo (chiama Captcha) che hai inserito non è valido. Se hai problemi con la lettura del Captcha, invia un email email: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Il numero di controllo (chiama Captcha) che hai inserito non è valido. Se hai problemi con la lettura del Captcha, invia un email email: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Devi inserire tutti i dati nei seguenti campi'; $MESSAGE['PAGES_ADDED'] = 'Pagina aggiunta'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Pagina intestazione aggiunta'; Index: branches/2.8.x/wb/languages/NO.php =================================================================== --- branches/2.8.x/wb/languages/NO.php (revision 1653) +++ branches/2.8.x/wb/languages/NO.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Kan ikke ha ../ i katalog målet'; $MESSAGE['MEDIA_UPLOADED'] = ' Lykkes å laste opp filene'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Beklager, dette skjemaet har blitt sendt for mange ganger denne timen. Vennligst prøv igjen om en time.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Bekreftelsesnummeret (også kjent som Captcha) som du skrev inn er feil. Hvis du har problemer med å lese Captcha, vennligst kontakt: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Bekreftelsesnummeret (også kjent som Captcha) som du skrev inn er feil. Hvis du har problemer med å lese Captcha, vennligst kontakt: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Du må skrive inn detaljer for følgende felt'; $MESSAGE['PAGES_ADDED'] = 'Lykkes å legge til siden'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Lykkes å legge til side overskrift'; Index: branches/2.8.x/wb/languages/SK.php =================================================================== --- branches/2.8.x/wb/languages/SK.php (revision 1653) +++ branches/2.8.x/wb/languages/SK.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Nejde použiť ../ v cielovom adresáry'; $MESSAGE['MEDIA_UPLOADED'] = ' súbory boly úspešne nahráné'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Ospravedlňujeme sa, ale tento formulár dosiahol limitu povolených odeslaní pre túto hodinu. Prosím skúste to znovu v dalšiej hodine..'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Kontrolný kód (známý ako Captcha) nezodpovedá. Pokiaľ máte problémy s prečítaním tohoto kódu, kontaktujte {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Kontrolný kód (známý ako Captcha) nezodpovedá. Pokiaľ máte problémy s prečítaním tohoto kódu, kontaktujte {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Musíte vyplniť následujúce pole'; $MESSAGE['PAGES_ADDED'] = 'Stránka bola úspešne pridaná'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Záhlavie stránky bolo úspešne pridané'; Index: branches/2.8.x/wb/languages/LV.php =================================================================== --- branches/2.8.x/wb/languages/LV.php (revision 1653) +++ branches/2.8.x/wb/languages/LV.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Nav iespejams ieklaut ../ mapes merki (target)'; $MESSAGE['MEDIA_UPLOADED'] = ' datnes tika veiksmigi augšupieladetas'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Atvaino, ši forma ir tikusi aizpildita parak daudz reižu šis stundas laika. Ludzu pamegini velreiz pec stundas.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Ievaditais parbaudes numurs ir nepareizs. Ja radušas problemas ar parbaudes koda nolasišanu, suti zinu uz: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Ievaditais parbaudes numurs ir nepareizs. Ja radušas problemas ar parbaudes koda nolasišanu, suti zinu uz: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Ievadi detalas sekojošajos laukos'; $MESSAGE['PAGES_ADDED'] = 'Lapa veiksmigi pievienota'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Lapas virsraksts pievienots veiksmigi'; Index: branches/2.8.x/wb/languages/CA.php =================================================================== --- branches/2.8.x/wb/languages/CA.php (revision 1653) +++ branches/2.8.x/wb/languages/CA.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'No es pot tenir ../ a la carpeta de destí'; $MESSAGE['MEDIA_UPLOADED'] = ' fitxers han estat penjats amb èxit'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Ho sentim, aquest formulari ha estat enviat massa vegades durant l\'última hora. Per favor torneu-ho a intentar d\'ací una hora.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Heu d\'introduir les dades per als següents camps'; $MESSAGE['PAGES_ADDED'] = 'Pàgina afegida amb èxit'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Capçalera de pàgina afegida amb èxit'; Index: branches/2.8.x/wb/languages/PT.php =================================================================== --- branches/2.8.x/wb/languages/PT.php (revision 1653) +++ branches/2.8.x/wb/languages/PT.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Não pode possuir ../ na pasta alvo'; $MESSAGE['MEDIA_UPLOADED'] = ' arquivos enviados com sucesso'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Desculpe, este formulário foi submetido várias vezes nessa hora. Favor tentar novamente dentro de uma hora.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'O Número de Verifica&ccdil;ão (conhecido como Captcha) que você entrou, é inválido. Se estiver tendo problemas usando o Captcha, envie uma mensagem para: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'O Número de Verifica&ccdil;ão (conhecido como Captcha) que você entrou, é inválido. Se estiver tendo problemas usando o Captcha, envie uma mensagem para: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Você precisa preencher os seguintes campos'; $MESSAGE['PAGES_ADDED'] = 'Página adicionada com sucesso'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Cabe&ccdil;alho da Página adicionado com sucesso.'; Index: branches/2.8.x/wb/languages/DA.php =================================================================== --- branches/2.8.x/wb/languages/DA.php (revision 1653) +++ branches/2.8.x/wb/languages/DA.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Kan ikke have ../ i placeringen af biblioteket (mappen)'; $MESSAGE['MEDIA_UPLOADED'] = 'filer blev overført'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Beklager! Denne formular er blevet afsendt for mange gange indenfor den sidste time, og du vil derfor blive afvist - Prøv igen om en times tid!'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Verifikationstallene (også kendt som Captcha) som du tastede er ikke korrekte. Hvis du har problemer med at læse Captha tallene, så kontakt venligst sidens Administrator på denne mailadresse: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Verifikationstallene (også kendt som Captcha) som du tastede er ikke korrekte. Hvis du har problemer med at læse Captha tallene, så kontakt venligst sidens Administrator på denne mailadresse: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Du skal udfylde følgende felter:'; $MESSAGE['PAGES_ADDED'] = 'Siden er tilføjet'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Overskrift til side tilføjet'; Index: branches/2.8.x/wb/languages/TR.php =================================================================== --- branches/2.8.x/wb/languages/TR.php (revision 1653) +++ branches/2.8.x/wb/languages/TR.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Cannot have ../ in the folder target'; $MESSAGE['MEDIA_UPLOADED'] = ' Dosyalar baþarýlý bir þekilde yüklendi'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'You must enter details for the following fields'; $MESSAGE['PAGES_ADDED'] = 'Sayfa, baþarýlý bir þekilde ekledi'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Üst sayfa, baþarýlý bir þekilde ekledi'; Index: branches/2.8.x/wb/languages/RU.php =================================================================== --- branches/2.8.x/wb/languages/RU.php (revision 1653) +++ branches/2.8.x/wb/languages/RU.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Нельзя использовать ../ в имени'; $MESSAGE['MEDIA_UPLOADED'] = ' файлы успешно закачаны'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Извините, слишком много сообщений за последний час. Пожалуйста попробуйте повторить отправку через некоторое время.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Код подтверждения введен неверно. Если вы не можете прочесть код, пожалуйста сообщите разработчикам: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Код подтверждения введен неверно. Если вы не можете прочесть код, пожалуйста сообщите разработчикам: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'ВНИМАНИЕ! Вы должны заполнить поле'; $MESSAGE['PAGES_ADDED'] = 'Страница успешно добавлена'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Заголовок страницы успешно добавлен'; Index: branches/2.8.x/wb/languages/DE.php =================================================================== --- branches/2.8.x/wb/languages/DE.php (revision 1653) +++ branches/2.8.x/wb/languages/DE.php (revision 1654) @@ -542,7 +542,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Der Name des Zielverzeichnisses darf nicht ../ enthalten'; $MESSAGE['MEDIA_UPLOADED'] = 'Dateien wurden erfolgreich übertragen'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Dieses Formular wurde zu oft aufgerufen. Bitte versuchen Sie es in einer Stunde noch einmal.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Die eingegebene Prüfziffer stimmt nicht überein. Wenn Sie Probleme mit dem Lesen der Prüfziffer haben, bitte schreiben Sie eine E-Mail an uns: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Die eingegebene Prüfziffer stimmt nicht überein. Wenn Sie Probleme mit dem Lesen der Prüfziffer haben, bitte schreiben Sie eine E-Mail an uns: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Bitte folgende Angaben ergänzen'; $MESSAGE['PAGES_ADDED'] = 'Die Seite wurde erfolgreich hinzugefügt'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Seitenkopf erfolgreich hinzugefügt'; Index: branches/2.8.x/wb/languages/BG.php =================================================================== --- branches/2.8.x/wb/languages/BG.php (revision 1653) +++ branches/2.8.x/wb/languages/BG.php (revision 1654) @@ -541,7 +541,7 @@ $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Не може да включите ../ като цел на папка'; $MESSAGE['MEDIA_UPLOADED'] = ' файловете бяха успешно качени'; $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Съжаляваме, този форуляр е подаден повече пъти от позволеното през този час. Опитайте отнове по време на следващи час.'; -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Контролния номер (позант като Captcha) е грешен. Ако имате проблем с четенето на Captcha, изпратете e-mail на: {SERVER_EMAIL}'; +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Контролния номер (позант като Captcha) е грешен. Ако имате проблем с четенето на Captcha, изпратете e-mail на: {{SERVER_EMAIL}}'; $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Трябва да попълните следните полета'; $MESSAGE['PAGES_ADDED'] = 'Страницата успешно добавена'; $MESSAGE['PAGES_ADDED_HEADING'] = 'Page heading успешно добавен'; Index: branches/2.8.x/wb/modules/news/submit_comment.php =================================================================== --- branches/2.8.x/wb/modules/news/submit_comment.php (revision 1653) +++ branches/2.8.x/wb/modules/news/submit_comment.php (revision 1654) @@ -27,7 +27,7 @@ require_once(WB_PATH.'/framework/class.wb.php'); $wb = new wb; - +include_once (WB_PATH.'/framework/functions.php'); /* $post_id = (int)$_GET['post_id']; $section_id = (int)$_GET['section_id']; @@ -108,9 +108,9 @@ if($settings['use_captcha']) { - $search = array('{SERVER_EMAIL}'); - $replace = array( SERVER_EMAIL,); - $MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = str_replace($search,$replace,$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA']); + $aServerEmail = (defined('SERVER_EMAIL') && SERVER_EMAIL != '' ? SERVER_EMAIL : $_SERVER['SERVER_NAME']); + $replace = array('SERVER_EMAIL' => $aServerEmail ); + $MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = replace_vars($MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'], $replace); if(isset($_POST['captcha']) AND $_POST['captcha'] != '') { // Check for a mismatch Index: branches/2.8.x/DEVINFOS =================================================================== --- branches/2.8.x/DEVINFOS (revision 1653) +++ branches/2.8.x/DEVINFOS (revision 1654) @@ -5,14 +5,37 @@ +22 Mar-2012 Build 1639 +---------------------- +Refer: new structure in config.php set by new installation +backwards compability is given, so const can be defined in /framework/initialize.php +add const DEBUG to config.php (default = false) +add const ADMIN_DIRECTORY to config.php (default = admin) +[code] +define('DEBUG', false); +define('DB_TYPE', 'mysql'); +define('DB_HOST', 'localhost'); +define('DB_NAME', 'xxxxxx'); +define('DB_USERNAME', 'xxxxxx'); +define('DB_PASSWORD', 'xxxxxx'); +define('TABLE_PREFIX', 'wb_'); + +define('WB_URL', 'http://xxxxxxxx.xx'); +define('ADMIN_DIRECTORY', 'admin'); // no leading/trailing slash or backslash!! A simple directory only!! + +require_once(dirname(__FILE__).'/framework/initialize.php'); +[/code] + + 09 Mar-2012 Build 1634 ---------------------- If using the $MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] in your module, please add -following code to your script +following code to your script, +requires: include_once (WB_PATH.'/framework/functions.php'); [code] -$search = array('{SERVER_EMAIL}'); -$replace = array( SERVER_EMAIL); -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = str_replace($search,$replace,$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA']); +$aServerEmail = (defined('SERVER_EMAIL') && SERVER_EMAIL != '' ? SERVER_EMAIL : $_SERVER['SERVER_NAME']); +$replace = array('SERVER_EMAIL' => $aServerEmail ); +$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = replace_vars($MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'], $replace); [/code]