Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1416) +++ branches/2.8.x/CHANGELOG (revision 1417) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------- +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) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1416) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1417) @@ -52,6 +52,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.2.RC5'); -if(!defined('REVISION')) define('REVISION', '1416'); +if(!defined('REVISION')) define('REVISION', '1417'); ?> Index: branches/2.8.x/wb/templates/wb_theme/templates/settings.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/settings.htt (revision 1416) +++ branches/2.8.x/wb/templates/wb_theme/templates/settings.htt (revision 1417) @@ -1,648 +1,646 @@ - - -
- -{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_WARN_PAGE_LEAVE}: - - - - -
{TEXT_SMART_LOGIN}: - - - - -
{TEXT_LOGIN}: - - - - -
{TEXT_REDIRECT_AFTER}: - -
{TEXT_SIGNUP}: - -
{TEXT_PHP_ERROR_LEVEL}: - -
{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}: -
{TEXT_USER}:{TEXT_GROUP}:{TEXT_OTHERS}:
- - -
- - -
- - - 		- - -
- - -
- - - 		- - -
- - -
- - -
- 		- - - - - - - - - - - - - - -
- {TEXT_DIRECTORIES}: -
{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} - - - + + +
+ +{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}: +
{TEXT_USER}:{TEXT_GROUP}:{TEXT_OTHERS}:
+ + +
+ + +
+ + + 		+ + +
+ + +
+ + + 		+ + +
+ + +
+ + +
+ 		+ + + + + + + + + + + + + + +
+ {TEXT_DIRECTORIES}: +
{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: branches/2.8.x/wb/templates/argos_theme/templates/settings.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/settings.htt (revision 1416) +++ branches/2.8.x/wb/templates/argos_theme/templates/settings.htt (revision 1417) @@ -1,589 +1,585 @@ - - -
- -{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_WARN_PAGE_LEAVE}: - - - - -
{TEXT_SMART_LOGIN}: - - - - -
{TEXT_LOGIN}: - - - - -
{TEXT_REDIRECT_AFTER}: - -
{TEXT_SIGNUP}: - -
{TEXT_PHP_ERROR_LEVEL}: - -
{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}:
{TEXT_USER}:{TEXT_GROUP}:{TEXT_OTHERS}:
- - -
- - -
- - - 		- - -
- - -
- - - 		- - -
- - -
- - -
- 		- - - - - - - - - - - - - - -
{TEXT_DIRECTORIES}:
{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} - - + + +
+ +{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}:
{TEXT_USER}:{TEXT_GROUP}:{TEXT_OTHERS}:
+ + +
+ + +
+ + + 		+ + +
+ + +
+ + + 		+ + +
+ + +
+ + +
+ 		+ + + + + + + + + + + + + + +
{TEXT_DIRECTORIES}:
{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} + +