Commit 89d35bbc authored by Michael Stucki's avatar Michael Stucki
Browse files

See ChangeLog


git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_3-7@485 709f56b5-9817-0410-a4d7-c38de5d9e867
parent cc1dd7c1
2004-09-19 Michael Stucki <mundaun@gmx.ch>
* Replaced all (comments AND code!) occurences of "writeable" with "writable"
* Fixed bug #0000171: Displaying wrong filepermissions in filelist module
* Fixed bug #0000261: fileDenyPattern default does not include ".php4"
* Fixed bug #0000298: Browser client Konqueror not recognized
* Fixed bug #0000362: Changed field length of sys_log[IP] to 39 (IPv6 related, patch by Sven Wilhelm)
2004-09-19 Ingmar Schlecht <ingmars@web.de>
* Fixed bug #0000248: Highlighting color of BE module is now the same as highlighting color in the page tree
......
......@@ -154,8 +154,8 @@ class t3lib_basicFileFunctions {
$info['type'] = @filetype($wholePath);
$info['owner'] = @fileowner($wholePath);
$info['perms'] = @fileperms($wholePath);
$info['writeable'] = ($info['perms']&2 || ($theuser==$info['owner'] && $info['perms']&128));
$info['readable'] = ($info['perms']&4 || ($theuser==$info['owner'] && $info['perms']&256));
$info['writable'] = !@is_writable($wholePath);
$info['readable'] = !@is_readable($wholePath);
return $info;
}
......
......@@ -1030,7 +1030,7 @@ $_EXTCONF = $TYPO3_CONF_VARS[\'EXT\'][\'extConf\'][$_EXTKEY];
* @internal
*/
function isLocalconfWritable() {
return is_writeable(PATH_typo3conf) && is_writeable(PATH_typo3conf.'localconf.php');
return @is_writable(PATH_typo3conf) && @is_writable(PATH_typo3conf.'localconf.php');
}
/**
......@@ -1044,15 +1044,15 @@ $_EXTCONF = $TYPO3_CONF_VARS[\'EXT\'][\'extConf\'][$_EXTKEY];
*/
function cannotCacheFilesWritable($cacheFilePrefix) {
$error=array();
if (!@is_writeable(PATH_typo3conf)) {
if (!@is_writable(PATH_typo3conf)) {
$error[]=PATH_typo3conf;
}
if (@is_file(PATH_typo3conf.$cacheFilePrefix.'_ext_localconf.php') &&
!@is_writeable(PATH_typo3conf.$cacheFilePrefix.'_ext_localconf.php')) {
!@is_writable(PATH_typo3conf.$cacheFilePrefix.'_ext_localconf.php')) {
$error[]=PATH_typo3conf.$cacheFilePrefix.'_ext_localconf.php';
}
if (@is_file(PATH_typo3conf.$cacheFilePrefix.'_ext_tables.php') &&
!@is_writeable(PATH_typo3conf.$cacheFilePrefix.'_ext_tables.php')) {
!@is_writable(PATH_typo3conf.$cacheFilePrefix.'_ext_tables.php')) {
$error[]=PATH_typo3conf.$cacheFilePrefix.'_ext_tables.php';
}
return implode(', ',$error);
......
......@@ -188,8 +188,8 @@ class t3lib_install {
if (!$this->allowUpdateLocalConf) {
die("->allowUpdateLocalConf flag in the install object is not set and therefore 'localconf.php' cannot be altered.");
}
if (!@is_writeable($writeToLocalconf_dat['file'])) {
die($writeToLocalconf_dat['file'].' is not writeable!');
if (!@is_writable($writeToLocalconf_dat['file'])) {
die($writeToLocalconf_dat['file'].' is not writable!');
}
// Splitting localconf.php file into lines:
......
......@@ -418,6 +418,8 @@ class t3lib_matchCondition {
// browser
if (strstr($useragent,'MSIE')) {
$browserInfo['browser']='msie';
} elseif(strstr($useragent,'Konqueror')) {
$browserInfo['browser']='konqueror';
} elseif(strstr($useragent,'Opera')) {
$browserInfo['browser']='opera';
} elseif(strstr($useragent,'Lynx')) {
......@@ -461,15 +463,19 @@ class t3lib_matchCondition {
break;
case 'avantgo':
$tmp = strstr($useragent,'AvantGo');
$browserInfo['version'] = $this->browserInfo_version(substr($tmp,5));
$browserInfo['version'] = $this->browserInfo_version(substr($tmp,7));
break;
case 'acrobat':
$tmp = strstr($useragent,'WebCapture');
$browserInfo['version'] = $this->browserInfo_version(substr($tmp,5));
$browserInfo['version'] = $this->browserInfo_version(substr($tmp,10));
break;
case 'ibrowse':
$tmp = strstr($useragent,'IBrowse/');
$browserInfo['version'] = $this->browserInfo_version(substr($tmp,5));
$browserInfo['version'] = $this->browserInfo_version(substr($tmp,8));
break;
case 'konqueror':
$tmp = strstr($useragent,'Konqueror/');
$browserInfo['version'] = $this->browserInfo_version(substr($tmp,10));
break;
}
// system
......
......@@ -102,7 +102,7 @@ define ('T3_ERR_SV_NO_INPUT', -4); // passed subtype is not possible with this s
define ('T3_ERR_SV_FILE_NOT_FOUND', -20); // File not found which the service should process
define ('T3_ERR_SV_FILE_READ', -21); // File not readable
define ('T3_ERR_SV_FILE_WRITE', -22); // File not writeable
define ('T3_ERR_SV_FILE_WRITE', -22); // File not writable
define ('T3_ERR_SV_PROG_NOT_FOUND', -40); // passed subtype is not possible with this service
define ('T3_ERR_SV_PROG_FAILED', -41); // passed subtype is not possible with this service
......
......@@ -136,11 +136,11 @@ $TYPO3_CONF_VARS = Array(
// If no fileextension, true is returned if 'allow' is '*', false if 'deny' is '*' and true if none of these matches
// This configuration below accepts everything in ftpspace and everything in webspace except php3 or php files
'fileExtensions' => array (
'webspace' => array('allow'=>'', 'deny'=>'php3,php'),
'webspace' => array('allow'=>'', 'deny'=>'php,php3,php4,php5'),
'ftpspace' => array('allow'=>'*', 'deny'=>'')
),
'customPermOptions' => array(), // Array with sets of custom permission options. Syntax is; 'key' => array('header' => 'header string, language splitted', 'items' => array('key' => array('label, language splitted', 'icon reference', 'Description text, language splitted'))). Keys cannot contain ":|," characters.
'fileDenyPattern' => '\.php\.|\.php3\.', // A regular expression that - if it matches a filename - will deny the file upload/rename or whatever in the webspace. Matching with eregi() (case-insensitive).
'fileDenyPattern' => '\.php$|\.php.$', // A regular expression that - if it matches a filename - will deny the file upload/rename or whatever in the webspace. Matching with eregi() (case-insensitive).
'interfaces' => 'backend', // This determines which interface options is available in the login prompt and in which order (All options: ",backend,frontend")
'loginLabels' => 'Username|Password|Interface|Log In|Log Out|Backend,Front End|Administration Login on ###SITENAME###|(Note: Cookies and JavaScript must be enabled!)|Important Messages:|Your login attempt did not succeed. Make sure to spell your username and password correctly, including upper/lowercase characters.', // Language labels of the login prompt.
'loginNews' => array(), // In this array you can define news-items for the login screen. To this array, add arrays with assoc keys 'date', 'header', 'content' (HTML content) and for those appropriate value pairs
......
......@@ -225,7 +225,7 @@ CREATE TABLE sys_log (
tstamp int(11) unsigned DEFAULT '0' NOT NULL,
type tinyint(3) unsigned DEFAULT '0' NOT NULL,
details_nr tinyint(3) unsigned DEFAULT '0' NOT NULL,
IP varchar(15) DEFAULT '' NOT NULL,
IP varchar(39) DEFAULT '' NOT NULL,
log_data tinyblob NOT NULL,
event_pid int(11) DEFAULT '-1' NOT NULL,
NEWid varchar(20) DEFAULT '' NOT NULL,
......
......@@ -331,7 +331,7 @@ class fileList extends t3lib_recordList {
// $theData[$field]=t3lib_div::formatSize($theFile[$field]);
break;
case 'rw':
$theData[$field]= (($theFile['readable'])?'':'<span class="typo3-red"><b>R</b></span>').(($theFile['writeable'])?'':'<span class="typo3-red"><b>W</b></span>');
$theData[$field]= (($theFile['readable'])?'':'<span class="typo3-red"><b>R</b></span>').(($theFile['writable'])?'':'<span class="typo3-red"><b>W</b></span>');
break;
case 'fileext':
// $theData[$field]=strtoupper($theFile['fileext']);
......@@ -457,7 +457,7 @@ class fileList extends t3lib_recordList {
$theData[$field]=t3lib_div::formatSize($theFile[$field]);
break;
case 'rw':
$theData[$field]= (($theFile['readable'])?'':'<span class="typo3-red"><b>R</b></span>').(($theFile['writeable'])?'':'<span class="typo3-red"><b>W</b></span>');
$theData[$field]= (($theFile['readable'])?'':'<span class="typo3-red"><b>R</b></span>').(($theFile['writable'])?'':'<span class="typo3-red"><b>W</b></span>');
break;
case 'fileext':
$theData[$field]=strtoupper($theFile[$field]);
......
......@@ -1412,7 +1412,7 @@
if(!ereg("^/", $theLogFile)) $theLogFile = PATH_site.$theLogFile;
if ($this->config['config']['stat_apache'] && $this->config['config']['stat_apache_logfile'] && !strstr($this->config['config']['stat_apache_logfile'],'/')) {
if(t3lib_div::isAllowedAbsPath($theLogFile) && @is_file($theLogFile) && @is_writeable($theLogFile)) {
if(t3lib_div::isAllowedAbsPath($theLogFile) && @is_file($theLogFile) && @is_writable($theLogFile)) {
$this->config['stat_vars']['logFile'] = $theLogFile;
$shortTitle = substr(ereg_replace('[^\.[:alnum:]_-]','_',$this->page['title']),0,30);
$pageName = $this->config['config']['stat_apache_pagenames'] ? $this->config['config']['stat_apache_pagenames'] : '[path][title]--[uid].html';
......
......@@ -1037,7 +1037,7 @@ th { font-family: verdana,arial, helvetica, sans-serif; font-size: 10pt; font-we
");
if (!$this->config_array["dir_typo3temp"]) {
$this->message("typo3temp/ directory","typo3temp/ not writeable!","
$this->message("typo3temp/ directory","typo3temp/ not writable!","
You must make typo3temp/ write enabled before you can proceed with this test.
",2);
echo $this->outputWrapper($this->printAll());
......@@ -1661,10 +1661,10 @@ From sub-directory:
$uniqueName = md5(uniqid(microtime()));
// The requirement level (the integer value, ie. the second value of the value array) has the following meanings:
// -1 = not required, but if it exists may be writeable or not
// 0 = not required, if it exists the dir should be writeable
// 1 = required, don't has to be writeable
// 2 = required, has to be writeable
// -1 = not required, but if it exists may be writable or not
// 0 = not required, if it exists the dir should be writable
// 1 = required, don't has to be writable
// 2 = required, has to be writable
$checkWrite=array(
"typo3temp/" => array("The folder is used by both the frontend (FE) and backend interface (TBE) for image manipulated files.",2,"dir_typo3temp"),
......@@ -1711,7 +1711,7 @@ From sub-directory:
if (@is_file($file)) {
unlink($file);
if ($descr[2]) { $this->config_array[$descr[2]]=1; }
$this->message($ext, $relpath." writeable","",-1);
$this->message($ext, $relpath." writable","",-1);
} else {
$severity = ($descr[1]==2 || $descr[1]==0) ? 3 : 2;
if ($descr[1] == 0 || $descr[1] == 2) {
......@@ -1719,7 +1719,7 @@ From sub-directory:
} elseif ($descr[1] == -1 || $descr[1] == 1) {
$msg = "The directory ".$relpath." does not neccesarily have to be writable.";
}
$this->message($ext, $relpath." directory not writeable","
$this->message($ext, $relpath." directory not writable","
<em>Full path: ".$file."</em>
".$general_message."
......@@ -2540,7 +2540,7 @@ From sub-directory:
return;
}
if (!$this->config_array["dir_typo3temp"]) {
$this->message("Image Processing","typo3temp/ not writeable!","
$this->message("Image Processing","typo3temp/ not writable!","
You must make typo3temp/ write enabled before you can proceed with this test.
",2);
echo $this->outputWrapper($this->printAll());
......
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