Index: tags/2.8.3/CHANGELOG =================================================================== --- tags/2.8.3/CHANGELOG (nonexistent) +++ tags/2.8.3/CHANGELOG (revision 1610) @@ -0,0 +1,2677 @@ +Change Log +=============================================================================== +Please note: This change log may not be accurate + +$Id$ + +Legend: ++ = Added +- = Removed +# = Bugfix +! = Update/Change +=============================================================================== + + +----------------------------------- 2.8.3 -------------------------------- +09 Feb-2012 Build 1609 Dietmar Woellbrink (Luisehahne) +! change Website Baker to WebsiteBaker in installer +09 Feb-2012 Build 1608 Dietmar Woellbrink (Luisehahne) +! A small optical correction of the installer. +09 Feb-2012 Build 1607 Dietmar Woellbrink (Luisehahne) +# typofix in /modules/form/view.php (Tks to jacobi22) +08 Feb-2012 Build 1606 Dietmar Woellbrink (Luisehahne) +# some little changes and fixes in template allcss and round ++ add // register_frontend_modfiles('jquery'); to activate comment out +! Set version to 2.71 +08 Feb-2012 Build 1605 Dietmar Woellbrink (Luisehahne) +! login.php fallback to revision 1602 +08 Feb-2012 Build 1604 Dietmar Woellbrink (Luisehahne) +# fixed parse error in login.php +08 Feb-2012 Build 1603 Dietmar Woellbrink (Luisehahne) +! fix local module reload and module manuell install +! forgot to upload login.php +08 Feb-2012 Build 1602 Dietmar Woellbrink (Luisehahne) +! a quick simple stylesheet fix in wb_theme, +07 Feb-2012 Build 1601 Dietmar Woellbrink (Luisehahne) +! little designfix in forgot_form.php +! fix media if uploading zip files with folder, than create FolderProtectFiles +07 Feb-2012 Build 1600 Dietmar Woellbrink (Luisehahne) +# more fixed issues with get_magic_quotes_gpc and FCKeditor +! remove create and upload in FCKeditor Filemanager +06 Feb-2012 Build 1599 Dietmar Woellbrink (Luisehahne) +! update all used files with redirect_url to $_SESSION['HTTP_REFERER'] +06 Feb-2012 Build 1598 Dietmar Woellbrink (Luisehahne) +# fixed undefined fragment index in initialize.php +! add $_SESSION['HTTP_REFERER'] storing active pagelink if page_id != 0 +05 Feb-2012 Build 1597 Dietmar Woellbrink (Luisehahne) +# fixed issues with get_magic_quotes_gpc and FCKeditor +04 Feb-2012 Build 1596 Dietmar Woellbrink (Luisehahne) +# highly critical security-fix +# announced on http://www.darksecurity.de/advisories/2012/SSCHADV2012-003.txt +04 Feb-2012 Build 1595 Dietmar Woellbrink (Luisehahne) +# fix form language vars for better understanding (Tks to Maverik) +! change request if HTTP_REFERER is not empty in logout.php +03 Feb-2012 Build 1594 Dietmar Woellbrink (Luisehahne) +# fixed use of undefined constant fri in /form/view.php +01 Feb-2012 Build 1593 Dietmar Woellbrink (Luisehahne) +# rebuild protectfile in pages/posts +31 Jan-2012 Build 1592 Werner v.d.Decken(DarkViper) +# little Typo-fix in database::SqlImport(). (grummel) +31 Jan-2012 Build 1591 Werner v.d.Decken(DarkViper) +# little Regex-fix in database::SqlImport(). +25 Jan-2012 Build 1590 Werner v.d.Decken(DarkViper) +! mod form: added request var to submit a request identifier. +! argument ?fri=12345 on GET-view will submit 'FormRequestId: 12345' by email +25 Jan-2012 Build 1589 Dietmar Woellbrink (Luisehahne) +# fixed starting upgrade-script if missing revision in settings +25 Jan-2012 Build 1588 Werner v.d.Decken(DarkViper) +# all module depending code removed, some little fixes, better integration for module-upgrade +25 Jan-2012 Build 1587 Werner v.d.Decken(DarkViper) ++ module news: added sql-dump to create database tables +# module news: some little fixes in install/upgrade +24 Jan-2012 Build 1586 Werner v.d.Decken(DarkViper) ++ added new method SqlImport() to class database +19 Jan-2012 Build 1585 Dietmar Woellbrink (Luisehahne) +# fixed double table width in modify.php form module ((Tks to Ruebenwurzel) +19 Jan-2012 Build 1584 Dietmar Woellbrink (Luisehahne) +! form module, shows email-adress from body tag +- remove scrollable table in overview form module +19 Jan-2012 Build 1583 Dietmar Woellbrink (Luisehahne) +! forgot upload save.php in wysiwyg module +19 Jan-2012 Build 1582 Dietmar Woellbrink (Luisehahne) +# wysiwyg module, fix issues with magic_quote_gpc if on +# form module, fix regex for radio and checkbox (Tks to Ruud) +! form module, make show submission table scrollable +17 Jan-2012 Build 1581 Werner v.d.Decken(DarkViper) +# wysiwyg module some little typo fixes a.s.o. +17 Jan-2012 Build 1580 Dietmar Woellbrink (Luisehahne) +! dropdown list to choose recipient for email confirmation +16 Jan-2012 Build 1579 Dietmar Woellbrink (Luisehahne) +- remove unneeded input fields in form settings +16 Jan-2012 Build 1578 Dietmar Woellbrink (Luisehahne) +# fixed warning in domain independend image links +16 Jan-2012 Build 1577 Dietmar Woellbrink (Luisehahne) +# fixed save dirmode and filmode to 0 if not superadmin +16 Jan-2012 Build 1576 Werner v.d.Decken(DarkViper) +# wysiwyg module changed to domain independend image links +16 Jan-2012 Build 1575 Dietmar Woellbrink (Luisehahne) +# fixed captcha error message in form module +! set form module to version 2.8.4 +16 Jan-2012 Build 1574 Dietmar Woellbrink (Luisehahne) ++ add instruction README.de.txt in form module +! update jquery to jQuery 1.7.1 and jQuery UI 1.8.17 +16 Jan-2012 Build 1573 Dietmar Woellbrink (Luisehahne) ++ add automatically generated e-mail language form variable +! send confirmation mail with details to superadmin from SERVER_EMAIL +! send confirmation mail without details to sender from SERVER_EMAIL +14 Jan-2012 Build 1572 Dietmar Woellbrink (Luisehahne) +! security fix, force SMTP Authentifikation +! server and email settings only for superadmin +12 Jan-2012 Build 1571 Dietmar Woellbrink (Luisehahne) +# remove session_start() in /account/logout.php +10 Jan-2012 Build 1570 Dietmar Woellbrink (Luisehahne) +! added $module_directory to make quickskin directory changes dynamically +10 Jan-2012 Build 1569 Werner v.d.Decken(DarkViper) +# possible errors on 'save password' fixed. Minimum length of password set to 6 chars +10 Jan-2012 Build 1568 Dietmar Woellbrink (Luisehahne) +! fix show_menu2 2th parameter for template round and allcss (Tks to Ruebenwurzel) +! set fingerprint_with_ip_octets default to 2 in a new installation +07 Jan-2012 Build 1567 Dietmar Woellbrink (Luisehahne) +# fix wbmailer_smtp_auth, could not be disabled after enabled +07 Jan-2012 Build 1566 Dietmar Woellbrink (Luisehahne) +# fix class.login, when name and pass are both empty no longer call increase_attemps +! some redirect updates in frontend account files +06 Jan-2012 Build 1565 Dietmar Woellbrink (Luisehahne) +! fixed:: detection of serverdefined charsets more different +06 Jan-2012 Build 1564 Dietmar Woellbrink (Luisehahne) +# entities fixes in FI and TR languages files (Tks to Ruebenwurzel) +06 Jan-2012 Build 1563 Dietmar Woellbrink (Luisehahne) +! add linebreak in backend message for 'delete install folder...' +05 Jan-2012 Build 1562 Dietmar Woellbrink (Luisehahne) +! only superadmin can start the upgrade-script from backend +05 Jan-2012 Build 1561 Dietmar Woellbrink (Luisehahne) +# secureForm Fix for hosting with load balancing +04 Jan-2012 Build 1560 Dietmar Woellbrink (Luisehahne) +! upgrade script start automatically after uploading a new version and login to the backend +04 Jan-2012 Build 1559 Dietmar Woellbrink (Luisehahne) +! change quickSkin to alpha status, ATTENTION rename folder to quickSkin_alpha +02 Jan-2012 Build 1558 Dietmar Woellbrink (Luisehahne) +# remove backslash in $_CONFIG['extensions_dir'] +! update editor.css for allcssand round (Tks to Ruebenwurzel) +# bugfix in forgot_form.php +02 Jan-2012 Build 1556 Dietmar Woellbrink (Luisehahne) +# typofix in function make_dir +02 Jan-2012 Build 1555 Dietmar Woellbrink (Luisehahne) +! wb_quickSkin_28.php create _skin folders with folder protect file +! add a 3th parameter to function make_dir to allows the creation of nested directories specified in the pathname. Defaults to TRUE +01 Jan-2012 Build 1554 Dietmar Woellbrink (Luisehahne) +# typofixes in DE languages files (Tks to Ruebenwurzel) +31 Dez-2011 Build 1553 Dietmar Woellbrink (Luisehahne) +! recoded formmodul, add dropdown email_fromname_field +31 Dez-2011 Build 1552 Dietmar Woellbrink (Luisehahne) +# fix mdcr.js $scriptLink to absolute url +! change separator breadcrumb admintools +27 Dez-2011 Build 1551 Dietmar Woellbrink (Luisehahne) ++ add languages vars in languages files ++ add upload error mesages moduleinstall ++ add index.php if not exists in function createFolderProtectFile +! corrected changed coding between login_form and forgot_form +21 Dez-2011 Build 1550 Dietmar Woellbrink (Luisehahne) +! update php mailer to version 5.2 +19 Dez-2011 Build 1549 Dietmar Woellbrink (Luisehahne) +! christmas time corrected wrong files +19 Dez-2011 Build 1548 Dietmar Woellbrink (Luisehahne) +- remove quickSkin /temp/folder/ for a later solution +18 Dez-2011 Build 1547 Dietmar Woellbrink (Luisehahne) ++ forgot a file in quickSkin Folder +18 Dez-2011 Build 1546 Dietmar Woellbrink (Luisehahne) +! recoded /account/forgot_form.php +! update quickSkin +! update languages files ++ add /temp/quickSkin/ folder +! begin fixing sec_anchor in urls +15 Dez-2011 Build 1545 Dietmar Woellbrink (Luisehahne) +! update admin/pages/modify.php now you can send page_id with GET and POST +15 Dez-2011 Build 1544 Dietmar Woellbrink (Luisehahne) +# fix droplet import after new wb installtion +14 Dez-2011 Build 1543 Dietmar Woellbrink (Luisehahne) +# fix droplet sectionPicker +# fix install config.php not writeable +# check table droplet if empty import examples +12 Dez-2011 Build 1542 Dietmar Woellbrink (Luisehahne) +# fix wrong background url in "Website Under Construction" +12 Dez-2011 Build 1541 Dietmar Woellbrink (Luisehahne) +! change block BEGIN to LOOP in quickskin (Tks to Stefek) +11 Dez-2011 Build 1540 Dietmar Woellbrink (Luisehahne) +! did some changes and fixes found by testers +10 Dez-2011 Build 1539 Dietmar Woellbrink (Luisehahne) +! update phpmailer to version 5.1 +10 Dez-2011 Build 1538 Dietmar Woellbrink (Luisehahne) +! add table db engine in module install scripts +! some small updates in modules +10 Dez-2011 Build 1537 Dietmar Woellbrink (Luisehahne) +! continue updating headerinfos, adding upgrade scripts to module +10 Dez-2011 Build 1536 Dietmar Woellbrink (Luisehahne) ++ add upgrade.php to captcha_control and small changes ++ add FolderProtectFile to quickskin +10 Dez-2011 Build 1535 Dietmar Woellbrink (Luisehahne) +! changes in code modul ++ add function getTableEngine to class.database ++ add Quickskin to include folder ++ add reworkes Droplet SectionPicker to load modules frontend.css +08 Dez-2011 Build 1534 Werner v.d.Decken(DarkViper) +# /output_filter/filter-routines.php rel-URL Filter fixed for mailto-links +08 Dez-2011 Build 1533 Dietmar Woellbrink (Luisehahne) ++ new backend theme handling (Tks to Stefek) +# some fixes in install +28 Nov-2011 Build 1532 Dietmar Woellbrink (Luisehahne) +! small changes in INSTALL and UPGRADE (Tks to unawave2) +! update upgrade-script showing from Version to Version (Tks to unawave2) ++ add Servicepack version to header.htt +28 Nov-2011 Build 1531 Dietmar Woellbrink (Luisehahne) +! add Instructions for droplets +27 Nov-2011 Build 1530 Dietmar Woellbrink (Luisehahne) +! update templates allcss and round (Tks to Rübenwurzel) ++ Add UPGRADE Instructions +! Update INSTALL Instructions +! Optimize config.php handling for installation +25 Nov-2011 Build 1529 Dietmar Woellbrink (Luisehahne) ++ add new backend theme handling (Tks to Stefek) +----------------------------------- Fixes 2.8.2 -------------------------------- +23 Nov-2011 Build 1528 Dietmar Woellbrink (Luisehahne) +! rework login and show_menu in templates allcss and round +22 Nov-2011 Build 1527 Dietmar Woellbrink (Luisehahne) +# fix redirect login +20 Nov-2011 Build 1526 Dietmar Woellbrink (Luisehahne) +# typofix in BG and RU +15 Nov-2011 Build 1525 Dietmar Woellbrink (Luisehahne) +# fix versions compare upgrade from WB version 2.7 +13 Nov-2011 Build 1524 Dietmar Woellbrink (Luisehahne) +! fix secureform was not uploaded +13 Nov-2011 Build 1523 Dietmar Woellbrink (Luisehahne) +# fix fingerprint in secureform +! update jquery to version 1.7 +12 Nov-2011 Build 1522 Werner v.d.Decken(DarkViper) +# /modules/output_filter/filter-routines.php little fix to inserting mdcr.js +# /modules/form/view.php little fix depending from recoded output filter +09 Nov-2011 Build 1521 Dietmar Woellbrink (Luisehahne) +! update jquery to version 1.6.4 +09 Nov-2011 Build 1520 Werner v.d.Decken(DarkViper) +! /modules/output_filter completely recoded ++ new filter for relative-URL added ++ some small fixes +! /admin/admintools/tool.php completely recoded +! /wb/index.php output_filter request changed to adopt new output_filter +08 Nov-2011 Build 1519 Dietmar Woellbrink (Luisehahne) +! corrected properties +26 Okt-2011 Build 1518 Dietmar Woellbrink (Luisehahne) +# fix anchor jump in sections (not work correctly with CKEditor) +24 Okt-2011 Build 1517 Dietmar Woellbrink (Luisehahne) +# fix SERVER_EMAIL in language files +# fix encoded text in sections.php ++ add missing image in argos_theme +05 Okt-2011 Build 1516 Dietmar Woellbrink (Luisehahne) ++ add forgotten language variable +05 Okt-2011 Build 1515 Dietmar Woellbrink (Luisehahne) +# typofix and changes in languages +04 Okt-2011 Build 1514 Dietmar Woellbrink (Luisehahne) +# account/signup.php, check if user is already logged +# fix non object message in framework/functions.php +04 Okt-2011 Build 1513 Dietmar Woellbrink (Luisehahne) +! outputfilter now check and add missing slash in empty href if relative urls are enabled +24 Sep-2011 Build 1512 Werner v.d.Decken(DarkViper) +! settings for pwgen updated +14 Sep-2011 Build 1511 Dietmar Woellbrink (Luisehahne) +# fixed strict notice warning in class.wb +! change editor for intropage to editarea +! add missing slash in themes +14 Sep-2011 Build 1510 Werner v.d.Decken(DarkViper) ++ new constant 'DO_NOT_TRACK' set to true if a client sends the DNT-Header +07 Sep-2011 Build 1509 Dietmar Woellbrink (Luisehahne) +# continue fixing frontend account +07 Sep-2011 Build 1508 Dietmar Woellbrink (Luisehahne) +# fixed print_error exit in frontend account +06 Sep-2011 Build 1507 Dietmar Woellbrink (Luisehahne) +# fixed field_remove +26 Aug-2011 Build 1506 Werner v.d.Decken(DarkViper) ++ new class PasswordHash ++ new Password-/Hash-generator +19 Aug-2011 Build 1505 Dietmar Woellbrink (Luisehahne) +# syntaxfix order::clean() +19 Aug-2011 Build 1504 Werner v.d.Decken(DarkViper) +# fixed order::clean() +18 Aug-2011 Build 1503 Dietmar Woellbrink (Luisehahne) +! change sql statements to strict in module droplets +! fix vars in compatibility mode for versions before 2.8.1 in frontend.functions.php +11 Aug-2011 Build 1502 Werner v.d.Decken(DarkViper) +# fixed c&p mistake +11 Aug-2011 Build 1501 Werner v.d.Decken(DarkViper) +- removed stoneaged code from 2.4 +11 Aug-2011 Build 1500 Werner v.d.Decken(DarkViper) +# sync working copy +11 Aug-2011 Build 1499 Werner v.d.Decken(DarkViper) +# little fix in calling globalExceptionHandler from inner core files +11 Aug-2011 Build 1498 Werner v.d.Decken(DarkViper) +# fixed secureform +11 Aug-2011 Build 1497 Werner v.d.Decken(DarkViper) +! sync changelog +11 Aug-2011 Build 1496 Werner v.d.Decken(DarkViper) +! activate globalExceptionHandler in inner core files +11 Aug-2011 Build 1495 Werner v.d.Decken(DarkViper) +# fix SQL-statements to SQL-strict +11 Aug-2011 Build 1494 Dietmar Woellbrink (Luisehahne) +# Fixed save wrong template directory in database +11 Aug-2011 Build 1493 Dietmar Woellbrink (Luisehahne) +# Ticket #1106 FatalError in groups module +11 Aug-2011 Build 1492 Dietmar Woellbrink (Luisehahne) +# Ticket #1107 Deleting users not possible + Change handling, first user will be set to inactive + secound inactive user will be show in an extra dropdown + and can now deleted from user table or reactivated +11 Aug-2011 Build 1491 Dietmar Woellbrink (Luisehahne) +! comment out $email_body .= "\n\nIP: ".$_SERVER['REMOTE_ADDR']; +11 Aug-2011 Build 1490 Dietmar Woellbrink (Luisehahne) +! set default FCKConfig.FillEmptyBlocks to true +11 Aug-2011 Build 1489 Werner v.d.Decken(DarkViper) ++ little fix in globalExceptionHandler +11 Aug-2011 Build 1488 Werner v.d.Decken(DarkViper) ++ globalExceptionHandler activated +10 Aug-2011 Build 1487 Werner v.d.Decken(DarkViper) +# class.order completely recoded to reduce SQL requests +# all other files: fix SQL-statements to SQL-strict +08 Aug-2011 Build 1486 Werner v.d.Decken(DarkViper) +# database::field_modify() there was a bug to fix +# all other files: fix SQL-statements to SQL-strict +01 Aug-2011 Build 1485 Dietmar Woellbrink (Luisehahne) +! rename config.php.bak to config.php.new +# fixed rss.php SERVER_EMAIL +31 Jul-2011 Build 1484 Dietmar Woellbrink (Luisehahne) +! move fixes 2.8.2 to 2.8.3 +! fixes will be shown in an extra readme +! an package with the fixed files will be created +! for all users who downloaded the 2.8.2 before 29 Jul-2011 +------------------------------------- 2.8.2 ------------------------------------ +25 Jul-2011 Build 1480 Dietmar Woellbrink (Luisehahne) +! Changed version to 2.8.2 +25 Jul-2011 Build 1479 Dietmar Woellbrink (Luisehahne) +! preparing backend for the new installer ++ add SecureFormSwitcher (Admintool) +22 Jul-2011 Build 1478 Dietmar Woellbrink (Luisehahne) +# fix mssing filename in intro.php +! inactive user in dropwonlist are show with line-through +21 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 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 +# change lang variable to remove upgrade-script +! reworked add sections in pages +! fix set empty href in show_menu2 +! set show_menu2 version to 4.9.6 +! reworked Droplet LoginBox, add redirect query +- remove unneeded folder js +! set Droplet to version 1.1.0 ++ add checkboxes to change frontend absolute url to relative urls +! set output_filter version to 0.2 +12 Jul-2011 Build 1474 Werner v.d.Decken(DarkViper) +# for security reasons the 'remember me' functionality is deaktivated in + class login +! 'Get configuration values' is optimized +09 Jul-2011 Build 1473 Dietmar Woellbrink (Luisehahne) +# found more backlinks to fix +- remove not working ftan in frontend +# fixed redirect in login procedure (Tks to mr-fan) +! update droplet LoginBox, additional parameter $redirect +# remove double config call in media (Tks to Testör) +07 Jul-2011 Build 1472 Dietmar Woellbrink (Luisehahne) +# fixed version.php +07 Jul-2011 Build 1471 Dietmar Woellbrink (Luisehahne) +! change to Release Candiate 7 +07 Jul-2011 Build 1470 Dietmar Woellbrink (Luisehahne) +# languages Typo fix (Tks to pcwacht) +! update intro, fixed saving +# fixed install/save.php (Tks to pcwacht) +07 Jul-2011 Build 1469 Dietmar Woellbrink (Luisehahne) +! Forgotten upload changelog and version.php +07 Jul-2011 Build 1468 Dietmar Woellbrink (Luisehahne) +! update jquery-min to version 1.6.2 +! update jquery-ui-min to version 1.8.14 +# fix index error in media upload (Tks to DBS) ++ add missing nopreview.jpg +! update media browser not to show forbidden files +- remove unused jquery archiv folder +02 Jul-2011 Build 1467 Dietmar Woellbrink (Luisehahne) +! update some headerinfos +# fix missing header for some error messages +01 Jul-2011 Build 1466 Dietmar Woellbrink (Luisehahne) +# fix form modul (tks to our Tester) +01 Jul-2011 Build 1465 Dietmar Woellbrink (Luisehahne) +# bugfix in initialize including SecureForm +! update admintools FTAN handling +01 Jul-2011 Build 1464 Werner v.d.Decken(DarkViper) +# Ticket 1102 fixed little bug in moveCssToHead() (Tks to Crnogorac081) +01 Jul-2011 Build 1463 Dietmar Woellbrink (Luisehahne) +# fixed Ticket 1050 Bug in include/phpmailer/class.phpmailer.php with Lotus Notes +# fixed Ticket 573, 939 Bad formatting of e-mail received from form submissions +# fixed Ticket 1009 cannot change user password without changing Email in preference +30 Jun-2011 Build 1462 Werner v.d.Decken(DarkViper) ++ class-switcher for SecureForm added +30 Jun-2011 Build 1461 Dietmar Woellbrink (Luisehahne) +! correct all misspellings on finnish language file (Tks to invisigoth) +29 Jun-2011 Build 1460 Dietmar Woellbrink (Luisehahne) +# Ticket 1101, phtml|php5|php4|php|cgi|pl|exe|com|bat|src| will be hardcoded + additional you can set more extension in settings extended in field rename_file_types + rename_file_types now is a blacklist and will no longer be renamed to .txt +! update admintools modules to work with SecureForm Patch from NorHei +26 Jun-2011 Build 1459 Dietmar Woellbrink (Luisehahne) +# Ticket 1099: change title for add_child_page in page tree +26 Jun-2011 Build 1458 Dietmar Woellbrink (Luisehahne) +# Ticket 833 fixed markup for table cells in view.php +! change themes.css to make style more flexible in success.htt and error.htt ++ backend themes: add js function redirect_to_page(url, timer) to redirect without message +25 Jun-2011 Build 1457 Dietmar Woellbrink (Luisehahne) +! Preparing 2.8.2 stable, last tests +10 Jun-2011 Build 1456 Dietmar Woellbrink (Luisehahne) ++ add PL languages to news and captcha_control (tks to vixrealitum) +! update PL language for WebsiteBaker (tks to vixrealitum) +06 Jun-2011 Build 1455 Werner v.d.Decken(DarkViper) +# fixed Bug-Ticket #1096: editing of files via modules/edit_module_files.php +06 Jun-2011 Build 1454 Werner v.d.Decken(DarkViper) +# in /framework/functions.php::media_filename - replace whitespaces by _ +# /upgrade-script.php - some small fixes +02 Jun-2011 Build 1453 Dietmar Woellbrink (Luisehahne) +# fix target in admin/media/browse.php +# http://www.websitebaker2.org/forum/index.php/topic,21688.msg145812.html#msg145812 +# Tks to the community +02 Jun-2011 Build 1452 Dietmar Woellbrink (Luisehahne) +! change status to RC6 +29 May-2011 Build 1451 Dietmar Woellbrink (Luisehahne) +# replace eregi with pregmatch in search_modext (Tks to Thorn) +22 May-2011 Build 1450 Werner v.d.Decken(DarkViper) +# small fix at calling of moveCssToHead() in /index.php +07 May-2011 Build 1449 Werner v.d.Decken(DarkViper) +! cleanup some code in edit_module_files.php +07 May-2011 Build 1448 Dietmar Woellbrink (Luisehahne) +# secure fix edit_module_files.php +# fix wb_wrapper_edit_area.php +03 May-2011 Build 1447 Werner v.d.Decken(DarkViper) +! syncronice version (no data changes) +03 May-2011 Build 1446 Werner v.d.Decken(DarkViper) +# fixed validation of username in users and signup +27 Apr-2011 Build 1445 Dietmar Woellbrink (Luisehahne) +# small validation fixes in backend themes +22 Apr-2011 Build 1444 Dietmar Woellbrink (Luisehahne) +# fix wrong url in captacha +19 Apr-2011 Build 1443 Dietmar Woellbrink (Luisehahne) +! remove auto including YUI Framework in backend for modules, enable with ->print_footer(true) +! ->print_error and ->print_success too accept a message as array +! auto validate in frontend if style block inside body tag +! captcha now XHTML valide +15 Apr-2011 Build 1442 Dietmar Woellbrink (Luisehahne) +# bug fixed in class.database.php methode field_add in call field_exists +! update search, pls test, (Tks to Thorn) +10 Apr-2011 Build 1441 Dietmar Woellbrink (Luisehahne) +# recoded /modules/admin.php info_banner, now compare with modify in pages +# security fixes remove defined WB_PATH for backend templates +# fixed class.admin.php missing $TEXT declaration, add get_section_details +26 Mar-2011 Build 1440 Dietmar Woellbrink (Luisehahne) +# add missing methode is_group_match in class.wb.php +17 Mar-2011 Build 1439 Werner v.d.Decken(DarkViper) +! syncronice version (no data changes) +17 Mar-2011 Build 1438 Werner v.d.Decken(DarkViper) +# little fixes for xhtml-validity in '/include/captcha/captcha.php' +17 Mar-2011 Build 1437 Werner v.d.Decken(DarkViper) +# little fixes for xhtml-validity module 'form' +17 Mar-2011 Build 1436 Dietmar Woellbrink (Luisehahne) +! update jquery to Version 1.5.1 and jQuery UI to Version 1.8.10 +17 Mar-2011 Build 1435 Dietmar Woellbrink (Luisehahne) +# fix entities converting in select languages (Tks to the community) +# see http://www.websitebaker2.org/forum/index.php/topic,20547.msg140512.html#msg140512 +13 Mar-2011 Build 1433 Dietmar Woellbrink (Luisehahne) +# fixed bug : Call to undefined method wb::preprocess() +14 Feb-2011 Build 1432 Dietmar Woellbrink (Luisehahne) +# update NL language file (Tks to Argos) +11 Feb-2011 Build 1431 Dietmar Woellbrink (Luisehahne) ++ add page position in get_page_details +11 Feb-2011 Build 1430 Dietmar Woellbrink (Luisehahne) +# fix save settings dir and file mode (Tks to the community) +09 Feb-2011 Build 1429 Dietmar Woellbrink (Luisehahne) +# add forgotten javascript variable +07 Feb-2011 Build 1428 Dietmar Woellbrink (Luisehahne) +! update Argostheme to version 1.5 (Tks to Argos) +! validation fixes +! call edit_full_area on the fly +04 Feb-2011 Build 1427 Dietmar Woellbrink (Luisehahne) +! validation fixes in wb_theme +04 Feb-2011 Build 1426 Dietmar Woellbrink (Luisehahne) +! validation fixes +04 Feb-2011 Build 1425 Dietmar Woellbrink (Luisehahne) +! redefined wrong admin backlinks +31 Jan-2011 Build 1424 Werner v.d.Decken(DarkViper) +# typo fix and simplify used_octets calculation +30 Jan-2011 Build 1423 Werner v.d.Decken(DarkViper) +! add FINGERPRINT_WITH_IP_OCTETS to table settings +30 Jan-2011 Build 1422 Dietmar Woellbrink (Luisehahne) +! update SecureForm.php to work behind Proxies +27 Jan-2011 Build 1421 Dietmar Woellbrink (Luisehahne) +# fix Undefined index: WARN_PAGE_LEAVE +26 Jan-2011 Build 1420 Dietmar Woellbrink (Luisehahne) +# YGN Ethical Hacker Group (2.8.2 / 2.9.0) +26 Jan-2011 Build 1419 Dietmar Woellbrink (Luisehahne) +! update rel handling FCKeditor for urls +25 Jan-2011 Build 1418 Dietmar Woellbrink (Luisehahne) +# remove new function see http://www.websitebaker2.org/forum/index.php/topic,20268.msg139557.html#msg139557 +24 Jan-2011 Build 1417 Dietmar Woellbrink (Luisehahne) +! add redirect timer description in settings.php +24 Jan-2011 Build 1416 Dietmar Woellbrink (Luisehahne) +# fixed unsafe sql queries +24 Jan-2011 Build 1415 Werner v.d.Decken(DarkViper) +# fixed unsafe sql queries +23 Jan-2011 Build 1414 Dietmar Woellbrink (Luisehahne) +# fix wrong error message in media +! backend start warning if upgrade-script exists +23 Jan-2011 Build 1413 Frank Heyne (FrankH) +# Bugfix for Ticket 900 +23 Jan-2011 Build 1412 Werner v.d.Decken(DarkViper) +# fixed wb::password_chars +23 Jan-2011 Build 1411 Frank Heyne (FrankH) +# Bugfix for Tickets 965, 966 and 910 +23 Jan-2011 Build 1410 Frank Heyne (FrankH) +# Bugfix for build 1409 +23 Jan-2011 Build 1409 Frank Heyne (FrankH) ++ Ticket 1058 added warn_page_leave (currently only in wysiwyg) +23 Jan-2011 Build 1408 Werner v.d.Decken(DarkViper) +# small changes in sm2menu() [SM2_NO_TITLE + SM2_XHTML_STRICT] +22 Jan-2011 Build 1407 Frank Heyne (FrankH) +# various Security fixes, thanks to secunia and others +22 Jan-2011 Build 1406 Frank Heyne (FrankH) +# Security fix to stop users from changing module contents without permission, thanks to Michael Schwarz +22 Jan-2011 Build 1405 Frank Heyne (FrankH) +# Security fix (XSS) in form module, thanks to Michael Schwarz +22 Jan-2011 Build 1404 Dietmar Woellbrink (Luisehahne) +# Security fix in pages +22 Jan-2011 Build 1403 Dietmar Woellbrink (Luisehahne) +! small fix +22 Jan-2011 Build 1402 Dietmar Woellbrink (Luisehahne) +! secure peparing and beginning fix admin/pages +21 Jan-2011 Build 1401 Frank Heyne (FrankH) +! fixed changelog +21 Jan-2011 Build 1400 Frank Heyne (FrankH) +# Security fix in account +# Security fix in admin/media, thanks to hal 9000 +21 Jan-2011 Build 1399 Dietmar Woellbrink (Luisehahne) +# Ticket 1090 fix wrong translation +20 Jan-2011 Build 1398 Frank Heyne (FrankH) +# Security fix in admin/admintools and admin/groups +20 Jan-2011 Build 1397 Dietmar Woellbrink (Luisehahne) +! recoded rediect timer in print_success (tks to Chio) +19 Jan-2011 Build 1396 Werner von den Decken (DarkViper) +! remove header redirect and add a die message +17 Jan-2011 Build 1395 Frank Heyne (FrankH) +# Security fix in admin/addons +16 Jan-2011 Build 1394 Dietmar Woellbrink (Luisehahne) +! set construct to FRONTEND class.wb +! set 2.8.2 to RC5 +16 Jan-2011 Build 1393 Frank Heyne (FrankH) +# Bugfix in Security fix +16 Jan-2011 Build 1392 Dietmar Woellbrink (Luisehahne) +! update headerinfos, change secure messages +16 Jan-2011 Build 1389-1391 Frank Heyne (FrankH) +# Security fixes for modules captcha_control, code and droplets +16 Jan-2011 Build 1388 Dietmar Woellbrink (Luisehahne) +# more Security fix for admin/pages +16 Jan-2011 Build 1387 Dietmar Woellbrink (Luisehahne) +# fix class.wb +16 Jan-2011 Build 1386 Dietmar Woellbrink (Luisehahne) +! update headerinfos +16 Jan-2011 Build 1385 Frank Heyne (FrankH) +# Security fix to filter out droplets from user input in news and form modules +16 Jan-2011 Build 1384 Dietmar Woellbrink (Luisehahne) +! Security fix in admin/pages +15 Jan-2011 Build 1383 Frank Heyne (FrankH) +# Security fix for news module +# Some more Security fixes, thanks to Gerben van Veenendaal +14 Jan-2011 Build 1382 Dietmar Woellbrink (Luisehahne) +# fix known error in drag and drop +14 Jan-2011 Build 1381 Dietmar Woellbrink (Luisehahne) +! update admin/modules unpack handling, overwrite newer files +13 Jan-2011 Build 1380 Dietmar Woellbrink (Luisehahne) ++ output fixings, known error in jsadmin will be fix later +13 Jan-2011 Build 1379 Werner von den Decken (DarkViper) +# fix class.admin +13 Jan-2011 Build 1378 Werner von den Decken (DarkViper) +! fixed inclusion of SecureForm ++ added IDNA/Punycode to wb::validate_email() +11 Jan-2011 Build 1377 Frank Heyne (FrankH) +# Security fix for modules jsadmin, menu_link and output_filter +11 Jan-2011 Build 1376 Frank Heyne (FrankH) +# Security fix for WYSIWYG module +# Security fix for Wrapper module +10 Jan-2011 Build 1375 Frank Heyne (FrankH) +# Security fix for Form module (new version is 2.8) +# bugfix for delete_field in Form module +10 Jan-2011 Build 1374 Dietmar Woellbrink (Luisehahne) +# fixed headerinfos +10 Jan-2011 Build 1373 Dietmar Woellbrink (Luisehahne) +! update headerinfos +10 Jan-2011 Build 1372 Dietmar Woellbrink (Luisehahne) +# fixed class.wb.php to add class SecureForm +09 Jan-2011 Build 1371 Dietmar Woellbrink (Luisehahne) +# captcha patch (Tks to FrankH) +! set status to 2.8.2 RC4 +09 Jan-2011 Build 1370 Dietmar Woellbrink (Luisehahne) +! update install, changed some default settings to enabled +06 Jan-2011 Build 1369 Dietmar Woellbrink (Luisehahne) ++ add jquery-include.js (Tks to Stefek) +! update bind jquery in frontend, jquery-include.js and jquery-insert.js are included +31 Dec-2010 Build 1368 Dietmar Woellbrink (Luisehahne) +- delete class.secureform.php ++ add newest SecureForm +# fixed Call to a member function read() on a non-object in function register_frontend_modfiles +29 Dec-2010 Build 1367 Dietmar Woellbrink (Luisehahne) +# securtiy fix in class.login +# see http://www.websitebaker2.org/forum/index.php/topic,20347.msg137554.html#msg137554 +29 Dec-2010 Build 1366 Dietmar Woellbrink (Luisehahne) +# fixed showing system_default for search_template +29 Dec-2010 Build 1365 Dietmar Woellbrink (Luisehahne) +! added some functions +! set status to 2.8.2 RC3 +29 Dec-2010 Build 1364 Dietmar Woellbrink (Luisehahne) +! added function 'db_update_key_value()' +29 Dec-2010 Build 1363 Dietmar Woellbrink (Luisehahne) +# Ticket #1053, Ticket #941 show_breadcrumb +29 Dec-2010 Build 1362 Dietmar Woellbrink (Luisehahne) +! additional functions added in class.database +28 Dec-2010 Build 1361 Dietmar Woellbrink (Luisehahne) +! sync languages files with 2.9.0.dev +! unzip addons now overwrite newer files +28 Dec-2010 Build 1360 Dietmar Woellbrink (Luisehahne) +! show_menu2 display Title-attribute fixed +! tooltip added, change modul version to 4.9.5 +28 Dec-2010 Build 1359 Dietmar Woellbrink (Luisehahne) +! upgrade FCKeditor to Version 2.6.6 +28 Dec-2010 Build 1358 Dietmar Woellbrink (Luisehahne) +! validation fixes in pages backend theme +27 Dec-2010 Build 1357 Frank Heyne (FrankH) +# security fix: in path admin/pages/ - added FTAN check +! had to enhance parameter for getFTAN() in framework/class.secureform.php +27 Dec-2010 Build 1356 Dietmar Woellbrink (Luisehahne) +# more little fixes in settings +! change to RC2 +27 Dec-2010 Build 1355 Frank Heyne (FrankH) +# security fix: remaining vulnerabilities mentioned in http://secunia.com/secunia_research/2010-90/ +# security fix: in path admin/templates/ - added FTAN check +# security fix: in path admin/settings/ - added FTAN check +26 Dec-2010 Dietmar Woellbrink (Luisehahne) ++ added admin/images +# fixed save handling settings entries +! local sync +26 Dec-2010 Build 1353 Frank Heyne (FrankH) +# security fix: in modules/admin.php - check whether section belongs to page +! security fix: changed $section_required into $no_section_required (apparently used by no module at all) +# security fix: in path admin/users/ - added FTAN check +# security fix: remaining vulnerabilities mentioned in http://secunia.com/secunia_research/2010-91/ +# security fix: vulnerabilities mentioned in http://secunia.com/secunia_research/2010-92/ +# security fix: remaining vulnerabilities mentioned in http://secunia.com/secunia_research/2010-93/ +21 Dec-2010 Dietmar Woellbrink (Luisehahne) +# fix if upgrade module can now overwrite existing newer files in modules folder +# same for upgrade templates +21 Dec-2010 Dietmar Woellbrink (Luisehahne) +# XHTML output fixed in show_menu2 +20 Dec-2010 Dietmar Woellbrink (Luisehahne) +# syntaxfix in initialize.php +19 Dec-2010 Dietmar Woellbrink (Luisehahne) ++ add ini_set('display_errors', 1) (Tks to Thorn) +! update headerinfos +17 Dec-2010 Dietmar Woellbrink (Luisehahne) +# fix save access rights in settings +23 Nov-2010 Dietmar Woellbrink (Luisehahne) +# fix Droplet LoginBox fronend_signup (tks to Maverik) +# fix save user e-mail, +12-May-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #999 wrong sql statement in admin/pages/index.php (Tks to Lucutus) +12-May-2010 Dietmar Woellbrink (Luisehahne) +- remove unneeded flags in backend themes +- remove admin/images +11-May-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #1004 Small typofixes needed in FR lang file (Tks to quinto) ++ Ticket #1005 add FR Language for the admin templates (Tks to quinto) +06-May-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #998 fix German language file from mixture of du and Sie (Tks to Erpe) +02-May-2010 Dietmar Woellbrink (Luisehahne) +! remove some unneeded code in backend themes templates +! see forum: JQuery und Backend-Theme +02-May-2010 Dietmar Woellbrink (Luisehahne) +! add lang variable for new userform +02-May-2010 Dietmar Woellbrink (Luisehahne) +! added IdKey to class secureForm +30-Apr-2010 Dietmar Woellbrink (Luisehahne) +! changes Backend javascripts from body to head +28-Apr-2010 Dietmar Woellbrink (Luisehahne) +! insert modulename in sections, even for missing module, you can style it with class selector: module_disabled +27-Apr-2010 Dietmar Woellbrink (Luisehahne) ++ add an extra class class.secureform.php and extends it to class.wb.php +! check for installed modules before loading in content +27-Apr-2010 Dietmar Woellbrink (Luisehahne) +! remove forgotten debug line +27-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Fixed update search settings +# Fixed bug in /modules/admin.php +22-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Fixed bug in /modules/admin.php +22-Apr-2010 Dietmar Woellbrink (Luisehahne) +! start recoding without style display:none +21-Apr-2010 Dietmar Woellbrink (Luisehahne) +! Ticket #995 update jquery-ui.css and images (Tks to Ruebenwurzel) ++ add languages files for jquery datepicker (tks to Ralf) +! Ticket #994 WYSIWYG editors sorted by name (tks to Aldus) +20-Apr-2010 Dietmar Woellbrink (Luisehahne) +! update class.login.php (tks to Ruud) +19-Apr-2010 Dietmar Woellbrink (Luisehahne) +! update class.login.php +18-Apr-2010 Dietmar Woellbrink (Luisehahne) +! Validation fix in preference +18-Apr-2010 Dietmar Woellbrink (Luisehahne) +# fixed directory_list +17-Apr-2010 Dietmar Woellbrink (Luisehahne) +! litte fix to show GMT value in default view +! fixed file_list +15-Apr-2010 Dietmar Woellbrink (Luisehahne) +! Update headerinfos admin/interface +14-Apr-2010 Dietmar Woellbrink (Luisehahne) +# changed e-mail notification for backend login +! styling in preference.htt in themes +14-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Typo fixes with german umlaute +14-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #985 With #1318 no login in backend possible +# Ticket #986 Typo inside the german language file +# Ticket #982 Unnessesary heredoc causes on errors while installation! +# Ticket #926/Ticket #928 Mail Notification on new user registration +14-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #984 Removing outdated comment-block in class.login.php +# Ticket #983 Sorting order of modules and templates inside groups.php +14-Apr-2010 Dietrich Roland Pehlke (Aldus) +# Ticket #982 - Wrong use of heredoc-syntax in some language-files (BG, CS and HR) breaks the installation-process. +14-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #974 Usability bug in /preferences +14-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #976 Using md5 also for the username inside class.login.php +14-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #977 Templates sorted in alphabetical order +14-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #978 Add additional PHP 5.2 check to installation +# Ticket #979 False PHP 4 requirements in install +# Ticket #980 Usebility - Bug in the settings-interface +# Ticket #981 typos in backend-theme "argos" in file groups.htt +11-Apr-2010 Dietmar Woellbrink (Luisehahne) +# fix ticket #975 some weird /pages/ header infos +11-Apr-2010 Dietmar Woellbrink (Luisehahne) +! little fixes for backwards compatible PHP4, pls test +11-Apr-2010 Dietmar Woellbrink (Luisehahne) +! show_menu2 remove unneeded code for WB < 2.7 +! class.wb.php, recoding backend preference ++ add a language variable $MESSAGE['PREFERENCES']['INVALID_CHARS'] +! update theme.css for preference.htt in argos_theme & wb_theme +- remove classic_theme +07-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #971 Using $_POST in Admin - account - login.php (tks to Aldus) +! update class.wb.php added tokens function +07-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #967 Typo in the mysql-query results in "not" upgrading the modul info ( tks to Aldus) +01-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Ticket 963 Minor XSS issue in admin login +! update jquery-ui-min.js from 1.7.2 to 1.8.0 +# Fixed typo in the english language file +26-Mar-2010 Dietmar Woellbrink (Luisehahne) +! update changelog +26-Mar-2010 Dietmar Woellbrink (Luisehahne) +- remove deprecated backup modul +19-Mar-2010 Dietmar Woellbrink (Luisehahne) +! rework admin/pages/save.php so that modules can use it +! fixed missing global install variable to work in modules +17-Mar-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #957 Wrong status returned for visibility +17-Mar-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #956 Useraccounts, now e-mail is required +09-Mar-2010 Dietmar Woellbrink (Luisehahne) +# Fixed e-mail preg pattern, because issues with some php versions +07-Mar-2010 Dietmar Woellbrink (Luisehahne) +# fixed search_modext.php ( Tks to Thorn ) +# Ticket #953 is already fixed +# Ticket #954 styles issues in theme.css ( Tks to Ruebenwurzel ) +07-Mar-2010 Dietmar Woellbrink (Luisehahne) +# Tickets #932 change deprecated eregi functions +# Tickets #948 fixed Multiple use of same parametrised droplet - parameter handling +! Upgrade Droplets to Version 1.0.3 +! update some headerinfos +! non existing pages will be created if clicking save in page settings +07-Mar-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #950 missing classes in theme.css ( Tks to Ruebenwurzel ) +! update jquery-min.js to version 1.4.2 +20-Feb-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #944 fixed double sections, with registered User +20-Feb-2010 Dietmar Woellbrink (Luisehahne) +# fix corrupted changelog +20-Feb-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #945 fixed reloads function +19-Feb-2010 Dietmar Woellbrink (Luisehahne) +! update headerinfo in module droplets +19-Feb-2010 Dietmar Woellbrink (Luisehahne) +! Beginning with Ticket #901 ++ add siteadd.png to backend themes +! change icon add child page +19-Feb-2010 Dietmar Woellbrink (Luisehahne) +! update headerinfo +! change $search_pattern for check if Javascript mailto encryption is enabled +! module output_filter set to version 0.12 +19-Feb-2010 Dietmar Woellbrink (Luisehahne) +! change show_menu2 to correct modul version 4.9 +19-Feb-2010 Dietmar Woellbrink (Luisehahne) +! insert $wb->preprocess($output), preprocess no longer needed in modules +! little modifaction in upgrade-script.php in function check_wb_tables +! updated module wysiwyg, set to module version 2.8 +19-Feb-2010 Dietmar Woellbrink (Luisehahne) +! recoded function extract_permission in /framework/functions.php +! change URL_HELP to http://www.websitebaker2.org/ in /framework/class.admin.php +! recoded function preprocess in /framework/class.frontend.php +! optimize function getVersion in /framework/addon.precheck.inc.php +19-Feb-2010 Dietmar Woellbrink (Luisehahne) +! change constant EDIT_ONE_SECTION to default false +------------------------------------- 2.8.1 ------------------------------------- +08-Feb-2010 Dietmar Woellbrink (Luisehahne) +! missunderstanding back to old logo +08-Feb-2010 Dietmar Woellbrink (Luisehahne) +# Droplet emailfilter fixed search mdcr.js +! some little fixes in upgrade-script ++ new WebsiteBaker Logo in themes +05-Feb-2010 Dietmar Woellbrink (Luisehahne) +! Fixed wrong themes path in jquery_theme.js, that plugins works correctly ++ images icons to run base theme +01-Feb-2010 Dietmar Woellbrink (Luisehahne) +! to hold content, install don't drop existing tables (code, form, menu_link, news, wrapper, wysiwyg) +! otherwise do it with uninstall +30-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #931 bug in admin/access/index.php +30-Jan-2010 Dietmar Woellbrink (Luisehahne) +! continue update headertext +! fixed tpyo Website Baker to WebsiteBaker in main language files +30-Jan-2010 Dietmar Woellbrink (Luisehahne) +! continue update headertext +# Ticket #930 disabled SyntaxHighlighter from default WB Installation +! change help url to www.websitebaker2.org +29-Jan-2010 Dietmar Woellbrink (Luisehahne) +! continue update headertext +28-Jan-2010 Dietmar Woellbrink (Luisehahne) ++ Ticket #927 news module language file in swedish +! update headertext +28-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #925 Slovak Lang Missing in allowed install languages! +28-Jan-2010 Dietmar Woellbrink (Luisehahne) +! update headertext +28-Jan-2010 Dietmar Woellbrink (Luisehahne) +! update jquery 1.4.0 to 1.4.1, +- removed include/jquery/plugins +! update backend themes +#24-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #923 argos_theme: Always Allowed Viewers in page_settings +# fixed css for pagetree to show in IE7 +24-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #921 fix issues in IE by using EditArea framework +23-Jan-2010 Dietmar Woellbrink (Luisehahne) +! Ticket #921 Update EditArea framework +! fix stylings wb_them +! fix upgradescript +23-Jan-2010 Dietmar Woellbrink (Luisehahne) +! update jquery to version 1.4, rename old one to jquery-min132.js +# fixed argos theme +22-Jan-2010 Dietmar Woellbrink (Luisehahne) +! continue update header info +22-Jan-2010 Dietmar Woellbrink (Luisehahne) +! set svn keywords +22-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #869 Droplet-Engine does'nt work in some case +! continue update header info +22-Jan-2010 Dietmar Woellbrink (Luisehahne) +! update header info +22-Jan-2010 Dietmar Woellbrink (Luisehahne) +! update fckeditor, forgotten to upload a file +22-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #917 Update backend themes +22-Jan-2010 Dietmar Woellbrink (Luisehahne) +! Ticket #909 WYSIWYG Editor width destroyes backend layout +! Set EDITOR_WIDTH to 0, This way backend theme developper +! can style the WYSIWYG Editor according to their themes. +22-Jan-2010 Dietmar Woellbrink (Luisehahne) +! Ticket #916 Update backend theme footer +21-Jan-2010 Dietmar Woellbrink (Luisehahne) +! updated YUI 2.4.1 to 2.8.0r4 +21-Jan-2010 Dietmar Woellbrink (Luisehahne) +! Beginning header information update +21-Jan-2010 Dietmar Woellbrink (Luisehahne) +# fix login_form.php sometimes produce javascript errors in IE +21-Jan-2010 Dietmar Woellbrink (Luisehahne) +# fix more small css-errors in WB Backend (thanks to Ruebenwurzel) +21-Jan-2010 Dietmar Woellbrink (Luisehahne) +! update header info +! change unknown user to guest in all languages +21-Jan-2010 Dietmar Woellbrink (Luisehahne) +! update info.php fckeditor +21-Jan-2010 Dietmar Woellbrink (Luisehahne) +# fix wrong settings in image browser dialog +21-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #912 fix Search Template bug +21-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #915 fix bug in search (utf-8 characters corrupted)(thanks to Thorn) +19-Jan-2010 Dietmar Woellbrink (Luisehahne) +# fix some more small css-errors in WB Backend (thanks to Ruebenwurzel) +19-Jan-2010 Dietmar Woellbrink (Luisehahne) +# removed wb_path as javascript var (thanks to Bianca) +19-Jan-2010 Dietmar Woellbrink (Luisehahne) +# fix some more small css-errors in WB Backend (thanks to Ruebenwurzel) +14-Jan-2010 Dietmar Woellbrink (Luisehahne) +# fixed snippets including frontend.css and frontend.js +# without register_frontend_modfiles +14-Jan-2010 Dietmar Woellbrink (Luisehahne) ++ Ticket #877 add slovak lang in Captcha and Advanced-Spam-Protection +14-Jan-2010 Dietmar Woellbrink (Luisehahne) +! update header +14-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #911 5. continue to fix CSS-errors in WB backend +14-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #911 4. continue to fix CSS-errors in WB backend +14-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #911 3. continue to fix CSS-errors in WB backend +14-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #911 2. continue to fix CSS-errors in WB backend +14-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #911 1. continue to fix CSS-errors in WB backend +13-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #911 Beginning to fix More CSS-errors in WB backend ++ add SVN- Revision to backend theme +12-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #906 Search Template bug +! update editor min width, dragableresize table +12-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #907 js files in backend themes are stored at wrong places ++ add include/jquery/plugins/toggle_zip.js +- removed toggle_zip.js in backend themes +12-Jan-2010 Dietmar Woellbrink (Luisehahne) +# fix open_basedir restriction in effect in save_post.php +11-Jan-2010 Dietmar Woellbrink (Luisehahne) +! fix load_module, load_language (tks to Webbird) +11-Jan-2010 Dietmar Woellbrink (Luisehahne) +! Ticket #904 fix if templatename is equal language +11-Jan-2010 Dietmar Woellbrink (Luisehahne) +! Ticket #905 fix search.php 'registered' hardcoded +10-Jan-2010 Dietmar Woellbrink (Luisehahne) +! Ticket #903 fix CSS-errors in WB backend +! add title class in show_breadcrumbs, now full css styling +05-Jan-2010 Dietmar Woellbrink (Luisehahne) +! recoded function show_breadcrumbs +30-Dec-2009 Dietmar Woellbrink (Luisehahne) +# fix Warning: stristr() [function.stristr] +29-Dec-2009 Dietmar Woellbrink (Luisehahne) +! set revision constant to release version +29-Dec-2009 Dietmar Woellbrink (Luisehahne) +! update release version +28-Dec-2009 Dietmar Woellbrink (Luisehahne) +# fix show date if only short content +28-Dec-2009 Dietmar Woellbrink (Luisehahne) +! check if load only one wysiwyg instance +! check update svn revision +28-Dec-2009 Dietmar Woellbrink (Luisehahne) +# fix syntax error +28-Dec-2009 Dietmar Woellbrink (Luisehahne) +! update header, check that all tables in WB package are installed +28-Dec-2009 Dietmar Woellbrink (Luisehahne) +! update header, change variable +28-Dec-2009 Dietmar Woellbrink (Luisehahne) +! update header +28-Dec-2009 Dietmar Woellbrink (Luisehahne) +! update header +28-Dec-2009 Dietmar Woellbrink (Luisehahne) +! validate code +28-Dec-2009 Dietmar Woellbrink (Luisehahne) +! change page_title to menu_title in dropdown list +! validate code +23-Dec-2009 Dietmar Woellbrink (Luisehahne) +! check if revision $id will be updated +21-Dec-2009 Moritz Stapelfeldt +# Ticket #896: Bugfix in framework/functions.php > added test is_dir to function rm_full_dir +16-Dec-2009 Ruud Eisinga +# Ticket #894: Bugfixes in newsmodule > rss.php +16-DEC-2009 Manuel Lang (MaGnaL) +# Minor bugfixes: Use localized messages in preference forms on frontend and backend, + correct html/php syntax in upgrade-script.php and NL localization of show_menu2 snippet +14-DEC-2009 Manuel lang (MaGnaL) +# Ticket #832: Fix wrong configuration of timezone-handling when saving + preferences-form on backend and frontend +12-DEC-2009 Manuel Lang (MaGnaL) +# Ticket #827: Fix false form-parameter when javascript is deactivated + on users and groups temps (admintool). +12-DEC-2009 Manuel Lang (MaGnaL) +# Bugfix of rev. 1211 search_modext.php (ticket #863): Use isset and + given unknown-user instead of counting all users. +12-Dez-2009 Dietrich Roland Pehlke (Aldus) +# Bugfix inside "search_modext.php" to avoid warings if the search found + a page last modified by a user witch has been deleted. (ticket #863) +03-Dez-2009 Dietmar Woellbrink (Luisehahne) +! Ticket #890 fixed visability proprty uses non valid value 'none' +03-Dez-2009 Dietmar Woellbrink (Luisehahne) +! change searchstring mdcr.js, workout crypt emails in output_filter/filter-routines.php +! comment out ob_end_flush line 259 in form/view.php +02-Dez-2009 Dietmar Woellbrink (Luisehahne) +! next step to validate backend themes +01-Dez-2009 Dietmar Woellbrink (Luisehahne) +! add Revision IDs to added files - Thanks to Ruebenwurzel +01-Dez-2009 Dietmar Woellbrink (Luisehahne) +! updated pclzip class +29-Nov-2009 Dietmar Woellbrink (Luisehahne) +! update module info.php (thanks to Waldschwein) +29-Nov-2009 Dietmar Woellbrink (Luisehahne) +! added missing swobject plugin in FCKeditor +! bug fixed in flvplayer +29-Nov-2009 Dietmar Woellbrink (Luisehahne) +! stop working plugin flvplayer in FCKeditor until fixed +29-Nov-2009 Dietmar Woellbrink (Luisehahne) +! fixed an undefined index in settings.php +28-Nov-2009 Dietmar Woellbrink (Luisehahne) +! Update FCKeditor Version 2.6.5 to Modulversion 2.9.3 +28-Nov-2009 Dietmar Woellbrink (Luisehahne) +! updated theme.css in wb_theme +28-Nov-2009 Dietmar Woellbrink (Luisehahne) +! Ticket #886 fix validation email, check tld between 2-4 letters +28-Nov-2009 Dietmar Woellbrink (Luisehahne) +! Ticket #874 add slovak lang in install + and validate output +28-Nov-2009 Dietmar Woellbrink (Luisehahne) +! Ticket #880 fixes language file SK.php +28-Nov-2009 Dietmar Woellbrink (Luisehahne) +! Ticket #828 fix deprecated eregi +27-Nov-2009 Dietmar Woellbrink (Luisehahne) +! fixes language file SK.php +27-Nov-2009 Dietmar Woellbrink (Luisehahne) +! fixed parse error ticket #878 +26-Nov-2009 Dietmar Woellbrink (Luisehahne) +! found and fix some deprecated functions +26-Nov-2009 Dietmar Woellbrink (Luisehahne) +! validate some output files +26-Nov-2009 Dietmar Woellbrink (Luisehahne) +! fix some PHP 5.3 deprecated functions +25-Nov-2009 Dietmar Woellbrink (Luisehahne) +! Fix to load edit_full_area only if needed +25-Nov-2009 Dietmar Woellbrink (Luisehahne) +! change page_title to menu_title for parent dropdown list in index.php and sections.php +25-Nov-2009 Dietmar Woellbrink (Luisehahne) +! more bug fixes language file SK.php +25-Nov-2009 Dietmar Woellbrink (Luisehahne) +! Many hosts disable error_log() in various and sundry ways. + In WB we do something like this to avoid triggering warnings and errors. + Even this is sometimes not sufficient to avoid problems with some hosts, but accommodates most. +25-Nov-2009 Dietmar Woellbrink (Luisehahne) +! fix show_menu2 include.php, page crashes, if php error_log is disabled +25-Nov-2009 Dietmar Woellbrink (Luisehahne) +! fixes language files HU.php and SK.php +24-Nov-2009 Dietmar Woellbrink (Luisehahne) +! fixed php 5.3 depricated function in show_menu2 +24-Nov-2009 Dietmar Woellbrink (Luisehahne) ++ add two constants in /framework/initialize.php for later feature in database settings ++ define('EDIT_ONE_SECTION', true) to edit only one section with editor in manage sections + modify page will be loading all sections with editor ++ define('EDITOR_WIDTH', 900) set min width for editor ++ adding more information in editor header 1) block 2) module 3) section_id +24-Nov-2009 Dietmar Woellbrink (Luisehahne) ++ add register_frontend_modfiles('jquery'); adds jquery basis scripts in head ++ add register_frontend_modfiles_body('jquery'); adds jquery basis scripts before body end ++ add jquery_theme.js to choose a ui theme, basis is loaded, can be change +24-Nov-2009 Dietmar Woellbrink (Luisehahne) ++ add a child page is cumbersome when the parent dropdown list gets to be too large. (Ticket #821) +24-Nov-2009 Dietmar Woellbrink (Luisehahne) +! validate captcha control +13-Oct-2009 Ruud Eisinga +# fixed breaking droplets by highlighting search-words in search result pages. +13-Oct-2009 Dietmar Woellbrink (Luisehahne) ++ added forgotten jquery-fancybox.js Version 1.0 +13-Oct-2009 Dietrich Roland Pehlke (Aldus) +# Fixed typo in the finnish language file (ticket #814). +12-Oct-2009 Dietmar Woellbrink +! security update FCKeditor (tks to Ruebenwurzel) +12-Oct-2009 Dietmar Woellbrink ++ added old version of fancybox.js +! rename new version fancybox ++ added missing language variables in newsmodul +12-Oct-2009 Dietmar Woellbrink +# fixes Bugs headersend errors in some core files +12-Oct-2009 Dietmar Woellbrink +! update function show_bread_crumb in framework/frontend.functions.php +! replace separator with entities char, add title for multilingual +! set breakcrumb in div container class="breadcrumb" +! set separator in span tag class="separator" +12-Oct-2009 Dietmar Woellbrink +! update jquery fancybox from 1.0 to 1.2.1 ++ fancybox imagefolder incl. fancybox.css +12-Oct-2009 Dietmar Woellbrink +! shows more details in wysiwyg editor +10-Oct-2009 Dietmar Woellbrink +! small update upgrade.php to reset newsfiles to created dates +10-Oct-2009 Dietmar Woellbrink +! Update FCKeditor to Version 2.6.5 Modulversion 2.9.1 +09-Oct-2009 Dietmar Woellbrink +! Update FCKeditor to Version 2.6.5 Modulversion 2.9.1 +09-Oct-2009 Dietmar Woellbrink ++ upgrade.php to reset newsfiles to created dates +09-Oct-2009 Dietmar Woellbrink +# Ticket #770, #785, #792, #807, #809, +# fixes and recoded news module +09-Oct-2009 Dietmar Woellbrink +# Ticket #815 Fix Warning: open_basedir restriction in effect. File is in wrong directory in load_module +# same fix to load_template +07-Oct-2009 Dietrich Roland Pehlke +# Missing contiue inside search.php to avoid access to an non-object if the query fails. (ticket #793). Thanks to Thorn. +06-Oct-2009 Dietmar Woellbrink +# Security fix - wrong placed "exit()" inside class.wb. +22-Sep-2009 Dietmar Woellbrink +# Fixed: Pagetree changed menu titles instead of page titles (ticket #805) thanks to Ralf (Berlin) +21-Sep-2009 Dietrrich Roland Pehlke +! Dutch tranlation(-s) for the captcha-control. [Ticket: #777] (Thanks to Argos) +# Missing code inside "framework/addon.precheck.php" (ticket #798). +# Changes inside "upgrade-script" to avoid "mysql_list_tables is deprecated" warnings (ticket #800). +# Add "global $admin" to the install.php of the droplets-module to avoid (variable isn't declared) warnings. (ticket #800). +18-Sep-2009 Dietmar Woellbrink +# french translation updated for WB 2.8 (tks to Ploc) +16-Sep-2009 Dietmar Woellbrink +# Fixed bug changed URL_HELP in class.admin.php to http://help.websitebaker.org/ (ticket #801). +# Fixed bug: inside the FCK-Editor wbmodul: missing 'OK' button when inserting WB link with Safari/Chrome (ticket #795). +# Fixed bug changed png fix and path to jquery-pngFix.js inside footer.htt for backend themes (ticket #786). +# Fixed bug: inside the FCK-Editor include.php: add $oFCKeditor->Width = $width; (ticket #799). +15-Sep-2009 Dietrich Roland Pehlke +# Fixed bug: group-restrictions and sections (ticket #791). +# Fixed bug inside the FCK-Editor wbmodul: displaying the correct page-tree by + adding "order by position" +25-Aug-2009 Dietrich Roland Pehlke +# Fixed bug in upgrate-script. Constant 'DEFAULT_THEME' doesn't exists (ticket #784). +25-Aug-2009 Ruud Eisinga +# Fixed bug in droplets. Multiple droplets with the same parameter did not extract the new parameter. + (problem introduced by code optimisations for WB2.8) +# Fixed usage of the depriciated (PHP 5.3.0) split() function in class.wb. (ticket #772) +# Fixed notice ob_end_clean..failed to delete buffer. (ticket #779) +22-Aug-2009 Ruud Eisinga +# Changed the default searchform name in the installer. (ticket #775) +# Fixed the recursive redirect problem when a page is called with a wrong language parm (ticket #780) +------------------------------------- 2.8.0 ------------------------------------- +14-Aug-2009 Matthias Gallas +# Fixed typo in dutch language file (Thanks to Argos) +# Changed FCKEditor to not show index.php files in browse media window (ticket #774) + (Thanks to BerndJM) +12-Aug-2009 Matthias Gallas +# Fixed some display issues in all backend themes +! Again updated dutch language file (Thanks to Argos) +# Fixed missing language variable in form modul (Thanks to Argos) ++ Added missing images to argos_theme (forgotten in changeset [1117]) +11-Aug-2009 Matthias Gallas +! commentet out the droplets logo for a more similar backend design with + other admin tools +! Updated icons in argos_theme (Thanks to Argos) +! Updated Dutch language file (Thanks to Argos) +! Updated show_menu2 to version 4.9 +9-Aug-2009 Matthias Gallas +# Replaced function mime_content_type as the old one causes shell_exec warnings + on some servers (Thanks to Aldus) +! updated argos_theme to version 1.4 (Thanks to Argos) +! some code cleaning of admin/pages/sections.php +# Fixed possible xss injection in login/forgot/index.php +# Fixed bug in news modul introduced in changeset [1057] +# Added missing variables also to preferences.php. Forgot in Changeset [1112] +8-Aug-2009 Matthias Gallas +# Added some missing variables to backend_themes (Thanks to Stefek) +6-Aug-2009 Matthias Gallas +! Set Version to 2.8 +! Updated upgrade_script to make use of the changed news settings ++ Added to show_menu2 the aOption 'SM2_HIDEPAGES'. If set all hidden pages are + hidden again (Thanks to DarkViper) +# Fixed again some bugs in news modul (ticket #756) (Thanks to Aldus and Luisehahne) +# Fixed bug that frontend.js, frontend.css and frontend_body.js are not used + from snippets (ticket #764) (Thanks to Luisehahne) ++ Added new function 'register_frontend_modfiles_body' to default templates ++ Added option to use a frontend_body.js in modules to include javascript from modules + in the body of the frontend (Thanks to Luisehahne) +! Updated Danish language Files (Thanks to Achrist) +# Fixed some display issues in argos_theme (Thanks to Argos) +30-July-2009 Ruud Eisinga (Ruud) +# Fixed a bug in the /admin/media resizer parameters for dirs with whitespaces (thnx to tiesy) +# Fixed a bug in FCKeditor include.php. Now the editor can be used from other + subdirectories than WB_PATH/modules/mymodule +29-July 2009 Dietrich Roland Pehlke (Aldus) +# changes in framework/class.wb.php to avoid the "print->footer()" bug in the frontend, + as this function/method doesn't exists for the frontend. +# Changes inside index.php and save.php in settings to get rid of the situation + that a SMTP-Password could not contain an "<" char (right chars are craped), + and also "<" is not transformed into an entitie "<". (Thanks to FrankH) +# Modify of "addon.precheck.inc.php" to get rid of the problematic that version_compare + could faild if words like "alpha", "beta" are inside a version-string. (missing in changelog 1100) +28-July 2009 Matthias Gallas +# fixed some smaller issues in rss.php (Thanks to Kibmcz) +27-July 2009 Matthias Gallas ++ Added German language file to droplets ++ Added modul_description to language files of droplets ++ Added Danish language files to modules (Thanks to Achrist) +! Updated Danish language file (Thanks to Achrist) +# Fixed improper spelling in language files (#754) +# Fixed bug introduced in changeset [1092] +25-July 2009 Matthias Gallas +# fixed some language bugs in search.php (Thanks to Thorn) +23-July 2009 Matthias Gallas +# fixed bug with missing filetype icon in media section of classic_theme (ticket #752) +# fixed bug with page not showing if 2 sections active (ticket #751) (Thanks to Pumpi) +# readded to phplib/template.inc $clear: whether to delete undefined vars or not + was already added in WB 2.7 but was deleted for unknown reasons (Thanks to FrankH) +22-July 2009 Matthias Gallas +! set Version to RC2 +! small modification on german language file (ticket #746) +# Fixed E_ALL&E_STRICT warning on PHP5 servers (Thanks to Aldus) +# Fixed bug with home folders are viewable and writable from other users + (ticket #605 and #748) (Thanks to Aldus) +20-July 2009 Matthias Gallas +! Moved backend.js back from to ++ Added possibility to add a backend_body.js to modules wich is then called in ++ Readded admin/images folder to keep backward compatibility to old modules +19-July 2009 Matthias Gallas +# Fixed display issue of jsadmin in backend themes (Thanks to Argos) +18-July 2009 Matthias Gallas +! Updated german laguage file in argos_theme ++ Added multilnaguage support to media section of argos_theme (Thanks to Argos) +# Fixed smaller display issue in argos_theme (Thanks to Argos) ++ Added more meta tags to backend themes +! Updated Argos_theme (Thanks to Argos and Luisehahne) +# Again added some & to news and form to get more valid output (Thanks to Luisehahne) +# Fixed wrong set tag to get valid output (Thanks to Luisehahne) +! Replaced in some alt tags hardcoded signs with language variables (Thanks to argos) +! Updated Dutch language File (Thanks to argos) +! Updated French language File (Thanks to mylesk42) +16-July 2009 Matthias Gallas +# Fixed E_ALL notice in news/view.php +! replaced in form and news delimiter "&" with "&" + was introduced with changeset [1069] but didn't work on all servers +# Removed double tags in pages/intro.php and wysiwyg/modify.php +! replaced all remaining mktime() with time(), except from third party scripts +15-July 2009 Matthias Gallas +! changed in modules/admin.php and admin/pages/add.php mktime() to time() +! changed in wrapper modul modify.html to modify.htt +# Fixed some validiation bugs in core and different modules (Thanks to luisehahne) +# fixed display issue of jscalendar in news modul (Thanks to Aldus) +! changed modules/admin.php to also make use of backend theme templates +! changed in class_login.php mktime() to time() +14-July 2009 Matthias Gallas +# Fixed bug with sections are only editable in new backend-themes if blocks are enabled + (Thanks to Luisehahne) +# Fixed some validiation bugs in news modul (ticket #742) (Thanks to Luisehahne) +14-July 2009 Dietrich Roland Pehlke +! changes in frontend.functions.php, line 323: 'date' to 'gmdate' to avoid E_STRICT warnings. +! changes in wb-setup.php, line 50: 'date' to 'gmdate' to avoid E_STRICT warnings. See also #741. +13-July 2009 Matthias Gallas ++ added changes from news/add.php to the upgrade-script.php +13-July-2009 Ruud Eisinga +# admin / media / browse reported an error in E_STRICT mode. +13-July 2009 Dietrich Roland Pehlke +! Change inside "date_formats.php" and "time_formats.php" mktime() within time() + to avoid warnings and strict messages. See #741. Minor cosmetic changes. +# News-Modul: add the unlink-routine for the ".news" folder inside uninstall.php + so the groupe-images are also unlink. +! News-Modul: add and -tags to the "none found" part in the view.php to + get valid output inside a table. +! Change the setting of $display_image and $display_groupe to avoid the + empty display roule problematic () for valid output. +! Add >> in "add.php" instead of >> to avoid invalid output. +11-July-2009 Ruud Eisinga +! The news module post_title link made unclickable when there is no full post. +11-July-2009 Matthias Gallas ++ Added changed news settings to upgrade-script +09-July-2009 Ruud Eisinga +! Added a better option to hide the READ_MORE link in the news module. (ticket #739) +09-July-2009 Matthias Gallas +# Fixed bug that backend.js is not loaded in backend themes (ticket #740) +# Fixed wrong path to unitpngfix.js and added missing script +# Fixed invalid output of page_sections Page in Backend (Thanks to Luisehahne) +08-July-2009 Matthias Gallas ++ Added PageID and SectionID to all backend themes (Thanks to Luiseshahne) +# Fixed some display issues in all backend themes (Thanks to Luisehahne) +! Replaced wbmodules.gif in FCKEditor Plugins (Thanks to Stefek) +08-July-2009 Dietrich Roland Pehlke +! Removed unused marker {USERS} inside the "groups.htt" of the wb-theme. +! admin -> users -> index.php +! admin -> groups -> index.php + Codechanges using blocks to avoid to generate the "switch"-link right-top, + if the user has no permission to edit the other one. +! wb_theme|classic_theme|argos_theme -> templates -> users.htt +! wb_theme|classic_theme|argos_theme -> templates -> groups.htt + Add block-comments +! admin -> addons -> index.php codechanges +! admin -> access -> index.php codechanges + Codechanges to get rid of the empty display(style) declaration "style='display: ;'", + and to avoid to generate (hidden) elements if the user isn't alowed to edit one. +! wb_theme|classic_theme|argos_theme -> templates -> addons.htt +! wb_theme|classic_theme|argos_theme -> templates -> access.htt + add block-comments +# Bugfix inside wb/admin/groups/get_permissions.php - replacing wrong "AND" within "OR" in line 64 + if one checkbox of "user" or "group" is selected (like in line 178; advanced settings). +07-July-2009 Matthias Gallas +# Fixed some minor bugs in argos_theme (Thanks to Argos) +# Fixed bugs in admin additons for argos_theme (Thanks to Argos) +! Updated Version Number in upgrade_script to 2.8RC1 +! Updated FCKEditor Modul Version Number to 2.89 ++ added in FCKEditor Advisory Relation to Links (thanks to Luisehahne) +06-July-2009 Matthias Gallas +! Updated FCKEditor to Version 2.6.4.1 (ticket #738) (Thanks to doc) +# Fixed Backend-Themes to get more valide output (Thanks to Luisehahne) ++ Added argos_theme ++ Added new functions to admin dir (Thanks Argos and Ruud) +! Updated install and upgrade-script +! Adapted wb_theme and classic_theme to changed admin dir files +04-July-2009 Dietrich Roland Pehlke +! FCK-Editor Modul: Droplet Select: change "page_list_block" to "droplets_list_block", + also "cmbPages" to "cmbDroplets" as we are listen droplets not pages. +! Remove unneeded empty lines and spaces/blanks; + minor cosmetic changes in the source to keep the string more readable. +04-July-2009 Matthias Gallas +! Replaced droplet icon for FCKEditor Toolbar (thanks to Stefek) +# Fixed two bugs in droplets-plugin for FCKEditor (thanks to Aldus) +! Changed Template from FCKEditor plugin WBModules to .htt ++ Added Droplets plugin to FCKEditor (ticket #737) (Big Thanks to vizmotion) +03-July-2009 Matthias Gallas ++ Fixed IE Bug in Wrapper modul (ticket #736) +03-July-2009 Ruud Eisinga +# Fixed the wrong handling of htmlentities in Droplet parameter parsing +02-July-2009 Matthias Gallas ++ Added missing fancy_progress.png +01-July-2009 Matthias Gallas +# Fixed backend display issues in IE6 and IE7 +! Set Version to WB2.8RC1 +! Minor tweaks in pages_sections.htt ++ Added posibility to upload and unzip .zip packages to media section + (Thanks to BerndJM) +! Updated Browse Media Window in wb_theme now supports file icons, more file + informations and a new preview function (Thanks to BerndJM) +29-June-2009 Matthias Gallas +# Replaced in FCKEdiotor folder all index.html with index.php (ticket #691) +! Update PHPMailer to version 2.0.4 (ticket #733) +! Update Editarea to version 0.8.1.1 (ticket #732) +! Update JQuery UI to version 1.7.2 (ticket #731) +27-June-2009 Ruud Eisinga +# Fixed email encryption bug in output filter. Introduced by adding droplets. + (Thanks to Luisehahne) +25-June-2009 Matthias Gallas ++ Added missing admin/settings/setting.js +! Changed name of classic theme from "classic" to "classic_theme" ++ Added output-filter warning to all language files +# Fixed admintool jsadmin to get XHTML valid output (Thanks to Luisehahne) +# Major fixes on backend to get XHTML valid output (Thanks to Luisehahne) ++ Added option to use also MYSQL_ASSOC and MYSQL_NUM with mysql_fetch_array + (Thanks to Luisehahne) +# Bugfix for Error-Level settings (Thanks to Luisehahne) +23-June-2009 Matthias Gallas +# Moved styles from admin/pages/sections.php to sections.htt in backend themes + (Thanks to Luisehahne) +! Moved javascript files from admin/pages/index.php to external js files + (Thanks to Luisehahne) +# Major improovements and changes to all backend files to get more valide Code + output (Thanks to Luisehahne) +22-June-2009 Matthias Gallas +# fixed wrong position id when adding a new page +- removed obsolete code/modify.html +22-June-2009 Dietrich Roland Pehlke +# Changes on module "code": add the section_id to the name of the textarea, + to keep the functionality if you are using more than one code-section on a page. +! Moving the html-template inside a "htt" folder and rename the suffix to ".htt" to + keep it consitant to other modules. Minor cosmetic changes inside the code. +22-June-2009 Ruud Eisinga +# Fixed a bug in Menu_link module that made childpages of the menu_link page + not selectable. (thnx to Luisehahne) +21-June-2009 Matthias Gallas +# Fixed small bug introduced in changeset [999] +19-June-2009 Matthias Gallas +# Fixed bug that parent pages didn't inherit language settings to kind pages +17-June-2009 Ruud Eisinga +# Bugfix in "droplets/upgrade.php" - wrong parameter order for adding fields. + also the query for "normal" upgrades had a typo. +! Added warning in output_filter that the function will be removed in 2.9 +17-June-2009 Dietrich Roland Pehlke +# Bugfix in "droplets/upgrade.php" - wrong tablename change to the correct one ++ Add upgrade-script to droplets +! Changes on upgrade-script to avoid droping droplet-modul-tables if the exists. +! calling "upgrate.php" or "install.php" instead of hard-coded lines to avoid + future conflicts by upgrading the modul +15-June-2009 Matthias Gallas ++ Added install routine for droplets to the upgrade script +# Fixed bug in menu_link modul with wrong displayed pages tree (Thanks to thorn) +# Fixed small bug introduced in changeset [989] ++ Added missing id tags and copyright notices to droplets modul +15-June-2009 Dietrich Roland Pehlke (aldus) +# Bugfix for ticket #725 ++ Add "$wb->strip_slashes" again for backslashes are displayed in the output (view.php). ++ Add Droplets (Ruud) ++ modifications inside frontend.functions.php for backwart compatiblity (Ruud) ++ modifications inside the search to get the droplets seachable (Ruud) +14-June-2009 Dietrich Roland Pehlke (aldus) +# Bugfixes for (ticket #728) ++ Add additional constant to "install/save.php" to avoid conflikts during + installation inside "/framework/initialize.php". ++ Add condition inside "/framework/initialize.php" to avoid conflikts + during installation; table "mod_captcha_control" doesn't exsits at runtime. ++ Add test for tables inside "install/save.php" if the user uncheck "install table" option. ++ Additional Errormessage if nessesary tables are not found (english). +13-June-2009 Matthias Gallas ++ Added jQuery-insert.js and jQuery plugins (Thanks to Luisehahne) +! Moved images in lQuery plugins folder (Thanks to Luisehahne) +# fixed small german language issue in jscalendar (Thanks to Luisehahne) +26-May-2009 Matthias Gallas ++ Added jQuery(1.3.2) and jQueryUI(1.7.1) to WB core (ticket #708) +21-May-2009 Matthias Gallas +# Fixed some strange backend layout issues (ticket #722) +09-May-2009 Matthias Gallas ++ Added index.php to all WB-Theme folders to prevent directory spoofing +06-May-2009 Matthias Gallas +! Updated Norsk language File (Thanks to oeh) +# Fixed bug with not always included stylesheets in backend (ticket #717) +27-Apr-2009 Matthias Gallas +# Fixed bug with missing option for admin-tools in advanced view of access + settings (ticket #714) +# Fixed bug with backup fails if a user has only permissions to admin-tools (ticket #715) +# Fixed bug with missing template object in groups and user settings(ticket #716) +25-Apr-2009 Matthias Gallas +! Updated Dutch language files for modules (Thanks to LuckyLuke) +23-Apr-2009 Matthias Gallas +# Fixed bug with dropdownlist in pages settings (ticket #713) +20-Apr-2009 Matthias Gallas +! Update show_menu2 to version 4.8 (ticket #712) +# Fixed small error in Spain language file (ticket #711) +18-Apr-2009 Matthias Gallas +! Updated Dutch language file (Thanks to Luckyluke) +17-Apr-2009 Matthias Gallas +# Fixed MenuLink timeout with many large wysiwyg-pages (ticket #710) +! Updated again Norsk language File (Thanks to oeh) +! Updated Dutch language file (Thanks to Luckyluke) +13-Apr-2009 Matthias Gallas +# Fixed minor dispay issue in upgrade script +! Updated Norsk language File (Thanks to oeh) +! Updated French language files (Thanks to Quinto and VotreEspace) +! Updated Danish language file (Thanks to Achrist) +12-Apr-2009 Matthias Gallas +# Fixed not defined language variable in account/email.php (Thanks to BlackTiger) +# Fixed Typo in group_form.htt (ticket #705) +01-Mar-2009 Christian Sommer +! Added disclaimer to upgrade-script.php +28-Feb-2009 Christian Sommer +# Removed hardcoded admin path from JSAdmin module (jsadmin/js/dragdrop.js) +25-Feb-2009 Matthias Gallas ++ Added language support for template_description (affects templates and themes) +# fixed wrong path to images in news and form modul +# fixed manage section is showed twice (ticket #694) +- removed unneeded icons from wb_theme +- removed unneeded stylesheet.css from account dir +# renamed warning.htt to warning.html to fix display of sourcecode after invalid logins ++ added fixed error.htt also to classic theme ++ corrected info.php of news-modul +24-Feb-2009 Dietrich Roland Pehlke +! Changes in warning.htt templates to get valid XHTL1.1 output - replace the center-tag with div +# add "AND section_id='$section_id'" to the delete-query to avoid conflicts if there are more + than one Form on one single page. +# Modify error.htt template in wb_theme for valid XHTML1.1 output - replace the center-tag with a div + and replace the br-tag with valid p-tags. +22-Feb-2009 Matthias Gallas ++ added skinable Admin Interface +21-Feb-2009 Christian Sommer ++ added update of search table missing in Changeset 941 +# fixed wrong index in language array +! removed some comment lines (changes are tracked by SVN) +20-Feb-2009 Dietrich Roland Pehlke (aldus) +! add additional tr and td tags to the text_no_results message to get valid XHMTL output +19-Feb-2009 Christian Sommer +! addon overview to show advanced options after redirect from reload.php +# fixed bug if language folder contains none language files (XX.php) or sub folders ++ added option to invoke module upgrade.php/uninstall.php files from backend (for modules uploaded via FTP) +18-Feb-2009 Dietrich Roland Pehlke (aldus) +# fixed: typos in the section_id inside the action-link +! Remove test_trash and unused variables in query, added suggetions from #588 +# Bugfix for form bug (ticket #688) +17-Feb-2009 Christian Sommer ++ added option to invoke module install.php from backend (for modules uploaded via FTP) +! admin Add-on settings no hidden by default (can be set visible via advanced link) +16-Feb-2009 Christian Sommer +! moved reload option of Add-ons to main Add-on section +! reworked logout to reset possible remember key in database when logging out +15-Feb-2009 Christian Sommer +# fixed bug with smart login option (remember me) (ticket #689) +# special chars like   are shown when editing Add-on CSS files (ticket #678) +! redirect time for function print_success can now be defined in Settings (ticket #603) +- removed reload admin tool ++ added possibility to reload Add-ons via the Add-on section +14-Feb-2009 Christian Sommer +! added option to display current user name in backend template +# fixed wrong redirect path and added SVN Id +13-Feb-2009 Christian Sommer ++ added option to perform pre-installation checks to test requirements of Add-Ons +# added error messages to installation process for Add-Ons with wrong file type +08-Feb-2009 Christian Sommer +# fixed warning if database connection failed during installation process +06-Feb-2009 Christian Sommer +! fixed some typos in German language file (thanks to freeSbee) +! added new captcha fonts and replaced old background images with the ones created by thorn +05-Feb-2009 Christian Sommer +! mail text for register, signup and forgot mail now taken from WB language file (ticket #684) +02-Feb-2009 Christian Sommer +# removed PHPMailer fix introduced with 2.0.3 to get SMTP working again (line 1041 in class.smtp.php) +02-Feb-2009 Matthias Gallas +# Fixed bug wich causes that install of captcha-control may fail (ticket #682 thanks to thorn) +01-Feb-2009 Matthias Gallas +! Update FCKEditor to version 2.6.4 +22-Jan-2009 Christian Sommer +! Added default target attribut to backend menu links +21-Jan-2009 Matthias Gallas +! Copyright notices now includes 2009 +20-Jan-2009 Matthias Gallas +# fixed form-module select (multiple) doesn't work (ticket #681 Thanks to thorn) +17-Jan-2009 Matthias Gallas ++ added French languages to modules +! changed handling of post_date in news modul (thanks to susigross) ++ added hour and minute support to default published_when field in news modul +13-Jan-2009 Christian Sommer +- removed the obsolete Codepress framework from the include folder ++ added Javascript syntax highlighting framework EditArea as replacement for Codepress +! updated external PHPMailer class to latest version (v2.0.3) +08-Jan-2009 Christian Sommer +# fixed error message in admin class if type array not defined +05-Jan-2009 Dietrich Roland Pehlke +# Code-Snippets are no longer shown as type: unknown. ++ Additional key in the languagefiles "$TEXT['CODE_SNIPPET']"; +# fixed bug for the rss of news, see ticket #609 +04-Jan-2009 Matthias Gallas +# made news Modul multilingual, see ticket #676 (some additional translations are needed) +03-Jan-2009 Matthias Gallas +# fixed bug in view.php of news module (ticket #676 Thanks to susigross) +# fixed another bug in view.php of news modul introduced in changeset [892] +30-Dec-2008 Matthias Gallas ++ added default new language variables to all language files +- modul_uninstall: Removed undefined and unused constants (DB_FETCHMODE_ASSOC) +! modul_uninstall: added language variable $TEXT['FILE'] instead of "Datei" +29-Dec-2008 Dietrich Roland Pehlke ++ add language support for the errormessages inside the uninstall.php files for modules + and templates. +! add new keys inside the german de.php language-file. +- removed my own debugging-code (was in 893 by mistake) +! Correct the last date in the changelog +29-Dec-2008 Matthias Gallas +! set version to 2.8 BETA +# replaced in news modul special chars with entities to get valid output +! changed SESSION ID Separator from '&' to '&' to get valid output +- Removed the

tag around the news as it is added from the editor +28-Dec-2008 Dietrich Roland Pehlke (aldus) ++ ticket 610: add ip-address to the email-body in the form-modul. ++ ticket 607: include the frontend.css in the comment_page.php file of the news-module. +# File: admin/admintools/index.php - add "order by name" to the query to display the admintools in alphabetic order. +# File: admin/modules/uninstall.php - remove a db-query to a db-field that doesn't exists in wb 2.7 anymore +26-Dec-2008 Thomas Hornik +# fixed two issues with searchresult-highlighting: do not highlight in 

/-tags, do not convert < to &lt; anymore. 
+13-Dec-2008 Christian Sommer
+!	changed mailer to not extract line break of alternative body text (thanks to freeSbee)
+28-Oct-2008 Christian Sommer
+!	updated output filter regex to exclude mail addresses contained in input fields
+27-Nov-2008 Thomas Hornik
+!	added redirect-type (301/302) to menu_link
+24-Nov-2008 Matthias Gallas
+!	updated upgrade-script.php to add sec_anchor field to settings table
+22-Nov-2008 Thomas Hornik
+!	search: replaced most of $string_ul_umlauts (from search_convert.php) through use of preg's u-switch.
+!	search: replaced strtr() by str_replace() (it's just faster). Changed ' to '
+06-Nov-2008 Thomas Hornik
+#	Module code: curly backets get deleted by pparse() from phplib --> old fix in #569 wasn't that smart. Fixed.
+#	fixed some typos in DE language-file, added missing tab in search.php
+02-Nov-2008 Thomas Hornik
+!	news: added PAGE_SPACER to $page_title (creates e.g. title-32.php instead of title32.php)
+01-Nov-2008 Thomas Hornik
+!	improved ext_charset to work with latin1,cp1252,cp1251,latin2,hebrew,greek,latin5,latin7,utf8
++	added config for section anchor. ATTN: add "INSERT INTO TABLE_PREFIX.'settings' (name,value,extra) VALUES ('sec_anchor', 'wb_', '')" to upgrade-script.
+!	updated menulink and search to use configureable section-anchor
+29-Oct-2008 Thomas Hornik
+# News: total number of news wasn't calculated correctly
+!	Captcha: removed IFRAME for Calculation-as-text captcha
+-	removed useless init_utf8funcs()-function
++	search: added search_lang for use in search-form. Using DE, the search will search ä=ae,... (alternate spelling of german umlauts)
+-	search: removed undocumented word-boundary search
+!	search: search_path is now anchored to the beginning of link ("link LIKE '$path%'" instead of "link LIKE '%$path%'")
++	search: added key 'ext_charset' to search-extension to query external databases
+25-Oct-2008 Christian Sommer
+!	updated basic templates according the template guidelines
+24-Oct-2008 Dietrich Roland Pehlke
+#	applied bugfix for ticket #608 (redeclaration of news module)
+23-Oct-2008 Dietrich Roland Pehlke
+!	modified module delete function to provide additional information when module is in use when trying to delete
+!	modified template delete function to provide additional information when template is in when trying to delete
+21-Oct-2008 Matthias Gallas
+#	fixed display issue in news modul
+!	updated show_menu2 to version 4.7
+18-Sep-2008 Thomas Hornik
++	Added captcha-reload
+16-Sep-2008 Thomas Hornik
+#	search: fixed windows-related regex issue
+19-Aug-2008 Matthias Gallas
+!	updated to latest FCKEditor version 2.6.3
+02-Aug-2008 Thomas Hornik
+#	fixed sorting order of search-results
+25-Jul-2008 Thomas Hornik
+#	fixed an issues related to search, changed one SQL inner join (to use USING instead of WHERE)
+!	added $database = new Database(); in front of output-filter
+05-Jul-2008 Thomas Hornik
+#	fixed MODI_DATE/PUBLISHED_DATE issue in news-module. Added PUBLISHED_TIME, removed PUBL_DATE,PUBL_TIME. Thanks to forum-member timorotha
+02-Jul-2008 Christian Sommer
+!	updated to latest FCKEditor version 2.6.2
+01-Jul-2008 Thomas Hornik
+#	page-names with doubled (or more) points can not be handled if php runs as cgi. Thanks to forum member hgi2001.
+29-June-2008 Christian Sommer
+!	applied additional mail check to forgot login form
+28-June-2008 Christian Sommer
+!	class and id attributes in mailto links are no longer ignored by the output filter
+22-Jun-2008 Thomas Hornik
+#	fixed issue with captcha (mt_rand() instead of rand())
+#	fixed bug in search (link to http://.../search/index.php performs a search with string 'unset')
+22-June-2008 Christian Sommer
+!	added output of block number to section admin if no block name is specified
+21-June-2008 Christian Sommer
++	added output of block names to modify pages dialogue if blocks are enabled
+!	updated show_menu2 to version 4.60 (to avoid disappearing menus)
+08-Jun-2008 Thomas Hornik
+#	hebrew-table in charsets-table.php was faultily imported - fixed. Thanks to forum-member iti.
+24-May-2008 Christian Sommer
+!	modified output filter routine to prevent errors if database entries do not exist
+04-May-2008 Thomas Hornik
+!	changed register_backend_modfile() to work with wysiwyg-module, too
+01-May-2008 Thomas Hornik
+#	fixed file-naming issue when old page-names (from before 2.7) contains "&"
+26-Apr-2008 Thomas Hornik
+#	class.admin.php deletes actual query-string while redirection. fixed.
+25-Apr-2008 Matthias Gallas
+#	fixed validiation bug in option fields of form modul
+------------------------------------- 2.7.0 -------------------------------------
+21-Apr-2008 Christian Sommer
+!	set version to 2.7
+#	fixed bug in the PL language file of the JS calendar
++	added some basic functions for module developers
+20-Apr-2008 Thomas Hornik
+#	fix: allow external urls for search-results
+17-Apr-2008 Thomas Hornik
+#	fixed jscalendar's language-files
+16-Apr-2008 Christian Sommer
+#	fixed possible clashes with intro page feature and WB core file /pages/index.php
+15-Apr-2008 Thomas Hornik
+!	revert back to pagename-creation from $page_menu, instead of $page_title
+15-Apr-2008 Christian Sommer
+#	fixed bug introduced with Changeset 826
+14-Apr-2008 Christian Sommer
++	added show_menu2() to pre-installed WB modules (many thanks to Brodie Thiesfield for this great menu function replacment)
+!	allowed tags for multi-lingual module descriptions
+14-Apr-2008 Thomas Hornik
+#	fixed issue with multigroups (level 0 page-creation)
+13-Apr-2008 Thomas Hornik
+!	ASP: off per default. CAPTCHA: removed unneeded $admin. Filename: just convert chars like quote, doublequote, < > & to empty string.
+#	fixed language-files
+10-Apr-2008 Christian Sommer
+!	fixed WB-Link Plugin to work with WB versions below 2.7 ($admin->page_is_visible() only available in WB 2.7)
+09-Apr-2008 Christian Sommer
+!	modified FCKEditor WB-Link Plugin to work also with WB versions below 2.7
+07-Apr-2008 Matthias Gallas
+#	fixed error in german laguage file
+07-Apr-2008 Christian Sommer
++	added the latest FCKEditor v2.60
+-	removed the outdated FCKEditor v2.51
+!	set version from 2.7 (RC3) to 2.7 (RC3a)
+07-Apr-2008 Thomas Hornik
+!	added missing group_id in INSERT-query
+!	removed PHP5 function stripos from installation script
+06-Apr-2008 Christian Sommer
+!	removed some obsolete language variables from news and form module (now defined in global WB language files)
+!	enlarged admin tool icon to match size 50x50px of the other icons
+05-Apr-2008 Matthias Gallas
+!	Moved language variables for edit module CSS from modules language files to core language files
++	Added norwegian translation (Thanks OEH)
+05-Apr-2008 Thomas Hornik
+!	some small fixes: group_id/groups_id-handling, safe_mode-query in install, better work-around for issue with phplib and code-module (removed {})
+#	fixed viewing_groups-handling in /admin/pages/add.php
+!	imported new russian translation from User shlack. Many Thanks
+05-Apr-2008 Christian Sommer
+!	added workaround for template parser class
+!	moved functions to edit module CSS files into the WB core to avoid duplication of code
+!	minor layout change
+!	allowed the character "-" to be used in database names
+04-Apr-2008 Thomas Hornik
+#	fixed: Language-redirect removed query-string from URL
+04-Apr-2008 Christian Sommer
+!	set WB version to 2.7 (RC3) for the next upcoming release candidate
+03-Apr-2008 Christian Sommer
+!	some code clean up in news/form module
+!	small adaption of the edit CSS function file css.functions.php
+!	updated edit module CSS functions to include backend.css into head if possible
+#	fixed bug in Javascript decryption routines of the Output-Filter module
+02-Apr-2008 Matthias Gallas
+#	fixed bug with registration of users are not added to signup group
+02-Apr-2008 Christian Sommer
+#	added handling of missing characters to mailto encryption routines
+!	some code clean-up in News module
+!	fixed some layout issues with Form module (combination with Output-filter)
+!	fixed layout issue with optional subject/body text of encrypted mailto links
+#	fixed bug in the mailto Javascript encryption code of the Output-Filter module
+01-Apr-2008 Christian Sommer
+!	removed typo in English language file
+!	added updated edit CSS functions to the News module
+!	added updated edit CSS functions to the Form module
+31-Mar-2008 Christian Sommer
+#	fixed bug in output filter (mailto links with HTML entities in optional part)
+29-Mar-2008 Christian Sommer
+!	added missing translation to Dutch language file (thanks Bramus)
+28-Mar-2008 Thomas Hornik
+!	Some cleanup in search.php
+!	WYSIWYG: changed field text to LONGTEXT, too.
+25-Mar-2008 Matthias Gallas
+!	Updated Dutch language file (Thanks to Bramus)
+26-Mar-2008 Tomas Hornik
+#	fixed E_NOTICE-message in admin/modules/details.php
+25-Mar-2008 Thomas Hornik
++	search: added search_time_limit in settings (mainly for sites with PHP < 4.3.3 and slow search)
++	search: added missing code to allow query of external data and to process the search data itself
+25-Mar-2008 Matthias Gallas
+#	Fixed missing  tag in Admin Interface (ticket #572)
+24-Mar-2008 Matthias Gallas
+!	Updated Danish Language file (Thanks to Achrist)
+! 	Added class nixhier to frontend.css from form and news Modul (required for ASP)
+24-Mar-2008 Thomas Hornik
++	Added RU-language-files, provided by user shlack; converted to entities.
+#	search: great speed-up with large pages - requires PHP >= 4.3.3; small speed-up for PHP < 4.3.3
+#	FCK-Editor: loads large pages faster
+-	removed include/captcha/asp.php. css have to be added to module's css-files.
+23-Mar-2008 Matthias Gallas
+! 	Updated form modul for valid output, removed all javascript (Big thanks to BerndJM)
+17-Mar-2008 Thomas Hornik
+#	fixed an issue with utf8_check() (too slow with many ~100KB pages)
+15-Mar-2008 Thomas Hornik
+#	menulink: link can be menulink or subpage of menulink, too
+#	call_captcha: added parameter 'style', fixed some issue with parameter 'image' and text-style captchas
+13-Mar-2008 Christian Sommer
+! 	adjusted error/warning templates to the updated backend layout
+13-Mar-2008 Matthias Gallas
+! 	replaced one icon in admin interface
+12-Mar-2008 Matthias Gallas
+# 	fixed loading time and some display issues in IE6 of the new admin interface
+!	tweaked the new admin interface a little bit
+12-Mar-2008 Christian Sommer
+! 	adjusted background color of installation and upgrade script
+! 	set version number to 2.7 (RC2) for the upcoming second release candidate
+! 	removed hardcoded /admin folder strings from WB core files where possible
+! 	added WB home folder fix proposed by the forum member spawnferkel (thanks)
+! 	defined  and  instead of  and  as default tags
+12-Mar-2008 Thomas Hornik
++	CAPTCHA: added parameter to call_captcha (can be one of: 'image', 'input' or 'text')
+11-Mar-2008 Christian Sommer
+#	fixed issue with output filter (all .@ in descriptive mailto part: >xxxxx were replaced; now restricted to emails)
+#	fixed issue with WYSIWYG pages (appears if backend language and page frontend language differs)
+08-Mar-2008 Thomas Hornik
+#	fixed issue with news and end-date
+04-Mar-2008 Christian Sommer
+#	fixed issue with smart view URL link
+03-Mar-2008 Thomas Hornik
+#	fixed an issue with text-captcha (default text got saved). Changes default text.
+#	fixed an issue with highlighting
+02-Mar-2008 Thomas Hornik
+#	added missing text in language-files
++	added missing sorting to language dropdown in admin/pages/settings.php
+01-Mar-2008 Thomas Hornik
+#	fixed ticket #562, applied changes from user tavitar with some own additions
++	added check for AddDefaultCharset to install
+29-Feb-2008 Thomas Hornik
+#	fixed issue in pagename generation if AddDefaultCharset is set (as work-around).
+28-Feb-2008 Thomas Hornik
+#	fixed hebrew transliteration-table. Thanks to forum-member iti.
+28-Feb-2008	Christian Sommer
+#	added bugfix from the forum member tavitar to fix an issue with multiple groups (module permission do not add up properly)
+25-Feb-2008	Matthias Gallas
++	added missing Dutch language files for core modules
+24-Feb-2008 Thomas Hornik
+#	issue with menulink in upgrade-script. Fixed.
+23-Feb-2008 Christian Sommer
+!	suppressed warnings in initialize.php if constant already defined; modified upgrade script to make FCK the new default editor
+#	fixed bug in upgrade script (WBMailer setting)
+22-Feb-2008 Christian Sommer
+#	some layout changes on the upgrade-script, fixed error in precheck
+#	restricted database name and table prefix to "a-zA-Z0-9_" (avoid problems with non quoted table/field names)
+20-Feb-2008 Thomas Hornik
+!	added workaround for language sorting-problem
+20-Feb-2008	Christian Sommer
+!	added WYSIWYG DB update and missing WBMAILER settings to upgrade script (added some status messages)
+!	modified upgrade script and suppressed headers already send message (avoid issues with error reporting E_ALL)
+#	added the FCKEditor module PHP connector fix found by the forum member Luisehahne (thanks man)
+!	Updated upgrade script (added WB2.7 basic styles, pre-checks and disclaimer)
+19-Feb-2008	Matthias Gallas
+!	Updated upgrade script
+!	Changed language sorting from directory to name (needs additional to be escaped!)
++	added new languages to install script
+#	fixed some issues and typos in languagefiles
+18-Feb-2008 Thomas Hornik
++	Converted and added some old language-files (BG, CS, PL, RU)
+18-Feb-2008	Christian Sommer
+#	Fixed two broken links
+!	Modified news module to create a default index.php during installation (directory spoofing)
+17-Feb-2008	Matthias Gallas
+-	Removed colloquially german language files as the filename causes issues
+17-Feb-2008	Christian Sommer
+!	removed German Umlauts in some language file (PHP comments)
+#	fixed language bug (backend language switched to the pages language viewed in frontend)
+16-Feb-2008	Thomas Hornik
+!	updated upgrade-script (menulink)
+13-Feb-2008 Thomas Hornik
++	allow externl links in menulink-module
+#	fixed an highlighting-issue: highlighting a page with more than one sections mangled umlauts in the second to last section.
+10-Feb-2008 Matthias Gallas
+#	fixed some errors in standard german language file
++	added new colloquially german language file
+10-Feb-2008 Thomas Hornik
+#	CAPTCHA: Wrong text for calc_ttf-captcha. 
+10-Feb-2008 Christian Sommer
+#	fixed E_NOTICE warning with already defined module frontend constants
+-	removed all stuff other than page_content from the blank template
+!	adapted color for onmouseover effect
+!	added disclaimer to the upgrade-script as the script is not sufficiently tested yet
+!	made Website Header field in Settings visible per default
+!	modified all templates (display Website Header, use show_menu instead of page_menu)
+!	added highlighting of active input elements to all WB backend areas; changed some colors
+!	removed hover highlighting of input fields to avoid possible confusion
+!	added visualization of wrong/empty input fields
+#	fixed a bug with re-enter admin password
+09-Feb-2008 Christian Sommer
+!	modified some colors and CSS definitions of pages, media and section interface
+#	output_filter: fixed bug in regular expression (eats up characters in mailto links)
+#	output_filter: removed word boundary from mailto regex part
+#	fixed bug in menu_link module (IE 7 did not show the select boxes at all)
+#	fixed bug in user signup
+!	output_filter: added word boundary for the mailto regex part
+09-Feb-2008 Thomas Hornwik
+!	jsadmin: added latest changes from swen, fixes most (or all?) issues.
+08-Feb-2008 Matthias Gallas
++	added kewyword id to all new files
+08-Feb-2008 Christian Sommer
+-	Removed admin module mail_filter
++	Added revised version of the output filter module
+08-Feb-2008 Thomas Hornik
+!	module news: set focus on captcha-field if user have to re-enter captcha
+!	Changed maxlength of captcha-fields - don't tell the bots how many chars we want to have.
+-	Removed unused function is_access_denied() from search
+04-Feb-2008 Thomas Hornik
+!	email-addresses are excluded from search-results page.
+#	Fixed possible XSS in account/login.php and forgot-form.php
+04-Feb-2008 Christian Sommer
+#	allowed usage of tags in settings fields: website_header, website_footer
+03-Feb-2008 Thomas Hornik
+#	out-of-date default page isn't shown anymore, instead shows next public page.
+#	fck_wbmodules.php: foreign privates pages in dropdown, fixed.
+03-Feb-2008 Matthias Gallas
++	added kewyword id to all new files
+02-Feb-2008 Christian Sommer
+#	fixed wrong redirect in /admin/images
+02-Feb-2008 Thomas Hornik
+!	search shows email-addresses, even if email-filter is activated (on page with highlighting). Fixed.
++	Added missing text in languages files for jscalendar
+!	settings: pages-directory '/' will be converted to '' (empty string) on save.
+!	changed last remaining call to my_htmlspecialchars() to htmlspecialchars()
+#	fixed path in jscalendar-css
+01-Feb-2008 Christian Sommer
+#	Added default index.php to all folders (directory spoofing)
+01-Feb-2008 Thomas Hornik
+#	Added some missing add_slashes(), get_post_escaped(), and strip_tags() for $_POST, $_GET and $_REQUEST-data. Also for $_SERVER['PHP_SELF'].
+#	Fixed possible XSS-vulnerability in wb/search/search.php
+31-Jan-2008 Thomas Hornik
+!	Adjusted clock-red icon to match wb colors
+#	admin/pages: the parent dropdown-list in index.php and settings.php showed foreign private pages, too. Fixed.
++	Added multi-group to upgrade-script
+30-Jan-2008 Christian Sommer
+#	fixed bug with text Captcha (input was restricted to 10 chars.) and a small layout issue
+30-Jan-2008 Thomas Hornik
+#	registered pages didn't appear in menu. fixed.
+!	Updated upgrade-script. (Some upgrades still missing)
+29-Jan-2008 Thomas Hornik
+#	strtotime()'s behavior differ in PHP4 and PHP5.
+	Had to fix some issues in admin/pages/sections and module news.
+#	Security bugfix: Text file for text-captcha was world-readable. Moved to database.
+#	Text-captcha: empty line in text file, following a question, was accepted as answer. Fixed.
+28-Jan-2008 Matthias Gallas
+#	Replaced all special chars in language files with htmlentities or unicode
++	Added some missing lines in language files
++	Added missing keyword Id
+28-Jan-2008 Christian Sommer
+#	fixed issue with top bar icon alt tag
+!	added some more backend layout modifications
+!	corrected bug in NL.php language file
+!	added missing session cookie forgotten in Changeset 593
+!	added possibility to select the default backend language during installation process
+!	Re-introduced Changeset 593 (filename in pages/ from page_title instead of menu_title)
+#	Fixed some bugs in the Javascript Admin modul
+28-Jan-2008 Thomas Hornik
++	Allow a user-supplied From-Name in form-settings for email und success-email.
+!	changeset 627: menu_link and search/search.php needs some minor changes, too.
++	Added Text-CAPTCHA on request. The captcha-text will be stored in temp/.captcha_text.txt
+27-Jan-2008 Christian Sommer
+!	fixed CSS background color of the installer CSS
+!	replaced static text with variable text from language file
+!	introduced the WB 2.7 backend style developed by Michael Brinsteiner (escpro), thanks man
+!	added missing ID tags
+27-Jan-2008 Christian Sommer
+!	added missing ID tags
+!	added default language for users to avoid empty language fields
+27-Jan-2008 Matthias Gallas
++	added kewyword id to new file
+#	Fixed some spelling errors in german language file
+27-Jan-2008 Thomas Hornik
+!	Module form: user supplied input isn't lost on captcha-failure anymore.
+#	fixed 100%-cpu-load-event in CAPTCHA admin-tool.
++	Added Calc_ttf_image CAPTCHA.
+!	Changed captcha/captcha.php to use table-layout for CAPTCHA.
+!	Some minor changes in CAPTCHA-code.
+!	Added some text to CAPTCHA admin-tool.
+#	Module form: dropdown "success page" listed foreign private pages, too. Fixed.
++	Added preview-images for CAPTCHA.
+!	Improved security: CAPTCHAS can't be loaded from outside WB
+!	CAPTCHA ttf_image: added variant. Adjusted character-pool and one background for better readability.
+26-Jan-2008 Christian Sommer
+!	changed WYSIWYG content field from text to longtext (allows more than 65'534 characters) 
++	Added Javascript Admin module (developed by Stepan Riha, adapted for WB2.7 by Swen Uth)
+26-Jan-2008 Matthias Gallas
+#	fixed bug in Javascript Admin module
++	Added new language files
++	Added keywords to files where they are missing
+26-Jan-2008 Thomas Hornik
+!	fixed some issues with CAPTCHA and ASP. Adjusted baseline of '*' in supplyed fonts to meet
+	baseline of numbers. Added counter to ttf_image generation-loop. Removed now unneeded GD-lib verification.
+	Improved ASP in news-module.
++	module news: added publish_until field to control the visibility of a news-posting by date and time
+!	added strongly "condensed" fonts with many intersections for ttf-CAPTCHA as default fonts.
+	It should be very difficult for spam-bots to recognize intersected characters.
+25-Jan-2008 Christian Sommer
+!	removed changes introduced with changeset 593 (we need to think off if we want to implement that feature)
+25-Jan-2008 Thomas Hornik
++	Added new CAPTCHA. Adapted core: signup and modules: news and form.
++	Added Advanced Spam Protection (ASP) to core: signup and modules news and form.
+#	module news: it was possible to post comments to postings with commenting disabled
+	or to inactive postings. Fixed
+24-Jan-2008 Thomas Hornik
+!	Generate filename in pages/ from page_title instead of menu_title.
+24-Jan-2008 Christian Sommer
+#	fixed bug in Codepress integration (if codepress framework not installed)
++	added language support to all integrated modules (except for news and form module)
+#	fixed another E_NOTICE warning
+24-Jan-2008 Matthias Gallas
++	Added keywords to files where they are missing
+23-Jan-2008 Christian Sommer
++	Added German language file for WB 2.7
+22-Jan-2008 Christian Sommer
++	Added language support for the Admin tools (backup, reload, mail_filter)
+-	Removed all admin tool text outputs from global language file to module language files
+!	Introduced language support for the overview page of the Admin tools
++	Added function get_variable_content to allow extraction of variable content without including files
+!	Changed language support for Addons -> Moduls -> Details
+22-Jan-2008 Matthias Gallas
++	Added keywords to new mail filter files
+22-Jan-2008 Thomas Hornik
++	manage-sections: changed calendar-icon to clock-icon, added second icon to empty date-field.
+21-Jan-2008 Christian Sommer
+!	Removed the manage section icon from the page admin (sections managed by publish by date function) 
+#	Fixed bug with the edit module CSS file implementation (IE7, Opera)
+21-Jan-2008 Thomas Hornik
++	Unique session-identifier for each website baker installation. fixes #354
+20-Jan-2008 Christian Sommer
+#	fixed E_NOTICE-warning in save.php when input data was wrong
++	added the new admin tool email output filter which allows to transform
+	emails before displaying them on the frontend
+20-Jan-2008 Thomas Hornik
+!	upgrade-script.php: fixed mysql_error() handling
+!	upgrade-script.php: added code to update menu_links
+#	fixed a typo in upgrade-script.php
+!	updated admin/pages/sections.php to changed jscalendar-api from changeset 571
+!	module menu_link: after adding a menu_link, the anchor dropdown shows "#"; fixed 
+#	fixed E_NOTICE-warning in news-module (about SECTION_ID in comment.php)
+19-Jan-2008 Christian Sommer
+!	Reduced the success time out and set WYSIWSY background to white
+#	Fixed some errors in form module (only in conjunction with E_ALL)
+!	Added support to configure the mailer settings via the backend
+19-Jan-2008 Matthias Gallas
+#	Fixed bug in news modul with missing variable PAGE_DIRECTORY
++	Added keywords to new files
+19-Jan-2008 Thomas Hornik
+-	Module news: removed old calendar
++	Module news: adapted news to use the new include/jscalendar
++	added installation-instructions to include/jscalendar
+#	Module code: curly backets get deleted by pparse() from phplib. fixed
++	Module menu_link: added dropdown-listbox to select anchor
+!	upgrade-script: added code to convert old menu_links to new ones (partly)
+18-Jan-2008 Matthias Gallas
+!	Updated news modul with features from the advanced news modul
+!	Updated form modul with features from the advanced form modul
+#	Fixed hardcoded /pages issue in intro page feature
++	Added example .htaccess to parse .html files, fixed bug in changeset 555
+!	Revoked parts of changeset 547 and again introduced changeset 540
++	Added keywords to modules/fckeditor and all other new files
+18-Jan-2008 Thomas Hornik
+#	fixed two E_NOTICE-warnings in admin/pages/index.php
++	added new module-based search-function
++	added new publish-by-date code
+17-Jan-2008 Christian Sommer
+#	fixed bug in frontend login and multiple groups (only in conjunction with E_ALL)
+!	removed the PAGE_EXTENSION from frontend login
+17-Jan-2008 Matthias Gallas
+#	Reintroduced changes from changeset 520 and 540 wich where overwritten 
+	by changeset 546
+#	Revoked changeset 541 end removed all PAGE_EXTENSION variables and the related
+	option in WB settings as this function only works on Apache Servers
+	together with .htaccess and mod_rewrite
++	Added keywords to file menu_link/uninstall.php and new admintools files
+17-Jan-2008 Christian Sommer
+!	added the "users in multiple groups" feature (closes parts of ticket #546)
+16-Jan-2008 Thomas Hornik
+!	changed admin/pages/save.php to allow hidden config-elements in table search.
+!	changed module menu_link: added table mod_menu_link, fixed page-deleting-bug,
+	fixed odd behavior in case of menu_link as default-page.
+#	changing PHP-error-level within website baker does not work - fixed (fixed ticket 532)
+14-Jan-2008 Matthias Gallas
+#	Replaced hardcoded .php with the variable PAGE_EXTENSION for the use in pagenames.
+	(!!Attention!! To get extenions other than .php working additional fixes are necessary!)
+#	Replaced the variable PAGE_EXTENSION with hardcoded .php on all places where the
+	pathes points to WB Corefiles with the page extension .php
+#	Replaced hardcoded text in login.php with language variables (fixes ticket 386)
+14-Jan-2008 Christian Sommer
+!	added a missing  tag
+#	re-introduced bugfix of Changeset 472 (fixes ticket 402) accidentally 
+	removed by Changeset 529 (enhanced pages admin)
+13-Jan-2008 Christian Sommer
+#	moved administration tools from Settings to the new section Admin-Tools
+#	this bugfix closes the ticket 529 (WB upgrades modules with identical version)	
+!	increased redirection time after success message, corrected HOME link of the login panel
+!	updated PHPMailer framework to version 2.0.0 (/include/phpmailer)
+#	this bugfix closes ticket 412 (direct call of admin/settings/save.php clears database)
+#	fixed error with redirection to admin panel after installation
+12-Jan-2008 Christian Sommer
+!	introduced smart URL detection for the 'View' menu in the WB backend
+	(if page_id is set, redirect to this page instead of the root)
+!	introduced the enhanced pages admin dialogue (thanks to icouto)
+11-Jan-2008 Christian Sommer
++	added the FCKEditor module files missing in Changeset 527 (/modules/fckeditor)
+-	removed the hmtlarea files in /modules/htmlarea
+!	set the fckeditor as the new default editor /install/save.php
+!	Updated function: register_frontend_modfiles in /framework/frontend.functions.php
+	(added constants MOD_FRONTEND_CSS_REGISTERED, MOD_FRONTEND_JAVASCRIPT_REGISTERED)
+11-Jan-2008 Matthias Gallas
+!	Update codepress to Version 0.9.6
+!	Update phplib to Version 7.4a
+09-Jan-2008 Matthias Gallas
+!	Upgrade pclzip to the newer more php5 complaint version 2.6, see ticket #526
+#	Fixed ticket #542 (Thanks to Thorn)
+23-Dec-2007 Matthias Gallas
+!	Changed all copyright notices to include now 2008
+21-Sep-2007 Matthias Gallas
+#	Fixed a typo in /framework/frontend.functions.php cause that websites using
+	the new register_frontend_modifles() functions do not validate
+24-Jan-2007 Christian Sommer
+!	Replaced some core files to allow configuration of wbmailer via admin settings panel
+------------------------------------- 2.6.7 -------------------------------------
+02-Jan-2007 Christian Sommer
++	Added missing converting file for changeset [504]
+------------------------------------- 2.6.6 -------------------------------------
+01-Jul-2007 Matthias Gallas
+#	Fixed converting issue with some ISO-charsets and speeded up converting on large pages (thanks to Thorn)
+01-Jul-2007 Ryan Djurovich
+#	Fixed bug where error message not displayed when script fails to create a page
+#	Fixed bugs introduced in [484]
+14-May-2007 Matthias Gallas
++	Added support for ISO-8859-6.(Thanks to thorn)
+12-May-2007 Christian Sommer
++	Replaced functions page_css and page_javascript by register_frontend_modfiles
++	Added function register_backend_modfiles to allow backend modules to use optional CSS and JS files
++	Added the JS framework codepress to allow syntax highlighting for JS, HTML, PHP code (textarea)
++	Added the new function register_frontend_modfiles to the built in templates
+08-May-2007 Matthias Gallas
++	Added wrapper to functions.php if mb_string is not available (Thanks to thorn)
++	Added new functions page_css and page_javascript to the built in templates
++	Added search highlight class to css files of the built in templates
+30-Apr-2007 Matthias Gallas
+#	Fixed ticket #392; root_parent not being set correctly (Thanks to eggsurplus)
+10-Apr-2007 Matthias Gallas
++	Optimized search and highlighting funktions (Thanks to thorn)
+03-Apr-2007 Matthias Gallas
+#	Fixed a bug in menulink; if you deleted a menulink page the linked page was also deleted
+	in the pages directory (Special thanks to "Funky_MF" for the fix)
+01-Apr-2007 Matthias Gallas
+#	Fixed issues with some languages when UTF8 is used. Removed all htmlentites
+	from the code (revoked changeset 396) and added new functions instead. Adapted the
+	search and the highlighting to use the new functions. With this changes WB can now
+	be used with charset UTF8 for all languages. Very special thanks to Thorn who wrote
+	and tested this changes.
+12-Mar-2007 Matthias Gallas
++	Added multilingual support to search
+03-Mar-2007 Matthias Gallas
++	Added new function for highlighting search results in the content area
+	(Special thanks to "thorn" and "Funky_MF")
+#	Fixed some issues in search with special chars
+	(Special thanks to "thorn" and "Funky_MF")
+22-Feb-2007 Christian Sommer
+#	Fixed bug in changeset 428 (page files were not deleted in /pages folder due to a typo in wb/framework/function.php)
+16-Feb-2007 Christian Sommer
+!	Suppressed PHP warnings and errors when reading empty intro.php
+16-Feb-2007 Christian Sommer
+#	Applied fix to enable parsing of PHP code in the intro.php 
+12-Feb-2007 Christian Sommer
+!	Added functions page_css and page_javascript which allow to include optional
+	module files module.css and module.js into the  section. This allows to 
+	create valid (X)HTML, as CSS definitions of modules are included in the head section
+12-Feb-2007 Christian Sommer
+!	Security enhancement (reduced number of login trials from 50 to 3)
+02-Feb-2007 Matthias Gallas
+#	Applied fix for ticket #380 (Thanks to pcwacht)
+30-Jan-2007 Ryan Djurovich
+#	Applied fix for ticket #376
+29-Jan-2007 Matthias Gallas
++	Added new variable $MODULE_DESCRIPTION wich allows to have optional a language
+	specific description of the modules in the language files of the modules.
+21-Jan-2007 Matthias Gallas
+#	Fixed issue in the search table entries of form modul
+13-Jan-2007 Matthias Gallas
+#	Fixed some bugs in rss.php
+07-Jan-2007 Matthias Gallas
+#	Fixed error when uninstalling the news modul
+02-Jan-2007 Matthias Gallas
++   Added id keywords to all missing files
+#	Fixed issue with Permissions for pages sections
+27-Dec-2006 Matthias Gallas
+#	Fixed form modul stores empty records
+------------------------------------- 2.6.5 -------------------------------------
+25-Dec-2006 Ryan Djurovich
+!	Changed links to WB help website
+24-Dec-2006 Matthias Gallas
+#	Fixed some minor javascript errors in admin (thanks to pcwacht)
+#	Fixed root_parent doesn't get updated when moving item in menu (#305)
+!	Changed all copyright notices to include now 2007
+23-Dec-2006 Matthias Gallas
+#	Fixed IE allows to set a page as parent of itself (#320)
+#	Fixed problem with Page Title has to be escaped (#287)
+#	Fixed the possibility to call the index.php of the templates directly in the browser (#291)
+21-Dec-2006 Matthias Gallas
+#	Fixed missing message when adding a site without page title (#300)
+21-Dec-2006 Ryan Djurovich
+#	Fixed bug with captcha script (#346)
+20-Dec-2006 Matthias Gallas
+#	Fixed Return to Search Results Page (#365)
+!	Set Version to 2.6.5
+-	Removed Changeset 365 because this will be a part of WB 2.7.x
+#	Fixed a little typo error in class.admin.php (#364)
+26-Nov-2006 Ryan Djurovich
++	Added new script that could possibly be apart of 2.7.x as a replacement
+	for having the pages directory 
+17-Nov-2006 Matthias Gallas
+#	Fixed fatal error in line 46 news/comment.php (thanks to eki)(#358)
+15-Nov-2006 Matthias Gallas
+#	Fixed again intropage doesn't work (#71)
+20-Oct-2006 Matthias Gallas
++	Added phpmailer class (thanks to doc)
++	Added Remember-expanded-pages-in-admin (thanks to ephraimt)
++	Added List sorting in admin area (thanks to rsmith)
+#	Fixed table width 100% are wrong displayed in container templates
+	when IE is used (#350)
+#	Fixed large space between menupoints in IE (#349)
+#	Fixed Website description is not displayed when no page description
+	available (#348)
+#	Fixed group images in news modul cannot be stored (#342)
+#	Fixed Typo in form/save_field.php (#341)
+#	Fixed files in /pages/posts folder are not deleted (#340)
+#	Fixed specialchars problem in the news modul (#339)
+#	Fixed news modul stores empty records (#338)
+#	Fixed Captcha didn't work in news comments (#337)
+#	Fixed various php notices (#334)
++	Added new upgrade_function (thanks to kozmoz)
+#	Fixed addons table isn't updated when a modul is updated (#332)
+#	Fixed spelling errors in the signup2.php (#330)
+#	Fixed MySQL 5.x missing default values for INT fields in all system
+	and modules tables (#329)
+#	Fixed installer does not insert admin user (#328)
++	Added support for getting page ID of page that referred search
+	request (#327) (thanks to brofield)
+#	Fixed search results generate invalid XHTML and notify warnings (#326)
+Stefan Braunewell
+#	Fixed Field 'last_reset' doesn't have a default value (#313)
++	Added get_post_escaped to wb class which automatically calls add_slashes
+	on get_post output and used it in form/save_field.php
+------------------------------------- 2.6.4 -------------------------------------
+20-May-2006 Ryan Djurovich
+#	Fixed security issues related to #237
+#	Fixed typo in news save comment page (#282)
+#	Fixed typo in news delete post page (#283)
+!	Added multi-submission protection to form module (#119)
+#	Added notice for when PHP Session Support appears to be disabled in installer,
+	even if it is enabled and the problem actually lies in the users browser (#154)
+19-May-2006 Ryan Djurovich
+#	Fixed problem in forgotten login form where email field is too short (#207)
+#	Fixed typo in forgotten login details email (#190)
+15-May-2006 Stefan Braunewell
+#	Fixed security issues (#237)
+03-May-2006 Stefan Braunewell
+#	Fixed problems with pre-2.6.0 modules in section list
+#	Fixed e-mail bug caused by From: headers in internal mail function calls
+	(#189)
+#	E-mail validation in install script now accepts new top-level domains
+	(#162)
+#	Error status is now overwritten by next database query (#182)
+#	Fixed obscure problem in htmlarea install script
+------------------------------------- 2.6.3 -------------------------------------
+19-Mar-2006 Stefan Braunewell
+#	Fixed ticket #146: problems removing groups from viewers list of a page
+16-Mar-2006 Stefan Braunewell
+!	Changed link target selection. Now self, top and new. (Ticket #145)
+#	Fixed ticket #143. Charset setting is now used in admin login and forgot
+	password pages.
+#	Some changes to the SQL code in the install script for improved 
+	compatibility with new MySQL versions
+#	Fixed ticket #134 - error on browsing media.
++	Improved backup module: new choice between full database or WB-related
+	backup.
+#	Fixed ticket #141 - admin now sees all folders in media
+#	Fixed e-mail sending problems due to additional parameter in mail call.
+#	Applied fix regarding ticket #138: new users now get deleted if
+	sending e-mail fails.
+#	Fixed ticket #137: Last Reset timer not reset in frontend forgotten 
+	password process
+#	Removed duplicate expression from modules/news/install.php which caused
+	problems in installation
+
+01-Mar-2006 Stefan Braunewell
+#	Fixed ticket #68 - Safari problem with displaying all parents.
+#	Fixed ticket #136 - mailing forgotten password in admin login screen leads 
+	to fatal error.
+!	Renamed tag [PROCESSTIME] to [PROCESS_TIME]
+------------------------------------- 2.6.2 -------------------------------------
+03-Feb-2006 Stefan Braunewell (very big special thanks to John and Alex)
+#	Fixed ticket #104 - commas in form field descriptions not allowed.
+#	Cookie REMEMBER_KEY wasn't cleared in account/logout 
+	and expiration date is now set to time in the past.
+#	Smart login not working.
+!	Changed mail calls to new function $wb->mail.
+#	Form: ticket 124 added captcha settings check 
+#	Ticket 118 added formfield type to check for email/text 
+#	Ticket 115 changed comparision /modules/form/view.php 
+#	Added correct timecheck in form submissions
+!	Changed captcha.php call to include timestamp
+!	Changed the e-mail validation code and added a mail function to class wb.
+!	Forgotten password: if sending of e-mail fails, restore old password.
+	Ticket #110
+!	Added more charset options. Ticket #102 - thanks to ruebenwurzel!
+!	Character encoding setting also affects admin backend.
+	Mentioned in ticket #102.
+!	Reintroduced page languages setting. If switched to off, page
+	languages are only used to determine the language file for the
+	universal texts. If on, displayed page and menu are affected by
+	the language session variable.
+#	Fixed bugs in show_breadcrumbs code and added parameter "depth"
+	to set the number of levels to be show.
+#	Fixed a bug where access settings of registered and private pages
+	were displayed incorrectly.
+#	Fixed captcha being cached.
+#	Added an exit call after every heading("Location:...")
+	redirector to prevent unwanted execution of code.
+#	Bug #122. Replaced empty field check by check that setting name is
+	not "wb_version".
+#	Replaced all remaining occurrences of '/media' by MEDIA_DIRECTORY - bug #108.
+#	Fixed bug #99 and two additional instances of typo 
+	catpcha instead of captcha.
+#	Fixed some typos
+#	Fixed some notices and warnings.
+#	Fixed bug #105 - back buttons in addon detail pages not editable.
+!	Replace 'admin' by 'wb' in all account pages. 
+!/#	Moved print_success and print_error code to class.wb.php.
+	Added correct parameters to these functions in account pages. 
+------------------------------------- 2.6.1 -------------------------------------
+12-Dec-2005 Ryan Djurovich
+#	Fixed security vulnerability in class.login.php
+#	Fixed typo in EN language file
+#	Fixed captcha problems (when feature is disabled) in form module and sign-up
+!	Added charset encoding to admin templates
+!	Added extra code to check for selection of addon upon uninstalling
+#	Fixed bugs in RSS news feeder
+#	Fixed bug with PAGE_DESCRIPTION not being set on any page
+------------------------------------- 2.6.0 -------------------------------------
+28-Nov-2005 Ryan Djurovich
++	Added default charset option to (advanced) settings
+#	Form module email fields now have email address validation
+#	Fixed spacing in form submissions
+27-Nov-2005 Ryan Djurovich
++	Added captcha verification to sign-up form
++	Added Captcha to News module
+24-Nov-2005 Stefan Braunewell
+!	Applied aportale's patch to use label instead of javascript toggle code
+20-Nov-2005 Ryan Djurovich
+!	News mod now hides read more link if no need for it (see ticket #56)
++	Added support for mailto: links in the menu link mod
+#	Added direct-access redirection on some files (see ticket #37)
++	Added extra characters to convert.php (see ticket #64)
+#	Fixed ticket #65 (last_reset check in account/forgot_form.php)
+29-Sep-2005 Ryan Djurovich
+!	Cleaned up form buttons in Settings
+!	Moved some options into Advanced Settings
+#	Semi-disabled "separate" page trash option
++	Created a backup module/tool for backing-up the database
+	(thanks to John (pcwacht) for the original code)
++	Created new "blank template", which can be used in case where you don't
+	want anything wrapping page-content.
+19-Sep-2005 Ryan Djurovich
++	Added _license field for all add-ons to specify a license
+!	Renamed _designed_for variables (for all addons) to _platform
++	Created addons table for faster internal referencing of installed addons
+!	Fixed some links, including the "Help" button in Admin
+#	Used nl2br to display body correctly when viewing form-submissions
+15-Sep-2005 Stefan Braunewell
++	Added table module with columns 'name','type' and 'directory' as an
+	index.
++	Added entry to settings table 'wb_version' which holds the version
+	number and can be utilized in future upgrade scripts.
+!	Added upgrade functionality also for templates and languages.
+#/!	Template/modules installation now respects paths.
+!	Moved updates from config.php to database.
+	Created initialize.php (required by config.php) to read settings.
+11-Sep-2005 Stefan Braunewell
+!	HTMLArea is now a module instead of a core component. Files moved
+	from "include" to "modules".
++	Implemented Installation of modules on top of an older version. This is 
+	done via checking $module_version. Instead of install.php, upgrade.php
+	is then called if it exists in the module package. 
+	For module developers: $module_version and $new_module_version are 
+	accessible in upgrade.php to find out what upgrade steps need to be taken.
+!	Changed column names in mod_news_posts from short,long to content_short,
+	content_long.
+09-Sep-2005 Stefan Braunewell
++	Added new advanced setting "Rename Files On Upload". File extensions can be
+	given so that respective files will have a ".txt" appended on media upload.
+#	Fixed "None found" message bug when user has no top level page edit
+	rights.
+#	Fixed missing parent option 'none' - ticket #12 - and a minor scope bug.
++	Added breadcrumbs code. Call using $wb->breadcrumbs().
++	Added utf-8 character encoding meta tag into all stock templates.
+#	Fixed bug when changing a page's parent
+!	Changed the way blocks are treated. Added new frontend class attribute
+	default_block_content that controls what is shown on pages such as
+	search, login, etc. (Ticket #16)
++	Added support for WYSIWYG editor modules (wysiwygmod)
++	When trying to access a registered page, user is automatically redirected
+	there on successful login.
+#	Fixed various issues with system search (mainly related to stripslashes()
+#	Removed stripslashes() in many places in the code. Added check for
+	magic_quotes_gpc to new wb class method add_slashes(). Now database contest
+	is independent of magic_quotes setting..
+05-Sep-2005 Stefan Braunewell
+#	Fixed bug concerning direct access of preferences page.
+#	Reworked page visibility and menu item visibility code (frontend login
+	problem).
+#	Pages in link list in htmlarea popup are now correctly ordered.
+#	Fixed bug where group with existing name can be added.
+04-Sep-2005 Ryan Djurovich
++	Added and RSS newsfeed script to the News module
+04-Sep-2005 Stefan Braunewell
+!	Rewrote menu function. Parameters are now given as attributes to frontend class.
+#	Fixed some occurrences of potential direct access path disclosure
+#	Added directory check to browse.php to prevent xss exploit by trusted users.
+!	Updated code to reflect move to Subversion repository system.
+27-Aug-2005 Stefan Braunewell
+#	Fixed bugs 4,5,6,8,9 in bug tracker
+!	Removed 'USER_LANGUAGE' and 'GET_LANGUAGE' constants.
+	A GET['lang'] now sets the session language variable.
+26-Aug-2005 Stefan Braunewell
+!	Moved redundant code into the new class functions. Created 
+	'compatibility.php' for backward compatibility with
+	modules and templates. Variables and functions can still be accessed
+	in the old way.
+!/+	Reorganized core frontend files, added new base class 'wb' from
+	which 'admin' and the new 'frontend' class inherit. Moved all frontend
+	function into new class. Completely rewrote core index.php.
+	Now all variables and functions that are available to templates and
+	modules are attributes and methods of the frontend and the wb classes
+------------------------------------- 2.5.2 -------------------------------------
+23-Jun-2005 Ryan Djurovich
+!	create_access_file now creates all parent directories if needed
+#	Fixed bug when moving page with subpages to another level
+#	Fixed bug when saving "Settings" (in Admin) on Windows/IIS
+#	Fixed bug where query was not setting error correctly in class.database.php
+22-Jun-2005 Ryan Djurovich
+#	Fixed bug where template permissions were not saved when a adding group
+21-Jun-2005 Ryan Djurovich
+#	Added htmlspecialchars for modifying WYSIWYG, news, etc. modules (Bug #78)
+#	Fixed language problems in some area's of Admin. (Bug #70)
+#	Added a space in website/page keywords (Bug #69)
+#	Fixed bugs on settings2.php (Bug #52)
+!	Links inserted with HTMLArea now use [wblink--PAGE_ID--] instead of raw URL
+13-Jun-2005 Ryan Djurovich
+#	Fixed bug (#88) with news module
+!	Title of Administration login page now taken from language file (Bug #72)
+#	Fixed redirection admin/home to admin/start on admin/index.php
+#	Fixed bug with forgotten password page in admin (Bug #81)
+25-Apr-2005 Ryan Djurovich
+#	Fixed numerous bugs with module uninstallation
+#	Fixed bug when uploading files in Administration -> Media
+!	Installer no-longer requires you to accept the GNU GPL
+------------------------------------- 2.5.1 -------------------------------------
+16-Apr-2005 Ryan Djurovich
+#	Fixed two bugs with account login/logout
+------------------------------------- 2.5.1 -------------------------------------
+15-Apr-2005 Ryan Djurovich
+#	Fixed bug where non-english characters can get used in page filenames. Many
+	measuers have been added (including a new file: wb/framework/convert.php),
+	to prevent any possible errors that can occur in page filenames.
+#	Fixed invalid meta tags in stock templates (meta tags were not closed)
+#	Removed lines 401, 402, and 425 of wb/index.php - not needed
+#	Fixed bug where search and account pages are shown in every block
+	that is in a template
+#	Fixed numerous bugs with media home directories feature
+10-Apr-2005 Ryan Djurovich
+#	Fixed bugs in account/login.php and logout.php where users
+	gets redirected to /pages
+------------------------------------- 2.5.0 -------------------------------------
+08-Apr-2005 Ryan Djurovich
+-	Removed section language feature
++	Added page language feature (replaces need for sections language feature)
+#	Fixed bug where pages using menu_link module can have the URL changed
+-	Page directory no longer stored in link field in pages table, it is now added
+	when the page_link function is called - this makes changing the pages
+	directory much easier and quicker
+!	Pages with visibility of "none" are now no longer directly accessable
++	Added new visibility setting "hidden", acts exactly like none did previously
+!	Template info file can now specify number of menu's available and relative names
+!	Template info file can now specify number of blocks's available and relative names
+------------------------------------- 2.4.3 -------------------------------------
+07-Apr-2005 Ryan Djurovich
+#	page_filename function has been rewritten using str_replace
+	function, which should be faster and will allow characters
+	from other languages into filenames
+!	Created new media_filename function, which is now used
+	by all media functions (create,upload,rename) to determine
+	which characters should be removed from a desired filename
++	New button in Administration page list to view specific page
+#	Updated the page_link function to now be compatible with menu link
+	module when setting pages directory to root
+#	Fixed bugs in search when using "Any Words" option
+#	Fixed bug with news module when pages directory set to root
+!	Changed URL of documentation website on Administration Start page
+------------------------------------- 2.4.2 -------------------------------------
+05-Apr-2005 Ryan Djurovich
+#	Fixed bug where file could be renamed to nothing in Media
+!	Optimised Media create folder, upload file, and rename functions
+#	Fixed bug where stripslashes not run on news post titles in admin
+05-Apr-2005 Stefan Braunewell
+#	Fixed bug concerning usage of the private_sql variable
+#	Fixed bug conerning sub-pages being displayed in menus incorrectly
+------------------------------------- 2.4.1 -------------------------------------
+04-Apr-2005 Ryan Djurovich
+!	Pages with visibility of "none" are again directly accessable
+#	Fixed bugs regarding renaming files and directories in Media section
+!	When home folders disabled, all folders now visible in Media section
+------------------------------------- 2.4.0 -------------------------------------
+03-Apr-2005 Ryan Djurovich
+-	Removed recently added visibility setting of "heading", and relative config vars
++	Added new "menu" field to pages table, and new setting "multiple menus"
+	which replaces the need for the menu headings feature
++	Added links to top of groups and users sections, linking to each other
+!	Change menu width in "Round" template to 170px (was 150px)
+#	Change page "are you sure" deletion message to mention that it will delete
+	all sub-pages as well
+#	Fixed many bugs with news module when viewing posts by group
+!	Pages with visibility of "none" are now no longer directly accessable
+02-Apr-2005 Ryan Djurovich
+-	Removed need to specify DB_URL when calling database class
+#	Stopped fields without a type specified from being shown in form mod
+#	Changed '/media' to MEDIA_DIRECTORY on HTMLArea popup windows
+	for insert link and insert image
++	Added setting which allows you to specify the default WYSIWYG style
++	Added "Server Email" option, to specify what is used in "From" field when
+	sending emails using the PHP mail function. Default is admins email address.
+#	Search now excludes pages which have a visibility of none or heading
+!	Pages are now given modified_when and modified_by when added
+01-Apr-2005 Ryan Djurovich
++	Added option to News module to specify how many posts should be listed
+	per page (by default it is set to unlimited, which functions like previous version)
+#	Added stripslashes when display page titles in search
++	Page descriptions and last updated date now shown in search by default
+30-Mar-2005 Ryan Djurovich
++	Added new feature for Media home folders, where a folder can be specified
+	for a specific user or group of users only
+!	Changed URL of Help button to http://www.websitebaker.org/docs/
++	Added new feature for "Page Trash" - two modes available: inline and separate
+!	When pages are deleted, all sub-pages are now deleted (instead of being moved
+	up a level)
+29-Mar-2005 Ryan Djurovich
+-	Removed Database Settings from Administration Settings (options will not be
+	available in 3.x, so trying to match interface with WB 3.x plans
+!	Changed the name of Path Settings to Filesystem Settings in Administration
+	Settings, and removed ability to change path/url options - matching interface
+	plans for WB 3.x
++	Added same options for OS and file permissions as installer to Settings
+!	Sessions now named with APP_NAME.'_session_id' (e.g. default is wb_session_id)
+28-Mar-2005 Ryan Djurovich
++	New functions available to templates to simplify creation of them. This aims
+	to "future-proof" templates for WB 3.x plans.
+!	Default templates updated to support some of the new functions
++	Added field to pages table "page_trail" which stores a list of the pages
+	parents. This field was needed by the new page_menu function
++	Added option for page visibility "heading" to enabled support for multiple
+	menu's. Also, this helps to "future-proof" templates for WB 3.x plans
++	Added option for page visibility "registered", which acts a little like
+	private, but is still shown in the menu (although users need to log in to view
+	the pages content)
++	Form module submissions now saved to database, and feature now added to
+	limit number of submissions per hour to prevent spamming
++	New field for Form module: email. Allows you to specify their email in
+	"from" field on module settings.
+#	Fixed bug when displaying comments in News module (WB Bug #14)
++	New "under contruction" message if no pages exist
+!	Cleaned-up wb/index.php
+27-Mar-2005 Ryan Djurovich
++	Created advanced mkdir and chmod functions
+#	Fixed bug in media where wrong file/folder is deleted
++	Complete overhall of installer - now only one step! It has been greatly
+	simplified in many ways, has much better validation, reports error much more
+	nicely, and automatically logs the user into the Administrations
++	Must now specify OS type - allows for customizable file permission settings
++	Sections can now have a language code assigned to them
++	Sections can now have a block name/id assigned to them
+!	Home section of Administration renamed to Start, to save confusion with saying
+	Homepage (because this term could either mean the main website or Home section
+	in	Administration). Also, this aims to unify the interface with WB 3.x plans
+!	Moved Users and Groups sections under Access section. This aims to unify the
+	interface with WB 3.x plans, which help to unclutter the menu
+!	Interface for Settings section has been imporved for usability purposes
+#	Fixed HTMLArea where no scrollbar for "insert link" and "insert image" dialogs
+	by placing media list inside an iframe
+#	Fixed stripslashes problem for viewing news comments
+!	Added code from Formesque module (an advanced version of the original Form
+	module, modified by Rudolph Lartey from www.carbonect.com), and made further
+	interface improvements for select box/checkbox group/radio group options.
+#	Possibly fixed bugs where an S appears before file and dir modes
+#	Fixed bug where users can be added with same emails (in Administration)
+-	Removed support for PEAR, as it was deemed an unnecessary addition which only
+	makes code more bulky, and removing it will decrease package size a lot
++	New "homepage redirect" option so first page is included and not redirected to
+#	Fixed text not being shown when module uninstalled
+!	Imporved interface for basic group permissions
+26-Mar-2005 Stefan Braunewell
+#	Fixed bug with front-end logins
+#	Fixed bug when saving intro page 
++	Added check on sign-up if e-mail exists (thanks to P. Melief)
+#	Fixed bugs concerning moving/deleting pages
+#	Fixed list of parents in page settings
+#	Fixed mkdir without mode parameter
+#	Added a check on install to ensure PHP 4.1.x compatibility (thanks to Wanderer)
++	Added support for PAGES_DIRECTORY set to root
++	Search form now supports quotes (thanks to Manafta)
+#	Fixed page section ordering
+#	News items are displayed with name of poster instead of "Unknown"
+#	Deletion confirmation popup window in media section now shows correct file name
+------------------------------------- 2.3.1 -------------------------------------
+03-Fed-2005 Ryan Djurovich
++	Now there is two types of "filesystem modes", one for directories and one
+	for files. Having different settings is very common for most servers, so
+	this addition should fix many problems people had with 2.3.0.
+-	Removed filesystem mode options from installation
+!	Removed duplicate text on installation step 3 for timezone
+!	All "access files" for the news module now stored in pages/posts instead
+	of a sub-dir relative to the page (this fixes many bugs)
+#	Fixed major bugs when deleting pages with sub-pages
+!	Removed the restrictions that prevent a user for changing a pages level
+#	Fixed bug with "toggle" plus/minus in IE for pages list
+#	Fixed some bugs where /pages was not replaced with PAGES_DIRECTORY constant
+------------------------------------- 2.3.0 -------------------------------------
+26-Jan-2005 Ryan Djurovich
+#	Fixed bug in framework/functions.php that made root parent always equal 8
+#	Added missing braces in lines 182 and 208 of admin/pages/settings2.php
+#	Fixed SQL-query on line 172, placing a / after $old_link
+#	Added eregi checks for PAGES_DIRECTORY on lines 140 and 150 of
+	admin/pages/settings2.php
+#	Added ordering cleaning to delete_post.php on line 53 for news module
+!	GMT option is selected for "Default Timezone" in the installer, instead
+	of the old "Please select" message (which had the same value as GMT)
+28-Jan-2005 Ryan Djurovich
+!	Ability to specify the chmod number when WB uploads files, etc.
+!	Modified file headers (copyright/license notice) so they now look almost the
+	same, independant of font. Also, it now covers copyright for 2005.
+30-Jan-2005 Ryan Djurovich
+#	Added code on wb/admin/pages/delete.php to remove sections from the sections
+	table when a page is deleted.
++	New 'Smart Login' prevents users from using external password managers,
+	and can be set to remember the users password using cookies.
+!	SourceForge CVS module now called websitebaker2 (instead of just
+	websitebaker). Also, all file versions have been reset.
+01-Fed-2005 Ryan Djurovich
+!	Added code to prevent from changing a pages level (it simply disables
+	the select box), to prevent many possible bugs.
+------------------------------------- 2.2.4 -------------------------------------
+23-Dec-2004 Ryan Djurovich
+!	Change 'EXACT_PHRASE' to 'EXACT_MATCH' on line 261 of wb/languages/EN.php
+#	Fixed multi-language support in search
++	Added more detailed options to list of PHP error reporting level's
+-	Removed ability to change language and PHP error reporting level
+	on installation to make things easier for newbie's
++	Ability to select custom spacer for page filename's
+!	Changed the way a language code is found on language installation
++	Added template permissions to groups
+#	Fixed bug when trying to change email from Preferences (admin and frontend)
+#	Fixed bug with auto-selection of "System Default" for Preferences
+!	News module now use's WYSIWYG for modifying news posts
++	Ability to specify both the pages and media target directories
+------------------------------------ 2.2.3-c ------------------------------------
+22-Dec-2004 Ryan Djurovich
+#	Fixed problem with DB password being reset if Settings saved in basic mode
+------------------------------------ 2.2.3-b ------------------------------------
+21-Dec-2004 Ryan Djurovich
+#	Fixed minor bug on admin templates section
+#	Fixed bug on rename.php and rename2.php in admin media section
+------------------------------------- 2.2.3 -------------------------------------
+20-Dec-2004 Ryan Djurovich
++	Added WB release version in Administration (top right corner)
+!	New option to prevent users from adding level 0 pages
+#	Fixed bug when deleting post's in News module
++	Added new field in pages table for "root" parent (level 0 parent), for
+	extra flexability in creating templates
+!	Round template now supports unlimited page levels
+------------------------------------- 2.2.2 -------------------------------------
+18-Dec-2004 Ryan Djurovich
++	New option under Search Settings for selecting custom template for search
++	New option when changing page settings to set the target
+#	Fixed error when saving a user after editing
+!	Users can now modify sub-page if they dont have permissions on the parent
+------------------------------------- 2.2.1 -------------------------------------
+15-Dec-2004 Ryan Djurovich
+#	Fixed bug when changing password on preferences form (front-end)
+#	Fixed bug when retrieving user details (administration)
+#	Added check to see if module, template, or language is in use when deleting
+#	Fixed up email that is sent to user from a submitted form
+#	Fixed major problem with module permissions which stopped it from working
+------------------------------------- 2.2.0 -------------------------------------
+14-Dec-2004 (Correct date[s] unkown) Ryan Djurovich
++	Multiple-level page support
++	Multiple section's for pages (including interface)
+!	Removed text created using two words on all areas
+	(e.g. {Intro} {PAGE} is now {INTRO_PAGE})
+	this is for better language support
++	Added Languages section
+!	Moved Templates and Modules under Add-ons section
+!	Changed name of "Default" template to "Round"
++	Added "All CSS" template
++	Added "Jump"
++	Added 
+!	Modified "Box" template to support multiple page levels
++	Added "Menu Link" module
++	Added "News" module
++	Added "Code" module
++	Added "Form" module
++	Added "Wrapper" module
+!	Changed name of "Normal Page" module to "WYSIWYG"
++	Created new admin wrapper script to ease module develpment
++	Media now automatically creates index.php file for every
+	sub-folder made (for security purposes)
+!	Change "Help" link in Administration menu so it now directs
+	to the the new Website Baker documentation website found at:
+	http://www.websitebaker.org/documentation
+!	Password is now required to change email in preferences
++	User can now select custom Language and Date & Time Formats
++	Added search functionality, with three different "methods":
+	1. Using all words  2. Using any words  3. Exact match
++	Added native MySQL database support

Property changes on: tags/2.8.3/CHANGELOG
___________________________________________________________________
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/interface/version.php
===================================================================
--- tags/2.8.3/wb/admin/interface/version.php	(nonexistent)
+++ tags/2.8.3/wb/admin/interface/version.php	(revision 1610)
@@ -0,0 +1,55 @@
+
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/interface/date_formats.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/interface/time_formats.php
===================================================================
--- tags/2.8.3/wb/admin/interface/time_formats.php	(nonexistent)
+++ tags/2.8.3/wb/admin/interface/time_formats.php	(revision 1610)
@@ -0,0 +1,56 @@
+
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/interface/time_formats.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/interface/charsets.php
===================================================================
--- tags/2.8.3/wb/admin/interface/charsets.php	(nonexistent)
+++ tags/2.8.3/wb/admin/interface/charsets.php	(revision 1610)
@@ -0,0 +1,46 @@
+
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/interface/charsets.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/interface/timezones.php
===================================================================
--- tags/2.8.3/wb/admin/interface/timezones.php	(nonexistent)
+++ tags/2.8.3/wb/admin/interface/timezones.php	(revision 1610)
@@ -0,0 +1,78 @@
+ 0 ) ? DEFAULT_TIMEZONE/3600 : 0;
+
+$TIMEZONES['-12'] = 'GMT - 12 Hours';
+$TIMEZONES['-11'] = 'GMT -11 Hours';
+$TIMEZONES['-10'] = 'GMT -10 Hours';
+$TIMEZONES['-9'] = 'GMT -9 Hours';
+$TIMEZONES['-8'] = 'GMT -8 Hours';
+$TIMEZONES['-7'] = 'GMT -7 Hours';
+$TIMEZONES['-6'] = 'GMT -6 Hours';
+$TIMEZONES['-5'] = 'GMT -5 Hours';
+$TIMEZONES['-4'] = 'GMT -4 Hours';
+$TIMEZONES['-3.5'] = 'GMT -3.5 Hours';
+$TIMEZONES['-3'] = 'GMT -3 Hours';
+$TIMEZONES['-2'] = 'GMT -2 Hours';
+$TIMEZONES['-1'] = 'GMT -1 Hour';
+$TIMEZONES['0'] = 'GMT';
+$TIMEZONES['1'] = 'GMT +1 Hour';
+$TIMEZONES['2'] = 'GMT +2 Hours';
+$TIMEZONES['3'] = 'GMT +3 Hours';
+$TIMEZONES['3.5'] = 'GMT +3.5 Hours';
+$TIMEZONES['4'] = 'GMT +4 Hours';
+$TIMEZONES['4.5'] = 'GMT +4.5 Hours';
+$TIMEZONES['5'] = 'GMT +5 Hours';
+$TIMEZONES['5.5'] = 'GMT +5.5 Hours';
+$TIMEZONES['6'] = 'GMT +6 Hours';
+$TIMEZONES['6.5'] = 'GMT +6.5 Hours';
+$TIMEZONES['7'] = 'GMT +7 Hours';
+$TIMEZONES['8'] = 'GMT +8 Hours';
+$TIMEZONES['9'] = 'GMT +9 Hours';
+$TIMEZONES['9.5'] = 'GMT +9.5 Hours';
+$TIMEZONES['10'] = 'GMT +10 Hours';
+$TIMEZONES['11'] = 'GMT +11 Hours';
+$TIMEZONES['12'] = 'GMT +12 Hours';
+$TIMEZONES['13'] = 'GMT +13 Hours';
+
+// Add "System Default" to list (if we need to)
+if(isset($user_time) && $user_time == true)
+{
+	if(isset($TEXT['SYSTEM_DEFAULT']))
+	{
+		$TIMEZONES['system_default'] = $TIMEZONES[$actual_timezone].' ('.$TEXT['SYSTEM_DEFAULT'].')';
+	} else {
+		$TIMEZONES['system_default'] = $TIMEZONES[$actual_timezone].' (System Default)';
+	}
+}
+
+// Reverse array so "System Default" is at the top
+$TIMEZONES = array_reverse($TIMEZONES, true);
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/interface/timezones.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/interface/er_levels.php
===================================================================
--- tags/2.8.3/wb/admin/interface/er_levels.php	(nonexistent)
+++ tags/2.8.3/wb/admin/interface/er_levels.php	(revision 1610)
@@ -0,0 +1,47 @@
+
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/interface/er_levels.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/interface/index.php
===================================================================
--- tags/2.8.3/wb/admin/interface/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/interface/index.php	(revision 1610)
@@ -0,0 +1,22 @@
+
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/interface/index.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/modules/manual_install.php
===================================================================
--- tags/2.8.3/wb/admin/modules/manual_install.php	(nonexistent)
+++ tags/2.8.3/wb/admin/modules/manual_install.php	(revision 1610)
@@ -0,0 +1,101 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back);
+}
+
+if ($admin->get_permission('admintools') == false) { die(header('Location: ../../index.php')); }
+
+// check if the referer URL if available
+$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] :
+	(isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : '');
+$referer = '';
+// if referer is set, check if script was invoked from "admin/modules/index.php"
+$required_url = ADMIN_URL . '/modules/index.php';
+if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false))) 
+{ die(header('Location: ../../index.php')); }
+
+// include WB functions file
+require_once(WB_PATH . '/framework/functions.php');
+
+// load WB language file
+require_once(WB_PATH . '/languages/' . LANGUAGE .'.php');
+
+// create Admin object with admin header
+$admin = new admin('Addons', '', true, false);
+
+/**
+ * Manually execute the specified module file (install.php, upgrade.php or uninstall.php)
+ */
+// check if specified module folder exists
+$mod_path = WB_PATH . '/modules/' . basename(WB_PATH . '/' . $_POST['file']);
+
+// let the old variablename if module use it
+$module_dir = $mod_path;
+if (!file_exists($mod_path . '/' . $_POST['action'] . '.php'))
+{
+	$admin->print_header();
+    $admin->print_error($TEXT['NOT_FOUND'].': "'.htmlentities(basename($mod_path)).'/'.$_POST['action'].'.php" ', $js_back);
+}
+
+// include modules install.php script
+require($mod_path . '/' . $_POST['action'] . '.php');
+
+// load module info into database and output status message
+load_module($mod_path, false);
+$msg = $TEXT['EXECUTE'] . ': "' . htmlentities(basename($mod_path)) . '/' . $_POST['action'] . '.php"';
+
+switch ($_POST['action'])
+{
+	case 'install':
+		// $admin->print_header();
+		$admin->print_success($msg, $js_back);
+		break;
+
+	case 'upgrade':
+		upgrade_module(basename($mod_path), false);
+		// $admin->print_header();
+		$admin->print_success($msg, $js_back);
+		break;
+	
+	case 'uninstall':
+		// $admin->print_header();
+		$admin->print_success($msg, $js_back);
+		break;
+}
+

Property changes on: tags/2.8.3/wb/admin/modules/manual_install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/modules/install.php
===================================================================
--- tags/2.8.3/wb/admin/modules/install.php	(nonexistent)
+++ tags/2.8.3/wb/admin/modules/install.php	(revision 1610)
@@ -0,0 +1,200 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
+
+// Check if user uploaded a file
+if(!isset($_FILES['userfile'])) {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Set temp vars
+$temp_dir = WB_PATH.'/temp/';
+$temp_file = $temp_dir . $_FILES['userfile']['name'];
+$temp_unzip = WB_PATH.'/temp/unzip/';
+
+if(!$_FILES['userfile']['error']) {
+	// Try to upload the file to the temp dir
+	if(!move_uploaded_file($_FILES['userfile']['tmp_name'], $temp_file))
+	{
+		$admin->print_error($MESSAGE['GENERIC_BAD_PERMISSIONS']);
+	}
+} else {
+// index for language files
+	$key = 'UNKNOW_UPLOAD_ERROR';
+    switch ($error_code) {
+        case UPLOAD_ERR_INI_SIZE:
+            $key = 'UPLOAD_ERR_INI_SIZE';
+        case UPLOAD_ERR_FORM_SIZE:
+            $key = 'UPLOAD_ERR_FORM_SIZE';
+        case UPLOAD_ERR_PARTIAL:
+            $key = 'UPLOAD_ERR_PARTIAL';
+        case UPLOAD_ERR_NO_FILE:
+            $key = 'UPLOAD_ERR_NO_FILE';
+        case UPLOAD_ERR_NO_TMP_DIR:
+            $key = 'UPLOAD_ERR_NO_TMP_DIR';
+        case UPLOAD_ERR_CANT_WRITE:
+            $key = 'UPLOAD_ERR_CANT_WRITE';
+        case UPLOAD_ERR_EXTENSION:
+            $key = 'UPLOAD_ERR_EXTENSION';
+        default:
+            $key = 'UNKNOW_UPLOAD_ERROR';
+    }
+	$admin->print_error($MESSAGE[$key].'
'.$MESSAGE['GENERIC_CANNOT_UPLOAD']);
+}
+
+// Include the PclZip class file (thanks to 
+require_once(WB_PATH.'/include/pclzip/pclzip.lib.php');
+
+// Remove any vars with name "module_directory"
+unset($module_directory);
+
+// Setup the PclZip object
+$archive = new PclZip($temp_file);
+// Unzip the files to the temp unzip folder
+$list = $archive->extract(PCLZIP_OPT_PATH, $temp_unzip);
+
+// Check if uploaded file is a valid Add-On zip file
+if (!($list && file_exists($temp_unzip . 'index.php')))
+{
+  $admin->print_error($MESSAGE['GENERIC_INVALID_ADDON_FILE']);
+}
+
+// Include the modules info file
+require($temp_unzip.'info.php');
+
+// Perform Add-on requirement checks before proceeding
+require(WB_PATH . '/framework/addon.precheck.inc.php');
+preCheckAddon($temp_file);
+// Delete the temp unzip directory
+rm_full_dir($temp_unzip);
+
+// Check if the file is valid
+if(!isset($module_directory))
+{
+	if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file
+	$admin->print_error($MESSAGE['GENERIC']['INVALID']);
+}
+
+// Check if this module is already installed
+// and compare versions if so
+$new_module_version = $module_version;
+$action="install";
+if(is_dir(WB_PATH.'/modules/'.$module_directory))
+{
+	if(file_exists(WB_PATH.'/modules/'.$module_directory.'/info.php'))
+    {
+		require(WB_PATH.'/modules/'.$module_directory.'/info.php');
+		// Version to be installed is older than currently installed version
+		if (versionCompare($module_version, $new_module_version, '>='))
+        {
+
+			if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file
+			$admin->print_error($MESSAGE['GENERIC']['ALREADY_INSTALLED']);
+		}
+
+		$action="upgrade";
+
+	}
+}
+
+// Check if module dir is writable
+if(!is_writable(WB_PATH.'/modules/'))
+{
+	if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file
+	$admin->print_error($MESSAGE['GENERIC']['BAD_PERMISSIONS']);
+}
+
+// Set module directory
+$module_dir = WB_PATH.'/modules/'.$module_directory;
+
+// Make sure the module dir exists, and chmod if needed
+make_dir($module_dir);
+
+// Unzip module to the module dir
+if(isset($_POST['overwrite'])){
+	$list = $archive->extract(PCLZIP_OPT_PATH, $module_dir, PCLZIP_OPT_REPLACE_NEWER );
+} else {
+	$list = $archive->extract(PCLZIP_OPT_PATH, $module_dir );
+}
+
+if(!$list)
+{
+	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNZIP']);
+}
+/*
+
+if ($list == 0) {
+  $admin->print_error("ERROR : ".$archive->errorInfo(true));
+}
+*/
+// Delete the temp zip file
+if(file_exists($temp_file)) { unlink($temp_file); }
+
+// Chmod all the uploaded files
+$dir = dir($module_dir);
+while (false !== $entry = $dir->read())
+{
+	// Skip pointers
+	if(substr($entry, 0, 1) != '.' AND $entry != '.svn' AND !is_dir($module_dir.'/'.$entry))
+    {
+		// Chmod file
+		change_mode($module_dir.'/'.$entry, 'file');
+	}
+}
+/* */
+// Run the modules install // upgrade script if there is one
+if(file_exists($module_dir.'/'.$action.'.php'))
+{
+	require($module_dir.'/'.$action.'.php');
+}
+
+// Print success message
+if ($action=="install")
+{
+	// Load module info into DB
+	load_module(WB_PATH.'/modules/'.$module_directory, false);
+	$admin->print_success($MESSAGE['GENERIC']['INSTALLED']);
+} elseif ($action=="upgrade")
+{
+
+	upgrade_module($module_directory, false);
+	$admin->print_success($MESSAGE['GENERIC']['UPGRADED']);
+}
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/modules/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/modules/details.php
===================================================================
--- tags/2.8.3/wb/admin/modules/details.php	(nonexistent)
+++ tags/2.8.3/wb/admin/modules/details.php	(revision 1610)
@@ -0,0 +1,143 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
+
+// Get module name
+if(!isset($_POST['file']) OR $_POST['file'] == "")
+{
+	header("Location: index.php");
+	exit(0);
+}
+else
+{
+	$file = preg_replace('/[^a-z0-9_-]/i', "", $_POST['file']);  // fix secunia 2010-92-1
+}
+
+// Check if the module exists
+if(!file_exists(WB_PATH.'/modules/'.$file)) {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('modules_details.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'modules_details.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Insert values
+$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND directory = '$file'");
+if($result->numRows() > 0) {
+	$module = $result->fetchRow();
+}
+
+// check if a module description exists for the displayed backend language
+$tool_description = false;
+if(function_exists('file_get_contents') && file_exists(WB_PATH.'/modules/'.$file.'/languages/'.LANGUAGE .'.php')) {
+	// read contents of the module language file into string
+	$data = @file_get_contents(WB_PATH .'/modules/' .$file .'/languages/' .LANGUAGE .'.php');
+	// use regular expressions to fetch the content of the variable from the string
+	$tool_description = get_variable_content('module_description', $data, false, false);
+	// replace optional placeholder {WB_URL} with value stored in config.php
+	if($tool_description !== false && strlen(trim($tool_description)) != 0) {
+		$tool_description = str_replace('{WB_URL}', WB_URL, $tool_description);
+	} else {
+		$tool_description = false;
+	}
+}		
+if($tool_description !== false) {
+	// Override the module-description with correct desription in users language
+	$module['description'] = $tool_description;
+}
+
+$template->set_var(array(
+								'NAME' => $module['name'],
+								'AUTHOR' => $module['author'],
+								'DESCRIPTION' => $module['description'],
+								'VERSION' => $module['version'],
+								'DESIGNED_FOR' => $module['platform'],
+								'ADMIN_URL' => ADMIN_URL,
+								'WB_URL' => WB_URL,
+								'THEME_URL' => THEME_URL
+								)
+						);
+						
+switch ($module['function']) {
+	case NULL:
+		$type_name = $TEXT['UNKNOWN'];
+		break;
+	case 'page':
+		$type_name = $TEXT['PAGE'];
+		break;
+	case 'wysiwyg':
+		$type_name = $TEXT['WYSIWYG_EDITOR'];
+		break;
+	case 'tool':
+		$type_name = $TEXT['ADMINISTRATION_TOOL'];
+		break;
+	case 'admin':
+		$type_name = $TEXT['ADMIN'];
+		break;
+	case 'administration':
+		$type_name = $TEXT['ADMINISTRATION'];
+		break;
+	case 'snippet':
+		$type_name = $TEXT['CODE_SNIPPET'];
+		break;
+	default:
+		$type_name = $TEXT['UNKNOWN'];
+}
+$template->set_var('TYPE', $type_name);
+
+// Insert language headings
+$template->set_var(array(
+								'HEADING_MODULE_DETAILS' => $HEADING['MODULE_DETAILS']
+								)
+						);
+// Insert language text and messages
+$template->set_var(array(
+								'TEXT_NAME' => $TEXT['NAME'],
+								'TEXT_TYPE' => $TEXT['TYPE'],
+								'TEXT_AUTHOR' => $TEXT['AUTHOR'],
+								'TEXT_VERSION' => $TEXT['VERSION'],
+								'TEXT_DESIGNED_FOR' => $TEXT['DESIGNED_FOR'],
+								'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'],
+								'TEXT_BACK' => $TEXT['BACK']
+								)
+						);
+
+// Parse module object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/modules/details.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/modules/index.php
===================================================================
--- tags/2.8.3/wb/admin/modules/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/modules/index.php	(revision 1610)
@@ -0,0 +1,137 @@
+correct_theme_source('modules.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'modules.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Insert values into module list
+$template->set_block('main_block', 'module_list_block', 'module_list');
+$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' order by name");
+if($result->numRows() > 0) {
+	while ($addon = $result->fetchRow()) {
+		$template->set_var('VALUE', $addon['directory']);
+		$template->set_var('NAME', $addon['name']);
+		$template->parse('module_list', 'module_list_block', true);
+	}
+}
+
+// Insert modules which includes a install.php file to install list
+$module_files = glob(WB_PATH . '/modules/*');
+$template->set_block('main_block', 'install_list_block', 'install_list');
+$template->set_block('main_block', 'upgrade_list_block', 'upgrade_list');
+$template->set_block('main_block', 'uninstall_list_block', 'uninstall_list');
+$template->set_var(array('INSTALL_VISIBLE' => 'hide', 'UPGRADE_VISIBLE' => 'hide', 'UNINSTALL_VISIBLE' => 'hide'));
+
+$show_block = false;
+foreach ($module_files as $index => $path) {
+	if (is_dir($path)) {
+		if (file_exists($path . '/install.php')) {
+			$show_block = true;
+			$template->set_var('INSTALL_VISIBLE', '');
+			$template->set_var('VALUE', basename($path));
+			$template->set_var('NAME', basename($path));
+			$template->parse('install_list', 'install_list_block', true);
+		}
+
+		if (file_exists($path . '/upgrade.php')) {
+			$show_block = true;
+			$template->set_var('UPGRADE_VISIBLE', '');
+			$template->set_var('VALUE', basename($path));
+			$template->set_var('NAME', basename($path));
+			$template->parse('upgrade_list', 'upgrade_list_block', true);
+		} 
+		
+		if (file_exists($path . '/uninstall.php')) {
+			$show_block = true;
+			$template->set_var('UNINSTALL_VISIBLE', '');
+			$template->set_var('VALUE', basename($path));
+			$template->set_var('NAME', basename($path));
+			$template->parse('uninstall_list', 'uninstall_list_block', true);
+		}
+
+	} else {
+		unset($module_files[$index]);
+	}
+}
+
+// Insert permissions values
+if($admin->get_permission('modules_install') != true) {
+	$template->set_var('DISPLAY_INSTALL', 'hide');
+}
+if($admin->get_permission('modules_uninstall') != true) {
+	$template->set_var('DISPLAY_UNINSTALL', 'hide');
+}
+if($admin->get_permission('modules_view') != true) {
+	$template->set_var('DISPLAY_LIST', 'hide');
+}
+// only show block if there is something to show
+if(!$show_block || count($module_files) == 0 || !isset($_GET['advanced']) || $admin->get_permission('admintools') != true) {
+	$template->set_var('DISPLAY_MANUAL_INSTALL', 'hide');
+}
+
+// Insert language headings
+$template->set_var(array(
+					'HEADING_INSTALL_MODULE' => $HEADING['INSTALL_MODULE'],
+					'HEADING_UNINSTALL_MODULE' => $HEADING['UNINSTALL_MODULE'],
+					'OVERWRITE_NEWER_FILES' => $MESSAGE['ADDON_OVERWRITE_NEWER_FILES'],
+					'HEADING_MODULE_DETAILS' => $HEADING['MODULE_DETAILS'],
+					'HEADING_INVOKE_MODULE_FILES' => $HEADING['INVOKE_MODULE_FILES']
+					)
+				);
+// insert urls
+$template->set_var(array(
+					'ADMIN_URL' => ADMIN_URL,
+					'WB_URL' => WB_URL,
+					'THEME_URL' => THEME_URL,
+					'FTAN' => $admin->getFTAN()
+					)
+				);
+// Insert language text and messages
+$template->set_var(array(
+	'URL_TEMPLATES' => $admin->get_permission('templates') ? 
+		'' . $MENU['TEMPLATES'] . '' : '',
+	'URL_LANGUAGES' => $admin->get_permission('languages') ? 
+		'' . $MENU['LANGUAGES'] . '' : '',
+	'URL_ADVANCED' => $admin->get_permission('admintools') ? 
+		'' . $TEXT['ADVANCED'] . '' : '',
+	'TEXT_INSTALL' => $TEXT['INSTALL'],
+	'TEXT_UNINSTALL' => $TEXT['UNINSTALL'],
+	'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'],
+	'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
+	'TEXT_MANUAL_INSTALLATION' => $MESSAGE['ADDON']['MANUAL_INSTALLATION'],
+	'TEXT_MANUAL_INSTALLATION_WARNING' => $MESSAGE['ADDON']['MANUAL_INSTALLATION_WARNING'],
+	'TEXT_EXECUTE' => $TEXT['EXECUTE'],
+	'TEXT_FILE' => $TEXT['FILE']
+	)
+);
+
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/modules/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/modules/uninstall.php
===================================================================
--- tags/2.8.3/wb/admin/modules/uninstall.php	(nonexistent)
+++ tags/2.8.3/wb/admin/modules/uninstall.php	(revision 1610)
@@ -0,0 +1,129 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
+
+// Check if user selected module
+if(!isset($_POST['file']) OR $_POST['file'] == "") {
+	header("Location: index.php");
+	exit(0);
+} else {
+	$file = $admin->add_slashes($_POST['file']);
+}
+
+// Extra protection
+if(trim($file) == '') {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Check if the module exists
+if(!is_dir(WB_PATH.'/modules/'.$file)) {
+	$admin->print_error($MESSAGE['GENERIC']['NOT_INSTALLED']);
+}
+
+if (!function_exists("replace_all")) {
+	function replace_all ($aStr = "", &$aArray ) {
+		foreach($aArray as $k=>$v) $aStr = str_replace("{{".$k."}}", $v, $aStr);
+		return $aStr;
+	}
+}
+
+$info = $database->query("SELECT section_id, page_id FROM ".TABLE_PREFIX."sections WHERE module='".$_POST['file']."'" );
+
+if ( $info->numRows() > 0) {
+	
+	/**
+	*	Modul is in use, so we have to warn the user
+	*/
+	if (!array_key_exists("CANNOT_UNINSTALL_IN_USE_TMPL", $MESSAGE['GENERIC'])) {
+		$add = $info->numRows() == 1 ? "this page" : "these pages";
+		$msg_template_str  = "

{{type}} {{type_name}} could not be uninstalled because it is still in use on {{pages}}";
+		$msg_template_str .= ":
click for editing.

";
+	} else {
+		$msg_template_str = $MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE_TMPL'];
+		$temp = explode(";",$MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE_TMPL_PAGES']);
+		$add = $info->numRows() == 1 ? $temp[0] : $temp[1];
+	}
+	/**
+	*	The template-string for displaying the Page-Titles ... in this case as a link
+	*/
+	$page_template_str = "- {{title}}
";
+	
+	$values = array ('type' => 'Modul', 'type_name' => $file, 'pages' => $add );
+	$msg = replace_all ( $msg_template_str,  $values );
+		
+	$page_names = "";
+	
+	while ($data = $info->fetchRow() ) {
+	
+		$temp = $database->query("SELECT page_title from ".TABLE_PREFIX."pages where page_id=".$data['page_id']);
+		$temp_title = $temp->fetchRow();
+		
+		$page_info = array(
+			'id'	=> $data['page_id'], 
+			'title' => $temp_title['page_title']
+		);
+			
+		$page_names .= replace_all ( $page_template_str, $page_info );
+	}
+	
+	/**
+	*	Printing out the error-message and die().
+	*/
+	$admin->print_error(str_replace ($TEXT['FILE'], "Modul", $MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE']).$msg.$page_names);
+}
+
+// Check if we have permissions on the directory
+if(!is_writable(WB_PATH.'/modules/'.$file)) {
+	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL']);
+}
+
+// Run the modules uninstall script if there is one
+if(file_exists(WB_PATH.'/modules/'.$file.'/uninstall.php')) {
+	require(WB_PATH.'/modules/'.$file.'/uninstall.php');
+}
+
+// Try to delete the module dir
+if(!rm_full_dir(WB_PATH.'/modules/'.$file)) {
+	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL']);
+} else {
+	// Remove entry from DB
+	$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE directory = '".$file."' AND type = 'module'");
+}
+
+// Print success message
+$admin->print_success($MESSAGE['GENERIC']['UNINSTALLED']);
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/modules/uninstall.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/addons/reload.php
===================================================================
--- tags/2.8.3/wb/admin/addons/reload.php	(nonexistent)
+++ tags/2.8.3/wb/admin/addons/reload.php	(revision 1610)
@@ -0,0 +1,146 @@
+ $key) {
+	if (!isset($_POST[$key])) unset($post_check[$index]);
+}
+if (count($post_check) == 0) die(header('Location: index.php?advanced'));
+
+/**
+ * check if user has permissions to access this file
+ */
+// include WB configuration file and WB admin class
+require_once('../../config.php');
+require_once('../../framework/class.admin.php');
+
+// check user permissions for admintools (redirect users with wrong permissions)
+$admin = new admin('Admintools', 'admintools', false, false);
+
+if ($admin->get_permission('admintools') == false) die(header('Location: ../../index.php'));
+
+// check if the referer URL if available
+$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] :
+	(isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : '');
+$referer = '';
+// if referer is set, check if script was invoked from "admin/modules/index.php"
+$required_url = ADMIN_URL . '/addons/index.php';
+if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false)))
+	die(header('Location: ../../index.php'));
+
+// include WB functions file
+require_once(WB_PATH . '/framework/functions.php');
+
+// load WB language file
+require_once(WB_PATH . '/languages/' . LANGUAGE .'.php');
+
+// create Admin object with admin header
+$admin = new admin('Addons', '', false, false);
+$js_back = ADMIN_URL . '/addons/index.php?advanced';
+
+if (!$admin->checkFTAN())
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back);
+}
+
+/**
+ * Reload all specified Addons
+ */
+$msg = array();
+$table = TABLE_PREFIX . 'addons';
+
+foreach ($post_check as $key) {
+	switch ($key) {
+		case 'reload_modules':
+			if ($handle = opendir(WB_PATH . '/modules')) {
+				// delete modules from database
+				$sql = "DELETE FROM `$table` WHERE `type` = 'module'";
+				$database->query($sql);
+
+				// loop over all modules
+				while(false !== ($file = readdir($handle))) {
+					if ($file != '' && substr($file, 0, 1) != '.' && $file != 'admin.php' && $file != 'index.php') {
+						load_module(WB_PATH . '/modules/' . $file);
+					}
+				}
+				closedir($handle);
+				// add success message
+				$msg[] = $MESSAGE['ADDON']['MODULES_RELOADED'];
+
+			} else {
+				// provide error message and stop
+				$admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back);
+			}
+			break;
+			
+		case 'reload_templates':
+			if ($handle = opendir(WB_PATH . '/templates')) {
+				// delete templates from database
+				$sql = "DELETE FROM `$table` WHERE `type` = 'template'";
+				$database->query($sql);
+
+				// loop over all templates
+				while(false !== ($file = readdir($handle))) {
+					if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') {
+						load_template(WB_PATH . '/templates/' . $file);
+					}
+				}
+				closedir($handle);
+				// add success message
+				$msg[] = $MESSAGE['ADDON']['TEMPLATES_RELOADED'];
+
+			} else {
+				// provide error message and stop
+				$admin->print_header();
+				$admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back);
+			}
+			break;
+
+		case 'reload_languages':
+			if ($handle = opendir(WB_PATH . '/languages/')) {
+				// delete languages from database
+				$sql = "DELETE FROM `$table` WHERE `type` = 'language'";
+				$database->query($sql);
+			
+				// loop over all languages
+				while(false !== ($file = readdir($handle))) {
+					if ($file != '' && substr($file, 0, 1) != '.' && $file != 'index.php') {
+						load_language(WB_PATH . '/languages/' . $file);
+					}
+				}
+				closedir($handle);
+				// add success message
+				$msg[] = $MESSAGE['ADDON']['LANGUAGES_RELOADED'];
+				
+			} else {
+				// provide error message and stop
+				$admin->print_header();
+				$admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back);
+			}
+			break;
+	}
+}
+
+// output success message
+$admin->print_header();
+$admin->print_success(implode($msg, '
'), $js_back);
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/addons/reload.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/addons/index.php
===================================================================
--- tags/2.8.3/wb/admin/addons/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/addons/index.php	(revision 1610)
@@ -0,0 +1,100 @@
+correct_theme_source('addons.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+$template->set_file('page', 'addons.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Insert values into the template object
+$template->set_var(array(
+		'ADMIN_URL' => ADMIN_URL,
+		'THEME_URL' => THEME_URL,
+		'WB_URL' => WB_URL
+	)
+);
+
+/**
+ *	Setting up the blocks
+ */
+$template->set_block('main_block', "modules_block", "modules");
+$template->set_block('main_block', "templates_block", "templates");
+$template->set_block('main_block', "languages_block", "languages");
+$template->set_block('main_block', "reload_block", "reload");
+
+/**
+ *	Insert permission values into the template object
+ *	Obsolete as we are using blocks ... see "parsing the blocks" section
+ */
+$display_none = "style=\"display: none;\"";
+if($admin->get_permission('modules') != true) 	$template->set_var('DISPLAY_MODULES', $display_none);	
+if($admin->get_permission('templates') != true)	$template->set_var('DISPLAY_TEMPLATES', $display_none);
+if($admin->get_permission('languages') != true)	$template->set_var('DISPLAY_LANGUAGES', $display_none);
+if($admin->get_permission('admintools') != true)	$template->set_var('DISPLAY_ADVANCED', $display_none);
+
+if(!isset($_GET['advanced']) || $admin->get_permission('admintools') != true)
+	$template->set_var('DISPLAY_RELOAD', $display_none);
+
+/**
+ *	Insert section names and descriptions
+ */
+$template->set_var(array(
+	'ADDONS_OVERVIEW' => $MENU['ADDONS'],
+	'MODULES' => $MENU['MODULES'],
+	'TEMPLATES' => $MENU['TEMPLATES'],
+	'LANGUAGES' => $MENU['LANGUAGES'],
+	'MODULES_OVERVIEW' => $OVERVIEW['MODULES'],
+	'TEMPLATES_OVERVIEW' => $OVERVIEW['TEMPLATES'],
+	'LANGUAGES_OVERVIEW' => $OVERVIEW['LANGUAGES'],
+	'TXT_ADMIN_SETTINGS' => $TEXT['ADMIN'] . ' ' . $TEXT['SETTINGS'],
+	'MESSAGE_RELOAD_ADDONS' => $MESSAGE['ADDON']['RELOAD'],
+	'TEXT_RELOAD' => $TEXT['RELOAD'],
+	'RELOAD_URL' => ADMIN_URL . '/addons/reload.php',
+	'URL_ADVANCED' => $admin->get_permission('admintools')
+                ? '' . $TEXT['ADVANCED'] . '' : '',
+	'ADVANCED_URL' => $admin->get_permission('admintools') ? ADMIN_URL . '/addons/index.php' : '',
+    'TEXT_ADVANCED' => $TEXT['ADVANCED'],
+	'FTAN'			=> $admin->getFTAN()
+	)
+);
+
+/**
+ *	Parsing the blocks ...
+ */
+if ( $admin->get_permission('modules') == true) $template->parse('main_block', "modules_block", true);
+if ( $admin->get_permission('templates') == true) $template->parse('main_block', "templates_block", true);
+if ( $admin->get_permission('languages') == true) $template->parse('main_block', "languages_block", true);
+if ( isset($_GET['advanced']) AND $admin->get_permission('admintools') == true) $template->parse('main_block', "reload_block", true);
+
+/**
+ *	Parse template object
+ */
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+/**
+ *	Print admin footer
+ */
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/addons/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/media/upload.php
===================================================================
--- tags/2.8.3/wb/admin/media/upload.php	(nonexistent)
+++ tags/2.8.3/wb/admin/media/upload.php	(revision 1610)
@@ -0,0 +1,181 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'] );
+}
+// After check print the header
+$admin->print_header();
+
+// Target location
+$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
+$target = (isset(${$requestMethod}['target'])) ? ${$requestMethod}['target'] : '';
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+$directory = ($target == '/') ?  '' : $target;
+$dirlink = 'index.php?dir='.$directory;
+$rootlink = 'index.php?dir=';
+
+// Check to see if target contains ../
+if (!check_media_path($target, false))
+{
+	$admin->print_error($MESSAGE['MEDIA']['TARGET_DOT_DOT_SLASH'] );
+}
+
+// Create relative path of the target location for the file
+$relative = WB_PATH.$target.'/';
+$resizepath = str_replace(array('/',' '),'_',$target);
+
+// Find out whether we should replace files or give an error
+$overwrite = ($admin->get_post('overwrite') != '') ? true : false;
+
+// Get list of file types to which we're supposed to append 'txt'
+$get_result=$database->query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name='rename_files_on_upload' LIMIT 1");
+$file_extension_string='';
+if ($get_result->numRows()>0) {
+	$fetch_result=$get_result->fetchRow();
+	$file_extension_string=$fetch_result['value'];
+}
+
+$file_extensions=explode(",",$file_extension_string);
+// get from settings and add to forbidden list
+$forbidden_file_types  = preg_replace( '/\s*[,;\|#]\s*/','|',RENAME_FILES_ON_UPLOAD);
+// Loop through the files
+$good_uploads = 0;
+$sum_dirs = 0;
+$sum_files = 0;
+
+for($count = 1; $count <= 10; $count++)
+{
+	// If file was upload to tmp
+	if(isset($_FILES["file$count"]['name']))
+	{
+		// Remove bad characters
+		$filename = trim(media_filename($_FILES["file$count"]['name']),'.') ;
+		// Check if there is still a filename left
+		// if($filename != '') {
+		$info = pathinfo($filename);
+		$ext = isset($info['extension']) ? $info['extension'] : '';
+
+		if ( ($filename != '') && !preg_match("/" . $forbidden_file_types . "$/i", $ext) )
+		{
+			// Move to relative path (in media folder)
+			if(file_exists($relative.$filename) AND $overwrite == true) {
+				if(move_uploaded_file($_FILES["file$count"]['tmp_name'], $relative.$filename)) {
+					$good_uploads++;
+					$sum_files++;
+					// Chmod the uploaded file
+					change_mode($relative.$filename);
+				}
+			} elseif(!file_exists($relative.$filename)) {
+				if(move_uploaded_file($_FILES["file$count"]['tmp_name'], $relative.$filename)) {
+					$good_uploads++;
+					$sum_files++;
+					// Chmod the uploaded file
+					change_mode($relative.$filename);
+				}
+			}
+
+			if(file_exists($relative.$filename)) {
+				if ($pathsettings[$resizepath]['width'] || $pathsettings[$resizepath]['height'] ) {
+					$rimg=new RESIZEIMAGE($relative.$filename);
+					$rimg->resize_limitwh($pathsettings[$resizepath]['width'],$pathsettings[$resizepath]['height'],$relative.$filename);
+					$rimg->close();
+				}
+			}
+
+			// store file name of first file for possible unzip action
+			if ($count == 1) {
+				$filename1 = $relative . $filename;
+			}
+		}
+	}
+}
+/*
+ * Callback function to skip files in black-list
+ */
+function pclzipCheckValidFile($p_event, &$p_header)
+{
+    //  return 1;
+// Check for potentially malicious files
+	$forbidden_file_types  = preg_replace( '/\s*[,;\|#]\s*/','|',RENAME_FILES_ON_UPLOAD);
+	$info = pathinfo($p_header['filename']);
+	$ext = isset($info['extension']) ? $info['extension'] : '';
+	$dots = (substr($info['basename'], 0, 1) == '.') || (substr($info['basename'], -1, 1) == '.');
+	if( !preg_match('/'.$forbidden_file_types.'$/i', $ext) && $dots != '.' )
+	{	// ----- allowed file types are extracted
+	  return 1;
+	}else
+	{	// ----- all other files are skiped
+	  return 0;
+	}
+}
+/* ********************************* */
+
+// If the user chose to unzip the first file, unzip into the current folder
+if (isset($_POST['unzip']) && isset($filename1) && file_exists($filename1) ) {
+	// Required to unzip file.
+	require_once(WB_PATH.'/include/pclzip/pclzip.lib.php');
+	$archive = new PclZip($filename1);
+	$list = $archive->extract(PCLZIP_OPT_PATH, $relative,PCLZIP_CB_PRE_EXTRACT, 'pclzipCheckValidFile');
+
+	if($list == 0) {
+		// error while trying to extract the archive (most likely wrong format)
+		$admin->print_error('UNABLE TO UNZIP FILE' . $archive -> errorInfo(true));
+	}
+	$sum_files = 0;
+	// rename executable files!
+	foreach ($list as $key => $val) {
+	    if( ($val['folder'] ) && change_mode($val['filename']) ) {
+		   $sum_dirs++;
+		} elseif( is_writable($val['filename']) && ($val['status'] == 'ok') && change_mode($val['filename']) )  {
+			$sum_files++;
+		}
+	}
+	if (isset($_POST['delzip'])) { unlink($filename1); }
+	$dir = dirname($filename1);
+    if(file_exists($dir)) {
+		$array = createFolderProtectFile($dir);
+    }
+}
+unset($list);
+
+if($sum_files == 1) {
+	$admin->print_success($sum_files.' '.$MESSAGE['MEDIA']['SINGLE_UPLOADED'] );
+} elseif($sum_files > 1) {
+	$admin->print_success($sum_files.' '.$MESSAGE['MEDIA']['UPLOADED'] );
+} else {
+	$admin->print_error($MESSAGE['MEDIA_NO_FILE_UPLOADED'] );
+}
+
+// Print admin
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/media/upload.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/media/index.php
===================================================================
--- tags/2.8.3/wb/admin/media/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/media/index.php	(revision 1610)
@@ -0,0 +1,129 @@
+correct_theme_source('media.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+$template->set_file('page', 'media.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Get home folder not to show
+$home_folders = get_home_folders();
+
+// Insert values
+$template->set_block('main_block', 'dir_list_block', 'dir_list');
+$dirs = directory_list(WB_PATH.MEDIA_DIRECTORY);
+$currentHome = $admin->get_home_folder();
+
+if ($currentHome){
+	$dirs = directory_list(WB_PATH.MEDIA_DIRECTORY.$currentHome);
+}
+else
+{
+	$dirs = directory_list(WB_PATH.MEDIA_DIRECTORY);
+}
+$array_lowercase = array_map('strtolower', $dirs);
+array_multisort($array_lowercase, SORT_ASC, SORT_STRING, $dirs);
+foreach($dirs AS $name) {
+	if(!isset($home_folders[str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)])) {
+		$template->set_var('NAME', str_replace(WB_PATH, '', $name));
+		$template->parse('dir_list', 'dir_list_block', true);
+	}
+}
+
+// Insert permissions values
+if($admin->get_permission('media_create') != true) {
+	$template->set_var('DISPLAY_CREATE', 'hide');
+}
+if($admin->get_permission('media_upload') != true) {
+	$template->set_var('DISPLAY_UPLOAD', 'hide');
+}
+if ($_SESSION['GROUP_ID'] != 1 && $pathsettings['global']['admin_only']) { // Only show admin the settings link
+	$template->set_var('DISPLAY_SETTINGS', 'hide');
+}
+// Workout if the up arrow should be shown
+if(($dirs == '') or ($dirs==$currentHome) or (!array_key_exists('dir', $_GET))) {
+	$display_up_arrow = 'hide';
+} else {
+	$display_up_arrow = '';
+}
+
+// Insert language headings
+$template->set_var(array(
+					'HEADING_BROWSE_MEDIA' => $HEADING['BROWSE_MEDIA'],
+					'HOME_DIRECTORY' => $currentHome,
+					'DISPLAY_UP_ARROW' => $display_up_arrow, // **!
+					'HEADING_CREATE_FOLDER' => $HEADING['CREATE_FOLDER'],
+					'HEADING_UPLOAD_FILES' => $HEADING['UPLOAD_FILES']
+				)
+			);
+// insert urls
+$template->set_var(array(
+					'ADMIN_URL' => ADMIN_URL,
+					'WB_URL' => WB_URL,
+					'WB_PATH' => WB_PATH,
+					'THEME_URL' => THEME_URL
+				)
+			);
+// Insert language text and messages
+$template->set_var(array(
+					'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
+					'TEXT_NAME' => $TEXT['TITLE'],
+					'TEXT_RELOAD' => $TEXT['RELOAD'],
+					'TEXT_TARGET_FOLDER' => $TEXT['TARGET_FOLDER'],
+					'TEXT_OVERWRITE_EXISTING' => $TEXT['OVERWRITE_EXISTING'],
+					'TEXT_FILES' => $TEXT['FILES'],
+					'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'],
+					'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'],
+					'CHANGE_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
+					'OPTIONS' => $TEXT['OPTION'],
+					'TEXT_UNZIP_FILE' => $TEXT['UNZIP_FILE'],
+					'TEXT_DELETE_ZIP' => $TEXT['DELETE_ZIP'],
+					'FTAN' => $admin->getFTAN()
+				)
+			);
+
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+/*
+$endtime=explode(" ", microtime());
+$endtime=$endtime[0]+$endtime[1];
+$debugVMsg = '';
+if($admin->ami_group_member('1') ) {
+	$debugVMsg  = "
Mask loaded in ".round($endtime - $starttime,6)." Sec,  ";
+	$debugVMsg .= "Memory in use ".number_format(memory_get_usage(true), 0, ',', '.')." Byte,  ";
+	$debugVMsg .= sizeof(get_included_files())." included files
";
+	// $debugVMsg = print_message($debugVMsg,'#','debug',-1,false);
+	print $debugVMsg.'
';
+ }
+*/
+// Print admin
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/media/index.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/media/setparameter.php
===================================================================
--- tags/2.8.3/wb/admin/media/setparameter.php	(nonexistent)
+++ tags/2.8.3/wb/admin/media/setparameter.php	(revision 1610)
@@ -0,0 +1,135 @@
+get_post_escaped("save"))) {
+/*
+	if (!$admin->checkFTAN())
+	{
+		$admin->print_error('::'.$MESSAGE['GENERIC_SECURITY_ACCESS'],'browse.php',false);
+	}
+*/
+
+	if(DEFAULT_THEME != ' wb_theme') {
+		//Check for existing settings entry, if not existing, create a record first!
+		if (!$database->query ( "SELECT * FROM ".TABLE_PREFIX."settings where `name`='mediasettings'" )) {
+			$database->query ( "INSERT INTO ".TABLE_PREFIX."settings (`name`,`value`) VALUES ('mediasettings','')" );
+		}
+	} else {
+		$pathsettings = array();
+	}
+
+	$dirs = directory_list(WB_PATH.MEDIA_DIRECTORY);
+	$dirs[] = WB_PATH.MEDIA_DIRECTORY;
+	foreach($dirs AS $name) {
+		$r = str_replace(WB_PATH, '', $name);
+		$r = str_replace(array('/',' '),'_',$r);
+		$w = (int)$admin->get_post_escaped($r.'-w');
+		$h = (int)$admin->get_post_escaped($r.'-h');
+		$pathsettings[$r]['width']=$w; 
+		$pathsettings[$r]['height']=$h;
+	}
+	$pathsettings['global']['admin_only'] = ($admin->get_post_escaped('admin_only')!=''?'checked':'');
+	$pathsettings['global']['show_thumbs'] = ($admin->get_post_escaped('show_thumbs')!=''?'checked':'');
+	$fieldSerialized = serialize($pathsettings);
+	$database->query ( "UPDATE ".TABLE_PREFIX."settings SET `value` = '$fieldSerialized' WHERE `name`='mediasettings'" );
+	header ("Location: browse.php");
+}
+
+include ('parameters.php');
+if ($_SESSION['GROUP_ID'] != 1 && $pathsettings['global']['admin_only']) {
+	echo "Sorry, settings not available";
+	exit();
+}
+
+// Read data to display
+$caller = "setparameter";
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('setparameter.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+$template->set_file('page', 'setparameter.htt');
+$template->set_block('page', 'main_block', 'main');
+if ($_SESSION['GROUP_ID'] != 1) {
+	$template->set_var('DISPLAY_ADMIN', 'hide');
+}
+$template->set_var(array( 
+				'TEXT_HEADER' => $TEXT['TEXT_HEADER'],
+				'SAVE_TEXT' => $TEXT['SAVE'],
+				'BACK' => $TEXT['BACK'],
+			)
+		);
+
+$template->set_block('main_block', 'list_block', 'list');
+$row_bg_color = '';
+$dirs = directory_list(WB_PATH.MEDIA_DIRECTORY);
+$dirs[] = WB_PATH.MEDIA_DIRECTORY;
+
+$array_lowercase = array_map('strtolower', $dirs);
+array_multisort($array_lowercase, SORT_ASC, SORT_STRING, $dirs);
+
+foreach($dirs AS $name) {
+	$relative = str_replace(WB_PATH, '', $name);
+	$safepath = str_replace(array('/',' '),'_',$relative);
+	$cur_width = $cur_height = '';
+	if (isset($pathsettings[$safepath]['width'])) $cur_width = $pathsettings[$safepath]['width'];
+	if (isset($pathsettings[$safepath]['height'])) $cur_height = $pathsettings[$safepath]['height'];
+	$cur_width = ($cur_width ? (int)$cur_width : '-');
+	$cur_height = ($cur_height ? (int)$cur_height : '-');
+
+	if($row_bg_color == 'DEDEDE') $row_bg_color = 'EEEEEE';
+	else $row_bg_color = 'DEDEDE';
+
+	$template->set_var(array( 
+					'ADMIN_URL' => ADMIN_URL,
+					'PATH_NAME' => $relative,
+					'WIDTH' => $TEXT['WIDTH'],
+					'HEIGHT' => $TEXT['HEIGHT'],
+					'FIELD_NAME_W' => $safepath.'-w',
+					'FIELD_NAME_H' => $safepath.'-h',
+					'CUR_WIDTH' => $cur_width,
+					'CUR_HEIGHT' => $cur_height,
+					'SETTINGS' => $TEXT['SETTINGS'],
+					'ADMIN_ONLY' => $TEXT['ADMIN_ONLY'],
+					'ADMIN_ONLY_SELECTED' => $pathsettings['global']['admin_only'],
+					'NO_SHOW_THUMBS' => $TEXT['NO_SHOW_THUMBS'],
+					'NO_SHOW_THUMBS_SELECTED' => $pathsettings['global']['show_thumbs'],
+					'ROW_BG_COLOR' => $row_bg_color,
+					'FTAN' => $admin->getFTAN()
+				)
+		);
+	$template->parse('list', 'list_block', true);
+}
+
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');

Property changes on: tags/2.8.3/wb/admin/media/setparameter.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/media/browse.php
===================================================================
--- tags/2.8.3/wb/admin/media/browse.php	(nonexistent)
+++ tags/2.8.3/wb/admin/media/browse.php	(revision 1610)
@@ -0,0 +1,326 @@
+ 0 ) {
+		$exp = floor( log($bytes)/log(1024) );
+		$converted_value = ( $bytes/pow(1024,floor($exp)) );
+	}
+	return sprintf( '%.2f '.$symbol[$exp], $converted_value );
+}
+
+// Get file extension
+function get_filetype($fname) {
+	$pathinfo = pathinfo($fname);
+	$extension = (isset($pathinfo['extension'])) ? strtolower($pathinfo['extension']) : '';
+	return $extension;
+}
+
+// Get file extension for icons
+function get_filetype_icon($fname) {
+	$pathinfo = pathinfo($fname);
+	$extension = (isset($pathinfo['extension'])) ? strtolower($pathinfo['extension']) : '';
+	if (file_exists(THEME_PATH.'/images/files/'.$extension.'.png')) {
+		return $extension;
+	} else {
+		return 'blank_16';
+	}
+}
+
+function ShowTip($name,$detail='') {
+$parts = explode(".", $name);
+$ext = strtolower(end($parts));
+if (strpos('.gif.jpg.jpeg.png.bmp.',$ext) )
+	return 'onmouseover="overlib(\'\',VAUTO, WIDTH)" onmouseout="nd()" ' ;
+else
+	return '';
+}
+
+function fsize($size) {
+   if($size == 0) return("0 Bytes");
+   $filesizename = array(" bytes", " kB", " MB", " GB", " TB");
+   return round($size/pow(1024, ($i = floor(log($size, 1024)))), 1) . $filesizename[$i];
+}
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('media_browse.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+$template->set_file('page', 'media_browse.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Get the current dir
+$currentHome = $admin->get_home_folder();
+$directory =	(($currentHome) AND (!array_key_exists('dir',$_GET)))
+				?
+				$currentHome
+				:
+				$admin->strip_slashes($admin->get_get('dir')) ;
+
+if($directory == '/' OR $directory == '\\') {
+	$directory = '';
+}
+
+$dir_backlink = 'browse.php?dir='.$directory;
+
+// Check to see if it contains ../
+if (!check_media_path($directory)) {
+	// $admin->print_header();
+	$admin->print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH']);
+}
+
+if(!file_exists(WB_PATH.MEDIA_DIRECTORY.$directory)) {
+	// $admin->print_header();
+	$admin->print_error($MESSAGE['MEDIA']['DIR_DOES_NOT_EXIST']);
+}
+
+// Check to see if the user wanted to go up a directory into the parent folder
+if($admin->get_get('up') == 1) {
+	$parent_directory = dirname($directory);
+	header("Location: browse.php?dir=$parent_directory");
+	exit(0);
+}
+
+if ($_SESSION['GROUP_ID'] != 1 && $pathsettings['global']['admin_only']) { // Only show admin the settings link
+	$template->set_var('DISPLAY_SETTINGS', 'hide');
+}
+
+// Workout the parent dir link
+$parent_dir_link = ADMIN_URL.'/media/browse.php?dir='.$directory.'&up=1';
+// Workout if the up arrow should be shown
+if(($directory == '') or ($directory==$currentHome)) {
+	$display_up_arrow = 'hide';
+} else {
+	$display_up_arrow = '';
+}
+
+// Insert values
+$template->set_var(array(
+					'THEME_URL' => THEME_URL,
+					// 'THEME_URL' => '',
+					'CURRENT_DIR' => $directory,
+					'PARENT_DIR_LINK' => $parent_dir_link,
+					'DISPLAY_UP_ARROW' => $display_up_arrow,
+					'INCLUDE_PATH' => WB_URL.'/include'
+				)
+			);
+
+// Get home folder not to show
+$home_folders = get_home_folders();
+
+// Generate list
+$template->set_block('main_block', 'list_block', 'list');
+
+$usedFiles = array();
+// require_once(ADMIN_PATH.'/media/dse.php');
+// $filename =  $currentdir;
+if(!empty($currentdir)) {
+	$usedFiles = $Dse->getMatchesFromDir( $currentdir, DseTwo::RETURN_USED);
+}
+
+// Check for potentially malicious files
+$forbidden_file_types  = preg_replace( '/\s*[,;\|#]\s*/','|',RENAME_FILES_ON_UPLOAD);
+
+if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.'/'.$directory)) {
+	// Loop through the files and dirs an add to list
+   while (false !== ($file = readdir($handle))) {
+		$info = pathinfo($file);
+		$ext = isset($info['extension']) ? $info['extension'] : '';
+		if(substr($file, 0, 1) != '.' AND $file != '.svn' AND $file != 'index.php') {
+			if( !preg_match('/'.$forbidden_file_types.'$/i', $ext) ) {
+				if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file)) {
+					if(!isset($home_folders[$directory.'/'.$file])) {
+						$DIR[] = $file;
+					}
+				} else {
+					$FILE[] = $file;
+				}
+			}
+		}
+	}
+	// Now parse these values to the template
+	$temp_id = 0;
+	$row_bg_color = 'FFF';
+	if(isset($DIR)) {
+		sort($DIR);
+		foreach($DIR AS $name) {
+			$link_name = str_replace(' ', '%20', $name);
+			$temp_id++;
+			$template->set_var(array(
+								'NAME' => $name,
+								'NAME_SLASHED' => addslashes($name),
+								'TEMP_ID' => $admin->getIDKEY($temp_id),
+								// 'TEMP_ID' => $temp_id,
+								'LINK' => "browse.php?dir=$directory/$link_name",
+								'LINK_TARGET' => '_self',
+								'ROW_BG_COLOR' => $row_bg_color,
+								'FT_ICON' => THEME_URL.'/images/folder_16.png',
+								'FILETYPE_ICON' => THEME_URL.'/images/folder_16.png',
+								'MOUSEOVER' => '',
+								'IMAGEDETAIL' => '',
+								'SIZE' => '',
+								'DATE' => '',
+								'PREVIEW' => '',
+								'IMAGE_TITLE' => $name,
+								'IMAGE_EXIST' => 'blank_16.gif'
+							)
+						);
+			$template->parse('list', 'list_block', true);
+			// Code to alternate row colors
+			if($row_bg_color == 'FFF') {
+				$row_bg_color = 'ECF1F3';
+			} else {
+				$row_bg_color = 'FFF';
+			}
+		}
+	}
+	if(isset($FILE)) {
+		sort($FILE);
+		$filepreview = array('jpg','gif','tif','tiff','png','txt','css','js','cfg','conf','pdf','zip','gz','doc');
+		foreach($FILE AS $name) {
+			$size = filesize('../../'.MEDIA_DIRECTORY.$directory.'/'.$name);
+			$bytes = byte_convert($size);
+			$fdate = filemtime('../../'.MEDIA_DIRECTORY.$directory.'/'.$name);
+			$date = gmdate(DATE_FORMAT.' '.TIME_FORMAT, $fdate);
+			$filetypeicon = get_filetype_icon(WB_URL.MEDIA_DIRECTORY.$directory.'/'.$name);
+			$filetype = get_filetype(WB_URL.MEDIA_DIRECTORY.$directory.'/'.$name);
+
+			if (in_array($filetype, $filepreview)) {
+				$preview = 'preview';
+			} else {
+				$preview = '';
+			}
+			$temp_id++;
+			$imgdetail = '';
+			// $icon = THEME_URL.'/images/blank_16.gif';
+			$icon = '';
+			$tooltip = '';
+
+
+			if (!$pathsettings['global']['show_thumbs']) {
+				$info = getimagesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name);
+				if ($info[0]) {
+					$imgdetail = fsize(filesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name)).'
 '.$info[0].' x '.$info[1].' px';
+					$icon = 'thumb.php?t=1&img='.$directory.'/'.$name;
+					$tooltip = ShowTip('thumb.php?t=2&img='.$directory.'/'.$name);
+				}
+			}
+
+			$filetype_url = THEME_URL.'/images/files/'.$filetypeicon.'.png';
+			$template->set_var(array(
+								'NAME' => $name,
+								'NAME_SLASHED' => addslashes($name),
+								'TEMP_ID' => $admin->getIDKEY($temp_id),
+								// 'TEMP_ID' => $temp_id,
+								'LINK' => WB_URL.MEDIA_DIRECTORY.$directory.'/'.$name,
+								'LINK_TARGET' => '_blank',
+								'ROW_BG_COLOR' => $row_bg_color,
+								'FT_ICON' => empty($icon) ? $filetype_url : $icon,
+								'FILETYPE_ICON' => $filetype_url,
+								'MOUSEOVER' => $tooltip,
+								'IMAGEDETAIL' => $imgdetail,
+								'SIZE' => $bytes,
+								'DATE' => $date,
+								'PREVIEW' => $preview,
+								'IMAGE_TITLE' => $name,
+								'IMAGE_EXIST' =>  'blank_16.gif'
+							)
+						);
+			$template->parse('list', 'list_block', true);
+			// Code to alternate row colors
+			if($row_bg_color == 'FFF') {
+				$row_bg_color = 'ECF1F3';
+			} else {
+				$row_bg_color = 'FFF';
+			}
+		}
+	}
+}
+
+// If no files are in the media folder say so
+if($temp_id == 0) {
+	$template->set_var('DISPLAY_LIST_TABLE', 'hide');
+} else {
+	$template->set_var('DISPLAY_NONE_FOUND', 'hide');
+}
+
+// Insert permissions values
+if($admin->get_permission('media_rename') != true) {
+	$template->set_var('DISPLAY_RENAME', 'hide');
+}
+if($admin->get_permission('media_delete') != true) {
+	$template->set_var('DISPLAY_DELETE', 'hide');
+}
+
+// Insert language text and messages
+$template->set_var(array(
+					'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
+					'TEXT_CURRENT_FOLDER' => $TEXT['CURRENT_FOLDER'],
+					'TEXT_RELOAD' => $TEXT['RELOAD'],
+					'TEXT_RENAME' => $TEXT['RENAME'],
+					'TEXT_DELETE' => $TEXT['DELETE'],
+					'TEXT_SIZE' => $TEXT['SIZE'],
+					'TEXT_DATE' => $TEXT['DATE'],
+					'TEXT_NAME' => $TEXT['NAME'],
+					'TEXT_TYPE' => $TEXT['TYPE'],
+					'TEXT_UP' => $TEXT['UP'],
+					'NONE_FOUND' => $MESSAGE['MEDIA']['NONE_FOUND'],
+					'CHANGE_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
+					'CONFIRM_DELETE' => $MESSAGE['MEDIA']['CONFIRM_DELETE']
+				)
+			);
+
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+/*
+$endtime=explode(" ", microtime());
+$endtime=$endtime[0]+$endtime[1];
+$debugVMsg = '';
+if($admin->ami_group_member('1') ) {
+	$debugVMsg  = "
Mask loaded in ".round($endtime - $starttime,6)." Sec,  ";
+	$debugVMsg .= "Memory in use ".number_format(memory_get_usage(true), 0, ',', '.')." Byte,  ";
+	$debugVMsg .= sizeof(get_included_files())." included files
";
+	// $debugVMsg = print_message($debugVMsg,'#','debug',-1,false);
+	print $debugVMsg.'
';
+ }
+*/ 
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/media/browse.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/media/parameters.php
===================================================================
--- tags/2.8.3/wb/admin/media/parameters.php	(nonexistent)
+++ tags/2.8.3/wb/admin/media/parameters.php	(revision 1610)
@@ -0,0 +1,35 @@
+query ( "SELECT * FROM ".TABLE_PREFIX."settings where `name`='mediasettings'" );
+	if ($query && $query->numRows() > 0) {
+		$settings = $query->fetchRow();
+		$pathsettings = __unserialize($settings['value']);
+	} else {
+		$database->query ( "INSERT INTO ".TABLE_PREFIX."settings (`name`,`value`) VALUES ('mediasettings','')" );
+	}
+}
+

Property changes on: tags/2.8.3/wb/admin/media/parameters.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/media/rename.php
===================================================================
--- tags/2.8.3/wb/admin/media/rename.php	(nonexistent)
+++ tags/2.8.3/wb/admin/media/rename.php	(revision 1610)
@@ -0,0 +1,143 @@
+get_get('dir');
+$directory = ($directory == '/') ?  '' : $directory;
+
+$dirlink = 'browse.php?dir='.$directory;
+$rootlink = 'browse.php?dir=';
+// $file_id = intval($admin->get_get('id'));
+
+// first Check to see if it contains ..
+if (!check_media_path($directory)) {
+	$admin->print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH'],$rootlink, false);
+}
+
+// Get the temp id
+$file_id = intval($admin->checkIDKEY('id', false, $_SERVER['REQUEST_METHOD']));
+if (!$file_id) {
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$dirlink, false);
+}
+
+// Get home folder not to show
+$home_folders = get_home_folders();
+// Check for potentially malicious files
+$forbidden_file_types  = preg_replace( '/\s*[,;\|#]\s*/','|',RENAME_FILES_ON_UPLOAD);
+
+// Figure out what folder name the temp id is
+if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.'/'.$directory)) {
+	// Loop through the files and dirs an add to list
+   while (false !== ($file = readdir($handle))) {
+		$info = pathinfo($file);
+		$ext = isset($info['extension']) ? $info['extension'] : '';
+		if(substr($file, 0, 1) != '.' AND $file != '.svn' AND $file != 'index.php') {
+			if( !preg_match('/'.$forbidden_file_types.'$/i', $ext) ) {
+				if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file)) {
+					if(!isset($home_folders[$directory.'/'.$file])) {
+						$DIR[] = $file;
+					}
+				} else {
+					$FILE[] = $file;
+				}
+			}
+		}
+	}
+
+	$temp_id = 0;
+	if(isset($DIR)) {
+		sort($DIR);
+		foreach($DIR AS $name) {
+			$temp_id++;
+			if($file_id == $temp_id) {
+				$rename_file = $name;
+				$type = 'folder';
+			}
+		}
+	}
+
+	if(isset($FILE)) {
+		sort($FILE);
+		foreach($FILE AS $name) {
+			$temp_id++;
+			if($file_id == $temp_id) {
+				$rename_file = $name;
+				$type = 'file';
+			}
+		}
+	}
+}
+
+if(!isset($rename_file)) {
+	$admin->print_error($MESSAGE['MEDIA']['FILE_NOT_FOUND'], $dirlink, false);
+}
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('media_rename.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+$template->set_file('page', 'media_rename.htt');
+$template->set_block('page', 'main_block', 'main');
+//echo WB_PATH.'/media/'.$directory.'/'.$rename_file;
+if($type == 'folder') {
+	$template->set_var('DISPlAY_EXTENSION', 'hide');
+	$extension = '';
+} else {
+	$template->set_var('DISPlAY_EXTENSION', '');
+	$extension = strstr($rename_file, '.');
+}
+
+if($type == 'folder') {
+	$type = $TEXT['FOLDER'];
+} else {
+	$type = $TEXT['FILE'];
+}
+
+$template->set_var(array(
+					'THEME_URL' => THEME_URL,
+					'FILENAME' => $rename_file,
+					'DIR' => $directory,
+					'FILE_ID' => $admin->getIDKEY($file_id),
+					// 'FILE_ID' => $file_id,
+					'TYPE' => $type,
+					'EXTENSION' => $extension,
+					'FTAN' => $admin->getFTAN()
+				)
+			);
+
+
+// Insert language text and messages
+$template->set_var(array(
+					'TEXT_TO' => $TEXT['TO'],
+					'TEXT_RENAME' => $TEXT['RENAME'],
+					'TEXT_CANCEL' => $TEXT['CANCEL'],
+					'TEXT_UP' => $TEXT['UP'],
+					'TEXT_OVERWRITE_EXISTING' => $TEXT['OVERWRITE_EXISTING']
+				)
+			);
+
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');

Property changes on: tags/2.8.3/wb/admin/media/rename.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/media/rename2.php
===================================================================
--- tags/2.8.3/wb/admin/media/rename2.php	(nonexistent)
+++ tags/2.8.3/wb/admin/media/rename2.php	(revision 1610)
@@ -0,0 +1,170 @@
+get_post('id'));
+
+// first Check to see if it contains ..
+if (!check_media_path($directory)) {
+	$admin->print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH'],$rootlink, false);
+}
+
+// Get the temp id
+$file_id = intval($admin->checkIDKEY('id', false, $_SERVER['REQUEST_METHOD']));
+if (!$file_id) {
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$dirlink, false);
+}
+
+// Check for potentially malicious files
+$forbidden_file_types  = preg_replace( '/\s*[,;\|#]\s*/','|',RENAME_FILES_ON_UPLOAD);
+// Get home folder not to show
+$home_folders = get_home_folders();
+
+// Figure out what folder name the temp id is
+if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.'/'.$directory)) {
+	// Loop through the files and dirs an add to list
+   while (false !== ($file = readdir($handle))) {
+		$info = pathinfo($file);
+		$ext = isset($info['extension']) ? $info['extension'] : '';
+		if(substr($file, 0, 1) != '.' AND $file != '.svn' AND $file != 'index.php') {
+			if( !preg_match('/'.$forbidden_file_types.'$/i', $ext) ) {
+				if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file)) {
+					if(!isset($home_folders[$directory.'/'.$file])) {
+						$DIR[] = $file;
+					}
+				} else {
+					$FILE[] = $file;
+				}
+			}
+		}
+	}
+	$temp_id = 0;
+	if(isset($DIR)) {
+		sort($DIR);
+		foreach($DIR AS $name) {
+			$temp_id++;
+			if($file_id == $temp_id) {
+				$rename_file = $name;
+				$type = 'folder';
+			}
+		}
+	}
+	if(isset($FILE)) {
+		sort($FILE);
+		foreach($FILE AS $name) {
+			$temp_id++;
+			if($file_id == $temp_id) {
+				$rename_file = $name;
+				$type = 'file';
+			}
+		}
+	}
+}
+
+$file_id = $admin->getIDKEY($file_id);
+
+if(!isset($rename_file)) {
+	$admin->print_error($MESSAGE['MEDIA']['FILE_NOT_FOUND'], $dirlink, false);
+}
+
+// Check if they entered a new name
+if(media_filename($admin->get_post('name')) == "") {
+	$admin->print_error($MESSAGE['MEDIA']['BLANK_NAME'], "rename.php?dir=$directory&id=$file_id", false);
+} else {
+	$old_name = $admin->get_post('old_name');
+	$new_name =  media_filename($admin->get_post('name'));
+}
+
+// Check if they entered an extension
+if($type == 'file') {
+	if(media_filename($admin->get_post('extension')) == "") {
+		$admin->print_error($MESSAGE['MEDIA']['BLANK_EXTENSION'], "rename.php?dir=$directory&id=$file_id", false);
+	} else {
+		$extension = media_filename($admin->get_post('extension'));
+	}
+} else {
+	$extension = '';
+}
+
+// Join new name and extension
+$name = $new_name.$extension;
+
+$info = pathinfo(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name);
+$ext = isset($info['extension']) ? $info['extension'] : '';
+$dots = (substr($info['basename'], 0, 1) == '.') || (substr($info['basename'], -1, 1) == '.');
+
+if( preg_match('/'.$forbidden_file_types.'$/i', $ext) || $dots == '.' ) {
+	$admin->print_error($MESSAGE['MEDIA']['CANNOT_RENAME'], "rename.php?dir=$directory&id=$file_id", false);
+}
+
+// Check if the name contains ..
+if(strstr($name, '..')) {
+	$admin->print_error($MESSAGE['MEDIA']['NAME_DOT_DOT_SLASH'], "rename.php?dir=$directory&id=$file_id", false);
+}
+
+// Check if the name is index.php
+if($name == 'index.php') {
+	$admin->print_error($MESSAGE['MEDIA']['NAME_INDEX_PHP'], "rename.php?dir=$directory&id=$file_id", false);
+}
+
+// Check that the name still has a value
+if($name == '') {
+	$admin->print_error($MESSAGE['MEDIA']['BLANK_NAME'], "rename.php?dir=$directory&id=$file_id", false);
+}
+
+$info = pathinfo(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$rename_file);
+$ext = isset($info['extension']) ? $info['extension'] : '';
+$dots = (substr($info['basename'], 0, 1) == '.') || (substr($info['basename'], -1, 1) == '.');
+
+if( preg_match('/'.$forbidden_file_types.'$/i', $ext) || $dots == '.' ) {
+	$admin->print_error($MESSAGE['MEDIA']['CANNOT_RENAME'], "rename.php?dir=$directory&id=$file_id", false);
+}
+
+// Check if we should overwrite or not
+if($admin->get_post('overwrite') != 'yes' AND file_exists(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name) == true) {
+	if($type == 'folder') {
+		$admin->print_error($MESSAGE['MEDIA']['DIR_EXISTS'], "rename.php?dir=$directory&id=$file_id", false);
+	} else {
+		$admin->print_error($MESSAGE['MEDIA']['FILE_EXISTS'], "rename.php?dir=$directory&id=$file_id", false);
+	}
+}
+
+// Try and rename the file/folder
+if(rename(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$rename_file, WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name)) {
+	$usedFiles = array();
+    // feature freeze
+	// require_once(ADMIN_PATH.'/media/dse.php');
+
+	$admin->print_success($MESSAGE['MEDIA']['RENAMED'], $dirlink);
+} else {
+	$admin->print_error($MESSAGE['MEDIA']['CANNOT_RENAME'], "rename.php?dir=$directory&id=$file_id", false);
+}

Property changes on: tags/2.8.3/wb/admin/media/rename2.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/media/delete.php
===================================================================
--- tags/2.8.3/wb/admin/media/delete.php	(nonexistent)
+++ tags/2.8.3/wb/admin/media/delete.php	(revision 1610)
@@ -0,0 +1,121 @@
+get_get('dir');
+$directory = ($directory == '/') ?  '' : $directory;
+
+$dirlink = 'browse.php?dir='.$directory;
+$rootlink = 'browse.php?dir=';
+
+// Check to see if it contains ..
+if (!check_media_path($directory)) {
+	// $admin->print_header();
+	$admin->print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH'],$rootlink,false );
+}
+
+// Get the file id
+$file_id = $admin->checkIDKEY('id', false, $_SERVER['REQUEST_METHOD']);
+if (!$file_id) {
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $dirlink,false);
+}
+
+// Get home folder not to show
+$home_folders = get_home_folders();
+$usedFiles = array();
+// feature freeze
+// require_once(ADMIN_PATH.'/media/dse.php');
+/*
+
+if(!empty($currentdir)) {
+	$usedFiles = $Dse->getMatchesFromDir( $directory, DseTwo::RETURN_USED);
+}
+*/
+// Figure out what folder name the temp id is
+if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.'/'.$directory)) {
+	// Loop through the files and dirs an add to list
+   while (false !== ($file = readdir($handle))) {
+		if(substr($file, 0, 1) != '.' AND $file != '.svn' AND $file != 'index.php') {
+			if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file)) {
+				if(!isset($home_folders[$directory.'/'.$file])) {
+					$DIR[] = $file;
+				}
+			} else {
+				$FILE[] = $file;
+			}
+		}
+	}
+	$temp_id = 0;
+	if(isset($DIR)) {
+		sort($DIR);
+		foreach($DIR AS $name) {
+			$temp_id++;
+			if(!isset($delete_file) AND $file_id == $temp_id) {
+				$delete_file = $name;
+				$type = 'folder';
+			}
+		}
+	}
+	if(isset($FILE)) {
+		sort($FILE);
+		foreach($FILE AS $name) {
+			$temp_id++;
+			if(!isset($delete_file) AND $file_id == $temp_id) {
+				$delete_file = $name;
+				$type = 'file';
+			}
+		}
+	}
+}
+
+// Check to see if we could find an id to match
+if(!isset($delete_file)) {
+	$admin->print_error($MESSAGE['MEDIA']['FILE_NOT_FOUND'], $dirlink, false);
+}
+$relative_path = WB_PATH.MEDIA_DIRECTORY.'/'.$directory.'/'.$delete_file;
+// Check if the file/folder exists
+if(!file_exists($relative_path)) {
+	$admin->print_error($MESSAGE['MEDIA']['FILE_NOT_FOUND'], $dirlink, false);
+}
+
+// Find out whether its a file or folder
+if($type == 'folder') {
+	// Try and delete the directory
+	if(rm_full_dir($relative_path)) {
+		$admin->print_success($MESSAGE['MEDIA']['DELETED_DIR'], $dirlink);
+	} else {
+		$admin->print_error($MESSAGE['MEDIA']['CANNOT_DELETE_DIR'], $dirlink, false);
+	}
+} else {
+	// Try and delete the file
+	if(unlink($relative_path)) {
+		$admin->print_success($MESSAGE['MEDIA']['DELETED_FILE'], $dirlink);
+	} else {
+		$admin->print_error($MESSAGE['MEDIA']['CANNOT_DELETE_FILE'], $dirlink, false);
+	}
+}
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/media/delete.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/media/create.php
===================================================================
--- tags/2.8.3/wb/admin/media/create.php	(nonexistent)
+++ tags/2.8.3/wb/admin/media/create.php	(revision 1610)
@@ -0,0 +1,77 @@
+print_header();
+	$admin->print_error($MESSAGE['MEDIA']['NAME_DOT_DOT_SLASH']);
+}
+
+// Remove bad characters
+$name = trim(media_filename($name),'.');
+
+// Target location
+$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
+$target = (isset(${$requestMethod}['target'])) ? ${$requestMethod}['target'] : '';
+
+if (!$admin->checkFTAN())
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
+
+if (!check_media_path($target, false)) {
+	$admin->print_error($MESSAGE['MEDIA']['TARGET_DOT_DOT_SLASH']);
+}
+
+// Create relative path of the new dir name
+$directory = WB_PATH.$target.'/'.$name;
+
+// Check to see if the folder already exists
+if(file_exists($directory)) {
+	$admin->print_error($MESSAGE['MEDIA']['DIR_EXISTS']);
+}
+
+if ( sizeof(createFolderProtectFile( $directory )) )
+{
+	$admin->print_error($MESSAGE['MEDIA']['DIR_NOT_MADE']);
+} else {
+	$usedFiles = array();
+    // feature freeze
+	// require_once(ADMIN_PATH.'/media/dse.php');
+	$admin->print_success($MESSAGE['MEDIA']['DIR_MADE']);
+}
+
+// Print admin
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/media/create.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/media/nopreview.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/jpeg

Property changes on: tags/2.8.3/wb/admin/media/nopreview.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/jpeg
\ No newline at end of property
Index: tags/2.8.3/wb/admin/media/dse.php
===================================================================
--- tags/2.8.3/wb/admin/media/dse.php	(nonexistent)
+++ tags/2.8.3/wb/admin/media/dse.php	(revision 1610)
@@ -0,0 +1,31 @@
+db_handle;
+$Dse = new DseTwo();
+$Dse->db_handle = $link;
+$Dse->db_name = DB_NAME;
+$Dse->base_dir = WB_PATH.MEDIA_DIRECTORY;
+$Dse->table_prefix = TABLE_PREFIX;
+$Dse->cache_dir = $CachePath;
+
+$Dse->addControllList($ListFile, DseTwo::USE_WHITELIST );  // $type const USE_ALL / USE_BLACKLIST / USE_WHITELIST
+
+if(!empty($directory)) {
+	$usedFiles = $Dse->getMatchesFromDir( $directory, DseTwo::RETURN_USED);
+}
+

Property changes on: tags/2.8.3/wb/admin/media/dse.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/media/MediaBlackList
===================================================================
--- tags/2.8.3/wb/admin/media/MediaBlackList	(nonexistent)
+++ tags/2.8.3/wb/admin/media/MediaBlackList	(revision 1610)
@@ -0,0 +1,29 @@
+addons
+groups
+mod_addon_file_editor
+mod_bookmarks_groups
+mod_bookmarks_links
+mod_bookmarks_settings
+mod_captcha_control
+mod_download_gallery_file_ext
+mod_download_gallery_settings
+mod_droplets
+mod_form_fields
+mod_form_settings
+mod_jsadmin
+mod_menu_link
+mod_mpform_fields
+od_mpform_settings
+mod_news_settings
+mod_output_filter
+mod_section_pick
+mod_topics_settings
+mod_addons
+mod_wbanner_groups
+mod_wbanner_stats
+mod_wrapper
+pages
+search
+sections
+settings
+users
Index: tags/2.8.3/wb/admin/media/MediaWhiteList
===================================================================
--- tags/2.8.3/wb/admin/media/MediaWhiteList	(nonexistent)
+++ tags/2.8.3/wb/admin/media/MediaWhiteList	(revision 1610)
@@ -0,0 +1,33 @@
+mod_addon_file_editor
+mod_bookmarks_groups
+mod_bookmarks_links
+mod_bookmarks_settings
+mod_brax_highslide_images
+mod_brax_highslide_settings
+mod_capslider_groups
+mod_capslider_slide
+mod_captcha_control
+mod_code
+mod_color4code
+mod_download_gallery_files
+mod_download_gallery_settings
+mod_droplets
+mod_form_fields
+mod_form_settings
+mod_form_submissions
+mod_mpform_settings
+mod_mpform_submissions
+mod_news_comments
+mod_news_groups
+mod_news_posts
+mod_news_settings
+mod_output_filter
+mod_section_pick
+mod_topics
+mod_topics_comments
+mod_topics_settings
+mod_addons
+mod_wbanner_banner
+mod_wrapper
+mod_wysiwyg
+mod_wysiwyg_hist
Index: tags/2.8.3/wb/admin/media/resize_img.php
===================================================================
--- tags/2.8.3/wb/admin/media/resize_img.php	(nonexistent)
+++ tags/2.8.3/wb/admin/media/resize_img.php	(revision 1610)
@@ -0,0 +1,286 @@
+_error="Error: GD Library is not available.";
+				return false;
+			}
+
+			$this->type=Array(1 => 'GIF', 2 => 'JPG', 3 => 'PNG', 4 => 'SWF', 5 => 'PSD', 6 => 'BMP', 7 => 'TIFF', 8 => 'TIFF', 9 => 'JPC', 10 => 'JP2', 11 => 'JPX', 12 => 'JB2', 13 => 'SWC', 14 => 'IFF', 15 => 'WBMP', 16 => 'XBM');
+			if(!empty($imgFile))
+				$this->setImage($imgFile);
+		}
+		/**
+		 * Error occured while resizing the image.
+		 *
+		 * @return String 
+		 */
+		function error()
+		{
+			return $this->_error;
+		}
+		
+		/**
+		 * Set image file name
+		 *
+		 * @param String $imgFile
+		 * @return void
+		 */
+		function setImage($imgFile)
+		{
+			$this->imgFile=$imgFile;
+			return $this->_createImage();
+		}
+		/**
+		 * 
+		 * @return void
+		 */
+		function close()
+		{
+			return @imagedestroy($this->_img);
+		}
+		/**
+		 * Resize a image to given width and height and keep it's current width and height ratio
+		 * 
+		 * @param Number $imgwidth
+		 * @param Numnber $imgheight
+		 * @param String $newfile
+		 */
+		function resize_limitwh($imgwidth,$imgheight,$newfile=NULL)
+		{
+			$image_per = 100;
+			list($width, $height, $type, $attr) = @getimagesize($this->imgFile);
+			if($width > $imgwidth && $imgwidth > 0)
+				$image_per = (double)(($imgwidth * 100) / $width);
+
+			if(floor(($height * $image_per)/100)>$imgheight && $imgheight > 0)
+				$image_per = (double)(($imgheight * 100) / $height);
+
+			$this->resize_percentage($image_per,$newfile);
+
+		}
+		/**
+		 * Resize an image to given percentage.
+		 *
+		 * @param Number $percent
+		 * @param String $newfile
+		 * @return Boolean
+		 */
+		function resize_percentage($percent=100,$newfile=NULL)
+		{
+			$newWidth=($this->imgWidth*$percent)/100;
+			$newHeight=($this->imgHeight*$percent)/100;
+			return $this->resize($newWidth,$newHeight,$newfile);
+		}
+		/**
+		 * Resize an image to given X and Y percentage.
+		 *
+		 * @param Number $xpercent
+		 * @param Number $ypercent
+		 * @param String $newfile
+		 * @return Boolean
+		 */
+		function resize_xypercentage($xpercent=100,$ypercent=100,$newfile=NULL)
+		{
+			$newWidth=($this->imgWidth*$xpercent)/100;
+			$newHeight=($this->imgHeight*$ypercent)/100;
+			return $this->resize($newWidth,$newHeight,$newfile);
+		}
+		
+		/**
+		 * Resize an image to given width and height
+		 *
+		 * @param Number $width
+		 * @param Number $height
+		 * @param String $newfile
+		 * @return Boolean
+		 */
+		function resize($width,$height,$newfile=NULL)
+		{
+			if(empty($this->imgFile))
+			{
+				$this->_error="File name is not initialised.";
+				return false;
+			}
+			if($this->imgWidth<=0 || $this->imgHeight<=0)
+			{
+				$this->_error="Could not resize given image";
+				return false;
+			}
+			if($width<=0)
+				$width=$this->imgWidth;
+			if($height<=0)
+				$height=$this->imgHeight;
+				
+			return $this->_resize($width,$height,$newfile);
+		}
+		
+		/**
+		 * Get the image attributes
+		 * @access Private
+		 * 		
+		 */
+		function _getImageInfo()
+		{
+			@list($this->imgWidth,$this->imgHeight,$type,$this->imgAttr)=@getimagesize($this->imgFile);
+			$this->imgType=$this->type[$type];
+		}
+		
+		/**
+		 * Create the image resource 
+		 * @access Private
+		 * @return Boolean
+		 */
+		function _createImage()
+		{
+			$this->_getImageInfo($this->imgFile);
+			if($this->imgType=='GIF')
+			{
+				$this->_img=@imagecreatefromgif($this->imgFile);
+			}
+			elseif($this->imgType=='JPG')
+			{
+				$this->_img=@imagecreatefromjpeg($this->imgFile);
+			}
+			elseif($this->imgType=='PNG')
+			{
+				$this->_img=@imagecreatefrompng($this->imgFile);
+			}			
+			if(!$this->_img || !@is_resource($this->_img))
+			{
+				$this->_error="Error loading ".$this->imgFile;
+				return false;
+			}
+			return true;
+		}
+		
+		/**
+		 * Function is used to resize the image
+		 * 
+		 * @access Private
+		 * @param Number $width
+		 * @param Number $height
+		 * @param String $newfile
+		 * @return Boolean
+		 */
+		function _resize($width,$height,$newfile=NULL)
+		{
+			if (!function_exists("imagecreate"))
+			{
+				$this->_error="Error: GD Library is not available.";
+				return false;
+			}
+
+			$newimg=@imagecreatetruecolor($width,$height);
+			//imagecolortransparent( $newimg, imagecolorat( $newimg, 0, 0 ) );
+			
+			if($this->imgType=='GIF' || $this->imgType=='PNG')
+			{
+				/** Code to keep transparency of image **/
+				$colorcount = imagecolorstotal($this->_img);
+				if ($colorcount == 0) $colorcount = 256;
+				imagetruecolortopalette($newimg,true,$colorcount);
+				imagepalettecopy($newimg,$this->_img);
+				$transparentcolor = imagecolortransparent($this->_img);
+				imagefill($newimg,0,0,$transparentcolor);
+				imagecolortransparent($newimg,$transparentcolor); 
+			}
+
+			@imagecopyresampled ( $newimg, $this->_img, 0,0,0,0, $width, $height, $this->imgWidth,$this->imgHeight);
+			
+
+
+			if($newfile===HAR_AUTO_NAME)
+			{
+				if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches))
+			   		$newfile=@substr_replace($this->imgFile,"_har",-@strlen($matches[0]),0);			
+			}
+			elseif(!empty($newfile))
+			{
+				if(!@preg_match("/\..*+$/",@basename($newfile)))
+				{
+					if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches))
+					   $newfile=$newfile.$matches[0];
+				}
+			}
+
+			if($this->imgType=='GIF')
+			{
+				if(!empty($newfile))
+					@imagegif($newimg,$newfile);
+				else
+				{
+					@header("Content-type: image/gif");
+					@imagegif($newimg);
+				}
+			}
+			elseif($this->imgType=='JPG')
+			{
+				if(!empty($newfile))
+					@imagejpeg($newimg,$newfile,85);
+				else
+				{
+					@header("Content-type: image/jpeg");
+					@imagejpeg($newimg);
+				}
+			}
+			elseif($this->imgType=='PNG')
+			{
+				if(!empty($newfile))
+					@imagepng($newimg,$newfile);
+				else
+				{
+					@header("Content-type: image/png");
+					@imagepng($newimg);
+				}
+			}
+			@imagedestroy($newimg);
+		}
+	}
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/media/resize_img.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/media/thumb.php
===================================================================
--- tags/2.8.3/wb/admin/media/thumb.php	(nonexistent)
+++ tags/2.8.3/wb/admin/media/thumb.php	(revision 1610)
@@ -0,0 +1,46 @@
+print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH'], WB_URL, false);
+	}
+
+	$type = addslashes($_GET['t']);
+	$media = WB_PATH.MEDIA_DIRECTORY;
+	$img=new RESIZEIMAGE($media.$image);
+	if ($img->imgWidth) {
+		if ($type == 1) {
+			$img->resize_limitwh(50,50);
+		} else if ($type == 2) {
+			$img->resize_limitwh(200,200);
+		} 
+		$img->close();
+	} else {
+		header ("Content-type: image/jpeg");
+		readfile ( "nopreview.jpg" );
+	}
+}
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/media/thumb.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/media/overlib.js
===================================================================
--- tags/2.8.3/wb/admin/media/overlib.js	(nonexistent)
+++ tags/2.8.3/wb/admin/media/overlib.js	(revision 1610)
@@ -0,0 +1,1491 @@
+//\/////
+//\  overLIB 4.21 - You may not remove or change this notice.
+//\  Copyright Erik Bosrup 1998-2004. All rights reserved.
+//\
+//\  Contributors are listed on the homepage.
+//\  This file might be old, always check for the latest version at:
+//\  http://www.bosrup.com/web/overlib/
+//\
+//\  Please read the license agreement (available through the link above)
+//\  before using overLIB. Direct any licensing questions to erik@bosrup.com.
+//\
+//\  Do not sell this as your own work or remove this copyright notice. 
+//\  For full details on copying or changing this script please read the
+//\  license agreement at the link above. Please give credit on sites that
+//\  use overLIB and submit changes of the script so other people can use
+//\  them as well.
+//   $Revision: 1.119 $                $Date: 2005/07/02 23:41:44 $
+//\/////
+//\mini
+
+////////
+// PRE-INIT
+// Ignore these lines, configuration is below.
+////////
+var olLoaded = 0;var pmStart = 10000000; var pmUpper = 10001000; var pmCount = pmStart+1; var pmt=''; var pms = new Array(); var olInfo = new Info('4.21', 1);
+var FREPLACE = 0; var FBEFORE = 1; var FAFTER = 2; var FALTERNATE = 3; var FCHAIN=4;
+var olHideForm=0;  // parameter for hiding SELECT and ActiveX elements in IE5.5+ 
+var olHautoFlag = 0;  // flags for over-riding VAUTO and HAUTO if corresponding
+var olVautoFlag = 0;  // positioning commands are used on the command line
+var hookPts = new Array(), postParse = new Array(), cmdLine = new Array(), runTime = new Array();
+// for plugins
+registerCommands('donothing,inarray,caparray,sticky,background,noclose,caption,left,right,center,offsetx,offsety,fgcolor,bgcolor,textcolor,capcolor,closecolor,width,border,cellpad,status,autostatus,autostatuscap,height,closetext,snapx,snapy,fixx,fixy,relx,rely,fgbackground,bgbackground,padx,pady,fullhtml,above,below,capicon,textfont,captionfont,closefont,textsize,captionsize,closesize,timeout,function,delay,hauto,vauto,closeclick,wrap,followmouse,mouseoff,closetitle,cssoff,compatmode,cssclass,fgclass,bgclass,textfontclass,captionfontclass,closefontclass');
+
+////////
+// DEFAULT CONFIGURATION
+// Settings you want everywhere are set here. All of this can also be
+// changed on your html page or through an overLIB call.
+////////
+if (typeof ol_fgcolor=='undefined') var ol_fgcolor="#ffffff";
+if (typeof ol_bgcolor=='undefined') var ol_bgcolor="#cccccc";
+if (typeof ol_textcolor=='undefined') var ol_textcolor="#000000";
+if (typeof ol_capcolor=='undefined') var ol_capcolor="#000000";
+if (typeof ol_closecolor=='undefined') var ol_closecolor="#9999FF";
+if (typeof ol_textfont=='undefined') var ol_textfont="Verdana,Arial,Helvetica";
+if (typeof ol_captionfont=='undefined') var ol_captionfont="Verdana,Arial,Helvetica";
+if (typeof ol_closefont=='undefined') var ol_closefont="Verdana,Arial,Helvetica";
+if (typeof ol_textsize=='undefined') var ol_textsize="1";
+if (typeof ol_captionsize=='undefined') var ol_captionsize="1";
+if (typeof ol_closesize=='undefined') var ol_closesize="1";
+if (typeof ol_width=='undefined') var ol_width="200";
+if (typeof ol_border=='undefined') var ol_border="1";
+if (typeof ol_cellpad=='undefined') var ol_cellpad=7;
+if (typeof ol_offsetx=='undefined') var ol_offsetx=10;
+if (typeof ol_offsety=='undefined') var ol_offsety=10;
+if (typeof ol_text=='undefined') var ol_text="";
+if (typeof ol_cap=='undefined') var ol_cap="";
+if (typeof ol_sticky=='undefined') var ol_sticky=0;
+if (typeof ol_background=='undefined') var ol_background="";
+if (typeof ol_close=='undefined') var ol_close="Close";
+if (typeof ol_hpos=='undefined') var ol_hpos=RIGHT;
+if (typeof ol_status=='undefined') var ol_status="";
+if (typeof ol_autostatus=='undefined') var ol_autostatus=0;
+if (typeof ol_height=='undefined') var ol_height=-1;
+if (typeof ol_snapx=='undefined') var ol_snapx=0;
+if (typeof ol_snapy=='undefined') var ol_snapy=0;
+if (typeof ol_fixx=='undefined') var ol_fixx=-1;
+if (typeof ol_fixy=='undefined') var ol_fixy=-1;
+if (typeof ol_relx=='undefined') var ol_relx=null;
+if (typeof ol_rely=='undefined') var ol_rely=null;
+if (typeof ol_fgbackground=='undefined') var ol_fgbackground="";
+if (typeof ol_bgbackground=='undefined') var ol_bgbackground="";
+if (typeof ol_padxl=='undefined') var ol_padxl=1;
+if (typeof ol_padxr=='undefined') var ol_padxr=1;
+if (typeof ol_padyt=='undefined') var ol_padyt=1;
+if (typeof ol_padyb=='undefined') var ol_padyb=1;
+if (typeof ol_fullhtml=='undefined') var ol_fullhtml=0;
+if (typeof ol_vpos=='undefined') var ol_vpos=BELOW;
+if (typeof ol_aboveheight=='undefined') var ol_aboveheight=0;
+if (typeof ol_capicon=='undefined') var ol_capicon="";
+if (typeof ol_frame=='undefined') var ol_frame=self;
+if (typeof ol_timeout=='undefined') var ol_timeout=0;
+if (typeof ol_function=='undefined') var ol_function=null;
+if (typeof ol_delay=='undefined') var ol_delay=0;
+if (typeof ol_hauto=='undefined') var ol_hauto=0;
+if (typeof ol_vauto=='undefined') var ol_vauto=0;
+if (typeof ol_closeclick=='undefined') var ol_closeclick=0;
+if (typeof ol_wrap=='undefined') var ol_wrap=0;
+if (typeof ol_followmouse=='undefined') var ol_followmouse=1;
+if (typeof ol_mouseoff=='undefined') var ol_mouseoff=0;
+if (typeof ol_closetitle=='undefined') var ol_closetitle='Close';
+if (typeof ol_compatmode=='undefined') var ol_compatmode=0;
+if (typeof ol_css=='undefined') var ol_css=CSSOFF;
+if (typeof ol_fgclass=='undefined') var ol_fgclass="";
+if (typeof ol_bgclass=='undefined') var ol_bgclass="";
+if (typeof ol_textfontclass=='undefined') var ol_textfontclass="";
+if (typeof ol_captionfontclass=='undefined') var ol_captionfontclass="";
+if (typeof ol_closefontclass=='undefined') var ol_closefontclass="";
+
+////////
+// ARRAY CONFIGURATION
+////////
+
+// You can use these arrays to store popup text here instead of in the html.
+if (typeof ol_texts=='undefined') var ol_texts = new Array("Text 0", "Text 1");
+if (typeof ol_caps=='undefined') var ol_caps = new Array("Caption 0", "Caption 1");
+
+////////
+// END OF CONFIGURATION
+// Don't change anything below this line, all configuration is above.
+////////
+
+
+
+
+
+////////
+// INIT
+////////
+// Runtime variables init. Don't change for config!
+var o3_text="";
+var o3_cap="";
+var o3_sticky=0;
+var o3_background="";
+var o3_close="Close";
+var o3_hpos=RIGHT;
+var o3_offsetx=2;
+var o3_offsety=2;
+var o3_fgcolor="";
+var o3_bgcolor="";
+var o3_textcolor="";
+var o3_capcolor="";
+var o3_closecolor="";
+var o3_width=100;
+var o3_border=1;
+var o3_cellpad=2;
+var o3_status="";
+var o3_autostatus=0;
+var o3_height=-1;
+var o3_snapx=0;
+var o3_snapy=0;
+var o3_fixx=-1;
+var o3_fixy=-1;
+var o3_relx=null;
+var o3_rely=null;
+var o3_fgbackground="";
+var o3_bgbackground="";
+var o3_padxl=0;
+var o3_padxr=0;
+var o3_padyt=0;
+var o3_padyb=0;
+var o3_fullhtml=0;
+var o3_vpos=BELOW;
+var o3_aboveheight=0;
+var o3_capicon="";
+var o3_textfont="Verdana,Arial,Helvetica";
+var o3_captionfont="Verdana,Arial,Helvetica";
+var o3_closefont="Verdana,Arial,Helvetica";
+var o3_textsize="1";
+var o3_captionsize="1";
+var o3_closesize="1";
+var o3_frame=self;
+var o3_timeout=0;
+var o3_timerid=0;
+var o3_allowmove=0;
+var o3_function=null; 
+var o3_delay=0;
+var o3_delayid=0;
+var o3_hauto=0;
+var o3_vauto=0;
+var o3_closeclick=0;
+var o3_wrap=0;
+var o3_followmouse=1;
+var o3_mouseoff=0;
+var o3_closetitle='';
+var o3_compatmode=0;
+var o3_css=CSSOFF;
+var o3_fgclass="";
+var o3_bgclass="";
+var o3_textfontclass="";
+var o3_captionfontclass="";
+var o3_closefontclass="";
+
+// Display state variables
+var o3_x = 0;
+var o3_y = 0;
+var o3_showingsticky = 0;
+var o3_removecounter = 0;
+
+// Our layer
+var over = null;
+var fnRef, hoveringSwitch = false;
+var olHideDelay;
+
+// Decide browser version
+var isMac = (navigator.userAgent.indexOf("Mac") != -1);
+var olOp = (navigator.userAgent.toLowerCase().indexOf('opera') > -1 && document.createTextNode);  // Opera 7
+var olNs4 = (navigator.appName=='Netscape' && parseInt(navigator.appVersion) == 4);
+var olNs6 = (document.getElementById) ? true : false;
+var olKq = (olNs6 && /konqueror/i.test(navigator.userAgent));
+var olIe4 = (document.all) ? true : false;
+var olIe5 = false; 
+var olIe55 = false; // Added additional variable to identify IE5.5+
+var docRoot = 'document.body';
+
+// Resize fix for NS4.x to keep track of layer
+if (olNs4) {
+	var oW = window.innerWidth;
+	var oH = window.innerHeight;
+	window.onresize = function() { if (oW != window.innerWidth || oH != window.innerHeight) location.reload(); }
+}
+
+// Microsoft Stupidity Check(tm).
+if (olIe4) {
+	var agent = navigator.userAgent;
+	if (/MSIE/.test(agent)) {
+		var versNum = parseFloat(agent.match(/MSIE[ ](\d\.\d+)\.*/i)[1]);
+		if (versNum >= 5){
+			olIe5=true;
+			olIe55=(versNum>=5.5&&!olOp) ? true : false;
+			if (olNs6) olNs6=false;
+		}
+	}
+	if (olNs6) olIe4 = false;
+}
+
+// Check for compatability mode.
+if (document.compatMode && document.compatMode == 'CSS1Compat') {
+	docRoot= ((olIe4 && !olOp) ? 'document.documentElement' : docRoot);
+}
+
+// Add window onload handlers to indicate when all modules have been loaded
+// For Netscape 6+ and Mozilla, uses addEventListener method on the window object
+// For IE it uses the attachEvent method of the window object and for Netscape 4.x
+// it sets the window.onload handler to the OLonload_handler function for Bubbling
+if(window.addEventListener) window.addEventListener("load",OLonLoad_handler,false);
+else if (window.attachEvent) window.attachEvent("onload",OLonLoad_handler);
+
+var capExtent;
+
+////////
+// PUBLIC FUNCTIONS
+////////
+
+// overlib(arg0,...,argN)
+// Loads parameters into global runtime variables.
+function overlib() {
+	if (!olLoaded || isExclusive(overlib.arguments)) return true;
+	if (olCheckMouseCapture) olMouseCapture();
+	if (over) {
+		over = (typeof over.id != 'string') ? o3_frame.document.all['overDiv'] : over;
+		cClick();
+	}
+
+	// Load defaults to runtime.
+  olHideDelay=0;
+	o3_text=ol_text;
+	o3_cap=ol_cap;
+	o3_sticky=ol_sticky;
+	o3_background=ol_background;
+	o3_close=ol_close;
+	o3_hpos=ol_hpos;
+	o3_offsetx=ol_offsetx;
+	o3_offsety=ol_offsety;
+	o3_fgcolor=ol_fgcolor;
+	o3_bgcolor=ol_bgcolor;
+	o3_textcolor=ol_textcolor;
+	o3_capcolor=ol_capcolor;
+	o3_closecolor=ol_closecolor;
+	o3_width=ol_width;
+	o3_border=ol_border;
+	o3_cellpad=ol_cellpad;
+	o3_status=ol_status;
+	o3_autostatus=ol_autostatus;
+	o3_height=ol_height;
+	o3_snapx=ol_snapx;
+	o3_snapy=ol_snapy;
+	o3_fixx=ol_fixx;
+	o3_fixy=ol_fixy;
+	o3_relx=ol_relx;
+	o3_rely=ol_rely;
+	o3_fgbackground=ol_fgbackground;
+	o3_bgbackground=ol_bgbackground;
+	o3_padxl=ol_padxl;
+	o3_padxr=ol_padxr;
+	o3_padyt=ol_padyt;
+	o3_padyb=ol_padyb;
+	o3_fullhtml=ol_fullhtml;
+	o3_vpos=ol_vpos;
+	o3_aboveheight=ol_aboveheight;
+	o3_capicon=ol_capicon;
+	o3_textfont=ol_textfont;
+	o3_captionfont=ol_captionfont;
+	o3_closefont=ol_closefont;
+	o3_textsize=ol_textsize;
+	o3_captionsize=ol_captionsize;
+	o3_closesize=ol_closesize;
+	o3_timeout=ol_timeout;
+	o3_function=ol_function;
+	o3_delay=ol_delay;
+	o3_hauto=ol_hauto;
+	o3_vauto=ol_vauto;
+	o3_closeclick=ol_closeclick;
+	o3_wrap=ol_wrap;	
+	o3_followmouse=ol_followmouse;
+	o3_mouseoff=ol_mouseoff;
+	o3_closetitle=ol_closetitle;
+	o3_css=ol_css;
+	o3_compatmode=ol_compatmode;
+	o3_fgclass=ol_fgclass;
+	o3_bgclass=ol_bgclass;
+	o3_textfontclass=ol_textfontclass;
+	o3_captionfontclass=ol_captionfontclass;
+	o3_closefontclass=ol_closefontclass;
+	
+	setRunTimeVariables();
+	
+	fnRef = '';
+	
+	// Special for frame support, over must be reset...
+	o3_frame = ol_frame;
+	
+	if(!(over=createDivContainer())) return false;
+
+	parseTokens('o3_', overlib.arguments);
+	if (!postParseChecks()) return false;
+
+	if (o3_delay == 0) {
+		return runHook("olMain", FREPLACE);
+ 	} else {
+		o3_delayid = setTimeout("runHook('olMain', FREPLACE)", o3_delay);
+		return false;
+	}
+}
+
+// Clears popups if appropriate
+function nd(time) {
+	if (olLoaded && !isExclusive()) {
+		hideDelay(time);  // delay popup close if time specified
+
+		if (o3_removecounter >= 1) { o3_showingsticky = 0 };
+		
+		if (o3_showingsticky == 0) {
+			o3_allowmove = 0;
+			if (over != null && o3_timerid == 0) runHook("hideObject", FREPLACE, over);
+		} else {
+			o3_removecounter++;
+		}
+	}
+	
+	return true;
+}
+
+// The Close onMouseOver function for stickies
+function cClick() {
+	if (olLoaded) {
+		runHook("hideObject", FREPLACE, over);
+		o3_showingsticky = 0;	
+	}	
+	return false;
+}
+
+// Method for setting page specific defaults.
+function overlib_pagedefaults() {
+	parseTokens('ol_', overlib_pagedefaults.arguments);
+}
+
+
+////////
+// OVERLIB MAIN FUNCTION
+////////
+
+// This function decides what it is we want to display and how we want it done.
+function olMain() {
+	var layerhtml, styleType;
+ 	runHook("olMain", FBEFORE);
+ 	
+	if (o3_background!="" || o3_fullhtml) {
+		// Use background instead of box.
+		layerhtml = runHook('ol_content_background', FALTERNATE, o3_css, o3_text, o3_background, o3_fullhtml);
+	} else {
+		// They want a popup box.
+		styleType = (pms[o3_css-1-pmStart] == "cssoff" || pms[o3_css-1-pmStart] == "cssclass");
+
+		// Prepare popup background
+		if (o3_fgbackground != "") o3_fgbackground = "background=\""+o3_fgbackground+"\"";
+		if (o3_bgbackground != "") o3_bgbackground = (styleType ? "background=\""+o3_bgbackground+"\"" : o3_bgbackground);
+
+		// Prepare popup colors
+		if (o3_fgcolor != "") o3_fgcolor = (styleType ? "bgcolor=\""+o3_fgcolor+"\"" : o3_fgcolor);
+		if (o3_bgcolor != "") o3_bgcolor = (styleType ? "bgcolor=\""+o3_bgcolor+"\"" : o3_bgcolor);
+
+		// Prepare popup height
+		if (o3_height > 0) o3_height = (styleType ? "height=\""+o3_height+"\"" : o3_height);
+		else o3_height = "";
+
+		// Decide which kinda box.
+		if (o3_cap=="") {
+			// Plain
+			layerhtml = runHook('ol_content_simple', FALTERNATE, o3_css, o3_text);
+		} else {
+			// With caption
+			if (o3_sticky) {
+				// Show close text
+				layerhtml = runHook('ol_content_caption', FALTERNATE, o3_css, o3_text, o3_cap, o3_close);
+			} else {
+				// No close text
+				layerhtml = runHook('ol_content_caption', FALTERNATE, o3_css, o3_text, o3_cap, "");
+			}
+		}
+	}	
+
+	// We want it to stick!
+	if (o3_sticky) {
+		if (o3_timerid > 0) {
+			clearTimeout(o3_timerid);
+			o3_timerid = 0;
+		}
+		o3_showingsticky = 1;
+		o3_removecounter = 0;
+	}
+
+	// Created a separate routine to generate the popup to make it easier
+	// to implement a plugin capability
+	if (!runHook("createPopup", FREPLACE, layerhtml)) return false;
+
+	// Prepare status bar
+	if (o3_autostatus > 0) {
+		o3_status = o3_text;
+		if (o3_autostatus > 1) o3_status = o3_cap;
+	}
+
+	// When placing the layer the first time, even stickies may be moved.
+	o3_allowmove = 0;
+
+	// Initiate a timer for timeout
+	if (o3_timeout > 0) {          
+		if (o3_timerid > 0) clearTimeout(o3_timerid);
+		o3_timerid = setTimeout("cClick()", o3_timeout);
+	}
+
+	// Show layer
+	runHook("disp", FREPLACE, o3_status);
+	runHook("olMain", FAFTER);
+
+	return (olOp && event && event.type == 'mouseover' && !o3_status) ? '' : (o3_status != '');
+}
+
+////////
+// LAYER GENERATION FUNCTIONS
+////////
+// These functions just handle popup content with tags that should adhere to the W3C standards specification.
+
+// Makes simple table without caption
+function ol_content_simple(text) {
+	var cpIsMultiple = /,/.test(o3_cellpad);
+	var txt = '
' : ((!olNs4&&cpIsMultiple) ? ' style="'+setCellPadStr(o3_cellpad)+'">' : '>'))+(o3_textfontclass ? '' : wrapStr(0,o3_textsize,'text'))+text+(o3_textfontclass ? '' : wrapStr(1,o3_textsize))+'
';
+
+	set_background("");
+	return txt;
+}
+
+// Makes table with caption and optional close link
+function ol_content_caption(text,title,close) {
+	var nameId, txt, cpIsMultiple = /,/.test(o3_cellpad);
+	var closing, closeevent;
+
+	closing = "";
+	closeevent = "onmouseover";
+	if (o3_closeclick == 1) closeevent = (o3_closetitle ? "title='" + o3_closetitle +"'" : "") + " onclick";
+	if (o3_capicon != "") {
+	  nameId = ' hspace = \"5\"'+' align = \"middle\" alt = \"\"';
+	  if (typeof o3_dragimg != 'undefined' && o3_dragimg) nameId =' hspace=\"5\"'+' name=\"'+o3_dragimg+'\" id=\"'+o3_dragimg+'\" align=\"middle\" alt=\"Drag Enabled\" title=\"Drag Enabled\"';
+	  o3_capicon = '';
+	}
+
+	if (close != "")
+		closing = ''+(o3_closefontclass ? '' : wrapStr(0,o3_closesize,'close'))+close+(o3_closefontclass ? '' : wrapStr(1,o3_closesize,'close'))+'';
+	txt = '
' : '>')+(o3_captionfontclass ? '' : ''+wrapStr(0,o3_captionsize,'caption'))+o3_capicon+title+(o3_captionfontclass ? '' : wrapStr(1,o3_captionsize)+'')+''+closing+'
' :((!olNs4&&cpIsMultiple) ? ' style="'+setCellPadStr(o3_cellpad)+'">' : '>'))+(o3_textfontclass ? '' : wrapStr(0,o3_textsize,'text'))+text+(o3_textfontclass ? '' : wrapStr(1,o3_textsize)) + '
';
+
+	set_background("");
+	return txt;
+}
+
+// Sets the background picture,padding and lots more. :)
+function ol_content_background(text,picture,hasfullhtml) {
+	if (hasfullhtml) {
+		txt=text;
+	} else {
+		txt='
'+(o3_textfontclass ? '' : wrapStr(0,o3_textsize,'text'))+text+(o3_textfontclass ? '' : wrapStr(1,o3_textsize))+'
';
+	}
+
+	set_background(picture);
+	return txt;
+}
+
+// Loads a picture into the div.
+function set_background(pic) {
+	if (pic == "") {
+		if (olNs4) {
+			over.background.src = null; 
+		} else if (over.style) {
+			over.style.backgroundImage = "none";
+		}
+	} else {
+		if (olNs4) {
+			over.background.src = pic;
+		} else if (over.style) {
+			over.style.width=o3_width + 'px';
+			over.style.backgroundImage = "url("+pic+")";
+		}
+	}
+}
+
+////////
+// HANDLING FUNCTIONS
+////////
+var olShowId=-1;
+
+// Displays the popup
+function disp(statustext) {
+	runHook("disp", FBEFORE);
+	
+	if (o3_allowmove == 0) {
+		runHook("placeLayer", FREPLACE);
+		(olNs6&&olShowId<0) ? olShowId=setTimeout("runHook('showObject', FREPLACE, over)", 1) : runHook("showObject", FREPLACE, over);
+		o3_allowmove = (o3_sticky || o3_followmouse==0) ? 0 : 1;
+	}
+	
+	runHook("disp", FAFTER);
+
+	if (statustext != "") self.status = statustext;
+}
+
+// Creates the actual popup structure
+function createPopup(lyrContent){
+	runHook("createPopup", FBEFORE);
+	
+	if (o3_wrap) {
+		var wd,ww,theObj = (olNs4 ? over : over.style);
+		theObj.top = theObj.left = ((olIe4&&!olOp) ? 0 : -10000) + (!olNs4 ? 'px' : 0);
+		layerWrite(lyrContent);
+		wd = (olNs4 ? over.clip.width : over.offsetWidth);
+		if (wd > (ww=windowWidth())) {
+			lyrContent=lyrContent.replace(/\ /g, ' ');
+			o3_width=ww;
+			o3_wrap=0;
+		} 
+	}
+
+	layerWrite(lyrContent);
+	
+	// Have to set o3_width for placeLayer() routine if o3_wrap is turned on
+	if (o3_wrap) o3_width=(olNs4 ? over.clip.width : over.offsetWidth);
+	
+	runHook("createPopup", FAFTER, lyrContent);
+
+	return true;
+}
+
+// Decides where we want the popup.
+function placeLayer() {
+	var placeX, placeY, widthFix = 0;
+	
+	// HORIZONTAL PLACEMENT, re-arranged to work in Safari
+	if (o3_frame.innerWidth) widthFix=18; 
+	iwidth = windowWidth();
+
+	// Horizontal scroll offset
+	winoffset=(olIe4) ? eval('o3_frame.'+docRoot+'.scrollLeft') : o3_frame.pageXOffset;
+
+	placeX = runHook('horizontalPlacement',FCHAIN,iwidth,winoffset,widthFix);
+
+	// VERTICAL PLACEMENT, re-arranged to work in Safari
+	if (o3_frame.innerHeight) {
+		iheight=o3_frame.innerHeight;
+	} else if (eval('o3_frame.'+docRoot)&&eval("typeof o3_frame."+docRoot+".clientHeight=='number'")&&eval('o3_frame.'+docRoot+'.clientHeight')) { 
+		iheight=eval('o3_frame.'+docRoot+'.clientHeight');
+	}			
+
+	// Vertical scroll offset
+	scrolloffset=(olIe4) ? eval('o3_frame.'+docRoot+'.scrollTop') : o3_frame.pageYOffset;
+	placeY = runHook('verticalPlacement',FCHAIN,iheight,scrolloffset);
+
+	// Actually move the object.
+	repositionTo(over, placeX, placeY);
+}
+
+// Moves the layer
+function olMouseMove(e) {
+	var e = (e) ? e : event;
+
+	if (e.pageX) {
+		o3_x = e.pageX;
+		o3_y = e.pageY;
+	} else if (e.clientX) {
+		o3_x = eval('e.clientX+o3_frame.'+docRoot+'.scrollLeft');
+		o3_y = eval('e.clientY+o3_frame.'+docRoot+'.scrollTop');
+	}
+	
+	if (o3_allowmove == 1) runHook("placeLayer", FREPLACE);
+
+	// MouseOut handler
+	if (hoveringSwitch && !olNs4 && runHook("cursorOff", FREPLACE)) {
+		(olHideDelay ? hideDelay(olHideDelay) : cClick());
+		hoveringSwitch = !hoveringSwitch;
+	}
+}
+
+// Fake function for 3.0 users.
+function no_overlib() { return ver3fix; }
+
+// Capture the mouse and chain other scripts.
+function olMouseCapture() {
+	capExtent = document;
+	var fN, str = '', l, k, f, wMv, sS, mseHandler = olMouseMove;
+	var re = /function[ ]*(\w*)\(/;
+	
+	wMv = (!olIe4 && window.onmousemove);
+	if (document.onmousemove || wMv) {
+		if (wMv) capExtent = window;
+		f = capExtent.onmousemove.toString();
+		fN = f.match(re);
+		if (fN == null) {
+			str = f+'(e); ';
+		} else if (fN[1] == 'anonymous' || fN[1] == 'olMouseMove' || (wMv && fN[1] == 'onmousemove')) {
+			if (!olOp && wMv) {
+				l = f.indexOf('{')+1;
+				k = f.lastIndexOf('}');
+				sS = f.substring(l,k);
+				if ((l = sS.indexOf('(')) != -1) {
+					sS = sS.substring(0,l).replace(/^\s+/,'').replace(/\s+$/,'');
+					if (eval("typeof " + sS + " == 'undefined'")) window.onmousemove = null;
+					else str = sS + '(e);';
+				}
+			}
+			if (!str) {
+				olCheckMouseCapture = false;
+				return;
+			}
+		} else {
+			if (fN[1]) str = fN[1]+'(e); ';
+			else {
+				l = f.indexOf('{')+1;
+				k = f.lastIndexOf('}');
+				str = f.substring(l,k) + '\n';
+			}
+		}
+		str += 'olMouseMove(e); ';
+		mseHandler = new Function('e', str);
+	}
+
+	capExtent.onmousemove = mseHandler;
+	if (olNs4) capExtent.captureEvents(Event.MOUSEMOVE);
+}
+
+////////
+// PARSING FUNCTIONS
+////////
+
+// Does the actual command parsing.
+function parseTokens(pf, ar) {
+	// What the next argument is expected to be.
+	var v, i, mode=-1, par = (pf != 'ol_');	
+	var fnMark = (par && !ar.length ? 1 : 0);
+
+	for (i = 0; i < ar.length; i++) {
+		if (mode < 0) {
+			// Arg is maintext,unless its a number between pmStart and pmUpper
+			// then its a command.
+			if (typeof ar[i] == 'number' && ar[i] > pmStart && ar[i] < pmUpper) {
+				fnMark = (par ? 1 : 0);
+				i--;   // backup one so that the next block can parse it
+			} else {
+				switch(pf) {
+					case 'ol_':
+						ol_text = ar[i].toString();
+						break;
+					default:
+						o3_text=ar[i].toString();  
+				}
+			}
+			mode = 0;
+		} else {
+			// Note: NS4 doesn't like switch cases with vars.
+			if (ar[i] >= pmCount || ar[i]==DONOTHING) { continue; }
+			if (ar[i]==INARRAY) { fnMark = 0; eval(pf+'text=ol_texts['+ar[++i]+'].toString()'); continue; }
+			if (ar[i]==CAPARRAY) { eval(pf+'cap=ol_caps['+ar[++i]+'].toString()'); continue; }
+			if (ar[i]==STICKY) { if (pf!='ol_') eval(pf+'sticky=1'); continue; }
+			if (ar[i]==BACKGROUND) { eval(pf+'background="'+ar[++i]+'"'); continue; }
+			if (ar[i]==NOCLOSE) { if (pf!='ol_') opt_NOCLOSE(); continue; }
+			if (ar[i]==CAPTION) { eval(pf+"cap='"+escSglQuote(ar[++i])+"'"); continue; }
+			if (ar[i]==CENTER || ar[i]==LEFT || ar[i]==RIGHT) { eval(pf+'hpos='+ar[i]); if(pf!='ol_') olHautoFlag=1; continue; }
+			if (ar[i]==OFFSETX) { eval(pf+'offsetx='+ar[++i]); continue; }
+			if (ar[i]==OFFSETY) { eval(pf+'offsety='+ar[++i]); continue; }
+			if (ar[i]==FGCOLOR) { eval(pf+'fgcolor="'+ar[++i]+'"'); continue; }
+			if (ar[i]==BGCOLOR) { eval(pf+'bgcolor="'+ar[++i]+'"'); continue; }
+			if (ar[i]==TEXTCOLOR) { eval(pf+'textcolor="'+ar[++i]+'"'); continue; }
+			if (ar[i]==CAPCOLOR) { eval(pf+'capcolor="'+ar[++i]+'"'); continue; }
+			if (ar[i]==CLOSECOLOR) { eval(pf+'closecolor="'+ar[++i]+'"'); continue; }
+			if (ar[i]==WIDTH) { eval(pf+'width='+ar[++i]); continue; }
+			if (ar[i]==BORDER) { eval(pf+'border='+ar[++i]); continue; }
+			if (ar[i]==CELLPAD) { i=opt_MULTIPLEARGS(++i,ar,(pf+'cellpad')); continue; }
+			if (ar[i]==STATUS) { eval(pf+"status='"+escSglQuote(ar[++i])+"'"); continue; }
+			if (ar[i]==AUTOSTATUS) { eval(pf +'autostatus=('+pf+'autostatus == 1) ? 0 : 1'); continue; }
+			if (ar[i]==AUTOSTATUSCAP) { eval(pf +'autostatus=('+pf+'autostatus == 2) ? 0 : 2'); continue; }
+			if (ar[i]==HEIGHT) { eval(pf+'height='+pf+'aboveheight='+ar[++i]); continue; } // Same param again.
+			if (ar[i]==CLOSETEXT) { eval(pf+"close='"+escSglQuote(ar[++i])+"'"); continue; }
+			if (ar[i]==SNAPX) { eval(pf+'snapx='+ar[++i]); continue; }
+			if (ar[i]==SNAPY) { eval(pf+'snapy='+ar[++i]); continue; }
+			if (ar[i]==FIXX) { eval(pf+'fixx='+ar[++i]); continue; }
+			if (ar[i]==FIXY) { eval(pf+'fixy='+ar[++i]); continue; }
+			if (ar[i]==RELX) { eval(pf+'relx='+ar[++i]); continue; }
+			if (ar[i]==RELY) { eval(pf+'rely='+ar[++i]); continue; }
+			if (ar[i]==FGBACKGROUND) { eval(pf+'fgbackground="'+ar[++i]+'"'); continue; }
+			if (ar[i]==BGBACKGROUND) { eval(pf+'bgbackground="'+ar[++i]+'"'); continue; }
+			if (ar[i]==PADX) { eval(pf+'padxl='+ar[++i]); eval(pf+'padxr='+ar[++i]); continue; }
+			if (ar[i]==PADY) { eval(pf+'padyt='+ar[++i]); eval(pf+'padyb='+ar[++i]); continue; }
+			if (ar[i]==FULLHTML) { if (pf!='ol_') eval(pf+'fullhtml=1'); continue; }
+			if (ar[i]==BELOW || ar[i]==ABOVE) { eval(pf+'vpos='+ar[i]); if (pf!='ol_') olVautoFlag=1; continue; }
+			if (ar[i]==CAPICON) { eval(pf+'capicon="'+ar[++i]+'"'); continue; }
+			if (ar[i]==TEXTFONT) { eval(pf+"textfont='"+escSglQuote(ar[++i])+"'"); continue; }
+			if (ar[i]==CAPTIONFONT) { eval(pf+"captionfont='"+escSglQuote(ar[++i])+"'"); continue; }
+			if (ar[i]==CLOSEFONT) { eval(pf+"closefont='"+escSglQuote(ar[++i])+"'"); continue; }
+			if (ar[i]==TEXTSIZE) { eval(pf+'textsize="'+ar[++i]+'"'); continue; }
+			if (ar[i]==CAPTIONSIZE) { eval(pf+'captionsize="'+ar[++i]+'"'); continue; }
+			if (ar[i]==CLOSESIZE) { eval(pf+'closesize="'+ar[++i]+'"'); continue; }
+			if (ar[i]==TIMEOUT) { eval(pf+'timeout='+ar[++i]); continue; }
+			if (ar[i]==FUNCTION) { if (pf=='ol_') { if (typeof ar[i+1]!='number') { v=ar[++i]; ol_function=(typeof v=='function' ? v : null); }} else {fnMark = 0; v = null; if (typeof ar[i+1]!='number') v = ar[++i];  opt_FUNCTION(v); } continue; }
+			if (ar[i]==DELAY) { eval(pf+'delay='+ar[++i]); continue; }
+			if (ar[i]==HAUTO) { eval(pf+'hauto=('+pf+'hauto == 0) ? 1 : 0'); continue; }
+			if (ar[i]==VAUTO) { eval(pf+'vauto=('+pf+'vauto == 0) ? 1 : 0'); continue; }
+			if (ar[i]==CLOSECLICK) { eval(pf +'closeclick=('+pf+'closeclick == 0) ? 1 : 0'); continue; }
+			if (ar[i]==WRAP) { eval(pf +'wrap=('+pf+'wrap == 0) ? 1 : 0'); continue; }
+			if (ar[i]==FOLLOWMOUSE) { eval(pf +'followmouse=('+pf+'followmouse == 1) ? 0 : 1'); continue; }
+			if (ar[i]==MOUSEOFF) { eval(pf +'mouseoff=('+pf+'mouseoff==0) ? 1 : 0'); v=ar[i+1]; if (pf != 'ol_' && eval(pf+'mouseoff') && typeof v == 'number' && (v < pmStart || v > pmUpper)) olHideDelay=ar[++i]; continue; }
+			if (ar[i]==CLOSETITLE) { eval(pf+"closetitle='"+escSglQuote(ar[++i])+"'"); continue; }
+			if (ar[i]==CSSOFF||ar[i]==CSSCLASS) { eval(pf+'css='+ar[i]); continue; }
+			if (ar[i]==COMPATMODE) { eval(pf+'compatmode=('+pf+'compatmode==0) ? 1 : 0'); continue; }
+			if (ar[i]==FGCLASS) { eval(pf+'fgclass="'+ar[++i]+'"'); continue; }
+			if (ar[i]==BGCLASS) { eval(pf+'bgclass="'+ar[++i]+'"'); continue; }
+			if (ar[i]==TEXTFONTCLASS) { eval(pf+'textfontclass="'+ar[++i]+'"'); continue; }
+			if (ar[i]==CAPTIONFONTCLASS) { eval(pf+'captionfontclass="'+ar[++i]+'"'); continue; }
+			if (ar[i]==CLOSEFONTCLASS) { eval(pf+'closefontclass="'+ar[++i]+'"'); continue; }
+			i = parseCmdLine(pf, i, ar);
+		}
+	}
+
+	if (fnMark && o3_function) o3_text = o3_function();
+	
+	if ((pf == 'o3_') && o3_wrap) {
+		o3_width = 0;
+		
+		var tReg=/<.*\n*>/ig;
+		if (!tReg.test(o3_text)) o3_text = o3_text.replace(/[ ]+/g, ' ');
+		if (!tReg.test(o3_cap))o3_cap = o3_cap.replace(/[ ]+/g, ' ');
+	}
+	if ((pf == 'o3_') && o3_sticky) {
+		if (!o3_close && (o3_frame != ol_frame)) o3_close = ol_close;
+		if (o3_mouseoff && (o3_frame == ol_frame)) opt_NOCLOSE(' ');
+	}
+}
+
+
+////////
+// LAYER FUNCTIONS
+////////
+
+// Writes to a layer
+function layerWrite(txt) {
+	txt += "\n";
+	if (olNs4) {
+		var lyr = o3_frame.document.layers['overDiv'].document
+		lyr.write(txt)
+		lyr.close()
+	} else if (typeof over.innerHTML != 'undefined') {
+		if (olIe5 && isMac) over.innerHTML = '';
+		over.innerHTML = txt;
+	} else {
+		range = o3_frame.document.createRange();
+		range.setStartAfter(over);
+		domfrag = range.createContextualFragment(txt);
+		
+		while (over.hasChildNodes()) {
+			over.removeChild(over.lastChild);
+		}
+		
+		over.appendChild(domfrag);
+	}
+}
+
+// Make an object visible
+function showObject(obj) {
+	runHook("showObject", FBEFORE);
+
+	var theObj=(olNs4 ? obj : obj.style);
+	theObj.visibility = 'visible';
+
+	runHook("showObject", FAFTER);
+}
+
+// Hides an object
+function hideObject(obj) {
+	runHook("hideObject", FBEFORE);
+
+	var theObj=(olNs4 ? obj : obj.style);
+	if (olNs6 && olShowId>0) { clearTimeout(olShowId); olShowId=0; }
+	theObj.visibility = 'hidden';
+	theObj.top = theObj.left = ((olIe4&&!olOp) ? 0 : -10000) + (!olNs4 ? 'px' : 0);
+
+	if (o3_timerid > 0) clearTimeout(o3_timerid);
+	if (o3_delayid > 0) clearTimeout(o3_delayid);
+
+	o3_timerid = 0;
+	o3_delayid = 0;
+	self.status = "";
+
+	if (obj.onmouseout||obj.onmouseover) {
+		if (olNs4) obj.releaseEvents(Event.MOUSEOUT || Event.MOUSEOVER);
+		obj.onmouseout = obj.onmouseover = null;
+	}
+
+	runHook("hideObject", FAFTER);
+}
+
+// Move a layer
+function repositionTo(obj, xL, yL) {
+	var theObj=(olNs4 ? obj : obj.style);
+	theObj.left = xL + (!olNs4 ? 'px' : 0);
+	theObj.top = yL + (!olNs4 ? 'px' : 0);
+}
+
+// Check position of cursor relative to overDiv DIVision; mouseOut function
+function cursorOff() {
+	var left = parseInt(over.style.left);
+	var top = parseInt(over.style.top);
+	var right = left + (over.offsetWidth >= parseInt(o3_width) ? over.offsetWidth : parseInt(o3_width));
+	var bottom = top + (over.offsetHeight >= o3_aboveheight ? over.offsetHeight : o3_aboveheight);
+
+	if (o3_x < left || o3_x > right || o3_y < top || o3_y > bottom) return true;
+
+	return false;
+}
+
+
+////////
+// COMMAND FUNCTIONS
+////////
+
+// Calls callme or the default function.
+function opt_FUNCTION(callme) {
+	o3_text = (callme ? (typeof callme=='string' ? (/.+\(.*\)/.test(callme) ? eval(callme) : callme) : callme()) : (o3_function ? o3_function() : 'No Function'));
+
+	return 0;
+}
+
+// Handle hovering
+function opt_NOCLOSE(unused) {
+	if (!unused) o3_close = "";
+
+	if (olNs4) {
+		over.captureEvents(Event.MOUSEOUT || Event.MOUSEOVER);
+		over.onmouseover = function () { if (o3_timerid > 0) { clearTimeout(o3_timerid); o3_timerid = 0; } }
+		over.onmouseout = function (e) { if (olHideDelay) hideDelay(olHideDelay); else cClick(e); }
+	} else {
+		over.onmouseover = function () {hoveringSwitch = true; if (o3_timerid > 0) { clearTimeout(o3_timerid); o3_timerid =0; } }
+	}
+
+	return 0;
+}
+
+// Function to scan command line arguments for multiples
+function opt_MULTIPLEARGS(i, args, parameter) {
+  var k=i, re, pV, str='';
+
+  for(k=i; kpmStart) break;
+		str += args[k] + ',';
+	}
+	if (str) str = str.substring(0,--str.length);
+
+	k--;  // reduce by one so the for loop this is in works correctly
+	pV=(olNs4 && /cellpad/i.test(parameter)) ? str.split(',')[0] : str;
+	eval(parameter + '="' + pV + '"');
+
+	return k;
+}
+
+// Remove   in texts when done.
+function nbspCleanup() {
+	if (o3_wrap) {
+		o3_text = o3_text.replace(/\ /g, ' ');
+		o3_cap = o3_cap.replace(/\ /g, ' ');
+	}
+}
+
+// Escape embedded single quotes in text strings
+function escSglQuote(str) {
+  return str.toString().replace(/'/g,"\\'");
+}
+
+// Onload handler for window onload event
+function OLonLoad_handler(e) {
+	var re = /\w+\(.*\)[;\s]+/g, olre = /overlib\(|nd\(|cClick\(/, fn, l, i;
+
+	if(!olLoaded) olLoaded=1;
+
+  // Remove it for Gecko based browsers
+	if(window.removeEventListener && e.eventPhase == 3) window.removeEventListener("load",OLonLoad_handler,false);
+	else if(window.detachEvent) { // and for IE and Opera 4.x but execute calls to overlib, nd, or cClick()
+		window.detachEvent("onload",OLonLoad_handler);
+		var fN = document.body.getAttribute('onload');
+		if (fN) {
+			fN=fN.toString().match(re);
+			if (fN && fN.length) {
+				for (i=0; i' : '') : '';
+	else {
+		fontStr='o3_'+whichString+'font';
+		fontColor='o3_'+((whichString=='caption')? 'cap' : whichString)+'color';
+		return (hasDims&&!olNs4) ? (isClose ? '' : '
') : '';
+	}
+}
+
+// Quotes Multi word font names; needed for CSS Standards adherence in font-family
+function quoteMultiNameFonts(theFont) {
+	var v, pM=theFont.split(',');
+	for (var i=0; i 0) clearTimeout(o3_timerid);
+
+		o3_timerid=setTimeout("cClick()",(o3_timeout=time));
+	}
+}
+
+// Was originally in the placeLayer() routine; separated out for future ease
+function horizontalPlacement(browserWidth, horizontalScrollAmount, widthFix) {
+	var placeX, iwidth=browserWidth, winoffset=horizontalScrollAmount;
+	var parsedWidth = parseInt(o3_width);
+
+	if (o3_fixx > -1 || o3_relx != null) {
+		// Fixed position
+		placeX=(o3_relx != null ? ( o3_relx < 0 ? winoffset +o3_relx+ iwidth - parsedWidth - widthFix : winoffset+o3_relx) : o3_fixx);
+	} else {  
+		// If HAUTO, decide what to use.
+		if (o3_hauto == 1) {
+			if ((o3_x - winoffset) > (iwidth / 2)) {
+				o3_hpos = LEFT;
+			} else {
+				o3_hpos = RIGHT;
+			}
+		}  		
+
+		// From mouse
+		if (o3_hpos == CENTER) { // Center
+			placeX = o3_x+o3_offsetx-(parsedWidth/2);
+
+			if (placeX < winoffset) placeX = winoffset;
+		}
+
+		if (o3_hpos == RIGHT) { // Right
+			placeX = o3_x+o3_offsetx;
+
+			if ((placeX+parsedWidth) > (winoffset+iwidth - widthFix)) {
+				placeX = iwidth+winoffset - parsedWidth - widthFix;
+				if (placeX < 0) placeX = 0;
+			}
+		}
+		if (o3_hpos == LEFT) { // Left
+			placeX = o3_x-o3_offsetx-parsedWidth;
+			if (placeX < winoffset) placeX = winoffset;
+		}  	
+
+		// Snapping!
+		if (o3_snapx > 1) {
+			var snapping = placeX % o3_snapx;
+
+			if (o3_hpos == LEFT) {
+				placeX = placeX - (o3_snapx+snapping);
+			} else {
+				// CENTER and RIGHT
+				placeX = placeX+(o3_snapx - snapping);
+			}
+
+			if (placeX < winoffset) placeX = winoffset;
+		}
+	}	
+
+	return placeX;
+}
+
+// was originally in the placeLayer() routine; separated out for future ease
+function verticalPlacement(browserHeight,verticalScrollAmount) {
+	var placeY, iheight=browserHeight, scrolloffset=verticalScrollAmount;
+	var parsedHeight=(o3_aboveheight ? parseInt(o3_aboveheight) : (olNs4 ? over.clip.height : over.offsetHeight));
+
+	if (o3_fixy > -1 || o3_rely != null) {
+		// Fixed position
+		placeY=(o3_rely != null ? (o3_rely < 0 ? scrolloffset+o3_rely+iheight - parsedHeight : scrolloffset+o3_rely) : o3_fixy);
+	} else {
+		// If VAUTO, decide what to use.
+		if (o3_vauto == 1) {
+			if ((o3_y - scrolloffset) > (iheight / 2) && o3_vpos == BELOW && (o3_y + parsedHeight + o3_offsety - (scrolloffset + iheight) > 0)) {
+				o3_vpos = ABOVE;
+			} else if (o3_vpos == ABOVE && (o3_y - (parsedHeight + o3_offsety) - scrolloffset < 0)) {
+				o3_vpos = BELOW;
+			}
+		}
+
+		// From mouse
+		if (o3_vpos == ABOVE) {
+			if (o3_aboveheight == 0) o3_aboveheight = parsedHeight; 
+
+			placeY = o3_y - (o3_aboveheight+o3_offsety);
+			if (placeY < scrolloffset) placeY = scrolloffset;
+		} else {
+			// BELOW
+			placeY = o3_y+o3_offsety;
+		} 
+
+		// Snapping!
+		if (o3_snapy > 1) {
+			var snapping = placeY % o3_snapy;  			
+
+			if (o3_aboveheight > 0 && o3_vpos == ABOVE) {
+				placeY = placeY - (o3_snapy+snapping);
+			} else {
+				placeY = placeY+(o3_snapy - snapping);
+			} 			
+
+			if (placeY < scrolloffset) placeY = scrolloffset;
+		}
+	}
+
+	return placeY;
+}
+
+// checks positioning flags
+function checkPositionFlags() {
+	if (olHautoFlag) olHautoFlag = o3_hauto=0;
+	if (olVautoFlag) olVautoFlag = o3_vauto=0;
+	return true;
+}
+
+// get Browser window width
+function windowWidth() {
+	var w;
+	if (o3_frame.innerWidth) w=o3_frame.innerWidth;
+	else if (eval('o3_frame.'+docRoot)&&eval("typeof o3_frame."+docRoot+".clientWidth=='number'")&&eval('o3_frame.'+docRoot+'.clientWidth')) 
+		w=eval('o3_frame.'+docRoot+'.clientWidth');
+	return w;			
+}
+
+// create the div container for popup content if it doesn't exist
+function createDivContainer(id,frm,zValue) {
+	id = (id || 'overDiv'), frm = (frm || o3_frame), zValue = (zValue || 1000);
+	var objRef, divContainer = layerReference(id);
+
+	if (divContainer == null) {
+		if (olNs4) {
+			divContainer = frm.document.layers[id] = new Layer(window.innerWidth, frm);
+			objRef = divContainer;
+		} else {
+			var body = (olIe4 ? frm.document.all.tags('BODY')[0] : frm.document.getElementsByTagName("BODY")[0]);
+			if (olIe4&&!document.getElementById) {
+				body.insertAdjacentHTML("beforeEnd",'
');
+				divContainer=layerReference(id);
+			} else {
+				divContainer = frm.document.createElement("DIV");
+				divContainer.id = id;
+				body.appendChild(divContainer);
+			}
+			objRef = divContainer.style;
+		}
+
+		objRef.position = 'absolute';
+		objRef.visibility = 'hidden';
+		objRef.zIndex = zValue;
+		if (olIe4&&!olOp) objRef.left = objRef.top = '0px';
+		else objRef.left = objRef.top =  -10000 + (!olNs4 ? 'px' : 0);
+	}
+
+	return divContainer;
+}
+
+// get reference to a layer with ID=id
+function layerReference(id) {
+	return (olNs4 ? o3_frame.document.layers[id] : (document.all ? o3_frame.document.all[id] : o3_frame.document.getElementById(id)));
+}
+////////
+//  UTILITY FUNCTIONS
+////////
+
+// Checks if something is a function.
+function isFunction(fnRef) {
+	var rtn = true;
+
+	if (typeof fnRef == 'object') {
+		for (var i = 0; i < fnRef.length; i++) {
+			if (typeof fnRef[i]=='function') continue;
+			rtn = false;
+			break;
+		}
+	} else if (typeof fnRef != 'function') {
+		rtn = false;
+	}
+	
+	return rtn;
+}
+
+// Converts an array into an argument string for use in eval.
+function argToString(array, strtInd, argName) {
+	var jS = strtInd, aS = '', ar = array;
+	argName=(argName ? argName : 'ar');
+	
+	if (ar.length > jS) {
+		for (var k = jS; k < ar.length; k++) aS += argName+'['+k+'], ';
+		aS = aS.substring(0, aS.length-2);
+	}
+	
+	return aS;
+}
+
+// Places a hook in the correct position in a hook point.
+function reOrder(hookPt, fnRef, order) {
+	var newPt = new Array(), match, i, j;
+
+	if (!order || typeof order == 'undefined' || typeof order == 'number') return hookPt;
+	
+	if (typeof order=='function') {
+		if (typeof fnRef=='object') {
+			newPt = newPt.concat(fnRef);
+		} else {
+			newPt[newPt.length++]=fnRef;
+		}
+		
+		for (i = 0; i < hookPt.length; i++) {
+			match = false;
+			if (typeof fnRef == 'function' && hookPt[i] == fnRef) {
+				continue;
+			} else {
+				for(j = 0; j < fnRef.length; j++) if (hookPt[i] == fnRef[j]) {
+					match = true;
+					break;
+				}
+			}
+			if (!match) newPt[newPt.length++] = hookPt[i];
+		}
+
+		newPt[newPt.length++] = order;
+
+	} else if (typeof order == 'object') {
+		if (typeof fnRef == 'object') {
+			newPt = newPt.concat(fnRef);
+		} else {
+			newPt[newPt.length++] = fnRef;
+		}
+		
+		for (j = 0; j < hookPt.length; j++) {
+			match = false;
+			if (typeof fnRef == 'function' && hookPt[j] == fnRef) {
+				continue;
+			} else {
+				for (i = 0; i < fnRef.length; i++) if (hookPt[j] == fnRef[i]) {
+					match = true;
+					break;
+				}
+			}
+			if (!match) newPt[newPt.length++]=hookPt[j];
+		}
+
+		for (i = 0; i < newPt.length; i++) hookPt[i] = newPt[i];
+		newPt.length = 0;
+		
+		for (j = 0; j < hookPt.length; j++) {
+			match = false;
+			for (i = 0; i < order.length; i++) {
+				if (hookPt[j] == order[i]) {
+					match = true;
+					break;
+				}
+			}
+			if (!match) newPt[newPt.length++] = hookPt[j];
+		}
+		newPt = newPt.concat(order);
+	}
+
+	hookPt = newPt;
+
+	return hookPt;
+}
+
+////////
+//  PLUGIN ACTIVATION FUNCTIONS
+////////
+
+// Runs plugin functions to set runtime variables.
+function setRunTimeVariables(){
+	if (typeof runTime != 'undefined' && runTime.length) {
+		for (var k = 0; k < runTime.length; k++) {
+			runTime[k]();
+		}
+	}
+}
+
+// Runs plugin functions to parse commands.
+function parseCmdLine(pf, i, args) {
+	if (typeof cmdLine != 'undefined' && cmdLine.length) { 
+		for (var k = 0; k < cmdLine.length; k++) { 
+			var j = cmdLine[k](pf, i, args);
+			if (j >- 1) {
+				i = j;
+				break;
+			}
+		}
+	}
+
+	return i;
+}
+
+// Runs plugin functions to do things after parse.
+function postParseChecks(pf,args){
+	if (typeof postParse != 'undefined' && postParse.length) {
+		for (var k = 0; k < postParse.length; k++) {
+			if (postParse[k](pf,args)) continue;
+			return false;  // end now since have an error
+		}
+	}
+	return true;
+}
+
+
+////////
+//  PLUGIN REGISTRATION FUNCTIONS
+////////
+
+// Registers commands and creates constants.
+function registerCommands(cmdStr) {
+	if (typeof cmdStr!='string') return;
+
+	var pM = cmdStr.split(',');
+	pms = pms.concat(pM);
+
+	for (var i = 0; i< pM.length; i++) {
+		eval(pM[i].toUpperCase()+'='+pmCount++);
+	}
+}
+
+// Registers no-parameter commands
+function registerNoParameterCommands(cmdStr) {
+	if (!cmdStr && typeof cmdStr != 'string') return;
+	pmt=(!pmt) ? cmdStr : pmt + ',' + cmdStr;
+}
+
+// Register a function to hook at a certain point.
+function registerHook(fnHookTo, fnRef, hookType, optPm) {
+	var hookPt, last = typeof optPm;
+	
+	if (fnHookTo == 'plgIn'||fnHookTo == 'postParse') return;
+	if (typeof hookPts[fnHookTo] == 'undefined') hookPts[fnHookTo] = new FunctionReference();
+
+	hookPt = hookPts[fnHookTo];
+
+	if (hookType != null) {
+		if (hookType == FREPLACE) {
+			hookPt.ovload = fnRef;  // replace normal overlib routine
+			if (fnHookTo.indexOf('ol_content_') > -1) hookPt.alt[pms[CSSOFF-1-pmStart]]=fnRef; 
+
+		} else if (hookType == FBEFORE || hookType == FAFTER) {
+			var hookPt=(hookType == 1 ? hookPt.before : hookPt.after);
+
+			if (typeof fnRef == 'object') {
+				hookPt = hookPt.concat(fnRef);
+			} else {
+				hookPt[hookPt.length++] = fnRef;
+			}
+
+			if (optPm) hookPt = reOrder(hookPt, fnRef, optPm);
+
+		} else if (hookType == FALTERNATE) {
+			if (last=='number') hookPt.alt[pms[optPm-1-pmStart]] = fnRef;
+		} else if (hookType == FCHAIN) {
+			hookPt = hookPt.chain; 
+			if (typeof fnRef=='object') hookPt=hookPt.concat(fnRef); // add other functions 
+			else hookPt[hookPt.length++]=fnRef;
+		}
+
+		return;
+	}
+}
+
+// Register a function that will set runtime variables.
+function registerRunTimeFunction(fn) {
+	if (isFunction(fn)) {
+		if (typeof fn == 'object') {
+			runTime = runTime.concat(fn);
+		} else {
+			runTime[runTime.length++] = fn;
+		}
+	}
+}
+
+// Register a function that will handle command parsing.
+function registerCmdLineFunction(fn){
+	if (isFunction(fn)) {
+		if (typeof fn == 'object') {
+			cmdLine = cmdLine.concat(fn);
+		} else {
+			cmdLine[cmdLine.length++] = fn;
+		}
+	}
+}
+
+// Register a function that does things after command parsing. 
+function registerPostParseFunction(fn){
+	if (isFunction(fn)) {
+		if (typeof fn == 'object') {
+			postParse = postParse.concat(fn);
+		} else {
+			postParse[postParse.length++] = fn;
+		}
+	}
+}
+
+////////
+//  PLUGIN REGISTRATION FUNCTIONS
+////////
+
+// Runs any hooks registered.
+function runHook(fnHookTo, hookType) {
+	var l = hookPts[fnHookTo], k, rtnVal = null, optPm, arS, ar = runHook.arguments;
+
+	if (hookType == FREPLACE) {
+		arS = argToString(ar, 2);
+
+		if (typeof l == 'undefined' || !(l = l.ovload)) rtnVal = eval(fnHookTo+'('+arS+')');
+		else rtnVal = eval('l('+arS+')');
+
+	} else if (hookType == FBEFORE || hookType == FAFTER) {
+		if (typeof l != 'undefined') {
+			l=(hookType == 1 ? l.before : l.after);
+	
+			if (l.length) {
+				arS = argToString(ar, 2);
+				for (var k = 0; k < l.length; k++) eval('l[k]('+arS+')');
+			}
+		}
+	} else if (hookType == FALTERNATE) {
+		optPm = ar[2];
+		arS = argToString(ar, 3);
+
+		if (typeof l == 'undefined' || (l = l.alt[pms[optPm-1-pmStart]]) == 'undefined') {
+			rtnVal = eval(fnHookTo+'('+arS+')');
+		} else {
+			rtnVal = eval('l('+arS+')');
+		}
+	} else if (hookType == FCHAIN) {
+		arS=argToString(ar,2);
+		l=l.chain;
+
+		for (k=l.length; k > 0; k--) if((rtnVal=eval('l[k-1]('+arS+')'))!=void(0)) break;
+	}
+
+	return rtnVal;
+}
+
+////////
+// OBJECT CONSTRUCTORS
+////////
+
+// Object for handling hooks.
+function FunctionReference() {
+	this.ovload = null;
+	this.before = new Array();
+	this.after = new Array();
+	this.alt = new Array();
+	this.chain = new Array();
+}
+
+// Object for simple access to the overLIB version used.
+// Examples: simpleversion:351 major:3 minor:5 revision:1
+function Info(version, prerelease) {
+	this.version = version;
+	this.prerelease = prerelease;
+
+	this.simpleversion = Math.round(this.version*100);
+	this.major = parseInt(this.simpleversion / 100);
+	this.minor = parseInt(this.simpleversion / 10) - this.major * 10;
+	this.revision = parseInt(this.simpleversion) - this.major * 100 - this.minor * 10;
+	this.meets = meets;
+}
+
+// checks for Core Version required
+function meets(reqdVersion) {
+	return (!reqdVersion) ? false : this.simpleversion >= Math.round(100*parseFloat(reqdVersion));
+}
+
+
+////////
+// STANDARD REGISTRATIONS
+////////
+registerHook("ol_content_simple", ol_content_simple, FALTERNATE, CSSOFF);
+registerHook("ol_content_caption", ol_content_caption, FALTERNATE, CSSOFF);
+registerHook("ol_content_background", ol_content_background, FALTERNATE, CSSOFF);
+registerHook("ol_content_simple", ol_content_simple, FALTERNATE, CSSCLASS);
+registerHook("ol_content_caption", ol_content_caption, FALTERNATE, CSSCLASS);
+registerHook("ol_content_background", ol_content_background, FALTERNATE, CSSCLASS);
+registerPostParseFunction(checkPositionFlags);
+registerHook("hideObject", nbspCleanup, FAFTER);
+registerHook("horizontalPlacement", horizontalPlacement, FCHAIN);
+registerHook("verticalPlacement", verticalPlacement, FCHAIN);
+if (olNs4||(olIe5&&isMac)||olKq) olLoaded=1;
+registerNoParameterCommands('sticky,autostatus,autostatuscap,fullhtml,hauto,vauto,closeclick,wrap,followmouse,mouseoff,compatmode');
+///////
+// ESTABLISH MOUSECAPTURING
+///////
+
+// Capture events, alt. diffuses the overlib function.
+var olCheckMouseCapture=true;
+if ((olNs4 || olNs6 || olIe4)) {
+	olMouseCapture();
+} else {
+	overlib = no_overlib;
+	nd = no_overlib;
+	ver3fix = true;
+}

Property changes on: tags/2.8.3/wb/admin/media/overlib.js
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.8.3/wb/admin/start/index.php
===================================================================
--- tags/2.8.3/wb/admin/start/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/start/index.php	(revision 1610)
@@ -0,0 +1,194 @@
+ WB_PATH.'/modules/',
+	               'templates' => WB_PATH.'/templates/',
+	               'languages' => WB_PATH.'/languages/'
+	             );
+	foreach($dirs AS $type => $dir) {
+		if( ($handle = opendir($dir)) ) {
+			while(false !== ($file = readdir($handle))) {
+				if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') {
+					// Get addon type
+					if($type == 'modules') {
+						load_module($dir.'/'.$file, true);
+						// Pretty ugly hack to let modules run $admin->set_error
+						// See dummy class definition admin_dummy above
+						if(isset($admin->error) && $admin->error != '') {
+							$admin->print_error($admin->error);
+						}
+					} elseif($type == 'templates') {
+						load_template($dir.'/'.$file);
+					} elseif($type == 'languages') {
+						load_language($dir.'/'.$file);
+					}
+				}
+			}
+		closedir($handle);
+		}
+	}
+	$sql = 'DELETE FROM `'.TABLE_PREFIX.'settings` WHERE `name`=\'FINALIZE_SETUP\'';
+	if($database->query($sql)) { }
+}
+// ---------------------------------------
+$msg = '
';
+// check if it is neccessary to start the uograde-script
+if(($admin->get_user_id()==1) && file_exists(WB_PATH.'/upgrade-script.php')) {
+	// check if it is neccessary to start the uograde-script
+	$sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name`=\'wb_revision\'';
+	if($wb_revision=$database->get_one($sql)) {
+	}
+	if (version_compare($wb_revision, REVISION ) < 0) {
+		if(!headers_sent()) {
+			header('Location: '.WB_URL.'/upgrade-script.php');
+		    exit;
+		} else {
+		    echo "
 The upgrade script could not be start automatically.\n" .
+		         "Please click on this link to start the script!
\n";
+		    exit;
+		}
+	}
+	$msg .= ''.$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'
';
+}
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('start.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+$template->set_file('page', 'start.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Insert values into the template object
+$template->set_var(array(
+					'WELCOME_MESSAGE' => $MESSAGE['START']['WELCOME_MESSAGE'],
+					'CURRENT_USER' => $MESSAGE['START']['CURRENT_USER'],
+					'DISPLAY_NAME' => $admin->get_display_name(),
+					'ADMIN_URL' => ADMIN_URL,
+					'WB_URL' => WB_URL,
+					'THEME_URL' => THEME_URL,
+					'WB_VERSION' => WB_VERSION
+				)
+			);
+
+// Insert permission values into the template object
+if($admin->get_permission('pages') != true)
+{
+	$template->set_var('DISPLAY_PAGES', 'display:none;');
+}
+if($admin->get_permission('media') != true)
+{
+	$template->set_var('DISPLAY_MEDIA', 'display:none;');
+}
+if($admin->get_permission('addons') != true)
+{
+	$template->set_var('DISPLAY_ADDONS', 'display:none;');
+}
+if($admin->get_permission('access') != true)
+{
+	$template->set_var('DISPLAY_ACCESS', 'display:none;');
+}
+if($admin->get_permission('settings') != true)
+{
+	$template->set_var('DISPLAY_SETTINGS', 'display:none;');
+}
+if($admin->get_permission('admintools') != true)
+{
+	$template->set_var('DISPLAY_ADMINTOOLS', 'display:none;');
+}
+
+$msg .= (file_exists(WB_PATH.'/install/')) ?  $MESSAGE['START']['INSTALL_DIR_EXISTS'] : '';
+
+// Check if installation directory still exists
+if(file_exists(WB_PATH.'/install/') || file_exists(WB_PATH.'/upgrade-script.php') ) {
+	// Check if user is part of Adminstrators group
+	if(in_array(1, $admin->get_groups_id()))
+    {
+		$template->set_var('WARNING', $msg );
+	} else {
+		$template->set_var('DISPLAY_WARNING', 'display:none;');
+	}
+} else {
+	$template->set_var('DISPLAY_WARNING', 'display:none;');
+}
+
+// Insert "Add-ons" section overview (pretty complex compared to normal)
+$addons_overview = $TEXT['MANAGE'].' ';
+$addons_count = 0;
+if($admin->get_permission('modules') == true)
+{
+	$addons_overview .= ''.$MENU['MODULES'].'';
+	$addons_count = 1;
+}
+if($admin->get_permission('templates') == true)
+{
+	if($addons_count == 1) { $addons_overview .= ', '; }
+	$addons_overview .= ''.$MENU['TEMPLATES'].'';
+	$addons_count = 1;
+}
+if($admin->get_permission('languages') == true)
+{
+	if($addons_count == 1) { $addons_overview .= ', '; }
+	$addons_overview .= ''.$MENU['LANGUAGES'].'';
+}
+
+// Insert "Access" section overview (pretty complex compared to normal)
+$access_overview = $TEXT['MANAGE'].' ';
+$access_count = 0;
+if($admin->get_permission('users') == true) {
+	$access_overview .= ''.$MENU['USERS'].'';
+	$access_count = 1;
+}
+if($admin->get_permission('groups') == true) {
+	if($access_count == 1) { $access_overview .= ', '; }
+	$access_overview .= ''.$MENU['GROUPS'].'';
+	$access_count = 1;
+}
+
+// Insert section names and descriptions
+$template->set_var(array(
+					'PAGES' => $MENU['PAGES'],
+					'MEDIA' => $MENU['MEDIA'],
+					'ADDONS' => $MENU['ADDONS'],
+					'ACCESS' => $MENU['ACCESS'],
+					'PREFERENCES' => $MENU['PREFERENCES'],
+					'SETTINGS' => $MENU['SETTINGS'],
+					'ADMINTOOLS' => $MENU['ADMINTOOLS'],
+					'HOME_OVERVIEW' => $OVERVIEW['START'],
+					'PAGES_OVERVIEW' => $OVERVIEW['PAGES'],
+					'MEDIA_OVERVIEW' => $OVERVIEW['MEDIA'],
+					'ADDONS_OVERVIEW' => $addons_overview,
+					'ACCESS_OVERVIEW' => $access_overview,
+					'PREFERENCES_OVERVIEW' => $OVERVIEW['PREFERENCES'],
+					'SETTINGS_OVERVIEW' => $OVERVIEW['SETTINGS'],
+					'ADMINTOOLS_OVERVIEW' => $OVERVIEW['ADMINTOOLS']
+				)
+			);
+
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/start/index.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/settings/save.php
===================================================================
--- tags/2.8.3/wb/admin/settings/save.php	(nonexistent)
+++ tags/2.8.3/wb/admin/settings/save.php	(revision 1610)
@@ -0,0 +1,260 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back );
+}
+// After check print the header
+$admin->print_header();
+
+// Ensure that the specified default email is formally valid
+if(isset($_POST['server_email']))
+{
+	$_POST['server_email'] = strip_tags($_POST['server_email']);
+    // $pattern = '/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9]([-a-z0-9_]?[a-z0-9])*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z]{2})|([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})(\.([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})){3})(:[0-9]{1,5})?\r/im';
+    $pattern = '/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.(([0-9]{1,3})|([a-zA-Z]{2,6}))$/';
+    if(false == preg_match($pattern, $_POST['server_email']))
+    {
+		$admin->print_error($MESSAGE['USERS_INVALID_EMAIL'].
+			'
Email: '.htmlentities($_POST['server_email']).'', $js_back);
+	}
+}
+
+if(isset($_POST['wbmailer_routine']) && ($_POST['wbmailer_routine']=='smtp')) {
+
+	$checkSmtpHost = (isset($_POST['wbmailer_smtp_host']) && ($_POST['wbmailer_smtp_host']=='') ? false : true);
+	$checkSmtpUser = (isset($_POST['wbmailer_smtp_username']) && ($_POST['wbmailer_smtp_username']=='') ? false : true);
+	$checkSmtpPassword = (isset($_POST['wbmailer_smtp_password']) && ($_POST['wbmailer_smtp_password']=='') ? false : true);
+	if(!$checkSmtpHost || !$checkSmtpUser || !$checkSmtpPassword) {
+		$admin->print_error($TEXT['REQUIRED'].' '.$TEXT['WBMAILER_SMTP_AUTH'].
+			'
'.$MESSAGE['GENERIC_FILL_IN_ALL'].'', $js_back);
+	}
+
+}
+
+// Work-out file mode
+if($advanced == '')
+{
+	// Check if should be set to 777 or left alone
+	if(isset($_POST['world_writeable']) && $_POST['world_writeable'] == 'true')
+    {
+		$file_mode = '0777';
+		$dir_mode = '0777';
+	} else {
+		$file_mode = STRING_FILE_MODE;
+		$dir_mode = STRING_DIR_MODE;
+	}
+} else {
+	$file_mode = STRING_FILE_MODE;
+	$dir_mode = STRING_DIR_MODE;
+	if($admin->get_user_id()=='1')
+	{
+		// Work-out the octal value for file mode
+		$u = 0;
+		if(isset($_POST['file_u_r']) && $_POST['file_u_r'] == 'true') {
+			$u = $u+4;
+		}
+		if(isset($_POST['file_u_w']) && $_POST['file_u_w'] == 'true') {
+			$u = $u+2;
+		}
+		if(isset($_POST['file_u_e']) && $_POST['file_u_e'] == 'true') {
+			$u = $u+1;
+		}
+		$g = 0;
+		if(isset($_POST['file_g_r']) && $_POST['file_g_r'] == 'true') {
+			$g = $g+4;
+		}
+		if(isset($_POST['file_g_w']) && $_POST['file_g_w'] == 'true') {
+			$g = $g+2;
+		}
+		if(isset($_POST['file_g_e']) && $_POST['file_g_e'] == 'true') {
+			$g = $g+1;
+		}
+		$o = 0;
+		if(isset($_POST['file_o_r']) && $_POST['file_o_r'] == 'true') {
+			$o = $o+4;
+		}
+		if(isset($_POST['file_o_w']) && $_POST['file_o_w'] == 'true') {
+			$o = $o+2;
+		}
+		if(isset($_POST['file_o_e']) && $_POST['file_o_e'] == 'true') {
+			$o = $o+1;
+		}
+		$file_mode = "0".$u.$g.$o;
+		// Work-out the octal value for dir mode
+		$u = 0;
+		if(isset($_POST['dir_u_r']) && $_POST['dir_u_r'] == 'true') {
+			$u = $u+4;
+		}
+		if(isset($_POST['dir_u_w']) && $_POST['dir_u_w'] == 'true') {
+			$u = $u+2;
+		}
+		if(isset($_POST['dir_u_e']) && $_POST['dir_u_e'] == 'true') {
+			$u = $u+1;
+		}
+		$g = 0;
+		if(isset($_POST['dir_g_r']) && $_POST['dir_g_r'] == 'true') {
+			$g = $g+4;
+		}
+		if(isset($_POST['dir_g_w']) && $_POST['dir_g_w'] == 'true') {
+			$g = $g+2;
+		}
+		if(isset($_POST['dir_g_e']) && $_POST['dir_g_e'] == 'true') {
+			$g = $g+1;
+		}
+		$o = 0;
+		if(isset($_POST['dir_o_r']) && $_POST['dir_o_r'] == 'true') {
+			$o = $o+4;
+		}
+		if(isset($_POST['dir_o_w']) && $_POST['dir_o_w'] == 'true') {
+			$o = $o+2;
+		}
+		if(isset($_POST['dir_o_e']) && $_POST['dir_o_e'] == 'true') {
+			$o = $o+1;
+		}
+		$dir_mode = "0".$u.$g.$o;
+	}
+}
+
+$allow_tags_in_fields = array('website_header', 'website_footer');
+$allow_empty_values = array('website_header','website_footer','sec_anchor','pages_directory','page_spacer');
+$disallow_in_fields = array('pages_directory', 'media_directory','wb_version');
+
+// Query current settings in the db, then loop through them and update the db with the new value
+$settings = array();
+$old_settings = array();
+// Query current settings in the db, then loop through them to get old values
+$sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings`';
+$sql .= 'ORDER BY `name`';
+
+if($res_settings = $database->query($sql)) {
+	$passed = false;
+	while($setting = $res_settings->fetchRow())
+	{
+		$old_settings[$setting['name']] = $setting['value'];
+		$setting_name = $setting['name'];
+		$value = $admin->get_post($setting_name);
+		$value = isset($_POST[$setting_name]) ? $value : $old_settings[$setting_name] ;
+		switch ($setting_name) {
+			case 'default_timezone':
+				$value=$value*60*60;
+				$passed = true;
+				break;
+			case 'string_dir_mode':
+				$value=$dir_mode;
+				$passed = true;
+				break;
+			case 'string_file_mode':
+				$value=$file_mode;
+	 			$passed = true;
+			break;
+			case 'pages_directory':
+				break;
+			case 'wbmailer_smtp_auth':
+				// $value = isset($_POST[$setting_name]) ? $_POST[$setting_name] : '' ;
+				$value = true ;
+	 			$passed = true;
+				break;
+			default :
+			    $passed = in_array($setting_name, $allow_empty_values);
+				break;
+		}
+
+	    if (!in_array($setting_name, $allow_tags_in_fields))
+	    {
+	        $value = strip_tags($value);
+	    }
+
+	    if ( !in_array($value, $disallow_in_fields) && (isset($_POST[$setting_name]) || $passed == true) )
+	    {
+	        $value = trim($admin->add_slashes($value));
+	        $sql = 'UPDATE `'.TABLE_PREFIX.'settings` ';
+	        $sql .= 'SET `value` = \''.$value.'\' ';
+	        $sql .= 'WHERE `name` != \'wb_version\' ';
+	        $sql .= 'AND `name` = \''.$setting_name.'\' ';
+
+	        if (!$database->query($sql))
+	        {
+				if($database->is_error()) {
+					$admin->print_error($database->get_error, $js_back );
+				}
+	        }
+		}
+	}
+}
+
+// Query current search settings in the db, then loop through them and update the db with the new value
+$sql  = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'search` ';
+$sql .= 'WHERE `extra` = ""';
+$res_search = $database->query($sql);
+
+if($database->is_error()) {
+	$admin->print_error($database->is_error(), $js_back );
+}
+
+while($search_setting = $res_search->fetchRow())
+{
+	$old_value = $search_setting['value'];
+	$setting_name = $search_setting['name'];
+	$post_name = 'search_'.$search_setting['name'];
+
+    // hold old value if post is empty
+    // check search template
+    $value = ( ($admin->get_post($post_name) == '') && ($setting_name != 'template') ) ? $old_value : $admin->get_post($post_name);
+    // $value =  ( ($admin->get_post($post_name) == '') && ($setting_name == 'template') ) ? DEFAULT_TEMPLATE : $admin->get_post($post_name);
+    if(isset($value))
+	{
+		$value = $admin->add_slashes($value);
+        $sql  = 'UPDATE `'.TABLE_PREFIX.'search` ';
+        $sql .= 'SET `value` = "'.$value.'" ';
+        $sql .= 'WHERE `name` = "'.$setting_name.'" ';
+        $sql .= 'AND `extra` = ""';
+		if($database->query($sql)) {
+		}
+		$sql_info = mysql_info($database->db_handle);
+    }
+}
+
+// Check if there was an error updating the db
+if($database->is_error()) {
+	$admin->print_error($database->get_error, $js_back );
+} else {
+	$admin->print_success($MESSAGE['SETTINGS']['SAVED'], $js_back );
+}
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/settings/save.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/settings/setting.js
===================================================================
--- tags/2.8.3/wb/admin/settings/setting.js	(nonexistent)
+++ tags/2.8.3/wb/admin/settings/setting.js	(revision 1610)
@@ -0,0 +1,42 @@
+function change_os(type) {
+	if(type == 'linux') {
+		document.getElementById('file_perms_box1').style.display = 'block';
+		document.getElementById('file_perms_box2').style.display = 'block';
+		document.getElementById('file_perms_box3').style.display = 'block';
+	} else if(type == 'windows') {
+		document.getElementById('file_perms_box1').style.display = 'none';
+		document.getElementById('file_perms_box2').style.display = 'none';
+		document.getElementById('file_perms_box3').style.display = 'none';
+	}
+}
+
+function change_wbmailer(type) {
+	if(type == 'smtp') {
+		document.getElementById('row_wbmailer_smtp_settings').style.display = '';
+		document.getElementById('row_wbmailer_smtp_host').style.display = '';
+		document.getElementById('row_wbmailer_smtp_auth_mode').style.display = '';
+		document.getElementById('row_wbmailer_smtp_username').style.display = '';
+		document.getElementById('row_wbmailer_smtp_password').style.display = '';
+	} else if(type == 'phpmail') {
+		document.getElementById('row_wbmailer_smtp_settings').style.display = 'none';
+		document.getElementById('row_wbmailer_smtp_host').style.display = 'none';
+		document.getElementById('row_wbmailer_smtp_auth_mode').style.display = 'none';
+		document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
+		document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
+	}
+}
+/*  */
+function toggle_wbmailer_auth() {
+		document.getElementById('row_wbmailer_smtp_username').style.display = '';
+		document.getElementById('row_wbmailer_smtp_password').style.display = '';
+		document.settings.wbmailer_smtp_auth.checked == true;
+/*
+	if( document.settings.wbmailer_smtp_auth.checked == true ) {
+		document.getElementById('row_wbmailer_smtp_username').style.display = '';
+		document.getElementById('row_wbmailer_smtp_password').style.display = '';
+	} else {
+		document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
+		document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
+	}
+*/
+}

Property changes on: tags/2.8.3/wb/admin/settings/setting.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/settings/index.php
===================================================================
--- tags/2.8.3/wb/admin/settings/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/settings/index.php	(revision 1610)
@@ -0,0 +1,750 @@
+correct_theme_source('settings.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page',        'settings.htt');
+$template->set_block('page',       'main_block', 'main');
+$template->set_var('FTAN', $admin->getFTAN());
+
+$template->set_block('main_block', 'template_list_block',         'template_list');
+$template->set_block('main_block', 'timezone_list_block',         'timezone_list');
+$template->set_block('main_block', 'language_list_block',         'language_list');
+$template->set_block('main_block', 'date_format_list_block',      'date_format_list');
+$template->set_block('main_block', 'time_format_list_block',      'time_format_list');
+$template->set_block('main_block', 'theme_list_block',            'theme_list');
+$template->set_block('main_block', 'search_template_list_block',  'search_template_list');
+$template->set_block('main_block', 'group_list_block',            'group_list');
+$template->set_block('main_block', 'charset_list_block',          'charset_list');
+$template->set_block('main_block', 'error_reporting_list_block',  'error_reporting_list');
+$template->set_block('main_block', 'editor_list_block',           'editor_list');
+$template->set_block('main_block', 'page_level_limit_list_block', 'page_level_limit_list');
+
+$template->set_block('main_block', 'show_page_level_limit_block', 'show_page_level_limit');
+$template->set_block('main_block', 'show_checkbox_1_block',       'show_checkbox_1');
+$template->set_block('main_block', 'show_checkbox_2_block',       'show_checkbox_2');
+$template->set_block('main_block', 'show_checkbox_3_block',       'show_checkbox_3');
+$template->set_block('main_block', 'show_php_error_level_block',  'show_php_error_level');
+$template->set_block('main_block', 'show_charset_block',          'show_charset');
+$template->set_block('main_block', 'show_wysiwyg_block',          'show_wysiwyg');
+$template->set_block('main_block', 'show_access_block',           'show_access');
+$template->set_block('main_block', 'show_search_block',           'show_search');
+$template->set_block('main_block', 'show_redirect_timer_block',   'show_redirect_timer');
+
+// Query current settings in the db, then loop through them and print them
+$query = "SELECT * FROM ".TABLE_PREFIX."settings";
+$results = $database->query($query);
+while($setting = $results->fetchRow())
+{
+	$setting_name = $setting['name'];
+	$setting_value = ( $setting_name != 'wbmailer_smtp_password' ) ? htmlspecialchars($setting['value']) : $setting['value'];
+	$template->set_var(strtoupper($setting_name),$setting_value);
+}
+
+// Do the same for settings stored in config file as with ones in db
+$database_type = '';
+$is_advanced = (isset($_GET['advanced']) && $_GET['advanced'] == 'yes');
+// Tell the browser whether or not to show advanced options
+if($is_advanced)
+{
+	$template->set_var('DISPLAY_ADVANCED', '');
+	$template->set_var('ADVANCED_FILE_PERMS_ID', 'file_perms_box');
+	$template->set_var('BASIC_FILE_PERMS_ID', 'hide');
+	$template->set_var('ADVANCED', 'yes');
+	$template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']);
+	$template->set_var('ADVANCED_LINK', 'index.php?advanced=no');
+
+} else {
+	$template->set_var('DISPLAY_ADVANCED', ' style="display: none;"');
+	$template->set_var('BASIC_FILE_PERMS_ID', 'file_perms_box');
+	$template->set_var('ADVANCED_FILE_PERMS_ID', 'hide');
+
+	$template->set_var('ADVANCED', 'no');
+	$template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>');
+	$template->set_var('ADVANCED_LINK', 'index.php?advanced=yes');
+}
+
+	$query = "SELECT * FROM ".TABLE_PREFIX."search WHERE extra = ''";
+	$results = $database->query($query);
+
+	// Query current settings in the db, then loop through them and print them
+	while($setting = $results->fetchRow())
+	{
+		$setting_name = $setting['name'];
+		$setting_value = htmlspecialchars(($setting['value']));
+		switch($setting_name) {
+			// Search header
+			case 'header':
+				$template->set_var('SEARCH_HEADER', $setting_value);
+			break;
+			// Search results header
+			case 'results_header':
+				$template->set_var('SEARCH_RESULTS_HEADER', $setting_value);
+			break;
+			// Search results loop
+			case 'results_loop':
+				$template->set_var('SEARCH_RESULTS_LOOP', $setting_value);
+			break;
+			// Search results footer
+			case 'results_footer':
+				$template->set_var('SEARCH_RESULTS_FOOTER', $setting_value);
+			break;
+			// Search no results
+			case 'no_results':
+				$template->set_var('SEARCH_NO_RESULTS', $setting_value);
+			break;
+			// Search footer
+			case 'footer':
+				$template->set_var('SEARCH_FOOTER', $setting_value);
+			break;
+			// Search module-order
+			case 'module_order':
+				$template->set_var('SEARCH_MODULE_ORDER', $setting_value);
+			break;
+			// Search max lines of excerpt
+			case 'max_excerpt':
+				$template->set_var('SEARCH_MAX_EXCERPT', $setting_value);
+			break;
+			// time-limit
+			case 'time_limit':
+				$template->set_var('SEARCH_TIME_LIMIT', $setting_value);
+			break;
+			// Search template
+			case 'template':
+				$search_template = $setting_value;
+			break;
+		}
+	}
+
+	$template->set_var(array(
+						'WB_URL' => WB_URL,
+						'THEME_URL' => THEME_URL,
+						'ADMIN_URL' => ADMIN_URL,
+					 ));
+
+	// Insert language values
+	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language' ORDER BY directory");
+	if($result->numRows() > 0)
+	{
+		while($addon = $result->fetchRow()) {
+	        $langIcons = (empty($addon['directory'])) ? 'none' : strtolower($addon['directory']);
+
+			$template->set_var('CODE',        $addon['directory']);
+			$template->set_var('NAME',        $addon['name']);
+			$template->set_var('FLAG',        THEME_URL.'/images/flags/'.$langIcons);
+			$template->set_var('SELECTED',    (DEFAULT_LANGUAGE == $addon['directory'] ? ' selected="selected"' : '') );
+			$template->parse('language_list', 'language_list_block', true);
+		}
+	}
+
+	// Insert default timezone values
+	require(ADMIN_PATH.'/interface/timezones.php');
+	foreach($TIMEZONES AS $hour_offset => $title)
+	{
+		// Make sure we dont list "System Default" as we are setting this value!
+		if($hour_offset != '-20') {
+			$template->set_var('VALUE', $hour_offset);
+			$template->set_var('NAME', $title);
+			if(DEFAULT_TIMEZONE == $hour_offset*60*60) {
+				$template->set_var('SELECTED', ' selected="selected"');
+			} else {
+				$template->set_var('SELECTED', '');
+			}
+			$template->parse('timezone_list', 'timezone_list_block', true);
+		}
+	}
+
+	// Insert default charset values
+	require(ADMIN_PATH.'/interface/charsets.php');
+	foreach($CHARSETS AS $code => $title) {
+		$template->set_var('VALUE', $code);
+		$template->set_var('NAME', $title);
+		if(DEFAULT_CHARSET == $code) {
+			$template->set_var('SELECTED', ' selected="selected"');
+		} else {
+			$template->set_var('SELECTED', '');
+		}
+		$template->parse('charset_list', 'charset_list_block', true);
+	}
+
+
+	// Insert date format list
+	require(ADMIN_PATH.'/interface/date_formats.php');
+	foreach($DATE_FORMATS AS $format => $title) {
+		$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
+		if($format != 'system_default') {
+			$template->set_var('VALUE', $format);
+		} else {
+			$template->set_var('VALUE', '');
+		}
+		$template->set_var('NAME', $title);
+		if(DEFAULT_DATE_FORMAT == $format) {
+			$template->set_var('SELECTED', ' selected="selected"');
+		} else {
+			$template->set_var('SELECTED', '');
+		}
+		$template->parse('date_format_list', 'date_format_list_block', true);
+	}
+
+	// Insert time format list
+	require(ADMIN_PATH.'/interface/time_formats.php');
+	foreach($TIME_FORMATS AS $format => $title) {
+		$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
+		if($format != 'system_default') {
+			$template->set_var('VALUE', $format);
+		} else {
+			$template->set_var('VALUE', '');
+		}
+		$template->set_var('NAME', $title);
+		if(DEFAULT_TIME_FORMAT == $format) {
+			$template->set_var('SELECTED', ' selected="selected"');
+		} else {
+			$template->set_var('SELECTED', '');
+		}
+		$template->parse('time_format_list', 'time_format_list_block', true);
+	}
+
+	// Insert templates
+	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function != 'theme' ORDER BY name");
+	if($result->numRows() > 0) {
+		while($addon = $result->fetchRow()) {
+			$template->set_var('FILE', $addon['directory']);
+			$template->set_var('NAME', $addon['name']);
+			if(($addon['directory'] == DEFAULT_TEMPLATE) ? $selected = ' selected="selected"' : $selected = '');
+			$template->set_var('SELECTED', $selected);
+			$template->parse('template_list', 'template_list_block', true);
+		}
+	}
+
+	// Insert backend theme
+	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function = 'theme' ORDER BY name");
+	if($result->numRows() > 0) {
+		while($addon = $result->fetchRow()) {
+			$template->set_var('FILE', $addon['directory']);
+			$template->set_var('NAME', $addon['name']);
+			if(($addon['directory'] == DEFAULT_THEME) ? $selected = ' selected="selected"' : $selected = '');
+			$template->set_var('SELECTED', $selected);
+			$template->parse('theme_list', 'theme_list_block', true);
+		}
+	}
+
+	// Insert WYSIWYG modules
+	$file='none';
+	$module_name=$TEXT['NONE'];
+	$template->set_var('FILE', $file);
+	$template->set_var('NAME', $module_name);
+	$selected = (!defined('WYSIWYG_EDITOR') || $file == WYSIWYG_EDITOR) ? ' selected="selected"' : '';
+	$template->set_var('SELECTED', $selected);
+	$template->parse('editor_list', 'editor_list_block', true);
+	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'wysiwyg' ORDER BY name");
+	if($result->numRows() > 0)
+	{
+		while($addon = $result->fetchRow())
+	    {
+			$template->set_var('FILE', $addon['directory']);
+			$template->set_var('NAME', $addon['name']);
+			$selected = (!defined('WYSIWYG_EDITOR') || $addon['directory'] == WYSIWYG_EDITOR) ? ' selected="selected"' : '';
+			$template->set_var('SELECTED', $selected);
+			$template->parse('editor_list', 'editor_list_block', true);
+		}
+	}
+
+// Insert templates for search settings
+	$search_template = ( ($search_template == DEFAULT_TEMPLATE) || ($search_template == '') ) ? '' : $search_template;
+	$selected = ( ($search_template != DEFAULT_TEMPLATE) ) ?  ' selected="selected"' : $selected = '';
+
+	$template->set_var(array(
+	        'FILE' => '',
+	        'NAME' => $TEXT['SYSTEM_DEFAULT'],
+	        'SELECTED' => $selected
+	    ));
+	$template->parse('search_template_list', 'search_template_list_block', true);
+
+	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function = 'template' ORDER BY name");
+	if($result->numRows() > 0)
+	{
+		while($addon = $result->fetchRow())
+	    {
+			$template->set_var('FILE', $addon['directory']);
+			$template->set_var('NAME', $addon['name']);
+	        $selected = ($addon['directory'] == $search_template) ? ' selected="selected"' :  $selected = '';
+			$template->set_var('SELECTED', $selected);
+			$template->parse('search_template_list', 'search_template_list_block', true);
+
+		}
+	}
+
+	// Insert default error reporting values
+	require(ADMIN_PATH.'/interface/er_levels.php');
+	foreach($ER_LEVELS AS $value => $title)
+	{
+		$template->set_var('VALUE', $value);
+		$template->set_var('NAME', $title);
+	    $selected = (ER_LEVEL == $value) ? ' selected="selected"' : '';
+	    $template->set_var('SELECTED', $selected);
+		$template->parse('error_reporting_list', 'error_reporting_list_block', true);
+	}
+
+	// Insert permissions values
+	if($admin->get_permission('settings_advanced') != true)
+	{
+		$template->set_var('DISPLAY_ADVANCED_BUTTON', 'hide');
+	}
+
+	// Insert page level limits
+	for($i = 1; $i <= 10; $i++)
+	{
+		$template->set_var('NUMBER', $i);
+		if(PAGE_LEVEL_LIMIT == $i)
+	    {
+			$template->set_var('SELECTED', ' selected="selected"');
+		} else {
+			$template->set_var('SELECTED', '');
+		}
+		$template->parse('page_level_limit_list', 'page_level_limit_list_block', true);
+	}
+
+	// Work-out if multiple menus feature is enabled
+	if(defined('MULTIPLE_MENUS') && MULTIPLE_MENUS == true)
+	{
+		$template->set_var('MULTIPLE_MENUS_ENABLED', ' checked="checked"');
+	} else {
+		$template->set_var('MULTIPLE_MENUS_DISABLED', ' checked="checked"');
+	}
+
+	// Work-out if page languages feature is enabled
+	if(defined('PAGE_LANGUAGES') && PAGE_LANGUAGES == true)
+	{
+	        $template->set_var('PAGE_LANGUAGES_ENABLED', ' checked="checked"');
+	} else {
+	        $template->set_var('PAGE_LANGUAGES_DISABLED', ' checked="checked"');
+	}
+
+	// Work-out if warn_page_leave feature is enabled
+	if (defined('WARN_PAGE_LEAVE') && WARN_PAGE_LEAVE == true)
+	{
+		$template->set_var('WARN_PAGE_LEAVE_ENABLED', ' checked="checked"');
+	} else {
+		$template->set_var('WARN_PAGE_LEAVE_DISABLED', ' checked="checked"');
+	}
+
+	// Work-out if smart login feature is enabled
+	if(defined('SMART_LOGIN') && SMART_LOGIN == true)
+	{
+		$template->set_var('SMART_LOGIN_ENABLED', ' checked="checked"');
+	} else {
+		$template->set_var('SMART_LOGIN_DISABLED', ' checked="checked"');
+	}
+
+	/* Make's sure GD library is installed */
+	if(extension_loaded('gd') && function_exists('imageCreateFromJpeg'))
+	{
+		$template->set_var('GD_EXTENSION_ENABLED', '');
+	} else {
+		$template->set_var('GD_EXTENSION_ENABLED', ' style="display: none;"');
+	}
+
+	// Work-out if section blocks feature is enabled
+	if(defined('SECTION_BLOCKS') && SECTION_BLOCKS == true)
+	{
+		$template->set_var('SECTION_BLOCKS_ENABLED', ' checked="checked"');
+	} else {
+		$template->set_var('SECTION_BLOCKS_DISABLED', ' checked="checked"');
+	}
+
+	// Work-out if homepage redirection feature is enabled
+	if(defined('HOMEPAGE_REDIRECTION') && HOMEPAGE_REDIRECTION == true)
+	{
+		$template->set_var('HOMEPAGE_REDIRECTION_ENABLED', ' checked="checked"');
+	} else {
+		$template->set_var('HOMEPAGE_REDIRECTION_DISABLED', ' checked="checked"');
+	}
+
+	// Work-out which server os should be checked
+	if(OPERATING_SYSTEM == 'linux')
+	{
+		$template->set_var('LINUX_SELECTED', ' checked="checked"');
+	} elseif(OPERATING_SYSTEM == 'windows') {
+		$template->set_var('WINDOWS_SELECTED', ' checked="checked"');
+	}
+
+	// Work-out if manage sections feature is enabled
+	if(MANAGE_SECTIONS)
+	{
+		$template->set_var('MANAGE_SECTIONS_ENABLED', ' checked="checked"');
+	} else {
+		$template->set_var('MANAGE_SECTIONS_DISABLED', ' checked="checked"');
+	}
+
+	// Work-out which wbmailer routine should be checked
+	$template->set_var(array(
+				'TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE' => $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'],
+				'TEXT_WBMAILER_DEFAULT_SENDER_MAIL' => $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'],
+				'TEXT_WBMAILER_DEFAULT_SENDER_NAME' => $TEXT['WBMAILER_DEFAULT_SENDER_NAME'],
+				'TEXT_WBMAILER_NOTICE' => $TEXT['WBMAILER_NOTICE'],
+				'TEXT_WBMAILER_FUNCTION' => $TEXT['WBMAILER_FUNCTION'],
+				'TEXT_WBMAILER_SMTP_HOST' => $TEXT['WBMAILER_SMTP_HOST'],
+				'TEXT_WBMAILER_PHP' => $TEXT['WBMAILER_PHP'],
+				'TEXT_WBMAILER_SMTP' => $TEXT['WBMAILER_SMTP'],
+				'TEXT_WBMAILER_SMTP_AUTH' => $TEXT['WBMAILER_SMTP_AUTH'],
+				'TEXT_WBMAILER_SMTP_AUTH_NOTICE' => $TEXT['REQUIRED'].' '.$TEXT['WBMAILER_SMTP_AUTH'],
+				'TEXT_WBMAILER_SMTP_USERNAME' => $TEXT['WBMAILER_SMTP_USERNAME'],
+				'TEXT_WBMAILER_SMTP_PASSWORD' => $TEXT['WBMAILER_SMTP_PASSWORD'],
+				'SMTP_AUTH_SELECTED' => ' checked="checked"'
+				));
+	if(WBMAILER_ROUTINE == 'phpmail')
+	{
+		$template->set_var('PHPMAIL_SELECTED', ' checked="checked"');
+		$template->set_var('SMTP_VISIBILITY', ' style="display: none;"');
+		$template->set_var('SMTP_VISIBILITY_AUTH', '');
+		// $template->set_var('SMTP_AUTH_SELECTED', '');
+	} elseif(WBMAILER_ROUTINE == 'smtp')
+	{
+		$template->set_var('SMTPMAIL_SELECTED', ' checked="checked"');
+		$template->set_var('SMTP_VISIBILITY', '');
+		$template->set_var('SMTP_VISIBILITY_AUTH', '');
+	}
+/* deprecated
+	// Work-out if SMTP authentification should be checked
+	if(WBMAILER_SMTP_AUTH)
+	{
+		$template->set_var('SMTP_AUTH_SELECTED', ' checked="checked"');
+		if(WBMAILER_ROUTINE == 'smtp')
+	    {
+			$template->set_var('SMTP_VISIBILITY_AUTH', '');
+
+		} else {
+			$template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"');
+		}
+	} else {
+		$template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"');
+	}
+*/
+	// Work-out if intro feature is enabled
+	if(INTRO_PAGE)
+	{
+		$template->set_var('INTRO_PAGE_ENABLED', ' checked="checked"');
+	} else {
+		$template->set_var('INTRO_PAGE_DISABLED', ' checked="checked"');
+	}
+
+	// Work-out if frontend login feature is enabled
+	if(FRONTEND_LOGIN)
+	{
+		$template->set_var('PRIVATE_ENABLED', ' checked="checked"');
+	} else {
+		$template->set_var('PRIVATE_DISABLED', ' checked="checked"');
+	}
+
+	// Work-out if page trash feature is disabled, in-line, or separate
+	if(PAGE_TRASH == 'disabled')
+	{
+		$template->set_var('PAGE_TRASH_DISABLED', ' checked="checked"');
+		$template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: none;');
+	} elseif(PAGE_TRASH == 'inline')
+	{
+		$template->set_var('PAGE_TRASH_INLINE', ' checked="checked"');
+		$template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: none;');
+	} elseif(PAGE_TRASH == 'separate')
+	{
+		$template->set_var('PAGE_TRASH_SEPARATE', ' checked="checked"');
+		$template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: inline;');
+	}
+
+	// Work-out if media home folde feature is enabled
+	if(HOME_FOLDERS)
+	{
+		$template->set_var('HOME_FOLDERS_ENABLED', ' checked="checked"');
+	} else {
+		$template->set_var('HOME_FOLDERS_DISABLED', ' checked="checked"');
+	}
+
+	// Insert search select
+	if(SEARCH == 'private')
+	{
+		$template->set_var('PRIVATE_SEARCH', ' selected="selected"');
+	} elseif(SEARCH == 'registered') {
+		$template->set_var('REGISTERED_SEARCH', ' selected="selected"');
+	} elseif(SEARCH == 'none') {
+		$template->set_var('NONE_SEARCH', ' selected="selected"');
+	}
+
+	// Work-out if 777 permissions are set
+	if(STRING_FILE_MODE == '0777' AND STRING_DIR_MODE == '0777')
+	{
+		$template->set_var('WORLD_WRITEABLE_SELECTED', ' checked="checked"');
+	}
+
+	// Work-out which file mode boxes are checked
+	if(extract_permission(STRING_FILE_MODE, 'u', 'r'))
+	{
+		$template->set_var('FILE_U_R_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_FILE_MODE, 'u', 'w'))
+	{
+		$template->set_var('FILE_U_W_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_FILE_MODE, 'u', 'e'))
+	{
+		$template->set_var('FILE_U_E_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_FILE_MODE, 'g', 'r'))
+	{
+		$template->set_var('FILE_G_R_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_FILE_MODE, 'g', 'w'))
+	{
+		$template->set_var('FILE_G_W_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_FILE_MODE, 'g', 'e'))
+	{
+		$template->set_var('FILE_G_E_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_FILE_MODE, 'o', 'r'))
+	{
+		$template->set_var('FILE_O_R_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_FILE_MODE, 'o', 'w'))
+	{
+		$template->set_var('FILE_O_W_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_FILE_MODE, 'o', 'e'))
+	{
+		$template->set_var('FILE_O_E_CHECKED', ' checked="checked"');
+	}
+	// Work-out which dir mode boxes are checked
+	if(extract_permission(STRING_DIR_MODE, 'u', 'r'))
+	{
+		$template->set_var('DIR_U_R_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_DIR_MODE, 'u', 'w'))
+	{
+		$template->set_var('DIR_U_W_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_DIR_MODE, 'u', 'e'))
+	{
+		$template->set_var('DIR_U_E_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_DIR_MODE, 'g', 'r'))
+	{
+		$template->set_var('DIR_G_R_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_DIR_MODE, 'g', 'w'))
+	{
+		$template->set_var('DIR_G_W_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_DIR_MODE, 'g', 'e'))
+	{
+		$template->set_var('DIR_G_E_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_DIR_MODE, 'o', 'r'))
+	{
+		$template->set_var('DIR_O_R_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_DIR_MODE, 'o', 'w'))
+	{
+		$template->set_var('DIR_O_W_CHECKED', ' checked="checked"');
+	}
+	if(extract_permission(STRING_DIR_MODE, 'o', 'e'))
+	{
+		$template->set_var('DIR_O_E_CHECKED', ' checked="checked"');
+	}
+
+	$template->set_var(array(
+						'PAGES_DIRECTORY' => PAGES_DIRECTORY,
+						'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
+						'PAGE_EXTENSION' => PAGE_EXTENSION,
+						'PAGE_SPACER' => PAGE_SPACER,
+						'TABLE_PREFIX' => TABLE_PREFIX
+					 ));
+
+	// Insert Server Email value into template
+	$template->set_var('SERVER_EMAIL', SERVER_EMAIL);
+
+	// Insert groups into signup list
+	$results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'");
+	if($results->numRows() > 0)
+	{
+		while($group = $results->fetchRow())
+	    {
+			$template->set_var('ID', $group['group_id']);
+			$template->set_var('NAME', $group['name']);
+			if(FRONTEND_SIGNUP == $group['group_id'])
+	        {
+				$template->set_var('SELECTED', ' selected="selected"');
+			} else {
+				$template->set_var('SELECTED', '');
+			}
+			$template->parse('group_list', 'group_list_block', true);
+		}
+	} else {
+		$template->set_var('ID', 'disabled');
+		$template->set_var('NAME', $MESSAGE['GROUPS']['NO_GROUPS_FOUND']);
+		$template->parse('group_list', 'group_list_block', true);
+	}
+
+	// Insert language headings
+	$template->set_var(array(
+					'HEADING_GENERAL_SETTINGS' => $HEADING['GENERAL_SETTINGS'],
+					'HEADING_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'],
+					'HEADING_SEARCH_SETTINGS' => $HEADING['SEARCH_SETTINGS'],
+					'HEADING_SERVER_SETTINGS' => $HEADING['SERVER_SETTINGS'],
+					'HEADING_WBMAILER_SETTINGS' => $HEADING['WBMAILER_SETTINGS'],
+					'HEADING_ADMINISTRATION_TOOLS' => $HEADING['ADMINISTRATION_TOOLS']
+					)
+			);
+	// Insert language text and messages
+	$template->set_var(array(
+					'TEXT_WEBSITE_TITLE' => $TEXT['WEBSITE_TITLE'],
+					'TEXT_WEBSITE_DESCRIPTION' => $TEXT['WEBSITE_DESCRIPTION'],
+					'TEXT_WEBSITE_KEYWORDS' => $TEXT['WEBSITE_KEYWORDS'],
+					'TEXT_WEBSITE_HEADER' => $TEXT['WEBSITE_HEADER'],
+					'TEXT_WEBSITE_FOOTER' => $TEXT['WEBSITE_FOOTER'],
+					'TEXT_HEADER' => $TEXT['HEADER'],
+					'TEXT_FOOTER' => $TEXT['FOOTER'],
+					'TEXT_VISIBILITY' => $TEXT['VISIBILITY'],
+					'TEXT_RESULTS_HEADER' => $TEXT['RESULTS_HEADER'],
+					'TEXT_RESULTS_LOOP' => $TEXT['RESULTS_LOOP'],
+					'TEXT_RESULTS_FOOTER' => $TEXT['RESULTS_FOOTER'],
+					'TEXT_NO_RESULTS' => $TEXT['NO_RESULTS'],
+					'TEXT_TEXT' => $TEXT['TEXT'],
+					'TEXT_DEFAULT' => $TEXT['DEFAULT'],
+					'TEXT_LANGUAGE' => $TEXT['LANGUAGE'],
+					'TEXT_TIMEZONE' => $TEXT['TIMEZONE'],
+					'TEXT_CHARSET' => $TEXT['CHARSET'],
+					'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'],
+					'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'],
+					'TEXT_TEMPLATE' => $TEXT['TEMPLATE'],
+					'TEXT_THEME' => $TEXT['THEME'],
+					'TEXT_WYSIWYG_EDITOR' => $TEXT['WYSIWYG_EDITOR'],
+					'TEXT_PAGE_LEVEL_LIMIT' => $TEXT['PAGE_LEVEL_LIMIT'],
+					'TEXT_INTRO_PAGE' => $TEXT['INTRO_PAGE'],
+					'TEXT_FRONTEND' => $TEXT['FRONTEND'],
+					'TEXT_LOGIN' => $TEXT['LOGIN'],
+					'TEXT_REDIRECT_AFTER' => $TEXT['REDIRECT_AFTER'],
+					'TEXT_SIGNUP' => $TEXT['SIGNUP'],
+					'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'],
+					'TEXT_PAGES_DIRECTORY' => $TEXT['PAGES_DIRECTORY'],
+					'TEXT_MEDIA_DIRECTORY' => $TEXT['MEDIA_DIRECTORY'],
+					'TEXT_PAGE_EXTENSION' => $TEXT['PAGE_EXTENSION'],
+					'TEXT_PAGE_SPACER' => $TEXT['PAGE_SPACER'],
+					'TEXT_RENAME_FILES_ON_UPLOAD' => $TEXT['RENAME_FILES_ON_UPLOAD'],
+					'TEXT_APP_NAME' => $TEXT['APP_NAME'],
+					'TEXT_SESSION_IDENTIFIER' => $TEXT['SESSION_IDENTIFIER'],
+					'TEXT_SEC_ANCHOR' => $TEXT['SEC_ANCHOR'],
+					'TEXT_SERVER_OPERATING_SYSTEM' => $TEXT['SERVER_OPERATING_SYSTEM'],
+					'TEXT_LINUX_UNIX_BASED' => $TEXT['LINUX_UNIX_BASED'],
+					'TEXT_WINDOWS' => $TEXT['WINDOWS'],
+					'TEXT_ADMIN' => $TEXT['ADMIN'],
+					'TEXT_TYPE' => $TEXT['TYPE'],
+					'TEXT_DATABASE' => $TEXT['DATABASE'],
+					'TEXT_HOST' => $TEXT['HOST'],
+					'TEXT_USERNAME' => $TEXT['USERNAME'],
+					'TEXT_PASSWORD' => $TEXT['PASSWORD'],
+					'TEXT_NAME' => $TEXT['NAME'],
+					'TEXT_TABLE_PREFIX' => $TEXT['TABLE_PREFIX'],
+					'TEXT_SAVE' => $TEXT['SAVE'],
+					'TEXT_RESET' => $TEXT['RESET'],
+					'TEXT_CHANGES' => $TEXT['CHANGES'],
+					'TEXT_ENABLED' => $TEXT['ENABLED'],
+					'TEXT_DISABLED' => $TEXT['DISABLED'],
+					'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'],
+					'TEXT_MANAGE' => $TEXT['MANAGE'],
+					'TEXT_SEARCH' => $TEXT['SEARCH'],
+					'TEXT_PUBLIC' => $TEXT['PUBLIC'],
+					'TEXT_PRIVATE' => $TEXT['PRIVATE'],
+					'TEXT_REGISTERED' => $TEXT['REGISTERED'],
+					'TEXT_NONE' => $TEXT['NONE'],
+					'TEXT_FILES' => strtoupper(substr($TEXT['FILES'], 0, 1)).substr($TEXT['FILES'], 1),
+					'TEXT_DIRECTORIES' => $TEXT['DIRECTORIES'],
+					'TEXT_FILESYSTEM_PERMISSIONS' => $TEXT['FILESYSTEM_PERMISSIONS'],
+					'TEXT_USER' => $TEXT['USER'],
+					'TEXT_GROUP' => $TEXT['GROUP'],
+					'TEXT_OTHERS' => $TEXT['OTHERS'],
+					'TEXT_READ' => $TEXT['READ'],
+					'TEXT_WRITE' => $TEXT['WRITE'],
+					'TEXT_EXECUTE' => $TEXT['EXECUTE'],
+					'TEXT_WARN_PAGE_LEAVE' => '',
+					'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'],
+					'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'],
+					'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'],
+					'TEXT_SECTION_BLOCKS' => $TEXT['SECTION_BLOCKS'],
+					'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
+					'TEXT_PAGE_TRASH' => $TEXT['PAGE_TRASH'],
+					'TEXT_PAGE_LANGUAGES' => $TEXT['PAGE_LANGUAGES'],
+					'TEXT_INLINE' => $TEXT['INLINE'],
+					'TEXT_SEPARATE' => $TEXT['SEPARATE'],
+					'TEXT_HOME_FOLDERS' => $TEXT['HOME_FOLDERS'],
+					'TEXT_WYSIWYG_STYLE' => $TEXT['WYSIWYG_STYLE'],
+					'TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS' => $TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'],
+					'MODE_SWITCH_WARNING' => $MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'],
+					'WORLD_WRITEABLE_WARNING' => $MESSAGE['SETTINGS']['WORLD_WRITEABLE_WARNING'],
+					'TEXT_MODULE_ORDER' => $TEXT['MODULE_ORDER'],
+					'TEXT_MAX_EXCERPT' => $TEXT['MAX_EXCERPT'],
+					'TEXT_TIME_LIMIT' => $TEXT['TIME_LIMIT']
+					));
+
+if($is_advanced)
+{
+	$template->parse('show_page_level_limit', 'show_page_level_limit_block', true);
+	$template->parse('show_checkbox_1',       'show_checkbox_1_block', true);
+ 	$template->parse('show_checkbox_2',       'show_checkbox_2_block', true);
+	$template->parse('show_checkbox_3',       'show_checkbox_3_block', true);
+	$template->parse('show_php_error_level',  'show_php_error_level_block', true);
+	$template->parse('show_charset',          'show_charset_block', true);
+	$template->parse('show_wysiwyg',          'show_wysiwyg_block', true);
+	$template->parse('show_search',           'show_search_block', false);
+	$template->parse('show_redirect_timer',   'show_redirect_timer_block', true);
+}else {
+	$template->set_block('show_page_level_limit', '');
+	$template->set_block('show_checkbox_1', '');
+	$template->set_block('show_checkbox_2', '');
+	$template->set_block('show_checkbox_3', '');
+	$template->set_block('show_php_error_level', '');
+	$template->set_block('show_charset', '');
+	$template->set_block('show_wysiwyg', '');
+	$template->set_block('show_search', '');
+	$template->set_block('show_redirect_timer', '');
+}
+if($is_advanced && $admin->get_user_id()=='1')
+{
+	$template->parse('show_access', 'show_access_block', true);
+}else {
+	$template->set_block('show_access', '');
+}
+
+// Parse template objects output
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/settings/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/themes/templates/settings.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/settings.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/settings.htt	(revision 1610)
@@ -0,0 +1,608 @@
+
+
+

+
+
+
+{FTAN}
+
+
+
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+
+	
+	
+
+
+
+	
+	
+
+
+
+        
+        
+
+
+	
+	
+
+
+
+	
+	
+
+
+
+	
+	
+
+
+	
+	
+
+
+
+	
+	
+
+
+
+	
+	
+
+
+	
+	
+
+
+
+	
+	
+
+
+
+	
+	
+
+
+
+	
+	
+
+
+
+	
+	
+
+
+
+
+	
+	
+
+
+	
+	
+
+
+
+	
+	
+	
+
+
+	
+
+
+	
+	
+
+
+
+	
+	
+
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+	
+
+
+	
+
+
+	
+	
+
+
+	
+	
+
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+
+
+	
+	
+	
+
+
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+
+	
+
+
+	
+	
+
+
+
+	
+	
+
+
+
+	
+	
+
+
+	
+	
+
+
+
+	
+	
+	
+
+
{HEADING_GENERAL_SETTINGS}
{TEXT_WEBSITE_TITLE}:
+		
+	
{TEXT_WEBSITE_DESCRIPTION}:
+		
+	
{TEXT_WEBSITE_KEYWORDS}:
+		
+	
{TEXT_WEBSITE_HEADER}:
+		
+	
{TEXT_WEBSITE_FOOTER}:
+		
+	
{TEXT_PAGE_LEVEL_LIMIT}:
+		
+	
{TEXT_PAGE_TRASH}:
+		
+		
+		
+		
+		

+			
+			
+		

+	
{TEXT_PAGE_LANGUAGES}:
+                
+                
+                
+                
+		
{TEXT_MULTIPLE_MENUS}:
+		
+		
+		
+		
+	
{TEXT_HOME_FOLDERS}:
+		
+		
+		
+		
+	
{TEXT_MANAGE_SECTIONS}:
+		
+		
+		
+		
+	
{TEXT_SECTION_BLOCKS}:
+		
+		
+		
+		
+	
{TEXT_INTRO_PAGE}:
+		
+		
+		
+		
+	
{TEXT_HOMEPAGE_REDIRECTION}:
+		
+		
+		
+		
+	
{TEXT_SMART_LOGIN}:
+		
+		
+		
+		
+	
{TEXT_LOGIN}:
+		
+		
+		
+		
+	
{TEXT_REDIRECT_AFTER}:
+		
+		

+	
{TEXT_SIGNUP}:
+		
+	
{TEXT_PHP_ERROR_LEVEL}:
+		
+	
{TEXT_WYSIWYG_STYLE}:
{TEXT_WYSIWYG_EDITOR}:
+		
+	
 
+		
+		
+	
+		
+	
{HEADING_DEFAULT_SETTINGS}
{TEXT_LANGUAGE}:
+		
+	
{TEXT_CHARSET}:
+		
+	
{TEXT_TIMEZONE}:
+		
+	
{TEXT_DATE_FORMAT}:
+		
+	
{TEXT_TIME_FORMAT}:
+		
+	
{TEXT_TEMPLATE}:
+		
+	
{TEXT_THEME}:
+		
+	
 
+		
+		
+	
+		
+	
{HEADING_SEARCH_SETTINGS}
{TEXT_VISIBILITY}:
+		
+	
{TEXT_TEMPLATE}:
+		
+	
{TEXT_HEADER}:
+		
+	
{TEXT_RESULTS_HEADER}:
+		
+	
{TEXT_RESULTS_LOOP}:
+		
+	
{TEXT_RESULTS_FOOTER}:
+		
+	
{TEXT_NO_RESULTS}:
+		
+	
{TEXT_FOOTER}:
+		
+	
{TEXT_MODULE_ORDER}:
+		
+	
{TEXT_MAX_EXCERPT}:
+		
+	
{TEXT_TIME_LIMIT}:
+		
+	
 
+		
+		
+	
+		
+	
{HEADING_SERVER_SETTINGS}
{TEXT_SERVER_OPERATING_SYSTEM}:
+		
+		
+		
+		
+	
 

+		

+			
+			
+			({WORLD_WRITEABLE_WARNING})
+		

+		

+	
{TEXT_FILESYSTEM_PERMISSIONS}:

+		
+		
+			
+		
+		
+			
+			
+			
+		
+		
+			
+			
+			
+		
+		
{TEXT_FILES}: {STRING_FILE_MODE}
{TEXT_USER}:{TEXT_GROUP}:{TEXT_OTHERS}:

+				
+				
+				

+				
+				
+				

+				
+				
+					
+				
+				
+				

+				
+				
+				

+				
+				
+					
+				
+				
+				

+				
+				
+				

+				
+				
+			

+			
+		
+		
+			
+		
+		
+			
+			
+			
+		
+		
+			
+			
+			
+		
+		
{TEXT_DIRECTORIES}: {STRING_DIR_MODE}
{TEXT_USER}:{TEXT_GROUP}:{TEXT_OTHERS}:

+				
+				
+				

+				
+				
+				

+				
+				
+					
+				
+				
+				

+				
+				
+				

+				
+				
+					
+				
+				
+				

+				
+				
+				

+				
+				
+			

+	
{TEXT_PAGES_DIRECTORY}:
{TEXT_MEDIA_DIRECTORY}:
{TEXT_PAGE_EXTENSION}:
{TEXT_PAGE_SPACER}:
{TEXT_RENAME_FILES_ON_UPLOAD}:
{TEXT_SESSION_IDENTIFIER}:
{TEXT_SEC_ANCHOR}:

+		
{HEADING_WBMAILER_SETTINGS}

+		
{TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE}

+	
{TEXT_WBMAILER_DEFAULT_SENDER_MAIL}:
{TEXT_WBMAILER_DEFAULT_SENDER_NAME}:
{TEXT_WBMAILER_FUNCTION}:
+		
+		
+		
+		
+	
{TEXT_WBMAILER_NOTICE}
{TEXT_WBMAILER_SMTP_HOST}:
{TEXT_WBMAILER_SMTP_AUTH}:
+		
+		
+	
{TEXT_WBMAILER_SMTP_USERNAME}:
{TEXT_WBMAILER_SMTP_PASSWORD}:
 
+		
+		
+	
+		
+	

+
+

+
+

+
+
+

+{MODE_SWITCH_WARNING}
+
+
Index: tags/2.8.3/wb/admin/themes/templates/header.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/header.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/header.htt	(revision 1610)
@@ -0,0 +1,59 @@
+
+
+
+
+{WEBSITE_TITLE}»{TEXT_ADMINISTRATION}-{SECTION_NAME}
+
+
+
+
+
+
+
+
+{BACKEND_MODULE_CSS}
+
+
+
+
+
+
+
+{BACKEND_MODULE_JS}
+
+
+

+	

+	  

+	    
 Home| {TITLE_VIEW}| {TITLE_LOGOUT}
+		  

+	      

+	      CMS Version {VERSION} {SP}

+	      Revision {REVISION}

+	      {ADMIN_VERSION}
+		 

+		
+		

+	  

+	    
+	  

+	

+	

+
Index: tags/2.8.3/wb/admin/themes/templates/login_forgot.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/login_forgot.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/login_forgot.htt	(revision 1610)
@@ -0,0 +1,70 @@
+
+
+
+
+Retrieve Login Details
+
+
+
+
+
+
+
+
+

+	
+	{SECTION_FORGOT}
+
 
+
+
+
+	
+
+

+	
+	

+	
+		
+		
+			
+		
+		
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
+			
+		
+		
{MESSAGE}
{TEXT_EMAIL}:
 

+	

+	
+	

+		{TEXT_NEED_TO_LOGIN}
+		

+		

+		{TEXT_HOME}
+	

+
+	

+
+
+
+	
+
+

+      
+      WebsiteBaker is released under the
+      GNU General Public License
+      
+	

+
+
+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/error.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/error.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/error.htt	(revision 1610)
@@ -0,0 +1,6 @@
+
+

+	
{MESSAGE}

+
+

+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/footer.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/footer.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/footer.htt	(revision 1610)
@@ -0,0 +1,19 @@
+
+
+

+

+
+
+  
+    
+  
+

+      
+      WebsiteBaker is released under the
+      GNU General Public License
+      
+    

+{BACKEND_BODY_MODULE_JS}
+
+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/pages.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/pages.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/pages.htt	(revision 1610)
@@ -0,0 +1,90 @@
+
+

+
{HEADING_ADD_PAGE}

+

+{FTAN}
+
+  
+	
+	
+	
+	
+  
+  
+	
+	
+  
+  
+	
+	
+  
+  
+	
+	
+  
+  
+	
+	
+  
+  
+	
+	
+  
+
{TEXT_TITLE}:{TEXT_ADMINISTRATORS}:
+		
    
+			
+			
  • 
+			
+			
+			
    • 
+			
+		

+			
+		
+	
{TEXT_TYPE}:
+		
+	
{TEXT_PARENT}:
+		
+	
{TEXT_VISIBILITY}:
+		
+	
 
+		
+		
+	
  

+

+

+

+

+
{HEADING_MODIFY_INTRO_PAGE}

+{INTRO_LINK}
+

+
+
+
+
Index: tags/2.8.3/wb/admin/themes/templates/users.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/users.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/users.htt	(revision 1610)
@@ -0,0 +1,32 @@
+
+
+

+
+{FTAN}
+
+
+	
+		
+		
+     
+
{HEADING_MODIFY_DELETE_USER}

+		
+		{TEXT_MANAGE_GROUPS}
+		
+		

+
+
+
+
+
+
+

+
+

+
{HEADING_ADD_USER}

+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/access.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/access.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/access.htt	(revision 1610)
@@ -0,0 +1,33 @@
+
+
{ACCESS}

+
+	
+		
+	
+

+				
+			
+				
+					
+					
+				
+			

+						{USERS}
+					
+						{USERS}
{USERS_OVERVIEW}

+					
	
+			
+					
+			
+				
+					
+					
+				
+			

+						{GROUPS}
+					
+						{GROUPS}
{GROUPS_OVERVIEW}

+					

+			
+		

+
Index: tags/2.8.3/wb/admin/themes/templates/templates_details.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/templates_details.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/templates_details.htt	(revision 1610)
@@ -0,0 +1,32 @@
+
+
+
{HEADING_TEMPLATE_DETAILS}

+
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
{TEXT_NAME}:{NAME}
{TEXT_AUTHOR}:{AUTHOR}
{TEXT_VERSION}:{VERSION}
{TEXT_DESIGNED_FOR}:Website Baker {DESIGNED_FOR}
{TEXT_DESCRIPTION}:{DESCRIPTION}

+
+

+
+
+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/pages_modify.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/pages_modify.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/pages_modify.htt	(revision 1610)
@@ -0,0 +1,25 @@
+
+
+
+
+	
+	
+	
+
+
{HEADING_MODIFY_PAGE}
ID: {PAGE_ID}
+		{TEXT_CURRENT_PAGE}:
+		{PAGE_TITLE}
+		- 
+		{TEXT_CHANGE_SETTINGS}
+
+		-
+		{TEXT_MANAGE_SECTIONS}
+
+		

+
+		{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}
+
+		
+	

+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/success.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/success.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/success.htt	(revision 1610)
@@ -0,0 +1,11 @@
+
+

+	
{MESSAGE}

+
+ 
+
+
+

+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/modules.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/modules.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/modules.htt	(revision 1610)
@@ -0,0 +1,136 @@
+
+
+	
+		
+     
+

+			{URL_TEMPLATES}
+			-
+			{URL_LANGUAGES}
+			-
+			{URL_ADVANCED}
+		

+
+

+{FTAN}
+  
{HEADING_INSTALL_MODULE}

+  
+    
+      
+      
+    
+  

+        
+        

+        
+		{OVERWRITE_NEWER_FILES}
+      		
+        
+      

+  

+

+

+{FTAN}
+  
{HEADING_UNINSTALL_MODULE}

+  
+    
+      
+      
+    
+  

+        
+      
+        
+      

+  

+

+

+{FTAN}
+  
{HEADING_MODULE_DETAILS}

+  
+    
+      
+      
+    
+  

+        
+      
+        
+      

+  

+

+

+  
{HEADING_INVOKE_MODULE_FILES}

+  
{TEXT_MANUAL_INSTALLATION}

+  

+{FTAN}
+  
+	  
+		
+		
+	  
+  
{TEXT_FILE}: "install.php"
+			
+			
+			
+		

+  

+  
+  

+{FTAN}
+  
+	  
+		
+		
+	  
+  
{TEXT_FILE}: "upgrade.php"
+			
+			
+			
+		

+  

+
+  

+{FTAN}
+  
+	  
+		
+		
+	  
+  
{TEXT_FILE}: "uninstall.php"
+			
+			
+			
+			

+  

+
+  
{TEXT_MANUAL_INSTALLATION_WARNING}

+

+
Index: tags/2.8.3/wb/admin/themes/templates/addons.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/addons.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/addons.htt	(revision 1610)
@@ -0,0 +1,60 @@
+
+
+	
+		
+		
+	
+
{ADDONS_OVERVIEW}
{URL_ADVANCED}

+
+
+	
+		
+	
+

+			
+			
+				
+					
+					
+				
+			
0  {MODULES}
{MODULES_OVERVIEW}

+			
+			
+			
+				
+					
+					
+				
+			
{TEMPLATES}  {TEMPLATES}
{TEMPLATES_OVERVIEW}

+			
+			
+			
+				
+					
+					
+				
+			
{LANGUAGES}   {LANGUAGES}
{LANGUAGES_OVERVIEW}

+			
+			
+			
+				
+					
+					
+				
+			
{TXT_ADMIN_SETTINGS} {TXT_ADMIN_SETTINGS}
+						

+						{FTAN}
+							{MESSAGE_RELOAD_ADDONS}
+							

+							
+							
+							
+							
+							
+							
+							
+						

+					

+			
+		

+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/login.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/login.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/login.htt	(revision 1610)
@@ -0,0 +1,83 @@
+
+
+
+
+{TEXT_LOGIN}
+
+
+
+
+
+
+
+

+	
+	{TEXT_LOGIN}
+
 
+
+  
+    
+  
+

+      
+      

+        {TEXT_FORGOTTEN_DETAILS} 
+		

+        

+        

+        {TEXT_HOME}
+      

+    

+
+  
+    
+  
+

+      
+      WebsiteBaker is released under the
+      GNU General Public License
+      
+    

+
+
+
Index: tags/2.8.3/wb/admin/themes/templates/admintools.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/admintools.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/admintools.htt	(revision 1610)
@@ -0,0 +1,22 @@
+
+
{HEADING_ADMINISTRATION_TOOLS} 

+

+	
    
+	
+	
  • 
+		
+		
+			
+			
+		
+		
    
+				{TOOL_NAME}
+			
+				{TOOL_NAME}{TOOL_DESCRIPTION}
+			
    
+	
    • 
+	
+	

+	{TOOL_LIST}
+

+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/warning.html
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/warning.html	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/warning.html	(revision 1610)
@@ -0,0 +1,48 @@
+
+
+
+Maximum Invalid Login Attemps Exceeded
+
+
+
+

+	
Excessive Invalid Logins

+	You have attempted to login too many times
+

+
+
+
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/themes/templates/warning.html
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Revision
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Index: tags/2.8.3/wb/admin/themes/templates/languages_details.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/languages_details.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/languages_details.htt	(revision 1610)
@@ -0,0 +1,32 @@
+
+
+
{HEADING_LANGUAGE_DETAILS}

+
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
{TEXT_NAME}:{NAME}
{TEXT_CODE}:{CODE}
{TEXT_AUTHOR}:{AUTHOR}
{TEXT_VERSION}:{VERSION}
{TEXT_DESIGNED_FOR}:Website Baker {DESIGNED_FOR}

+
+

+
+
+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/groups.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/groups.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/groups.htt	(revision 1610)
@@ -0,0 +1,30 @@
+
+
+

+ {FTAN}
+  
+	
+		
+		
+     
+
{HEADING_MODIFY_DELETE_GROUP}

+		
+		{TEXT_MANAGE_USERS}
+		
+		

+
+  
+  
+  
+

+

+

+  {HEADING_ADD_GROUP}
+

+
Index: tags/2.8.3/wb/admin/themes/templates/users_form.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/users_form.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/users_form.htt	(revision 1610)
@@ -0,0 +1,95 @@
+
+
+
+
+
{HEADING_MODIFY_USER}

+
+

+
+
+{FTAN}
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
{TEXT_USERNAME}:
+		
+	
{TEXT_PASSWORD}:
+		
+	
{TEXT_RETYPE_PASSWORD}:
+		
+	
 
+		{CHANGING_PASSWORD}
+	
{TEXT_DISPLAY_NAME}:
+		
+	
{TEXT_EMAIL}:
+		
+	
{TEXT_HOME_FOLDER}:
+		
+	
{TEXT_GROUP}:
+		
+	
 
+		
+		
+		
+		
+	
 
+		
+		
+		
+	

+
+

+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/setparameter.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/setparameter.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/setparameter.htt	(revision 1610)
@@ -0,0 +1,64 @@
+
+
+
+
+Set Upload Parameters
+
+
+
+
+
+
+
+
+	
+
+
{TEXT_HEADER}

+

+	{FTAN}
+
+	
+	 
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
{SETTINGS} {NO_SHOW_THUMBS}
 {ADMIN_ONLY}
 
{PATH_NAME}{WIDTH}  {HEIGHT} 

+

+
+
+
+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/start.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/start.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/start.htt	(revision 1610)
@@ -0,0 +1,75 @@
+
+
+
+  
+    
+  
+  
+    
+  
+  
+    
+    
+    
+  
+
{WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}. 
{WARNING}

+      
+        
+          
+          
+        
+
+      
  {PAGES}   {PAGES}
+		  {PAGES_OVERVIEW}
+		  

+      
+        
+          
+          
+        
+      
  {ADDONS}   {ADDONS}
+		  {ADDONS_OVERVIEW}
+		  

+      
+        
+          
+          
+        
+      
  {SETTINGS}   {SETTINGS}
+		  {SETTINGS_OVERVIEW}
+		  

+      
+        
+          
+          
+        
+      
  {ACCESS}   {ACCESS}
+		  {ACCESS_OVERVIEW}
+		  

+    		  
+	  
+        
+          
+          
+        
+      
  {MEDIA}   {MEDIA}
+		  {MEDIA_OVERVIEW}
+		  
	  
+      
+        
+          
+          
+        
+      
  {PREFERENCES}   {PREFERENCES}
+		  {PREFERENCES_OVERVIEW}
+		  

+      
+        
+          
+          
+        
+      
  {ADMINTOOLS}   {ADMINTOOLS}
+		  {ADMINTOOLS_OVERVIEW}
+		  

+    

+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/templates.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/templates.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/templates.htt	(revision 1610)
@@ -0,0 +1,88 @@
+
+
+
+	
+		
+		
+     
+
{CHANGE_TEMPLATE_NOTICE}
+			{URL_MODULES}
+			-
+			{URL_LANGUAGES}
+			-
+			{URL_ADVANCED}
+		

+
+

+{FTAN}
+
+
{HEADING_INSTALL_TEMPLATE}

+
+
+
+	
+	
+
+

+		
+		


+			
+		
+	

+
+

+
+

+
+

+{FTAN}
+
+
{HEADING_UNINSTALL_TEMPLATE}

+
+
+
+	
+	
+
+

+		
+	
+		
+	

+
+

+
+

+
+

+{FTAN}
+
+
{HEADING_TEMPLATE_DETAILS}

+
+
+
+	
+	
+
+

+		
+	
+		
+	

+
+

+

+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/index.php
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/index.php	(revision 1610)
@@ -0,0 +1,32 @@
+
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/themes/templates/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/themes/templates/media_browse.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/media_browse.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/media_browse.htt	(revision 1610)
@@ -0,0 +1,59 @@
+
+
+
+
+Browse Media
+
+
+
+
+
+
+
+
+	
+	
+	
+
+

+		^
+	
+		{TEXT_UP}
+	
+		{TEXT_CURRENT_FOLDER}: {MEDIA_DIRECTORY}{CURRENT_DIR}
+	

+
+
+
+
+	
+	
+	
+	
+   
+
+
+

+		
+	
+		{NAME}
+	
+		{IMAGEDETAIL}
{DATE}
+			
+		{TEXT_RENAME}    
+		{TEXT_DELETE}  
+	
+	   {IMAGE_TITLE}
+   

+
+
+
  {NONE_FOUND}
+
+
+
+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/preferences.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/preferences.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/preferences.htt	(revision 1610)
@@ -0,0 +1,114 @@
+
+
{HEADING_MY_SETTINGS}

+

+	

+		{FTAN}
+			

+				

+					

+				

+				

+					
{USERNAME}


+				

+			

+			

+				

+					

+				

+				

+					

+				

+			

+			

+				

+					

+				

+				

+				
+				

+			

+			

+				

+					

+				

+				

+					
+				

+			

+			

+				

+					

+				

+				

+					
+				

+			

+			

+				

+					

+				

+				

+					
+				

+			

+
+			

+				

+					

+				

+				

+					

+				

+			

+			

+				

+					

+				

+				

+					

+				

+			

+			

+				

+					

+				

+				

+					

+				

+			

+			

+			

+				

+					

+				

+				

+					

+				

+			

+			

+				

+					
+					
+				

+				
 

+			

+	

+

+
+
Index: tags/2.8.3/wb/admin/themes/templates/groups_form.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/groups_form.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/groups_form.htt	(revision 1610)
@@ -0,0 +1,279 @@
+
+
{HEADING_MODIFY_GROUP}

+
+

+
+
+{FTAN}
+
+
+	
+	
+
+
{TEXT_NAME}:
+		
+	

+
+
+	
+	
+
+
{TEXT_SYSTEM_PERMISSIONS}:
+		
+		
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+		

+				
+				
+			
+				
+				
+			
+				
+				
+			
+				
+				
+			

+				
+				
+					
+				
+				
+			
+				
+				
+			
+				
+				
+			

+				
+				
+			   

+	

+
+
+	
+	
+
+
{TEXT_SYSTEM_PERMISSIONS}:
+
+
+
+	
+
+
+	
+	
+	
+	
+
+
+	
+	
+	
+	
+
+
+	
+	
+	
+	
+
+
+	
+
+
+	
+	
+	
+	
+
+
+	
+	
+	
+	
+
+
+	
+	
+	
+	
+
+
+	
+
+
+	
+	
+	
+	
+
+
+	
+	
+	
+	
+
+
+	
+
+
+	
+	
+	
+	
+
+
+	
+	
+	
+	
+
+
+	
+
+
+	
+	
+	
+	
+
+
+	
+	
+	
+	
+
+
+	
+
+
+	
+	
+	
+	
+
+
+	
+
+
+	
+	
+	
+	
+
+
+	
+	
+	
+	
+
+
+	
+
+
+
+	
+	
+	
+	
+
+
+	
+	
+	
+	
+
+
+	
+
+
+	
+	
+	
+	
+
+
{SECTION_PAGES}

+		
+		 
+		(
+		)
+	
{SECTION_MEDIA}
  
{SECTION_MODULES}
  
{SECTION_TEMPLATES}
  
{SECTION_LANGUAGES}
  
{SECTION_SETTINGS}
{SECTION_USERS}
{SECTION_GROUPS}

+		
{SECTION_ADMINTOOLS}

+	
  

+
+
+	

+
+
+
+	
+	
+	
+	
+
+
+    
+	
+	
+    
+
+
{TEXT_MODULE_PERMISSIONS}:
+		
    
+			
+			
  • 
+				
+				
+			
    • 
+			
+		

+			{TEXT_TEMPLATE_PERMISSIONS}:
+		
    
+			
+			
  • 
+				
+				
+			
    • 
+			
+		

+	
 
+		
+	
+		
+	 

+

+
+
+

+
+
+{FTAN}
+
+
+    
+	
+    
+
+
 
+		
+	 

+

+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/media_rename.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/media_rename.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/media_rename.htt	(revision 1610)
@@ -0,0 +1,61 @@
+
+
+
+
+Rename Media
+
+
+
+
+
+
+
+
+

+
+
+
+{FTAN}
+
+
+	
+
+
+	
+	
+
+
+	
+
+
+	
+
+
{TEXT_RENAME} '{FILENAME}' {TEXT_TO}:

+		
+		
+	
+		
+	

+		
+		
+	

+		
+		
+	

+
+

+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/languages.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/languages.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/languages.htt	(revision 1610)
@@ -0,0 +1,74 @@
+
+
+
+	
+		
+		
+     
+
{CHANGE_TEMPLATE_NOTICE}
+			{URL_MODULES}
+			-
+			{URL_TEMPLATES}
+			-
+			{URL_ADVANCED}
+		

+
+

+{FTAN}
+  
{HEADING_INSTALL_LANGUAGE}

+  
+    
+      
+      
+    
+  

+        
+        


+      		
+        
+      

+  

+

+

+{FTAN}
+  
{HEADING_UNINSTALL_LANGUAGE}

+  
+    
+      
+      
+    
+  

+        
+      
+        
+      

+  

+

+

+{FTAN}
+  
{HEADING_LANGUAGE_DETAILS}

+  
+    
+      
+      
+    
+  

+        
+      
+        
+      

+  

+

+
Index: tags/2.8.3/wb/admin/themes/templates/pages_sections.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/pages_sections.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/pages_sections.htt	(revision 1610)
@@ -0,0 +1,115 @@
+
+

+
+	
+		
+		
+		
+     
+
{HEADING_MANAGE_SECTIONS}
ID: {PAGE_ID}{TEXT_CURRENT_PAGE}: {PAGE_TITLE}
+			-
+			{HEADING_MODIFY_PAGE}
+			-
+			{TEXT_CHANGE_SETTINGS}
+		

+
+        

+		{FTAN}
+		
+        
+			
+				
+				
+				
+				
+				
+				
+				
+			
+
+            	
+    				
+					
+                    
+					
+                    
+					
+                    
+					
+                    
+
+					
+					
+                    
+
+                    
+
+                    
+
+                    
+                
+
+                
+                    
+    	        
+	    
{TEXT_TYPE}{TEXT_BLOCK} {TEXT_PUBL_START_DATE}{TEXT_PUBL_END_DATE}{TEXT_ACTIONS}ID{TEXT_PID}

+                      
+                      
+                      {VAR_SECTION_ID}
+                    {LINK_MODIFY_URL_VAR_MODUL_NAME}
+                    	 
+                    
+                        {TEXT_CALENDAR}
+                        {TEXT_DELETE_DATE}
+                    
+                        {TEXT_CALENDAR}
+                        {TEXT_DELETE_DATE}
+                    {VAR_MOVE_UP_URL}{VAR_MOVE_DOWN_URL}
+                        
+                        {TEXT_DELETE}
+                        
+                    {VAR_SECTION_ID}{POSITION}

+					

+					
+					

+    

+

+	
{TEXT_ADD_SECTION}

+	

+        
+		{FTAN}
+    	
+    	
+    		
+    	
+   	  

+    			
+				  
+				
+   		  

+	

+    
+    
+    
+    
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/modules_details.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/modules_details.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/modules_details.htt	(revision 1610)
@@ -0,0 +1,36 @@
+
+
+
{HEADING_MODULE_DETAILS}

+
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
{TEXT_NAME}:{NAME}
{TEXT_TYPE}:{TYPE}
{TEXT_AUTHOR}:{AUTHOR}
{TEXT_VERSION}:{VERSION}
{TEXT_DESIGNED_FOR}:Website Baker {DESIGNED_FOR}
{TEXT_DESCRIPTION}:{DESCRIPTION}

+
+

+
+
+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/themes/templates/media.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/media.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/media.htt	(revision 1610)
@@ -0,0 +1,123 @@
+
+
+
+
+  
+    
+	
+    
+  
+

+	
{HEADING_UPLOAD_FILES}

+      

+		{FTAN}
+		
+          
+            
+          
+        
{TEXT_TARGET_FOLDER}:

+              
+            

+        
+          
+		  	
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+		  
+            
+          
+          
+            
+          
+          
+            
+          
+		  
+            
+          
+          
+            
+          
+        

+				
+				
+				
+			
 
 
 
 
 
 
 
 
 
 

+
+        
+          
+            
+          
+        

+              

+              
+            

+      

+ 
+      

+	  


+        

+		{FTAN}
+          
{HEADING_CREATE_FOLDER}

+          
+            
+              
+            
+          
{TEXT_NAME}:

+              

+          
+            
+              
+            
+          
{TEXT_TARGET_FOLDER}:

+                
+              

+          
+            
+              
+            
+          

+              

+        

+      

+      
+    		 
+	
{HEADING_BROWSE_MEDIA}

+	{OPTIONS}: 
+	{CHANGE_SETTINGS}  | 
+	{TEXT_RELOAD}
+	
+	
+    

Index: tags/2.8.3/wb/admin/themes/templates/pages_settings.htt
===================================================================
--- tags/2.8.3/wb/admin/themes/templates/pages_settings.htt	(nonexistent)
+++ tags/2.8.3/wb/admin/themes/templates/pages_settings.htt	(revision 1610)
@@ -0,0 +1,178 @@
+
+
+
+
+
+  
+	
+	
+	
+  
+
{HEADING_MODIFY_PAGE_SETTINGS}
ID: {PAGE_ID}
+		{TEXT_CURRENT_PAGE}:
+		{PAGE_TITLE}
+		-
+		{TEXT_MODIFY_PAGE}
+		-
+		{TEXT_MANAGE_SECTIONS}
+		

+		
+			{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}
+		
+	

+
+

+{FTAN}
+
+
+
+	
+	
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
+
+	
+	
+
+
+
+	
+	
+
+
+	
+	
+
+
+	
+	
+
+
{TEXT_PAGE_TITLE}:
+		
+	
+		{TEXT_ADMINISTRATORS}:
+		
    
+			
+			
  • 
+			
+			
+			
    • 
+			
+		

+			
+		

+			{TEXT_ALLOWED_VIEWERS}:
+			
    
+				
+				
  • 
+				
+				
+				
    • 
+				
+			

+		

+	
{TEXT_MENU_TITLE}:
+		
+	
{TEXT_PARENT}:
+		
+	
{TEXT_VISIBILITY}:
+		
+	
{TEXT_DESCRIPTION}:
+		
+	
{TEXT_KEYWORDS}:
+		
+	

+		{TEXT_TARGET}:
+	
+		
+	
{TEXT_TEMPLATE}:
+		
+	
{TEXT_MENU}:
+		
+	
{TEXT_LANGUAGE}:
+		
+	
{TEXT_PAGE_CODE}:
+		
+	
{TEXT_SEARCHING}:
+		
+	
 
+		
+		
+	
  

+
+

+
+
\ No newline at end of file
Index: tags/2.8.3/wb/admin/preferences/save.php
===================================================================
--- tags/2.8.3/wb/admin/preferences/save.php	(nonexistent)
+++ tags/2.8.3/wb/admin/preferences/save.php	(revision 1610)
@@ -0,0 +1,168 @@
+checkFTAN()){ $err_msg[] = $MESSAGE['GENERIC_SECURITY_ACCESS']; }
+// Get entered values and validate all
+	// remove any dangerouse chars from display_name
+	$display_name     = $admin->add_slashes(strip_tags(trim($admin->get_post('display_name'))));
+	$display_name     = ( $display_name == '' ? $admin->get_display_name() : $display_name );
+	// check that display_name is unique in whoole system (prevents from User-faking)
+	$sql  = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'users` ';
+	$sql .= 'WHERE `user_id` <> '.(int)$admin->get_user_id().' AND `display_name` LIKE "'.$display_name.'"';
+	if( $database->get_one($sql) > 0 ){ $err_msg[] = $MESSAGE['USERS_USERNAME_TAKEN']; }
+// language must be 2 upercase letters only
+	$language         = strtoupper($admin->get_post('language'));
+	$language         = (preg_match('/^[A-Z]{2}$/', $language) ? $language : DEFAULT_LANGUAGE);
+// timezone must be between -12 and +13  or -20 as system_default
+	$timezone         = $admin->get_post('timezone');
+	$timezone         = (is_numeric($timezone) ? $timezone : -20);
+	$timezone         = ( ($timezone >= -12 && $timezone <= 13) ? $timezone : -20 ) * 3600;
+// date_format must be a key from /interface/date_formats
+	$date_format      = $admin->get_post('date_format');
+	$date_format_key  = str_replace(' ', '|', $date_format);
+	$user_time = true;
+	include( ADMIN_PATH.'/interface/date_formats.php' );
+	$date_format = (array_key_exists($date_format_key, $DATE_FORMATS) ? $date_format : 'system_default');
+	$date_format = ($date_format == 'system_default' ? '' : $date_format);
+	unset($DATE_FORMATS);
+// time_format must be a key from /interface/time_formats	
+	$time_format      = $admin->get_post('time_format');
+	$time_format_key  = str_replace(' ', '|', $time_format);
+	$user_time = true;
+	include( ADMIN_PATH.'/interface/time_formats.php' );
+	$time_format = (array_key_exists($time_format_key, $TIME_FORMATS) ? $time_format : 'system_default');
+	$time_format = ($time_format == 'system_default' ? '' : $time_format);
+	unset($TIME_FORMATS);
+// email should be validatet by core
+	$email = trim( $admin->get_post('email') == null ? '' : $admin->get_post('email') );
+	if( !$admin->validate_email($email) )
+	{
+		$email = '';
+		$err_msg[] = $MESSAGE['USERS_INVALID_EMAIL'];
+	}else {
+		if($email != '') {
+		// check that email is unique in whoole system
+			$email = $admin->add_slashes($email);
+			$sql  = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'users` ';
+			$sql .= 'WHERE `user_id` <> '.(int)$admin->get_user_id().' AND `email` LIKE "'.$email.'"';
+			if( $database->get_one($sql) > 0 ){ $err_msg[] = $MESSAGE['USERS_EMAIL_TAKEN']; }
+		}
+	}
+// receive password vars and calculate needed action
+	$sCurrentPassword = $admin->get_post('current_password');
+	$sCurrentPassword = (is_null($sCurrentPassword) ? '' : $sCurrentPassword);
+	$sNewPassword = $admin->get_post('new_password_1');
+	$sNewPassword = (is_null($sNewPassword) ? '' : $sNewPassword);
+	$sNewPasswordRetyped = $admin->get_post('new_password_2');
+	$sNewPasswordRetyped= (is_null($sNewPasswordRetyped) ? '' : $sNewPasswordRetyped);
+// Check existing password
+	$sql  = 'SELECT `password` ';
+	$sql .= 'FROM `'.TABLE_PREFIX.'users` ';
+	$sql .= 'WHERE `user_id` = '.$admin->get_user_id();
+	if (md5($sCurrentPassword) != $database->get_one($sql)) {
+// access denied
+		$err_msg[] = $MESSAGE['PREFERENCES_CURRENT_PASSWORD_INCORRECT'];
+	}else {
+// validate new password
+		$sPwHashNew = false;
+		if($sNewPassword != '') {
+			if(strlen($sNewPassword) < $iMinPassLength) {
+				$err_msg[] = $MESSAGE['USERS_PASSWORD_TOO_SHORT'];
+			}else {
+				if($sNewPassword != $sNewPasswordRetyped) {
+					$err_msg[] = $MESSAGE['USERS_PASSWORD_MISMATCH'];
+				}else {
+					$pattern = '/[^'.$admin->password_chars.']/';
+					if (preg_match($pattern, $sNewPassword)) {
+						$err_msg[] = $MESSAGE['PREFERENCES_INVALID_CHARS'];
+					}else {
+						$sPwHashNew = md5($sNewPassword);
+					}
+				}
+			}
+		}
+// if no validation errors, try to update the database, otherwise return errormessages
+		if(sizeof($err_msg) == 0)
+		{
+			$sql  = 'UPDATE `'.TABLE_PREFIX.'users` ';
+			$sql .= 'SET `display_name`=\''.$display_name.'\', ';
+			if($sPwHashNew) {
+				$sql .=     '`password`=\''.$sPwHashNew.'\', ';
+			}
+			if($email != '') {
+				$sql .=     '`email`=\''.$email.'\', ';
+			}
+			$sql .=     '`language`=\''.$language.'\', ';
+			$sql .=     '`timezone`=\''.$timezone.'\', ';
+			$sql .=     '`date_format`=\''.$date_format.'\', ';
+			$sql .=     '`time_format`=\''.$time_format.'\' ';
+			$sql .= 'WHERE `user_id`='.(int)$admin->get_user_id();
+			if( $database->query($sql) )
+			{
+				// update successfull, takeover values into the session
+				$_SESSION['DISPLAY_NAME'] = $display_name;
+				$_SESSION['LANGUAGE'] = $language;
+				$_SESSION['TIMEZONE'] = $timezone;
+				$_SESSION['EMAIL'] = $email;
+				// Update date format
+				if($date_format != '') {
+					$_SESSION['DATE_FORMAT'] = $date_format;
+					if(isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) { unset($_SESSION['USE_DEFAULT_DATE_FORMAT']); }
+				} else {
+					$_SESSION['USE_DEFAULT_DATE_FORMAT'] = true;
+					if(isset($_SESSION['DATE_FORMAT'])) { unset($_SESSION['DATE_FORMAT']); }
+				}
+				// Update time format
+				if($time_format != '') {
+					$_SESSION['TIME_FORMAT'] = $time_format;
+					if(isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { unset($_SESSION['USE_DEFAULT_TIME_FORMAT']); }
+				} else {
+					$_SESSION['USE_DEFAULT_TIME_FORMAT'] = true;
+					if(isset($_SESSION['TIME_FORMAT'])) { unset($_SESSION['TIME_FORMAT']); }
+				}
+			}else {
+				$err_msg[] = 'invalid database UPDATE call in '.__FILE__.'::'.__FUNCTION__.'before line '.__LINE__;
+			}
+		}
+	}
+	return ( (sizeof($err_msg) > 0) ? implode('
', $err_msg) : '' );
+}
+$retval = save_preferences($admin, $database);
+if( $retval == '')
+{
+	// print the header
+	$admin->print_header();
+	$admin->print_success($MESSAGE['PREFERENCES_DETAILS_SAVED']);
+	$admin->print_footer();
+}else {
+	// print the header
+	$admin->print_header();
+	$admin->print_error($retval);
+}

Property changes on: tags/2.8.3/wb/admin/preferences/save.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/preferences/index.php
===================================================================
--- tags/2.8.3/wb/admin/preferences/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/preferences/index.php	(revision 1610)
@@ -0,0 +1,154 @@
+correct_theme_source('preferences.htt'));
+	// Create new template object
+	$template = new Template($ThemePath);
+	$template->set_file( 'page', 'preferences.htt' );
+	$template->set_block( 'page', 'main_block', 'main' );
+// read user-info from table users and assign it to template
+	$sql  = 'SELECT `display_name`, `username`, `email` FROM `'.TABLE_PREFIX.'users` ';
+	$sql .= 'WHERE `user_id` = '.(int)$admin->get_user_id();
+	if( $res_user = $database->query($sql) )
+	{
+		if( $rec_user = $res_user->fetchRow() )
+		{
+			$template->set_var('DISPLAY_NAME', $rec_user['display_name']);
+			$template->set_var('USERNAME',     $rec_user['username']);
+			$template->set_var('EMAIL',        $rec_user['email']);
+			$template->set_var('ADMIN_URL',    ADMIN_URL);
+		}
+	}
+// read available languages from table addons and assign it to the template
+	$sql  = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ';
+	$sql .= 'WHERE `type` = \'language\' ORDER BY `directory`';
+	if( $res_lang = $database->query($sql) )
+	{
+		$template->set_block('main_block', 'language_list_block', 'language_list');
+		while( $rec_lang = $res_lang->fetchRow() )
+		{
+	        $langIcons = (empty($rec_lang['directory'])) ? 'none' : strtolower($rec_lang['directory']);
+			$template->set_var('CODE',        $rec_lang['directory']);
+			$template->set_var('NAME',        $rec_lang['name']);
+			$template->set_var('FLAG',        THEME_URL.'/images/flags/'.$langIcons);
+			$template->set_var('SELECTED',    (LANGUAGE == $rec_lang['directory'] ? ' selected="selected"' : '') );
+			$template->parse('language_list', 'language_list_block', true);
+		}
+	}
+// Insert default timezone values
+	$user_time = true;
+	include_once( ADMIN_PATH.'/interface/timezones.php' );
+	$template->set_block('main_block', 'timezone_list_block', 'timezone_list');
+	foreach( $TIMEZONES AS $hour_offset => $title )
+	{
+		$template->set_var('VALUE',    $hour_offset);
+		$template->set_var('NAME',     $title);
+		$template->set_var('SELECTED', ($admin->get_timezone() == ($hour_offset * 3600) ? ' selected="selected"' : '') );
+		$template->parse('timezone_list', 'timezone_list_block', true);
+	}
+// Insert date format list
+	include_once( ADMIN_PATH.'/interface/date_formats.php' );
+	$template->set_block('main_block', 'date_format_list_block', 'date_format_list');
+	foreach( $DATE_FORMATS AS $format => $title )
+	{
+		$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
+		$template->set_var( 'VALUE', ($format != 'system_default' ? $format : 'system_default') );
+		$template->set_var( 'NAME',  $title );
+		if( (DATE_FORMAT == $format && !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) ||
+			('system_default' == $format && isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) )
+		{
+			$template->set_var('SELECTED', ' selected="selected"');
+		}else {
+			$template->set_var('SELECTED', '');
+		}
+		$template->parse('date_format_list', 'date_format_list_block', true);
+	}
+// Insert time format list
+	include_once( ADMIN_PATH.'/interface/time_formats.php' );
+	$template->set_block('main_block', 'time_format_list_block', 'time_format_list');
+	foreach( $TIME_FORMATS AS $format => $title )
+	{
+		$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
+		$template->set_var('VALUE', $format != 'system_default' ? $format : 'system_default' );
+		$template->set_var('NAME',  $title);
+		if( (TIME_FORMAT == $format && !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) ||
+		    ('system_default' == $format && isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) )
+		{
+			$template->set_var('SELECTED', ' selected="selected"');
+		} else {
+			$template->set_var('SELECTED', '');
+		}
+		$template->parse('time_format_list', 'time_format_list_block', true);
+	}
+
+// assign systemvars to template
+	$template->set_var(array( 'ADMIN_URL'  => ADMIN_URL,
+	                          'WB_URL'     => WB_URL,
+                              'THEME_URL'  => THEME_URL,
+		                      'ACTION_URL' => ADMIN_URL.'/preferences/save.php'
+                            )
+                      );
+	$template->set_var('FTAN', $admin->getFTAN());
+	$template->set_var('FORM_NAME', 'preferences_save');
+// assign language vars
+	$template->set_var(array( 'HEADING_MY_SETTINGS'      => $HEADING['MY_SETTINGS'],
+                              'HEADING_MY_EMAIL'         => $HEADING['MY_EMAIL'],
+                              'HEADING_MY_PASSWORD'      => $HEADING['MY_PASSWORD'],
+                              'TEXT_SAVE'                => $TEXT['SAVE'],
+                              'TEXT_RESET'               => $TEXT['RESET'],
+                              'TEXT_DISPLAY_NAME'        => $TEXT['DISPLAY_NAME'],
+                              'TEXT_USERNAME'            => $TEXT['USERNAME'],
+                              'TEXT_EMAIL'               => $TEXT['EMAIL'],
+                              'TEXT_LANGUAGE'            => $TEXT['LANGUAGE'],
+                              'TEXT_TIMEZONE'            => $TEXT['TIMEZONE'],
+                              'TEXT_DATE_FORMAT'         => $TEXT['DATE_FORMAT'],
+                              'TEXT_TIME_FORMAT'         => $TEXT['TIME_FORMAT'],
+                              'TEXT_CURRENT_PASSWORD'    => $TEXT['CURRENT_PASSWORD'],
+                              'TEXT_NEW_PASSWORD'        => $TEXT['NEW_PASSWORD'],
+                              'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'],
+							  'TEXT_NEW_PASSWORD'        => $TEXT['NEW_PASSWORD'],
+                              'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'],
+							  'TEXT_NEED_CURRENT_PASSWORD' => $TEXT['NEED_CURRENT_PASSWORD'],
+	                          'EMPTY_STRING'             => ''
+                            )
+                      );
+// Parse template for preferences form
+	$template->parse('main', 'main_block', false);
+	$output = $template->finish($template->parse('output', 'page'));
+	return $output;
+}
+// test if valid $admin-object already exists (bit complicated about PHP4 Compatibility)
+if( !(isset($admin) && is_object($admin) && (get_class($admin) == 'admin')) )
+{
+    require( '../../config.php' );
+	require_once( WB_PATH.'/framework/class.admin.php' );
+	$admin = new admin('Preferences');
+}
+echo build_page($admin, $database);
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/preferences/index.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/preferences
===================================================================
--- tags/2.8.3/wb/admin/preferences	(nonexistent)
+++ tags/2.8.3/wb/admin/preferences	(revision 1610)

Property changes on: tags/2.8.3/wb/admin/preferences
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+details.php
+email.php
+index.php
Index: tags/2.8.3/wb/admin/admintools/tool.php
===================================================================
--- tags/2.8.3/wb/admin/admintools/tool.php	(nonexistent)
+++ tags/2.8.3/wb/admin/admintools/tool.php	(revision 1610)
@@ -0,0 +1,52 @@
+get_one($sql))) {
+		// create admin-object and print header if FTAN is NOT supported AND function 'save' is requested
+			$admin_header = !(is_file(WB_PATH.'/modules/'.$toolDir.'/FTAN_SUPPORTED') && $doSave);
+			$admin = new admin('admintools', 'admintools', $admin_header );
+			if(!$doSave) {
+			// show title if not function 'save' is requested
+				print '
'.
+				      $HEADING['ADMINISTRATION_TOOLS'].''.
+					  ' » '.$toolName.'
'."\n";
+			}
+			// include modules tool.php
+			require(WB_PATH.'/modules/'.$toolDir.'/tool.php');
+			$admin->print_footer();
+		}else {
+		// no installed module found, jump to index.php of admintools
+			header('location: '.ADMIN_URL.'/admintools/index.php');
+			exit(0);
+		}
+	}else {
+	// invalid module name requested, jump to index.php of admintools
+		header('location: '.ADMIN_URL.'/admintools/index.php');
+		exit(0);
+	}

Property changes on: tags/2.8.3/wb/admin/admintools/tool.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/admintools/index.php
===================================================================
--- tags/2.8.3/wb/admin/admintools/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/admintools/index.php	(revision 1610)
@@ -0,0 +1,63 @@
+correct_theme_source('admintools.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'admintools.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Insert required template variables
+$template->set_var('ADMIN_URL', ADMIN_URL);
+$template->set_var('THEME_URL', THEME_URL);
+$template->set_var('HEADING_ADMINISTRATION_TOOLS', $HEADING['ADMINISTRATION_TOOLS']);
+
+// Insert tools into tool list
+$template->set_block('main_block', 'tool_list_block', 'tool_list');
+$results = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' order by name");
+if($results->numRows() > 0) {
+	while($tool = $results->fetchRow()) {
+		$template->set_var('TOOL_NAME', $tool['name']);
+		$template->set_var('TOOL_DIR', $tool['directory']);
+		// check if a module description exists for the displayed backend language
+		$tool_description = false;
+		if(function_exists('file_get_contents') && file_exists(WB_PATH.'/modules/'.$tool['directory'].'/languages/'.LANGUAGE .'.php')) {
+			// read contents of the module language file into string
+			$data = @file_get_contents(WB_PATH .'/modules/' .$tool['directory'] .'/languages/' .LANGUAGE .'.php');
+			$tool_description = get_variable_content('module_description', $data, true, false);
+		}		
+		$template->set_var('TOOL_DESCRIPTION', ($tool_description === False)? $tool['description'] :$tool_description);
+		$template->parse('tool_list', 'tool_list_block', true);
+	}
+} else {
+	$template->set_var('TOOL_LIST', $TEXT['NONE_FOUND']);	
+}
+
+// Parse template objects output
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/admintools/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/modify.php
===================================================================
--- tags/2.8.3/wb/admin/pages/modify.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/modify.php	(revision 1610)
@@ -0,0 +1,207 @@
+checkIDKEY('page_id', $page_id, $_SERVER['REQUEST_METHOD']))) )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+*/
+
+// Get perms
+if(!$admin->get_page_permission($page_id,'admin')) {
+	$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+}
+
+$sectionId = isset($_GET['wysiwyg']) ? htmlspecialchars($admin->get_get('wysiwyg')) : NULL;
+
+// Get page details
+$results_array=$admin->get_page_details($page_id);
+
+// Get display name of person who last modified the page
+$user=$admin->get_user_details($results_array['modified_by']);
+
+// Convert the unix ts for modified_when to human a readable form
+
+$modified_ts = ($results_array['modified_when'] != 0)
+        ? $modified_ts = date(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE)
+        : 'Unknown';
+// $ftan_module = $GLOBALS['ftan_module'];
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('pages_modify.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'pages_modify.htt');
+$template->set_block('page', 'main_block', 'main');
+$template->set_var('FTAN', $admin->getFTAN() );
+
+$template->set_var(array(
+			'PAGE_ID' => $results_array['page_id'],
+			// 'PAGE_IDKEY' => $admin->getIDKEY($results_array['page_id']),
+			'PAGE_IDKEY' => $results_array['page_id'],
+			'PAGE_TITLE' => ($results_array['page_title']),
+			'MENU_TITLE' => ($results_array['menu_title']),
+			'ADMIN_URL' => ADMIN_URL,
+			'WB_URL' => WB_URL,
+			'THEME_URL' => THEME_URL
+			));
+
+$template->set_var(array(
+			'MODIFIED_BY' => $user['display_name'],
+			'MODIFIED_BY_USERNAME' => $user['username'],
+			'MODIFIED_WHEN' => $modified_ts,
+			'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'],
+			));
+
+$template->set_block('main_block', 'show_modify_block', 'show_modify');
+if($modified_ts == 'Unknown')
+{
+    $template->set_block('show_modify', '');
+	$template->set_var('CLASS_DISPLAY_MODIFIED', 'hide');
+
+} else {
+	$template->set_var('CLASS_DISPLAY_MODIFIED', '');
+    $template->parse('show_modify', 'show_modify_block', true);
+}
+
+// Work-out if we should show the "manage sections" link
+$sql  = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` WHERE `page_id` = '.(int)$page_id.' ';
+$sql .= 'AND `module` = "menu_link"';
+$query_sections = $database->query($sql);
+
+$template->set_block('main_block', 'show_section_block', 'show_section');
+if($query_sections->numRows() > 0)
+{
+	$template->set_block('show_section', '');
+	$template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;');
+
+} elseif(MANAGE_SECTIONS == 'enabled')
+{
+
+	$template->set_var('TEXT_MANAGE_SECTIONS', $HEADING['MANAGE_SECTIONS']);
+    $template->parse('show_section', 'show_section_block', true);
+
+} else {
+	$template->set_block('show_section', '');
+	$template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;');
+
+}
+
+// Insert language TEXT
+$template->set_var(array(
+				'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'],
+				'TEXT_CHANGE_SETTINGS' => $TEXT['CHANGE_SETTINGS'],
+				'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE']
+				));
+
+// Parse and print header template
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// get template used for the displayed page (for displaying block details)
+if (SECTION_BLOCKS)
+{
+	$sql = "SELECT `template` from `" . TABLE_PREFIX . "pages` WHERE `page_id` = '$page_id' ";
+	$result = $database->query($sql);
+	if ($result && $result->numRows() == 1) {
+		$row = $result->fetchRow();
+		$page_template = ($row['template'] == '') ? DEFAULT_TEMPLATE : $row['template'];
+		// include template info file if exists
+		if (file_exists(WB_PATH . '/templates/' . $page_template . '/info.php'))
+		{
+			include_once(WB_PATH . '/templates/' . $page_template . '/info.php');
+		}
+	}
+}
+
+// Get sections for this page
+$module_permissions = $_SESSION['MODULE_PERMISSIONS'];
+// workout for edit only one section for faster pageloading
+// Constant later set in wb_settings, in meantime defined in framework/initialize.php
+$sql = 'SELECT `section_id`, `module`, `block` FROM `'.TABLE_PREFIX.'sections` ';
+
+$sql .= (defined('EDIT_ONE_SECTION') && EDIT_ONE_SECTION && is_numeric($sectionId))
+		? 'WHERE `section_id` = '.$sectionId
+		: 'WHERE `page_id` = '.intval($page_id);
+$sql .= ' ORDER BY position ASC';
+$query_sections = $database->query($sql);
+if($query_sections->numRows() > 0)
+{
+	while($section = $query_sections->fetchRow())
+    {
+		$section_id = $section['section_id'];
+		$module = $section['module'];
+		//Have permission?
+		if(!is_numeric(array_search($module, $module_permissions)))
+        {
+			// Include the modules editing script if it exists
+			if(file_exists(WB_PATH.'/modules/'.$module.'/modify.php'))
+            {
+				print /* ''. */"\n";
+				// output block name if blocks are enabled
+				if (SECTION_BLOCKS) {
+					if (isset($block[$section['block']]) && trim(strip_tags(($block[$section['block']]))) != '')
+                    {
+						$block_name = htmlentities(strip_tags($block[$section['block']]));
+					} else {
+						if ($section['block'] == 1)
+                        {
+							$block_name = $TEXT['MAIN'];
+						} else {
+							$block_name = '#' . (int) $section['block'];
+						}
+					}
+
+                    $sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' )  ? 'id="'.SEC_ANCHOR.$section['section_id'].'"' : '');
+					print '
' . $TEXT['BLOCK'] . ': ' . $block_name;
+					print '  Modul: ' . $section['module']." ";
+					print '  ID: ' . $section_id."
\n";
+
+				}
+				require(WB_PATH.'/modules/'.$module.'/modify.php');
+			}
+		}
+	}
+}
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/pages/modify.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/settings.php
===================================================================
--- tags/2.8.3/wb/admin/pages/settings.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/settings.php	(revision 1610)
@@ -0,0 +1,629 @@
+checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+	exit();
+}
+*/
+$sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$page_id;
+$results = $database->query($sql);
+$results_array = $results->fetchRow();
+
+$old_admin_groups = explode(',', $results_array['admin_groups']);
+$old_admin_users = explode(',', $results_array['admin_users']);
+
+// Work-out if we should check for existing page_code
+$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code');
+
+$in_old_group = FALSE;
+foreach($admin->get_groups_id() as $cur_gid)
+{
+	if (in_array($cur_gid, $old_admin_groups))
+    {
+		$in_old_group = TRUE;
+	}
+}
+if((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users)))
+{
+	$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+}
+
+// Get page details
+/* $database = new database();  */
+$sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `page_id`='.$page_id;
+$results = $database->query($sql);
+if($database->is_error()) {
+	$admin->print_header();
+	$admin->print_error($database->get_error());
+}
+if($results->numRows() == 0) {
+	$admin->print_header();
+	$admin->print_error($MESSAGE['PAGES']['NOT_FOUND']);
+}
+$results_array = $results->fetchRow();
+
+// Get display name of person who last modified the page
+$user=$admin->get_user_details($results_array['modified_by']);
+
+// Convert the unix ts for modified_when to human a readable form
+if($results_array['modified_when'] != 0)
+{
+	$modified_ts = gmdate(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE);
+} else {
+	$modified_ts = 'Unknown';
+}
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('pages_settings.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'pages_settings.htt');
+$template->set_block('page', 'main_block', 'main');
+$template->set_var('FTAN', $admin->getFTAN());
+
+$template->set_var(array(
+				'PAGE_ID' => $results_array['page_id'],
+				// 'PAGE_IDKEY' => $admin->getIDKEY($results_array['page_id']),
+				'PAGE_IDKEY' => $results_array['page_id'],
+				'PAGE_TITLE' => ($results_array['page_title']),
+				'MENU_TITLE' => ($results_array['menu_title']),
+				'DESCRIPTION' => ($results_array['description']),
+				'KEYWORDS' => ($results_array['keywords']),
+				'MODIFIED_BY' => $user['display_name'],
+				'MODIFIED_BY_USERNAME' => $user['username'],
+				'MODIFIED_WHEN' => $modified_ts,
+				'ADMIN_URL' => ADMIN_URL,
+				'WB_URL' => WB_URL,
+				'THEME_URL' => THEME_URL
+				)
+		);
+
+// Work-out if we should show the "manage sections" link
+$sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'sections` WHERE `page_id`='.$page_id.' AND `module`="menu_link"';
+$sections_available = (intval($database->get_one($sql)) != 0);
+if ($sections_available)
+{
+    $template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;');
+} elseif(MANAGE_SECTIONS == 'enabled')
+{
+	$template->set_var('TEXT_MANAGE_SECTIONS', $HEADING['MANAGE_SECTIONS']);
+} else {
+	$template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;');
+}
+
+// Visibility
+if($results_array['visibility'] == 'public') {
+	$template->set_var('PUBLIC_SELECTED', ' selected="selected"');
+} elseif($results_array['visibility'] == 'private') {
+	$template->set_var('PRIVATE_SELECTED', ' selected="selected"');
+} elseif($results_array['visibility'] == 'registered') {
+	$template->set_var('REGISTERED_SELECTED', ' selected="selected"');
+} elseif($results_array['visibility'] == 'hidden') {
+	$template->set_var('HIDDEN_SELECTED', ' selected="selected"');
+} elseif($results_array['visibility'] == 'none') {
+	$template->set_var('NO_VIS_SELECTED', ' selected="selected"');
+}
+// Group list 1 (admin_groups)
+	$admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups']));
+
+	$sql = 'SELECT * FROM `'.TABLE_PREFIX.'groups`';
+    $get_groups = $database->query($sql);
+
+	$template->set_block('main_block', 'group_list_block', 'group_list');
+	// Insert admin group and current group first
+	$admin_group_name = $get_groups->fetchRow();
+	$template->set_var(array(
+									'ID' => 1,
+									'TOGGLE' => '',
+									'DISABLED' => ' disabled="disabled"',
+									'LINK_COLOR' => '000000',
+									'CURSOR' => 'default',
+									'NAME' => $admin_group_name['name'],
+									'CHECKED' => ' checked="checked"'
+									)
+							);
+	$template->parse('group_list', 'group_list_block', true);
+	while($group = $get_groups->fetchRow()) {
+		// check if the user is a member of this group
+		$flag_disabled = '';
+		$flag_checked =  '';
+		$flag_cursor =   'pointer';
+		$flag_color =    '';
+		if (in_array($group["group_id"], $admin->get_groups_id())) {
+			$flag_disabled = ''; //' disabled';
+			$flag_checked =  ''; //' checked';
+			$flag_cursor =   'default';
+			$flag_color =    '000000';
+		}
+
+		// Check if the group is allowed to edit pages
+		$system_permissions = explode(',', $group['system_permissions']);
+		if(is_numeric(array_search('pages_modify', $system_permissions))) {
+			$template->set_var(array(
+											'ID' => $group['group_id'],
+											'TOGGLE' => $group['group_id'],
+											'DISABLED' => $flag_disabled,
+											'LINK_COLOR' => $flag_color,
+											'CURSOR' => $flag_cursor,
+											'NAME' => $group['name'],
+											'CHECKED' => $flag_checked
+											)
+									);
+			if(is_numeric(array_search($group['group_id'], $admin_groups))) {
+				$template->set_var('CHECKED', ' checked="checked"');
+			} else {
+				if (!$flag_checked) $template->set_var('CHECKED', '');
+			}
+			$template->parse('group_list', 'group_list_block', true);
+		}
+	}
+
+// Group list 2 (viewing_groups)
+	$viewing_groups = explode(',', str_replace('_', '', $results_array['viewing_groups']));
+
+    $sql = 'SELECT * FROM `'.TABLE_PREFIX.'groups`';
+    $get_groups = $database->query($sql);
+
+	$template->set_block('main_block', 'group_list_block2', 'group_list2');
+	// Insert admin group and current group first
+	$admin_group_name = $get_groups->fetchRow();
+	$template->set_var(array(
+									'ID' => 1,
+									'TOGGLE' => '',
+									'DISABLED' => ' disabled="disabled"',
+									'LINK_COLOR' => '000000',
+									'CURSOR' => 'default',
+									'NAME' => $admin_group_name['name'],
+									'CHECKED' => ' checked="checked"'
+									)
+							);
+	$template->parse('group_list2', 'group_list_block2', true);
+
+	while($group = $get_groups->fetchRow())
+    {
+		// check if the user is a member of this group
+		$flag_disabled = '';
+		$flag_checked =  '';
+		$flag_cursor =   'pointer';
+		$flag_color =    '';
+		if (in_array($group["group_id"], $admin->get_groups_id()))
+        {
+			$flag_disabled = ''; //' disabled';
+			$flag_checked =  ''; //' checked';
+			$flag_cursor =   'default';
+			$flag_color =    '000000';
+		}
+
+		$template->set_var(array(
+										'ID' => $group['group_id'],
+										'TOGGLE' => $group['group_id'],
+										'DISABLED' => $flag_disabled,
+										'LINK_COLOR' => $flag_color,
+										'CURSOR' => $flag_cursor,
+										'NAME' => $group['name'],
+										'CHECKED' => $flag_checked
+										)
+								);
+		if(is_numeric(array_search($group['group_id'], $viewing_groups)))
+        {
+			$template->set_var('CHECKED', 'checked="checked"');
+		} else {
+			if (!$flag_checked) {$template->set_var('CHECKED', '');}
+		}
+
+		$template->parse('group_list2', 'group_list_block2', true);
+
+	}
+
+// Show private viewers
+if($results_array['visibility'] == 'private' OR $results_array['visibility'] == 'registered')
+{
+	$template->set_var('DISPLAY_VIEWERS', '');
+} else {
+	$template->set_var('DISPLAY_VIEWERS', 'display:none;');
+}
+
+//-- insert page_code 20090904-->
+$template->set_var('DISPLAY_CODE_PAGE_LIST', ' id="multi_lingual" style="display:none;"');
+
+// Work-out if page languages feature is enabled
+if((defined('PAGE_LANGUAGES') && PAGE_LANGUAGES) && $field_set && file_exists(WB_PATH.'/modules/mod_multilingual/update_keys.php') )
+{
+    // workout field is set but module missing
+    $TEXT['PAGE_CODE'] = empty($TEXT['PAGE_CODE']) ? 'Pagecode' : $TEXT['PAGE_CODE'];
+	$template->set_var( array(
+            'DISPLAY_CODE_PAGE_LIST' => ' id="multi_lingual"',
+            'TEXT_PAGE_CODE' => ''.$TEXT['PAGE_CODE'].''
+        )
+    );
+
+	// Page_code list
+   /* 	$database = new database();  */
+	function page_code_list($parent)
+    {
+		global $admin, $database, $template, $results_array, $pageCode;
+		$default_language = DEFAULT_LANGUAGE;
+
+        $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$parent.' AND `language` = "'.$default_language.'" ORDER BY `position` ASC';
+        $get_pages = $database->query($sql);
+
+		while($page = $get_pages->fetchRow())
+        {
+			if(($admin->page_is_visible($page)==false) && ($page['visibility'] <> 'none') ) { continue; }
+
+			$template->set_var('FLAG_CODE_ICON',' none ');
+			if( $page['parent'] == 0 )
+            {
+				$template->set_var('FLAG_CODE_ICON','url('.THEME_URL.'/images/flags/'.strtolower($page['language']).'.png)');
+			}
+
+			// If the current page cannot be parent, then its children neither
+			$list_next_level = true;
+			// Stop users from adding pages with a level of more than the set page level limit
+			if($page['level']+1 < PAGE_LEVEL_LIMIT)
+            {
+				// Get user perms
+				$admin_groups = explode(',', str_replace('_', '', $page['admin_groups']));
+				$admin_users = explode(',', str_replace('_', '', $page['admin_users']));
+
+				$in_group = FALSE;
+				foreach($admin->get_groups_id() as $cur_gid)
+                {
+					if (in_array($cur_gid, $admin_groups))
+					{
+						$in_group = TRUE;
+					}
+				}
+
+				if(($in_group) OR is_numeric(array_search($admin->get_user_id(), $admin_users)))
+                {
+					$can_modify = true;
+				} else {
+					$can_modify = false;
+				}
+
+				$title_prefix = '';
+				for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - -  '; }
+                // $space = str_repeat(' ', 3);  $space.'<'..'>'
+				$template->set_var(array(
+										'VALUE' => $page['page_code'],
+                                        'PAGE_VALUE' => $title_prefix.$page['menu_title'],
+										'PAGE_CODE' => $title_prefix.$page['page_id']
+										)
+								);
+				if($results_array['page_code'] == $page['page_code'])
+                {
+					$template->set_var('SELECTED', ' selected="selected"');
+				} elseif($results_array['page_code'] == $page['page_code'])
+                {
+					$template->set_var('SELECTED', ' disabled="disabled" class="disabled"');
+					$list_next_level=false;
+				} elseif($can_modify != true)
+                {
+					$template->set_var('SELECTED', ' disabled="disabled" class="disabled"');
+				} else {
+					$template->set_var('SELECTED', '');
+				}
+				$template->parse('page_code_list', 'page_code_list_block', true);
+			}
+			if ($list_next_level)
+				page_code_list($page['page_id']);
+		}
+	}
+
+	// Insert code_page values from page to modify
+	$template->set_block('main_block', 'page_code_list_block', 'page_code_list');
+	if($admin->get_permission('pages_add_l0') == true OR $results_array['level'] == 0) {
+		if($results_array['parent'] == 0) { $selected = ' selected'; } else { $selected = ''; }
+		$template->set_var(array(
+									'VALUE' => '',
+									'PAGE_CODE' => $TEXT['NONE'],
+                                    'PAGE_VALUE' => '',
+									'SELECTED' => $selected
+								)
+							);
+		$template->parse('page_code_list', 'page_code_list_block', true);
+	}
+	// get pagecode form this page_id
+   	page_code_list(0);
+}
+//-- page code -->
+
+// Parent page list
+/* $database = new database();  */
+function parent_list($parent)
+{
+	global $admin, $database, $template, $results_array,$field_set;
+
+    $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$parent.' ORDER BY `position` ASC';
+    $get_pages = $database->query($sql);
+
+	while($page = $get_pages->fetchRow())
+    {
+		if($admin->page_is_visible($page)==false)
+        {
+          continue;
+        }
+
+		// if parent = 0 set flag_icon
+		$template->set_var('FLAG_ROOT_ICON',' none ');
+		if( $page['parent'] == 0  && $field_set)
+        {
+			$template->set_var('FLAG_ROOT_ICON','url('.THEME_URL.'/images/flags/'.strtolower($page['language']).'.png)');
+		}
+		// If the current page cannot be parent, then its children neither
+		$list_next_level = true;
+		// Stop users from adding pages with a level of more than the set page level limit
+		if($page['level']+1 < PAGE_LEVEL_LIMIT)
+        {
+			// Get user perms
+			$admin_groups = explode(',', str_replace('_', '', $page['admin_groups']));
+			$admin_users = explode(',', str_replace('_', '', $page['admin_users']));
+			$in_group = FALSE;
+			foreach($admin->get_groups_id() as $cur_gid)
+            {
+				if (in_array($cur_gid, $admin_groups))
+                {
+					$in_group = TRUE;
+				}
+			}
+			if(($in_group) OR is_numeric(array_search($admin->get_user_id(), $admin_users)))
+            {
+				$can_modify = true;
+			} else {
+				$can_modify = false;
+			}
+			// Title -'s prefix
+			$title_prefix = '';
+			for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - -  '; }
+			$template->set_var(array(
+								'ID' => $page['page_id'],
+								'TITLE' => ($title_prefix.$page['menu_title']),
+								'MENU-TITLE' => ($title_prefix.$page['menu_title']),
+								'PAGE-TITLE' => ($title_prefix.$page['page_title']),
+								'FLAG_ICON' => ' none ',
+								));
+
+			if($results_array['parent'] == $page['page_id'])
+            {
+				$template->set_var('SELECTED', ' selected="selected"');
+			} elseif($results_array['page_id'] == $page['page_id'])
+            {
+				$template->set_var('SELECTED', ' disabled="disabled" class="disabled"');
+				$list_next_level=false;
+			} elseif($can_modify != true)
+            {
+				$template->set_var('SELECTED', ' disabled="disabled" class="disabled"');
+			} else {
+				$template->set_var('SELECTED', '');
+			}
+			$template->parse('page_list2', 'page_list_block2', true);
+		}
+		if ($list_next_level)
+        {
+          parent_list($page['page_id']);
+        }
+
+	}
+}
+
+$template->set_block('main_block', 'page_list_block2', 'page_list2');
+if($admin->get_permission('pages_add_l0') == true OR $results_array['level'] == 0) {
+	if($results_array['parent'] == 0)
+    {
+		$selected = ' selected="selected"';
+	} else { 
+		$selected = '';
+	}
+	$template->set_var(array(
+						'ID' => '0',
+						'TITLE' => $TEXT['NONE'],
+						'SELECTED' => $selected
+						) );
+	$template->parse('page_list2', 'page_list_block2', true);
+}
+parent_list(0);
+
+if($modified_ts == 'Unknown')
+{
+	$template->set_var('DISPLAY_MODIFIED', 'hide');
+} else {
+	$template->set_var('DISPLAY_MODIFIED', '');
+}
+
+// Templates list
+$template->set_block('main_block', 'template_list_block', 'template_list');
+
+$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "template" AND `function` = "template" order by `name`';
+if( ($res_templates = $database->query($sql)) )
+{
+	while($rec_template = $res_templates->fetchRow())
+    {
+		// Check if the user has perms to use this template
+		if($rec_template['directory'] == $results_array['template'] OR $admin->get_permission($rec_template['directory'], 'template') == true)
+        {
+			$template->set_var('VALUE', $rec_template['directory']);
+			$template->set_var('NAME', $rec_template['name']);
+			if($rec_template['directory'] == $results_array['template'])
+            {
+				$template->set_var('SELECTED', ' selected="selected"');
+			} else {
+				$template->set_var('SELECTED', '');
+			}
+			$template->parse('template_list', 'template_list_block', true);
+		}
+	}
+}
+
+// Menu list
+if(MULTIPLE_MENUS == false)
+{
+	$template->set_var('DISPLAY_MENU_LIST', 'display:none;');
+}
+// Include template info file (if it exists)
+if($results_array['template'] != '')
+{
+	$template_location = WB_PATH.'/templates/'.$results_array['template'].'/info.php';
+} else {
+	$template_location = WB_PATH.'/templates/'.DEFAULT_TEMPLATE.'/info.php';
+}
+if(file_exists($template_location))
+{
+	require($template_location);
+}
+// Check if $menu is set
+if(!isset($menu[1]) OR $menu[1] == '')
+{
+	// Make our own menu list
+	$menu[1] = $TEXT['MAIN'];
+}
+// Add menu options to the list
+$template->set_block('main_block', 'menu_list_block', 'menu_list');
+foreach($menu AS $number => $name)
+{
+	$template->set_var('NAME', $name);
+	$template->set_var('VALUE', $number);
+	if($results_array['menu'] == $number)
+    {
+		$template->set_var('SELECTED', ' selected="selected"');
+	} else {
+		$template->set_var('SELECTED', '');
+	}
+	$template->parse('menu_list', 'menu_list_block', true);
+}
+
+// Insert language values
+$template->set_block('main_block', 'language_list_block', 'language_list');
+
+$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "language" ORDER BY `name`';
+if( ($res_languages = $database->query($sql)) )
+{
+	while($rec_language = $res_languages->fetchRow())
+    {
+		$l_codes[$rec_language['name']] = $rec_language['directory'];
+		$l_names[$rec_language['name']] = entities_to_7bit($rec_language['name']); // sorting-problem workaround
+	}
+	asort($l_names);
+
+	foreach($l_names as $l_name=>$v)
+    {
+        $langIcons = (empty($l_codes[$l_name])) ? 'none' : strtolower($l_codes[$l_name]);
+		// Insert code and name
+		$template->set_var(array(
+								'VALUE' => $l_codes[$l_name],
+								'NAME' => $l_name,
+								'FLAG_LANG_ICONS' => 'url('.THEME_URL.'/images/flags/'.$langIcons.'.png)',
+								));
+		// Check if it is selected
+		if($results_array['language'] == $l_codes[$l_name])
+        {
+			$template->set_var('SELECTED', ' selected="selected"');
+		} else {
+			$template->set_var('SELECTED', '');
+		}
+		$template->parse('language_list', 'language_list_block', true);
+	}
+}
+
+// Select disabled if searching is disabled
+if($results_array['searching'] == 0)
+{
+	$template->set_var('SEARCHING_DISABLED', ' selected="selected"');
+}
+// Select what the page target is
+switch ($results_array['target'])
+{
+	case '_top':
+		$template->set_var('TOP_SELECTED', ' selected="selected"');
+		break;
+	case '_self':
+		$template->set_var('SELF_SELECTED', ' selected="selected"');
+		break;
+	case '_blank':
+		$template->set_var('BLANK_SELECTED', ' selected="selected"');
+		break;
+}
+
+// Insert language text
+$template->set_var(array(
+				'HEADING_MODIFY_PAGE_SETTINGS' => $HEADING['MODIFY_PAGE_SETTINGS'],
+				'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'],
+				'TEXT_MODIFY' => $TEXT['MODIFY'],
+				'TEXT_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'],
+				'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'],
+				'TEXT_PAGE_TITLE' => $TEXT['PAGE_TITLE'],
+				'TEXT_MENU_TITLE' => $TEXT['MENU_TITLE'],
+				'TEXT_TYPE' => $TEXT['TYPE'],
+				'TEXT_MENU' => $TEXT['MENU'],
+				'TEXT_PARENT' => $TEXT['PARENT'],
+				'TEXT_VISIBILITY' => $TEXT['VISIBILITY'],
+				'TEXT_PUBLIC' => $TEXT['PUBLIC'],
+				'TEXT_PRIVATE' => $TEXT['PRIVATE'],
+				'TEXT_REGISTERED' => $TEXT['REGISTERED'],
+				'TEXT_NONE' => $TEXT['NONE'],
+				'TEXT_HIDDEN' => $TEXT['HIDDEN'],
+				'TEXT_TEMPLATE' => $TEXT['TEMPLATE'],
+				'TEXT_TARGET' => $TEXT['TARGET'],
+				'TEXT_SYSTEM_DEFAULT' => $TEXT['SYSTEM_DEFAULT'],
+				'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
+				'TEXT_NEW_WINDOW' => $TEXT['NEW_WINDOW'],
+				'TEXT_SAME_WINDOW' => $TEXT['SAME_WINDOW'],
+				'TEXT_TOP_FRAME' => $TEXT['TOP_FRAME'],
+				'TEXT_ADMINISTRATORS' => $TEXT['ADMINISTRATORS'],
+				'TEXT_ALLOWED_VIEWERS' => $TEXT['ALLOWED_VIEWERS'],
+				'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'],
+				'TEXT_KEYWORDS' => $TEXT['KEYWORDS'],
+				'TEXT_SEARCHING' => $TEXT['SEARCHING'],
+				'TEXT_LANGUAGE' => $TEXT['LANGUAGE'],
+				'TEXT_ENABLED' => $TEXT['ENABLED'],
+				'TEXT_DISABLED' => $TEXT['DISABLED'],
+				'TEXT_SAVE' => $TEXT['SAVE'],
+				'TEXT_RESET' => $TEXT['RESET'],
+				'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'],
+				'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE']
+			) );
+
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/pages/settings.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/index.php
===================================================================
--- tags/2.8.3/wb/admin/pages/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/index.php	(revision 1610)
@@ -0,0 +1,601 @@
+clearIDKEY();
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+// eggsurplus: add child pages for a specific page
+?>
+
+\n";
+ 	}
+
+	return $retval;
+}
+
+function make_list($parent = 0, $editable_pages = 0) {
+	// Get objects and vars from outside this function
+	global $admin, $template, $database, $TEXT, $MESSAGE, $HEADING, $par;
+
+    print set_node ($parent,$par);
+
+	// Get page list from database
+    $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$parent.' ';
+    $sql .= (PAGE_TRASH != 'inline') ?  'AND `visibility` != \'deleted\' ' : ' ';
+    $sql .= 'ORDER BY `position` ASC';
+	$get_pages = $database->query($sql);
+
+	// Insert values into main page list
+	if($get_pages->numRows() > 0)
+	{
+		while($page = $get_pages->fetchRow())
+		{
+			// Get user perms
+			$admin_groups = explode(',', str_replace('_', '', $page['admin_groups']));
+			$admin_users = explode(',', str_replace('_', '', $page['admin_users']));
+			$in_group = FALSE;
+			foreach($admin->get_groups_id() as $cur_gid)
+            {
+				if (in_array($cur_gid, $admin_groups))
+                {
+					$in_group = TRUE;
+				}
+			}
+			if(($in_group) || is_numeric(array_search($admin->get_user_id(), $admin_users)))
+            {
+				if($page['visibility'] == 'deleted')
+                {
+					if(PAGE_TRASH == 'inline')
+                    {
+						$can_modify = true;
+						$editable_pages = $editable_pages+1;
+					} else {
+						$can_modify = false;
+					}
+				} elseif($page['visibility'] != 'deleted')
+                {
+					$can_modify = true;
+					$editable_pages = $editable_pages+1;
+				}
+			} else {
+				if($page['visibility'] == 'private')
+                {
+					continue;
+				}
+				else {
+					$can_modify = false;
+				}
+			}
+
+			// Work out if we should show a plus or not
+            $sql = 'SELECT `page_id`,`admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$page['page_id'].' ';
+            $sql .= (PAGE_TRASH != 'inline') ?  'AND `visibility` != \'deleted\' ' : ' ';
+            // $sql .= ' ORDER BY `position` ASC';
+        	$get_page_subs = $database->query($sql);
+			$num_subs = $get_page_subs->numRows();
+			$par['num_subs'] = $num_subs;
+/*
+			if(PAGE_TRASH != 'inline')
+            {
+				$get_page_subs = $database->query("SELECT page_id,admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE parent = '".$page['page_id']."' AND visibility!='deleted'");
+			} else {
+				$get_page_subs = $database->query("SELECT page_id,admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE parent = '".$page['page_id']."'");
+			}
+*/
+			if($get_page_subs->numRows() > 0)
+            {
+				$display_plus = true;
+			} else {
+				$display_plus = false;
+			}
+			// Work out how many pages there are for this parent
+			$num_pages = $get_pages->numRows();
+			?>
+			
  • 
+			
+			
+				
+				get_permission('pages_modify') == true && $can_modify == true) { ?>
+				
+				
+				
+				
+				
+				
+
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+
+			
+			
    
+					
+					
+						+
+					
+					
+				
+					
+						
+							<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PUBLIC']; ?>
+						
+							<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PRIVATE']; ?>
+						
+							<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['REGISTERED']; ?>
+						
+							<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['HIDDEN']; ?>
+						
+							<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['NONE']; ?>
+						
+							<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['DELETED']; ?>
+						'.($page['menu_title']).''; ?>
+					
+				
+					
+						<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PUBLIC']; ?>
+					
+						<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PRIVATE']; ?>
+					
+						<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['REGISTERED']; ?>
+					
+						<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['HIDDEN']; ?>
+					
+						<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['NONE']; ?>
+					
+						<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['DELETED']; ?>
+					
+				
+					
+				
+					
+				
+					
+					
+						<?php echo $TEXT['VIEW']; ?>
+					
+					
+				
+					
+						get_permission('pages_settings') == true && $can_modify == true) { ?>
+						
+							<?php echo $TEXT['SETTINGS']; ?>
+						
+						
+					
+						
+							<?php echo $TEXT['RESTORE']; ?>
+						
+					
+				
+				get_permission('pages_modify')==true && $can_modify==true)
+                {
+                    $sql = 'SELECT `publ_start`, `publ_end` FROM `'.TABLE_PREFIX.'sections` ';
+                    $sql .= 'WHERE `page_id` = '.$page['page_id'].' AND `module` != \'menu_link\' ';
+					// $query_sections = $database->query("SELECT publ_start, publ_end FROM ".TABLE_PREFIX."sections WHERE page_id = '{$page['page_id']}' AND module != 'menu_link'");
+					if( ($query_sections = $database->query($sql)) )
+                    {
+						$mdate_display=false;
+						while($mdate_res = $query_sections->fetchRow())
+                        {
+							if($mdate_res['publ_start']!='0' || $mdate_res['publ_end']!='0')
+                            {
+								$mdate_display=true;
+								break;
+							}
+						}
+						if($mdate_display==1)
+                        {
+							$file=$admin->page_is_active($page)?"clock_16.png":"clock_red_16.png";
+							?>
+							
+							" alt="" />
+							
+						
+							
+							<?php echo $HEADING['MANAGE_SECTIONS']; ?>
+						
+					
+				
+				
+				
+					
+						get_permission('pages_settings') == true && $can_modify == true) { ?>
+						
+							<?php echo $TEXT['MOVE_UP']; ?>
+						
+						
+					
+				
+				
+				
+					
+						get_permission('pages_settings') == true && $can_modify == true) { ?>
+						
+							<?php echo $TEXT['MOVE_DOWN']; ?>
+						
+						
+					
+				
+				
+					get_permission('pages_delete') == true && $can_modify == true) { // add IdKey ?>
+					
+						<?php echo $TEXT['DELETE']; ?>
+					
+					
+				
+					get_permission('pages_add')) == (true && $can_modify == true) && ($page['visibility'] != 'deleted')) { ?>
+					
+						Add Child Page
+					
+					
+				
    
+			'."\n";
+		}
+	}
+	$output = ($par['num_subs'] )? ''."\n" : '';
+    $par['num_subs'] = (empty($output) ) ?  1 : $par['num_subs'];
+    print $output;
+	return $editable_pages;
+}
+
+// Generate pages list
+if($admin->get_permission('pages_view') == true) {
+	?>
+	
    
+	
+	
+		
+		
+	
+	
    
+			
    
+		
    
+	
    
+	
+	
+		
+		
+		
+		
+	
+	
    
+			:
+		
+			:
+		
+			ID:
+		
+			:
+		
    
+	field_exists(TABLE_PREFIX.'pages', 'page_code');
+
+    $par = array();
+	$par['num_subs'] = 1;
+	$editable_pages = make_list(0, 0);
+} else {
+	$editable_pages = 0;
+}
+ ?>
    
+	
    
+		
+	
    
+	correct_theme_source('pages.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'pages.htt');
+$template->set_block('page', 'main_block', 'main');
+// Insert values into the add page form
+$template->set_var('FTAN', $admin->getFTAN());
+
+// Group list 1
+
+	$query = "SELECT * FROM ".TABLE_PREFIX."groups";
+	$get_groups = $database->query($query);
+	$template->set_block('main_block', 'group_list_block', 'group_list');
+	// Insert admin group and current group first
+	$admin_group_name = $get_groups->fetchRow();
+	$template->set_var(array(
+									'ID' => 1,
+									'TOGGLE' => '1',
+									'DISABLED' => ' disabled="disabled"',
+									'LINK_COLOR' => '000000',
+									'CURSOR' => 'default',
+									'NAME' => $admin_group_name['name'],
+									'CHECKED' => ' checked="checked"'
+									)
+							);
+	$template->parse('group_list', 'group_list_block', true);
+
+	while($group = $get_groups->fetchRow()) {
+		// check if the user is a member of this group
+		$flag_disabled = '';
+		$flag_checked =  '';
+		$flag_cursor =   'pointer';
+		$flag_color =    '';
+		if (in_array($group["group_id"], $admin->get_groups_id())) {
+			$flag_disabled = ''; //' disabled';
+			$flag_checked =  ' checked="checked"';
+			$flag_cursor =   'default';
+			$flag_color =    '000000';
+		}
+
+		// Check if the group is allowed to edit pages
+		$system_permissions = explode(',', $group['system_permissions']);
+		if(is_numeric(array_search('pages_modify', $system_permissions))) {
+			$template->set_var(array(
+											'ID' => $group['group_id'],
+											'TOGGLE' => $group['group_id'],
+											'CHECKED' => $flag_checked,
+											'DISABLED' => $flag_disabled,
+											'LINK_COLOR' => $flag_color,
+											'CURSOR' => $flag_checked,
+											'NAME' => $group['name'],
+											)
+									);
+			$template->parse('group_list', 'group_list_block', true);
+		}
+	}
+// Group list 2
+
+	$query = "SELECT * FROM ".TABLE_PREFIX."groups";
+
+	$get_groups = $database->query($query);
+	$template->set_block('main_block', 'group_list_block2', 'group_list2');
+	// Insert admin group and current group first
+	$admin_group_name = $get_groups->fetchRow();
+	$template->set_var(array(
+									'ID' => 1,
+									'TOGGLE' => '1',
+									'DISABLED' => ' disabled="disabled"',
+									'LINK_COLOR' => '000000',
+									'CURSOR' => 'default',
+									'NAME' => $admin_group_name['name'],
+									'CHECKED' => ' checked="checked"'
+									)
+							);
+	$template->parse('group_list2', 'group_list_block2', true);
+
+	while($group = $get_groups->fetchRow()) {
+		// check if the user is a member of this group
+		$flag_disabled = '';
+		$flag_checked =  '';
+		$flag_cursor =   'pointer';
+		$flag_color =    '';
+		if (in_array($group["group_id"], $admin->get_groups_id())) {
+			$flag_disabled = ''; //' disabled';
+			$flag_checked =  ' checked="checked"';
+			$flag_cursor =   'default';
+			$flag_color =    '000000';
+		}
+
+		$template->set_var(array(
+										'ID' => $group['group_id'],
+										'TOGGLE' => $group['group_id'],
+										'CHECKED' => $flag_checked,
+										'DISABLED' => $flag_disabled,
+										'LINK_COLOR' => $flag_color,
+										'CURSOR' => $flag_cursor,
+										'NAME' => $group['name'],
+										)
+								);
+		$template->parse('group_list2', 'group_list_block2', true);
+	}
+
+
+// Parent page list
+// $database = new database();
+function parent_list($parent)
+{
+	global $admin, $database, $template, $field_set;
+	$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' AND visibility!='deleted' ORDER BY position ASC";
+	$get_pages = $database->query($query);
+	while($page = $get_pages->fetchRow()) {
+		if($admin->page_is_visible($page)==false)
+			continue;
+		// if parent = 0 set flag_icon
+		$template->set_var('FLAG_ROOT_ICON',' none ');
+		if( $page['parent'] == 0 && $field_set) {
+			$template->set_var('FLAG_ROOT_ICON','url('.THEME_URL.'/images/flags/'.strtolower($page['language']).'.png)');
+		}
+		// Stop users from adding pages with a level of more than the set page level limit
+		if($page['level']+1 < PAGE_LEVEL_LIMIT) {
+			// Get user perms
+			$admin_groups = explode(',', str_replace('_', '', $page['admin_groups']));
+			$admin_users = explode(',', str_replace('_', '', $page['admin_users']));
+			
+			$in_group = FALSE;
+			foreach($admin->get_groups_id() as $cur_gid) {
+				if (in_array($cur_gid, $admin_groups)) {
+					$in_group = TRUE;
+				}
+			}
+			if(($in_group) || is_numeric(array_search($admin->get_user_id(), $admin_users))) {
+				$can_modify = true;
+			} else {
+				$can_modify = false;
+			}
+			// Title -'s prefix
+			$title_prefix = '';
+			for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - -  '; }
+				$template->set_var(array(
+										'ID' => $page['page_id'],
+										'TITLE' => ($title_prefix.$page['menu_title']),
+										'MENU-TITLE' => ($title_prefix.$page['menu_title']),
+										'PAGE-TITLE' => ($title_prefix.$page['page_title'])
+										));
+				if($can_modify == true) {
+					$template->set_var('DISABLED', '');
+				} else {
+					$template->set_var('DISABLED', ' disabled="disabled" class="disabled"');
+				}
+				$template->parse('page_list2', 'page_list_block2', true);
+		}
+		parent_list($page['page_id']);
+	}
+}
+$template->set_block('main_block', 'page_list_block2', 'page_list2');
+if($admin->get_permission('pages_add_l0') == true) {
+	$template->set_var(array(
+						'ID' => '0',
+						'TITLE' => $TEXT['NONE'],
+						'SELECTED' => ' selected="selected"',
+						'DISABLED' => ''
+					)
+				);
+	$template->parse('page_list2', 'page_list_block2', true);
+}
+parent_list(0);
+
+// Explode module permissions
+$module_permissions = $_SESSION['MODULE_PERMISSIONS'];
+// Modules list
+$template->set_block('main_block', 'module_list_block', 'module_list');
+$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'page' order by name");
+if($result->numRows() > 0) {
+	while ($module = $result->fetchRow()) {
+		// Check if user is allowed to use this module
+		if(!is_numeric(array_search($module['directory'], $module_permissions))) {
+			$template->set_var('VALUE', $module['directory']);
+			$template->set_var('NAME', $module['name']);
+			if($module['directory'] == 'wysiwyg') {
+				$template->set_var('SELECTED', ' selected="selected"');
+			} else {
+				$template->set_var('SELECTED', '');
+			}
+			$template->parse('module_list', 'module_list_block', true);
+		}
+	}
+}
+
+// Insert urls
+$template->set_var(array(
+								'THEME_URL' => THEME_URL,
+								'WB_URL' => WB_URL,
+								'ADMIN_URL' => ADMIN_URL,
+								)
+						);
+
+// Insert language headings
+$template->set_var(array(
+								'HEADING_ADD_PAGE' => $HEADING['ADD_PAGE'],
+								'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE']
+								)
+						);
+// Insert language text and messages
+$template->set_var(array(
+								'TEXT_TITLE' => $TEXT['TITLE'],
+								'TEXT_TYPE' => $TEXT['TYPE'],
+								'TEXT_PARENT' => $TEXT['PARENT'],
+								'TEXT_VISIBILITY' => $TEXT['VISIBILITY'],
+								'TEXT_PUBLIC' => $TEXT['PUBLIC'],
+								'TEXT_PRIVATE' => $TEXT['PRIVATE'],
+								'TEXT_REGISTERED' => $TEXT['REGISTERED'],
+								'TEXT_HIDDEN' => $TEXT['HIDDEN'],
+								'TEXT_NONE' => $TEXT['NONE'],
+								'TEXT_NONE_FOUND' => $TEXT['NONE_FOUND'],
+								'TEXT_ADD' => $TEXT['ADD'],
+								'TEXT_RESET' => $TEXT['RESET'],
+								'TEXT_ADMINISTRATORS' => $TEXT['ADMINISTRATORS'],
+								'TEXT_PRIVATE_VIEWERS' => $TEXT['PRIVATE_VIEWERS'],
+								'TEXT_REGISTERED_VIEWERS' => $TEXT['REGISTERED_VIEWERS'],
+								'INTRO_LINK' => $MESSAGE['PAGES']['INTRO_LINK'],
+								)
+						);
+
+// Insert permissions values
+if($admin->get_permission('pages_add') != true) {
+	$template->set_var('DISPLAY_ADD', 'hide');
+} elseif($admin->get_permission('pages_add_l0') != true && $editable_pages == 0) {
+	$template->set_var('DISPLAY_ADD', 'hide');
+}
+if($admin->get_permission('pages_intro') != true || INTRO_PAGE != 'enabled') {
+	$template->set_var('DISPLAY_INTRO', 'hide');
+}
+
+
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// include the required file for Javascript admin
+if(file_exists(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php'))
+{
+	include(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php');
+}
+
+// Print admin
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/pages/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/sections.php
===================================================================
--- tags/2.8.3/wb/admin/pages/sections.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/sections.php	(revision 1610)
@@ -0,0 +1,523 @@
+checkIDKEY('section_id', 0, $_SERVER['REQUEST_METHOD'])) )) )
+		{
+			if($admin_header) { $admin->print_header(); }
+			$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$backlink);
+		}
+
+		$action = 'show';
+	    $sql  = 'SELECT `module` FROM `'.TABLE_PREFIX.'sections` ';
+	    $sql .= 'WHERE `section_id` ='.$section_id;
+        if( ( ($modulname = $database->get_one($sql)) == $module) && ($section_id > 0 ) ) {
+			// Include the modules delete file if it exists
+			if(file_exists(WB_PATH.'/modules/'.$modulname.'/delete.php'))
+		    {
+				require(WB_PATH.'/modules/'.$modulname.'/delete.php');
+			}
+		    $sql  = 'DELETE FROM `'.TABLE_PREFIX.'sections` ';
+		    $sql .= 'WHERE `section_id` ='.(int)$section_id.' LIMIT 1';
+			if( !$database->query($sql) ) {
+				if($admin_header) { $admin->print_header(); }
+				$admin->print_error($database->get_error(),$backlink);
+			}  else {
+				require_once(WB_PATH.'/framework/class.order.php');
+				$order = new order(TABLE_PREFIX.'sections', 'position', 'section_id', 'page_id');
+				$order->clean($page_id);
+				$format = $TEXT['SECTION'].' %d  %s %s '.strtolower( $TEXT['DELETED']);
+				$message = sprintf ($format,$section_id,strtoupper($modulname),strtolower($TEXT['SUCCESS']));
+				if($admin_header) { $admin->print_header(); }
+				$admin_header = false;
+				unset($_POST);
+				$admin->print_success($message, $backlink );
+			}
+        } else {
+			if($admin_header) { $admin->print_header(); }
+			$admin->print_error($module.' '.strtolower($TEXT['NOT_FOUND']),$backlink);
+        }
+
+		break;
+	case 'add' :
+
+		if (!$admin->checkFTAN())
+		{
+			$admin->print_header();
+			$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$backlink);
+		}
+		$action = 'show';
+		$module = preg_replace('/\W/', '', $module );  // fix secunia 2010-91-4
+		require_once(WB_PATH.'/framework/class.order.php');
+		// Get new order
+		$order = new order(TABLE_PREFIX.'sections', 'position', 'section_id', 'page_id');
+		$position = $order->get_new($page_id);
+		// Insert module into DB
+	    $sql  = 'INSERT INTO `'.TABLE_PREFIX.'sections` SET ';
+	    $sql .= '`page_id` = '.(int)$page_id.', ';
+	    $sql .= '`module` = \''.$module.'\', ';
+	    $sql .= '`position` = '.(int)$position.', ';
+	    $sql .= '`block` = 1';
+        if($database->query($sql)) {
+			// Get the section id
+			$section_id = $database->get_one("SELECT LAST_INSERT_ID()");
+			// Include the selected modules add file if it exists
+			if(file_exists(WB_PATH.'/modules/'.$module.'/add.php'))
+		    {
+				require(WB_PATH.'/modules/'.$module.'/add.php');
+			}
+        } elseif ($database->is_error())  {
+			if($admin_header) { $admin->print_header(); }
+			$admin->print_error($database->get_error());
+		}
+		break;
+	default:
+		break;
+endswitch;
+
+switch ($action):
+	default:
+
+		if($admin_header) { $admin->print_header(); }
+		// Get perms
+		$sql  = 'SELECT `admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` ';
+		$sql .= 'WHERE `page_id` = '.$page_id;
+		$results = $database->query($sql);
+
+		$results_array = $results->fetchRow();
+		$old_admin_groups = explode(',', $results_array['admin_groups']);
+		$old_admin_users = explode(',', $results_array['admin_users']);
+		$in_old_group = FALSE;
+		foreach($admin->get_groups_id() as $cur_gid)
+		{
+			if (in_array($cur_gid, $old_admin_groups))
+		    {
+				$in_old_group = TRUE;
+			}
+		}
+		if((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users)))
+		{
+			$admin->print_header();
+			$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+		}
+
+		// Get page details
+		$sql  = 'SELECT * FROM `'.TABLE_PREFIX.'pages` ';
+		$sql .= 'WHERE `page_id` = '.$page_id;
+		$results = $database->query($sql);
+
+		if($database->is_error())
+		{
+			// $admin->print_header();
+			$admin->print_error($database->get_error());
+		}
+		if($results->numRows() == 0)
+		{
+			// $admin->print_header();
+			$admin->print_error($MESSAGE['PAGES']['NOT_FOUND']);
+		}
+		$results_array = $results->fetchRow();
+
+		// Set module permissions
+		$module_permissions = $_SESSION['MODULE_PERMISSIONS'];
+
+		// Unset block var
+		unset($block);
+		// Include template info file (if it exists)
+		if($results_array['template'] != '')
+		{
+			$template_location = WB_PATH.'/templates/'.$results_array['template'].'/info.php';
+		} else {
+			$template_location = WB_PATH.'/templates/'.DEFAULT_TEMPLATE.'/info.php';
+		}
+		if(file_exists($template_location))
+		{
+			require($template_location);
+		}
+		// Check if $menu is set
+		if(!isset($block[1]) || $block[1] == '')
+		{
+			// Make our own menu list
+			$block[1] = $TEXT['MAIN'];
+		}
+
+		/*-- load css files with jquery --*/
+		// include jscalendar-setup
+		$jscal_use_time = true; // whether to use a clock, too
+		require_once(WB_PATH."/include/jscalendar/wb-setup.php");
+
+		// Setup template object, parse vars to it, then parse it
+		$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('pages_sections.htt'));
+		// Create new template object
+		$tpl = new Template($ThemePath);
+		// $template->debug = true;
+		$tpl->set_file('page', 'pages_sections.htt');
+		$tpl->set_block('page', 'main_block', 'main');
+		$tpl->set_block('main_block', 'module_block', 'module_list');
+		$tpl->set_block('main_block', 'section_block', 'section_list');
+		$tpl->set_block('section_block', 'block_block', 'block_list');
+		$tpl->set_block('main_block', 'calendar_block', 'calendar_list');
+		$tpl->set_var('FTAN', $admin->getFTAN());
+
+		// set first defaults and messages
+		$tpl->set_var(array(
+						'PAGE_ID' => $results_array['page_id'],
+						// 'PAGE_IDKEY' => $admin->getIDKEY($results_array['page_id']),
+						'PAGE_IDKEY' => $results_array['page_id'],
+						'TEXT_PAGE' => $TEXT['PAGE'],
+						'PAGE_TITLE' => ($results_array['page_title']),
+						'MENU_TITLE' => ($results_array['menu_title']),
+						'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'],
+						'HEADING_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'],
+						'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'],
+						'TEXT_CHANGE_SETTINGS' => $TEXT['CHANGE_SETTINGS'],
+						'TEXT_ADD_SECTION' => $TEXT['ADD_SECTION'],
+						'TEXT_ID' => 'ID',
+						'TEXT_TYPE' => $TEXT['TYPE'],
+						'TEXT_BLOCK' => $TEXT['BLOCK'],
+						'TEXT_PUBL_START_DATE' => $TEXT{'PUBL_START_DATE'},
+						'TEXT_PUBL_END_DATE' => $TEXT['PUBL_END_DATE'],
+						'TEXT_ACTIONS' => $TEXT['ACTIONS'],
+						'ADMIN_URL' => ADMIN_URL,
+						'WB_URL' => WB_URL,
+						'THEME_URL' => THEME_URL
+						)
+					);
+
+		// Insert variables
+		$tpl->set_var(array(
+						'PAGE_ID' => $results_array['page_id'],
+						// 'PAGE_IDKEY' => $admin->getIDKEY($results_array['page_id']),
+						'PAGE_IDKEY' => $results_array['page_id'],
+						'VAR_PAGE_TITLE' => $results_array['page_title'],
+						'SETTINGS_LINK' => ADMIN_URL.'/pages/settings.php?page_id='.$results_array['page_id'],
+						'MODIFY_LINK' => ADMIN_URL.'/pages/modify.php?page_id='.$results_array['page_id']
+						)
+					);
+
+		$sql  = 'SELECT `section_id`,`module`,`position`,`block`,`publ_start`,`publ_end` ';
+		$sql .= 'FROM `'.TABLE_PREFIX.'sections` ';
+		$sql .= 'WHERE `page_id` = '.$page_id.' ';
+		$sql .= 'ORDER BY `position` ASC';
+		$query_sections = $database->query($sql);
+
+		if($query_sections->numRows() > 0)
+		{
+			$num_sections = $query_sections->numRows();
+			while($section = $query_sections->fetchRow())
+		    {
+				if(!is_numeric(array_search($section['module'], $module_permissions)))
+		        {
+					// Get the modules real name
+		            $sql = 'SELECT `name` FROM `'.TABLE_PREFIX.'addons` ';
+		            $sql .= 'WHERE `directory` = "'.$section['module'].'"';
+		            if(!$database->get_one($sql) || !file_exists(WB_PATH.'/modules/'.$section['module']))
+					{
+						$edit_page = ''.$section['module'].'';
+					}else
+					{
+						$edit_page = '';
+					}
+					$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' )  ? SEC_ANCHOR : '');
+					$edit_page_0 = '' : '">';
+					$edit_page_1 .= $section['module'].'';
+					if(SECTION_BLOCKS)
+		            {
+						if($edit_page == '')
+						{
+							if(defined('EDIT_ONE_SECTION') && EDIT_ONE_SECTION)
+							{
+								$edit_page = $edit_page_0.'&wysiwyg='.$section['section_id'].$edit_page_1;
+							} else {
+								$edit_page = $edit_page_0.$edit_page_1;
+							}
+						}
+						$input_attribute = 'input_normal';
+						$tpl->set_var(array(
+								'STYLE_DISPLAY_SECTION_BLOCK' => ' style="visibility:visible;"',
+								'NAME_SIZE' => 300,
+								'INPUT_ATTRIBUTE' => $input_attribute,
+								'VAR_SECTION_ID' => $section['section_id'],
+								'VAR_SECTION_IDKEY' => $admin->getIDKEY($section['section_id']),
+								// 'VAR_SECTION_IDKEY' => $section['section_id'],
+								'VAR_POSITION' => $section['position'],
+								'LINK_MODIFY_URL_VAR_MODUL_NAME' => $edit_page,
+								'SELECT' => '',
+								'SET_NONE_DISPLAY_OPTION' => ''
+								)
+							);
+						// Add block options to the section_list
+						$tpl->clear_var('block_list');
+						foreach($block AS $number => $name)
+		                {
+							$tpl->set_var('NAME', htmlentities(strip_tags($name)));
+							$tpl->set_var('VALUE', $number);
+							$tpl->set_var('SIZE', 1);
+							if($section['block'] == $number)
+		                    {
+								$tpl->set_var('SELECTED', ' selected="selected"');
+							} else {
+								$tpl->set_var('SELECTED', '');
+							}
+							$tpl->parse('block_list', 'block_block', true);
+						}
+					} else {
+						if($edit_page == '')
+						{
+							$edit_page = $edit_page_0.'#wb_'.$edit_page_1;
+						}
+						$input_attribute = 'input_normal';
+						$tpl->set_var(array(
+								'STYLE_DISPLAY_SECTION_BLOCK' => ' style="visibility:hidden;"',
+								'NAME_SIZE' => 300,
+								'INPUT_ATTRIBUTE' => $input_attribute,
+								'VAR_SECTION_ID' => $section['section_id'],
+								'VAR_SECTION_IDKEY' => $admin->getIDKEY($section['section_id']),
+								// 'VAR_SECTION_IDKEY' => $section['section_id'],
+								'VAR_POSITION' => $section['position'],
+								'LINK_MODIFY_URL_VAR_MODUL_NAME' => $edit_page,
+								'NAME' => htmlentities(strip_tags($block[1])),
+								'VALUE' => 1,
+								'SET_NONE_DISPLAY_OPTION' => ''
+								)
+							);
+					}
+					// Insert icon and images
+					$tpl->set_var(array(
+								'CLOCK_16_PNG' => 'clock_16.png',
+								'CLOCK_DEL_16_PNG' => 'clock_del_16.png',
+								'DELETE_16_PNG' => 'delete_16.png'
+								)
+							);
+					// set calendar start values
+					if($section['publ_start']==0)
+		            {
+						$tpl->set_var('VALUE_PUBL_START', '');
+					} else {
+						$tpl->set_var('VALUE_PUBL_START', date($jscal_format, $section['publ_start']));
+					}
+					// set calendar start values
+					if($section['publ_end']==0)
+		            {
+						$tpl->set_var('VALUE_PUBL_END', '');
+					} else {
+						$tpl->set_var('VALUE_PUBL_END', date($jscal_format, $section['publ_end']));
+					}
+					// Insert icons up and down
+					if($section['position'] != 1 )
+		            {
+						$tpl->set_var(
+									'VAR_MOVE_UP_URL',
+									'
+									{TEXT_MOVE_UP}
+									' );
+					} else {
+						$tpl->set_var(array(
+									'VAR_MOVE_UP_URL' => ''
+									)
+								);
+					}
+					if($section['position'] != $num_sections ) {
+						$tpl->set_var(
+									'VAR_MOVE_DOWN_URL',
+									'
+									{TEXT_MOVE_DOWN}
+									' );
+					} else {
+						$tpl->set_var(array(
+									'VAR_MOVE_DOWN_URL' => ''
+									)
+								);
+					}
+				} else {
+				  continue;
+				}
+
+					$tpl->set_var(array(
+									'DISPLAY_DEBUG' => ' style="visibility="visible;"',
+									'TEXT_SID' => 'SID',
+									'DEBUG_COLSPAN_SIZE' => 9
+									)
+								);
+				if($debug)
+		        {
+					$tpl->set_var(array(
+									'DISPLAY_DEBUG' => ' style="visibility="visible;"',
+									'TEXT_PID' => 'PID',
+									'TEXT_SID' => 'SID',
+									'POSITION' => $section['position']
+									)
+								);
+				} else {
+					$tpl->set_var(array(
+									'DISPLAY_DEBUG' => ' style="display:none;"',
+									'TEXT_PID' => '',
+									'POSITION' => ''
+									)
+								);
+				}
+				$tpl->parse('section_list', 'section_block', true);
+			}
+		}
+
+		// now add the calendars -- remember to to set the range to [1970, 2037] if the date is used as timestamp!
+		// the loop is simply a copy from above.
+		$sql  = 'SELECT `section_id`,`module` FROM `'.TABLE_PREFIX.'sections` ';
+		$sql .= 'WHERE page_id = '.$page_id.' ';
+		$sql .= 'ORDER BY `position` ASC';
+		$query_sections = $database->query($sql);
+
+		if($query_sections->numRows() > 0)
+		{
+			$num_sections = $query_sections->numRows();
+			while($section = $query_sections->fetchRow())
+		    {
+				// Get the modules real name
+		        $sql  = 'SELECT `name` FROM `'.TABLE_PREFIX.'addons` ';
+		        $sql .= 'WHERE `directory` = "'.$section['module'].'"';
+		        $module_name = $database->get_one($sql);
+
+				if(!is_numeric(array_search($section['module'], $module_permissions)))
+		        {
+					$tpl->set_var(array(
+								'jscal_ifformat' => $jscal_ifformat,
+								'jscal_firstday' => $jscal_firstday,
+								'jscal_today' => $jscal_today,
+								'start_date' => 'start_date'.$section['section_id'],
+								'end_date' => 'end_date'.$section['section_id'],
+								'trigger_start' => 'trigger_start'.$section['section_id'],
+								'trigger_end' => 'trigger_stop'.$section['section_id']
+								)
+							);
+					if(isset($jscal_use_time) && $jscal_use_time==TRUE) {
+						$tpl->set_var(array(
+								'showsTime' => "true",
+								'timeFormat' => "24"
+								)
+							);
+					}  else {
+						$tpl->set_var(array(
+								'showsTime' => "false",
+								'timeFormat' => "24"
+								)
+							);
+					}
+				}
+				$tpl->parse('calendar_list', 'calendar_block', true);
+			}
+		}
+
+		// Work-out if we should show the "Add Section" form
+		$sql  = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` ';
+		$sql .= 'WHERE `page_id` = '.$page_id.' AND `module` = "menu_link"';
+		$query_sections = $database->query($sql);
+		if($query_sections->numRows() == 0)
+		{
+			// Modules list
+		    $sql  = 'SELECT `name`,`directory`,`type` FROM `'.TABLE_PREFIX.'addons` ';
+		    $sql .= 'WHERE `type` = "module" AND `function` = "page" AND `directory` != "menu_link" ';
+		    $sql .= 'ORDER BY `name`';
+		    $result = $database->query($sql);
+		// if(DEBUG && $database->is_error()) { $admin->print_error($database->get_error()); }
+
+			if($result->numRows() > 0)
+		    {
+				while ($module = $result->fetchRow())
+		        {
+					// Check if user is allowed to use this module   echo  $module['directory'],'
    ';
+					if(!is_numeric(array_search($module['directory'], $module_permissions)))
+		            {
+						$tpl->set_var('VALUE', $module['directory']);
+						$tpl->set_var('NAME', $module['name']);
+						if($module['directory'] == 'wysiwyg')
+		                {
+							$tpl->set_var('SELECTED', ' selected="selected"');
+						} else {
+							$tpl->set_var('SELECTED', '');
+						}
+						$tpl->parse('module_list', 'module_block', true);
+					} else {
+					  continue;
+					}
+				}
+			}
+		}
+		// Insert language text and messages
+		$tpl->set_var(array(
+							'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'],
+							'TEXT_ARE_YOU_SURE' => $TEXT['ARE_YOU_SURE'],
+							'TEXT_TYPE' => $TEXT['TYPE'],
+							'TEXT_ADD' => $TEXT['ADD'],
+							'TEXT_SAVE' =>  $TEXT['SAVE'],
+							'TEXTLINK_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'],
+							'TEXT_CALENDAR' => $TEXT['CALENDAR'],
+							'TEXT_DELETE_DATE' => $TEXT['DELETE_DATE'],
+							'TEXT_ADD_SECTION' => $TEXT['ADD_SECTION'],
+							'TEXT_MOVE_UP' => $TEXT['MOVE_UP'],
+							'TEXT_MOVE_DOWN' => $TEXT['MOVE_DOWN']
+							)
+						);
+		$tpl->parse('main', 'main_block', false);
+		$tpl->pparse('output', 'page');
+		// include the required file for Javascript admin
+		if(file_exists(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php'))
+		{
+			include(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php');
+		}
+		break;
+endswitch;
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/pages/sections.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/intro.php
===================================================================
--- tags/2.8.3/wb/admin/pages/intro.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/intro.php	(revision 1610)
@@ -0,0 +1,65 @@
+ 0) {
+	$content = file_get_contents( $filename ) ;
+} else {
+	$content = file_get_contents( ADMIN_PATH.'/pages/html.php' ) ;
+}
+
+require_once(WB_PATH . '/include/editarea/wb_wrapper_edit_area.php');
+$toolbar = 'search, fullscreen, |, undo, redo, |, select_font, syntax_selection,|,word_wrap, highlight, reset_highlight, |,charmap, |, help';
+echo registerEditArea ('content','php',true,'both',true,true,600,450,$toolbar);
+function show_wysiwyg_editor($name,$id,$content,$width,$height) {
+	echo '';
+}
+?>
+
    
+getFTAN(); ?>
+
+
+	
+		
+	
+	
+		
+		
+	
+
    
+		
+		
    
+			
+		
+			
+		
    
+
+
    
+print_footer();

Property changes on: tags/2.8.3/wb/admin/pages/intro.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/html.php
===================================================================
--- tags/2.8.3/wb/admin/pages/html.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/html.php	(revision 1610)
@@ -0,0 +1,40 @@
+
+
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+
+	
    
+		
    Put your content here
    
+	
    
+
+
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/pages/html.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/intro2.php
===================================================================
--- tags/2.8.3/wb/admin/pages/intro2.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/intro2.php	(revision 1610)
@@ -0,0 +1,56 @@
+checkFTAN())
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+
+// Get posted content
+if(!isset($_POST['content'])) {
+	header("Location: intro".PAGE_EXTENSION."");
+	exit(0);
+} else {
+	$content = $admin->strip_slashes($_POST['content']);
+}
+
+// $content = $admin->strip_slashes($content);
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+$admin->print_header();
+// Write new content
+$filename = WB_PATH.PAGES_DIRECTORY.'/intro'.PAGE_EXTENSION;
+if(file_put_contents($filename, utf8_encode($content))===false){
+	$admin->print_error($MESSAGE['PAGES_NOT_SAVED']);
+} else {
+	change_mode($filename);
+	$admin->print_success($MESSAGE['PAGES']['INTRO_SAVED']);
+}
+if(!is_writable($filename)) {
+	$admin->print_error($MESSAGE['PAGES']['INTRO_NOT_WRITABLE']);
+}
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/pages/intro2.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/settings2.php
===================================================================
--- tags/2.8.3/wb/admin/pages/settings2.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/settings2.php	(revision 1610)
@@ -0,0 +1,328 @@
+checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+*/
+$pagetree_url = ADMIN_URL.'/pages/index.php';
+$target_url = ADMIN_URL.'/pages/settings.php?page_id='.$page_id;
+
+if (!$admin->checkFTAN())
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$target_url);
+}
+// After check print the header
+$admin->print_header();
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Get values
+$page_title = str_replace(array("[[", "]]"), '', htmlspecialchars($admin->get_post_escaped('page_title')));
+$menu_title = str_replace(array("[[", "]]"), '', htmlspecialchars($admin->get_post_escaped('menu_title')));
+$page_code = intval($admin->get_post('page_code')) ;
+$description = str_replace(array("[[", "]]"), '', htmlspecialchars($admin->add_slashes($admin->get_post('description'))));
+$keywords = str_replace(array("[[", "]]"), '', htmlspecialchars($admin->add_slashes($admin->get_post('keywords'))));
+$parent = intval($admin->get_post('parent')); // fix secunia 2010-91-3
+$visibility = $admin->get_post_escaped('visibility');
+if (!in_array($visibility, array('public', 'private', 'registered', 'hidden', 'none'))) {$visibility = 'public';} // fix secunia 2010-93-3
+$template = preg_replace('/[^a-z0-9_-]/i', "", $admin->get_post('template')); // fix secunia 2010-93-3
+$template = (($template == DEFAULT_TEMPLATE ) ? '' : $template);
+$target = preg_replace("/\W/", "", $admin->get_post('target'));
+$admin_groups = $admin->get_post_escaped('admin_groups');
+$viewing_groups = $admin->get_post_escaped('viewing_groups');
+$searching = intval($admin->get_post('searching'));
+$language = strtoupper($admin->get_post('language'));
+$language = (preg_match('/^[A-Z]{2}$/', $language) ? $language : DEFAULT_LANGUAGE);
+$menu = intval($admin->get_post('menu')); // fix secunia 2010-91-3
+
+// Validate data
+if($page_title == '' || substr($page_title,0,1)=='.')
+{
+	$admin->print_error($MESSAGE['PAGES']['BLANK_PAGE_TITLE']);
+}
+if($menu_title == '' || substr($menu_title,0,1)=='.')
+{
+	$admin->print_error($MESSAGE['PAGES']['BLANK_MENU_TITLE']);
+}
+
+// Get existing perms
+// $database = new database();
+
+$sql = 'SELECT `parent`,`link`,`position`,`admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id`='.$page_id;
+$results = $database->query($sql);
+
+$results_array = $results->fetchRow();
+$old_parent = $results_array['parent'];
+$old_link = $results_array['link'];
+$old_position = $results_array['position'];
+$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups']));
+$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users']));
+
+// Work-out if we should check for existing page_code
+$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code');
+
+$in_old_group = FALSE;
+foreach($admin->get_groups_id() as $cur_gid)
+{
+    if (in_array($cur_gid, $old_admin_groups))
+    {
+	$in_old_group = TRUE;
+    }
+}
+if((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users)))
+{
+	$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+}
+
+// Setup admin groups
+$admin_groups[] = 1;
+//if(!in_array(1, $admin->get_groups_id())) {
+//	$admin_groups[] = implode(",",$admin->get_groups_id());
+//}
+$admin_groups = preg_replace("/[^\d,]/", "", implode(',', $admin_groups));
+// Setup viewing groups
+$viewing_groups[] = 1;
+//if(!in_array(1, $admin->get_groups_id())) {
+//	$viewing_groups[] = implode(",",$admin->get_groups_id());
+//}
+$viewing_groups = preg_replace("/[^\d,]/", "", implode(',', $viewing_groups));
+
+// If needed, get new order
+if($parent != $old_parent)
+{
+	// Include ordering class
+	require(WB_PATH.'/framework/class.order.php');
+	$order = new order(TABLE_PREFIX.'pages', 'position', 'page_id', 'parent');
+	// Get new order
+	$position = $order->get_new($parent);
+	// Clean new order
+	$order->clean($parent);
+} else {
+	$position = $old_position;
+}
+
+// Work out level and root parent
+if ($parent!='0')
+{
+	$level = level_count($parent)+1;
+	$root_parent = root_parent($parent);
+}
+else {
+	$level = '0';
+	$root_parent = '0';
+}
+
+// Work-out what the link should be
+if($parent == '0')
+{
+	$link = '/'.page_filename($menu_title);
+	// rename menu titles: index && intro to prevent clashes with intro page feature and WB core file /pages/index.php
+	if($link == '/index' || $link == '/intro')
+    {
+		$link .= '_' .$page_id;
+		$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).'_'.$page_id .PAGE_EXTENSION;
+	} else {
+		$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).PAGE_EXTENSION;
+	}
+} else {
+	$parent_section = '';
+	$parent_titles = array_reverse(get_parent_titles($parent));
+	foreach($parent_titles AS $parent_title)
+    {
+		$parent_section .= page_filename($parent_title).'/';
+	}
+	if($parent_section == '/')
+    {
+      $parent_section = '';
+    }
+	$link = '/'.$parent_section.page_filename($menu_title);
+	$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($menu_title).PAGE_EXTENSION;
+}
+
+// Check if a page with same page filename exists
+// $database = new database();
+$sql = 'SELECT `page_id`,`page_title` FROM `'.TABLE_PREFIX.'pages` WHERE `link` = "'.$link.'" AND `page_id` != '.$page_id;
+$get_same_page = $database->query($sql);
+
+if($get_same_page->numRows() > 0)
+{
+	$admin->print_error($MESSAGE['PAGES']['PAGE_EXISTS']);
+}
+
+// Update page with new order
+$sql = 'UPDATE `'.TABLE_PREFIX.'pages` SET `parent`='.$parent.', `position`='.$position.' WHERE `page_id`='.$page_id.'';
+// $database = new database();
+$database->query($sql);
+
+// Get page trail
+$page_trail = get_page_trail($page_id);
+
+// Update page settings in the pages table
+$sql  = 'UPDATE `'.TABLE_PREFIX.'pages` SET ';
+$sql .= '`parent` = '.$parent.', ';
+$sql .= '`page_title` = "'.$page_title.'", ';
+$sql .= '`menu_title` = "'.$menu_title.'", ';
+$sql .= '`menu` = '.$menu.', ';
+$sql .= '`level` = '.$level.', ';
+$sql .= '`page_trail` = "'.$page_trail.'", ';
+$sql .= '`root_parent` = '.$root_parent.', ';
+$sql .= '`link` = "'.$link.'", ';
+$sql .= '`template` = "'.$template.'", ';
+$sql .= '`target` = "'.$target.'", ';
+$sql .= '`description` = "'.$description.'", ';
+$sql .= '`keywords` = "'.$keywords.'", ';
+$sql .= '`position` = '.$position.', ';
+$sql .= '`visibility` = "'.$visibility.'", ';
+$sql .= '`searching` = '.$searching.', ';
+$sql .= '`language` = "'.$language.'", ';
+$sql .= '`admin_groups` = "'.$admin_groups.'", ';
+$sql .= '`viewing_groups` = "'.$viewing_groups.'"';
+$sql .= (defined('PAGE_LANGUAGES') && PAGE_LANGUAGES) && $field_set && (file_exists(WB_PATH.'/modules/mod_multilingual/update_keys.php')) ? ', `page_code` = '.(int)$page_code.' ' : ' ';
+$sql .= 'WHERE `page_id` = '.$page_id;
+$database->query($sql);
+
+$target_url = ADMIN_URL.'/pages/settings.php?page_id='.$page_id;
+if($database->is_error())
+{
+	$admin->print_error($database->get_error(), $target_url );
+}
+// Clean old order if needed
+if($parent != $old_parent)
+{
+	$order->clean($old_parent);
+}
+
+/* BEGIN page "access file" code */
+
+// Create a new file in the /pages dir if title changed
+if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/'))
+{
+	$admin->print_error($MESSAGE['PAGES']['CANNOT_CREATE_ACCESS_FILE']);
+} else {
+    $old_filename = WB_PATH.PAGES_DIRECTORY.$old_link.PAGE_EXTENSION;
+	// First check if we need to create a new file
+	if(($old_link != $link) || (!file_exists($old_filename)))
+    {
+		// Delete old file
+		$old_filename = WB_PATH.PAGES_DIRECTORY.$old_link.PAGE_EXTENSION;
+		if(file_exists($old_filename))
+        {
+			unlink($old_filename);
+		}
+		// Create access file
+		create_access_file($filename,$page_id,$level);
+		// Move a directory for this page
+		if(file_exists(WB_PATH.PAGES_DIRECTORY.$old_link.'/') && is_dir(WB_PATH.PAGES_DIRECTORY.$old_link.'/'))
+        {
+			rename(WB_PATH.PAGES_DIRECTORY.$old_link.'/', WB_PATH.PAGES_DIRECTORY.$link.'/');
+		}
+		// Update any pages that had the old link with the new one
+		$old_link_len = strlen($old_link);
+        $sql = '';
+		$query_subs = $database->query("SELECT page_id,link,level FROM ".TABLE_PREFIX."pages WHERE link LIKE '%$old_link/%' ORDER BY LEVEL ASC");
+
+		if($query_subs->numRows() > 0)
+        {
+			while($sub = $query_subs->fetchRow())
+            {
+				// Double-check to see if it contains old link
+				if(substr($sub['link'], 0, $old_link_len) == $old_link)
+                {
+					// Get new link
+					$replace_this = $old_link;
+					$old_sub_link_len =strlen($sub['link']);
+					$new_sub_link = $link.'/'.substr($sub['link'],$old_link_len+1,$old_sub_link_len);
+					// Work out level
+					$new_sub_level = level_count($sub['page_id']);
+					// Update level and link
+					$database->query("UPDATE ".TABLE_PREFIX."pages SET link = '$new_sub_link', level = '$new_sub_level' WHERE page_id = '".$sub['page_id']."' LIMIT 1");
+					// Re-write the access file for this page
+					$old_subpage_file = WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION;
+					if(file_exists($old_subpage_file))
+                    {
+						unlink($old_subpage_file);
+					}
+					create_access_file(WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION, $sub['page_id'], $new_sub_level);
+				}
+			}
+		}
+	}
+}
+
+// Function to fix page trail of subs
+function fix_page_trail($parent,$root_parent)
+{
+	// Get objects and vars from outside this function
+	global $admin, $template, $database, $TEXT, $MESSAGE;
+	// Get page list from database
+	// $database = new database();
+	$query = "SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent'";
+	$get_pages = $database->query($query);
+	// Insert values into main page list
+	if($get_pages->numRows() > 0)
+    {
+		while($page = $get_pages->fetchRow())
+        {
+			// Fix page trail
+
+			$database->query("UPDATE ".TABLE_PREFIX."pages SET ".($root_parent != 0 ?"root_parent = '$root_parent', ":"")." page_trail = '".get_page_trail($page['page_id'])."' WHERE page_id = '".$page['page_id']."'");
+			// Run this query on subs
+			fix_page_trail($page['page_id'],$root_parent);
+		}
+	}
+}
+
+// Fix sub-pages page trail
+fix_page_trail($page_id,$root_parent);
+
+/* END page "access file" code */
+
+//$pagetree_url = ADMIN_URL.'/pages/index.php';
+//$target_url = ADMIN_URL.'/pages/settings.php?page_id='.$page_id;
+// Check if there is a db error, otherwise say successful
+if($database->is_error())
+{
+	$admin->print_error($database->get_error(), $target_url );
+} else {
+	$admin->print_success($MESSAGE['PAGES']['SAVED_SETTINGS'], $target_url );
+}
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/pages/settings2.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/add.php
===================================================================
--- tags/2.8.3/wb/admin/pages/add.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/add.php	(revision 1610)
@@ -0,0 +1,245 @@
+checkFTAN())
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Get values
+$title = $admin->get_post_escaped('title');
+$title = htmlspecialchars($title);
+$module = preg_replace('/[^a-z0-9_-]/i', "", $admin->get_post('type')); // fix secunia 2010-93-4
+$parent = intval($admin->get_post('parent')); // fix secunia 2010-91-2
+$visibility = $admin->get_post('visibility');
+if (!in_array($visibility, array('public', 'private', 'registered', 'hidden', 'none'))) {$visibility = 'public';} // fix secunia 2010-91-2
+$admin_groups = $admin->get_post('admin_groups');
+$viewing_groups = $admin->get_post('viewing_groups');
+
+// Work-out if we should check for existing page_code
+$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code');
+
+// add Admin to admin and viewing-groups
+$admin_groups[] = 1;
+$viewing_groups[] = 1;
+
+// After check print the header
+$admin->print_header();
+// check parent page permissions:
+if ($parent!=0) {
+	if (!$admin->get_page_permission($parent,'admin'))
+    {
+        $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+    }
+
+} elseif (!$admin->get_permission('pages_add_l0','system'))
+{
+	$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+}	
+
+// check module permissions:
+if (!$admin->get_permission($module, 'module'))
+{
+	$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+}	
+
+// Validate data
+if($title == '' || substr($title,0,1)=='.')
+{
+	$admin->print_error($MESSAGE['PAGES']['BLANK_PAGE_TITLE']);
+}
+
+// Check to see if page created has needed permissions
+if(!in_array(1, $admin->get_groups_id()))
+{
+	$admin_perm_ok = false;
+	foreach ($admin_groups as $adm_group)
+    {
+		if (in_array($adm_group, $admin->get_groups_id()))
+        {
+			$admin_perm_ok = true;
+		} 
+	}
+	if ($admin_perm_ok == false)
+    {
+		$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+	}
+	$admin_perm_ok = false;
+	foreach ($viewing_groups as $view_group)
+    {
+		if (in_array($view_group, $admin->get_groups_id()))
+        {
+			$admin_perm_ok = true;
+		}
+	}
+	if ($admin_perm_ok == false)
+    {
+		$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+	}
+}
+
+$admin_groups = implode(',', $admin_groups);
+$viewing_groups = implode(',', $viewing_groups);
+
+// Work-out what the link and page filename should be
+if($parent == '0')
+{
+	$link = '/'.page_filename($title);
+	// rename menu titles: index && intro to prevent clashes with intro page feature and WB core file /pages/index.php
+	if($link == '/index' || $link == '/intro')
+    {
+		$link .= '_0';
+		$filename = WB_PATH .PAGES_DIRECTORY .'/' .page_filename($title) .'_0' .PAGE_EXTENSION;
+	} else {
+		$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($title).PAGE_EXTENSION;
+	}
+} else {
+	$parent_section = '';
+	$parent_titles = array_reverse(get_parent_titles($parent));
+	foreach($parent_titles AS $parent_title)
+    {
+		$parent_section .= page_filename($parent_title).'/';
+	}
+	if($parent_section == '/') { $parent_section = ''; }
+	$link = '/'.$parent_section.page_filename($title);
+	$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($title).PAGE_EXTENSION;
+	make_dir(WB_PATH.PAGES_DIRECTORY.'/'.$parent_section);
+}
+
+// Check if a page with same page filename exists
+$get_same_page = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE link = '$link'");
+if($get_same_page->numRows() > 0 OR file_exists(WB_PATH.PAGES_DIRECTORY.$link.PAGE_EXTENSION) OR file_exists(WB_PATH.PAGES_DIRECTORY.$link.'/'))
+{
+	$admin->print_error($MESSAGE['PAGES']['PAGE_EXISTS']);
+}
+
+// Include the ordering class
+require(WB_PATH.'/framework/class.order.php');
+$order = new order(TABLE_PREFIX.'pages', 'position', 'page_id', 'parent');
+// First clean order
+$order->clean($parent);
+// Get new order
+$position = $order->get_new($parent);
+
+// Work-out if the page parent (if selected) has a seperate template or language to the default
+$query_parent = $database->query("SELECT template, language FROM ".TABLE_PREFIX."pages WHERE page_id = '$parent'");
+if($query_parent->numRows() > 0)
+{
+	$fetch_parent = $query_parent->fetchRow();
+	$template = $fetch_parent['template'];
+	$language = $fetch_parent['language'];
+} else {
+	$template = '';
+	$language = DEFAULT_LANGUAGE;
+}
+
+// Insert page into pages table
+$sql  = 'INSERT INTO `'.TABLE_PREFIX.'pages` SET ';
+$sql .= '`parent` = '.$parent.', ';
+$sql .= '`target` = "_top", ';
+$sql .= '`page_title` = "'.$title.'", ';
+$sql .= '`menu_title` = "'.$title.'", ';
+$sql .= '`template` = "'.$template.'", ';
+$sql .= '`visibility` = "'.$visibility.'", ';
+$sql .= '`position` = '.$position.', ';
+$sql .= '`menu` = 1, ';
+$sql .= '`language` = "'.$language.'", ';
+$sql .= '`searching` = 1, ';
+$sql .= '`modified_when` = '.time().', ';
+$sql .= '`modified_by` = '.$admin->get_user_id().', ';
+$sql .= '`admin_groups` = "'.$admin_groups.'", ';
+$sql .= '`viewing_groups` = "'.$viewing_groups.'"';
+
+$database->query($sql);
+/*
+$query = "INSERT INTO ".TABLE_PREFIX."pages
+(page_title,menu_title,parent,template,target,position,visibility,searching,menu,language,admin_groups,viewing_groups,modified_when,modified_by) VALUES
+('$title','$title','$parent','$template','_top','$position','$visibility','1','1','$language','$admin_groups','$viewing_groups','".time()."','".$admin->get_user_id()."')";
+$database->query($query);
+*/
+if($database->is_error())
+{
+	$admin->print_error($database->get_error());
+}
+
+// Get the page id
+$page_id = $database->get_one("SELECT LAST_INSERT_ID()");
+
+// Work out level
+$level = level_count($page_id);
+// Work out root parent
+$root_parent = root_parent($page_id);
+// Work out page trail
+$page_trail = get_page_trail($page_id);
+
+// Update page with new level and link
+$sql  = 'UPDATE `'.TABLE_PREFIX.'pages` SET ';
+$sql .= '`root_parent` = '.$root_parent.', ';
+$sql .= '`level` = '.$level.', ';
+$sql .= '`link` = "'.$link.'", ';
+$sql .= '`page_trail` = "'.$page_trail.'"';
+$sql .= (defined('PAGE_LANGUAGES') && PAGE_LANGUAGES)
+         && $field_set
+         && ($language == DEFAULT_LANGUAGE)
+         && (file_exists(WB_PATH.'/modules/mod_multilingual/update_keys.php')
+         )
+         ? ', `page_code` = '.(int)$page_id.' ' : ' ';
+$sql .= 'WHERE `page_id` = '.$page_id;
+$database->query($sql);
+/*
+$database->query("UPDATE ".TABLE_PREFIX."pages SET link = '$link', level = '$level', root_parent = '$root_parent', page_trail = '$page_trail' WHERE page_id = '$page_id'");
+*/
+if($database->is_error())
+{
+	$admin->print_error($database->get_error());
+}
+// Create a new file in the /pages dir
+create_access_file($filename, $page_id, $level);
+
+// add position 1 to new page
+$position = 1;
+
+// Add new record into the sections table
+$database->query("INSERT INTO ".TABLE_PREFIX."sections (page_id,position,module,block) VALUES ('$page_id','$position', '$module','1')");
+
+// Get the section id
+$section_id = $database->get_one("SELECT LAST_INSERT_ID()");
+
+// Include the selected modules add file if it exists
+if(file_exists(WB_PATH.'/modules/'.$module.'/add.php')) {
+	require(WB_PATH.'/modules/'.$module.'/add.php');
+}
+
+// Check if there is a db error, otherwise say successful
+if($database->is_error()) {
+	$admin->print_error($database->get_error());
+} else {
+	$admin->print_success($MESSAGE['PAGES']['ADDED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+}
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/pages/add.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/sections_save.php
===================================================================
--- tags/2.8.3/wb/admin/pages/sections_save.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/sections_save.php	(revision 1610)
@@ -0,0 +1,135 @@
+checkFTAN())
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],ADMIN_URL.'/pages/sections.php?page_id='.$page_id);
+}
+// After check print the header
+$admin->print_header();
+/*
+if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+	exit();
+}
+*/
+// Get perms
+// $database = new database();
+$results = $database->query("SELECT admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'");
+$results_array = $results->fetchRow();
+$old_admin_groups = explode(',', $results_array['admin_groups']);
+$old_admin_users = explode(',', $results_array['admin_users']);
+$in_old_group = FALSE;
+foreach($admin->get_groups_id() as $cur_gid){
+    if (in_array($cur_gid, $old_admin_groups)) {
+        $in_old_group = TRUE;
+    }
+}
+if((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) {
+	$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+}
+
+// Get page details
+// $database = new database();
+$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'";
+$results = $database->query($query);
+if($database->is_error()) {
+	$admin->print_header();
+	$admin->print_error($database->get_error());
+}
+if($results->numRows() == 0) {
+	$admin->print_header();
+	$admin->print_error($MESSAGE['PAGES']['NOT_FOUND']);
+}
+$results_array = $results->fetchRow();
+
+// Set module permissions
+$module_permissions = $_SESSION['MODULE_PERMISSIONS'];
+
+// Loop through sections
+$query_sections = $database->query("SELECT section_id,module,position FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' ORDER BY position ASC");
+if($query_sections->numRows() > 0) {
+	$num_sections = $query_sections->numRows();
+	while($section = $query_sections->fetchRow()) {
+		if(!is_numeric(array_search($section['module'], $module_permissions))) {
+			// Update the section record with properties
+			$section_id = $section['section_id'];
+			$sql = ''; $publ_start = 0; $publ_end = 0;
+			$dst = date("I")?" DST":""; // daylight saving time?
+			if(isset($_POST['block'.$section_id]) && $_POST['block'.$section_id] != '') {
+				$sql = "block = '".$admin->add_slashes($_POST['block'.$section_id])."'";
+			}
+			// update publ_start and publ_end, trying to make use of the strtotime()-features like "next week", "+1 month", ...
+			if(isset($_POST['start_date'.$section_id]) && isset($_POST['end_date'.$section_id])) {
+				if(trim($_POST['start_date'.$section_id]) == '0' || trim($_POST['start_date'.$section_id]) == '') {
+					$publ_start = 0;
+				} else {
+					$publ_start = jscalendar_to_timestamp($_POST['start_date'.$section_id]);
+				}
+				if(trim($_POST['end_date'.$section_id]) == '0' || trim($_POST['end_date'.$section_id]) == '') {
+					$publ_end = 0;
+				} else {
+					$publ_end = jscalendar_to_timestamp($_POST['end_date'.$section_id], $publ_start);
+				}
+				if($sql != '')
+					$sql .= ",";
+				$sql .= " publ_start = '".$admin->add_slashes($publ_start)."'";
+				$sql .= ", publ_end = '".$admin->add_slashes($publ_end)."'";
+			}
+			$query = "UPDATE ".TABLE_PREFIX."sections SET $sql WHERE section_id = '$section_id' LIMIT 1";
+			if($sql != '') {
+				$database->query($query);
+			}
+		}
+	}
+}
+// Check for error or print success message
+if($database->is_error()) {
+	$admin->print_error($database->get_error(), ADMIN_URL.'/pages/sections.php?page_id='.$page_id );
+} else {
+	$admin->print_success($MESSAGE['PAGES']['SECTIONS_PROPERTIES_SAVED'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id );
+}
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/pages/sections_save.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/page_calendar.js
===================================================================
--- tags/2.8.3/wb/admin/pages/page_calendar.js	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/page_calendar.js	(revision 1610)
@@ -0,0 +1,26 @@
+Calendar.setup(
+	{
+	inputField  : start_date,
+	ifFormat    : jscal_ifformat,
+	button      : trigger_start,
+	firstDay    : jscal_firstday,
+	showsTime   : showsTime,
+	timeFormat  : timeFormat,
+	date        : jscal_today,
+	range       : [1970, 2037],
+	step        : 1
+	}
+);
+Calendar.setup(
+	{
+	inputField  : end_date,
+	ifFormat    : jscal_ifformat,
+	button      : trigger_end,
+	firstDay    : jscal_firstday,
+	showsTime   : showsTime,
+	timeFormat  : timeFormat,
+	date        : jscal_today,
+	range       : [1970, 2037],
+	step        : 1
+	}
+);
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/pages/page_calendar.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/move_down.php
===================================================================
--- tags/2.8.3/wb/admin/pages/move_down.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/move_down.php	(revision 1610)
@@ -0,0 +1,66 @@
+move_down($id)) {
+		$admin->print_success($MESSAGE['PAGES']['REORDERED']);
+	} else {
+		$admin->print_error($MESSAGE['PAGES']['CANNOT_REORDER']);
+	}
+} else {
+	if($order->move_down($id)) {
+		$admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id);
+	} else {
+		$admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id);
+	}
+}
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/pages/move_down.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/save.php
===================================================================
--- tags/2.8.3/wb/admin/pages/save.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/save.php	(revision 1610)
@@ -0,0 +1,125 @@
+checkFTAN())
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back );
+}
+// After check print the header
+$admin->print_header();
+
+/*
+if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+
+if( (!($section_id= $admin->checkIDKEY('section_id', 0, $_SERVER['REQUEST_METHOD']))) )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+*/
+
+// Get perms
+$sql  = 'SELECT `admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` ';
+$sql .= 'WHERE `page_id` = '.$page_id;
+$results = $database->query($sql);
+$results_array = $results->fetchRow();
+$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups']));
+$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users']));
+$in_old_group = FALSE;
+foreach($admin->get_groups_id() as $cur_gid)
+{
+    if (in_array($cur_gid, $old_admin_groups))
+    {
+        $in_old_group = TRUE;
+    }
+}
+if((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users)))
+{
+	$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+}
+// Get page module
+$sql  = 'SELECT `module` FROM `'.TABLE_PREFIX.'sections` ';
+$sql .= 'WHERE `page_id`='.$page_id.' AND `section_id`='.$section_id;
+$module = $database->get_one($sql);
+if(!$module)
+{
+	$admin->print_error( $database->is_error() ? $database->get_error() : $MESSAGE['PAGES']['NOT_FOUND']);
+}
+//$results = $database->query($sql);
+//if($database->is_error()) {
+//	$admin->print_error($database->get_error());
+//}
+//if($results->numRows() == 0) {
+//	$admin->print_error($MESSAGE['PAGES']['NOT_FOUND']);
+//}
+//$results_array = $results->fetchRow();
+//$module = $results_array['module'];
+
+// Update the pages table
+$now = time();
+$sql  = 'UPDATE `'.TABLE_PREFIX.'pages` SET ';
+$sql .= '`modified_when` = '.$now.', `modified_by` = '.$admin->get_user_id().' ';
+$sql .= 'WHERE `page_id` = '.$page_id;
+$database->query($sql);
+
+// Include the modules saving script if it exists
+if(file_exists(WB_PATH.'/modules/'.$module.'/save.php'))
+{
+	include_once(WB_PATH.'/modules/'.$module.'/save.php');
+}
+// Check if there is a db error, otherwise say successful
+if($database->is_error())
+{
+	$admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$results_array['page_id'] );
+} else {
+	$admin->print_success($MESSAGE['PAGES']['SAVED'], ADMIN_URL.'/pages/modify.php?page_id='.$results_array['page_id'] );
+}
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/pages/save.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/empty_trash.php
===================================================================
--- tags/2.8.3/wb/admin/pages/empty_trash.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/empty_trash.php	(revision 1610)
@@ -0,0 +1,54 @@
+query($query);
+
+// Insert values into main page list
+if($get_pages->numRows() > 0)	{
+	while($page = $get_pages->fetchRow()) {
+		// Delete page subs
+		$sub_pages = get_subs($page['page_id'], array());
+		foreach($sub_pages AS $sub_page_id) {
+			delete_page($sub_page_id);
+		}	
+		// Delete page
+		delete_page($page['page_id']);
+	}
+}
+
+// Check if there is a db error, otherwise say successful
+if($database->is_error()) {
+	$admin->print_error($database->get_error());
+} else {
+	$admin->print_success($TEXT['TRASH_EMPTIED']);
+}
+
+// Print admin 
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/pages/empty_trash.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/delete.php
===================================================================
--- tags/2.8.3/wb/admin/pages/delete.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/delete.php	(revision 1610)
@@ -0,0 +1,109 @@
+checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+	exit();
+}
+
+/* 
+// Get page id
+if(!isset($_GET['page_id']) || !is_numeric($_GET['page_id'])) {
+	header("Location: index.php");
+	exit(0);
+} else {
+	$page_id = $_GET['page_id'];
+}
+*/
+// Get perms
+if (!$admin->get_page_permission($page_id,'admin')) {
+	$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+}
+
+// Find out more about the page
+$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'";
+$results = $database->query($query);
+if($database->is_error()) {
+	$admin->print_error($database->get_error());
+}
+if($results->numRows() == 0) {
+	$admin->print_error($MESSAGE['PAGES']['NOT_FOUND']);
+}
+
+$results_array = $results->fetchRow();
+
+$visibility = $results_array['visibility'];
+
+// Check if we should delete it or just set the visibility to 'deleted'
+if(PAGE_TRASH != 'disabled' AND $visibility != 'deleted') {
+	// Page trash is enabled and page has not yet been deleted
+	// Function to change all child pages visibility to deleted
+	function trash_subs($parent = 0) {
+		global $database;
+		// Query pages
+		$query_menu = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' ORDER BY position ASC");
+		// Check if there are any pages to show
+		if($query_menu->numRows() > 0) {
+			// Loop through pages
+			while($page = $query_menu->fetchRow()) {
+				// Update the page visibility to 'deleted'
+				$database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'deleted' WHERE page_id = '".$page['page_id']."' LIMIT 1");
+				// Run this function again for all sub-pages
+				trash_subs($page['page_id']);
+			}
+		}
+	}
+	
+	// Update the page visibility to 'deleted'
+	$database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'deleted' WHERE page_id = '$page_id.' LIMIT 1");
+	
+	// Run trash subs for this page
+	trash_subs($page_id);
+} else {
+	// Really dump the page
+	// Delete page subs
+	$sub_pages = get_subs($page_id, array());
+	foreach($sub_pages AS $sub_page_id) {
+		delete_page($sub_page_id);
+	}
+	// Delete page
+	delete_page($page_id);
+}	
+
+// Check if there is a db error, otherwise say successful
+if($database->is_error()) {
+	$admin->print_error($database->get_error());
+} else {
+	$admin->print_success($MESSAGE['PAGES']['DELETED']);
+}
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/pages/delete.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/page_trash.js
===================================================================
--- tags/2.8.3/wb/admin/pages/page_trash.js	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/page_trash.js	(revision 1610)
@@ -0,0 +1,32 @@
+function toggle_viewers() {
+	if(document.add.visibility.value == 'private') {
+		document.getElementById('private_viewers').style.display = 'block';
+		document.getElementById('registered_viewers').style.display = 'none';
+	} else if(document.add.visibility.value == 'registered') {
+		document.getElementById('private_viewers').style.display = 'none';
+		document.getElementById('registered_viewers').style.display = 'block';
+	} else {
+		document.getElementById('private_viewers').style.display = 'none';
+		document.getElementById('registered_viewers').style.display = 'none';
+	}
+}
+
+function toggle_visibility(id){
+	if(document.getElementById(id).style.display == "block") {
+		document.getElementById(id).style.display = "none";
+	} else {
+		document.getElementById(id).style.display = "block";
+	}
+}
+var plus = new Image;
+plus.src = "/images/plus_16.png";
+var minus = new Image;
+minus.src = "/images/minus_16.png";
+function toggle_plus_minus(id) {
+	var img_src = document.images['plus_minus_' + id].src;
+	if(img_src == plus.src) {
+		document.images['plus_minus_' + id].src = minus.src;
+	} else {
+		document.images['plus_minus_' + id].src = plus.src;
+	}
+}
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/pages/page_trash.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/move_up.php
===================================================================
--- tags/2.8.3/wb/admin/pages/move_up.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/move_up.php	(revision 1610)
@@ -0,0 +1,66 @@
+move_up($id)) {
+		$admin->print_success($MESSAGE['PAGES']['REORDERED']);
+	} else {
+		$admin->print_error($MESSAGE['PAGES']['CANNOT_REORDER']);
+	}
+} else {
+	if($order->move_up($id)) {
+		$admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id);
+	} else {
+		$admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id);
+	}
+}
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/pages/move_up.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/trash.php
===================================================================
--- tags/2.8.3/wb/admin/pages/trash.php	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/trash.php	(revision 1610)
@@ -0,0 +1,282 @@
+
+
+
+
+	
      >
+	query($query);
+	
+	// Insert values into main page list
+	if($get_pages->numRows() > 0)	{
+		while($page = $get_pages->fetchRow()) {
+			// Get user perms
+			$admin_groups = explode(',', str_replace('_', '', $page['admin_groups']));
+			$admin_users = explode(',', str_replace('_', '', $page['admin_users']));
+			$in_old_group = FALSE;
+			foreach($admin->get_groups_id() as $cur_gid){
+			    if (in_array($cur_gid, $old_admin_groups)) {
+				$in_old_group = TRUE;
+			    }
+			}
+			if((!$in_old_group) OR is_numeric(array_search($admin->get_user_id(), $admin_users))) {
+				if($page['visibility'] == 'deleted') {
+					$can_modify = true;
+					$editable_pages = $editable_pages+1;
+				} else {
+					$can_modify = false;
+				}
+			} else {
+				$can_modify = false;
+			}
+						
+			// Work out if we should show a plus or not
+			$get_page_subs = $database->query("SELECT page_id,admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE parent = '".$page['page_id']."'");
+			if($get_page_subs->numRows() > 0) {
+				$display_plus = true;
+			} else {
+				$display_plus = false;
+			}
+			
+			// Work out how many pages there are for this parent
+			$num_pages = $get_pages->numRows();
+			?>
+			
+			
    • 
+			
+			
+				
+				get_permission('pages_modify') == true AND $can_modify == true AND $page['visibility'] != 'heading') { ?>
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+			
+			
      
+					
+					
+						+
+					
+					
+				
+					
+				
+					'.($page['page_title']).'';
+					}
+					?>
+				
+					
+				
+				
+					<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PUBLIC']; ?>
+				
+					<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PRIVATE']; ?>
+				
+					<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['REGISTERED']; ?>
+				
+					<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['NONE']; ?>
+				
+					<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['DELETED']; ?>
+				
+				
+					
+						get_permission('pages_settings') == true AND $can_modify == true) { ?>
+						
+							<?php echo $TEXT['SETTINGS']; ?>
+						
+						
+					
+						
+							<?php echo $TEXT['RESTORE']; ?>
+						
+					
+				
+				
+					
+						get_permission('pages_settings') == true AND $can_modify == true) { ?>
+						
+							^
+						
+						
+					
+				
+				
+				
+					
+						get_permission('pages_settings') == true AND $can_modify == true) { ?>
+						
+							v
+						
+						
+					
+				
+				
+					get_permission('pages_delete') == true AND $can_modify == true) { ?>
+					
+						X
+					
+					
+				
      
+			
      • 
+							
+			
+	
    
+	get_permission('pages_view') == true) {
+	?>
+	
+	
+		
+		
+	
+	
    
+			
    
+		    		
+				
+				<?php echo $TEXT['PAGE_TRASH']; ?>
+				
+		
    
+	
    
+	
+	
+		
+		
+		
+		
+				
+	
+	
    
+			 
+		
+			:
+		
+			:
+		
+			:
+		
+			:
+		
    
+	
+	
    
+	
    
+		
+	
    
+	
+	
+	
+	
+	
+
    < 
+print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/pages/trash.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/page_settings.js
===================================================================
--- tags/2.8.3/wb/admin/pages/page_settings.js	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/page_settings.js	(revision 1610)
@@ -0,0 +1,26 @@
+function toggle_viewers() {
+	if(document.settings.visibility.value == 'private' || document.settings.visibility.value == 'registered') {
+		document.getElementById('allowed_viewers').style.display = 'block';
+	} else {
+		document.getElementById('allowed_viewers').style.display = 'none';
+	}
+}
+var lastselectedindex = new Array();
+
+function disabled_hack_for_ie(sel) {
+	var sels = document.getElementsByTagName("select");
+	var i;
+	var sel_num_in_doc = 0;
+	for (i = 0; i query("SELECT admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'");
+$results_array = $results->fetchRow();
+
+// Find out more about the page
+$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'";
+$results = $database->query($query);
+if($database->is_error()) {
+	$admin->print_error($database->get_error());
+}
+if($results->numRows() == 0) {
+	$admin->print_error($MESSAGE['PAGES']['NOT_FOUND']);
+}
+$results_array = $results->fetchRow();
+$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups']));
+$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users']));
+
+$in_old_group = FALSE;
+foreach($admin->get_groups_id() as $cur_gid){
+    if (in_array($cur_gid, $old_admin_groups)) {
+	$in_old_group = TRUE;
+    }
+}
+if((!$in_old_group) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) {
+	$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
+}
+
+$visibility = $results_array['visibility'];
+
+if(PAGE_TRASH) {
+	if($visibility == 'deleted') {	
+		// Function to change all child pages visibility to deleted
+		function restore_subs($parent = 0) {
+			global $database;
+			// Query pages
+			$query_menu = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' ORDER BY position ASC");
+			// Check if there are any pages to show
+			if($query_menu->numRows() > 0) {
+				// Loop through pages
+				while($page = $query_menu->fetchRow()) {
+					// Update the page visibility to 'deleted'
+					$database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'public' WHERE page_id = '".$page['page_id']."' LIMIT 1");
+					// Run this function again for all sub-pages
+					restore_subs($page['page_id']);
+				}
+			}
+		}
+		
+		// Update the page visibility to 'deleted'
+		$database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'public' WHERE page_id = '$page_id.' LIMIT 1");
+		
+		// Run trash subs for this page
+		restore_subs($page_id);
+		
+	}
+}
+
+// Check if there is a db error, otherwise say successful
+if($database->is_error()) {
+	$admin->print_error($database->get_error());
+} else {
+	$admin->print_success($MESSAGE['PAGES']['RESTORED']);
+}
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/pages/restore.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/eggsurplus.js
===================================================================
--- tags/2.8.3/wb/admin/pages/eggsurplus.js	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/eggsurplus.js	(revision 1610)
@@ -0,0 +1,15 @@
+	function add_child_page(page_id)
+    {
+		//find and select the page in the parent dropdown
+		var selectBox = document.add.parent;
+		for (var i = 0; i < selectBox.options.length; i++)
+		{
+			  if (selectBox.options[i].value == page_id)
+			  {
+					selectBox.selectedIndex = i;
+					break;
+			  }
+		}
+		//set focus to add form
+		document.add.title.focus();
+	}

Property changes on: tags/2.8.3/wb/admin/pages/eggsurplus.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/pages/page_index.js
===================================================================
--- tags/2.8.3/wb/admin/pages/page_index.js	(nonexistent)
+++ tags/2.8.3/wb/admin/pages/page_index.js	(revision 1610)
@@ -0,0 +1,35 @@
+/*-- Addition for remembering expanded state of pages --*/
+function writeSessionCookie (cookieName, cookieValue) {
+	document.cookie = escape(cookieName) + "=" + escape(cookieValue) + ";";
+}
+
+function toggle_viewers() {
+	if(document.add.visibility.value == 'private') {
+		document.getElementById('viewers').style.display = 'block';
+	} else if(document.add.visibility.value == 'registered') {
+		document.getElementById('viewers').style.display = 'block';
+	} else {
+		document.getElementById('viewers').style.display = 'none';
+	}
+}
+function toggle_visibility(id){
+	if(document.getElementById(id).style.display == "block") {
+		document.getElementById(id).style.display = "none";
+		writeSessionCookie (id, "0");//Addition for remembering expanded state of pages
+	} else {
+		document.getElementById(id).style.display = "block";
+		writeSessionCookie (id, "1");//Addition for remembering expanded state of pages
+	}
+}
+var plus = new Image;
+plus.src = THEME_URL+"/images/plus_16.png";
+var minus = new Image;
+minus.src = THEME_URL+"/images/minus_16.png";
+function toggle_plus_minus(id) {
+	var img_src = document.images['plus_minus_' + id].src;
+	if(img_src == plus.src) {
+		document.images['plus_minus_' + id].src = minus.src;
+	} else {
+		document.images['plus_minus_' + id].src = plus.src;
+	}
+}
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/pages/page_index.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/groups/get_permissions.php
===================================================================
--- tags/2.8.3/wb/admin/groups/get_permissions.php	(nonexistent)
+++ tags/2.8.3/wb/admin/groups/get_permissions.php	(revision 1610)
@@ -0,0 +1,248 @@
+get_post('advanced') != 'yes') {
+	$system_permissions['pages'] = $admin->get_post('pages');
+		$system_permissions['pages_view'] = $system_permissions['pages'];
+		$system_permissions['pages_add'] = $system_permissions['pages'];
+		$system_permissions['pages_add_l0'] = $system_permissions['pages'];
+		$system_permissions['pages_settings'] = $system_permissions['pages'];
+		$system_permissions['pages_modify'] = $system_permissions['pages'];
+		$system_permissions['pages_intro'] = $system_permissions['pages'];
+		$system_permissions['pages_delete'] = $system_permissions['pages'];
+	$system_permissions['media'] = $admin->get_post('media');
+		$system_permissions['media_view'] = $system_permissions['media'];
+		$system_permissions['media_upload'] = $system_permissions['media'];
+		$system_permissions['media_rename'] = $system_permissions['media'];
+		$system_permissions['media_delete'] = $system_permissions['media'];
+		$system_permissions['media_create'] = $system_permissions['media'];
+	if($admin->get_post('modules') != '' OR $admin->get_post('templates') != '' OR $admin->get_post('languages') != '') {
+		$system_permissions['addons'] = 1;
+	} else {
+		$system_permissions['addons'] = 0;
+	}
+		$system_permissions['modules'] = $admin->get_post('modules');
+			$system_permissions['modules_view'] = $system_permissions['modules'];
+			$system_permissions['modules_install'] = $system_permissions['modules'];
+			$system_permissions['modules_uninstall'] = $system_permissions['modules'];
+		$system_permissions['templates'] = $admin->get_post('templates');
+			$system_permissions['templates_view'] = $system_permissions['templates'];
+			$system_permissions['templates_install'] = $system_permissions['templates'];
+			$system_permissions['templates_uninstall'] = $system_permissions['templates'];
+		$system_permissions['languages'] = $admin->get_post('languages');
+			$system_permissions['languages_view'] = $system_permissions['languages'];
+			$system_permissions['languages_install'] = $system_permissions['languages'];
+			$system_permissions['languages_uninstall'] = $system_permissions['languages'];
+	$system_permissions['settings'] = $admin->get_post('settings');
+		$system_permissions['settings_basic'] = $system_permissions['settings'];
+		$system_permissions['settings_advanced'] = $system_permissions['settings'];
+	if($admin->get_post('users') != '' OR $admin->get_post('groups') != '') {
+		$system_permissions['access'] = 1;
+	} else {
+		$system_permissions['access'] = 0;
+	}
+	$system_permissions['users'] = $admin->get_post('users');
+	$system_permissions['users_view'] = $system_permissions['users'];
+	$system_permissions['users_add'] = $system_permissions['users'];
+	$system_permissions['users_modify'] = $system_permissions['users'];
+	$system_permissions['users_delete'] = $system_permissions['users'];
+	$system_permissions['groups'] = $admin->get_post('groups');
+	$system_permissions['groups_view'] = $system_permissions['groups'];
+	$system_permissions['groups_add'] = $system_permissions['groups'];
+	$system_permissions['groups_modify'] = $system_permissions['groups'];
+	$system_permissions['groups_delete'] = $system_permissions['groups'];
+	$system_permissions['admintools'] = $admin->get_post('admintools');
+	$system_permissions['admintools_settings'] = $system_permissions['admintools'];
+} else {
+	// Pages
+	$system_permissions['pages_view'] = $admin->get_post('pages_view');
+		$system_permissions['pages_add'] = $admin->get_post('pages_add');
+	if($admin->get_post('pages_add') != 1 AND $admin->get_post('pages_add_l0') == 1) {
+		$system_permissions['pages_add'] = $admin->get_post('pages_add_l0');
+	}
+	$system_permissions['pages_add_l0'] = $admin->get_post('pages_add_l0');
+	$system_permissions['pages_settings'] = $admin->get_post('pages_settings');
+	$system_permissions['pages_modify'] = $admin->get_post('pages_modify');
+	$system_permissions['pages_intro'] = $admin->get_post('pages_intro');
+	$system_permissions['pages_delete'] = $admin->get_post('pages_delete');
+	if($system_permissions['pages_view'] == 1 OR $system_permissions['pages_add'] == 1 OR $system_permissions['pages_settings'] == 1 OR $system_permissions['pages_modify'] == 1 OR $system_permissions['pages_intro'] == 1 OR $system_permissions['pages_delete'] == 1) {
+		$system_permissions['pages'] = 1;
+	} else {
+		$system_permissions['pages'] = '';
+	}
+	// Media
+	$system_permissions['media_view'] = $admin->get_post('media_view');
+	$system_permissions['media_upload'] = $admin->get_post('media_upload');
+	$system_permissions['media_rename'] = $admin->get_post('media_rename');
+	$system_permissions['media_delete'] = $admin->get_post('media_delete');
+	$system_permissions['media_create'] = $admin->get_post('media_create');
+	if($system_permissions['media_view'] == 1 OR $system_permissions['media_upload'] == 1 OR $system_permissions['media_rename'] == 1 OR $system_permissions['media_delete'] == 1 OR $system_permissions['media_create'] == 1) {
+		$system_permissions['media'] = 1;
+	} else {
+		$system_permissions['media'] = '';
+	}
+	// Add-ons
+		// Modules
+		$system_permissions['modules_view'] = $admin->get_post('modules_view');
+		$system_permissions['modules_install'] = $admin->get_post('modules_install');
+		$system_permissions['modules_uninstall'] = $admin->get_post('modules_uninstall');
+		if($system_permissions['modules_view'] == 1 OR $system_permissions['modules_install'] == 1 OR $system_permissions['modules_uninstall'] == 1) {
+			$system_permissions['modules'] = 1;
+		} else {
+			$system_permissions['modules'] = '';
+		}
+		// Templates
+		$system_permissions['templates_view'] = $admin->get_post('templates_view');
+		$system_permissions['templates_install'] = $admin->get_post('templates_install');
+		$system_permissions['templates_uninstall'] = $admin->get_post('templates_uninstall');
+		if($system_permissions['templates_view'] == 1 OR $system_permissions['templates_install'] == 1 OR $system_permissions['templates_uninstall'] == 1) {
+			$system_permissions['templates'] = 1;
+		} else {
+			$system_permissions['templates'] = '';
+		}
+		// Languages
+		$system_permissions['languages_view'] = $admin->get_post('languages_view');
+		$system_permissions['languages_install'] = $admin->get_post('languages_install');
+		$system_permissions['languages_uninstall'] = $admin->get_post('languages_uninstall');
+		if($system_permissions['languages_install'] == 1 OR $system_permissions['languages_uninstall'] == 1) {
+			$system_permissions['languages'] = 1;
+		} else {
+			$system_permissions['languages'] = '';
+		}
+		// Admintools
+		$system_permissions['admintools_settings'] = $admin->get_post('admintools_settings');
+		if($system_permissions['admintools_settings'] == 1) {
+			$system_permissions['admintools'] = 1;
+		} else {
+			$system_permissions['admintools'] = '';
+		}
+	if($system_permissions['modules'] == 1 OR $system_permissions['templates'] == 1 OR $system_permissions['languages'] == 1) {
+		$system_permissions['addons'] = 1;
+	} else {
+		$system_permissions['addons'] = '';
+	}
+	// Settings
+	$system_permissions['settings_basic'] = $admin->get_post('settings_basic');
+	$system_permissions['settings_advanced'] = $admin->get_post('settings_advanced');
+	if($system_permissions['settings_basic'] == 1 OR $system_permissions['settings_advanced'] == 1) {
+		$system_permissions['settings'] = 1;
+	} else {
+		$system_permissions['settings'] = '';
+	}
+	// Access
+		// Users
+		$system_permissions['users_view'] = $admin->get_post('users_view');
+		$system_permissions['users_add'] = $admin->get_post('users_add');
+		$system_permissions['users_modify'] = $admin->get_post('users_modify');
+		$system_permissions['users_delete'] = $admin->get_post('users_delete');
+		if($system_permissions['users_view'] == 1 OR $system_permissions['users_add'] == 1 OR $system_permissions['users_modify'] == 1 OR $system_permissions['users_delete'] == 1) {
+			$system_permissions['users'] = 1;
+		} else {
+			$system_permissions['users'] = '';
+		}
+		// Groups
+		$system_permissions['groups_view'] = $admin->get_post('groups_view');
+		$system_permissions['groups_add'] = $admin->get_post('groups_add');
+		$system_permissions['groups_modify'] = $admin->get_post('groups_modify');
+		$system_permissions['groups_delete'] = $admin->get_post('groups_delete');
+		if($system_permissions['groups_view'] == 1 OR $system_permissions['groups_add'] == 1 OR $system_permissions['groups_modify'] == 1 OR $system_permissions['groups_delete'] == 1) {
+			$system_permissions['groups'] = 1;
+		} else {
+			$system_permissions['groups'] = '';
+		}
+	if($system_permissions['users'] == 1 OR $system_permissions['groups'] == 1) {
+		$system_permissions['access'] = 1;
+	} else {
+		$system_permissions['access'] = '';
+	}
+}
+
+// Implode system permissions
+$imploded_system_permissions = '';
+foreach($system_permissions AS $name => $value) {
+	if($value == true) {
+		if($imploded_system_permissions == '') {
+			$imploded_system_permissions = $name;
+		} else {
+			$imploded_system_permissions .= ','.$name;
+		}
+	}
+}
+
+$system_permissions = $imploded_system_permissions;
+
+// Get module permissions
+$module_permissions = '';
+if($handle = opendir(WB_PATH.'/modules/')) {
+	while (false !== ($file = readdir($handle))) {
+		if($file != "." AND $file != ".." AND $file != ".svn" AND is_dir(WB_PATH."/modules/$file") AND file_exists(WB_PATH."/modules/$file/info.php")) {
+			// Include the modules info file
+			require(WB_PATH.'/modules/'.$file.'/info.php');
+			// Check if it was selected to be used or not
+			$count = 0;
+			if(is_array($admin->get_post('module_permissions'))) {
+				foreach($admin->get_post('module_permissions') AS $selected_name) {
+					if($file == $selected_name) {
+						$count = $count+1;
+					}
+				}
+			}
+			if($count == 0) {
+				// Add unselected modules to list
+				if($module_permissions == '') {
+					$module_permissions = $file;
+				} else {
+					$module_permissions .= ','.$file;
+				}
+			}
+		}
+	}
+}
+
+// Get template permissions
+$template_permissions = '';
+if($handle = opendir(WB_PATH.'/templates/')) {
+	while (false !== ($file = readdir($handle))) {
+		if($file != "." AND $file != ".." AND $file != ".svn" AND is_dir(WB_PATH."/templates/$file") AND file_exists(WB_PATH."/templates/$file/info.php")) {
+			// Include the modules info file
+			require(WB_PATH.'/templates/'.$file.'/info.php');
+			// Check if it was selected to be used or not
+			$count = 0;
+			if(is_array($admin->get_post('template_permissions'))) {
+				foreach($admin->get_post('template_permissions') AS $selected_name) {
+					if($file == $selected_name) {
+						$count = $count+1;
+					}
+				}
+			}
+			if($count == 0) {
+				// Add unselected modules to list
+				if($template_permissions == '') {
+					$template_permissions = $file;
+				} else {
+					$template_permissions .= ','.$file;
+				}
+			}
+		}
+	}
+}
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/groups/get_permissions.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/groups/groups.php
===================================================================
--- tags/2.8.3/wb/admin/groups/groups.php	(nonexistent)
+++ tags/2.8.3/wb/admin/groups/groups.php	(revision 1610)
@@ -0,0 +1,199 @@
+checkIDKEY('group_id', 0, $_SERVER['REQUEST_METHOD']));
+            if($group_id == 0){
+				$admin->print_error($MESSAGE['USERS_NO_GROUP'] );
+            }
+			if( ($group_id < 2 ) )
+			{
+				// if($admin_header) { $admin->print_header(); }
+				$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'] );
+			}
+
+			// Get existing values
+			$results = $database->query("SELECT * FROM ".TABLE_PREFIX."groups WHERE group_id = '".$group_id."'");
+			$group = $results->fetchRow();
+			// Setup template object, parse vars to it, then parse it
+			$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('groups_form.htt'));
+			// Create new template object
+			$template = new Template($ThemePath);
+			// $template->debug = true;
+			$template->set_file('page', 'groups_form.htt');
+			$template->set_block('page', 'main_block', 'main');
+			$template->set_var(	array(
+									'ACTION_URL' => ADMIN_URL.'/groups/save.php',
+									'SUBMIT_TITLE' => $TEXT['SAVE'],
+									'GROUP_ID' => $admin->getIDKEY($group['group_id']),
+									'GROUP_NAME' => $group['name'],
+									'ADVANCED_LINK' => 'groups.php',
+									'FTAN' => $admin->getFTAN()
+								));
+			// Tell the browser whether or not to show advanced options
+			if( true == (isset( $_POST['advanced']) AND ( strpos( $_POST['advanced'], ">>") > 0 ) ) ) {
+				$template->set_var('DISPLAY_ADVANCED', '');
+				$template->set_var('DISPLAY_BASIC', 'display:none;');
+				$template->set_var('ADVANCED', 'yes');
+				$template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']);
+			} else {
+				$template->set_var('DISPLAY_ADVANCED', 'display:none;');
+				$template->set_var('DISPLAY_BASIC', '');
+				$template->set_var('ADVANCED', 'no');
+				$template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].'  >>');
+			}
+
+			// Explode system permissions
+			$system_permissions = explode(',', $group['system_permissions']);
+			// Check system permissions boxes
+			foreach($system_permissions AS $name) {
+					$template->set_var($name.'_checked', ' checked="checked"');
+			}
+			// Explode module permissions
+			$module_permissions = explode(',', $group['module_permissions']);
+			// Explode template permissions
+			$template_permissions = explode(',', $group['template_permissions']);
+
+			// Insert values into module list
+			$template->set_block('main_block', 'module_list_block', 'module_list');
+			$result = $database->query('SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "module" AND `function` = "page" ORDER BY `name`');
+			if($result->numRows() > 0) {
+				while($addon = $result->fetchRow()) {
+					$template->set_var('VALUE', $addon['directory']);
+					$template->set_var('NAME', $addon['name']);
+					if(!is_numeric(array_search($addon['directory'], $module_permissions))) {
+						$template->set_var('CHECKED', ' checked="checked"');
+					} else {
+						$template->set_var('CHECKED', '');
+					}
+					$template->parse('module_list', 'module_list_block', true);
+				}
+			}
+
+			// Insert values into template list
+			$template->set_block('main_block', 'template_list_block', 'template_list');
+			$result = $database->query('SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "template" ORDER BY `name`');
+			if($result->numRows() > 0) {
+				while($addon = $result->fetchRow()) {
+					$template->set_var('VALUE', $addon['directory']);
+					$template->set_var('NAME', $addon['name']);
+					if(!is_numeric(array_search($addon['directory'], $template_permissions))) {
+						$template->set_var('CHECKED', ' checked="checked"');
+					} else {
+						$template->set_var('CHECKED', '');
+					}
+					$template->parse('template_list', 'template_list_block', true);
+				}
+			}
+
+			// Insert language text and messages
+			$template->set_var(array(
+						'TEXT_RESET' => $TEXT['RESET'],
+						'TEXT_ACTIVE' => $TEXT['ACTIVE'],
+						'TEXT_DISABLED' => $TEXT['DISABLED'],
+						'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
+						'TEXT_USERNAME' => $TEXT['USERNAME'],
+						'TEXT_PASSWORD' => $TEXT['PASSWORD'],
+						'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
+						'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
+						'TEXT_EMAIL' => $TEXT['EMAIL'],
+						'TEXT_GROUP' => $TEXT['GROUP'],
+						'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'],
+						'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'],
+						'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'],
+						'TEXT_NAME' => $TEXT['NAME'],
+						'SECTION_PAGES' => $MENU['PAGES'],
+						'SECTION_MEDIA' => $MENU['MEDIA'],
+						'SECTION_MODULES' => $MENU['MODULES'],
+						'SECTION_TEMPLATES' => $MENU['TEMPLATES'],
+						'SECTION_LANGUAGES' => $MENU['LANGUAGES'],
+						'SECTION_SETTINGS' => $MENU['SETTINGS'],
+						'SECTION_USERS' => $MENU['USERS'],
+						'SECTION_GROUPS' => $MENU['GROUPS'],
+						'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'],
+						'TEXT_VIEW' => $TEXT['VIEW'],
+						'TEXT_ADD' => $TEXT['ADD'],
+						'TEXT_LEVEL' => $TEXT['LEVEL'],
+						'TEXT_MODIFY' => $TEXT['MODIFY'],
+						'TEXT_DELETE' => $TEXT['DELETE'],
+						'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'],
+						'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
+						'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'],
+						'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'],
+						'TEXT_RENAME' => $TEXT['RENAME'],
+						'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'],
+						'TEXT_BASIC' => $TEXT['BASIC'],
+						'TEXT_ADVANCED' => $TEXT['ADVANCED'],
+						'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'],
+						'HEADING_MODIFY_GROUP' => $HEADING['MODIFY_GROUP'],
+					));
+
+			// Parse template object
+			$template->parse('main', 'main_block', false);
+			$template->pparse('output', 'page');
+			// Print admin footer
+			$admin->print_footer();			break;
+		case 'delete' :
+			// Create new admin object
+			$admin = new admin('Access', 'groups_delete');
+			$group_id = intval($admin->checkIDKEY('group_id', 0, $_SERVER['REQUEST_METHOD']));
+            if($group_id == 0){
+				$admin->print_error($MESSAGE['USERS_NO_GROUP'] );
+            }
+			// Check if user id is a valid number and doesnt equal 1
+			if( ($group_id < 2 ) )
+			{
+				// if($admin_header) { $admin->print_header(); }
+				$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'] );
+			}
+			// Print header
+			$admin->print_header();
+			// Delete the group
+			$database->query("DELETE FROM `".TABLE_PREFIX."groups` WHERE `group_id` = '".$group_id."' LIMIT 1");
+			if($database->is_error()) {
+				$admin->print_error($database->get_error());
+			} else {
+				// Delete users in the group
+				$database->query("DELETE FROM `".TABLE_PREFIX."users` WHERE `group_id` = '".$group_id."'");
+				if($database->is_error()) {
+					$admin->print_error($database->get_error());
+				} else {
+					$admin->print_success($MESSAGE['GROUPS']['DELETED']);
+				}
+			}
+			// Print admin footer
+			$admin->print_footer();
+			break;
+	default:
+			break;
+endswitch;

Property changes on: tags/2.8.3/wb/admin/groups/groups.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/groups/index.php
===================================================================
--- tags/2.8.3/wb/admin/groups/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/groups/index.php	(revision 1610)
@@ -0,0 +1,202 @@
+getFTAN();
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('groups.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'groups.htt');
+$template->set_block('page', 'main_block', 'main');
+$template->set_block('main_block', 'manage_users_block', 'users');
+// insert urls
+$template->set_var(array(
+	'ADMIN_URL' => ADMIN_URL,
+	'WB_URL' => WB_URL,
+	'THEME_URL' => THEME_URL,
+	'FTAN' => $ftan
+	)
+);
+
+// Get existing value from database
+// $database = new database();
+$query = "SELECT group_id,name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'";
+$results = $database->query($query);
+if($database->is_error()) {
+	$admin->print_error($database->get_error(), 'index.php');
+}
+
+// Insert values into the modify/remove menu
+$template->set_block('main_block', 'list_block', 'list');
+if($results->numRows() > 0) {
+	// Insert first value to say please select
+	$template->set_var('VALUE', '');
+	$template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...');
+	$template->parse('list', 'list_block', true);
+	// Loop through groups
+	while($group = $results->fetchRow()) {
+		$template->set_var('VALUE',$admin->getIDKEY($group['group_id']));
+		$template->set_var('NAME', $group['name']);
+		$template->parse('list', 'list_block', true);
+	}
+} else {
+	// Insert single value to say no groups were found
+	$template->set_var('NAME', $TEXT['NONE_FOUND']);
+	$template->parse('list', 'list_block', true);
+}
+
+// Insert permissions values
+if($admin->get_permission('groups_add') != true) {
+	$template->set_var('DISPLAY_ADD', 'hide');
+}
+if($admin->get_permission('groups_modify') != true) {
+	$template->set_var('DISPLAY_MODIFY', 'hide');
+}
+if($admin->get_permission('groups_delete') != true) {
+	$template->set_var('DISPLAY_DELETE', 'hide');
+}
+
+// Insert language headings
+$template->set_var(array(
+	'HEADING_MODIFY_DELETE_GROUP' => $HEADING['MODIFY_DELETE_GROUP'],
+	'HEADING_ADD_GROUP' => $HEADING['ADD_GROUP']
+	)
+);
+// Insert language text and messages
+$template->set_var(array(
+	'TEXT_MODIFY' => $TEXT['MODIFY'],
+	'TEXT_DELETE' => $TEXT['DELETE'],
+	'TEXT_MANAGE_USERS' => ( $admin->get_permission('users') == true ) ? $TEXT['MANAGE_USERS']: "",
+	'CONFIRM_DELETE' => $MESSAGE['GROUPS']['CONFIRM_DELETE']
+	)
+);
+if ( $admin->get_permission('users') == true ) $template->parse("users", "manage_users_block", true);
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('groups_form.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'groups_form.htt');
+$template->set_block('page', 'main_block', 'main');
+$template->set_var('DISPLAY_EXTRA', 'display:none;');
+$template->set_var('ACTION_URL', ADMIN_URL.'/groups/add.php');
+$template->set_var('SUBMIT_TITLE', $TEXT['ADD']);
+$template->set_var('ADVANCED_LINK', 'index.php');
+
+// Tell the browser whether or not to show advanced options
+if ( true == (isset( $_POST['advanced']) AND ( strpos( $_POST['advanced'], ">>") > 0 ) ) ) {
+	$template->set_var('DISPLAY_ADVANCED', '');
+	$template->set_var('DISPLAY_BASIC', 'display:none;');
+	$template->set_var('ADVANCED', 'yes');
+	$template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']);
+} else {
+	$template->set_var('DISPLAY_ADVANCED', 'display:none;');
+	$template->set_var('DISPLAY_BASIC', '');
+	$template->set_var('ADVANCED', 'no');
+	$template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>');
+}
+
+// Insert permissions values
+if($admin->get_permission('groups_add') != true) {
+	$template->set_var('DISPLAY_ADD', 'hide');
+}
+
+// Insert values into module list
+$template->set_block('main_block', 'module_list_block', 'module_list');
+$result = $database->query('SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "module" AND `function` = "page" ORDER BY `name`');
+if($result->numRows() > 0) {
+	while($addon = $result->fetchRow()) {
+		$template->set_var('VALUE', $addon['directory']);
+		$template->set_var('NAME', $addon['name']);
+		$template->parse('module_list', 'module_list_block', true);
+	}
+}
+
+// Insert values into template list
+$template->set_block('main_block', 'template_list_block', 'template_list');
+$result = $database->query('SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "template" ORDER BY `name`');
+if($result->numRows() > 0) {
+	while($addon = $result->fetchRow()) {
+		$template->set_var('VALUE', $addon['directory']);
+		$template->set_var('NAME', $addon['name']);
+		$template->parse('template_list', 'template_list_block', true);
+	}
+}
+
+// Insert language text and messages
+$template->set_var(array(
+								'TEXT_RESET' => $TEXT['RESET'],
+								'TEXT_ACTIVE' => $TEXT['ACTIVE'],
+								'TEXT_DISABLED' => $TEXT['DISABLED'],
+								'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
+								'TEXT_USERNAME' => $TEXT['USERNAME'],
+								'TEXT_PASSWORD' => $TEXT['PASSWORD'],
+								'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
+								'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
+								'TEXT_EMAIL' => $TEXT['EMAIL'],
+								'TEXT_GROUP' => $TEXT['GROUP'],
+								'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'],
+								'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'],
+								'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'],
+								'TEXT_NAME' => $TEXT['NAME'],
+								'SECTION_PAGES' => $MENU['PAGES'],
+								'SECTION_MEDIA' => $MENU['MEDIA'],
+								'SECTION_MODULES' => $MENU['MODULES'],
+								'SECTION_TEMPLATES' => $MENU['TEMPLATES'],
+								'SECTION_SETTINGS' => $MENU['SETTINGS'],
+								'SECTION_LANGUAGES' => $MENU['LANGUAGES'],
+								'SECTION_USERS' => $MENU['USERS'],
+								'SECTION_GROUPS' => $MENU['GROUPS'],
+								'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'],
+								'TEXT_VIEW' => $TEXT['VIEW'],
+								'TEXT_ADD' => $TEXT['ADD'],
+								'TEXT_LEVEL' => $TEXT['LEVEL'],
+								'TEXT_MODIFY' => $TEXT['MODIFY'],
+								'TEXT_DELETE' => $TEXT['DELETE'],
+								'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'],
+								'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
+								'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'],
+								'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'],
+								'TEXT_RENAME' => $TEXT['RENAME'],
+								'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'],
+								'TEXT_BASIC' => $TEXT['BASIC'],
+								'TEXT_ADVANCED' => $TEXT['ADVANCED'],
+								'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'],
+								'CHECKED' => ' checked="checked"',
+								'ADMIN_URL' => ADMIN_URL,
+								'WB_URL' => WB_URL,
+								'THEME_URL' => THEME_URL,
+								'FTAN' => $ftan
+								)
+						);
+
+// Parse template for add group form
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print the admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/groups/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/groups/save.php
===================================================================
--- tags/2.8.3/wb/admin/groups/save.php	(nonexistent)
+++ tags/2.8.3/wb/admin/groups/save.php	(revision 1610)
@@ -0,0 +1,66 @@
+checkFTAN())
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back);
+}
+
+// Check if group group_id is a valid number and doesnt equal 1
+$group_id = intval($admin->checkIDKEY('group_id', 0, $_SERVER['REQUEST_METHOD']));
+if( ($group_id < 2 ) )
+{
+	// if($admin_header) { $admin->print_header(); }
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'] );
+}
+
+// Gather details entered
+$group_name = $admin->get_post_escaped('group_name');
+
+// Check values
+if($group_name == "") {
+	$admin->print_error($MESSAGE['GROUPS']['GROUP_NAME_BLANK'], $js_back);
+}
+// After check print the header
+$admin->print_header();
+
+// Get system permissions
+require_once(ADMIN_PATH.'/groups/get_permissions.php');
+
+// Update the database
+$query = "UPDATE `".TABLE_PREFIX."groups` SET `name` = '$group_name', `system_permissions` = '$system_permissions', `module_permissions` = '$module_permissions', `template_permissions` = '$template_permissions' WHERE `group_id` = '$group_id'";
+
+$database->query($query);
+if($database->is_error()) {
+	$admin->print_error($database->get_error());
+} else {
+	$admin->print_success($MESSAGE['GROUPS']['SAVED'], ADMIN_URL.'/groups/index.php');
+}
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/groups/save.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/groups/add.php
===================================================================
--- tags/2.8.3/wb/admin/groups/add.php	(nonexistent)
+++ tags/2.8.3/wb/admin/groups/add.php	(revision 1610)
@@ -0,0 +1,62 @@
+checkFTAN())
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back);
+}
+// After check print the header
+$admin->print_header();
+
+// Gather details entered
+$group_name = mysql_real_escape_string(strip_tags(trim($admin->get_post('group_name'))));
+
+// Check values
+if($group_name == "") {
+	$admin->print_error($MESSAGE['GROUPS']['GROUP_NAME_BLANK'], $js_back);
+}
+$results = $database->query("SELECT * FROM ".TABLE_PREFIX."groups WHERE name = '$group_name'");  
+if($results->numRows()>0) {
+	$admin->print_error($MESSAGE['GROUPS']['GROUP_NAME_EXISTS'], $js_back);  
+}
+
+// Get system and module permissions
+require(ADMIN_PATH.'/groups/get_permissions.php');
+
+// Update the database
+$query = "INSERT INTO ".TABLE_PREFIX."groups (name,system_permissions,module_permissions,template_permissions) VALUES ('$group_name','$system_permissions','$module_permissions','$template_permissions')";
+
+$database->query($query);
+if($database->is_error()) {
+	$admin->print_error($database->get_error());
+} else {
+	$admin->print_success($MESSAGE['GROUPS']['ADDED'], ADMIN_URL.'/groups/index.php');
+}
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/groups/add.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/index.php
===================================================================
--- tags/2.8.3/wb/admin/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/index.php	(revision 1610)
@@ -0,0 +1,36 @@
+
+ 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
+
+*/
+
+// Include config file
+if(!defined('WB_URL')) {
+	require('../config.php');
+}
+
+// Check if the config file has been set-up
+if(!defined('WB_PATH')) {
+	header("Location: ../install/index.php");
+} else {
+	header('Location: '.ADMIN_URL.'/start/index.php');
+}

Property changes on: tags/2.8.3/wb/admin/index.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/templates/details.php
===================================================================
--- tags/2.8.3/wb/admin/templates/details.php	(nonexistent)
+++ tags/2.8.3/wb/admin/templates/details.php	(revision 1610)
@@ -0,0 +1,113 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+
+// Get template name
+if(!isset($_POST['file']) OR $_POST['file'] == "") {
+	header("Location: index.php");
+	exit(0);
+} else {
+	$file = preg_replace('/[^a-z0-9_-]/i', "", $_POST['file']);  // fix secunia 2010-92-2
+}
+
+// Check if the template exists
+if(!file_exists(WB_PATH.'/templates/'.$file)) {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Print admin header
+$admin = new admin('Addons', 'templates_view');
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('templates_details.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'templates_details.htt');
+$template->set_block('page', 'main_block', 'main');
+$template->set_var('FTAN', $admin->getFTAN());
+
+// Insert values
+$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND directory = '$file'");
+if($result->numRows() > 0) {
+	$row = $result->fetchRow();
+}
+
+// check if a template description exists for the displayed backend language
+$tool_description = false;
+if(function_exists('file_get_contents') && file_exists(WB_PATH.'/templates/'.$file.'/languages/'.LANGUAGE .'.php')) {
+	// read contents of the template language file into string
+	$data = @file_get_contents(WB_PATH .'/templates/' .$file .'/languages/' .LANGUAGE .'.php');
+	// use regular expressions to fetch the content of the variable from the string
+	$tool_description = get_variable_content('template_description', $data, false, false);
+	// replace optional placeholder {WB_URL} with value stored in config.php
+	if($tool_description !== false && strlen(trim($tool_description)) != 0) {
+		$tool_description = str_replace('{WB_URL}', WB_URL, $tool_description);
+	} else {
+		$tool_description = false;
+	}
+}
+if($tool_description !== false) {
+	// Override the template-description with correct desription in users language
+	$row['description'] = $tool_description;
+}	
+
+$template->set_var(array(
+								'NAME' => $row['name'],
+								'AUTHOR' => $row['author'],
+								'DESCRIPTION' => $row['description'],
+								'VERSION' => $row['version'],
+								'DESIGNED_FOR' => $row['platform']
+								)
+						);
+
+// Insert language headings
+$template->set_var(array(
+								'HEADING_TEMPLATE_DETAILS' => $HEADING['TEMPLATE_DETAILS']
+								)
+						);
+// Insert language text and messages
+$template->set_var(array(
+								'TEXT_NAME' => $TEXT['NAME'],
+								'TEXT_AUTHOR' => $TEXT['AUTHOR'],
+								'TEXT_VERSION' => $TEXT['VERSION'],
+								'TEXT_DESIGNED_FOR' => $TEXT['DESIGNED_FOR'],
+								'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'],
+								'TEXT_BACK' => $TEXT['BACK']
+								)
+						);
+
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/templates/details.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/templates/index.php
===================================================================
--- tags/2.8.3/wb/admin/templates/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/templates/index.php	(revision 1610)
@@ -0,0 +1,89 @@
+correct_theme_source('templates.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'templates.htt');
+$template->set_block('page', 'main_block', 'main');
+$template->set_var('FTAN', $admin->getFTAN());
+
+// Insert values into template list
+$template->set_block('main_block', 'template_list_block', 'template_list');
+$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' order by name");
+if($result->numRows() > 0) {
+	while($addon = $result->fetchRow()) {
+		$template->set_var('VALUE', $addon['directory']);
+		$template->set_var('NAME', $addon['name']);
+		$template->parse('template_list', 'template_list_block', true);
+	}
+}
+
+// Insert permissions values
+if($admin->get_permission('templates_install') != true) {
+	$template->set_var('DISPLAY_INSTALL', 'hide');
+}
+if($admin->get_permission('templates_uninstall') != true) {
+	$template->set_var('DISPLAY_UNINSTALL', 'hide');
+}
+if($admin->get_permission('templates_view') != true) {
+	$template->set_var('DISPLAY_LIST', 'hide');
+}
+
+// Insert language headings
+$template->set_var(array(
+					'HEADING_INSTALL_TEMPLATE' => $HEADING['INSTALL_TEMPLATE'],
+					'HEADING_UNINSTALL_TEMPLATE' => $HEADING['UNINSTALL_TEMPLATE'],
+					'HEADING_TEMPLATE_DETAILS' => $HEADING['TEMPLATE_DETAILS']
+				)
+			);
+// insert urls
+$template->set_var(array(
+					'ADMIN_URL' => ADMIN_URL,
+					'WB_URL' => WB_URL,
+					'THEME_URL' => THEME_URL,
+					'FTAN' => $admin->getFTAN()
+				)
+			);
+// Insert language text and messages
+$template->set_var(array(
+	'URL_MODULES' => $admin->get_permission('modules') ? 
+		'' . $MENU['MODULES'] . '' : '',
+	'URL_LANGUAGES' => $admin->get_permission('languages') ?
+		'' . $MENU['LANGUAGES'] . '' : '',
+	'URL_ADVANCED' => '          ',
+	'TEXT_INSTALL' => $TEXT['INSTALL'],
+	'TEXT_UNINSTALL' => $TEXT['UNINSTALL'],
+	'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'],
+	'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
+	'CHANGE_TEMPLATE_NOTICE' => $MESSAGE['TEMPLATES']['CHANGE_TEMPLATE_NOTICE']
+	)
+);
+
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/templates/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/templates/uninstall.php
===================================================================
--- tags/2.8.3/wb/admin/templates/uninstall.php	(nonexistent)
+++ tags/2.8.3/wb/admin/templates/uninstall.php	(revision 1610)
@@ -0,0 +1,153 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
+
+// Check if user selected template
+if(!isset($_POST['file']) OR $_POST['file'] == "") {
+	header("Location: index.php");
+	exit(0);
+} else {
+	$file = $_POST['file'];
+}
+
+// Extra protection
+if(trim($file) == '') {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Check if the template exists
+if(!is_dir(WB_PATH.'/templates/'.$file)) {
+	$admin->print_error($MESSAGE['GENERIC']['NOT_INSTALLED']);
+}
+
+if (!function_exists("replace_all")) {
+	function replace_all ($aStr = "", &$aArray ) {
+		foreach($aArray as $k=>$v) $aStr = str_replace("{{".$k."}}", $v, $aStr);
+		return $aStr;
+	}
+}
+
+/**
+*	Check if the template is the standard-template or still in use
+*/
+if (!array_key_exists('CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE', $MESSAGE['GENERIC'] ) )
+	$MESSAGE['GENERIC']['CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'] = "Can't uninstall this template {{name}} because it's the standardtemplate!";
+
+// check whether the template is used as default wb theme
+if($file == DEFAULT_THEME) {
+	$temp = array ('name' => $file );
+	$msg = replace_all( $MESSAGE['GENERIC']['CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'], $temp );
+	$admin->print_error( $msg );
+}
+
+if ($file == DEFAULT_TEMPLATE) {
+	$temp = array ('name' => $file );
+	$msg = replace_all( $MESSAGE['GENERIC']['CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'], $temp );
+	$admin->print_error( $msg );
+
+} else {
+	
+	/**
+	*	Check if the template is still in use by a page ...
+	*/
+	$info = $database->query("SELECT page_id, page_title FROM ".TABLE_PREFIX."pages WHERE template='".$file."' order by page_title");
+	
+	if ($info->numRows() > 0) {
+		/**
+		*	Template is still in use, so we're collecting the page-titles
+		*/
+		
+		/**
+		*	The base-message template-string for the top of the message
+		*/
+		if (!array_key_exists("CANNOT_UNINSTALL_IN_USE_TMPL", $MESSAGE['GENERIC'])) {
+			$add = $info->numRows() == 1 ? "this page" : "these pages";
+			$msg_template_str  = "

    {{type}} {{type_name}} could not be uninstalled because it is still in use by {{pages}}";
+			$msg_template_str .= ":
    click for editing.

    ";
+		} else {
+			$msg_template_str = $MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE_TMPL'];
+			$temp = explode(";",$MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE_TMPL_PAGES']);
+			$add = $info->numRows() == 1 ? $temp[0] : $temp[1];
+		}
+		/**
+		*	The template-string for displaying the Page-Titles ... in this case as a link
+		*/
+		$page_template_str = "- {{title}}
    ";
+		
+		$values = array ('type' => 'Template', 'type_name' => $file, 'pages' => $add);
+		$msg = replace_all ( $msg_template_str,  $values );
+		
+		$page_names = "";
+		
+		while ($data = $info->fetchRow() ) {
+			
+			$page_info = array(
+				'id'	=> $data['page_id'], 
+				'title' => $data['page_title']
+			);
+			
+			$page_names .= replace_all ( $page_template_str, $page_info );
+		}
+		
+		/**
+		*	Printing out the error-message and die().
+		*/
+		$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE'].$msg.$page_names);
+	}
+}
+
+// Check if we have permissions on the directory
+if(!is_writable(WB_PATH.'/templates/'.$file)) {
+	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL'].WB_PATH.'/templates/'.$file);
+}
+
+// Try to delete the template dir
+if(!rm_full_dir(WB_PATH.'/templates/'.$file)) {
+	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL']);
+} else {
+	// Remove entry from DB
+	$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE directory = '".$file."' AND type = 'template'");
+}
+
+// Update pages that use this template with default template
+// $database = new database();
+$database->query("UPDATE ".TABLE_PREFIX."pages SET template = '".DEFAULT_TEMPLATE."' WHERE template = '$file'");
+
+// Print success message
+$admin->print_success($MESSAGE['GENERIC']['UNINSTALLED']);
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/templates/uninstall.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/templates/install.php
===================================================================
--- tags/2.8.3/wb/admin/templates/install.php	(nonexistent)
+++ tags/2.8.3/wb/admin/templates/install.php	(revision 1610)
@@ -0,0 +1,146 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
+
+// Check if user uploaded a file
+if(!isset($_FILES['userfile'])) {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Set temp vars
+$temp_dir = WB_PATH.'/temp/';
+$temp_file = $temp_dir . $_FILES['userfile']['name'];
+$temp_unzip = WB_PATH.'/temp/unzip/';
+
+// Try to upload the file to the temp dir
+if(!move_uploaded_file($_FILES['userfile']['tmp_name'], $temp_file)) {
+	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UPLOAD']);
+}
+
+// Include the PclZip class file (thanks to 
+require_once(WB_PATH.'/include/pclzip/pclzip.lib.php');
+
+// Remove any vars with name "template_directory" and "theme_directory"
+unset($template_directory);
+unset($theme_directory);
+
+// Setup the PclZip object
+$archive = new PclZip($temp_file);
+// Unzip the files to the temp unzip folder
+$list = $archive->extract(PCLZIP_OPT_PATH, $temp_unzip);
+
+// Check if uploaded file is a valid Add-On zip file
+if (!($list && file_exists($temp_unzip . 'index.php'))) $admin->print_error($MESSAGE['GENERIC']['INVALID_ADDON_FILE']);
+
+// Include the templates info file
+require($temp_unzip.'info.php');
+
+// Perform Add-on requirement checks before proceeding
+require(WB_PATH . '/framework/addon.precheck.inc.php');
+preCheckAddon($temp_file);
+
+// Delete the temp unzip directory
+rm_full_dir($temp_unzip);
+
+// Check if the file is valid
+if(!isset($template_directory)) {
+	if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file
+	$admin->print_error($MESSAGE['GENERIC']['INVALID']);
+}
+
+// Check if this module is already installed
+// and compare versions if so
+$new_template_version=$template_version;
+if(is_dir(WB_PATH.'/templates/'.$template_directory)) {
+	if(file_exists(WB_PATH.'/templates/'.$template_directory.'/info.php')) {
+		require(WB_PATH.'/templates/'.$template_directory.'/info.php');
+		// Version to be installed is older than currently installed version
+		if (versionCompare($template_version, $new_template_version, '>=')) {
+			if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file
+			$admin->print_error($MESSAGE['GENERIC']['ALREADY_INSTALLED']);
+		}
+	} 
+	$success_message=$MESSAGE['GENERIC']['UPGRADED'];
+} else {
+	$success_message=$MESSAGE['GENERIC']['INSTALLED'];
+}
+
+// Check if template dir is writable
+if(!is_writable(WB_PATH.'/templates/')) {
+	if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file
+	$admin->print_error($MESSAGE['TEMPLATES']['BAD_PERMISSIONS']);
+}
+
+// Set template dir
+$template_dir = WB_PATH.'/templates/'.$template_directory;
+
+// Make sure the template dir exists, and chmod if needed
+if(!file_exists($template_dir)) {
+	make_dir($template_dir);
+} else {
+	change_mode($template_dir, 'dir');
+}
+
+// Unzip template to the template dir
+$list = $archive->extract(PCLZIP_OPT_PATH, $template_dir, PCLZIP_OPT_REPLACE_NEWER);
+if(!$list) {
+	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNZIP']);
+}
+
+// Delete the temp zip file
+if(file_exists($temp_file)) { unlink($temp_file); }
+
+// Chmod all the uploaded files
+$dir = dir($template_dir);
+while(false !== $entry = $dir->read()) {
+	// Skip pointers
+	if(substr($entry, 0, 1) != '.' AND $entry != '.svn' AND !is_dir($template_dir.'/'.$entry)) {
+		// Chmod file
+		change_mode($template_dir.'/'.$entry);
+	}
+}
+
+// Load template info into DB
+load_template($template_dir);
+
+// Print success message
+$admin->print_success($success_message);
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/templates/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/users/users.php
===================================================================
--- tags/2.8.3/wb/admin/users/users.php	(nonexistent)
+++ tags/2.8.3/wb/admin/users/users.php	(revision 1610)
@@ -0,0 +1,213 @@
+checkIDKEY('user_id', 0, $_SERVER['REQUEST_METHOD']));
+			// Check if user id is a valid number and doesnt equal 1
+			if($user_id == 0){
+			$admin->print_error($MESSAGE['GENERIC_FORGOT_OPTIONS'] );
+            }
+			if( ($user_id < 2 ) )
+			{
+				// if($admin_header) { $admin->print_header(); }
+				$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'] );
+			}
+			// Get existing values
+			$results = $database->query("SELECT * FROM `".TABLE_PREFIX."users` WHERE `user_id` = '".$user_id."'");
+			$user = $results->fetchRow();
+
+			// Setup template object, parse vars to it, then parse it
+			$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('users_form.htt'));
+			// Create new template object
+			$template = new Template($ThemePath);
+			// $template->debug = true;
+			$template->set_file('page', 'users_form.htt');
+			$template->set_block('page', 'main_block', 'main');
+			$template->set_var(	array(
+								'ACTION_URL' => ADMIN_URL.'/users/save.php',
+								'SUBMIT_TITLE' => $TEXT['SAVE'],
+								'USER_ID' => $user['user_id'],
+								'USERNAME' => $user['username'],
+								'DISPLAY_NAME' => $user['display_name'],
+								'EMAIL' => $user['email'],
+								'ADMIN_URL' => ADMIN_URL,
+								'WB_URL' => WB_URL,
+								'THEME_URL' => THEME_URL
+								)
+						);
+
+			$template->set_var('FTAN', $admin->getFTAN());
+			if($user['active'] == 1) {
+				$template->set_var('ACTIVE_CHECKED', ' checked="checked"');
+			} else {
+				$template->set_var('DISABLED_CHECKED', ' checked="checked"');
+			}
+			// Add groups to list
+			$template->set_block('main_block', 'group_list_block', 'group_list');
+			$results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1' ORDER BY name");
+			if($results->numRows() > 0) {
+				$template->set_var('ID', '');
+				$template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...');
+				$template->set_var('SELECTED', '');
+				$template->parse('group_list', 'group_list_block', true);
+				while($group = $results->fetchRow()) {
+					$template->set_var('ID', $group['group_id']);
+					$template->set_var('NAME', $group['name']);
+					if(in_array($group['group_id'], explode(",",$user['groups_id']))) {
+						$template->set_var('SELECTED', ' selected="selected"');
+					} else {
+						$template->set_var('SELECTED', '');
+					}
+					$template->parse('group_list', 'group_list_block', true);
+				}
+			}
+
+			// Only allow the user to add a user to the Administrators group if they belong to it
+			if(in_array(1, $admin->get_groups_id()))
+		    {
+				$template->set_var('ID', '1');
+				$users_groups = $admin->get_groups_name();
+				$template->set_var('NAME', $users_groups[1]);
+
+				$in_group = FALSE;
+				foreach($admin->get_groups_id() as $cur_gid){
+				    if (in_array($cur_gid, explode(",", $user['groups_id']))) {
+				        $in_group = TRUE;
+				    }
+				}
+
+				if($in_group) {
+					$template->set_var('SELECTED', ' selected="selected"');
+				} else {
+					$template->set_var('SELECTED', '');
+				}
+				$template->parse('group_list', 'group_list_block', true);
+			} else {
+				if($results->numRows() == 0) {
+					$template->set_var('ID', '');
+					$template->set_var('NAME', $TEXT['NONE_FOUND']);
+					$template->set_var('SELECTED', ' selected="selected"');
+					$template->parse('group_list', 'group_list_block', true);
+				}
+			}
+
+			// Generate username field name
+			$username_fieldname = 'username_';
+			$salt = "abchefghjkmnpqrstuvwxyz0123456789";
+			srand((double)microtime()*1000000);
+			$i = 0;
+			while ($i <= 7) {
+				$num = rand() % 33;
+				$tmp = substr($salt, $num, 1);
+				$username_fieldname = $username_fieldname . $tmp;
+				$i++;
+			}
+
+			// Work-out if home folder should be shown
+			if(!HOME_FOLDERS) {
+				$template->set_var('DISPLAY_HOME_FOLDERS', 'display:none;');
+			}
+
+			// Include the WB functions file
+			require_once(WB_PATH.'/framework/functions.php');
+
+			// Add media folders to home folder list
+			$template->set_block('main_block', 'folder_list_block', 'folder_list');
+			foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name)
+		    {
+				$template->set_var('NAME', str_replace(WB_PATH, '', $name));
+				$template->set_var('FOLDER', str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name));
+				if($user['home_folder'] == str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)) {
+					$template->set_var('SELECTED', ' selected="selected"');
+				} else {
+					$template->set_var('SELECTED', ' ');
+				}
+				$template->parse('folder_list', 'folder_list_block', true);
+			}
+
+			// Insert language text and messages
+			$template->set_var(array(
+								'TEXT_RESET' => $TEXT['RESET'],
+								'TEXT_CANCEL' => $TEXT['CANCEL'],
+								'TEXT_ACTIVE' => $TEXT['ACTIVE'],
+								'TEXT_DISABLED' => $TEXT['DISABLED'],
+								'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
+								'TEXT_USERNAME' => $TEXT['USERNAME'],
+								'TEXT_PASSWORD' => $TEXT['PASSWORD'],
+								'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
+								'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
+								'TEXT_EMAIL' => $TEXT['EMAIL'],
+								'TEXT_GROUP' => $TEXT['GROUP'],
+								'TEXT_NONE' => $TEXT['NONE'],
+								'TEXT_HOME_FOLDER' => $TEXT['HOME_FOLDER'],
+								'USERNAME_FIELDNAME' => $username_fieldname,
+								'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'],
+								'HEADING_MODIFY_USER' => $HEADING['MODIFY_USER']
+								)
+						);
+
+			// Parse template object
+			$template->parse('main', 'main_block', false);
+			$template->pparse('output', 'page');
+			// Print admin footer
+			$admin->print_footer();
+			break;
+		case 'delete' :
+			// Print header
+			$admin = new admin('Access', 'users_delete');
+			$user_id = intval($admin->checkIDKEY('user_id', 0, $_SERVER['REQUEST_METHOD']));
+			// Check if user id is a valid number and doesnt equal 1
+			if($user_id == 0){
+			$admin->print_error($MESSAGE['GENERIC_FORGOT_OPTIONS'] );
+            }
+			if( ($user_id < 2 ) )
+			{
+				// if($admin_header) { $admin->print_header(); }
+				$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'] );
+			}
+			$sql  = 'SELECT `active` FROM `'.TABLE_PREFIX.'users` ';
+            $sql .= 'WHERE `user_id` = '.$user_id.'';
+            if( ($iDeleteUser = $database->get_one($sql)) == 1 ) {
+				// Delete the user
+				$database->query("UPDATE `".TABLE_PREFIX."users` SET `active` = 0 WHERE `user_id` = '".$user_id."' ");
+            } else {
+				$database->query("DELETE FROM `".TABLE_PREFIX."users` WHERE `user_id` = ".$user_id);
+            }
+
+			if($database->is_error()) {
+				$admin->print_error($database->get_error());
+			} else {
+				$admin->print_success($MESSAGE['USERS_DELETED']);
+			}
+			// Print admin footer
+			$admin->print_footer();
+			break;
+	default:
+			break;
+endswitch;

Property changes on: tags/2.8.3/wb/admin/users/users.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/users/index.php
===================================================================
--- tags/2.8.3/wb/admin/users/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/users/index.php	(revision 1610)
@@ -0,0 +1,228 @@
+get_get('status')==1 ) ? 0 : $iUserStatus );
+unset($_GET);
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('users.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+
+$template->set_file('page', 'users.htt');
+$template->set_block('page', 'main_block', 'main');
+$template->set_block("main_block", "manage_groups_block", "groups");
+$template->set_var('ADMIN_URL', ADMIN_URL);
+$template->set_var('FTAN', $admin->getFTAN());
+$template->set_var('USER_STATUS', $iUserStatus );
+
+$UserStatusActive = 'url('.THEME_URL.'/images/user.png)';
+$UserStatusInactive = 'url('.THEME_URL.'/images/user_red.png)';
+
+$sUserTitle = ($iUserStatus == 0) ? $MENU['USERS'].' '.strtolower($TEXT['ACTIVE']) : $MENU['USERS'].' '.strtolower($TEXT['DELETED']) ;
+
+$template->set_var('TEXT_USERS', $sUserTitle.' '.$TEXT['SHOW'] );
+$template->set_var('STATUS_ICON', ( ($iUserStatus==0) ? $UserStatusActive : $UserStatusInactive) );
+
+// Get existing value from database
+$sql  = 'SELECT `user_id`, `username`, `display_name`, `active` FROM `'.TABLE_PREFIX.'users` ' ;
+$sql .= 'WHERE user_id != 1 ';
+$sql .=     'AND active = '.$iUserStatus.' ';
+$sql .= 'ORDER BY `display_name`,`username`';
+
+$query = "SELECT user_id, username, display_name, active FROM ".TABLE_PREFIX."users WHERE user_id != '1' ORDER BY display_name,username";
+$results = $database->query($sql);
+if($database->is_error()) {
+	$admin->print_error($database->get_error(), 'index.php');
+}
+
+$sUserList  = $TEXT['LIST_OPTIONS'].' ';
+$sUserList .= ($iUserStatus == 1) ? $MENU['USERS'].' '.strtolower($TEXT['ACTIVE']) : $MENU['USERS'].' '.strtolower($TEXT['DELETED']) ;
+// Insert values into the modify/remove menu
+$template->set_block('main_block', 'list_block', 'list');
+if($results->numRows() > 0) {
+	// Insert first value to say please select
+	$template->set_var('VALUE', '');
+	$template->set_var('NAME', $sUserList);
+	$template->set_var('STATUS', 'class="user-active"' );
+	$template->parse('list', 'list_block', true);
+	// Loop through users
+	while($user = $results->fetchRow()) {
+		$template->set_var('VALUE',$admin->getIDKEY($user['user_id']));
+		$template->set_var('STATUS', ($user['active']==false ? 'class="user-inactive"' : 'class="user-active"') );
+		$template->set_var('NAME', $user['display_name'].' ('.$user['username'].')');
+		$template->parse('list', 'list_block', true);
+	}
+} else {
+	// Insert single value to say no users were found
+	$template->set_var('NAME', $TEXT['NONE_FOUND']);
+	$template->parse('list', 'list_block', true);
+}
+
+// Insert permissions values
+if($admin->get_permission('users_add') != true) {
+	$template->set_var('DISPLAY_ADD', 'hide');
+}
+if($admin->get_permission('users_modify') != true) {
+	$template->set_var('DISPLAY_MODIFY', 'hide');
+}
+if($admin->get_permission('users_delete') != true) {
+	$template->set_var('DISPLAY_DELETE', 'hide');
+}
+$HeaderTitle = $HEADING['MODIFY_DELETE_USER'].' ';
+$HeaderTitle .= (($iUserStatus == 1) ? strtolower($TEXT['ACTIVE']) : strtolower($TEXT['DELETED']));
+// Insert language headings
+$template->set_var(array(
+		'HEADING_MODIFY_DELETE_USER' => $HeaderTitle,
+		'HEADING_ADD_USER' => $HEADING['ADD_USER']
+		)
+);
+// insert urls
+$template->set_var(array(
+		'ADMIN_URL' => ADMIN_URL,
+		'WB_URL' => WB_URL,
+		'THEME_URL' => THEME_URL
+		)
+);
+// Insert language text and messages
+$template->set_var(array(
+		'TEXT_MODIFY' => $TEXT['MODIFY'],
+		'TEXT_DELETE' => $TEXT['DELETE'],
+		'TEXT_MANAGE_GROUPS' => ( $admin->get_permission('groups') == true ) ? $TEXT['MANAGE_GROUPS'] : "**",
+		'CONFIRM_DELETE' => (($iUserStatus == 1) ? $TEXT['ARE_YOU_SURE'] : $MESSAGE['USERS']['CONFIRM_DELETE'])
+		)
+);
+if ( $admin->get_permission('groups') == true ) $template->parse("groups", "manage_groups_block", true);
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('users_form.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'users_form.htt');
+$template->set_block('page', 'main_block', 'main');
+$template->set_var('DISPLAY_EXTRA', 'display:none;');
+$template->set_var('ACTIVE_CHECKED', ' checked="checked"');
+$template->set_var('ACTION_URL', ADMIN_URL.'/users/add.php');
+$template->set_var('SUBMIT_TITLE', $TEXT['ADD']);
+$template->set_var('FTAN', $admin->getFTAN());
+// insert urls
+$template->set_var(array(
+		'ADMIN_URL' => ADMIN_URL,
+		'WB_URL' => WB_URL,
+		'THEME_URL' => THEME_URL
+		)
+);
+
+// Add groups to list
+$template->set_block('main_block', 'group_list_block', 'group_list');
+$results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'");
+if($results->numRows() > 0) {
+	$template->set_var('ID', '');
+	$template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...');
+	$template->set_var('SELECTED', ' selected="selected"');
+	$template->parse('group_list', 'group_list_block', true);
+	while($group = $results->fetchRow()) {
+		$template->set_var('ID', $group['group_id']);
+		$template->set_var('NAME', $group['name']);
+		$template->set_var('SELECTED', '');
+		$template->parse('group_list', 'group_list_block', true);
+	}
+}
+// Only allow the user to add a user to the Administrators group if they belong to it
+if(in_array(1, $admin->get_groups_id())) {
+	$users_groups = $admin->get_groups_name();
+	$template->set_var('ID', '1');
+	$template->set_var('NAME', $users_groups[1]);
+	$template->set_var('SELECTED', '');
+	$template->parse('group_list', 'group_list_block', true);
+} else {
+	if($results->numRows() == 0) {
+		$template->set_var('ID', '');
+		$template->set_var('NAME', $TEXT['NONE_FOUND']);
+		$template->parse('group_list', 'group_list_block', true);
+	}
+}
+
+// Insert permissions values
+if($admin->get_permission('users_add') != true) {
+	$template->set_var('DISPLAY_ADD', 'hide');
+}
+
+// Generate username field name
+$username_fieldname = 'username_';
+$salt = "abchefghjkmnpqrstuvwxyz0123456789";
+srand((double)microtime()*1000000);
+$i = 0;
+while ($i <= 7) {
+	$num = rand() % 33;
+	$tmp = substr($salt, $num, 1);
+	$username_fieldname = $username_fieldname . $tmp;
+	$i++;
+}
+
+// Work-out if home folder should be shown
+if(!HOME_FOLDERS) {
+	$template->set_var('DISPLAY_HOME_FOLDERS', 'display:none;');
+}
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Add media folders to home folder list
+$template->set_block('main_block', 'folder_list_block', 'folder_list');
+foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name) {
+	$template->set_var('NAME', str_replace(WB_PATH, '', $name));
+	$template->set_var('FOLDER', str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name));
+	$template->set_var('SELECTED', ' ');
+	$template->parse('folder_list', 'folder_list_block', true);
+}
+
+// Insert language text and messages
+$template->set_var(array(
+			'TEXT_CANCEL' => $TEXT['CANCEL'],
+			'TEXT_RESET' => $TEXT['RESET'],
+			'TEXT_ACTIVE' => $TEXT['ACTIVE'],
+			'TEXT_DISABLED' => $TEXT['DISABLED'],
+			'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
+			'TEXT_USERNAME' => $TEXT['USERNAME'],
+			'TEXT_PASSWORD' => $TEXT['PASSWORD'],
+			'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
+			'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
+			'TEXT_EMAIL' => $TEXT['EMAIL'],
+			'TEXT_GROUP' => $TEXT['GROUP'],
+			'TEXT_NONE' => $TEXT['NONE'],
+			'TEXT_HOME_FOLDER' => $TEXT['HOME_FOLDER'],
+			'USERNAME_FIELDNAME' => $username_fieldname,
+			'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD']
+			)
+	);
+
+// Parse template for add user form
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/users/index.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/users/add.php
===================================================================
--- tags/2.8.3/wb/admin/users/add.php	(nonexistent)
+++ tags/2.8.3/wb/admin/users/add.php	(revision 1610)
@@ -0,0 +1,109 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back);
+}
+// After check print the header
+$admin->print_header();
+
+// Get details entered
+$groups_id = (isset($_POST['groups'])) ? implode(",", $admin->add_slashes($_POST['groups'])) : ''; //should check permissions
+$groups_id = trim($groups_id, ','); // there will be an additional ',' when "Please Choose" was selected, too
+$active = $admin->add_slashes($_POST['active'][0]);
+$username_fieldname = $admin->get_post_escaped('username_fieldname');
+$username = strtolower($admin->get_post_escaped($username_fieldname));
+$password = $admin->get_post('password');
+$password2 = $admin->get_post('password2');
+$display_name = $admin->get_post_escaped('display_name');
+$email = $admin->get_post_escaped('email');
+$home_folder = $admin->get_post_escaped('home_folder');
+$default_language = DEFAULT_LANGUAGE;
+
+// Check values
+if($groups_id == '') {
+	$admin->print_error($MESSAGE['USERS']['NO_GROUP'], $js_back);
+}
+if(!preg_match('/^[a-z]{1}[a-z0-9_-]{2,}$/i', $username)) {
+	$admin->print_error( $MESSAGE['USERS_NAME_INVALID_CHARS'].' / '.
+	                  $MESSAGE['USERS_USERNAME_TOO_SHORT'], $js_back);
+}
+if(strlen($password) < 2) {
+	$admin->print_error($MESSAGE['USERS']['PASSWORD_TOO_SHORT'], $js_back);
+}
+if($password != $password2) {
+	$admin->print_error($MESSAGE['USERS']['PASSWORD_MISMATCH'], $js_back);
+}
+if($email != '')
+{
+	if($admin->validate_email($email) == false)
+    {
+		$admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back);
+	}
+} else { // e-mail must be present
+	$admin->print_error($MESSAGE['SIGNUP']['NO_EMAIL'], $js_back);
+}
+
+// choose group_id from groups_id - workaround for still remaining calls to group_id (to be cleaned-up)
+$gid_tmp = explode(',', $groups_id);
+if(in_array('1', $gid_tmp)) $group_id = '1'; // if user is in administrator-group, get this group
+else $group_id = $gid_tmp[0]; // else just get the first one
+unset($gid_tmp);
+
+// Check if username already exists
+$results = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE username = '$username'");
+if($results->numRows() > 0) {
+	$admin->print_error($MESSAGE['USERS']['USERNAME_TAKEN'], $js_back);
+}
+
+// Check if the email already exists
+$results = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE email = '".$admin->add_slashes($_POST['email'])."'");
+if($results->numRows() > 0)
+{
+	if(isset($MESSAGE['USERS']['EMAIL_TAKEN']))
+    {
+		$admin->print_error($MESSAGE['USERS']['EMAIL_TAKEN'], $js_back);
+	} else {
+		$admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back);
+	}
+}
+
+// MD5 supplied password
+$md5_password = md5($password);
+
+// Inser the user into the database
+$query = "INSERT INTO ".TABLE_PREFIX."users (group_id,groups_id,active,username,password,display_name,home_folder,email,timezone, language) VALUES ('$group_id', '$groups_id', '$active', '$username','$md5_password','$display_name','$home_folder','$email','-72000', '$default_language')";
+$database->query($query);
+if($database->is_error()) {
+	$admin->print_error($database->get_error());
+} else {
+	$admin->print_success($MESSAGE['USERS']['ADDED']);
+}
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/users/add.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/users/save.php
===================================================================
--- tags/2.8.3/wb/admin/users/save.php	(nonexistent)
+++ tags/2.8.3/wb/admin/users/save.php	(revision 1610)
@@ -0,0 +1,117 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back);
+}
+// After check print the header
+$admin->print_header();
+
+// Check if user id is a valid number and doesnt equal 1
+if(!isset($_POST['user_id']) OR !is_numeric($_POST['user_id']) OR $_POST['user_id'] == 1) {
+	header("Location: index.php");
+	exit(0);
+} else {
+	$user_id = $_POST['user_id'];
+}
+
+// Gather details entered
+$groups_id = (isset($_POST['groups'])) ? implode(",", $admin->add_slashes($_POST['groups'])) : '';
+$active = $admin->add_slashes($_POST['active'][0]);
+$username_fieldname = $admin->get_post_escaped('username_fieldname');
+$username = strtolower($admin->get_post_escaped($username_fieldname));
+$password = $admin->get_post('password');
+$password2 = $admin->get_post('password2');
+$display_name = $admin->get_post_escaped('display_name');
+$email = $admin->get_post_escaped('email');
+$home_folder = $admin->get_post_escaped('home_folder');
+
+// Check values
+if($groups_id == "") {
+	$admin->print_error($MESSAGE['USERS']['NO_GROUP'], $js_back);
+}
+if(!preg_match('/^[a-z]{1}[a-z0-9_-]{2,}$/i', $username)) {
+	$admin->print_error( $MESSAGE['USERS_NAME_INVALID_CHARS'].' / '.
+	                  $MESSAGE['USERS_USERNAME_TOO_SHORT'], $js_back);
+}
+if($password != "") {
+	if(strlen($password) < 2) {
+		$admin->print_error($MESSAGE['USERS']['PASSWORD_TOO_SHORT'], $js_back);
+	}
+	if($password != $password2) {
+		$admin->print_error($MESSAGE['USERS']['PASSWORD_MISMATCH'], $js_back);
+	}
+}
+
+if($email != "")
+{
+	if($admin->validate_email($email) == false)
+    {
+        $admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back);
+	}
+} else { // e-mail must be present
+	$admin->print_error($MESSAGE['SIGNUP']['NO_EMAIL'], $js_back);
+}
+
+// Check if the email already exists
+$results = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE email = '".$admin->add_slashes($_POST['email'])."' AND user_id <> '".$user_id."' ");
+if($results->numRows() > 0)
+{
+	if(isset($MESSAGE['USERS']['EMAIL_TAKEN']))
+    {
+		$admin->print_error($MESSAGE['USERS']['EMAIL_TAKEN'], $js_back);
+	} else {
+		$admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back);
+	}
+}
+
+// Prevent from renaming user to "admin"
+if($username != 'admin') {
+	$username_code = ", username = '$username'";
+} else {
+	$username_code = '';
+}
+
+// Update the database
+if($password == "") {
+	$query = "UPDATE ".TABLE_PREFIX."users SET groups_id = '$groups_id', active = '$active'$username_code, display_name = '$display_name', home_folder = '$home_folder', email = '$email' WHERE user_id = '$user_id'";
+} else {
+	// MD5 supplied password
+	$md5_password = md5($password);
+	$query = "UPDATE ".TABLE_PREFIX."users SET groups_id = '$groups_id', active = '$active'$username_code, display_name = '$display_name', home_folder = '$home_folder', email = '$email', password = '$md5_password' WHERE user_id = '$user_id'";
+}
+$database->query($query);
+if($database->is_error()) {
+	$admin->print_error($database->get_error(),$js_back);
+} else {
+	$admin->print_success($MESSAGE['USERS']['SAVED']);
+}
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/users/save.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/access/index.php
===================================================================
--- tags/2.8.3/wb/admin/access/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/access/index.php	(revision 1610)
@@ -0,0 +1,70 @@
+correct_theme_source('access.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'access.htt');
+
+$template->set_block('page', 'main_block', 'main');
+$template->set_block('main_block', 'users_block', 'user');
+$template->set_block('main_block', 'groups_block', 'group');
+
+// Insert values into the template object
+$template->set_var(array(
+		'ADMIN_URL' => ADMIN_URL,
+		'THEME_URL' => THEME_URL,
+		'WB_URL' => WB_URL
+	)
+);
+
+/**
+ *	Insert permission values into the template object
+ *	Deprecated - as we are using blocks.
+ */
+$display_none = "style=\"display: none;\"";
+if($admin->get_permission('users') != true)	$template->set_var('DISPLAY_USERS', $display_none);
+if($admin->get_permission('groups') != true) $template->set_var('DISPLAY_GROUPS', $display_none);
+
+// Insert section names and descriptions
+$template->set_var(array(
+		'USERS' => $MENU['USERS'],
+		'GROUPS' => $MENU['GROUPS'],
+		'ACCESS' => $MENU['ACCESS'],
+		'USERS_OVERVIEW' => $OVERVIEW['USERS'],
+		'GROUPS_OVERVIEW' => $OVERVIEW['GROUPS'],
+	)
+);
+
+if ( $admin->get_permission('users') == true )	$template->parse('main_block', "users_block", true);
+if ( $admin->get_permission('groups') == true )	$template->parse('main_block', "groups_block", true);
+
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/access/index.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/languages/details.php
===================================================================
--- tags/2.8.3/wb/admin/languages/details.php	(nonexistent)
+++ tags/2.8.3/wb/admin/languages/details.php	(revision 1610)
@@ -0,0 +1,99 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
+
+// Get language name
+if(!isset($_POST['code']) OR $_POST['code'] == "") {
+	$code = '';
+} else {
+	$code = $_POST['code'];
+}
+
+// fix secunia 2010-93-2
+if (!preg_match('/^[A-Z]{2}$/', $code)) {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Check if the language exists
+if(!file_exists(WB_PATH.'/languages/'.$code.'.php')) {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('languages_details.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'languages_details.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Insert values
+require(WB_PATH.'/languages/'.$code.'.php');
+$template->set_var(array(
+								'CODE' => $language_code,
+								'NAME' => $language_name,
+								'AUTHOR' => $language_author,
+								'VERSION' => $language_version,
+								'DESIGNED_FOR' => $language_platform,
+								'ADMIN_URL' => ADMIN_URL,
+								'WB_URL' => WB_URL,
+								'THEME_URL' => THEME_URL
+								)
+						);
+
+// Restore language to original code
+require(WB_PATH.'/languages/'.LANGUAGE.'.php');
+
+// Insert language headings
+$template->set_var(array(
+								'HEADING_LANGUAGE_DETAILS' => $HEADING['LANGUAGE_DETAILS']
+								)
+						);
+// Insert language text and messages
+$template->set_var(array(
+								'TEXT_CODE' => $TEXT['CODE'],
+								'TEXT_NAME' => $TEXT['NAME'],
+								'TEXT_TYPE' => $TEXT['TYPE'],
+								'TEXT_AUTHOR' => $TEXT['AUTHOR'],
+								'TEXT_VERSION' => $TEXT['VERSION'],
+								'TEXT_DESIGNED_FOR' => $TEXT['DESIGNED_FOR'],
+								'TEXT_BACK' => $TEXT['BACK']
+								)
+						);
+
+// Parse language object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/languages/details.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/languages/index.php
===================================================================
--- tags/2.8.3/wb/admin/languages/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/languages/index.php	(revision 1610)
@@ -0,0 +1,88 @@
+correct_theme_source('languages.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'languages.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Insert values into language list
+$template->set_block('main_block', 'language_list_block', 'language_list');
+$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language' order by directory");
+if($result->numRows() > 0) {
+	while($addon = $result->fetchRow()) {
+		$template->set_var('VALUE', $addon['directory']);
+		$template->set_var('NAME', $addon['name'].' ('.$addon['directory'].')');
+		$template->parse('language_list', 'language_list_block', true);
+	}
+}
+
+// Insert permissions values
+if($admin->get_permission('languages_install') != true) {
+	$template->set_var('DISPLAY_INSTALL', 'hide');
+}
+if($admin->get_permission('languages_uninstall') != true) {
+	$template->set_var('DISPLAY_UNINSTALL', 'hide');
+}
+if($admin->get_permission('languages_view') != true) {
+	$template->set_var('DISPLAY_LIST', 'hide');
+}
+
+// Insert language headings
+$template->set_var(array(
+				'HEADING_INSTALL_LANGUAGE' => $HEADING['INSTALL_LANGUAGE'],
+				'HEADING_UNINSTALL_LANGUAGE' => $HEADING['UNINSTALL_LANGUAGE'],
+				'HEADING_LANGUAGE_DETAILS' => $HEADING['LANGUAGE_DETAILS']
+			)
+		);
+// insert urls
+$template->set_var(array(
+				'ADMIN_URL' => ADMIN_URL,
+				'WB_URL' => WB_URL,
+				'THEME_URL' => THEME_URL,
+				'FTAN' => $admin->getFTAN()
+			)
+		);
+// Insert language text and messages
+$template->set_var(array(
+	'URL_MODULES' => $admin->get_permission('modules') ?
+		'' . $MENU['MODULES'] . '' : '',
+	'URL_ADVANCED' => '          ',
+	'URL_TEMPLATES' => $admin->get_permission('templates') ?
+		'' . $MENU['TEMPLATES'] . '' : '',
+	'TEXT_INSTALL' => $TEXT['INSTALL'],
+	'TEXT_UNINSTALL' => $TEXT['UNINSTALL'],
+	'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'],
+	'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT']
+	)
+);
+
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print admin footer
+$admin->print_footer();

Property changes on: tags/2.8.3/wb/admin/languages/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/languages/uninstall.php
===================================================================
--- tags/2.8.3/wb/admin/languages/uninstall.php	(nonexistent)
+++ tags/2.8.3/wb/admin/languages/uninstall.php	(revision 1610)
@@ -0,0 +1,76 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
+
+// Check if user selected language
+if(!isset($_POST['code']) OR $_POST['code'] == "") {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Extra protection
+if(trim($_POST['code']) == '') {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Check if the language exists
+if(!file_exists(WB_PATH.'/languages/'.$_POST['code'].'.php')) {
+	$admin->print_error($MESSAGE['GENERIC']['NOT_INSTALLED']);
+}
+
+// Check if the language is in use
+if($_POST['code'] == DEFAULT_LANGUAGE OR $_POST['code'] == LANGUAGE) {
+	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE']);
+} else {
+	$query_users = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE language = '".$admin->add_slashes($_POST['code'])."' LIMIT 1");
+	if($query_users->numRows() > 0) {
+		$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL_IN_USE']);
+	}
+}
+
+// Try to delete the language code
+if(!unlink(WB_PATH.'/languages/'.$_POST['code'].'.php')) {
+	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL']);
+} else {
+	// Remove entry from DB
+	$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE directory = '".$_POST['code']."' AND type = 'language'");
+}
+
+// Print success message
+$admin->print_success($MESSAGE['GENERIC']['UNINSTALLED']);
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/languages/uninstall.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/languages/install.php
===================================================================
--- tags/2.8.3/wb/admin/languages/install.php	(nonexistent)
+++ tags/2.8.3/wb/admin/languages/install.php	(revision 1610)
@@ -0,0 +1,131 @@
+checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
+
+// Check if user uploaded a file
+if(!isset($_FILES['userfile'])) {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Create temp string
+$temp_string = '';
+$salt = "abchefghjkmnpqrstuvwxyz0123456789";
+srand((double)microtime()*1000000);
+$i = 0;
+while ($i <= 7) {
+	$num = rand() % 33;
+	$tmp = substr($salt, $num, 1);
+	$temp_string = $temp_string . $tmp;
+	$i++;
+}
+
+// Set temp vars
+$temp_dir = WB_PATH.'/temp/';
+$temp_file = $temp_dir . 'language'.$temp_string;
+
+// Check if language dir is writable
+if(!is_writable(WB_PATH.'/languages/')) {
+	if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file
+	$admin->print_error($MESSAGE['GENERIC']['BAD_PERMISSIONS']);
+}
+
+// Try to upload the file to the temp dir
+if(!move_uploaded_file($_FILES['userfile']['tmp_name'], $temp_file)) {
+	if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file
+	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UPLOAD']);
+}
+
+// Check if uploaded file is a valid language file (no binary file etc.)
+$content = file_get_contents($temp_file);
+if (strpos($content, 'print_error($MESSAGE['GENERIC']['INVALID_LANGUAGE_FILE']);
+
+// Remove any vars with name "language_code"
+unset($language_code);
+
+// Include precheck files for versionCompare routine
+require(WB_PATH . '/framework/addon.precheck.inc.php');
+
+// Read the temp file and look for a language code
+require($temp_file);
+$new_language_version=$language_version;
+
+// Check if the file is valid
+if(!isset($language_code)) {
+	if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file
+	// Restore to correct language
+	require(WB_PATH.'/languages/'.LANGUAGE.'.php');
+	$admin->print_error($MESSAGE['GENERIC']['INVALID_LANGUAGE_FILE']);
+}
+
+// Set destination for language file
+$language_file = WB_PATH.'/languages/'.$language_code.'.php';
+$action="install";
+
+// Move to new location
+if (file_exists($language_file)) {
+	require($language_file);
+	if (versionCompare($language_version, $new_language_version, '>=')) {
+		// Restore to correct language
+		require(WB_PATH . '/languages/' . LANGUAGE . '.php');
+		$admin->print_error($MESSAGE['GENERIC']['ALREADY_INSTALLED']);
+	}
+	$action="upgrade";
+	unlink($language_file);
+}
+
+rename($temp_file, $language_file);
+
+// Chmod the file
+change_mode($language_file, 'file');
+
+// Load language info into DB
+load_language($language_file);
+
+// Restore to correct language
+require(WB_PATH.'/languages/'.LANGUAGE.'.php');
+
+// Print success message
+if ($action=="install") {
+	$admin->print_success($MESSAGE['GENERIC']['INSTALLED']);
+} else {
+	$admin->print_success($MESSAGE['GENERIC']['UPGRADED']);
+}
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/languages/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/login/forgot/index.php
===================================================================
--- tags/2.8.3/wb/admin/login/forgot/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/login/forgot/index.php	(revision 1610)
@@ -0,0 +1,162 @@
+query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name = 'title'");
+$results = $results->fetchRow();
+$website_title = $results['value'];
+
+// Check if the user has already submitted the form, otherwise show it
+if(isset($_POST['email']) AND $_POST['email'] != "") {
+	
+	$email = htmlspecialchars($_POST['email'],ENT_QUOTES);
+	
+	// Check if the email exists in the database
+	$query = "SELECT user_id,username,display_name,email,last_reset,password FROM ".TABLE_PREFIX."users WHERE email = '".$admin->add_slashes($_POST['email'])."'";
+	$results = $database->query($query);
+	if($results->numRows() > 0) {
+
+		// Get the id, username, email, and last_reset from the above db query
+		$results_array = $results->fetchRow();
+		
+		// Check if the password has been reset in the last 2 hours
+		$last_reset = $results_array['last_reset'];
+		$time_diff = time()-$last_reset; // Time since last reset in seconds
+		$time_diff = $time_diff/60/60; // Time since last reset in hours
+		if($time_diff < 2) {
+			
+			// Tell the user that their password cannot be reset more than once per hour
+			$message = $MESSAGE['FORGOT_PASS']['ALREADY_RESET'];
+			
+		} else {
+			
+			$old_pass = $results_array['password'];
+			
+			// Generate a random password then update the database with it
+			$new_pass = '';
+			$salt = "abchefghjkmnpqrstuvwxyz0123456789";
+			srand((double)microtime()*1000000);
+			$i = 0;
+			while ($i <= 7) {
+				$num = rand() % 33;
+				$tmp = substr($salt, $num, 1);
+				$new_pass = $new_pass . $tmp;
+				$i++;
+			}
+			
+			$database->query("UPDATE ".TABLE_PREFIX."users SET password = '".md5($new_pass)."', last_reset = '".time()."' WHERE user_id = '".$results_array['user_id']."'");
+			
+			if($database->is_error()) {
+				// Error updating database
+				$message = $database->get_error();
+			} else {
+				// Setup email to send
+				$mail_to = $email;
+				$mail_subject = $MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'];
+
+				// Replace placeholders from language variable with values
+				$search = array('{LOGIN_DISPLAY_NAME}', '{LOGIN_WEBSITE_TITLE}', '{LOGIN_NAME}', '{LOGIN_PASSWORD}');
+				$replace = array($results_array['display_name'], WEBSITE_TITLE, $results_array['username'], $new_pass); 
+				$mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2']['BODY_LOGIN_FORGOT']);
+
+				// Try sending the email
+				if($admin->mail(SERVER_EMAIL,$mail_to,$mail_subject,$mail_message)) { 
+					$message = $MESSAGE['FORGOT_PASS']['PASSWORD_RESET'];
+					$display_form = false;
+				} else {
+					$database->query("UPDATE ".TABLE_PREFIX."users SET password = '".$old_pass."' WHERE user_id = '".$results_array['user_id']."'");
+					$message = $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'];
+				}
+			}
+		
+		}
+		
+	} else {
+		// Email doesn't exist, so tell the user
+		$message = $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'];
+		// and delete the wrong Email
+		$email = '';
+	}
+	
+} else {
+	$email = '';
+}
+
+if(!isset($message)) {
+	$message = $MESSAGE['FORGOT_PASS']['NO_DATA'];
+	$message_color = '000000';
+} else {
+	$message_color = 'FF0000';
+}
+	
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('login_forgot.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+$template->set_file('page', 'login_forgot.htt');
+$template->set_block('page', 'main_block', 'main');
+if(defined('FRONTEND')) {
+	$template->set_var('ACTION_URL', 'forgot.php');
+} else {
+	$template->set_var('ACTION_URL', 'index.php');
+}
+$template->set_var('EMAIL', $email);
+
+if(isset($display_form)) {
+	$template->set_var('DISPLAY_FORM', 'display:none;');
+}
+
+$template->set_var(array(
+								'SECTION_FORGOT' => $MENU['FORGOT'],
+								'MESSAGE_COLOR' => $message_color,
+								'MESSAGE' => $message,
+								'WB_URL' => WB_URL,
+								'ADMIN_URL' => ADMIN_URL,
+								'THEME_URL' => THEME_URL,
+								'LANGUAGE' => strtolower(LANGUAGE),
+								'TEXT_EMAIL' => $TEXT['EMAIL'],
+								'TEXT_SEND_DETAILS' => $TEXT['SEND_DETAILS'],
+								'TEXT_HOME' => $TEXT['HOME'],
+								'TEXT_NEED_TO_LOGIN' => $TEXT['NEED_TO_LOGIN']
+								)
+						);
+
+if(defined('FRONTEND')) {
+	$template->set_var('LOGIN_URL', WB_URL.'/account/login.php');
+} else {
+	$template->set_var('LOGIN_URL', ADMIN_URL);
+}
+$template->set_var('INTERFACE_URL', ADMIN_URL.'/interface');	
+
+if(defined('DEFAULT_CHARSET')) {
+	$charset=DEFAULT_CHARSET;
+} else {
+	$charset='utf-8';
+}
+
+$template->set_var('CHARSET', $charset);	
+
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');

Property changes on: tags/2.8.3/wb/admin/login/forgot/index.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/login/index.php
===================================================================
--- tags/2.8.3/wb/admin/login/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/login/index.php	(revision 1610)
@@ -0,0 +1,64 @@
+correct_theme_source('warning.html');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('login.htt'));
+
+$thisApp = new Login( array(
+						'MAX_ATTEMPS' => "3",
+						'WARNING_URL' => $ThemeUrl.'/warning.html',
+						'USERNAME_FIELDNAME' => $username_fieldname,
+						'PASSWORD_FIELDNAME' => $password_fieldname,
+						'REMEMBER_ME_OPTION' => SMART_LOGIN,
+						'MIN_USERNAME_LEN' => "2",
+						'MIN_PASSWORD_LEN' => "2",
+						'MAX_USERNAME_LEN' => "30",
+						'MAX_PASSWORD_LEN' => "30",
+						'LOGIN_URL' => ADMIN_URL."/login/index.php",
+						'DEFAULT_URL' => ADMIN_URL."/start/index.php",
+						'TEMPLATE_DIR' => $ThemePath,
+						'TEMPLATE_FILE' => "login.htt",
+						'FRONTEND' => false,
+						'FORGOTTEN_DETAILS_APP' => ADMIN_URL."/login/forgot/index.php",
+						'USERS_TABLE' => TABLE_PREFIX."users",
+						'GROUPS_TABLE' => TABLE_PREFIX."groups",
+				)
+		);

Property changes on: tags/2.8.3/wb/admin/login/index.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/admin/logout/index.php
===================================================================
--- tags/2.8.3/wb/admin/logout/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/logout/index.php	(revision 1610)
@@ -0,0 +1,54 @@
+query($sql);
+}
+
+// delete remember key cookie if set
+if (isset($_COOKIE['REMEMBER_KEY'])) {
+	setcookie('REMEMBER_KEY', '', time() - 3600, '/');
+}
+
+// delete most critical session variables manually
+$_SESSION['USER_ID'] = null;
+$_SESSION['GROUP_ID'] = null;
+$_SESSION['GROUPS_ID'] = null;
+$_SESSION['USERNAME'] = null;
+$_SESSION['PAGE_PERMISSIONS'] = null;
+$_SESSION['SYSTEM_PERMISSIONS'] = null;
+
+// overwrite session array
+$_SESSION = array();
+
+// delete session cookie if set
+if (isset($_COOKIE[session_name()])) {
+    setcookie(session_name(), '', time() - 42000, '/');
+}
+
+// delete the session itself
+session_destroy();
+
+// redirect to admin login
+die(header('Location: ' . ADMIN_URL . '/login/index.php'));
+
+?>
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/logout/index.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/modify.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/modify.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/modify_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/modify_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/noclock_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/noclock_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/minus_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/minus_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/hidden_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/hidden_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/clock_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/clock_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/visible_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/visible_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/none_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/none_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/delete_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/delete_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/blank.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/gif

Property changes on: tags/2.8.3/wb/admin/images/blank.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/index.php
===================================================================
--- tags/2.8.3/wb/admin/images/index.php	(nonexistent)
+++ tags/2.8.3/wb/admin/images/index.php	(revision 1610)
@@ -0,0 +1,28 @@
+
+ Copyright (C) 2004-2008, 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

Property changes on: tags/2.8.3/wb/admin/images/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+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: tags/2.8.3/wb/admin/images/reload_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/reload_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/deleted_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/deleted_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/down_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/down_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/view_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/view_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/private_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/private_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/keys_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/keys_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/folder_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/folder_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/clock_del_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/clock_del_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/up_folder_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/up_folder_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/README.txt
===================================================================
--- tags/2.8.3/wb/admin/images/README.txt	(nonexistent)
+++ tags/2.8.3/wb/admin/images/README.txt	(revision 1610)
@@ -0,0 +1,10 @@
+The folder admin/images isn't needed for WB 2.8. anymore.
+
+It remains only to keep backward compatibility to old modules
+wich make use of the images from this folder.
+
+Modules should be adapted as soon as possible to use images
+from the backend themes instead.
+
+If you are shure you have only Modules wich uses images from
+backend themes, this folder can be deleted.
\ No newline at end of file

Property changes on: tags/2.8.3/wb/admin/images/README.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Revision
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/restore_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/restore_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/plus_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/plus_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/up_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/up_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/admin/images/clock_red_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: tags/2.8.3/wb/admin/images/clock_red_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.8.3/wb/install/index.php
===================================================================
--- tags/2.8.3/wb/install/index.php	(nonexistent)
+++ tags/2.8.3/wb/install/index.php	(revision 1610)
@@ -0,0 +1,508 @@
+Enabled    ';
+	// Reload page
+	header('Location: index.php?sessions_checked=true');
+	exit(0);
+} else {
+	// Check if session variable has been saved after reload
+	if(isset($_SESSION['session_support'])) {
+		$session_support = $_SESSION['session_support'];
+	} else {
+		$installFlag = false;
+		$session_support = 'Disabled';
+	}
+}
+// Check if AddDefaultCharset is set
+$e_adc=false;
+$sapi=php_sapi_name();
+if(strpos($sapi, 'apache')!==FALSE || strpos($sapi, 'nsapi')!==FALSE) {
+	flush();
+	$apache_rheaders=apache_response_headers();
+	foreach($apache_rheaders AS $h) {
+		if(strpos($h, 'html; charset')!==FALSE) {
+			preg_match('/charset\s*=\s*([a-zA-Z0-9- _]+)/', $h, $match);
+			$apache_charset=$match[1];
+			$e_adc=$apache_charset;
+		}
+	}
+}
+
+?>
+
+
+WebsiteBaker Installation Wizard
+
+
+
+
+
+
    
+
+
+	
+	
+
+
    
+		Logo
+	
+		
    Installation Wizard
    
+	
    
+
+
    
+
+
+
+
+
+		
    
+			Welcome to the WebsiteBaker Installation Wizard.
+		
    
+		
    Error: 
    
+		
+		
+			
+		
+		Enabled') { ?>
+		
+			
+		
+		
+		
+			
+			
+			
+			
+		
+	
+		
+			
+			
+			
+		
+		
+		
+			
+
+
+
    Step 1
     Please check the following requirements are met before continuing...
    Please note: PHP Session Support may appear disabled if your browser does not support cookies.
    PHP Version > 5.2.1
+				'))
+			   {
+					?>YesNo
+			PHP Session Support
    Server DefaultCharset
+				
+						
+						
+						
+			PHP Safe Mode
+				DisabledEnabled
+			
    
+
    
+Please note: Yor webserver is configured to deliver  charset only.
    
+To display national special characters (e.g.: ä á) in clear manner, switch off this preset please(or let it do by your hosting provider).
    
+In any case you can choose  in the settings of WebsiteBaker.
    
+But this solution does not guarranty a correct displaying of the content from all modules!
+
    
+
    
+
+
+	
+
+Writeable';
+	$config_content = " 128)
+				{
+					$installFlag = false;
+					$config = 'Not empty!!?';
+// try to open and to write
+				} elseif( !$handle = fopen($wb_path.$configFile, 'w') )
+				{
+					$installFlag = false;
+	                $config = 'Not Writeable';
+				} else {
+					if (fwrite($handle, $config_content) === FALSE) {
+						$installFlag = false;
+		                $config = 'Not Writeable';
+					} else {
+						$config = 'Writeable';
+						$_SESSION['config_rename'] = true;
+					}
+					// Close file
+					fclose($handle);
+					}
+			} else {
+				$installFlag = false;
+                $config = 'Not Writeable';
+			}
+// it's config.php.new
+		} elseif((file_exists($wb_path.'/config.php.new')==true))
+		{
+			$configFile = '/config.php.new';
+			$installFlag = false;
+			$config = 'Please rename';
+		} else
+		{
+			$installFlag = false;
+			$config = 'Missing!!?';
+		}
+	}
+?>
+		
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
    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'; } ?>/media/Writeable'; } elseif(!file_exists('../media/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>/templates/Writeable'; } elseif(!file_exists('../templates/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
    /modules/Writeable'; } elseif(!file_exists('../modules/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>/languages/Writeable'; } elseif(!file_exists('../languages/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>/temp/Writeable'; } elseif(!file_exists('../temp/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>  
    
+		
+		
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
    Step 3
     Please check URL settings, and select a default timezone and a default backend language...
    
+				Absolute URL:
+			
+				
+				 type="text" tabindex="1" name="wb_url" style="width: 99%;" value="" />
+			
    
+				Default Timezone:
+			
+				
+			
    
+				Default Language:
+			
+				
+			
    
+		
+		
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
    Step 4
     Please specify your operating system information below...
     
+				Server Operating System:
+			
+				 />
+				Linux/Unix based
+				
    
+				 />
+				Windows
+			
     
+				
    
+					
+						World-writeable file permissions (777)
+					
+				
    
+					
    (Please note: only recommended for testing environments)
    
+				
    
+			
    
+		
+    		
+    			
+    		
+    		
+    			
+    			
+    		
+    		
+    			
+    			
+    		
+		
+			
+			
+		
+		
+    			
+    			
+		
+		
+    			
+    			
+		
+		
+			
+		
+		
    Step 5
     Please enter your MySQL database server details below...
    Host Name
+    				 type="text" tabindex="7" name="database_host" value="" />
+    			
    Database Name ([a-zA-Z0-9_-])
+    				 type="text" tabindex="8" name="database_name" value="" />
+    			
    Table Prefix ([a-zA-Z0-9_])
+				 type="text" tabindex="11" name="table_prefix" value="" />
+			
    Username:
+    				 type="text" tabindex="9" name="database_username" value="" />
+    			
    Password:
+    				
+    			
    
+				 />
+				
+				
    
+				(Please note: May remove existing tables and data)
+			
    
+		
+		
+		
+			
+		
+		
+			
+			
+		
+		
+		
    Step 6
     Please enter your website title below...
    Website Title:
+				 type="text" tabindex="13" name="website_title" value="" />
+			
    
+		
+		
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
    Step 7
     Please enter your Administrator account details below...
    Loginname:
+				 type="text" tabindex="14" name="admin_username" value="" />
+			
    Email:
+				 type="text" tabindex="15" name="admin_email" value="" />
+			
    Password:
+				 type="password" tabindex="16" name="admin_password" value="" />
+			
    Re-Password:
+				 type="password" tabindex="17" name="admin_repassword" value=""  />
+			
    
+		
+				
+					
+				
+				
+					
+				
+				
+			
+		
+		
    Please note:  
    
+						
    
+						WebsiteBaker is released under the
+						GNU General Public License
+						
    
+						By clicking install, you are accepting the license.
+						
    
+					
    
+			
    
+				
+				
+				
+				
+				
+			
    
+			
    
+
+
    
+
+	
    
+		
+		WebsiteBaker
+		is	released under the
+		GNU General Public License
+		
+	
    
+
    
+
+
+

Property changes on: tags/2.8.3/wb/install/index.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1,4 ##
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: tags/2.8.3/wb/install/stylesheet.css
===================================================================
--- tags/2.8.3/wb/install/stylesheet.css	(nonexistent)
+++ tags/2.8.3/wb/install/stylesheet.css	(revision 1610)
@@ -0,0 +1,179 @@
+@charset "UTF-8";
+/*  thead {
+		background-color: #f2f1ff;
+	}
+		table > thead > tr {
+		}
+			table > thead > tr > th {
+				color: #555758;
+				font-size: 1.15em;
+				padding: 1.2em 1em;
+			}
+			table > thead > tr > td {
+				color: #555758;
+				font-size: 1.08em;
+				padding: 1.2em 1em;
+			}
+	table > tbody {
+		display: block;
+	}
+		table > tbody > tr {
+   border-bottom :1px solid #222222; /* #d2d1cc; */
+   padding :0.8em 0 0.2em 0;
+   width :100%;
+}
+			table > tbody > tr > th {
+				font-size: 1em;
+				width: 1%;
+				padding-left: 0.8em; padding-right: 0.8em;
+				vertical-align: top;
+				text-align: right;
+				white-space: nowrap;
+			}
+			table > tbody > tr > td {
+				font-size: 1em;
+				width: 19%;
+				padding-left: 0.8em; padding-right: 0.8em;
+				vertical-align: top;
+				text-align: left;
+            line-height :2em;
+			}
+
+td.step-row {
+   line-height : 3em;
+   color : #666666;
+   font-weight : bold;
+   font-size : 100%;
+}
+td.name { 
+   width : 180px;
+   color: #666666;
+   vertical-align :middle;
+   font-weight : bold;
+   font-size : 90%;
+   float :left;
+ }
+td.value { 
+   width : 100%;
+   vertical-align :middle;
+ }
+td.value input { 
+   width : 100%;
+   vertical-align :middle;
+ }
+ 
+ 
+h1.step-row {
+   margin : 0;
+   display :inline;
+   color : #6699ff;
+}
+/*
+	FORM Elements
+*/
+form { margin: 0; }
+input, select { padding: 2px; border: solid 1px #a3baca; }
+input:focus, select:focus { background: #fdf8e8; }
+input.submit    {
+	color: #305c8d;
+	font-size: 12px;
+	font-weight: bold;
+	text-transform: uppercase;
+	letter-spacing: 1px;
+	padding: 6px;
+	margin: 1em 0;
+	cursor: pointer;
+	border: outset 2px green;
+}
+input.submit:hover  {
+	border-style: inset;
+}
+input.submit.bad {
+	background-color: #fde8e8;
+	border-color: red;
+}
+input.submit.good {
+	background-color: #deffde;
+	border-color: green;
+}
+/*
+	COMMON Elements
+*/
+img {border: none; }
+p  { margin: 11px 0 4px 0 }
+h1 { color: #3a628f; font-size: 1.3em; margin: 10px 0 5px; border-top: medium none }
+a, a:link, a:visited, a:active  { color: #003366; text-decoration: underline }
+a:focus {outline: none; }
+a:hover  { color: #336699 }
+/*
+	HINTS
+*/
+
+.warning, .error {
+	color: #b70000;
+	line-height: 1.2em;
+	background-color: #fde8e8;
+	margin-top: 0.5em;
+	padding: 0.3em 0.5em;
+	border: solid 1px
+}
+.warning {
+	color: #ca6800;
+}
+.bad { color: #b70000; }
+.good { color: #118301; }
+.warn { color: #ca6800; }
+.hint { color: #464646; font-size: 0.85em; }
+.small { font-size: 0.85em; }
+.italic { font-style: italic; }
+.center { text-align: center; }
+.hide { display: none; }
+/*
+	List Elements
+*/
+ul  { margin: 0; padding: 2px 0 2px 15px; }
+li  { list-style-type: square; margin: 0; }
+/* ************************************************************************** */

Property changes on: tags/2.8.3/wb/install/stylesheet.css
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/install/background.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tags/2.8.3/wb/install/background.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.8.3/wb/install/logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tags/2.8.3/wb/install/logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.8.3/wb/install/save.php
===================================================================
--- tags/2.8.3/wb/install/save.php	(nonexistent)
+++ tags/2.8.3/wb/install/save.php	(revision 1610)
@@ -0,0 +1,809 @@
+Enabled';
+		// Redirect to first page again and exit
+		header('Location: index.php?sessions_checked=true');
+		exit();
+	}
+}
+/* */
+
+// Function to workout what the default permissions are for files created by the webserver
+function default_file_mode($temp_dir) {
+	$v = explode(".",PHP_VERSION);
+	$v = $v[0].$v[1];
+	if($v > 41 AND is_writable($temp_dir)) {
+		$filename = $temp_dir.'/test_permissions.txt';
+		$handle = fopen($filename, 'w');
+		fwrite($handle, 'This file is to get the default file permissions');
+		fclose($handle);
+		$default_file_mode = '0'.substr(sprintf('%o', fileperms($filename)), -3);
+		unlink($filename);
+	} else {
+		$default_file_mode = '0777';
+	}
+	return $default_file_mode;
+}
+
+// Function to workout what the default permissions are for directories created by the webserver
+function default_dir_mode($temp_dir) {
+	$v = explode(".",PHP_VERSION);
+	$v = $v[0].$v[1];
+	if($v > 41 AND is_writable($temp_dir)) {
+		$dirname = $temp_dir.'/test_permissions/';
+		mkdir($dirname);
+		$default_dir_mode = '0'.substr(sprintf('%o', fileperms($dirname)), -3);
+		rmdir($dirname);
+	} else {
+		$default_dir_mode = '0777';
+	}
+	return $default_dir_mode;
+}
+
+function add_slashes($input) {
+	if ( get_magic_quotes_gpc() || ( !is_string($input) ) ) {
+		return $input;
+	}
+	$output = addslashes($input);
+	return $output;
+}
+
+// Begin check to see if form was even submitted
+// Set error if no post vars found
+if(!isset($_POST['website_title'])) {
+	set_error('Please fill-in the form below');
+}
+// End check to see if form was even submitted
+
+// Begin path and timezone details code
+
+// Check if user has entered the installation url
+if(!isset($_POST['wb_url']) OR $_POST['wb_url'] == '') {
+	set_error('Please enter an absolute URL', 'wb_url');
+} else {
+	$wb_url = $_POST['wb_url'];
+}
+// Remove any slashes at the end of the URL
+if(substr($wb_url, strlen($wb_url)-1, 1) == "/") {
+	$wb_url = substr($wb_url, 0, strlen($wb_url)-1);
+}
+if(substr($wb_url, strlen($wb_url)-1, 1) == "\\") {
+	$wb_url = substr($wb_url, 0, strlen($wb_url)-1);
+}
+if(substr($wb_url, strlen($wb_url)-1, 1) == "/") {
+	$wb_url = substr($wb_url, 0, strlen($wb_url)-1);
+}
+if(substr($wb_url, strlen($wb_url)-1, 1) == "\\") {
+	$wb_url = substr($wb_url, 0, strlen($wb_url)-1);
+}
+// Get the default time zone
+if(!isset($_POST['default_timezone']) OR !is_numeric($_POST['default_timezone'])) {
+	set_error('Please select a valid default timezone', 'default_timezone');
+} else {
+	$default_timezone = $_POST['default_timezone']*60*60;
+}
+// End path and timezone details code
+
+// Get the default language
+$allowed_languages = array('BG','CA', 'CS', 'DA', 'DE', 'EN', 'ES', 'ET', 'FI', 'FR', 'HR', 'HU', 'IT', 'LV', 'NL', 'NO', 'PL', 'PT', 'RU','SE','SK','TR');
+if(!isset($_POST['default_language']) OR !in_array($_POST['default_language'], $allowed_languages)) {
+	set_error('Please select a valid default backend language','default_language');
+} else {
+	$default_language = $_POST['default_language'];
+	// make sure the selected language file exists in the language folder
+	if(!file_exists('../languages/' .$default_language .'.php')) {
+		set_error('The language file: \'' .$default_language .'.php\' is missing. Upload file to language folder or choose another language','default_language');
+	}
+}
+// End default language details code
+
+// Begin operating system specific code
+// Get operating system
+if(!isset($_POST['operating_system']) OR $_POST['operating_system'] != 'linux' AND $_POST['operating_system'] != 'windows') {
+	set_error('Please select a valid operating system');
+} else {
+	$operating_system = $_POST['operating_system'];
+}
+// Work-out file permissions
+if($operating_system == 'windows') {
+	$file_mode = '0777';
+	$dir_mode = '0777';
+} elseif(isset($_POST['world_writeable']) AND $_POST['world_writeable'] == 'true') {
+	$file_mode = '0777';
+	$dir_mode = '0777';
+} else {
+	$file_mode = default_file_mode('../temp');
+	$dir_mode = default_dir_mode('../temp');
+}
+// End operating system specific code
+
+// Begin database details code
+// Check if user has entered a database host
+if(!isset($_POST['database_host']) OR $_POST['database_host'] == '') {
+	set_error('Please enter a database host name', 'database_host');
+} else {
+	$database_host = $_POST['database_host'];
+}
+// Check if user has entered a database username
+if(!isset($_POST['database_username']) OR $_POST['database_username'] == '') {
+	set_error('Please enter a database username','database_username');
+} else {
+	$database_username = $_POST['database_username'];
+}
+// Check if user has entered a database password
+if(!isset($_POST['database_password'])) {
+	set_error('Please enter a database password', 'database_password');
+} else {
+	$database_password = $_POST['database_password'];
+}
+// Check if user has entered a database name
+if(!isset($_POST['database_name']) OR $_POST['database_name'] == '') {
+	set_error('Please enter a database name', 'database_name');
+} else {
+	// make sure only allowed characters are specified
+	if(preg_match('/[^a-z0-9_-]+/i', $_POST['database_name'])) {
+		// contains invalid characters (only a-z, A-Z, 0-9 and _ allowed to avoid problems with table/field names)
+		set_error('Only characters a-z, A-Z, 0-9, - and _ allowed in database name.', 'database_name');
+	}
+	$database_name = $_POST['database_name'];
+}
+// Get table prefix
+if(preg_match('/[^a-z0-9_]+/i', $_POST['table_prefix'])) {
+	// contains invalid characters (only a-z, A-Z, 0-9 and _ allowed to avoid problems with table/field names)
+	set_error('Only characters a-z, A-Z, 0-9 and _ allowed in table_prefix.', 'table_prefix');
+} else {
+	$table_prefix = $_POST['table_prefix'];
+}
+
+// Find out if the user wants to install tables and data
+if(isset($_POST['install_tables']) AND $_POST['install_tables'] == 'true') {
+	$install_tables = true;
+} else {
+	$install_tables = false;
+}
+// End database details code
+
+// Begin website title code
+// Get website title
+if(!isset($_POST['website_title']) OR $_POST['website_title'] == '') {
+	set_error('Please enter a website title', 'website_title');
+} else {
+	$website_title = add_slashes($_POST['website_title']);
+}
+// End website title code
+
+// Begin admin user details code
+// Get admin username
+if(!isset($_POST['admin_username']) OR $_POST['admin_username'] == '') {
+	set_error('Please enter a username for the Administrator account','admin_username');
+} else {
+	$admin_username = $_POST['admin_username'];
+}
+// Get admin email and validate it
+if(!isset($_POST['admin_email']) OR $_POST['admin_email'] == '') {
+	set_error('Please enter an email for the Administrator account','admin_email');
+} else {
+	if(preg_match('/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i', $_POST['admin_email'])) {
+		$admin_email = $_POST['admin_email'];
+	} else {
+		set_error('Please enter a valid email address for the Administrator account','admin_email');
+	}
+}
+// Get the two admin passwords entered, and check that they match
+if(!isset($_POST['admin_password']) OR $_POST['admin_password'] == '') {
+	set_error('Please enter a password for the Administrator account','admin_password');
+} else {
+	$admin_password = $_POST['admin_password'];
+}
+if(!isset($_POST['admin_repassword']) OR $_POST['admin_repassword'] == '') {
+	set_error('Please make sure you re-enter the password for the Administrator account','admin_repassword');
+} else {
+	$admin_repassword = $_POST['admin_repassword'];
+}
+if($admin_password != $admin_repassword) {
+	set_error('Sorry, the two Administrator account passwords you entered do not match','admin_repassword');
+}
+// End admin user details code
+
+// Try and write settings to config file
+$config_content = "" .
+"'.mysql_error());
+}
+
+// Try to create the database
+mysql_query('CREATE DATABASE `'.$database_name.'`');
+
+// Close the mysql connection
+mysql_close();
+
+$sSecMod = (defined('SECURE_FORM_MODULE') && SECURE_FORM_MODULE != '') ? '.'.SECURE_FORM_MODULE : '';
+$sSecMod = WB_PATH.'/framework/SecureForm'.$sSecMod.'.php';
+require_once($sSecMod);
+
+require_once(WB_PATH.'/framework/class.admin.php');
+
+// Dummy class to allow modules' install scripts to call $admin->print_error
+class admin_dummy extends admin
+{
+	var $error='';
+	function print_error($message)
+	{
+		$this->error=$message;
+	}
+}
+
+// Include WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Re-connect to the database, this time using in-build database class
+require_once(WB_PATH.'/framework/class.login.php');
+
+$database=new database();
+
+// Check if we should install tables
+if($install_tables == true) {
+	if (!defined('WB_INSTALL_PROCESS')) define ('WB_INSTALL_PROCESS', true);
+	// Remove tables if they exist
+
+	// Pages table
+	$pages = "DROP TABLE IF EXISTS `".TABLE_PREFIX."pages`";
+	$database->query($pages);
+	// Sections table
+	$sections = "DROP TABLE IF EXISTS `".TABLE_PREFIX."sections`";
+	$database->query($sections);
+	// Settings table
+	$settings = "DROP TABLE IF EXISTS `".TABLE_PREFIX."settings`";
+	$database->query($settings);
+	// Users table
+	$users = "DROP TABLE IF EXISTS `".TABLE_PREFIX."users`";
+	$database->query($users);
+	// Groups table
+	$groups = "DROP TABLE IF EXISTS `".TABLE_PREFIX."groups`";
+	$database->query($groups);
+	// Search table
+	$search = "DROP TABLE IF EXISTS `".TABLE_PREFIX."search`";
+	$database->query($search);
+	// Addons table
+	$addons = "DROP TABLE IF EXISTS `".TABLE_PREFIX."addons`";
+	$database->query($addons);
+				
+	// Try installing tables
+	
+	// Pages table
+	$pages = 'CREATE TABLE `'.TABLE_PREFIX.'pages` ( `page_id` INT NOT NULL auto_increment,'
+	       . ' `parent` INT NOT NULL DEFAULT \'0\','
+	       . ' `root_parent` INT NOT NULL DEFAULT \'0\','
+	       . ' `level` INT NOT NULL DEFAULT \'0\','
+	       . ' `link` TEXT NOT NULL,'
+	       . ' `target` VARCHAR( 7 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `page_title` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `menu_title` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `description` TEXT NOT NULL ,'
+	       . ' `keywords` TEXT NOT NULL ,'
+	       . ' `page_trail` TEXT NOT NULL  ,'
+	       . ' `template` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `visibility` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `position` INT NOT NULL DEFAULT \'0\','
+	       . ' `menu` INT NOT NULL DEFAULT \'0\','
+	       . ' `language` VARCHAR( 5 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `searching` INT NOT NULL DEFAULT \'0\','
+	       . ' `admin_groups` TEXT NOT NULL ,'
+	       . ' `admin_users` TEXT NOT NULL ,'
+	       . ' `viewing_groups` TEXT NOT NULL ,'
+	       . ' `viewing_users` TEXT NOT NULL ,'
+	       . ' `modified_when` INT NOT NULL DEFAULT \'0\','
+	       . ' `modified_by` INT NOT NULL  DEFAULT \'0\','
+	       . ' PRIMARY KEY ( `page_id` ) '
+	       . ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
+	$database->query($pages);
+	
+	// Sections table
+	$pages = 'CREATE TABLE `'.TABLE_PREFIX.'sections` ( `section_id` INT NOT NULL auto_increment,'
+	       . ' `page_id` INT NOT NULL DEFAULT \'0\','
+	       . ' `position` INT NOT NULL DEFAULT \'0\','
+	       . ' `module` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `block` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `publ_start` VARCHAR( 255 ) NOT NULL DEFAULT \'0\' ,'
+	       . ' `publ_end` VARCHAR( 255 ) NOT NULL DEFAULT \'0\' ,' 
+	       . ' PRIMARY KEY ( `section_id` ) '
+	       . ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
+	$database->query($pages);
+
+	require(ADMIN_PATH.'/interface/version.php');
+	
+	// Settings table
+	$settings='CREATE TABLE `'.TABLE_PREFIX.'settings` ( `setting_id` INT NOT NULL auto_increment,'
+		. ' `name` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+		. ' `value` TEXT NOT NULL ,'
+		. ' PRIMARY KEY ( `setting_id` ) '
+		. ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
+	$database->query($settings);
+
+	$settings_rows=	"INSERT INTO `".TABLE_PREFIX."settings` "
+	." (name, value) VALUES "
+	." ('wb_version', '".VERSION."'),"
+	." ('wb_revision', '".REVISION."'),"
+ 	." ('wb_sp', '".SP."'),"
+	." ('website_title', '$website_title'),"
+	." ('website_description', ''),"
+	." ('website_keywords', ''),"
+	." ('website_header', ''),"
+	." ('website_footer', ''),"
+	." ('wysiwyg_style', 'font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px;'),"
+	." ('er_level', ''),"
+	." ('default_language', '$default_language'),"
+	." ('app_name', 'wb_$session_rand'),"
+	." ('sec_anchor', 'wb_'),"
+	." ('default_timezone', '$default_timezone'),"
+	." ('default_date_format', 'M d Y'),"
+	." ('default_time_format', 'g:i A'),"
+	." ('redirect_timer', '1500'),"
+	." ('home_folders', 'true'),"
+	." ('warn_page_leave', '1'),"
+	." ('default_template', 'round'),"
+	." ('default_theme', 'wb_theme'),"
+	." ('default_charset', 'utf-8'),"
+	." ('multiple_menus', 'true'),"
+	." ('page_level_limit', '4'),"
+	." ('intro_page', 'false'),"
+	." ('page_trash', 'inline'),"
+	." ('homepage_redirection', 'false'),"
+	." ('page_languages', 'true'),"
+	." ('wysiwyg_editor', 'fckeditor'),"
+	." ('manage_sections', 'true'),"
+	." ('section_blocks', 'true'),"
+	." ('smart_login', 'true'),"
+	." ('frontend_login', 'false'),"
+	." ('frontend_signup', 'false'),"
+	." ('search', 'public'),"
+	." ('page_extension', '.php'),"
+	." ('page_spacer', '-'),"
+	." ('pages_directory', '/pages'),"
+	." ('rename_files_on_upload', 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx'),"
+	." ('media_directory', '/media'),"
+	." ('operating_system', '$operating_system'),"
+	." ('string_file_mode', '$file_mode'),"
+	." ('string_dir_mode', '$dir_mode'),"
+	." ('wbmailer_routine', 'phpmail'),"
+	." ('server_email', '$admin_email'),"		// avoid that mail provider (e.g. mail.com) reject mails like yourname@mail.com
+	." ('wbmailer_default_sendername', 'WB Mailer'),"
+	." ('wbmailer_smtp_host', ''),"
+	." ('wbmailer_smtp_auth', ''),"
+	." ('wbmailer_smtp_username', ''),"
+	." ('wbmailer_smtp_password', ''),"
+	." ('fingerprint_with_ip_octets', '2'),"
+	." ('secure_form_module', ''),"
+	." ('mediasettings', '')";
+	$database->query($settings_rows);
+	
+	// Users table
+	$users = 'CREATE TABLE `'.TABLE_PREFIX.'users` ( `user_id` INT NOT NULL auto_increment,'
+	       . ' `group_id` INT NOT NULL DEFAULT \'0\','
+	       . ' `groups_id` VARCHAR( 255 ) NOT NULL DEFAULT \'0\','
+	       . ' `active` INT NOT NULL DEFAULT \'0\','
+	       . ' `username` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `password` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `remember_key` VARCHAR( 255 ) NOT NULL DEFAULT \'\','
+	       . ' `last_reset` INT NOT NULL DEFAULT \'0\','
+	       . ' `display_name` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `email` TEXT NOT NULL ,'
+	       . ' `timezone` INT NOT NULL DEFAULT \'0\','
+	       . ' `date_format` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `time_format` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	       . ' `language` VARCHAR( 5 ) NOT NULL DEFAULT \'' .$default_language .'\' ,'
+	       . ' `home_folder` TEXT NOT NULL ,'
+	       . ' `login_when` INT NOT NULL  DEFAULT \'0\','
+	       . ' `login_ip` VARCHAR( 15 ) NOT NULL DEFAULT \'\' ,'
+	       . ' PRIMARY KEY ( `user_id` ) '
+	       . ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
+	$database->query($users);
+	
+	// Groups table
+	$groups = 'CREATE TABLE `'.TABLE_PREFIX.'groups` ( `group_id` INT NOT NULL auto_increment,'
+	        . ' `name` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	        . ' `system_permissions` TEXT NOT NULL ,'
+	        . ' `module_permissions` TEXT NOT NULL ,'
+	        . ' `template_permissions` TEXT NOT NULL ,'
+	        . ' PRIMARY KEY ( `group_id` ) '
+	        . ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
+	$database->query($groups);
+	
+	// Search settings table
+	$search = 'CREATE TABLE `'.TABLE_PREFIX.'search` ( `search_id` INT NOT NULL auto_increment,'
+	        . ' `name` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+	        . ' `value` TEXT NOT NULL ,'
+	        . ' `extra` TEXT NOT NULL ,'
+	        . ' PRIMARY KEY ( `search_id` ) '
+	        . ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
+	$database->query($search);
+	
+	// Addons table
+	$addons = 'CREATE TABLE `'.TABLE_PREFIX.'addons` ( '
+			.'`addon_id` INT NOT NULL auto_increment ,'
+			.'`type` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+			.'`directory` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+			.'`name` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+			.'`description` TEXT NOT NULL ,'
+			.'`function` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+			.'`version` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+			.'`platform` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+			.'`author` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+			.'`license` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+			.' PRIMARY KEY ( `addon_id` ) '
+			.' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
+	$database->query($addons);
+
+	// Insert default data
+	
+	// Admin group
+	$full_system_permissions = 'pages,pages_view,pages_add,pages_add_l0,pages_settings,pages_modify,pages_intro,pages_delete,media,media_view,media_upload,media_rename,media_delete,media_create,addons,modules,modules_view,modules_install,modules_uninstall,templates,templates_view,templates_install,templates_uninstall,languages,languages_view,languages_install,languages_uninstall,settings,settings_basic,settings_advanced,access,users,users_view,users_add,users_modify,users_delete,groups,groups_view,groups_add,groups_modify,groups_delete,admintools';
+	$insert_admin_group = "INSERT INTO `".TABLE_PREFIX."groups` VALUES ('1', 'Administrators', '$full_system_permissions', '', '')";
+	$database->query($insert_admin_group);
+	// Admin user
+	$insert_admin_user = "INSERT INTO `".TABLE_PREFIX."users` (user_id,group_id,groups_id,active,username,password,email,display_name) VALUES ('1','1','1','1','$admin_username','".md5($admin_password)."','$admin_email','Administrator')";
+	$database->query($insert_admin_user);
+	
+	// Search header
+	$search_header = addslashes('
+
    [TEXT_SEARCH]
    
+
+
    
+
+
+
+
+
+
+
+
+
    
+
+
+
+
+
    
+
+
+
+
+
+
+
    
+
+
    
+
+
    
+	');
+	$insert_search_header = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'header', '$search_header', '')";
+	$database->query($insert_search_header);
+	// Search footer
+	$search_footer = addslashes('');
+	$insert_search_footer = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'footer', '$search_footer', '')";
+	$database->query($insert_search_footer);
+	// Search results header
+	$search_results_header = addslashes(''.
+'[TEXT_RESULTS_FOR] \'[SEARCH_STRING]\':
+');
+	$insert_search_results_header = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'results_header', '$search_results_header', '')";
+	$database->query($insert_search_results_header);
+	// Search results loop
+	$search_results_loop = addslashes(''.
+'
+
+
+
+
+');
+
+	$insert_search_results_loop = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'results_loop', '$search_results_loop', '')";
+	$database->query($insert_search_results_loop);
+	// Search results footer
+	$search_results_footer = addslashes("
    [TITLE][TEXT_LAST_UPDATED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [DATE]
    [DESCRIPTION]
    [EXCERPT]
    ");
+	$insert_search_results_footer = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'results_footer', '$search_results_footer', '')";
+	$database->query($insert_search_results_footer);
+	// Search no results
+	$search_no_results = addslashes('
    [TEXT_NO_RESULTS]
    ');
+	$insert_search_no_results = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'no_results', '$search_no_results', '')";
+	$database->query($insert_search_no_results);
+	// Search module-order
+	$search_module_order = addslashes('faqbaker,manual,wysiwyg');
+	$insert_search_module_order = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'module_order', '$search_module_order', '')";
+	$database->query($insert_search_module_order);
+	// Search max lines of excerpt
+	$search_max_excerpt = addslashes('15');
+	$insert_search_max_excerpt = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'max_excerpt', '$search_max_excerpt', '')";
+	$database->query($insert_search_max_excerpt);
+	// max time to search per module
+	$search_time_limit = addslashes('0');
+	$insert_search_time_limit = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'time_limit', '$search_time_limit', '')";
+	$database->query($insert_search_time_limit);
+	// some config-elements
+	$database->query("INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'cfg_enable_old_search', 'true', '')");
+	$database->query("INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'cfg_search_keywords', 'true', '')");
+	$database->query("INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'cfg_search_description', 'true', '')");
+	$database->query("INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'cfg_show_description', 'true', '')");
+	$database->query("INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'cfg_enable_flush', 'false', '')");
+	// Search template
+	$database->query("INSERT INTO `".TABLE_PREFIX."search` (name) VALUES ('template')");
+
+	require_once(WB_PATH.'/framework/initialize.php');
+
+	// Include the PclZip class file (thanks to
+	require_once(WB_PATH.'/include/pclzip/pclzip.lib.php');
+
+	// Install add-ons
+	if(file_exists(WB_PATH.'/install/modules')) {
+		// Unpack pre-packaged modules
+			
+	}
+	if(file_exists(WB_PATH.'/install/templates')) {
+		// Unpack pre-packaged templates
+		
+	}
+	if(file_exists(WB_PATH.'/install/languages')) {
+		// Unpack pre-packaged languages
+		
+	}
+
+	$admin=new admin_dummy('Start','',false,false);
+
+	// Load addons into DB
+	$dirs['modules'] = WB_PATH.'/modules/';
+	$dirs['templates'] = WB_PATH.'/templates/';
+	$dirs['languages'] = WB_PATH.'/languages/';
+
+	foreach($dirs AS $type => $dir) {
+		if($handle = opendir($dir)) {
+			while(false !== ($file = readdir($handle))) {
+				if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') {
+					// Get addon type
+					if($type == 'modules') {
+						load_module($dir.'/'.$file, true);
+						// Pretty ugly hack to let modules run $admin->set_error
+						// See dummy class definition admin_dummy above
+						if ($admin->error!='') {
+							set_error($admin->error);
+						}
+					} elseif($type == 'templates') {
+						load_template($dir.'/'.$file);
+					} elseif($type == 'languages') {
+						load_language($dir.'/'.$file);
+					}
+				}
+			}
+		closedir($handle);
+		}
+	}
+	
+	// Check if there was a database error
+	if($database->is_error()) {
+		set_error($database->get_error());
+	}
+
+// end of if install_tables	
+} else {
+	/**
+	 *	DB - Exists
+	 *	Tables also?
+	 *
+	 */
+	$requested_tables = array("pages","sections","settings","users","groups","search","addons");
+	for($i=0;$i 0 ) {
+		$error_message  = "One or more tables are missing in the selected database ".DB_NAME.".
    ";
+		$error_message .= "Please install the missing tables or choose 'install tables' as recommend.
    ";
+		$error_message .= "Missing tables are: ".implode(", ", $missing_tables)."";
+		
+		set_error( $error_message );
+	}
+	
+	/**
+	 *	Try to get some default settings ...
+	 */
+	$vars = array(
+		'DEFAULT_THEME'	=> "wb_theme",
+		'THEME_URL'		=> WB_URL."/templates/wb_theme",
+		'THEME_PATH'	=> WB_PATH."/templates/wb_theme",
+		'LANGUAGE'		=> $_POST['default_language'],
+		'SERVER_EMAIL'	=> "admin@yourdomain.com",
+		'SMART_LOGIN'	=> false
+	);
+	foreach($vars as $k => $v) if (!defined($k)) define($k, $v);
+	
+	if (!isset($MESSAGE)) include (WB_PATH."/languages/".LANGUAGE.".php");
+	
+	/**
+	 *	The important part ...
+	 *	Is there an valid user?
+	 */
+	$result = $database->query("SELECT * from ".$table_prefix."users where username='".$_POST['admin_username']."'");
+	if ( $database->is_error() ) {
+		set_error ($database->get_error() );
+	}
+	if ($result->numRows() == 0) {
+		/**
+		 *	No matches found ... user properly unknown
+	 	 */
+	 	set_error ("Unkown user. Please use a valid username.");
+	} else {
+	 	
+		$data = $result->fetchRow();
+	 	/**
+	 	 *	Does the password match
+	 	 */
+	 	if ( md5($_POST['admin_password']) != $data['password']) {
+	 		set_error ("Password didn't match");
+	 	}
+	}
+}
+
+$ThemeUrl = WB_URL.$admin->correct_theme_source('warning.html');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('login.htt'));
+
+// Log the user in and go to Website Baker Administration
+$thisApp = new Login(
+		array(
+				"MAX_ATTEMPS" => "50",
+				"WARNING_URL" => $ThemeUrl."/warning.html",
+				"USERNAME_FIELDNAME" => 'admin_username',
+				"PASSWORD_FIELDNAME" => 'admin_password',
+				"REMEMBER_ME_OPTION" => SMART_LOGIN,
+				"MIN_USERNAME_LEN" => "2",
+				"MIN_PASSWORD_LEN" => "3",
+				"MAX_USERNAME_LEN" => "30",
+				"MAX_PASSWORD_LEN" => "30",
+				'LOGIN_URL' => ADMIN_URL."/login/index.php",
+				'DEFAULT_URL' => ADMIN_URL."/start/index.php",
+				'TEMPLATE_DIR' => $ThemePath,
+				'TEMPLATE_FILE' => 'login.htt',
+				'FRONTEND' => false,
+				'FORGOTTEN_DETAILS_APP' => ADMIN_URL."/login/forgot/index.php",
+				'USERS_TABLE' => TABLE_PREFIX."users",
+				'GROUPS_TABLE' => TABLE_PREFIX."groups",
+		)
+);

Property changes on: tags/2.8.3/wb/install/save.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: tags/2.8.3/wb/modules/form/view.php
===================================================================
--- tags/2.8.3/wb/modules/form/view.php	(nonexistent)
+++ tags/2.8.3/wb/modules/form/view.php	(revision 1610)
@@ -0,0 +1,534 @@
+Access denied
    Cannot access this file directly
    ');
+}
+/* -------------------------------------------------------- */
+
+// load module language file
+$lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php';
+require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang );
+
+include_once(WB_PATH .'/framework/functions.php');
+/*
+function removebreaks($value) {
+	return trim(preg_replace('=((||0x0A/%0A|0x0D/%0D|\\n|\\r)\S).*=i', null, $value));
+}
+function checkbreaks($value) {
+	return $value === removebreaks($value);
+}
+*/
+
+if (!function_exists('emailAdmin')) {
+	function emailAdmin() {
+		global $database,$admin;
+        $retval = $admin->get_email();
+        if($admin->get_user_id()!='1') {
+			$sql  = 'SELECT `email` FROM `'.TABLE_PREFIX.'users` ';
+			$sql .= 'WHERE `user_id`=\'1\' ';
+	        $retval = $database->get_one($sql);
+
+        }
+		return $retval;
+	}
+}
+
+// Function for generating an optionsfor a select field
+if (!function_exists('make_option')) {
+	function make_option(&$n, $k, $values) {
+		// start option group if it exists
+		if (substr($n,0,2) == '[=') {
+		 	$n = ''.PHP_EOL;
+		} elseif ($n == ']') {
+			$n = ''.PHP_EOL;
+		} else {
+			if(in_array($n, $values)) {
+				$n = ''.PHP_EOL;
+			} else {
+				$n = ''.PHP_EOL;
+			}
+		}
+	}
+}
+// Function for generating a checkbox
+if (!function_exists('make_checkbox')) {
+	function make_checkbox(&$key, $idx, $params) {
+		$field_id = $params[0][0];
+		$seperator = $params[0][1];
+
+		$label_id = 'wb_'.preg_replace('/[^a-z0-9]/i', '_', $key).$field_id;
+		if(in_array($key, $params[1])) {
+			$key = ''.'