Commit 7a194cd7 authored by Kasper Skårhøj's avatar Kasper Skårhøj
Browse files

* Moved "install" extension to be a sys extension in sysext/ (MAKE SURE to remove your old global "install" extension and clear the TEMP_cached files.


git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@305 709f56b5-9817-0410-a4d7-c38de5d9e867
parent 58093839
2004-05-17 Kasper Skårhøj,,, <kasper@typo3.com>
* Moved "install" extension to be a sys extension in sysext/
2004-05-17 Kasper Skårhøj,,, <kasper@typo3.com>
* Corrected some bugs in t3lib_cs while writing a unit test for it.
2004-05-15 Kasper Skårhøj,,, <kasper@typo3.com>
* Splitted the Install Tool interface parts out from t3lib_install into the class tx_install (in extension "install"). Only things left are logic to update localconf.php files and manage SQL / Database (for Extension Manager).
2004-05-11 Kasper Skårhøj,,, <kasper@typo3.com>
* Changed version number to 3.7.0-dev according to newly adopted major.minor.patch version numbering model.
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -210,10 +210,11 @@ if (!get_magic_quotes_gpc()) {
// Check if the install script should be run:
// ********************************************
if (defined('TYPO3_enterInstallScript') && TYPO3_enterInstallScript) {
require_once (PATH_t3lib.'class.t3lib_install.php');
require_once (PATH_t3lib.'class.t3lib_stdgraphic.php');
$install_check = t3lib_div::makeInstance('t3lib_install');
$install_check->allowUpdateLocalConf=1;
if (!t3lib_extMgm::isLoaded('install')) die('Install Tool is not loaded as an extension.<br/>You must add the key "install" to the list of installed extensions in typo3temp/localconf.php, $TYPO3_CONF_VARS["EXT"]["extList"].');
require_once(t3lib_extMgm::extPath('install').'mod/class.tx_install.php');
$install_check = t3lib_div::makeInstance('tx_install');
$install_check->allowUpdateLocalConf = 1;
$install_check->init();
exit;
}
......
......@@ -42,7 +42,7 @@
// This checks for my own IP at home. You can just remove the if-statement.
if (1==0 || (substr($HTTP_SERVER_VARS['REMOTE_ADDR'],0,7)!='192.168' && $HTTP_SERVER_VARS['REMOTE_ADDR']!='127.0.0.1')) {
die("In the main source distribution of TYPO3, the install script is disabled by a die() function call.<BR>Open the file typo3/install/index.php and remove/out-comment the line that outputs this message!");
die("In the source distribution of TYPO3, the install script is disabled by a die() function call.<br/><b>Fix:</b> Open the file typo3/install/index.php and remove/out-comment the line that outputs this message!");
}
......
......@@ -185,25 +185,6 @@ if (t3lib_extMgm::isLoaded('extrep_wizard')) {
}
/**
* Extension class of install tool for use in Extension Manager.
*
* @author Kasper Skaarhoj <kasper@typo3.com>
* @package TYPO3
* @subpackage core
*/
class em_install_class extends t3lib_install {
/**
* Make sure the normal constructor is NOT called:
*
* @return void
*/
function em_install_class() {
}
}
......@@ -3091,14 +3072,14 @@ EXTENSION KEYS:
function writeNewExtensionList($newExtList) {
// Instance of install tool
$instObj = new em_install_class;
$instObj = new t3lib_install;
$instObj->allowUpdateLocalConf =1;
$instObj->updateIdentity = 'TYPO3 Extension Manager';
// Get lines from localconf file
$lines = $instObj->writeToLocalconf_control();
$instObj->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'EXT\'][\'extList\']', $newExtList);
$instObj->writeToLocalconf_control($lines,1);
$instObj->writeToLocalconf_control($lines);
$this->removeCacheFiles();
}
......@@ -3114,14 +3095,14 @@ EXTENSION KEYS:
function writeTsStyleConfig($extKey,$arr) {
// Instance of install tool
$instObj = new em_install_class;
$instObj = new t3lib_install;
$instObj->allowUpdateLocalConf =1;
$instObj->updateIdentity = 'TYPO3 Extension Manager';
// Get lines from localconf file
$lines = $instObj->writeToLocalconf_control();
$instObj->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'EXT\'][\'extConf\'][\''.$extKey.'\']', serialize($arr)); // This will be saved only if there are no linebreaks in it !
$instObj->writeToLocalconf_control($lines,1);
$instObj->writeToLocalconf_control($lines);
$this->removeCacheFiles();
}
......@@ -3491,7 +3472,6 @@ EXTENSION KEYS:
$tce->start(Array(),Array());
$tce->clear_cacheCmd('all');
} else { // Show checkbox for clearing cache:
$instObj = new em_install_class;
$content.= '
<br />
<h3>Clear cache</h3>
......@@ -3513,9 +3493,6 @@ EXTENSION KEYS:
*/
function checkUploadFolder($extKey,$extInfo) {
// Install class instance:
$instObj = new em_install_class;
// Checking for upload folder:
$uploadFolder = PATH_site.$this->ulFolder($extKey);
if ($extInfo['EM_CONF']['uploadfolder'] && !@is_dir($uploadFolder)) {
......@@ -3602,7 +3579,7 @@ EXTENSION KEYS:
function checkDBupdates($extKey,$extInfo,$infoOnly=0) {
// Initializing Install Tool object:
$instObj = new em_install_class;
$instObj = new t3lib_install;
$instObj->INSTALL = t3lib_div::_GP('TYPO3_INSTALL');
$dbStatus = array();
......@@ -3621,9 +3598,9 @@ EXTENSION KEYS:
// Updating database...
if (!$infoOnly && is_array($instObj->INSTALL['database_update'])) {
$instObj->preformUpdateQueries($update_statements['add'],$instObj->INSTALL['database_update']);
$instObj->preformUpdateQueries($update_statements['change'],$instObj->INSTALL['database_update']);
$instObj->preformUpdateQueries($update_statements['create_table'],$instObj->INSTALL['database_update']);
$instObj->performUpdateQueries($update_statements['add'],$instObj->INSTALL['database_update']);
$instObj->performUpdateQueries($update_statements['change'],$instObj->INSTALL['database_update']);
$instObj->performUpdateQueries($update_statements['create_table'],$instObj->INSTALL['database_update']);
} else {
$content.=$instObj->generateUpdateDatabaseForm_checkboxes($update_statements['add'],'Add fields');
$content.=$instObj->generateUpdateDatabaseForm_checkboxes($update_statements['change'],'Changing fields',1,0,$update_statements['change_currentValue']);
......@@ -3818,7 +3795,7 @@ EXTENSION KEYS:
* @see dumpTableAndFieldStructure()
*/
function dumpStaticTables($tableList) {
$instObj = new em_install_class;
$instObj = new t3lib_install;
$dbFields = $instObj->getFieldDefinitions_database(TYPO3_db);
$out = '';
......@@ -3939,7 +3916,7 @@ EXTENSION KEYS:
*/
function getTableAndFieldStructure($parts) {
// Instance of install tool
$instObj = new em_install_class;
$instObj = new t3lib_install;
$dbFields = $instObj->getFieldDefinitions_database(TYPO3_db);
......
......@@ -2178,7 +2178,7 @@ if (version == "n3") {
// Set header for charset-encoding if set. Added by RL 17.10.03
if ($this->config['config']['metaCharset']) {
$headLine = 'Content-Type:text/html;charset='.trim ($this->config['config']['metaCharset']);
$headLine = 'Content-Type:text/html;charset='.trim($this->config['config']['metaCharset']);
header ($headLine);
}
......@@ -2984,7 +2984,7 @@ if (version == "n3") {
$this->siteCharset = $this->csConvObj->parse_charset($GLOBALS['TSFE']->config['config']['metaCharset'] ? $GLOBALS['TSFE']->config['config']['metaCharset'] : $GLOBALS['TSFE']->defaultCharSet);
$this->labelsCharset = $this->csConvObj->parse_charset($this->csConvObj->charSetArray[$this->lang] ? $this->csConvObj->charSetArray[$this->lang] : 'iso-8859-1');
if ($this->siteCharset != $this->labelsCharset) {
$this->convCharsetToFrom=array(
$this->convCharsetToFrom = array(
'from' => $this->labelsCharset,
'to' => $this->siteCharset
);
......@@ -3018,7 +3018,6 @@ if (version == "n3") {
}
if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/class.tslib_fe.php']) {
include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/class.tslib_fe.php']);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment