Project

General

Profile

« Previous | Next » 

Revision 1896

Added by Dietmar over 11 years ago

  1. solved install exeption
    ! update wrapper module and set version to 2.8.4
    ! update wysiwyg install.php, info.php

View differences:

branches/2.8.x/CHANGELOG
13 13 

  		




  14
  14
  
    

  		




  15
  15
  
    

  		




  
  16
  
    
20 Mar-2013 Build 1896 Dietmar Woellbrink (Luisehahne)


  		




  
  17
  
    
# solved install exeption


  		




  
  18
  
    
! update wrapper module and set version to 2.8.4


  		




  
  19
  
    
! update wysiwyg install.php, info.php


  		




  16
  20
  
    
20 Mar-2013 Build 1895 Dietmar Woellbrink (Luisehahne)


  		




  17
  21
  
    
! update jsadmin module and set Version to 1.4.1


  		




  18
  22
  
    
! update news module and set Version to 3.8.7


  		












  

    
      branches/2.8.x/wb/upgrade-script.php
    
  





  954
  954
  
    
	 */


  		




  955
  955
  
    
	$aModuleList = array(


  		




  956
  956
  
    
	              'captcha_control','code','form','jsadmin',


  		




  957
  
  
    
	              'menu_link','news','output_filter','wysiwyg');


  		




  
  957
  
    
	              'menu_link','news','output_filter','wrapper','wysiwyg');


  		




  958
  958
  
    
	if(sizeof($aModuleList)) 


  		




  959
  959
  
    
	{


  		




  960
  960
  
    
		echo '<h3>Step '.(++$stepID).': Upgrade proofed modules</h3>';


  		












  

    
      branches/2.8.x/wb/config.php.new
    
  





  
  1
  
    
<?php


  		












  

    
      branches/2.8.x/wb/admin/interface/version.php
    
  





  51
  51
  
    

  		




  52
  52
  
    
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)


  		




  53
  53
  
    
if(!defined('VERSION')) define('VERSION', '2.8.3');


  		




  54
  
  
    
if(!defined('REVISION')) define('REVISION', '1895');


  		




  
  54
  
    
if(!defined('REVISION')) define('REVISION', '1896');


  		




  55
  55
  
    
if(!defined('SP')) define('SP', '');


  		












  

    
      branches/2.8.x/wb/setup.ini.php.new
    
  





  
  1
  
    
<?php


  		












  

    
      branches/2.8.x/wb/install/save.php
    
  





  39
  39
  
    
include(dirname(dirname(__FILE__)).'/framework/WbAutoloader.php');


  		




  40
  40
  
    
WbAutoloader::doRegister(array('admin'=>'a', 'modules'=>'m'));


  		




  41
  41
  
    

  		




  42
  
  
    
/**


  		




  43
  
  
    
 * Set constants for system/install values


  		




  44
  
  
    
 * @throws RuntimeException


  		




  45
  
  
    
 */


  		




  
  42
  
    
function errorLogs($error_str)


  		




  
  43
  
    
{


  		




  
  44
  
    
	$log_error = true;


  		




  
  45
  
    
	if ( ! function_exists('error_log') ) { $log_error = false; }


  		




  
  46
  
    
	$log_file = @ini_get('error_log');


  		




  
  47
  
    
	if ( !empty($log_file) && ('syslog' != $log_file) && !@is_writable($log_file) ) {


  		




  
  48
  
    
		$log_error = false;


  		




  
  49
  
    
	}


  		




  
  50
  
    
	if ( $log_error ) {@error_log($error_str, 0);}


  		




  
  51
  
    
}


  		




  46
  52
  
    

  		




  47
  53
  
    
/**


  		




  48
  54
  
    
 * Read DB settings from configuration file


  		




  ......




  407
  413
  
    
	set_error("The configuration file $sConfigName is not writable. Change its permissions so it is, then re-run step 4.");


  		




  408
  414
  
    
}


  		




  409
  415
  
    

  		




  410
  
  
    
// load db configuration ---


  		




  411
  
  
    
$sDbConnectType = 'url'; // depending from class WbDatabase it can be 'url' or 'dsn'


  		




  412
  
  
    
$aSqlData = _readConfiguration($sDbConnectType);


  		




  413
  
  
    

  		




  414
  416
  
    
//_SetInstallPathConstants();


  		




  415
  
  
    
//$TABLE_PREFIX = $table_prefix;


  		




  416
  
  
    
//$WB_PATH = (dirname(dirname(__FILE__)));


  		




  417
  
  
    
//$ADMIN_PATH = $WB_PATH.'/admin';


  		




  
  417
  
    
if(!defined('WB_INSTALL_PROCESS')){ define('WB_INSTALL_PROCESS', true ); }


  		




  
  418
  
    
if(!defined('WB_URL')){ define('WB_URL', trim( $wb_url,'/' )); }


  		




  418
  419
  
    
if(!defined('WB_PATH')){ define('WB_PATH', dirname(dirname(__FILE__))); }


  		




  419
  420
  
    
if(!defined('ADMIN_URL')){ define('ADMIN_URL', WB_URL.'/admin'); }


  		




  420
  421
  
    
if(!defined('ADMIN_PATH')){ define('ADMIN_PATH', WB_PATH.'/admin'); }


  		




  
  422
  
    
// load db configuration ---


  		




  
  423
  
    
$sDbConnectType = 'url'; // depending from class WbDatabase it can be 'url' or 'dsn'


  		




  
  424
  
    
$aSqlData = _readConfiguration($sDbConnectType);


  		




  421
  425
  
    

  		




  422
  426
  
    
if(!file_exists(WB_PATH.'/framework/class.admin.php')) {


  		




  423
  427
  
    
	set_error('It appears the Absolute path that you entered is incorrect');


  		












  

    
      branches/2.8.x/wb/modules/wrapper/sql/mod_wrapper.sql
    
  





  
  1
  
    
-- phpMyAdmin SQL Dump


  		




  
  2
  
    
-- Server version 5.5.7


  		




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


  		




  
  4
  
    
--


  		




  
  5
  
    
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";


  		




  
  6
  
    
-- --------------------------------------------------------


  		




  
  7
  
    
-- Database structure for WebsiteBaker core


  		




  
  8
  
    
--


  		




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


  		




  
  10
  
    
--


  		




  
  11
  
    
-- --------------------------------------------------------


  		




  
  12
  
    
--


  		




  
  13
  
    
-- Tabellenstruktur für Tabelle `mod_wrapper`


  		




  
  14
  
    
--


  		




  
  15
  
    
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}mod_wrapper` (


  		




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


  		




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


  		




  
  18
  
    
  `url` text{TABLE_COLLATION} NOT NULL DEFAULT '',


  		




  
  19
  
    
  `height` int(11) NOT NULL DEFAULT '0',


  		




  
  20
  
    
  PRIMARY KEY (`section_id`)


  		




  
  21
  
    
){TABLE_ENGINE};


  		




  
  22
  
    
--


  		




  
  23
  
    
-- EndOfFile


  		












  

    
      branches/2.8.x/wb/modules/wrapper/info.php
    
  





  4
  4
  
    
 * @category        modules


  		




  5
  5
  
    
 * @package         wrapper


  		




  6
  6
  
    
 * @author          WebsiteBaker Project


  		




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


  		




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


  		




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


  		




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


  		




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


  		




  10
  10
  
    
 * @platform        WebsiteBaker 2.8.x


  		




  11
  11
  
    
 * @requirements    PHP 5.2.2 and higher


  		




  12
  
  
    
 * @version      	$Id$


  		




  13
  
  
    
 * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/wrapper/install.php $


  		




  
  12
  
    
 * @version         $Id$


  		




  
  13
  
    
 * @filesource      $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/wrapper/install.php $


  		




  14
  14
  
    
 * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10 Jan 2011) $


  		




  15
  15
  
    
 *


  		




  16
  16
  
    
 */


  		




  17
  
  
    
// Must include code to stop this file being access directly


  		




  18
  17
  
    
/* -------------------------------------------------------- */


  		




  19
  
  
    
if(defined('WB_PATH') == false)


  		




  20
  
  
    
{


  		




  21
  
  
    
	// Stop this file being access directly


  		




  22
  
  
    
		die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');


  		




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


  		




  
  19
  
    
if(!defined('WB_PATH')) {


  		




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


  		




  
  21
  
    
	throw new IllegalFileException();


  		




  23
  22
  
    
}


  		




  24
  23
  
    
/* -------------------------------------------------------- */


  		




  25
  24
  
    

  		




  26
  25
  
    
$module_directory = 'wrapper';


  		




  27
  26
  
    
$module_name = 'Wrapper';


  		




  28
  27
  
    
$module_function = 'page';


  		




  29
  
  
    
$module_version = '2.8.3';


  		




  30
  
  
    
$module_platform = '2.7 | 2.8.x';


  		




  
  28
  
    
$module_version = '2.8.4';


  		




  
  29
  
    
$module_platform = '2.8.4';


  		




  31
  30
  
    
$module_author = 'Ryan Djurovich';


  		




  32
  31
  
    
$module_license = 'GNU General Public License';


  		




  33
  32
  
    
$module_description = 'This module allows you to wrap your site around another using an inline frame';


  		












  

    
      branches/2.8.x/wb/modules/wrapper/install.php
    
  





  4
  4
  
    
 * @category        modules


  		




  5
  5
  
    
 * @package         wrapper


  		




  6
  6
  
    
 * @author          WebsiteBaker Project


  		




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


  		




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


  		




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


  		




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


  		




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


  		




  10
  10
  
    
 * @platform        WebsiteBaker 2.8.x


  		




  11
  11
  
    
 * @requirements    PHP 5.2.2 and higher


  		




  12
  
  
    
 * @version      	$Id$


  		




  13
  
  
    
 * @filesource		$HeadURL$


  		




  
  12
  
    
 * @version         $Id$


  		




  
  13
  
    
 * @filesource      $HeadURL$


  		




  14
  14
  
    
 * @lastmodified    $Date$


  		




  15
  15
  
    
 *


  		




  16
  16
  
    
 */


  		




  17
  
  
    

  		




  18
  
  
    
if(defined('WB_URL')) {


  		




  19
  
  
    
	


  		




  
  17
  
    
/* -------------------------------------------------------- */


  		




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


  		




  
  19
  
    
if(!defined('WB_PATH')) {


  		




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


  		




  
  21
  
    
	throw new IllegalFileException();


  		




  
  22
  
    
} else {


  		




  
  23
  
    
// Create tables


  		




  
  24
  
    
	$aError = array();


  		




  20
  25
  
    
	// Create table


  		




  21
  
  
    
	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wrapper`");


  		




  22
  
  
    
	$mod_wrapper = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_wrapper` ('


  		




  23
  
  
    
		. ' `section_id` INT NOT NULL DEFAULT \'0\','


  		




  24
  
  
    
		. ' `page_id` INT NOT NULL DEFAULT \'0\','


  		




  25
  
  
    
		. ' `url` TEXT NOT NULL,'


  		




  26
  
  
    
		. ' `height` INT NOT NULL DEFAULT \'0\','


  		




  27
  
  
    
		. ' PRIMARY KEY ( `section_id` ) '


  		




  28
  
  
    
		. ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';


  		




  29
  
  
    
	$database->query($mod_wrapper);


  		




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


  		




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


  		




  
  28
  
    
	}


  		




  30
  29
  
    
}


  		












  

    
      branches/2.8.x/wb/modules/wrapper/upgrade.php
    
  





  4
  4
  
    
 * @category        modules


  		




  5
  5
  
    
 * @package         wrapper


  		




  6
  6
  
    
 * @author          WebsiteBaker Project


  		




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


  		




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


  		




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


  		




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


  		




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


  		




  10
  10
  
    
 * @platform        WebsiteBaker 2.8.x


  		




  11
  11
  
    
 * @requirements    PHP 5.2.2 and higher


  		




  12
  
  
    
 * @version      	$Id$


  		




  13
  
  
    
 * @filesource		$HeadURL$


  		




  
  12
  
    
 * @version         $Id$


  		




  
  13
  
    
 * @filesource      $HeadURL$


  		




  14
  14
  
    
 * @lastmodified    $Date$


  		




  15
  15
  
    
 *


  		




  16
  16
  
    
 */


  		




  17
  
  
    
// Must include code to stop this file being access directly


  		




  18
  17
  
    
/* -------------------------------------------------------- */


  		




  19
  
  
    
if(defined('WB_PATH') == false)


  		




  20
  
  
    
{


  		




  21
  
  
    
	// Stop this file being access directly


  		




  22
  
  
    
		die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');


  		




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


  		




  
  19
  
    
if(!defined('WB_URL')) {


  		




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


  		




  
  21
  
    
	throw new IllegalFileException();


  		




  23
  22
  
    
}


  		




  24
  23
  
    
/* -------------------------------------------------------- */


  		




  25
  24
  
    

  		




  26
  
  
    
$msg = '';


  		




  27
  
  
    
$sTable = TABLE_PREFIX.'mod_wrapper';


  		




  28
  
  
    
if(($sOldType = $database->getTableEngine($sTable))) {


  		




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


  		




  30
  
  
    
		if(!$database->query('ALTER TABLE `'.$sTable.'` Engine = \'MyISAM\' ')) {


  		




  31
  
  
    
			$msg = $database->get_error();


  		




  
  25
  
    
	function mod_wrapper_upgrade($bDebug=false) {


  		




  
  26
  
    
		global $OK ,$FAIL;


  		




  
  27
  
    
		$database=WbDatabase::getInstance();


  		




  
  28
  
    
		$msg = array();


  		




  
  29
  
    
		$callingScript = $_SERVER["SCRIPT_NAME"];


  		




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


  		




  
  31
  
    
		$tmp = 'upgrade-script.php';


  		




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


  		




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


  		




  
  34
  
    
		$aTable = array('mod_wrapper');


  		




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


  		




  
  36
  
    
		if( sizeof($aPackage) > 0){


  		




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


  		




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


  		




  
  39
  
    
			if($globalStarted) {


  		




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


  		




  
  41
  
    
			}


  		




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


  		




  
  43
  
    
		} else {


  		




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


  		




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


  		




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


  		




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


  		




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


  		




  
  49
  
    
						} else{


  		




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


  		




  
  51
  
    
						}


  		




  
  52
  
    
					} else {


  		




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


  		




  
  54
  
    
					}


  		




  
  55
  
    
				} else {


  		




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


  		




  
  57
  
    
				}


  		




  
  58
  
    
			}


  		




  
  59
  
    
// only for upgrade-script


  		




  
  60
  
    
			if($globalStarted) {


  		




  
  61
  
    
				if($bDebug) {


  		




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


  		




  
  63
  
    
				}


  		




  
  64
  
    
			}


  		




  32
  65
  
    
		}


  		




  
  66
  
    
		$msg[] = 'Mod_Wrapper upgrade successfull finished '." $OK";


  		




  
  67
  
    
		if($globalStarted) {


  		




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


  		




  
  69
  
    
		}


  		




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


  		




  33
  71
  
    
	}


  		




  34
  
  
    
} else {


  		




  35
  
  
    
	$msg = $database->get_error();


  		




  
  72
  
    
// ------------------------------------


  		




  
  73
  
    

  		




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


  		




  
  75
  
    
// Don't show the messages twice


  		




  
  76
  
    
if( is_array($msg = mod_wrapper_upgrade($bDebugModus)) ) {


  		




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


  		




  36
  78
  
    
}


  		




  37
  
  
    
// ------------------------------------


  		












  

    
      branches/2.8.x/wb/modules/wysiwyg/info.php
    
  





  4
  4
  
    
 * @category        modules


  		




  5
  5
  
    
 * @package         wysiwyg


  		




  6
  6
  
    
 * @author          WebsiteBaker Project


  		




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


  		




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


  		




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


  		




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


  		




  10
  10
  
    
 * @platform        WebsiteBaker 2.8.3


  		












  

    
      branches/2.8.x/wb/modules/wysiwyg/install.php
    
  





  4
  4
  
    
 * @category        modules


  		




  5
  5
  
    
 * @package         wysiwyg


  		




  6
  6
  
    
 * @author          WebsiteBaker Project


  		




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


  		




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


  		




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


  		




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


  		




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


  		




  10
  10
  
    
 * @platform        WebsiteBaker 2.8.3


  		




  11
  11
  
    
 * @requirements    PHP 5.2.2 and higher


  		




  12
  
  
    
 * @version      	$Id$


  		




  13
  
  
    
 * @filesource		$HeadURL$


  		




  
  12
  
    
 * @version         $Id$


  		




  
  13
  
    
 * @filesource      $HeadURL$


  		




  14
  14
  
    
 * @lastmodified    $Date$


  		




  15
  15
  
    
 *


  		




  16
  16
  
    
 */


  		




  ......




  21
  21
  
    
	throw new IllegalFileException();


  		




  22
  22
  
    
} else {


  		




  23
  23
  
    
	// Create table


  		




  
  24
  
    
	$aError = array();


  		




  
  25
  
    
	// Create table


  		




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


  		




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


  		




  
  28
  
    
	}


  		




  24
  29
  
    

  		




  25
  
  
    
$database->SqlImport(dirname(__FILE__).'/sql/mod_wysiwyg.sql','',false);


  		




  26
  
  
    

  		




  27
  30
  
    
// remove old version of search (deprecated)


  		




  28
  31
  
    

  		




  29
  32
  
    
}


  		












Also available in:  Unified diff