WB 2.08.x

19 Mar-2013 Build 1894 Dietmar Woellbrink (Luisehahne)

# bugfix form intall form284db.sql

# bugfix wb_search_data.sql layout for table settings 

! update menu_link module and set Version to 2.8.1

# little issue on handing the cache in TranslationTable

# fix missing block or block[0] issue in /admin/pages/section.php

        echo '<h4 style="margin-left:0;">NOTICE: '.sizeof($aPackage).' total tables included in package are successfully installed into your database `'.$database->DbName.'` '.$OK.'</h4>';

		exit();

	}

	/**********************************************************

	 *  - Adding field default_theme to settings table

	 */

	$aDebugMessage[] = '<div style="margin-left:2em;">';

	$aDebugMessage[] = "<br /><span><strong>Adding default_theme to settings table</strong></span>";

	// db_update_key_value('settings', 'default_theme', $DEFAULT_THEME);

	$cfg = array(

		'default_theme' => defined('DEFAULT_THEME')&& (DEFAULT_THEME!='') ? DEFAULT_THEME : $DEFAULT_THEME

	);

	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");

	$aDebugMessage[] = '</div>';

	echo implode(PHP_EOL,$aDebugMessage);

	/**********************************************************

	 *  - Adding field sec_anchor to settings table

	 */

	echo '<div style="margin-left:2em;">';

	echo "<h4>Adding/updating entries on table settings</h4>";

	$aDebugMessage[] = "<span>Adding/updating sec_anchor to settings table</span>";

	$cfg = array(

		'sec_anchor' => defined('SEC_ANCHOR')&& (SEC_ANCHOR!='') ? SEC_ANCHOR : 'section_'

	);

	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");

	/**********************************************************

	 *  - Adding redirect timer to settings table

	 */

	$aDebugMessage[] = "<span>Adding/updating redirect timer to settings table</span>";

	$cfg = array(

		'redirect_timer' => defined('REDIRECT_TIMER')&& (REDIRECT_TIMER!='') ? REDIRECT_TIMER : '1500'

	);

	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");

	/**********************************************************

	 *  - Adding default_time_formatr to settings table

	 */

	$aDebugMessage[] = "<span>Adding/updating default_time_format to settings table</span>";

	$cfg = array(

		'default_time_format' => defined('DEFAULT_TIME_FORMAT')&& (DEFAULT_TIME_FORMAT!='') ? DEFAULT_TIME_FORMAT : 'h:i A'

	);

	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");

	/**********************************************************

	 *  - Adding rename_files_on_upload to settings table

	 */

	$aDebugMessage[] = "<span>Adding/Updating rename_files_on_upload to settings table</span>";

	$cfg = array(

	    'rename_files_on_upload' => (defined('RENAME_FILES_ON_UPLOAD')&& (RENAME_FILES_ON_UPLOAD!='') ? RENAME_FILES_ON_UPLOAD : 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js')

	);

	if( version_compare( WB_VERSION, '2.8.2', '<' )) {

		$cfg = array(

		    'rename_files_on_upload' => 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js'

		);

	}

	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");

	/**********************************************************

	 *  - Adding mediasettings to settings table

	 */

	$aDebugMessage[] = "<span>Adding/updating mediasettings to settings table</span>";

	$cfg = array(

		'mediasettings' => (defined('MEDIASETTINGS')&& (MEDIASETTINGS!='') ? MEDIASETTINGS : ''),

	);

	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");

	/**********************************************************

	 *  - Adding fingerprint_with_ip_octets to settings table

	 */

	$aDebugMessage[] = "<span>Adding/updating fingerprint_with_ip_octets to settings table</span>";

	$cfg = array(

		'fingerprint_with_ip_octets' => (defined('FINGERPRINT_WITH_IP_OCTETS') ? FINGERPRINT_WITH_IP_OCTETS : '2'),

		'secure_form_module' => (defined('SECURE_FORM_MODULE') ? SECURE_FORM_MODULE : '')

	);

	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");

	/**********************************************************

	 *  - Adding page_icon_dir to settings table

	 */

	$aDebugMessage[] = "<span>Adding/updating page_icon_dir to settings table</span>";

	$cfg = array(

		'page_icon_dir' => (defined('PAGE_ICON_DIR')&& (PAGE_ICON_DIR!='') ? PAGE_ICON_DIR : '/templates/*/title_images'),

	);

	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");

	/**********************************************************

	 *  - Adding page_extended to settings table

	 */

	$aDebugMessage[] = "<span>Adding/updating page_extendet to settings table</span>";

	$cfg = array(

		'page_extendet' => (defined('PAGE_EXTENDET') ? PAGE_EXTENDET : 'true'),

	);

	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");

	/**********************************************************

	 *  - Adding wbmail_signature to settings table

	 */

	$aDebugMessage[] = "<span>Adding/updating wbmail_signature to settings table</span>";

	$cfg = array(

		'wbmail_signature' => (defined('WBMAIL_SIGNATURE')&& (WBMAIL_SIGNATURE!='') ? WBMAIL_SIGNATURE : '')

	);

	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");

	/**********************************************************

	 *  - Adding confirmed_registration to settings table

	 */

	$aDebugMessage[] = "<span>Adding/updating confirmed_registration to settings table</span>";

	$cfg = array(

		'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') ? CONFIRMED_REGISTRATION : '0')

	);

	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");

	/**********************************************************

	 *  - Adding dev_infos to settings table

	 */

	$aDebugMessage[] = "<span>Adding/updating dev_infos to settings table</span>";

	$cfg = array(

		'dev_infos' => (defined('DEV_INFOS') ? DEV_INFOS : 'false')

	);

	echo '<div style="margin-left:2em;">';

		echo "<h4>Adding/updating fields on table search</h4>";

		echo "Updating database field `no_results` on search table: ";

		$search_no_results = addslashes('<tr><td><p>[TEXT_NO_RESULTS]</p></td></tr>');

		$sql  = 'UPDATE `'.TABLE_PREFIX.'search` ';

		echo ($database->query($sql)) ? " $OK<br />" : " $FAIL!<br />";

	$aDebugMessage = array();

	echo "<h4>Adding/updating field on table pages</h4>";

	 *  - Add field "page_icon" to table "pages"

	 */

	add_modify_field_in_database($table_name,$field_name,$description);

	add_modify_field_in_database($table_name,$field_name,$description);

	 *  - Add field "menu_icon_0" to table "pages"

	 */

	add_modify_field_in_database($table_name,$field_name,$description);

	 */

	add_modify_field_in_database($table_name,$field_name,$description);

	 */

	add_modify_field_in_database($table_name,$field_name,$description);

	 */

	add_modify_field_in_database($table_name,$field_name,$description);

	add_modify_field_in_database($table_name,$field_name,$description);

	 add_modify_field_in_database($table_name,$field_name,$description);

	add_modify_field_in_database($table_name,$field_name,$description);

	 *  - Add field "custom01" to table "pages"

	 */

	add_modify_field_in_database($table_name,$field_name,$description);

	 *  - Add field "custom02" to table "pages"

	 */

	add_modify_field_in_database($table_name,$field_name,$description);

	if($bDebugModus) {

		echo implode(PHP_EOL,$aDebugMessage);

	}

	 * modify wrong strucre on table sections

	 * wrong structure let crash wb

	 */

	if($bDebugModus) {

		echo implode(PHP_EOL,$aDebugMessage);

	}

	echo '</div>';

	$aDebugMessage = array();

	echo '<h3>Step '.(++$stepID).': Updating structure in table users/groups</h3>';

	$aDebugMessage[] = ($database->query($sql)) ? " $OK<br />" : " $FAIL!<br />";

	if( ($admin->is_authenticated() == true) && ($admin->ami_group_member('1') ) ) {

	    $_SESSION['SYSTEM_PERMISSIONS'] = array_merge($_SESSION['SYSTEM_PERMISSIONS'], explode(',', $sSystemPermissions));

	}

	if($bDebugModus) {

		echo implode(PHP_EOL,$aDebugMessage);

	}

	echo '</div>';

	 *   `confirm_code` VARCHAR(32) NOT NULL DEFAULT '',

	 *   `confirm_timeout` INT(11) NOT NULL DEFAULT '0',

	 */

	add_modify_field_in_database($table_name,$field_name,$description);

	add_modify_field_in_database($table_name,$field_name,$description);

	if($bDebugModus) {

	    echo implode(PHP_EOL,$aDebugMessage);

	}

	echo '</div>';

	$aDebugMessage = array();

	/**********************************************************

	* Updating group_id in table users

	*/

	    $aUsers = array();

	$aDebugMessage[] = '</div>';

	if($bDebugModus) {

	// $aDebugMessage[] =

	    echo implode(PHP_EOL,$aDebugMessage);

	}else {

	    echo '<span><strong>'.$iTotalUsers.' users updating the groups</strong></span>'." $OK<br />";

	    echo '</div>';

	}

	/**********************************************************

	* upgrade media directory index protect files

	*/

	$dir = (WB_PATH.MEDIA_DIRECTORY);

	echo '<h4>Upgrade media directory '.MEDIA_DIRECTORY.'/ index.php protect files</h4>';

	$aDebugMessage = rebuildFolderProtectFile($dir);

	if( sizeof( $aDebugMessage ) ){

		echo '<span><strong>Upgrade '.sizeof( $aDebugMessage ).' directory '.MEDIA_DIRECTORY.'/ protect files</strong></span>'." $OK<br />";

	} else {

		echo '<span><strong>Upgrade directory '.MEDIA_DIRECTORY.'/ protect files</strong></span>'." $FAIL!<br />";

		echo implode ('<br />',$aDebugMessage);

	}

	$aModuleList = array(

	              'captcha_control','code','form','menu_link',

	              'output_filter','wysiwyg');

if(!defined('REVISION')) define('REVISION', '1894');

INSERT INTO `{TABLE_PREFIX}search` VALUES(3, 'results_header', '<p>[TEXT_RESULTS_FOR] <strong>[SEARCH_STRING]</strong>:</p>\r\n<div class="searchresults">', '');

-- phpMyAdmin SQL Dump

-- version 3.5.7

-- Erstellungszeit: 15. Mrz 2013 um 18:21

--

SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";

-- --------------------------------------------------------

-- Database structure for WebsiteBaker core

--

-- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {TABLE_COLLATION}

--

-- --------------------------------------------------------

--

-- Tabellenstruktur für Tabelle `{TABLE_PREFIX}mod_menu_link`

--

DROP TABLE IF EXISTS `{TABLE_PREFIX}mod_menu_link`;

CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}mod_menu_link` (

  `section_id` int(11) NOT NULL DEFAULT '0',

  `page_id` int(11) NOT NULL DEFAULT '0',

  `target_page_id` int(11) NOT NULL DEFAULT '0',

  `redirect_type` int(11) NOT NULL DEFAULT '301',

  `anchor` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '0',

  `extern` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',

  PRIMARY KEY (`section_id`)

){TABLE_ENGINE};

-- EndOfFile

<?php

/**

 *

 * @category        modules

 * @package         Menu Link

 * @author          WebsiteBaker Project

 * @copyright       2004-2009, Ryan Djurovich

 * @copyright       2009-2013, WebsiteBaker Org. e.V.

 * @link            http://www.websitebaker2.org/

 * @license         http://www.gnu.org/licenses/gpl.html

 * @platform        WebsiteBaker 2.8.x

 * @requirements    PHP 5.2.2 and higher

 * @version         $Id$

 * @filesource      $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/wysiwyg/modify.php $

 * @lastmodified    $Date: 2011-01-11 20:29:52 +0100 (Di, 11 Jan 2011) $

 *

 */

/* History:

2.8 - June 2009

- Improved the pagelist (thorn)

- Added different redirect types 301 or 302 (thorn)

- Set platform version 2.8

2.7 - 24. Jan. 2008 - doc

- added language support, changed platform to 2.7

2.6.1.1 - 16. Jan. 2008 - thorn

- added table mod_menu_link

- added install.php, delete.php, add.php

- changed wb/index.php: redirect if page is menu_link

- removed special-handling of menu_link in: admin/pages/settings2.php

*/

$module_directory = 'menu_link';

$module_name = 'Menu Link';

$module_function = 'page';

$module_version = '2.8.1';

$module_platform = '2.8.4';

$module_author = 'Ryan Djurovich, thorn';

$module_license = 'GNU General Public License';

$module_description = 'This module allows you to insert a link into the menu.';

 * @copyright       2009-2013, WebsiteBaker Org. e.V.

 * @link            http://www.websitebaker2.org/

 * @version         $Id$

 * @filesource      $HeadURL$

// Must include code to stop this file being accessed directly

if(!defined('WB_PATH')) {

	require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php');

	throw new IllegalFileException();

} else {

	$database = WbDatabase::getInstance();

	$sError = '';

	// Create table

	if(!$database->SqlImport(dirname(__FILE__).'/sql/mod_menu_link.sql','',false)){

		$sError = $database->get_error();

	}

 * @copyright       2009-2012, WebsiteBaker Org. e.V.

// Must include code to stop this file being accessed directly

if(!defined('WB_URL')) {

	require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php');

	throw new IllegalFileException();

	function mod_menu_link_upgrade($bDebug=false) {

		global $OK ,$FAIL;

		$database=WbDatabase::getInstance();

		$msg = array();

		$callingScript = $_SERVER["SCRIPT_NAME"];

		// check if upgrade startet by upgrade-script to echo a message

		$tmp = 'upgrade-script.php';

		$globalStarted = substr_compare($callingScript, $tmp,(0-strlen($tmp)),strlen($tmp)) === 0;

// check for missing tables, if true stop the upgrade

		$aTable = array('mod_menu_link');

		$aPackage = UpgradeHelper::existsAllTables($aTable);

		if( sizeof($aPackage) > 0){

			$msg[] =  'TABLE '.implode(' missing! '.$FAIL.'<br />TABLE ',$aPackage).' missing! '.$FAIL;

			$msg[] = 'Menu_Link upgrade failed'." $FAIL";

			if($globalStarted) {

				echo '<strong>'.implode('<br />',$msg).'</strong><br />';

			}

			return ( ($globalStarted==true ) ? $globalStarted : $msg);

		} else {

			for($x=0; $x<sizeof($aTable);$x++) {

				if(($sOldType = $database->getTableEngine($database->TablePrefix.$aTable[$x]))) {

					if(('myisam' != strtolower($sOldType))) {

						if(!$database->query('ALTER TABLE `'.$database->TablePrefix.$aTable[$x].'` Engine = \'MyISAM\' ')) {

							$msg[] = $database->get_error();

						} else{

							$msg[] = 'TABLE `'.$database->TablePrefix.$aTable[$x].'` changed to Engine = \'MyISAM\''." $OK";

						}

					} else {

						$msg[] = 'TABLE `'.$database->TablePrefix.$aTable[$x].'` has Engine = \'MyISAM\''." $OK";

					}

				} else {

					$msg[] = $database->get_error();

				}

			}

// change table structure

			$sTable = $database->TablePrefix.'mod_menu_link';

			$sFieldName = 'redirect_type';

			$sDescription = "INT NOT NULL DEFAULT '301' AFTER `target_page_id`";

			if(!$database->field_modify($sTable,$sFieldName,$sDescription)) {

				$msg[] = ''.$database->get_error();

			} else {

				$msg[] = 'Field ( `redirect_type` ) description has been changed successfully'." $OK";

			}

// only for upgrade-script

			if($globalStarted) {

				if($bDebug) {

					echo '<strong>'.implode('<br />',$msg).'</strong><br />';

				}

			}

		$msg[] = 'Menu_Link upgrade successfull finished ';

		if($globalStarted) {

			echo "<strong>Menu_Link upgrade successfull finished $OK</strong><br />";

		}

		return ( ($globalStarted==true ) ? $globalStarted : $msg);

// ------------------------------------

$bDebugModus = ((isset($bDebugModus)) ? $bDebugModus : false);

// Don't show the messages twice

if( is_array($msg = mod_menu_link_upgrade($bDebugModus))) {

	echo '<strong>'.implode('<br />',$msg).'</strong><br />';

 * @copyright       2009-2013, Website Baker Org. e.V.

 * @link            http://www.websitebaker2.org/

 * @version         $Id$

 * @filesource      $HeadURL$

	$aError = array();

		$aError[] = $database->get_error();

  `email_fromname` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',