Project

General

Profile

« Previous | Next » 

Revision 1887

Added by Dietmar over 11 years ago

  1. bugfix Notice: Constant messages during new WB installation
    ! update WbDatabase SqlImport parameter,

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12
===============================================================================
13 13

  
14
12 Mar-2013 Build 1885 Dietmar Woellbrink (Luisehahne)
14
12 Mar-2013 Build 1887 Dietmar Woellbrink (Luisehahne)
15
# bugfix Notice: Constant messages during new WB installation
16
! update WbDatabase SqlImport parameter, 
17
12 Mar-2013 Build 1886 Dietmar Woellbrink (Luisehahne)
15 18
! Install update, Split Step1+2 from the inputs Steps
16 19
# Languages Typofix
17 20
! check tables remove not needed tables 
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', '1886');
54
if(!defined('REVISION')) define('REVISION', '1887');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/framework/WbDatabase.php
114 114
			throw new WbDatabaseException('Missing parameter: unable to connect database');
115 115
		}
116 116
		$this->_db_handle = @mysql_connect($hostname.$hostport,
117
		                                  $username,
118
		                                  $password);
117
		                                   $username,
118
		                                   $password);
119 119
		if(!$this->_db_handle) {
120 120
			throw new WbDatabaseException('unable to connect \''.$scheme.'://'.
121 121
			                           $hostname.$hostport.'\'');
......
400 400
 * Import a standard *.sql dump file
401 401
 * @param string $sSqlDump link to the sql-dumpfile
402 402
 * @param string $sTablePrefix
403
 * @param bool $bPreserve set to true will ignore all DROP TABLE statements
404
 * @param string $sTblEngine
405
 * @param string $sTblCollation
403
 * @param bool     $bPreserve   set to true will ignore all DROP TABLE statements
404
 * @param string   $sEngine     can be 'MyISAM' or 'InnoDB'
405
 * @param string   $sCollation  one of the list of available collations
406 406
 * @return boolean true if import successful
407 407
 */
408 408
	public function SqlImport($sSqlDump,
409 409
	                          $sTablePrefix = '',
410
	                          $bPreserve = true,
411
	                          $sTblEngine = 'ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci',
412
	                          $sTblCollation = ' collate utf8_unicode_ci')
410
	                          $bPreserve    = true,
411
	                          $sEngine      = 'MyISAM',
412
	                          $sCollation   = 'utf8_unicode_ci')
413 413
	{
414
		$sCollation = ($sCollation != '' ? $sCollation : 'utf8_unicode_ci');
415
		$aCharset = preg_split('/_/', $sCollation, null, PREG_SPLIT_NO_EMPTY);
416
		$sEngine = 'ENGINE='.$sEngine.' DEFAULT CHARSET='.$aCharset[0].' COLLATE='.$sCollation;
417
		$sCollation = ' collate '.$sCollation;
414 418
		$retval = true;
415 419
		$this->error = '';
416 420
		$aSearch  = array('{TABLE_PREFIX}','{TABLE_ENGINE}', '{TABLE_COLLATION}');
417
		$aReplace = array($sTablePrefix, $sTblEngine, $sTblCollation);
421
		$aReplace = array($this->sTablePrefix, $sEngine, $sCollation);
418 422
		$sql = '';
419 423
		$aSql = file($sSqlDump);
420 424
		while ( sizeof($aSql) > 0 ) {
branches/2.8.x/wb/framework/initialize.php
78 78
			$x1 = parse_url(WB_URL);
79 79
			define('WB_REL', (isset($x1['path']) ? $x1['path'] : ''));
80 80
		}
81
		define('ADMIN_REL', WB_REL.'/'.ADMIN_DIRECTORY);
81
		if(!defined('ADMIN_REL')){ define('ADMIN_REL', WB_REL.'/'.ADMIN_DIRECTORY); }
82 82
		if(!defined('DOCUMENT_ROOT')) {
83 83
			
84 84
			define('DOCUMENT_ROOT', preg_replace('/'.preg_quote(WB_REL, '/').'$/', '', WB_PATH));
85 85
		}
86
		define('TMP_PATH', WB_PATH.'/temp');
86
		if(!defined('TMP_PATH')){ define('TMP_PATH', WB_PATH.'/temp'); }
87 87
	}
88 88
/**
89 89
 * Read DB settings from configuration file
......
117 117
				switch($key):
118 118
					case 'DEBUG':
119 119
						$value = filter_var($value, FILTER_VALIDATE_BOOLEAN);
120
						if(!defined('DEBUG')) { define('DEBUG', $value); }
120 121
						break;
121 122
					case 'WB_URL':
122 123
					case 'AppUrl':
......
143 144
			$db['name'] = isset($db['name']) ? $db['name'] : 'dummy';
144 145
			$db['charset'] = isset($db['charset']) ? $db['charset'] : 'utf8';
145 146
			$db['table_prefix'] = (isset($db['table_prefix']) ? $db['table_prefix'] : '');
146
			define('TABLE_PREFIX', $db['table_prefix']);
147
			if(!defined('TABLE_PREFIX')) { define('TABLE_PREFIX', $db['table_prefix']); }
147 148
			if($sRetvalType == 'dsn') {
148 149
				$aRetval[0] = $db['type'].':dbname='.$db['name'].';host='.$db['host'].';'
149 150
				            . ($db['port'] != '' ? 'port='.(int)$db['port'].';' : '');
......
232 233
			switch($sSettingName):
233 234
				case 'STRING_FILE_MODE':
234 235
					$iTmp = ((intval(octdec($aSetting['value'])) & ~0111)|0600);
235
					define('OCTAL_FILE_MODE', $iTmp);
236
					define('STRING_FILE_MODE', sprintf('0%03o', $iTmp));
236
					if(!defined('OCTAL_FILE_MODE')) { define('OCTAL_FILE_MODE', $iTmp); }
237
					if(!defined('STRING_FILE_MODE')) { define('STRING_FILE_MODE', sprintf('0%03o', $iTmp)); }
237 238
					break;
238 239
				case 'STRING_DIR_MODE':
239 240
					$iTmp = (intval(octdec($aSetting['value'])) |0711);
240
					define('OCTAL_DIR_MODE', $iTmp);
241
					define('STRING_DIR_MODE', sprintf('0%03o', $iTmp));
241
					if(!defined('OCTAL_DIR_MODE')) { define('OCTAL_DIR_MODE', $iTmp); }
242
					if(!defined('STRING_DIR_MODE')) { define('STRING_DIR_MODE', sprintf('0%03o', $iTmp)); }
242 243
					break;
243 244
				case 'PAGES_DIRECTORY':
244 245
					// sanitize pages_directory
245 246
					$sTmp = trim($aSetting['value'], '/');
246 247
					$sTmp = ($sTmp == '' ? '' : '/'.$sTmp);
247
					define('PAGES_DIRECTORY', $sTmp);
248
					if(!defined('PAGES_DIRECTORY')) { define('PAGES_DIRECTORY', $sTmp); }
248 249
					break;
249 250
				default: // make global const from setting
250
					@define($sSettingName, $aSetting['value']);
251
					if(!defined($sSettingName)) { define($sSettingName, $aSetting['value']); }
251 252
					break;
252 253
			endswitch;
253 254
		}
......
266 267
		define('SESSION_STARTED', true);
267 268
	}
268 269
// get/set users timezone ---
269
	define('TIMEZONE',    (isset($_SESSION['TIMEZONE'])    ? $_SESSION['TIMEZONE']    : DEFAULT_TIMEZONE));
270
	define('DATE_FORMAT', (isset($_SESSION['DATE_FORMAT']) ? $_SESSION['DATE_FORMAT'] : DEFAULT_DATE_FORMAT));
271
	define('TIME_FORMAT', (isset($_SESSION['TIME_FORMAT']) ? $_SESSION['TIME_FORMAT'] : DEFAULT_TIME_FORMAT));
270
	if(!defined('TIMEZONE')) { define('TIMEZONE', (isset($_SESSION['TIMEZONE']) ? $_SESSION['TIMEZONE'] : DEFAULT_TIMEZONE)); }
271
	if(!defined('DATE_FORMAT')) { define('DATE_FORMAT', (isset($_SESSION['DATE_FORMAT']) ? $_SESSION['DATE_FORMAT'] : DEFAULT_DATE_FORMAT)); }
272
	if(!defined('TIME_FORMAT')) { define('TIME_FORMAT', (isset($_SESSION['TIME_FORMAT']) ? $_SESSION['TIME_FORMAT'] : DEFAULT_TIME_FORMAT)); }
272 273
// set Theme directory --- 
273
	define('THEME_URL',  WB_URL.'/templates/'.DEFAULT_THEME);
274
	define('THEME_PATH', WB_PATH.'/templates/'.DEFAULT_THEME);
275
	define('THEME_REL',  WB_REL.'/templates/'.DEFAULT_THEME);
274
	if(!defined('THEMA_URL')) { define('THEME_URL',  WB_URL.'/templates/'.DEFAULT_THEME); }
275
	if(!defined('THEME_PATH')) { define('THEME_PATH', WB_PATH.'/templates/'.DEFAULT_THEME); }
276
	if(!defined('THEME_REL')) { define('THEME_REL',  WB_REL.'/templates/'.DEFAULT_THEME); }
276 277
// extended wb editor settings
277
	define('EDIT_ONE_SECTION', false);
278
	define('EDITOR_WIDTH', 0);
278
	if(!defined('EDIT_ONE_SECTION')) { define('EDIT_ONE_SECTION', false); }
279
	if(!defined('EDITOR_WIDTH')) { define('EDITOR_WIDTH', 0); }
279 280
// define form security class and preload it ---
280 281
	$sSecMod = (defined('SECURE_FORM_MODULE') && SECURE_FORM_MODULE != '') ? '.'.SECURE_FORM_MODULE : '';
281 282
	$sSecMod = WB_PATH.'/framework/SecureForm'.$sSecMod.'.php';
282 283
	require_once($sSecMod);
283 284
// *** begin deprecated part *************************************************************
284 285
// load settings for use in Captch and ASP module
285
	if (!defined("WB_INSTALL_PROCESS")) {
286
	if (!defined('WB_INSTALL_PROCESS') && !defined('ENABLED_CAPTCHA')) {
286 287
		$sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_captcha_control`';
287 288
		// request settings from database
288 289
		if(($oSettings = $database->query($sql))) {
branches/2.8.x/wb/install/sql/websitebaker.sql
73 73
  `custom01` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
74 74
  `custom02` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
75 75
  PRIMARY KEY (`page_id`)
76
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
76
) {TABLE_ENGINE};
77 77
--
78 78
-- Structure of table  '{TABLE_PREFIX}sections'
79 79
--
......
87 87
  `publ_start` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '0',
88 88
  `publ_end` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '0',
89 89
  PRIMARY KEY (`section_id`)
90
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
90
) {TABLE_ENGINE};
91 91
--
92 92
-- Structure of table  '{TABLE_PREFIX}users'
93 93
--
branches/2.8.x/wb/install/save.php
43 43
 * Set constants for system/install values
44 44
 * @throws RuntimeException
45 45
 */
46
	function _SetInstallPathConstants() {
47
		if(!defined('DEBUG')){ define('DEBUG', false); } // normaly set in config file
48
		if(!defined('ADMIN_DIRECTORY')){ define('ADMIN_DIRECTORY', 'admin'); }
49
		if(!preg_match('/xx[a-z0-9_][a-z0-9_\-\.]+/i', 'xx'.ADMIN_DIRECTORY)) {
50
			throw new RuntimeException('Invalid admin-directory: ' . ADMIN_DIRECTORY);
51
		}
52
		if(!defined('WB_PATH')){ define('WB_PATH', dirname(dirname(__FILE__))); }
53
		if(!defined('ADMIN_URL')){ define('ADMIN_URL', WB_URL.'/'.ADMIN_DIRECTORY); }
54
		if(!defined('ADMIN_PATH')){ define('ADMIN_PATH', WB_PATH.'/'.ADMIN_DIRECTORY); }
55
		if(!defined('WB_REL')){
56
			$x1 = parse_url(WB_URL);
57
			define('WB_REL', (isset($x1['path']) ? $x1['path'] : ''));
58
		}
59
		define('ADMIN_REL', WB_REL.'/'.ADMIN_DIRECTORY);
60
		if(!defined('DOCUMENT_ROOT')) {
61
			
62
			define('DOCUMENT_ROOT', preg_replace('/'.preg_quote(WB_REL, '/').'$/', '', WB_PATH));
63
		}
64
		define('TMP_PATH', WB_PATH.'/temp');
65
	}
66 46

  
67 47
/**
68 48
 * Read DB settings from configuration file
......
122 102
			$db['name'] = isset($db['name']) ? $db['name'] : 'dummy';
123 103
			$db['charset'] = isset($db['charset']) ? $db['charset'] : 'utf8';
124 104
			$db['table_prefix'] = (isset($db['table_prefix']) ? $db['table_prefix'] : '');
125
			define('TABLE_PREFIX', $db['table_prefix']);
105
			if(!defined('TABLE_PREFIX')) {define('TABLE_PREFIX', $db['table_prefix']);}
126 106
			if($sRetvalType == 'dsn') {
127 107
				$aRetval[0] = $db['type'].':dbname='.$db['name'].';host='.$db['host'].';'
128 108
				            . ($db['port'] != '' ? 'port='.(int)$db['port'].';' : '');
......
431 411
$sDbConnectType = 'url'; // depending from class WbDatabase it can be 'url' or 'dsn'
432 412
$aSqlData = _readConfiguration($sDbConnectType);
433 413

  
434
_SetInstallPathConstants();
414
//_SetInstallPathConstants();
415
//$TABLE_PREFIX = $table_prefix;
416
//$WB_PATH = (dirname(dirname(__FILE__)));
417
//$ADMIN_PATH = $WB_PATH.'/admin';
418
if(!defined('WB_PATH')){ define('WB_PATH', dirname(dirname(__FILE__))); }
419
if(!defined('ADMIN_URL')){ define('ADMIN_URL', WB_URL.'/admin'); }
420
if(!defined('ADMIN_PATH')){ define('ADMIN_PATH', WB_PATH.'/admin'); }
435 421

  
436 422
if(!file_exists(WB_PATH.'/framework/class.admin.php')) {
437 423
	set_error('It appears the Absolute path that you entered is incorrect');
......
563 549
	if(!$database->SqlImport($sSqlFileName,TABLE_PREFIX, false)) { set_error($database->get_error()); }
564 550

  
565 551
	require_once(WB_PATH.'/framework/initialize.php');
552
// 
566 553
// Include WB functions file
567 554
	require_once(WB_PATH.'/framework/functions.php');
568 555
// Re-connect to the database, this time using in-build database class
branches/2.8.x/wb/modules/wysiwyg/sql/mod_wysiwyg.sql
1 1
-- phpMyAdmin SQL Dump
2
-- version 3.4.5
3
-- http://www.phpmyadmin.net
4
--
5
-- Host: localhost
6 2
-- Erstellungszeit: 15. Sep 2012 um 21:37
7 3
-- Server Version: 5.5.16
8
-- PHP-Version: 5.3.8
9

  
10 4
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
11
SET time_zone = "+00:00";
12

  
13

  
14
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
15
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
16
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
17
/*!40101 SET NAMES utf8 */;
18

  
19 5
-- --------------------------------------------------------
20

  
6
-- Database structure for module 'wysiwyg'
21 7
--
8
-- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {TABLE_COLLATION}
9
--
10
-- --------------------------------------------------------
11
--
22 12
-- Tabellenstruktur für Tabelle `mod_wysiwyg`
23
--
24 13

  
25 14
DROP TABLE IF EXISTS `{TABLE_PREFIX}mod_wysiwyg`;
26 15
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}mod_wysiwyg` (
27 16
  `section_id` int(11) NOT NULL DEFAULT '0',
28 17
  `page_id` int(11) NOT NULL DEFAULT '0',
29
  `content` longtext NOT NULL,
30
  `text` longtext NOT NULL,
18
  `content` longtext{TABLE_COLLATION} NOT NULL,
19
  `text` longtext{TABLE_COLLATION} NOT NULL,
31 20
  PRIMARY KEY (`section_id`)
32
) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
33

  
34
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
35
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
36
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
21
) {TABLE_ENGINE};
22
-- EndOfFile
branches/2.8.x/wb/modules/form/sql/form284db.sql
1 1
-- phpMyAdmin SQL Dump
2
-- version 3.4.5
3
-- http://www.phpmyadmin.net
4
--
5
-- Host: localhost
6 2
-- Erstellungszeit: 16. Sep 2012 um 03:20
7 3
-- Server Version: 5.5.16
8
-- PHP-Version: 5.3.8
9
-- $Id$
10

  
11 4
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
12
SET time_zone = "+00:00";
13

  
14

  
15
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
16
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
17
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
18
/*!40101 SET NAMES utf8 */;
19

  
5
-- --------------------------------------------------------
6
-- Database structure for module 'form'
20 7
--
21
-- Datenbank: ``
8
-- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {TABLE_COLLATION}
22 9
--
23

  
24 10
-- --------------------------------------------------------
25

  
26 11
--
27 12
-- Tabellenstruktur für Tabelle `mod_form_fields`
28 13
--
29

  
30 14
DROP TABLE IF EXISTS `{TABLE_PREFIX}mod_form_fields`;
31 15
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}mod_form_fields` (
32 16
  `field_id` int(11) NOT NULL AUTO_INCREMENT,
33 17
  `section_id` int(11) NOT NULL DEFAULT '0',
34 18
  `page_id` int(11) NOT NULL DEFAULT '0',
35 19
  `position` int(11) NOT NULL DEFAULT '0',
36
  `title` varchar(255) NOT NULL DEFAULT '',
37
  `type` varchar(255) NOT NULL DEFAULT '',
20
  `title` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
21
  `type` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
38 22
  `required` int(11) NOT NULL DEFAULT '0',
39
  `value` text NOT NULL,
40
  `extra` text NOT NULL,
23
  `value` text{TABLE_COLLATION} NOT NULL,
24
  `extra` text{TABLE_COLLATION} NOT NULL,
41 25
  PRIMARY KEY (`field_id`)
42 26
) {TABLE_ENGINE};
43

  
44 27
-- --------------------------------------------------------
45

  
46 28
--
47 29
-- Tabellenstruktur für Tabelle `mod_form_settings`
48 30
--
49

  
50 31
DROP TABLE IF EXISTS `{TABLE_PREFIX}mod_form_settings`;
51 32
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}mod_form_settings` (
52 33
  `section_id` int(11) NOT NULL DEFAULT '0',
53 34
  `page_id` int(11) NOT NULL DEFAULT '0',
54
  `header` text NOT NULL,
35
  `header` text{TABLE_COLLATION} NOT NULL,
55 36
  `field_loop` text NOT NULL,
56
  `footer` text NOT NULL,
57
  `email_to` text NOT NULL,
58
  `email_from` varchar(255) NOT NULL DEFAULT '',
59
  `email_fromname` varchar(255) NOT NULL DEFAULT '',
60
  `email_subject` varchar(255) NOT NULL DEFAULT '',
61
  `success_page` text NOT NULL,
62
  `success_email_to` text NOT NULL,
63
  `success_email_from` varchar(255) NOT NULL DEFAULT '',
64
  `success_email_fromname` varchar(255) NOT NULL DEFAULT '',
65
  `success_email_text` text NOT NULL,
66
  `success_email_subject` varchar(255) NOT NULL DEFAULT '',
37
  `footer` text{TABLE_COLLATION} NOT NULL,
38
  `email_to` text{TABLE_COLLATION} NOT NULL,
39
  `email_from` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
40
  `email_fromname` varchar(255{TABLE_COLLATION}) NOT NULL DEFAULT '',
41
  `email_subject` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
42
  `success_page` text{TABLE_COLLATION} NOT NULL,
43
  `success_email_to` text{TABLE_COLLATION} NOT NULL,
44
  `success_email_from` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
45
  `success_email_fromname` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
46
  `success_email_text` text{TABLE_COLLATION} NOT NULL,
47
  `success_email_subject` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
67 48
  `stored_submissions` int(11) NOT NULL DEFAULT '0',
68 49
  `max_submissions` int(11) NOT NULL DEFAULT '0',
69 50
  `perpage_submissions` int(11) NOT NULL DEFAULT '10',
70 51
  `use_captcha` int(11) NOT NULL DEFAULT '0',
71 52
  PRIMARY KEY (`section_id`)
72 53
) {TABLE_ENGINE};
73

  
74 54
-- --------------------------------------------------------
75

  
76 55
--
77 56
-- Tabellenstruktur für Tabelle `mod_form_submissions`
78 57
--
79

  
80 58
DROP TABLE IF EXISTS `{TABLE_PREFIX}mod_form_submissions`;
81 59
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}mod_form_submissions` (
82 60
  `submission_id` int(11) NOT NULL AUTO_INCREMENT,
......
84 62
  `page_id` int(11) NOT NULL DEFAULT '0',
85 63
  `submitted_when` int(11) NOT NULL DEFAULT '0',
86 64
  `submitted_by` int(11) NOT NULL DEFAULT '0',
87
  `body` text NOT NULL,
65
  `body` text{TABLE_COLLATION} NOT NULL,
88 66
  PRIMARY KEY (`submission_id`)
89 67
) {TABLE_ENGINE};
90

  
91
-- --------------------------------------------------------
92

  
93
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
94
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
95
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
68
-- EndOfFile

Also available in: Unified diff