Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php (revision 1744)
+++ branches/2.8.x/wb/admin/interface/version.php (revision 1745)
@@ -51,5 +51,5 @@
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1744');
+if(!defined('REVISION')) define('REVISION', '1745');
if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/admin/settings/save.php
===================================================================
--- branches/2.8.x/wb/admin/settings/save.php (revision 1744)
+++ branches/2.8.x/wb/admin/settings/save.php (revision 1745)
@@ -154,7 +154,7 @@
}
$allow_tags_in_fields = array('website_header', 'website_footer','website_signature');
-$allow_empty_values = array('website_header','website_footer','sec_anchor','pages_directory','page_spacer','website_signature,page_icon_dir');
+$allow_empty_values = array('website_header','website_footer','pages_directory','page_spacer','website_signature,page_icon_dir');
$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
@@ -185,6 +185,9 @@
$value=$file_mode;
$passed = true;
break;
+ case 'sec_anchor':
+ $value=(($value=='') ? 'section_' : $value);
+ $passed = true;
case 'pages_directory':
break;
case 'wbmailer_smtp_auth':
Index: branches/2.8.x/wb/admin/settings/languages/EN.php
===================================================================
--- branches/2.8.x/wb/admin/settings/languages/EN.php (revision 1744)
+++ branches/2.8.x/wb/admin/settings/languages/EN.php (revision 1745)
@@ -7,3 +7,5 @@
$TEXT['WEBSITE_SIGNATURE'] = 'Contact Signature';
$TEXT['PAGE_EXTENDED'] = 'Extended Pagesettings';
+$TEXT['CONFIRMED_REGISTRATION'] = 'Activation-Mail';
+$HELP['ACTIVATION_MAIL'] = 'Registration per Activation-Mail (Enabled) or Directregistration (Disabled)';
Index: branches/2.8.x/wb/admin/settings/languages/DE.php
===================================================================
--- branches/2.8.x/wb/admin/settings/languages/DE.php (revision 1744)
+++ branches/2.8.x/wb/admin/settings/languages/DE.php (revision 1745)
@@ -8,3 +8,5 @@
$TEXT['WEBSITE_SIGNATURE'] = 'Kontakt Signature';
$TEXT['PAGE_EXTENDED'] = 'Erweiterte Seiteneinstellungen';
+$TEXT['CONFIRMED_REGISTRATION'] = 'Aktivierungs-Mail';
+$HELP['ACTIVATION_MAIL'] = 'Registrierung per Aktivierungs-Mail (Eingeschaltet) oder Direktregistrierung (Ausgeschaltet)';
Index: branches/2.8.x/wb/admin/settings/index.php
===================================================================
--- branches/2.8.x/wb/admin/settings/index.php (revision 1744)
+++ branches/2.8.x/wb/admin/settings/index.php (revision 1745)
@@ -69,6 +69,8 @@
$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');
+/*-- insert all needed vars from language files ----------------------------------------*/
+ $template->set_var($mLang->getLangArray());
// Query current settings in the db, then loop through them and print them
$query = "SELECT * FROM ".TABLE_PREFIX."settings";
@@ -157,8 +159,6 @@
$sSelected = ' selected="selected"';
$checked = ' checked="checked"';
-/*-- insert all needed vars from language files ----------------------------------------*/
- $template->set_var($mLang->getLangArray());
$template->set_var(array(
'WB_URL' => WB_URL,
@@ -901,7 +901,6 @@
'TEXT_EXECUTE' => $TEXT['EXECUTE'],
'TEXT_WARN_PAGE_LEAVE' => '',
'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'],
- 'TEXT_CONFIRMED_REGISTRATION' => $TEXT['EMAIL'].' '.$TEXT['SIGNUP'],
'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'],
'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'],
'TEXT_SECTION_BLOCKS' => $TEXT['SECTION_BLOCKS'],
@@ -913,8 +912,8 @@
'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'],
+ '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']
Index: branches/2.8.x/wb/framework/frontend.functions.php
===================================================================
--- branches/2.8.x/wb/framework/frontend.functions.php (revision 1744)
+++ branches/2.8.x/wb/framework/frontend.functions.php (revision 1745)
@@ -305,11 +305,10 @@
if(file_exists(WB_PATH.'/modules/'.$module.'/view.php')) {
// fetch content -- this is where to place possible output-filters (before highlighting)
ob_start(); // fetch original content
- // make a anchor for every section
- if(defined('SEC_ANCHOR') && SEC_ANCHOR!='') {
- echo "\n".''."\n";
- }
+ $sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR.$section_id : 'section_'.$section_id;
+ echo PHP_EOL.''.PHP_EOL;
require(WB_PATH.'/modules/'.$module.'/view.php');
+ echo PHP_EOL.'
'.PHP_EOL;
$content = ob_get_clean();
} else {
continue;
Index: branches/2.8.x/wb/install/save.php
===================================================================
--- branches/2.8.x/wb/install/save.php (revision 1744)
+++ branches/2.8.x/wb/install/save.php (revision 1745)
@@ -437,7 +437,7 @@
." ('er_level', ''),"
." ('default_language', '$default_language'),"
." ('app_name', 'wb_$session_rand'),"
- ." ('sec_anchor', 'wb_'),"
+ ." ('sec_anchor', 'section_'),"
." ('default_timezone', '$default_timezone'),"
." ('default_date_format', 'M d Y'),"
." ('default_time_format', 'g:i A'),"
Index: branches/2.8.x/wb/modules/wysiwyg/save.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/save.php (revision 1744)
+++ branches/2.8.x/wb/modules/wysiwyg/save.php (revision 1745)
@@ -57,7 +57,7 @@
$aErrors[] = $MESSAGE['GENERIC_NOT_UPGRADED'].((defined('DEBUG') && DEBUG) ? '
'.$MESSAGE['FRONTEND_SORRY_NO_ACTIVE_SECTIONS'] : '');
}
-$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : '' );
+$sec_anchor = '#'.(defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR.$section_id : 'section_'.$section_id );
if(defined('EDIT_ONE_SECTION') and EDIT_ONE_SECTION){
$edit_page = ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'&wysiwyg='.$section_id;
} else {
Index: branches/2.8.x/wb/modules/droplets/example/SectionPicker.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/example/SectionPicker.php (revision 1744)
+++ branches/2.8.x/wb/modules/droplets/example/SectionPicker.php (revision 1745)
@@ -18,9 +18,12 @@
$_sFrontendCss = '';
}
} else { $_sFrontendCss = ''; }
+ $section_id = $sid;
ob_start();
- $section_id = $sid;
- require(WB_PATH.'/modules/'.$module.'/view.php');
+ $sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR.$section_id : 'section_'.$section_id;
+ echo PHP_EOL.''.PHP_EOL;
+ require(WB_PATH.'/modules/'.$module.'/view.php');
+ echo PHP_EOL.'
'.PHP_EOL;
$content = $_sFrontendCss.ob_get_clean();
$section_id = $oldSid; // restore old sectionID
}
Index: branches/2.8.x/wb/modules/droplets/example/ShowWysiwyg.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/example/ShowWysiwyg.php (revision 1744)
+++ branches/2.8.x/wb/modules/droplets/example/ShowWysiwyg.php (revision 1745)
@@ -1,17 +1,20 @@
//:Display one defined WYSIWYG section
//:Use [[ShowWysiwyg?section=10]]
global $database, $section_id;
- $content = '';
- $section = isset($section) ? intval($section) : 0;
- if ($section) {
- if (is_readable(WB_PATH.'/modules/wysiwyg/view.php')) {
- // if valid section is given and module wysiwyg is installed
- $iOldSectionId = intval($section_id); // save old SectionID
- $section_id = $section;
- ob_start(); // generate output by regulary wysiwyg module
- require(WB_PATH.'/modules/wysiwyg/view.php');
- $content = ob_get_clean();
- $section_id = $iOldSectionId; // restore old SectionId
- }
- }
+$content = '';
+$section = isset($section) ? intval($section) : 0;
+if ($section) {
+ if (is_readable(WB_PATH.'/modules/wysiwyg/view.php')) {
+ // if valid section is given and module wysiwyg is installed
+ $iOldSectionId = intval($section_id); // save old SectionID
+ $section_id = $section;
+ ob_start(); // generate output by regulary wysiwyg module
+ $sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR.$section_id : 'section_'.$section_id;
+ echo PHP_EOL.''.PHP_EOL;
+ require(WB_PATH.'/modules/wysiwyg/view.php');
+ echo PHP_EOL.'
'.PHP_EOL;
+ $content = ob_get_clean();
+ $section_id = $iOldSectionId; // restore old SectionId
+ }
+}
return $content;
\ No newline at end of file
Index: branches/2.8.x/wb/modules/droplets/example/ShowRandomWysiwyg.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/example/ShowRandomWysiwyg.php (revision 1744)
+++ branches/2.8.x/wb/modules/droplets/example/ShowRandomWysiwyg.php (revision 1745)
@@ -1,20 +1,23 @@
//:Randomly display one WYSIWYG section from a given list
//:Use [[ShowRandomWysiwyg?section=10,12,15,20]] possible Delimiters: [ ,;:|-+#/ ]
global $database, $section_id;
- $content = '';
- if (isset($section)) {
- if( preg_match('/^[0-9]+(?:\s*[\,\|\-\;\:\+\#\/]\s*[0-9]+\s*)*$/', $section)) {
- if (is_readable(WB_PATH.'/modules/wysiwyg/view.php')) {
- // if valid arguments given and module wysiwyg is installed
- // split and sanitize arguments
- $aSections = preg_split('/[\s\,\|\-\;\:\+\#\/]+/', $section);
- $iOldSectionId = intval($section_id); // save old SectionID
- $section_id = $aSections[array_rand($aSections)]; // get random element
- ob_start(); // generate output by wysiwyg module
- require(WB_PATH.'/modules/wysiwyg/view.php');
- $content = ob_get_clean();
- $section_id = $iOldSectionId; // restore old SectionId
- }
- }
- }
+$content = '';
+if (isset($section)) {
+ if( preg_match('/^[0-9]+(?:\s*[\,\|\-\;\:\+\#\/]\s*[0-9]+\s*)*$/', $section)) {
+ if (is_readable(WB_PATH.'/modules/wysiwyg/view.php')) {
+ // if valid arguments given and module wysiwyg is installed
+ // split and sanitize arguments
+ $aSections = preg_split('/[\s\,\|\-\;\:\+\#\/]+/', $section);
+ $iOldSectionId = intval($section_id); // save old SectionID
+ $section_id = $aSections[array_rand($aSections)]; // get random element
+ ob_start(); // generate output by wysiwyg module
+ $sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR.$section_id : 'section_'.$section_id;
+ echo PHP_EOL.''.PHP_EOL;
+ require(WB_PATH.'/modules/wysiwyg/view.php');
+ echo PHP_EOL.'
'.PHP_EOL;
+ $content = ob_get_clean();
+ $section_id = $iOldSectionId; // restore old SectionId
+ }
+ }
+}
return $content;
\ No newline at end of file
Index: branches/2.8.x/wb/modules/form/add_field.php
===================================================================
--- branches/2.8.x/wb/modules/form/add_field.php (revision 1744)
+++ branches/2.8.x/wb/modules/form/add_field.php (revision 1745)
@@ -20,7 +20,7 @@
// Include WB admin wrapper script
require(WB_PATH.'/modules/admin.php');
-$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : '' );
+$sec_anchor = '#'.(defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR.$section_id : 'section_'.$section_id );
// Include the ordering class
require(WB_PATH.'/framework/class.order.php');
Index: branches/2.8.x/wb/modules/form/delete_field.php
===================================================================
--- branches/2.8.x/wb/modules/form/delete_field.php (revision 1744)
+++ branches/2.8.x/wb/modules/form/delete_field.php (revision 1745)
@@ -12,7 +12,7 @@
* @version $Id$
* @filesource $HeadURL$
* @lastmodified $Date$
- * @description
+ * @description
*/
require('../../config.php');
@@ -27,7 +27,7 @@
$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
}
-$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : '' );
+$sec_anchor = '#'.(defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR.$section_id : 'section_'.$section_id );
// Delete row
$database->query("DELETE FROM ".TABLE_PREFIX."mod_form_fields WHERE field_id = '$field_id'");
Index: branches/2.8.x/wb/modules/admin.php
===================================================================
--- branches/2.8.x/wb/modules/admin.php (revision 1744)
+++ branches/2.8.x/wb/modules/admin.php (revision 1745)
@@ -217,8 +217,9 @@
}
}
- $sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? 'id="'.SEC_ANCHOR.$section['section_id'].'"' : '');
- print '' . $TEXT['BLOCK'] . ': ' . $block_name;
+ $sec_anchor = '#'.(defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR.$section_id : 'section_'.$section_id );
+ //print '
' . $TEXT['BLOCK'] . ': ' . $block_name;
+ print '
' . $TEXT['BLOCK'] . ': ' . $block_name;
print '
Modul: ' . $section['module']." ";
print '
ID: \n";
}