Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1476) +++ branches/2.8.x/CHANGELOG (revision 1477) @@ -11,11 +11,22 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------ +19 Jul-2011 Build 1477 Dietmar Woellbrink (Luisehahne) +! update DA language (Tks to Achrist) +! update some languages variables (Tks to Rübenwurzel, Testör) +! move function url_encode from admin/pages to framework/functions.php +! add missing svn properties in some headerinfos +! font-size correction in wb_theme (Tks to Rübenwurzel) 13 Jul-2011 Build 1476 Dietmar Woellbrink (Luisehahne) ! optimize blacklist handling, add more separator ",#|;" set of a wildcard ".*?" e.g. ph.*? proof ext like php, php3, php4 etc. -# fix sctrict warnings in media if default theme ist not Argos Theme +# fix strict warnings in media if default theme ist not Argos Theme + add new settings value in install, upgrade-script and core module +13 Jul-2011 Build 1476 Dietmar Woellbrink (Luisehahne) +! optimize blacklist handling, add more separator ",#|;" + set of a wildcard ".*?" e.g. ph.*? proof ext like php, php3, php4 etc. +# fix strict warnings in media if default theme ist not Argos Theme ++ add new settings value in install, upgrade-script and core module 13 Jul-2011 Build 1475 Dietmar Woellbrink (Luisehahne) + add SecureForm.mtab.php under maintenance by WebsiteBaker Community ! security fixes media, groups, users, sections Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1476) +++ branches/2.8.x/wb/upgrade-script.php (revision 1477) @@ -182,7 +182,7 @@

WebsiteBaker Upgrade

Warning:
It is not possible to upgrade from WebsiteBaker Versions bevor 2.7.0.
For upgrading to version '.VERSION.' you must upgrade first to v.2.7.0 at least!!!', 'warning', 'div'); + status_msg('Warning:
It is not possible to upgrade from WebsiteBaker Versions before 2.7.0.
For upgrading to version '.VERSION.' you must upgrade first to v.2.7.0 at least!!!', 'warning', 'div'); echo '

'; echo " @@ -326,7 +326,6 @@ /********************************************************** * - Adding field sec_anchor to settings table */ - echo "
Adding sec_anchor to settings table
"; $cfg = array( 'sec_anchor' => 'wb_' @@ -376,8 +375,6 @@ echo "
Adding field redirect_type to mod_menu_link table
"; db_add_field('redirect_type', 'mod_menu_link', "INT NOT NULL DEFAULT '302' AFTER `target_page_id`"); - - if (version_compare(WB_VERSION, '2.8.0') < 0) { /********************************************************** @@ -443,66 +440,66 @@

[POST_TITLE]


'; -if(in_array('mod_news_settings', $all_tables)) -{ - // Insert default settings into database - $query_dates = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings where section_id != 0 and page_id != 0"); - if($query_dates->numRows() > 1) - { - while($result = $query_dates->fetchRow()) - { + if(in_array('mod_news_settings', $all_tables)) + { + // Insert default settings into database + $query_dates = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings where section_id != 0 and page_id != 0"); + if($query_dates->numRows() > 1) + { + while($result = $query_dates->fetchRow()) + { - echo "
Add default settings to database for news section_id= ".$result['section_id']."
"; - $section_id = $result['section_id']; + echo "
Add default settings to database for news section_id= ".$result['section_id']."
"; + $section_id = $result['section_id']; - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `header` = '$header' WHERE `section_id` = $section_id")) { - echo 'Database data header added successfully'; - } - echo mysql_error().'
'; + if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `header` = '$header' WHERE `section_id` = $section_id")) { + echo 'Database data header added successfully'; + } + echo mysql_error().'
'; - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_loop` = '$post_loop' WHERE `section_id` = $section_id")) { - echo 'Database data post_loop added successfully'; - } - echo mysql_error().'
'; + if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_loop` = '$post_loop' WHERE `section_id` = $section_id")) { + echo 'Database data post_loop added successfully'; + } + echo mysql_error().'
'; - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `footer` = '$footer' WHERE `section_id` = $section_id")) { - echo 'Database data footer added successfully'; - } - echo mysql_error().'
'; + if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `footer` = '$footer' WHERE `section_id` = $section_id")) { + echo 'Database data footer added successfully'; + } + echo mysql_error().'
'; - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_header` = '$post_header' WHERE `section_id` = $section_id")) { - echo 'Database data post_header added successfully'; - } - echo mysql_error().'
'; + if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_header` = '$post_header' WHERE `section_id` = $section_id")) { + echo 'Database data post_header added successfully'; + } + echo mysql_error().'
'; - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_footer` = '$post_footer' WHERE `section_id` = $section_id")) { - echo 'Database data post_footer added successfully'; - } - echo mysql_error().'
'; + if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_footer` = '$post_footer' WHERE `section_id` = $section_id")) { + echo 'Database data post_footer added successfully'; + } + echo mysql_error().'
'; - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_header` = '$comments_header' WHERE `section_id` = $section_id")) { - echo 'Database data comments_header added successfully'; - } - echo mysql_error().'
'; + if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_header` = '$comments_header' WHERE `section_id` = $section_id")) { + echo 'Database data comments_header added successfully'; + } + echo mysql_error().'
'; - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_loop` = '$comments_loop' WHERE `section_id` = $section_id")) { - echo 'Database data comments_loop added successfully'; - } - echo mysql_error().'
'; + if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_loop` = '$comments_loop' WHERE `section_id` = $section_id")) { + echo 'Database data comments_loop added successfully'; + } + echo mysql_error().'
'; - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_footer` = '$comments_footer' WHERE `section_id` = $section_id")) { - echo 'Database data comments_footer added successfully'; - } - echo mysql_error().'
'; + if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_footer` = '$comments_footer' WHERE `section_id` = $section_id")) { + echo 'Database data comments_footer added successfully'; + } + echo mysql_error().'
'; - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_page` = '$comments_page' WHERE `section_id` = $section_id")) { - echo 'Database data comments_page added successfully'; - } - echo mysql_error().'
'; + if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_page` = '$comments_page' WHERE `section_id` = $section_id")) { + echo 'Database data comments_page added successfully'; + } + echo mysql_error().'
'; - } - } - } + } + } + } } /********************************************************** * upgrade media folder index protect files @@ -546,7 +543,8 @@ if( ($handle = opendir(WB_PATH.'/modules/')) ) { while(false !== ($file = readdir($handle))) { if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') { - load_module(WB_PATH.'/modules/'.$file); + load_module(WB_PATH.'/modules/'.$file ); + upgrade_module($file, true); } } closedir($handle); Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1476) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1477) @@ -52,4 +52,4 @@ // 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.2.RC7'); -if(!defined('REVISION')) define('REVISION', '1476'); +if(!defined('REVISION')) define('REVISION', '1477'); Index: branches/2.8.x/wb/framework/functions.php =================================================================== --- branches/2.8.x/wb/framework/functions.php (revision 1476) +++ branches/2.8.x/wb/framework/functions.php (revision 1477) @@ -703,30 +703,31 @@ } // Create a new directory and/or protected file in the given directory -function createFolderProtectFile($relative='',$make_dir=true) +function createFolderProtectFile($sAbsDir='',$make_dir=true) { global $admin, $MESSAGE; $retVal = array(); - if($relative=='') { return $retVal;} + if( ($sAbsDir=='') || ($sAbsDir == WB_PATH) ) { return $retVal;} if ( $make_dir==true ) { // Check to see if the folder already exists - if(file_exists($relative)) { + if(file_exists($sAbsDir)) { // $admin->print_error($MESSAGE['MEDIA_DIR_EXISTS']); - $retVal[] = basename($relative).'::'.$MESSAGE['MEDIA_DIR_EXISTS']; + $retVal[] = basename($sAbsDir).'::'.$MESSAGE['MEDIA_DIR_EXISTS']; } - if ( !make_dir($relative) ) { + if ( !make_dir($sAbsDir) ) { // $admin->print_error($MESSAGE['MEDIA_DIR_NOT_MADE']); - $retVal[] = basename($relative).'::'.$MESSAGE['MEDIA_DIR_NOT_MADE']; + $retVal[] = basename($sAbsDir).'::'.$MESSAGE['MEDIA_DIR_NOT_MADE']; + } else { + change_mode($sAbsDir); } } - change_mode($relative); - if( is_writable($relative) ) + if( is_writable($sAbsDir) ) { - if(file_exists($relative.'/index.php')) { unlink($relative.'/index.php'); } + // if(file_exists($sAbsDir.'/index.php')) { unlink($sAbsDir.'/index.php'); } // Create default "index.php" file - $rel_pages_dir = str_replace(WB_PATH, '', dirname($relative) ); + $rel_pages_dir = str_replace(WB_PATH, '', dirname($sAbsDir) ); $step_back = str_repeat( '../', substr_count($rel_pages_dir, '/')+1 ); $sResponse = $_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently'; @@ -740,7 +741,7 @@ "\t".'header(\''.$sResponse.'\');'."\n". "\t".'header(\'Location: '.WB_URL.'/index.php\');'."\n". '// *************************************************'."\n"; - $filename = $relative.'/index.php'; + $filename = $sAbsDir.'/index.php'; // write content into file if ($handle = fopen($filename, 'w')) { fwrite($handle, $content); @@ -1422,8 +1423,8 @@ if(!function_exists('url_encode')){ function url_encode($string) { $string = html_entity_decode($string,ENT_QUOTES,'UTF-8'); - $entities = array('%20', '%21', '%2A', '%27', '%28', '%29', '%3B', '%3A', '%40', '%26', '%3D', '%2B', '%24', '%2C', '%2F', '%3F', '%25', '%23', '%5B', '%5D'); - $replacements = array(' ','!', '*', "'", "(", ")", ";", ":", "@", "&", "=", "+", "$", ",", "/", "?", "%", "#", "[", "]"); - return str_replace($entities, $replacements, rawurlencode($string)); + $entities = array('%21', '%2A', '%27', '%28', '%29', '%3B', '%3A', '%40', '%26', '%3D', '%2B', '%24', '%2C', '%2F', '%3F', '%25', '%23', '%5B', '%5D'); + $replacements = array('!', '*', "'", "(", ")", ";", ":", "@", "&", "=", "+", "$", ",", "/", "?", "%", "#", "[", "]"); + return str_replace($entities,$replacements, rawurlencode($string)); } } Index: branches/2.8.x/wb/templates/wb_theme/theme.css =================================================================== --- branches/2.8.x/wb/templates/wb_theme/theme.css (revision 1476) +++ branches/2.8.x/wb/templates/wb_theme/theme.css (revision 1477) @@ -1,11 +1,11 @@ * html div{ height :1em; /* Workaround gegen den 3-Pixel-Bug des Internet Explorers 6 *//* Workaround gegen den 3-Pixel-Bug des Internet Explorers 6 */ } html{ font-family :Verdana, "Trebuchet MS", Arial, Helvetica, sans-serif; font-size :100.1%; font-weight :normal; color :#404040; overflow :-moz-scrollbars-vertical; } -body{ margin :0px; padding :0px; background :#a8bccb; text-align :left; } -body { margin :0 auto; background-color :#a8bccb; background-repeat :repeat-x; } +body{ margin :0 auto; padding :0px; background :#a8bccb; text-align :left; font-size :0.8em; } +body { background-color :#a8bccb; background-repeat :repeat-x; } td,th,input,textarea { color :#000000; - font-size :0.9em; + font-size :1.0em; font-family :Verdana, Arial, Helvetica, sans-serif; } textarea { font-size :1em; } @@ -28,7 +28,7 @@ div.box { width: 100%; margin: -10px 0 0 0; font-size: small; text-align: right; } .header { width: 900px; margin: 0 auto; } .container { width: 85%; margin: 0 auto; background: #fff url(images/bgtitle.png); background-repeat: repeat-x; } -.content { padding: 1.6em; font-size :0.8em; margin: 0 auto; min-height: 300px; vertical-align: top; } +.content { padding: 1.6em; margin: 0 auto; min-height: 300px; vertical-align: top; } #content_container {text-align:center;width:900px;clear:both;margin:0 auto;} Index: branches/2.8.x/wb/templates/argos_theme/theme.css =================================================================== --- branches/2.8.x/wb/templates/argos_theme/theme.css (revision 1476) +++ branches/2.8.x/wb/templates/argos_theme/theme.css (revision 1477) @@ -140,7 +140,7 @@ .c10l, .c10r {width:10%;} .c20l, .c20r {width:20%;line-height:2em;} .c40l, .c40r {width:40%;} -.c60l, .c60r {width:60%;height:21px;} +.c60l, .c60r {width:60%;height:2em;} .c25l, .c25r {width:28%;} .c33l, .c33r {width:33.333%;} .c50l, .c50r {width:50%;} Index: branches/2.8.x/wb/languages/FI.php =================================================================== --- branches/2.8.x/wb/languages/FI.php (revision 1476) +++ branches/2.8.x/wb/languages/FI.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Lataa uudelleen'; $TEXT['REMEMBER_ME'] = 'Palauta '; $TEXT['RENAME'] = 'Nimeä uudelleen'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Nimeä ladatut'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Pakollinen'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Peruuta'; Index: branches/2.8.x/wb/languages/EN.php =================================================================== --- branches/2.8.x/wb/languages/EN.php (revision 1476) +++ branches/2.8.x/wb/languages/EN.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Reload'; $TEXT['REMEMBER_ME'] = 'Remember Me'; $TEXT['RENAME'] = 'Rename'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Rename Files On Upload'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Required'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Reset'; Index: branches/2.8.x/wb/languages/CS.php =================================================================== --- branches/2.8.x/wb/languages/CS.php (revision 1476) +++ branches/2.8.x/wb/languages/CS.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Obnovit'; $TEXT['REMEMBER_ME'] = 'Zapamatovat údaje'; $TEXT['RENAME'] = 'Přejm.'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Přejm. soubory po nahrání'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Povinný'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Vyčistit'; Index: branches/2.8.x/wb/languages/SE.php =================================================================== --- branches/2.8.x/wb/languages/SE.php (revision 1476) +++ branches/2.8.x/wb/languages/SE.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Ladda Om'; $TEXT['REMEMBER_ME'] = 'Kom ihåg mig'; $TEXT['RENAME'] = 'Döp om'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Ändra filnamn vid uppladdning'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Obligatoriskt'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Ångra'; Index: branches/2.8.x/wb/languages/ES.php =================================================================== --- branches/2.8.x/wb/languages/ES.php (revision 1476) +++ branches/2.8.x/wb/languages/ES.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Recargar'; $TEXT['REMEMBER_ME'] = 'Recuérdame'; $TEXT['RENAME'] = 'Renombrar'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Renombrar los ficheros en la subida'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Obligatorio'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Reiniciar'; Index: branches/2.8.x/wb/languages/FR.php =================================================================== --- branches/2.8.x/wb/languages/FR.php (revision 1476) +++ branches/2.8.x/wb/languages/FR.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Actualiser'; $TEXT['REMEMBER_ME'] = 'Se souvenir de moi'; $TEXT['RENAME'] = 'Renommer'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Renommer les fichiers lors de l'upload'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Obligatoire'; $TEXT['REQUIREMENT'] = 'Paramètres requis'; $TEXT['RESET'] = 'Réinitialiser'; Index: branches/2.8.x/wb/languages/ET.php =================================================================== --- branches/2.8.x/wb/languages/ET.php (revision 1476) +++ branches/2.8.x/wb/languages/ET.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Lae Uuesti'; $TEXT['REMEMBER_ME'] = 'Pea Mind Meeles'; $TEXT['RENAME'] = 'Nimeta Ümber'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Rename Files On Upload'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Required'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Tagasta'; Index: branches/2.8.x/wb/languages/HR.php =================================================================== --- branches/2.8.x/wb/languages/HR.php (revision 1476) +++ branches/2.8.x/wb/languages/HR.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Ponovo uèitavanje'; $TEXT['REMEMBER_ME'] = 'Sjeti me'; $TEXT['RENAME'] = 'Preimenuj'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Izmjeni fileove kod ponovnog upisa'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Traženo'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Resetiraj'; Index: branches/2.8.x/wb/languages/NL.php =================================================================== --- branches/2.8.x/wb/languages/NL.php (revision 1476) +++ branches/2.8.x/wb/languages/NL.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Vernieuwen'; $TEXT['REMEMBER_ME'] = 'Onthoud mijn gegevens.'; $TEXT['RENAME'] = 'Hernoemen'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Bestanden hernoemen bij uploaden'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Verplicht'; $TEXT['REQUIREMENT'] = 'Benodigd'; $TEXT['RESET'] = 'Opnieuw'; Index: branches/2.8.x/wb/languages/PL.php =================================================================== --- branches/2.8.x/wb/languages/PL.php (revision 1476) +++ branches/2.8.x/wb/languages/PL.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'PrzeÅ‚aduj, odÅ›wież'; $TEXT['REMEMBER_ME'] = 'ZapamiÄ™taj mnie'; $TEXT['RENAME'] = 'ZmieÅ„ nazwÄ™'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'ZmieÅ„ nazwy plików przy zaÅ‚adowywaniu'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Wymagany'; $TEXT['REQUIREMENT'] = 'Wymagania'; $TEXT['RESET'] = 'Resetuj'; Index: branches/2.8.x/wb/languages/HU.php =================================================================== --- branches/2.8.x/wb/languages/HU.php (revision 1476) +++ branches/2.8.x/wb/languages/HU.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'ªratöltés'; $TEXT['REMEMBER_ME'] = 'Emlékezzen'; $TEXT['RENAME'] = '´nevez'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Fájlok átnevezése feltöltésnél'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Kötelezç'; $TEXT['REQUIREMENT'] = 'Követelemény'; $TEXT['RESET'] = 'Visszavon'; Index: branches/2.8.x/wb/languages/IT.php =================================================================== --- branches/2.8.x/wb/languages/IT.php (revision 1476) +++ branches/2.8.x/wb/languages/IT.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Ricarica'; $TEXT['REMEMBER_ME'] = 'Ricordami'; $TEXT['RENAME'] = 'Rinomina'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Rinomina i Files per il Caricamento'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Obbligatorio'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Resetta'; Index: branches/2.8.x/wb/languages/NO.php =================================================================== --- branches/2.8.x/wb/languages/NO.php (revision 1476) +++ branches/2.8.x/wb/languages/NO.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Oppdater'; $TEXT['REMEMBER_ME'] = 'Husk Meg'; $TEXT['RENAME'] = 'Endre navn'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Gi filer nytt navn etter opplastningen'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Påbudt'; $TEXT['REQUIREMENT'] = 'Krav'; $TEXT['RESET'] = 'Tilbakestill'; Index: branches/2.8.x/wb/languages/SK.php =================================================================== --- branches/2.8.x/wb/languages/SK.php (revision 1476) +++ branches/2.8.x/wb/languages/SK.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Obnoviť'; $TEXT['REMEMBER_ME'] = 'Zapamätať údaje'; $TEXT['RENAME'] = 'Premenovať.'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Premenovať. súbory pre nahrávanie'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Povinný'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Vyčistiť'; Index: branches/2.8.x/wb/languages/LV.php =================================================================== --- branches/2.8.x/wb/languages/LV.php (revision 1476) +++ branches/2.8.x/wb/languages/LV.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Parladet'; $TEXT['REMEMBER_ME'] = 'Atmineties mani'; $TEXT['RENAME'] = 'Parsaukt'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Datnes, kuram augšupieladejot jamaina nosaukumi'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Obligats'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Parladet'; Index: branches/2.8.x/wb/languages/CA.php =================================================================== --- branches/2.8.x/wb/languages/CA.php (revision 1476) +++ branches/2.8.x/wb/languages/CA.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Recarrega'; $TEXT['REMEMBER_ME'] = 'Recorda les meues dades'; $TEXT['RENAME'] = 'Reanomena'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Rename Files On Upload'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Requerit'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Reinicia'; Index: branches/2.8.x/wb/languages/PT.php =================================================================== --- branches/2.8.x/wb/languages/PT.php (revision 1476) +++ branches/2.8.x/wb/languages/PT.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Recarregar'; $TEXT['REMEMBER_ME'] = 'Lembrar-me'; $TEXT['RENAME'] = 'Renomear'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Renomear Arquivos ao Enviar'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Requerido'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Redefinir'; Index: branches/2.8.x/wb/languages/DA.php =================================================================== --- branches/2.8.x/wb/languages/DA.php (revision 1476) +++ branches/2.8.x/wb/languages/DA.php (revision 1477) @@ -17,7 +17,7 @@ */ // Must include code to stop this file being access directly -if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } +if(defined('WB_PATH') == false) { exit("Du kan ikke få direkte adgang til denne fil"); } // Define that this file is loaded if(!defined('LANGUAGE_LOADED')) { @@ -29,17 +29,17 @@ $language_name = 'Dansk'; $language_version = '2.8'; $language_platform = '2.8.x'; -$language_author = 'Achrist'; +$language_author = 'Allan Christensen'; $language_license = 'GNU General Public License'; /* MENU */ $MENU['ACCESS'] = 'Adgang'; -$MENU['ADDON'] = 'Add-on'; -$MENU['ADDONS'] = 'Add-ons'; +$MENU['ADDON'] = 'Tilføjelse'; +$MENU['ADDONS'] = 'Tilføjelser'; $MENU['ADMINTOOLS'] = 'Admin-værktøjer'; -$MENU['BREADCRUMB'] = 'You are here: '; -$MENU['FORGOT'] = 'Modtag login oplysninger'; -$MENU['GROUP'] = 'Group'; +$MENU['BREADCRUMB'] = 'Du er her: '; +$MENU['FORGOT'] = 'Send login oplysninger'; +$MENU['GROUP'] = 'Gruppe'; $MENU['GROUPS'] = 'Grupper'; $MENU['HELP'] = 'Hjælp'; $MENU['LANGUAGES'] = 'Sprog'; @@ -68,13 +68,13 @@ $TEXT['ADMINISTRATOR'] = 'Administrator'; $TEXT['ADMINISTRATORS'] = 'Administratorer'; $TEXT['ADVANCED'] = 'Avanceret'; -$TEXT['ALLOWED_FILETYPES_ON_UPLOAD'] = 'Allowed filetypes on upload'; +$TEXT['ALLOWED_FILETYPES_ON_UPLOAD'] = 'Tilladte filtyper ved overførsel'; $TEXT['ALLOWED_VIEWERS'] = 'Tilladte brugere'; $TEXT['ALLOW_MULTIPLE_SELECTIONS'] = 'Tillad flere valg samtidig'; $TEXT['ALL_WORDS'] = 'Alle ordene'; $TEXT['ANCHOR'] = 'Bogmærke'; $TEXT['ANONYMOUS'] = 'Anonym'; -$TEXT['ANY_WORDS'] = 'Bare et af ordene'; +$TEXT['ANY_WORDS'] = 'Kun et af ordene'; $TEXT['APP_NAME'] = 'Applikationsnavn'; $TEXT['ARE_YOU_SURE'] = 'Er du sikker?'; $TEXT['AUTHOR'] = 'Udvikler/forfatter'; @@ -88,7 +88,7 @@ $TEXT['BLOCK'] = 'Blok'; $TEXT['CALENDAR'] = 'Kalender'; $TEXT['CANCEL'] = 'Annullér'; -$TEXT['CAN_DELETE_HIMSELF'] = 'Can delete himself'; +$TEXT['CAN_DELETE_HIMSELF'] = 'Kan slette sig selv'; $TEXT['CAPTCHA_VERIFICATION'] = 'Captcha verifikation'; $TEXT['CAP_EDIT_CSS'] = 'Rediger CSS'; $TEXT['CHANGE'] = 'Ret'; @@ -149,7 +149,7 @@ $TEXT['FROM'] = 'Fra'; $TEXT['FRONTEND'] = 'Websted (vis siden)'; $TEXT['FULL_NAME'] = 'Fulde navn'; -$TEXT['FUNCTION'] = 'Function'; +$TEXT['FUNCTION'] = 'Funktion'; $TEXT['GROUP'] = 'Gruppe'; $TEXT['HEADER'] = 'Hoved (overligger)'; $TEXT['HEADING'] = 'Overskrift'; @@ -160,8 +160,8 @@ $TEXT['HIDE_ADVANCED'] = 'Skjul avancerede indstillinger'; $TEXT['HOME'] = 'Hjem'; $TEXT['HOMEPAGE_REDIRECTION'] = 'Viderestilling af hjemmeside'; -$TEXT['HOME_FOLDER'] = 'Personal Folder'; -$TEXT['HOME_FOLDERS'] = 'Personal Folders'; +$TEXT['HOME_FOLDER'] = 'Personlig folder'; +$TEXT['HOME_FOLDERS'] = 'Personlige foldere'; $TEXT['HOST'] = 'Vært'; $TEXT['ICON'] = 'Ikon'; $TEXT['IMAGE'] = 'Billede'; @@ -173,7 +173,7 @@ $TEXT['INSTALLED'] = 'installeret'; $TEXT['INTRO'] = 'Introduktion'; $TEXT['INTRO_PAGE'] = 'Intro-side'; -$TEXT['INVALID_SIGNS'] = 'must begin with a letter or has invalid signs'; +$TEXT['INVALID_SIGNS'] = 'skal begynde med et bogstav eller indeholder ugyldige tegn'; $TEXT['KEYWORDS'] = 'Nøgleord'; $TEXT['LANGUAGE'] = 'Sprog'; $TEXT['LAST_UPDATED_BY'] = 'Sidst opdateret af:'; @@ -188,19 +188,19 @@ $TEXT['LONG_TEXT'] = 'Lang tekst'; $TEXT['LOOP'] = 'Liste'; $TEXT['MAIN'] = 'Hovedoversigt'; -$TEXT['MAINTENANCE_OFF'] = 'Maintenance off'; -$TEXT['MAINTENANCE_ON'] = 'Maintenance on'; +$TEXT['MAINTENANCE_OFF'] = 'Vedligeholdelse tilvalgt'; +$TEXT['MAINTENANCE_ON'] = 'MaVedligeholdelse fravalgt'; $TEXT['MANAGE'] = 'Administrér'; $TEXT['MANAGE_GROUPS'] = 'Administrér grupper'; $TEXT['MANAGE_USERS'] = 'Administrér brugere'; $TEXT['MATCH'] = 'Match'; $TEXT['MATCHING'] = 'Matchende'; -$TEXT['MAX_EXCERPT'] = 'Max linier i uddrag'; +$TEXT['MAX_EXCERPT'] = 'Max linier i udsnit'; $TEXT['MAX_SUBMISSIONS_PER_HOUR'] = 'Max. indsendte bidrag pr. time'; $TEXT['MEDIA_DIRECTORY'] = 'Mediebibliotek (mappe)'; $TEXT['MENU'] = 'Menu'; -$TEXT['MENU_ICON_0'] = 'Menu-Icon normal'; -$TEXT['MENU_ICON_1'] = 'Menu-Icon hover'; +$TEXT['MENU_ICON_0'] = 'Menu-ikon normal'; +$TEXT['MENU_ICON_1'] = 'Menu-ikon sværende'; $TEXT['MENU_TITLE'] = 'Menutitel'; $TEXT['MESSAGE'] = 'Indlæg'; $TEXT['MODIFY'] = 'Ret'; @@ -214,7 +214,7 @@ $TEXT['MULTIPLE_MENUS'] = 'Flere menuer'; $TEXT['MULTISELECT'] = 'Multi-valg'; $TEXT['NAME'] = 'Navn'; -$TEXT['NEED_CURRENT_PASSWORD'] = 'confirm with current password'; +$TEXT['NEED_CURRENT_PASSWORD'] = 'Bekræft med nuværende adgangskode'; $TEXT['NEED_TO_LOGIN'] = 'Brug for at logge ind?'; $TEXT['NEW_PASSWORD'] = 'Ny adgangskode'; $TEXT['NEW_WINDOW'] = 'Nyt vindue'; @@ -225,7 +225,7 @@ $TEXT['NONE_FOUND'] = 'Ingen fundet'; $TEXT['NOT_FOUND'] = 'Ikke fundet'; $TEXT['NOT_INSTALLED'] = 'ikke installeret'; -$TEXT['NO_IMAGE_SELECTED'] = 'no image selected'; +$TEXT['NO_IMAGE_SELECTED'] = 'intet billede valgt'; $TEXT['NO_RESULTS'] = 'Intet fundet'; $TEXT['OF'] = 'af'; $TEXT['ON'] = 'D.'; @@ -236,11 +236,11 @@ $TEXT['OVERWRITE_EXISTING'] = 'Overskriv eksisterende'; $TEXT['PAGE'] = 'Side'; $TEXT['PAGES_DIRECTORY'] = 'Sidebibliotek (mappe)'; -$TEXT['PAGES_PERMISSION'] = 'Pages Permission'; -$TEXT['PAGES_PERMISSIONS'] = 'Pages Permissions'; +$TEXT['PAGES_PERMISSION'] = 'Sideadgang'; +$TEXT['PAGES_PERMISSIONS'] = 'Sideadgange'; $TEXT['PAGE_EXTENSION'] = 'Side-udvidelse'; -$TEXT['PAGE_ICON'] = 'Page Image'; -$TEXT['PAGE_ICON_DIR'] = 'Path pages/menu images'; +$TEXT['PAGE_ICON'] = 'Sidebillede'; +$TEXT['PAGE_ICON_DIR'] = 'Sti til sider/menu billeder'; $TEXT['PAGE_LANGUAGES'] = 'Sprog'; $TEXT['PAGE_LEVEL_LIMIT'] = 'Max. sideantal'; $TEXT['PAGE_SPACER'] = 'Side pladsmarkør'; @@ -260,7 +260,7 @@ $TEXT['PREVIOUS_PAGE'] = 'Forrige side'; $TEXT['PRIVATE'] = 'Privat'; $TEXT['PRIVATE_VIEWERS'] = 'Private besøgende'; -$TEXT['PROFILES_EDIT'] = 'Change the profile'; +$TEXT['PROFILES_EDIT'] = 'Ret profil'; $TEXT['PUBLIC'] = 'Offentlig'; $TEXT['PUBL_END_DATE'] = 'Slutdato'; $TEXT['PUBL_START_DATE'] = 'Startdato'; @@ -351,12 +351,12 @@ $TEXT['URL'] = 'URL'; $TEXT['USER'] = 'Bruger'; $TEXT['USERNAME'] = 'Brugernavn'; -$TEXT['USERS_ACTIVE'] = 'User is set active'; -$TEXT['USERS_CAN_SELFDELETE'] = 'User can delete himself'; -$TEXT['USERS_CHANGE_SETTINGS'] = 'User can change his own settings'; -$TEXT['USERS_DELETED'] = 'User is marked as deleted'; -$TEXT['USERS_FLAGS'] = 'User-Flags'; -$TEXT['USERS_PROFILE_ALLOWED'] = 'User can create extended profile'; +$TEXT['USERS_ACTIVE'] = 'Brugeren er sat aktiv'; +$TEXT['USERS_CAN_SELFDELETE'] = 'Brugeren kan slette sig selv'; +$TEXT['USERS_CHANGE_SETTINGS'] = 'Brugeren kan slette egne indstillinger'; +$TEXT['USERS_DELETED'] = 'Brugeren er slettemarkeret'; +$TEXT['USERS_FLAGS'] = 'Brugermærker'; +$TEXT['USERS_PROFILE_ALLOWED'] = 'Brugeren kan lave udvidet profil'; $TEXT['VERIFICATION'] = 'Indtast verifikationstal'; $TEXT['VERSION'] = 'Version'; $TEXT['VIEW'] = 'Se'; @@ -393,9 +393,9 @@ /* HEADING */ $HEADING['ADDON_PRECHECK_FAILED'] = 'Add-On krav er ikke opfyldt'; -$HEADING['ADD_CHILD_PAGE'] = 'Add child page'; +$HEADING['ADD_CHILD_PAGE'] = 'Tilføj underside'; $HEADING['ADD_GROUP'] = 'Tilføj gruppe'; -$HEADING['ADD_GROUPS'] = 'Add Groups'; +$HEADING['ADD_GROUPS'] = 'Tilføj grupper'; $HEADING['ADD_HEADING'] = 'Tilføj overskrift'; $HEADING['ADD_PAGE'] = 'Tilføj side'; $HEADING['ADD_USER'] = 'Tilføj bruger'; @@ -409,9 +409,9 @@ $HEADING['INSTALL_LANGUAGE'] = 'Installér sprog'; $HEADING['INSTALL_MODULE'] = 'Installér modul'; $HEADING['INSTALL_TEMPLATE'] = 'Installér skabelon'; -$HEADING['INVOKE_LANGUAGE_FILES'] = 'Execute language files manually'; -$HEADING['INVOKE_MODULE_FILES'] = 'Eksekver modulfiler manuelt'; -$HEADING['INVOKE_TEMPLATE_FILES'] = 'Execute template files manually'; +$HEADING['INVOKE_LANGUAGE_FILES'] = 'Håndter sprogfiler manuelt'; +$HEADING['INVOKE_MODULE_FILES'] = 'Håndter modulfiler manuelt'; +$HEADING['INVOKE_TEMPLATE_FILES'] = 'Håndter skabelonfiler manuelt'; $HEADING['LANGUAGE_DETAILS'] = 'Info om sprog'; $HEADING['MANAGE_SECTIONS'] = 'Administrér sektioner'; $HEADING['MODIFY_ADVANCED_PAGE_SETTINGS'] = 'Rediger avancerede indstillinger for hjemmesiden'; @@ -419,7 +419,7 @@ $HEADING['MODIFY_DELETE_PAGE'] = 'Ret/slet side'; $HEADING['MODIFY_DELETE_USER'] = 'Ret/slet bruger'; $HEADING['MODIFY_GROUP'] = 'Ret gruppe'; -$HEADING['MODIFY_GROUPS'] = 'Modify Groups'; +$HEADING['MODIFY_GROUPS'] = 'Ret grupper'; $HEADING['MODIFY_INTRO_PAGE'] = 'Rediger intro-side'; $HEADING['MODIFY_PAGE'] = 'Rediger side'; $HEADING['MODIFY_PAGE_SETTINGS'] = 'Rediger side-indstillinger'; @@ -434,24 +434,24 @@ $HEADING['UNINSTALL_LANGUAGE'] = 'Afinstallér sprog'; $HEADING['UNINSTALL_MODULE'] = 'Afinstallér modul'; $HEADING['UNINSTALL_TEMPLATE'] = 'Afinstallér skabelon'; -$HEADING['UPGRADE_LANGUAGE'] = 'Language register/upgrading'; +$HEADING['UPGRADE_LANGUAGE'] = 'Sprogopgradering'; $HEADING['UPLOAD_FILES'] = 'Overfør fil(er)'; $HEADING['WBMAILER_SETTINGS'] = 'E-mail-indstillinger'; /* MESSAGE */ -$MESSAGE['ADDON_ERROR_RELOAD'] = 'Error while updating the Add-On information.'; -$MESSAGE['ADDON_LANGUAGES_RELOADED'] = 'Languages reloaded successfully'; -$MESSAGE['ADDON_MANUAL_FTP_LANGUAGE'] = 'ATTENTION! For safety reasons uploading languages files in the folder/languages/ only by FTP and use the Upgrade function for registering or updating.'; -$MESSAGE['ADDON_MANUAL_FTP_WARNING'] = 'Warning: Existing module database entries will get lost. '; -$MESSAGE['ADDON_MANUAL_INSTALLATION'] = 'When modules are uploaded via FTP (not recommended), the module installation functions install, upgrade or uninstall will not be executed automatically. Those modules may not work correct or do not uninstall properly.

You can execute the module functions manually for modules uploaded via FTP below.'; -$MESSAGE['ADDON_MANUAL_INSTALLATION_WARNING'] = 'Warning: Existing module database entries will get lost. Only use this option if you experience problems with modules uploaded via FTP.'; -$MESSAGE['ADDON_MANUAL_RELOAD_WARNING'] = 'Warning: Existing module database entries will get lost. '; -$MESSAGE['ADDON_MODULES_RELOADED'] = 'Modules reloaded successfully'; -$MESSAGE['ADDON_OVERWRITE_NEWER_FILES'] = 'Overwrite newer Files'; -$MESSAGE['ADDON_PRECHECK_FAILED'] = 'Add-on installation failed. Your system does not fulfill the requirements of this Add-on. To make this Add-on working on your system, please fix the issues summarized below.'; -$MESSAGE['ADDON_RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; -$MESSAGE['ADDON_TEMPLATES_RELOADED'] = 'Templates reloaded successfully'; -$MESSAGE['ADMIN_INSUFFICIENT_PRIVELLIGES'] = 'Du har ikke den fornødne adgang til dette område'; +$MESSAGE['ADDON_ERROR_RELOAD'] = 'Fejl under opdatering af tilføjelse.'; +$MESSAGE['ADDON_LANGUAGES_RELOADED'] = 'Sprog indlæst'; +$MESSAGE['ADDON_MANUAL_FTP_LANGUAGE'] = 'PAS På! Af sikkerhedsgrunde bør sprogfiler kun indlæses i folderen /languages/ med FTP, og opgraderingsfunktionen bør bruges til registrering/opdatering.'; +$MESSAGE['ADDON_MANUAL_FTP_WARNING'] = 'Advarsel: Eksisterende moduler i databasen vil gå tabt. '; +$MESSAGE['ADDON_MANUAL_INSTALLATION'] = 'Når moduler overføres med FTP (anbefales ikke), udføres installatonsfunktionerne installer, opgrader eller afinstaller ikke automatisk. Modulerne vil måske ikke fungere korrekt eller bliver rigtigt afinstallerett.

Du kan nedenfor udføre modulfunktionerne manuelt for moduler, der er overført via FTP.'; +$MESSAGE['ADDON_MANUAL_INSTALLATION_WARNING'] = 'Advarsel: Eksisterende moduler i databasen vil gå tabt. Brug kun denne funktion, hvis du oplever problemer med moduler, der er overført med FTP.'; +$MESSAGE['ADDON_MANUAL_RELOAD_WARNING'] = 'Advarsel: Eksisterende moduler i databasen vil gå tabt. '; +$MESSAGE['ADDON_MODULES_RELOADED'] = 'Moduler er genindlæst'; +$MESSAGE['ADDON_OVERWRITE_NEWER_FILES'] = 'Overskriv nyere filer'; +$MESSAGE['ADDON_PRECHECK_FAILED'] = 'Installation af tilf&oring;jelsen mislykkedes. Dit system opfylder ikke kravene til denne tilf&oring;jelse. For at få denne tilføjelse til at virke i dit system, skal du rette de forhold, der opregnes nedenfor.'; +$MESSAGE['ADDON_RELOAD'] = 'Opdater databasen med information fra tilføjelsesfiler (f.eks. efter FTP-overførsel).'; +$MESSAGE['ADDON_TEMPLATES_RELOADED'] = 'Skabeloner genindlæst'; +$MESSAGE['ADMIN_INSUFFICIENT_PRIVELLIGES'] = 'Du har ikke den nødvendige adgang til dette område'; $MESSAGE['FORGOT_PASS_ALREADY_RESET'] = 'Adgangskode kan kun nulstilles 1 gang i timen - beklager!'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Kunne ikke sende din adgangskode til din email-adresse - Kontakt en systemadministrator'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Den email-adresse du indtastede findes ikke i vores database'; @@ -461,45 +461,45 @@ $MESSAGE['FRONTEND_SORRY_NO_VIEWING_PERMISSIONS'] = 'Beklager - du har ikke adgang til at se denne side'; $MESSAGE['GENERIC_ALREADY_INSTALLED'] = 'Er allerede installeret'; $MESSAGE['GENERIC_BAD_PERMISSIONS'] = 'Kan ikke skrive i det valgte modtagebibliotek (mappe)'; -$MESSAGE['GENERIC_BE_PATIENT'] = 'Please be patient.'; +$MESSAGE['GENERIC_BE_PATIENT'] = 'Hav lidt tålmodighed'; $MESSAGE['GENERIC_CANNOT_UNINSTALL'] = 'Kan ikke afinstallere'; $MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE'] = 'Kan ikke afinstallere: Den valgte fil er i brug'; $MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL'] = '

{{type}} {{type_name}} kan ikke afinstalleres, da den stadig bruges på {{pages}}.

'; -$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL_PAGES'] = 'denne side;disse sider'; +$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL_PAGES'] = 'denne side/disse sider'; $MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'] = 'Kan ikke afinstallere skabelonen {{name}}, da den er standardskabelonen!'; -$MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_THEME'] = 'Can\'t uninstall the template {{name}}, because it is the default backend theme!'; +$MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_THEME'] = 'kan ikek afinstallere skabelonen {{name}}, da den er standard administrator-skabelon!'; $MESSAGE['GENERIC_CANNOT_UNZIP'] = 'Kan ikke udpakke fil'; -$MESSAGE['GENERIC_CANNOT_UPLOAD'] = 'Kunne ikke overøre filen'; -$MESSAGE['GENERIC_COMPARE'] = ' successfully'; +$MESSAGE['GENERIC_CANNOT_UPLOAD'] = 'Kunne ikke overføre filen'; +$MESSAGE['GENERIC_COMPARE'] = ' uden fejl'; $MESSAGE['GENERIC_ERROR_OPENING_FILE'] = 'Fejl ved åbning af filen.'; -$MESSAGE['GENERIC_FAILED_COMPARE'] = ' failed'; -$MESSAGE['GENERIC_FILE_TYPE'] = 'OBS: Vær opmærksom på at den fil du vil overøre skal være i flg. format:'; -$MESSAGE['GENERIC_FILE_TYPES'] = 'OBS: Vær opmærksom på at den fil du vil overøre skal være i et af flg. formater:'; +$MESSAGE['GENERIC_FAILED_COMPARE'] = ' mislykkedes'; +$MESSAGE['GENERIC_FILE_TYPE'] = 'OBS: Vær opmærksom på at den fil du vil overføre skal være i flg. format:'; +$MESSAGE['GENERIC_FILE_TYPES'] = 'OBS: Vær opmærksom på at den fil du vil overføre skal være i et af flg. formater:'; $MESSAGE['GENERIC_FILL_IN_ALL'] = 'Gå venligst tilbage og udfyld alle felter'; -$MESSAGE['GENERIC_FORGOT_OPTIONS'] = 'You have selected no choice!'; +$MESSAGE['GENERIC_FORGOT_OPTIONS'] = 'Du har intet valgt!'; $MESSAGE['GENERIC_INSTALLED'] = 'Installeret'; -$MESSAGE['GENERIC_INVALID'] = 'Filen du overørte er fejlbehæftet'; +$MESSAGE['GENERIC_INVALID'] = 'Filen du overførte er fejlbehæftet'; $MESSAGE['GENERIC_INVALID_ADDON_FILE'] = 'WebsiteBaker installationsfil ikke i korrekt format. Kontroller *.zip formatet.'; $MESSAGE['GENERIC_INVALID_LANGUAGE_FILE'] = 'WebsiteBaker sprogfil ikke i korrekt format. Kontroller tekstfilen.'; -$MESSAGE['GENERIC_INVALID_MODULE_FILE'] = 'Invalid WebsiteBaker module file. Please check the text file.'; -$MESSAGE['GENERIC_INVALID_TEMPLATE_FILE'] = 'Invalid WebsiteBaker template file. Please check the text file.'; -$MESSAGE['GENERIC_IN_USE'] = ' but used in '; -$MESSAGE['GENERIC_MISSING_ARCHIVE_FILE'] = 'Missing Archiv file!'; -$MESSAGE['GENERIC_MODULE_VERSION_ERROR'] = 'The module is not installed properly!'; -$MESSAGE['GENERIC_NOT_COMPARE'] = ' not possibly'; +$MESSAGE['GENERIC_INVALID_MODULE_FILE'] = 'WebsiteBaker modulfil ikke gyldig. Kontroller tekstfilen.'; +$MESSAGE['GENERIC_INVALID_TEMPLATE_FILE'] = 'WebsiteBaker skabelon ikke gyldig. Kontroller tekstfilen.'; +$MESSAGE['GENERIC_IN_USE'] = ' men bruges i '; +$MESSAGE['GENERIC_MISSING_ARCHIVE_FILE'] = 'Arkivfil mangler!'; +$MESSAGE['GENERIC_MODULE_VERSION_ERROR'] = 'Modulet er ikke korrekt installeret!'; +$MESSAGE['GENERIC_NOT_COMPARE'] = ' ikke mulig'; $MESSAGE['GENERIC_NOT_INSTALLED'] = 'Ikke installeret'; -$MESSAGE['GENERIC_NOT_UPGRADED'] = 'Actualization not possibly'; +$MESSAGE['GENERIC_NOT_UPGRADED'] = 'Opdatering ikke mulig'; $MESSAGE['GENERIC_PLEASE_BE_PATIENT'] = 'Vær tålmodig, dette kan godt vare et stykke tid.'; $MESSAGE['GENERIC_PLEASE_CHECK_BACK_SOON'] = 'Kom venligst igen senere...'; -$MESSAGE['GENERIC_SECURITY_ACCESS'] = 'Security offense!! Access denied!'; -$MESSAGE['GENERIC_SECURITY_OFFENSE'] = 'Security offense!! data storing was refused!!'; +$MESSAGE['GENERIC_SECURITY_ACCESS'] = 'Sikerhedsbrud! Adgang afslået!'; +$MESSAGE['GENERIC_SECURITY_OFFENSE'] = 'Sikerhedsbrud! Lagring nægtet!'; $MESSAGE['GENERIC_UNINSTALLED'] = 'Afinstalleret'; $MESSAGE['GENERIC_UPGRADED'] = 'Opgraderet'; -$MESSAGE['GENERIC_VERSION_COMPARE'] = 'Version comparison'; -$MESSAGE['GENERIC_VERSION_GT'] = 'Upgrade necessary!'; -$MESSAGE['GENERIC_VERSION_LT'] = 'Downgrade'; -$MESSAGE['GENERIC_WEBSITE_LOCKED'] = 'this site is temporarily down for maintenance'; -$MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'] = 'Website under konstruktion'; +$MESSAGE['GENERIC_VERSION_COMPARE'] = 'Versionssammenligning'; +$MESSAGE['GENERIC_VERSION_GT'] = 'Opgraderng nødvending!'; +$MESSAGE['GENERIC_VERSION_LT'] = 'Nedgraderng'; +$MESSAGE['GENERIC_WEBSITE_LOCKED'] = 'Dette websted er midlertidigt lukket på grund af vedligeholdelse'; +$MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'] = 'Websted under konstruktion'; $MESSAGE['GROUPS_ADDED'] = 'Gruppen er tilføjet'; $MESSAGE['GROUPS_CONFIRM_DELETE'] = 'Er du helt sikker på du vil slette denne gruppe (og alle brugere som tilhører den)?'; $MESSAGE['GROUPS_DELETED'] = 'Gruppen er slettet'; @@ -534,13 +534,13 @@ $MESSAGE['MEDIA_NAME_DOT_DOT_SLASH'] = 'Kan ikke inkludere ../ i navnet'; $MESSAGE['MEDIA_NAME_INDEX_PHP'] = 'Kan ikke anvende index.php som navn'; $MESSAGE['MEDIA_NONE_FOUND'] = 'Der blev ikke fundet medie-filer i det pågældende bibliotek (mappe)'; -$MESSAGE['MEDIA_NO_FILE_UPLOADED'] = 'No file was recieved'; +$MESSAGE['MEDIA_NO_FILE_UPLOADED'] = 'Ingen fil overført'; $MESSAGE['MEDIA_RENAMED'] = 'Omdøbning udført'; $MESSAGE['MEDIA_SINGLE_UPLOADED'] = 'fil blev overført'; $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'] = 'Verifikations tallene (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'; @@ -568,12 +568,12 @@ $MESSAGE['PREFERENCES_CURRENT_PASSWORD_INCORRECT'] = 'Den (nuværende) adgangskode som du indtastede er ikke korrekt'; $MESSAGE['PREFERENCES_DETAILS_SAVED'] = 'Oplysningerne er gemt'; $MESSAGE['PREFERENCES_EMAIL_UPDATED'] = 'Email-adresse opdateret'; -$MESSAGE['PREFERENCES_INVALID_CHARS'] = 'Invalid password chars used'; +$MESSAGE['PREFERENCES_INVALID_CHARS'] = 'Ugyldige tegn i adgangskode'; $MESSAGE['PREFERENCES_PASSWORD_CHANGED'] = 'Adgangskode ændret'; -$MESSAGE['RECORD_MODIFIED_FAILED'] = 'The change of the record has missed.'; -$MESSAGE['RECORD_MODIFIED_SAVED'] = 'The changed record was updated successfully.'; -$MESSAGE['RECORD_NEW_FAILED'] = 'Adding a new record has missed.'; -$MESSAGE['RECORD_NEW_SAVED'] = 'New record was added successfully.'; +$MESSAGE['RECORD_MODIFIED_FAILED'] = '&Aelig;ndring mislykket'; +$MESSAGE['RECORD_MODIFIED_SAVED'] = '&Aelig;ndring udført.'; +$MESSAGE['RECORD_NEW_FAILED'] = 'Tilføjelse af nu post mislykkedes.'; +$MESSAGE['RECORD_NEW_SAVED'] = 'Ny post tilføjet.'; $MESSAGE['SETTINGS_MODE_SWITCH_WARNING'] = '
OBS: Ved at klikke på denne knap tabes alle ændringer, der ikke er gemt!'; $MESSAGE['SETTINGS_SAVED'] = 'Indstillingerne er gemt'; $MESSAGE['SETTINGS_UNABLE_OPEN_CONFIG'] = 'Er ikke i stand til at åbne konfigurationsfilen'; @@ -580,63 +580,62 @@ $MESSAGE['SETTINGS_UNABLE_WRITE_CONFIG'] = 'Kan ikke skrive til konfigurationsfilen (check rettigheder for filen)'; $MESSAGE['SETTINGS_WORLD_WRITEABLE_WARNING'] = 'OBS! Dette anbefales kun i testmiljøer '; $MESSAGE['SIGNUP2_ADMIN_INFO'] = ' -A new user was registered. +En ny bruger er registreret. -Username: {LOGIN_NAME} -UserId: {LOGIN_ID} -E-Mail: {LOGIN_EMAIL} -IP-Adress: {LOGIN_IP} -Registration date: {SIGNUP_DATE} +Brugernavn: {LOGIN_NAME} +BrugerId: {LOGIN_ID} +Email: {LOGIN_EMAIL} +IP-adresse: {LOGIN_IP} +Registreringsdato: {SIGNUP_DATE} ---------------------------------------- -This message was automatic generated! +Denne meddelselse er sendt automatisk. '; $MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = ' -Hello {LOGIN_DISPLAY_NAME}, +Hej {LOGIN_DISPLAY_NAME}, -This mail was sent because the \'forgot password\' function has been applied to your account. +Denne besked er sendt, fordi funktionen \'Glemt adgangskode\' er blevet anvendt. -Your new \'{LOGIN_WEBSITE_TITLE}\' login details are: +Dine nye \'{LOGIN_WEBSITE_TITLE}\' logind-oplysninger er: -Username: {LOGIN_NAME} -Password: {LOGIN_PASSWORD} +Brugernavn: {LOGIN_NAME} +Adgangskode: {LOGIN_PASSWORD} -Your password has been reset to the one above. -This means that your old password will no longer work anymore! -If you\'ve got any questions or problems within the new login-data -you should contact the website-team or the admin of \'{LOGIN_WEBSITE_TITLE}\'. -Please remember to clean you browser-cache before using the new one to avoid unexpected fails. +Din adgangskode er ændret til ovenstående. +Det betyder, at din gamle adgangskode ikke kan anvendes mere. +hvis du har spørgsmål til eller problemer med dine nye adgangsoplysninger +bør du kontakte webstedet eller administatoren for \'{LOGIN_WEBSITE_TITLE}\'. +Husk at slette din browsers hukommelse (cache) for at undgå problemer med at logge ind. -Regards +Venlig hilsen ------------------------------------ -This message was automatic generated +Denne besked er sendt automatisk '; $MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = ' -Hello {LOGIN_DISPLAY_NAME}, +Hej {LOGIN_DISPLAY_NAME}, -Welcome to our \'{LOGIN_WEBSITE_TITLE}\'. +Velkommen til \'{LOGIN_WEBSITE_TITLE}\'. -Your \'{LOGIN_WEBSITE_TITLE}\' login details are: -Username: {LOGIN_NAME} -Password: {LOGIN_PASSWORD} +Dine adgangsoplysninger til \'{LOGIN_WEBSITE_TITLE}\' er: +Brugernavn: {LOGIN_NAME} +Adgangskode: {LOGIN_PASSWORD} -Regards +Venlig hilsen -Please: -if you have received this message by an error, please delete it immediately! -------------------------------------- -This message was automatic generated! +Hvis du har modtaget denne besked ved en fejl, bedes du straks slette den. +------------------------------------ +Denne besked er sendt automatisk + '; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Dine login-oplysninger...'; $MESSAGE['SIGNUP_NO_EMAIL'] = 'Du skal indtaste en gyldig email-adresse'; $MESSAGE['START_CURRENT_USER'] = 'Du er lige nu logget ind som:'; $MESSAGE['START_INSTALL_DIR_EXISTS'] = 'ADVARSEL! Installationsbiblioteket (mappen) findes stadig på serveren. Du bør slette den straks af hensyn til sikkerheden!'; -$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'] = 'Please delete the file "upgrade-script.php" from your webspace.'; $MESSAGE['START_WELCOME_MESSAGE'] = 'Velkommen til administration af din WebsiteBaker'; $MESSAGE['TEMPLATES_CHANGE_TEMPLATE_NOTICE'] = 'OBS: For at ændre skabelonen skal du gå til punktet indstillinger'; $MESSAGE['USERS_ADDED'] = 'Brugeren er oprettet'; -$MESSAGE['USERS_CANT_SELFDELETE'] = 'Function rejected, You can not delete yourself!'; +$MESSAGE['USERS_CANT_SELFDELETE'] = 'Funktionen udføres ikke - du kan ikke slette dig selv'; $MESSAGE['USERS_CHANGING_PASSWORD'] = 'OBS! Du skal kun indtaste værdier i felterne ovenfor, såfremt du ønsker at ændre denne brugers adgangskode'; $MESSAGE['USERS_CONFIRM_DELETE'] = 'Er du sikker på at du vil slette den valgte bruger?'; $MESSAGE['USERS_DELETED'] = 'Brugeren er slettet'; Index: branches/2.8.x/wb/languages/TR.php =================================================================== --- branches/2.8.x/wb/languages/TR.php (revision 1476) +++ branches/2.8.x/wb/languages/TR.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Tekrarla'; $TEXT['REMEMBER_ME'] = 'Hazýrla'; $TEXT['RENAME'] = 'Yeni isim ver'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Yüklenen dosyanýn adýný deðiþtir'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Gerekli'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Sýfýrla'; Index: branches/2.8.x/wb/languages/RU.php =================================================================== --- branches/2.8.x/wb/languages/RU.php (revision 1476) +++ branches/2.8.x/wb/languages/RU.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Перегрузить'; $TEXT['REMEMBER_ME'] = 'Запомнить меня'; $TEXT['RENAME'] = 'Переименовать'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Переименовать файл при загрузке'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Необходимые'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Сбросить'; Index: branches/2.8.x/wb/languages/DE.php =================================================================== --- branches/2.8.x/wb/languages/DE.php (revision 1476) +++ branches/2.8.x/wb/languages/DE.php (revision 1477) @@ -274,7 +274,7 @@ $TEXT['RELOAD'] = 'Neu laden'; $TEXT['REMEMBER_ME'] = 'Passwort speichern'; $TEXT['RENAME'] = 'Umbenennen'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Datei nach Hochladen umbenennen'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Diese Dateitypen nicht hochladen'; $TEXT['REQUIRED'] = 'Erforderlich'; $TEXT['REQUIREMENT'] = 'Voraussetzung'; $TEXT['RESET'] = 'Zurücksetzen'; @@ -551,7 +551,7 @@ $MESSAGE['PAGES_CANNOT_DELETE_ACCESS_FILE'] = 'Beim Löschen der Zugangsdatei im Verzeichnis /pages ist ein Fehler aufgetreten (Ungenügende Zugangsrechte)'; $MESSAGE['PAGES_CANNOT_REORDER'] = 'Bei der Zusammenstellung der Seite ist ein Fehler aufgetreten'; $MESSAGE['PAGES_DELETED'] = 'Die Seite wurde erfolgreich gelöscht'; -$MESSAGE['PAGES_DELETE_CONFIRM'] = 'Sind Sie sicher, dass Sie die ausgewählte Seite löschen möchten'; +$MESSAGE['PAGES_DELETE_CONFIRM'] = 'Sind Sie sicher, dass Sie die ausgewählte Seite löschen möchten ( und deren Unterseiten )'; $MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS'] = 'Sie haben keine Berechtigung, diese Seite zu ändern'; $MESSAGE['PAGES_INTRO_LINK'] = 'Bitte klicken Sie HIER um die Eingangsseite zu ändern'; $MESSAGE['PAGES_INTRO_NOT_WRITABLE'] = 'Es konnte nicht in die Datei /pages/intro.php geschrieben werden (ungenügende Zugangsrechte)'; @@ -566,7 +566,7 @@ $MESSAGE['PAGES_SAVED'] = 'Die Seite wurde erfolgreich gespeichert'; $MESSAGE['PAGES_SAVED_SETTINGS'] = 'Die Seiteneinstellungen wurden erfolgreich gespeichert'; $MESSAGE['PAGES_SECTIONS_PROPERTIES_SAVED'] = 'Einstellungen für diesen Abschnitt erfolgreich gespeichert'; -$MESSAGE['PREFERENCES_CURRENT_PASSWORD_INCORRECT'] = 'Das alte Passwort, das Sie angegeben haben, ist ungültig'; +$MESSAGE['PREFERENCES_CURRENT_PASSWORD_INCORRECT'] = 'Das Passwort, das Sie angegeben haben, ist ungültig'; $MESSAGE['PREFERENCES_DETAILS_SAVED'] = 'Persönliche Daten wurden erfolgreich gespeichert'; $MESSAGE['PREFERENCES_EMAIL_UPDATED'] = 'E-Mail Einstellung geändert'; $MESSAGE['PREFERENCES_INVALID_CHARS'] = 'Es wurden ungültige Zeichen für des Passwort verwendet'; Index: branches/2.8.x/wb/languages/BG.php =================================================================== --- branches/2.8.x/wb/languages/BG.php (revision 1476) +++ branches/2.8.x/wb/languages/BG.php (revision 1477) @@ -273,7 +273,7 @@ $TEXT['RELOAD'] = 'Обнови'; $TEXT['REMEMBER_ME'] = 'Запомни ме'; $TEXT['RENAME'] = 'Преименувай'; -$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Преименувай файловете при качване'; +$TEXT['RENAME_FILES_ON_UPLOAD'] = 'No upload for this filetypes'; $TEXT['REQUIRED'] = 'Задължително'; $TEXT['REQUIREMENT'] = 'Requirement'; $TEXT['RESET'] = 'Нулирай'; Index: branches/2.8.x/wb/modules/captcha_control/uninstall.php =================================================================== --- branches/2.8.x/wb/modules/captcha_control/uninstall.php (revision 1476) +++ branches/2.8.x/wb/modules/captcha_control/uninstall.php (revision 1477) @@ -1,32 +1,24 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - // prevent this file from being accessed directly if(!defined('WB_PATH')) { exit('Cannot access this file directly'); } $table = TABLE_PREFIX .'mod_captcha_control'; $database->query("DROP TABLE `$table`"); - -?> \ No newline at end of file Index: branches/2.8.x/wb/modules/captcha_control/tool.php =================================================================== --- branches/2.8.x/wb/modules/captcha_control/tool.php (revision 1476) +++ branches/2.8.x/wb/modules/captcha_control/tool.php (revision 1477) @@ -1,31 +1,25 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ // Must include code to stop this file being access directly if(defined('WB_PATH') == false) { die("Cannot access this file directly"); } - // check if module language file exists for the language set by the user (e.g. DE, EN) if(!file_exists(WB_PATH .'/modules/captcha_control/languages/'.LANGUAGE .'.php')) { // no module language file exists for the language set by the user, include default module language file EN.php @@ -199,7 +193,4 @@ - - \ No newline at end of file + \ No newline at end of file Index: branches/2.8.x/wb/modules/captcha_control/install.php =================================================================== --- branches/2.8.x/wb/modules/captcha_control/install.php (revision 1476) +++ branches/2.8.x/wb/modules/captcha_control/install.php (revision 1477) @@ -1,28 +1,22 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - // prevent this file from being accessed directly if(!defined('WB_PATH')) { exit('Cannot access this file directly'); } @@ -47,5 +41,3 @@ VALUES ('1', '1', 'calc_text') "); - -?> \ No newline at end of file Index: branches/2.8.x/wb/modules/captcha_control/index.php =================================================================== --- branches/2.8.x/wb/modules/captcha_control/index.php (revision 1476) +++ branches/2.8.x/wb/modules/captcha_control/index.php (revision 1477) @@ -1,28 +1,20 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - header('Location: ../index.php'); - -?> \ No newline at end of file Index: branches/2.8.x/wb/modules/form/info.php =================================================================== --- branches/2.8.x/wb/modules/form/info.php (revision 1476) +++ branches/2.8.x/wb/modules/form/info.php (revision 1477) @@ -19,11 +19,10 @@ $module_directory = 'form'; $module_name = 'Form'; $module_function = 'page'; -$module_version = '2.8'; -$module_platform = '2.7 | 2.8.x'; +$module_version = '2.8.1'; +$module_platform = '2.8.x'; $module_author = 'Ryan Djurovich & Rudolph Lartey - additions John Maats - PCWacht'; $module_license = 'GNU General Public License'; $module_description = 'This module allows you to create customised online forms, such as a feedback form. '. 'Thank-you to Rudolph Lartey who help enhance this module, providing code for extra field types, etc.'; -?> \ No newline at end of file Index: branches/2.8.x/wb/modules/jsadmin/uninstall.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/uninstall.php (revision 1476) +++ branches/2.8.x/wb/modules/jsadmin/uninstall.php (revision 1477) @@ -11,8 +11,8 @@ * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/menu_link/save.php $ - * @lastmodified $Date: 2011-01-10 13:21:47 +0100 (Mo, 10 Jan 2011) $ + * @filesource $HeadURL$ + * @lastmodified $Date$ * */ @@ -21,4 +21,3 @@ $table = TABLE_PREFIX ."mod_jsadmin"; $database->query("DROP TABLE `$table`"); -?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/jsadmin/uninstall.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1 ## -Id \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/jsadmin/info.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/info.php (revision 1476) +++ branches/2.8.x/wb/modules/jsadmin/info.php (revision 1477) @@ -12,8 +12,8 @@ * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL: $ - * @lastmodified $Date: $ + * @filesource $HeadURL$ + * @lastmodified $Date$ * */ @@ -25,5 +25,3 @@ $module_author = 'Stepan Riha, Swen Uth'; $module_license = 'BSD License'; $module_description = 'This module adds Javascript functionality to the Website Baker Admin to improve some of the UI interactions. Uses the YahooUI library.'; - -?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/jsadmin/info.php ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: svn:keywords ## -1 +1 ## -Id \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/jsadmin/tool.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/tool.php (revision 1476) +++ branches/2.8.x/wb/modules/jsadmin/tool.php (revision 1477) @@ -11,8 +11,8 @@ * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/menu_link/save.php $ - * @lastmodified $Date: 2011-01-10 13:21:47 +0100 (Mo, 10 Jan 2011) $ + * @filesource $HeadURL$ + * @lastmodified $Date$ * */ Property changes on: branches/2.8.x/wb/modules/jsadmin/tool.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1 ## -Id \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php (revision 1476) +++ branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php (revision 1477) @@ -11,8 +11,8 @@ * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/menu_link/save.php $ - * @lastmodified $Date: 2011-01-10 13:21:47 +0100 (Mo, 10 Jan 2011) $ + * @filesource $HeadURL$ + * @lastmodified $Date$ * */ Property changes on: branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1 ## -Id \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/jsadmin/README.txt =================================================================== --- branches/2.8.x/wb/modules/jsadmin/README.txt (revision 1476) +++ branches/2.8.x/wb/modules/jsadmin/README.txt (revision 1477) Property changes on: branches/2.8.x/wb/modules/jsadmin/README.txt ___________________________________________________________________ Modified: svn:keywords ## -1 +1 ## -Id \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/jsadmin/jsadmin.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/jsadmin.php (revision 1476) +++ branches/2.8.x/wb/modules/jsadmin/jsadmin.php (revision 1477) @@ -11,8 +11,8 @@ * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/menu_link/save.php $ - * @lastmodified $Date: 2011-01-10 13:21:47 +0100 (Mo, 10 Jan 2011) $ + * @filesource $HeadURL$ + * @lastmodified $Date$ * */ Property changes on: branches/2.8.x/wb/modules/jsadmin/jsadmin.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1 ## -Id \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/jsadmin/install.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/install.php (revision 1476) +++ branches/2.8.x/wb/modules/jsadmin/install.php (revision 1477) @@ -11,8 +11,8 @@ * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/menu_link/save.php $ - * @lastmodified $Date: 2011-01-10 13:21:47 +0100 (Mo, 10 Jan 2011) $ + * @filesource $HeadURL$ + * @lastmodified $Date$ * */ Property changes on: branches/2.8.x/wb/modules/jsadmin/install.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1 ## -Id \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/jsadmin/index.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/index.php (revision 1476) +++ branches/2.8.x/wb/modules/jsadmin/index.php (revision 1477) @@ -11,8 +11,8 @@ * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/menu_link/save.php $ - * @lastmodified $Date: 2011-01-10 13:21:47 +0100 (Mo, 10 Jan 2011) $ + * @filesource $HeadURL$ + * @lastmodified $Date$ * */ Property changes on: branches/2.8.x/wb/modules/jsadmin/index.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1 ## -Id \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/output_filter/uninstall.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/uninstall.php (revision 1476) +++ branches/2.8.x/wb/modules/output_filter/uninstall.php (revision 1477) Property changes on: branches/2.8.x/wb/modules/output_filter/uninstall.php ___________________________________________________________________ Modified: svn:keywords ## -1,4 +1 ## -Id -Revision -HeadURL -Date \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/output_filter/filter-routines.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/filter-routines.php (revision 1476) +++ branches/2.8.x/wb/modules/output_filter/filter-routines.php (revision 1477) @@ -23,6 +23,11 @@ if (!function_exists('get_output_filter_settings')) { function get_output_filter_settings() { global $database, $admin; + // be sure field is in table (suppresses strict warning) + $table_name = TABLE_PREFIX .'mod_output_filter'; + $field_name = 'sys_rel'; + $description = 'VARCHAR(1) NOT NULL DEFAULT \'0\''; + $msg_flag = ($database->field_add($table_name,$field_name,$description )); // connect to database and read out filter settings $result = $database->query("SELECT * FROM " .TABLE_PREFIX ."mod_output_filter"); if($result && $result->numRows() > 0) { @@ -240,5 +245,3 @@ return $match[0]; } } - -?> Property changes on: branches/2.8.x/wb/modules/output_filter/filter-routines.php ___________________________________________________________________ Modified: svn:keywords ## -1,4 +1 ## -Id -Revision -HeadURL -Date \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/output_filter/info.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/info.php (revision 1476) +++ branches/2.8.x/wb/modules/output_filter/info.php (revision 1477) Property changes on: branches/2.8.x/wb/modules/output_filter/info.php ___________________________________________________________________ Modified: svn:keywords ## -1,4 +1 ## -Id -Revision -HeadURL -Date \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/output_filter/tool.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/tool.php (revision 1476) +++ branches/2.8.x/wb/modules/output_filter/tool.php (revision 1477) Property changes on: branches/2.8.x/wb/modules/output_filter/tool.php ___________________________________________________________________ Modified: svn:keywords ## -1,4 +1 ## -Id -Revision -HeadURL -Date \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/output_filter/install.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/install.php (revision 1476) +++ branches/2.8.x/wb/modules/output_filter/install.php (revision 1477) Property changes on: branches/2.8.x/wb/modules/output_filter/install.php ___________________________________________________________________ Modified: svn:keywords ## -1,4 +1 ## -Id -Revision -HeadURL -Date \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/output_filter/index.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/index.php (revision 1476) +++ branches/2.8.x/wb/modules/output_filter/index.php (revision 1477) Property changes on: branches/2.8.x/wb/modules/output_filter/index.php ___________________________________________________________________ Modified: svn:keywords ## -1,4 +1 ## -Id -Revision -HeadURL -Date \ No newline at end of property +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/output_filter/upgrade.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/upgrade.php (revision 1476) +++ branches/2.8.x/wb/modules/output_filter/upgrade.php (revision 1477) @@ -18,15 +18,23 @@ // Must include code to stop this file being access directly if(defined('WB_PATH') == false) { die("Cannot access this file directly"); } - +global $i; $table_name = TABLE_PREFIX .'mod_output_filter'; $field_name = 'sys_rel'; -$description = 'VARCHAR(1) NOT NULL DEFAULT \'0\''; -$msg_flag = ($database->field_add($table_name,$field_name,$description )); -$sql = 'UPDATE '; -$sql .= '`'.$table.'` '; -$sql .= 'SET `'.$field_name.'` = \'1\' '; -if( !$database->query($sql.$sqlwhere) ) -{ - $sql_info = mysql_info($database->db_handle); +$i = (!isset($i) ? 1 : $i); +print "
"; +print "

Step $i: Updating Output Filter

\n"; +$i++; +$OK = "OK"; +$FAIL = "FAILED"; +if ( ($database->field_exists($table_name,$field_name) )) { + print "
'Output Filter already updated' $OK
\n"; +} else { + $description = 'VARCHAR(1) NOT NULL DEFAULT \'0\''; + if( ($database->field_add($table_name,$field_name,$description )) ) { + print "
Updating Output Filter $OK
\n"; + } else { + print "
Updating Output Filter $FAIL
\n"; + } } +print "
"; Property changes on: branches/2.8.x/wb/modules/output_filter/upgrade.php ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/droplets/example/LoginBox.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/LoginBox.php (revision 1476) +++ branches/2.8.x/wb/modules/droplets/example/LoginBox.php (revision 1477) @@ -1,7 +1,7 @@ //:Puts a Login / Logout box on your page. //:Use: [[LoginBox?redirect=url]] - Absolute or relative url possible - Remember to enable frontend login in your website settings. +//:Absolute or relative url possible +//:Remember to enable frontend login in your website settings. global $wb,$page_id,$TEXT, $MENU, $HEADING; Index: branches/2.8.x/wb/modules/news/upgrade.php =================================================================== --- branches/2.8.x/wb/modules/news/upgrade.php (revision 1476) +++ branches/2.8.x/wb/modules/news/upgrade.php (revision 1477) @@ -20,6 +20,8 @@ if(!defined('WB_URL')) { throw new Exception('illegal file access!! ['.$_SERVER['PHP_SELF'].']'); } /* **** START UPGRADE ******************************************************* */ +if(!function_exists('mod_news_Upgrade')) +{ function mod_news_Upgrade() { global $database, $admin, $MESSAGE; @@ -161,5 +163,7 @@ if($globalStarted) { echo 'created '.$count.' new accessfiles.'; } if(!$globalStarted) { $admin->print_footer(); } } +} + mod_news_Upgrade(); /* **** END UPGRADE ********************************************************* */