WB 2.08.x

06 Oct-2013 Build 1977 Dietmar Woellbrink (Luisehahne)

! /framework/functions.php: started implementation of packet AccessFile in function rebuild_all_accessfiles()

+ /framework/functions.php::rm_full_dir() added additional argument to set list of protected files

! integrate the new processes into the upgrade-script.php

+ extended checks and informations in /modules/MultiLingual/upgrade.php 

  increasing version for module MultiLingual to 1.6.9

!  /install/sql/wb_search_data.sql recoding initial data for table `search` without primary index value

$stepID = 1;

	$aDebugMessage = rebuildFolderProtectFile();

//    $sPagePath = (defined('PAGES_DIRECTORY') && (PAGES_DIRECTORY != '') ? PAGES_DIRECTORY : '');

//	$sPageDir = str_replace('\\','/',WB_PATH.$sPagePath);

//	$aProtectedFiles = array(

//           $sPageDir.'/intro.php',

//           $sPageDir.'/intro/intro.php',

//    );

    $msg = rebuild_all_accessfiles($bDebugModus);

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

 * Delete an Accessfiles Tree

 * @param  string  $sDirToDelete  

 * @return boolean true/false

 * @description    Delete all accessfiles and its depending directory tree 

 *                 inside the given directory.

 */

function DeleteAccessFilesTree($sDirToDelete)

{

        $sBaseDir = realpath($sDirToDelete);

        if( $sBaseDir !== false) {    

		$sBaseDir = rtrim(str_replace('\\', '/', $sBaseDir), '/') . '/';

		// scan start directory for access files

		foreach (glob($sBaseDir . '*.php', GLOB_MARK) as $sItem) {

            $sItem = str_replace('\\', '/', $sItem);

			try{

				$oAccFile = new AccessFile($sItem);

				$oAccFile->delete();

			}catch(AccessFileIsNoAccessfileException $e) {

				continue;

			}

		}

		return true;

	}	

	return false;

}

/**

 * @param array $aProtectedFiles optional list of protected files, full path needed

function rm_full_dir($directory, $empty = false, $aProtectedFiles = null)

	$directory = rtrim(str_replace('\\','/',$directory),'/');

	if($aProtectedFiles == null) {

		$aProtectedFiles = array();

	}

		if(!in_array(($directory), $aProtectedFiles)) {

			$retval = unlink($directory);

			clearstatcache();

			error_reporting($iErrorReporting);

			return $retval;

		}else {

			return true;

		}

                    rm_full_dir($path, false, $aProtectedFiles);

					if(!in_array($path, $aProtectedFiles)) {

				        unlink($path);

						clearstatcache();

					}

	$wb_path   = rtrim(str_replace('\/\\', '/', WB_PATH), '/');

	$sAppPath  = rtrim(str_replace('\/\\', '/', WB_PATH), '/').'/';

	if( ($sAbsDir=='') || ($sAbsDir == $sAppPath) ) { return $retVal;}

		if (!make_dir($sAbsDir) && !is_dir($sAbsDir) ) {

		$iBackSteps = substr_count(str_replace($sAppPath, '', $sAbsDir), '/');

		$sIndexFile = str_repeat('../', $iBackSteps).'index.php';

	function rebuild_all_accessfiles($bShowDetails=false ) {

    	$aRetval = array();

 //   	$sTempDir = (defined('PAGES_DIRECTORY') && (PAGES_DIRECTORY != '') ? PAGES_DIRECTORY : '').'/';

        $sTreeToDelete = WbAdaptor::getInstance()->AppPath.WbAdaptor::getInstance()->PagesDir;

    	if(($sTreeToDelete!='') && is_writeable($sTreeToDelete)==true) {

//    	 	if(rm_full_dir (WB_PATH.$sTempDir, true, $aProtectedFiles )==false) {

//    			$aRetval[] = 'Could not delete existing access files';

//    	 	}

            DeleteAccessFilesTree($sTreeToDelete);

            if($bShowDetails) {

                $aRetval = array_merge($aRetval, AccessFileHelper::getDelTreeLog());

            }

		$aRetval = array_merge($aRetval,createFolderProtectFile(rtrim( WB_PATH.PAGES_DIRECTORY,'/') ));

            $aRetval[] = 'Number of new formated access files: '.$x.'';

    return $aRetval;

 * @version      1.6.9

$module_name = 'MultiLingual Switcher 1.6.9';

$module_version = '1.6.9';

 * @version      1.6.9

	function mod_MultiLingual_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;

// change table structure

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

    	$sFieldName = 'page_code';

    	$sDescription = "INT NOT NULL DEFAULT '0' AFTER `language`";

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

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

		} else {

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

		}

// Work-out if we should check old format for existing page_code

        $sql = 'DESCRIBE `'.$database->TablePrefix.'pages` `page_code`';

        $field_sql = $database->query($sql);

//        $field_set = $field_sql->numRows();

        $format = $field_sql->fetchRow(MYSQL_ASSOC) ;

        // upgrade only if old format

        if($format['Type'] == 'varchar(255)' )

        {

            $sql = 'SELECT `page_code`,`page_id` FROM `'.$database->TablePrefix.'pages` ORDER BY `page_id`';

            if($query_code = $database->query($sql))

            {

                // extract page_id from old format

                $pattern = '/(?<=_)([0-9]{1,11})/s';

                while( $page  = $query_code->fetchRow(MYSQL_ASSOC))

                {

                    preg_match($pattern, $page['page_code'], $array);

                    $page_code = $array[0];

                    $page_id =  $page['page_id'];

                    $sql  = 'UPDATE `'.$database->TablePrefix.'pages` SET ';

                    $sql .= ((empty($array[0])) ? '`page_code` = 0 ' : '`page_code` = '.$page_code.' ');

                    $sql .= 'WHERE `page_id` = '.$page_id;

                    $database->query($sql);

                }

                $field_set = $database->field_modify($sTable,$sFieldName,$sDescription);

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

// only for upgrade-script

    			if($globalStarted) {

    				if($bDebug) {

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

    				}

    			}

            }  else {

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

            }  

        }

        //

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

		if($globalStarted) {

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

		}

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

	}

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

//$directory = dirname(__FILE__).'/'.'info.php';

//// update entry in table addons to new version

//load_module($directory, $install = false);

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

// Don't show the messages twice

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

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

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