Skip to content
GitLab
Commit 3a93bc67 authored by Kasper Skårhøj's avatar Kasper Skårhøj
Browse files

Only changes to function indexes, comments and stripping of trailing... 

Only changes to function indexes, comments and stripping of trailing whitespace in code lines all over code.


git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@196 709f56b5-9817-0410-a4d7-c38de5d9e867
parent dccc77f7
Expand all Hide whitespace changes
Inline Side-by-side
CVSreadme.txt
View file @ 3a93bc67
......@@ -5,7 +5,7 @@ checked out source before it will work for you. Follow these guidelines:
- Go to the module directory (default is "TYPO3core")
- Create symlink for tslib:
- Create symlink for tslib:
ln -s typo3/sysext/cms/tslib
- Go to typo3/ folder:
cd typo3/
......@@ -18,7 +18,7 @@ checked out source before it will work for you. Follow these guidelines:
- Create two symlinks to fonts:
ln -s vera.ttf verdana.ttf
ln -s nimbus.ttf arial.ttf
OR
- Go to the module directory (default is "TYPO3core")
......
ChangeLog
View file @ 3a93bc67
......@@ -9,7 +9,7 @@ Fixed bugs in Mount Points / Status:
- Fixed support for correct MP-vars for any entryLevel number for HMENU
- Added option to overlay the mount point with the mounted page; This means the mount point gets substituted with the mounted page and not only the subpages of the mounted page. This is called "Overlay" mode. Can be set on a per-mount level (checkbox in the pages record). Only doktypes < 200 can be mounted in overlay mode.
- Checked consistency of exclude pages/hidden/starttime/endtime and found it to be ok.
- HMENU special types supported:
- HMENU special types supported:
rootline : full support
list,directory : Supported, but only if the ID values supplied are in the main rootline of the site. The pages in the menus are allowed to be mount points of course. If the supplied IDs are outside the rootline they will loose their connection to the rootline unless "config.MP_mapRootPoints" is configured to supply some mapping.
browse : Not supported: Didn't have time to do it, but should be possible to implement technically.
......@@ -41,7 +41,7 @@ Fixed bugs in Mount Points / Status:
2004-04-01 Kasper Skårhøj,,, <kasper@typo3.com>
* Added full safety for the internal TYPO3 formmail; email addresses in the fields "recipient" and "recipient_copy" are encrypted in the transfer and the "formmail" interface is safe for spam-misuse (since a proper recipient address cannot be forged automatically).
* Added full safety for the internal TYPO3 formmail; email addresses in the fields "recipient" and "recipient_copy" are encrypted in the transfer and the "formmail" interface is safe for spam-misuse (since a proper recipient address cannot be forged automatically).
!!!If someone are using the "formmail" API from other renderers than the FORM cObject in TypoScript you will have to set the recipient address to the encrypted value by default OR alternatively disabled the check by TYPO3_CONF_VARS[FE][strictFormmail] = FALSE
2004-04-01 Kasper Skårhøj,,, <kasper@typo3.com>
......@@ -86,7 +86,7 @@ Fixed bugs in Mount Points / Status:
2004-03-31 Kasper Skårhøj,,, <kasper@typo3.com>
* Fixed an error for form wizard (and others...) where the return URL would be wrong if the wizard was activated right after having saved a new record (would like back to a new record again).
* Fixed an error for form wizard (and others...) where the return URL would be wrong if the wizard was activated right after having saved a new record (would like back to a new record again).
* Further, I added the option of xmlOutput from the table and form wizards. This option is configured in the wizard setup. There is NO frontend rendering supporting the XML format yet. But it might be very handy (and recommended) for other applications wanting to use the table and formwizards.
2004-03-31 Kasper Skårhøj,,, <kasper@typo3.com>
......@@ -103,8 +103,8 @@ Fixed bugs in Mount Points / Status:
2004-03-24 Kasper Skårhøj,,, <kasper@typo3.com>
* Added RTE API and changed the "rte" extension to use that.
* Added t3lib_div::getUserObj() which returns an OBJECT , instead of executing a method call like callUserFunc() does.
* Added RTE API and changed the "rte" extension to use that.
* Added t3lib_div::getUserObj() which returns an OBJECT , instead of executing a method call like callUserFunc() does.
2004-03-23 Kasper Skårhøj,,, <kasper@typo3.com>
......@@ -151,7 +151,7 @@ Generally:
2004-02-12 Robert Lemke <rl@robertlemke.de>
*
*
Made changes to class.tslib_content.php:
- added function getAltParam () which acts as an abstraction method / API creating alt and title parameters for img tags
- added a new TypoScript configuration property: "titleText" (string / stdWrp) similar to "altText". If only altText is specified, it will also be used for the "title" parameter
......@@ -164,7 +164,7 @@ Kasper Sk
- Added processing option to RTE, "proc.plainImageMode"
- Added options for select and group types in TCA to set the selector box style.
- Added $altPageId parameter to function linkTP*() in tslib_pibase + pi_list_linkSingle()
- Changed the order of <?xml> and <!DOCTYPE> in the frontend for XHTML around again. And added an option, "doctypeSwitch" which will reverse the order for those needing that. And finally the "doctype" option fed with a value that is not "xhtml_frames", "xhtml_trans" or "xhtml_strict" will be outputted AS the doctype!
- Changed the order of <?xml> and <!DOCTYPE> in the frontend for XHTML around again. And added an option, "doctypeSwitch" which will reverse the order for those needing that. And finally the "doctype" option fed with a value that is not "xhtml_frames", "xhtml_trans" or "xhtml_strict" will be outputted AS the doctype!
- Implemented checkbox for show thumbnails in Element browser/file and RTE select image dialog.
- Implemented pop-up window size selector in link wizard
......@@ -209,7 +209,7 @@ PHP:
!!! The global var $AB has been removed (since the "alternative backend" is now THE backend and the classic is totally gone. If you use this var, you can safely expect $AB's value to be TRUE and therefore remove all code which would excute if it was FALSE.
!!! Removed what looked like unused functions and variables in the backend frameset JavaScript.
!!! Change db_list_frame and file_list_frame to just "list_frame".
!!! Cleaned up a lot in the template-class.
!!! Cleaned up a lot in the template-class.
!!! dfw() and rfw() functions must be substituted with $GLOBALS["TBE_TEMPLATE"]->dfw() / ->rfw()
!!! fw() is highly depreciated (and does NOT wrap strings anymore!)
!!! if (top.theMenu) top.theMenu.recentuid
......
GPL.txt
View file @ 3a93bc67
GNU GENERAL PUBLIC LICENSE
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
......
LICENSE.txt
View file @ 3a93bc67
......@@ -2,7 +2,7 @@
The TYPO3 licensing conditions
2003, Kasper Skårhøj (kasper@typo3.com)
Document version 2.00, 24-02-2003
---------------------------------
---------------------------------
The TYPO3 project is free software under the terms of the GNU General Public License.
The GNU/GPL license is found in the file GPL.txt
......
TODO.txt
View file @ 3a93bc67
This diff is collapsed.
t3lib/README.txt
View file @ 3a93bc67
TYPO3 Library
The "t3lib/" contains PHP-classes providing core
functionalities of TYPO3 such as manipulation the
database (tce_main.php), providing user authentication
The "t3lib/" contains PHP-classes providing core
functionalities of TYPO3 such as manipulation the
database (tce_main.php), providing user authentication
and datatransfer to the TYPO3 backend to name a few.
Please refer to the document "Inside TYPO3" for details on the TYPO3 core.
......
t3lib/class.gzip_encode.php
View file @ 3a93bc67
......@@ -9,7 +9,7 @@
// It will calculate the effects of this class on a page.
// compression level, cpu time, download time, etc
// Note: this may better for some sites:
// Note: this may better for some sites:
// http://www.remotecommunications.com/apache/mod_gzip/
// I've read that the above doesn't work with php output.
......@@ -18,12 +18,12 @@ class gzip_encode {
* gzip_encode - a class to gzip encode php output
*
* By Sandy McArthur, Jr. <Leknor@Leknor.com>
*
*
* Copyright 2001 (c) All Rights Reserved, All Responsibility Yours.
*
* This code is released under the GNU LGPL Go read it over here:
* http://www.gnu.org/copyleft/lesser.html
*
*
* I do make one optional request, I would like an account on or a
* copy of where this code is used. If that is not possible then
* an email would be cool.
......@@ -203,7 +203,7 @@ class gzip_encode {
echo $gzdata;
}
/*
* gzip_accepted() - Test headers for Accept-Encoding: gzip
......@@ -311,7 +311,7 @@ class gzip_encode {
ereg("averag(es|e): ([0-9][.][0-9][0-9]), ([0-9][.][0-9][0-9]), ([0-9][.][0-9][0-9]*)", $buffer, $load);
return max((float)$load[2], (float)$load[3], (float)$load[4]);
}
}
}
?>
\ No newline at end of file
t3lib/class.t3lib_admin.php
View file @ 3a93bc67
<?php
/***************************************************************
* Copyright notice
*
*
* (c) 1999-2004 Kasper Skaarhoj (kasper@typo3.com)
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
* This script is part of the TYPO3 project. The TYPO3 project is
* free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*
* The GNU General Public License can be found at
* http://www.gnu.org/copyleft/gpl.html.
* A copy is found in the textfile GPL.txt and important notices to the license
* A copy is found in the textfile GPL.txt and important notices to the license
* from the author is found in LICENSE.txt distributed with these scripts.
*
*
*
* This script is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
......@@ -24,7 +24,7 @@
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
/**
* Contains a class for evaluation of database integrity according to $TCA
*
* $Id$
......@@ -38,19 +38,19 @@
*
*
*
* 90: class t3lib_admin
* 116: function genTree($theID, $depthData)
* 156: function lostRecords($pid_list)
* 187: function fixLostRecord($table,$uid)
* 208: function countRecords($pid_list)
* 236: function getGroupFields($mode)
* 270: function getFileFields($uploadfolder)
* 293: function getDBFields($theSearchTable)
* 321: function selectNonEmptyRecordsWithFkeys($fkey_arrays)
* 394: function testFileRefs ()
* 445: function testDBRefs($theArray)
* 483: function whereIsRecordReferenced($searchTable,$id)
* 520: function whereIsFileReferenced($uploadfolder,$filename)
* 90: class t3lib_admin
* 116: function genTree($theID, $depthData)
* 156: function lostRecords($pid_list)
* 187: function fixLostRecord($table,$uid)
* 208: function countRecords($pid_list)
* 236: function getGroupFields($mode)
* 270: function getFileFields($uploadfolder)
* 293: function getDBFields($theSearchTable)
* 321: function selectNonEmptyRecordsWithFkeys($fkey_arrays)
* 394: function testFileRefs ()
* 445: function testDBRefs($theArray)
* 483: function whereIsRecordReferenced($searchTable,$id)
* 520: function whereIsFileReferenced($uploadfolder,$filename)
*
* TOTAL FUNCTIONS: 12
* (This index is automatically created/updated by the extension "extdeveval")
......@@ -94,7 +94,7 @@ class t3lib_admin {
// internal
var $genTree_idlist = ''; // Will hold the id-list from genTree()
var $getTree_HTML = ''; // Will hold the HTML-code visualising the tree. genTree()
var $backPath='';
var $backPath='';
// internal
var $checkFileRefs = Array();
......@@ -115,10 +115,10 @@ class t3lib_admin {
*/
function genTree($theID, $depthData) {
$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
'uid,title,doktype,deleted'.(t3lib_extMgm::isLoaded('cms')?',hidden':''),
'pages',
'pid='.intval($theID).' '.((!$this->genTree_includeDeleted)?'AND deleted=0':'').$this->perms_clause,
'',
'uid,title,doktype,deleted'.(t3lib_extMgm::isLoaded('cms')?',hidden':''),
'pages',
'pid='.intval($theID).' '.((!$this->genTree_includeDeleted)?'AND deleted=0':'').$this->perms_clause,
'',
'sorting'
);
$a=0;
......@@ -126,7 +126,7 @@ class t3lib_admin {
while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
$a++;
$newID =$row['uid'];
if ($this->genTree_makeHTML) {
if ($this->genTree_makeHTML) {
$this->genTree_HTML.=chr(10).'<div><span class="nobr">';
$PM = 'join';
$LN = ($a==$c)?'blank':'line';
......@@ -141,12 +141,12 @@ class t3lib_admin {
if ($row['deleted']) {$this->recStat['deleted']++;}
if ($row['hidden']) {$this->recStat['hidden']++;}
$this->recStat['doktype'][$row['doktype']]++;
$this->genTree($newID,$this->genTree_HTML ? $depthData.'<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.$LN.'.gif','width="18" height="16"').' align="top" alt="" />' : '');
}
return $GLOBALS['TYPO3_DB']->sql_num_rows($res);
}
/**
* Fills $this->lRecords with the records from all tc-tables that are not attached to a PID in the pid-list.
*
......@@ -161,8 +161,8 @@ class t3lib_admin {
while (list($table)=each($TCA)) {
t3lib_div::loadTCA($table);
$garbage = $GLOBALS['TYPO3_DB']->exec_SELECTquery (
'uid,pid,'.$TCA[$table]['ctrl']['label'],
$table,
'uid,pid,'.$TCA[$table]['ctrl']['label'],
$table,
'pid NOT IN ('.$pid_list.')'
);
$lostIdList=Array();
......@@ -244,7 +244,7 @@ class t3lib_admin {
while (list($field,$config)=each($cols)) {
if ($config['config']['type']=='group') {
if (
((!$mode||$mode=='file') && $config['config']['internal_type']=='file') ||
((!$mode||$mode=='file') && $config['config']['internal_type']=='file') ||
((!$mode||$mode=='db') && $config['config']['internal_type']=='db')
) {
$result[$table][]=$field;
......@@ -483,20 +483,20 @@ class t3lib_admin {
function whereIsRecordReferenced($searchTable,$id) {
global $TCA;
$fileFields = $this->getDBFields($searchTable); // Gets tables / Fields that reference to files...
$theRecordList=Array();
$theRecordList=Array();
while (list(,$info)=each($fileFields)) {
$table=$info[0]; $field=$info[1];
t3lib_div::loadTCA($table);
$mres = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
'uid,pid,'.$TCA[$table]['ctrl']['label'].','.$field,
$table,
'uid,pid,'.$TCA[$table]['ctrl']['label'].','.$field,
$table,
$field.' LIKE "%'.$GLOBALS['TYPO3_DB']->quoteStr($id, $table).'%"'
);
while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($mres)) {
// Now this is the field, where the reference COULD come from. But we're not garanteed, so we must carefully examine the data.
$fieldConf = $TCA[$table]['columns'][$field]['config'];
$allowedTables = ($fieldConf['type']=='group') ? $fieldConf['allowed'] : $fieldConf['foreign_table'];
$dbAnalysis = t3lib_div::makeInstance('t3lib_loadDBGroup');
$dbAnalysis->start($row[$field],$allowedTables,$fieldConf['MM'],$row['uid']);
reset($dbAnalysis->itemArray);
......@@ -520,12 +520,12 @@ class t3lib_admin {
function whereIsFileReferenced($uploadfolder,$filename) {
global $TCA;
$fileFields = $this->getFileFields($uploadfolder); // Gets tables / Fields that reference to files...
$theRecordList=Array();
$theRecordList=Array();
while (list(,$info)=each($fileFields)) {
$table=$info[0]; $field=$info[1];
$mres = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
'uid,pid,'.$TCA[$table]['ctrl']['label'].','.$field,
$table,
'uid,pid,'.$TCA[$table]['ctrl']['label'].','.$field,
$table,
$field.' LIKE "%'.$GLOBALS['TYPO3_DB']->quoteStr($filename, $table).'%"'
);
while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($mres)) {
......
t3lib/class.t3lib_arraybrowser.php
View file @ 3a93bc67
<?php
/***************************************************************
* Copyright notice
*
*
* (c) 1999-2004 Kasper Skaarhoj (kasper@typo3.com)
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
* This script is part of the TYPO3 project. The TYPO3 project is
* free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*
* The GNU General Public License can be found at
* http://www.gnu.org/copyleft/gpl.html.
* A copy is found in the textfile GPL.txt and important notices to the license
* A copy is found in the textfile GPL.txt and important notices to the license
* from the author is found in LICENSE.txt distributed with these scripts.
*
*
*
* This script is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
......@@ -24,7 +24,7 @@
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
/**
* Class for displaying an array as a tree
*
* $Id$
......@@ -38,11 +38,11 @@
*
*
*
* 75: class t3lib_arrayBrowser
* 91: function tree($arr, $depth_in, $depthData)
* 154: function getSearchKeys($keyArr, $depth_in, $searchString, $keyArray)
* 186: function fixed_lgd($string,$chars)
* 203: function depthKeys($arr,$settings)
* 75: class t3lib_arrayBrowser
* 91: function tree($arr, $depth_in, $depthData)
* 154: function getSearchKeys($keyArr, $depth_in, $searchString, $keyArray)
* 186: function fixed_lgd($string,$chars)
* 203: function depthKeys($arr,$settings)
*
* TOTAL FUNCTIONS: 4
* (This index is automatically created/updated by the extension "extdeveval")
......@@ -75,9 +75,9 @@
class t3lib_arrayBrowser {
var $depthKeys = array(); // Array defining which keys to expand. Typically set from outside from some session variable - otherwise the array will collapse.
var $searchKeys = array(); // After calling the getSearchKeys function this array is populated with the key-positions in the array which contains values matching the search.
var $fixedLgd=1; // If set, the values are truncated with "..." appended if longer than a certain length.
var $fixedLgd=1; // If set, the values are truncated with "..." appended if longer than a certain length.
var $regexMode=0; // If set, search for string with regex, otherwise stristr()
/**
* Make browsable tree
* Before calling this function you may want to set some of the internal vars like depthKeys, regexMode and fixedLgd. For examples see SC_mod_tools_config_index::main()
......@@ -93,7 +93,7 @@ class t3lib_arrayBrowser {
$a=0;
if ($depth_in) {$depth_in = $depth_in.'.';}
$c=count($arr);
reset($arr);
while (list($key,)=each($arr)) {
......@@ -132,9 +132,9 @@ class t3lib_arrayBrowser {
} else {
$HTML.='=<b>'.htmlspecialchars($theValue).'</b>';
}
}
}
$HTML.='<br />';
if ($deeper) {
$HTML.=$this->tree($arr[$key], $depth, $depthData.'<img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/ol/'.$LN.'.gif','width="18" height="16"').' align="top" alt="" />');
}
......@@ -158,13 +158,13 @@ class t3lib_arrayBrowser {
while (list($key,)=each($keyArr)) {
$depth=$depth_in.$key;
$deeper = is_array($keyArr[$key]);
if ($this->regexMode) {
if (ereg($searchString,$keyArr[$key])) { $this->searchKeys[$depth]=1; }
} else {
if (stristr($keyArr[$key],$searchString)) { $this->searchKeys[$depth]=1; }
}
if ($deeper) {
$cS = count($this->searchKeys);
$keyArray = $this->getSearchKeys($keyArr[$key], $depth, $searchString, $keyArray);
......@@ -172,7 +172,7 @@ class t3lib_arrayBrowser {
$keyArray[$depth]=1;
}
}
}
}
return $keyArray;
}
......
t3lib/class.t3lib_basicfilefunc.php
View file @ 3a93bc67
<?php
/***************************************************************
* Copyright notice
*
*
* (c) 1999-2004 Kasper Skaarhoj (kasper@typo3.com)
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
* This script is part of the TYPO3 project. The TYPO3 project is
* free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*
* The GNU General Public License can be found at
* http://www.gnu.org/copyleft/gpl.html.
* A copy is found in the textfile GPL.txt and important notices to the license
* A copy is found in the textfile GPL.txt and important notices to the license
* from the author is found in LICENSE.txt distributed with these scripts.
*
*
*
* This script is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
......@@ -24,7 +24,7 @@
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
/**
* Contains class with basic file management functions
*
* $Id$
......@@ -37,36 +37,36 @@
*
*
*
* 80: class t3lib_basicFileFunctions
* 80: class t3lib_basicFileFunctions
*
* SECTION: Checking functions
* 132: function init($mounts, $f_ext)
* 149: function getTotalFileInfo($wholePath)
* 169: function is_allowed($iconkey,$type)
* 194: function checkIfFullAccess($theDest)
* 208: function is_webpath($path)
* 228: function checkIfAllowed($ext, $theDest, $filename='')
* 238: function checkFileNameLen($fileName)
* 248: function is_directory($theDir)
* 265: function isPathValid($theFile)
* 280: function getUniqueName($theFile, $theDest, $dontCheckForUnique=0)
* 323: function checkPathAgainstMounts($thePath)
* 341: function blindPath($thePath)
* 357: function findTempFolder()
* 132: function init($mounts, $f_ext)
* 149: function getTotalFileInfo($wholePath)
* 169: function is_allowed($iconkey,$type)
* 194: function checkIfFullAccess($theDest)
* 208: function is_webpath($path)
* 228: function checkIfAllowed($ext, $theDest, $filename='')
* 238: function checkFileNameLen($fileName)
* 248: function is_directory($theDir)
* 265: function isPathValid($theFile)
* 280: function getUniqueName($theFile, $theDest, $dontCheckForUnique=0)
* 323: function checkPathAgainstMounts($thePath)
* 341: function blindPath($thePath)
* 357: function findTempFolder()
*
* SECTION: Cleaning functions
* 386: function cleanDirectoryName($theDir)
* 396: function rmDoubleSlash($string)
* 406: function slashPath($path)
* 419: function cleanFileName($fileName)
* 430: function formatSize($sizeInBytes)
* 386: function cleanDirectoryName($theDir)
* 396: function rmDoubleSlash($string)
* 406: function slashPath($path)
* 419: function cleanFileName($fileName)
* 430: function formatSize($sizeInBytes)
*
* TOTAL FUNCTIONS: 18
* (This index is automatically created/updated by the extension "extdeveval")
*
*/
/**
......@@ -87,11 +87,11 @@ class t3lib_basicFileFunctions {
// internal
var $f_ext = Array(); // See comment in header
var $mounts = Array(); // See comment in header
var $webPath =''; // Set to DOCUMENT_ROOT.
var $webPath =''; // Set to DOCUMENT_ROOT.
var $isInit=0; // Set to true after start();
/**********************************
*
* Checking functions
......@@ -134,7 +134,7 @@ class t3lib_basicFileFunctions {
$this->f_ext['webspace']['deny'] = t3lib_div::uniqueList(strtolower($f_ext['webspace']['deny']));
$this->f_ext['ftpspace']['allow'] = t3lib_div::uniqueList(strtolower($f_ext['ftpspace']['allow']));
$this->f_ext['ftpspace']['deny'] = t3lib_div::uniqueList(strtolower($f_ext['ftpspace']['deny']));
$this->mounts = $mounts;
$this->webPath = t3lib_div::getIndpEnv('TYPO3_DOCUMENT_ROOT');
$this->isInit=1;
......@@ -155,7 +155,7 @@ class t3lib_basicFileFunctions {
$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['readable'] = ($info['perms']&4 || ($theuser==$info['owner'] && $info['perms']&256));
return $info;
}
......@@ -205,7 +205,7 @@ class t3lib_basicFileFunctions {
* @param string Absolute path to check
* @return boolean
*/
function is_webpath($path) {
function is_webpath($path) {
if ($this->isInit) {
$testPath = $this->slashPath($path);
$testPathWeb = $this->slashPath($this->webPath);
......@@ -226,7 +226,7 @@ class t3lib_basicFileFunctions {
* @return boolean True if extension/filename is allowed
*/
function checkIfAllowed($ext, $theDest, $filename='') {
return t3lib_div::verifyFilenameAgainstDenyPattern($filename) && $this->is_allowed($ext,($this->is_webpath($theDest)?'webspace':'ftpspace'));
return t3lib_div::verifyFilenameAgainstDenyPattern($filename) && $this->is_allowed($ext,($this->is_webpath($theDest)?'webspace':'ftpspace'));
}
/**
......@@ -406,9 +406,9 @@ class t3lib_basicFileFunctions {
function slashPath($path) {
if (substr($path,-1)!='/') {
return $path.'/';
}
}
return $path;
}
}
/**
* Returns a string where any character not matching [.a-zA-Z0-9_-] is substituted by '_'
......
t3lib/class.t3lib_bedisplaylog.php
View file @ 3a93bc67
<?php
/***************************************************************
* Copyright notice
*
*
* (c) 1999-2004 Kasper Skaarhoj (kasper@typo3.com)
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
* This script is part of the TYPO3 project. The TYPO3 project is
* free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*
* The GNU General Public License can be found at
* http://www.gnu.org/copyleft/gpl.html.
* A copy is found in the textfile GPL.txt and important notices to the license
* A copy is found in the textfile GPL.txt and important notices to the license
* from the author is found in LICENSE.txt distributed with these scripts.
*
*
*
* This script is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
......@@ -24,7 +24,7 @@
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
/**
* Contains class for display of backend log
*
* $Id$
......@@ -38,17 +38,17 @@