Commit a21f8a41 authored by Stefano Kowalke's avatar Stefano Kowalke Committed by Christian Kuhn
Browse files

[TASK] Replace Space Indent into Tab indent (CGL Cleanup)

This patch replaces some forgotten and/or
overseen space chars in indention into tab chars.

Change-Id: I1118488ee3e06d5529d741b2811095548ca818a5
Resolves: #36871
Reviewed-on: http://review.typo3.org/11018
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
parent efb17a08
......@@ -83,7 +83,7 @@ class t3lib_beUserAuth extends t3lib_userAuthGroup {
Reserved keys for other storage of session data:
moduleData
moduleSessionID
*/
*/
var $uc_default = Array(
'interfaceSetup' => '', // serialized content that is used to store interface pane and menu positions. Set by the logout.php-script
'moduleData' => Array(), // user-data for the modules
......
......@@ -187,8 +187,8 @@ class t3lib_Compressor {
$filenameFromMainDir = $this->getFilenameFromMainDir($fileOptions['file']);
// if $options['baseDirectories'] set, we only include files below these directories
if ((!isset($options['baseDirectories'])
|| $this->checkBaseDirectory($filenameFromMainDir, array_merge($options['baseDirectories'], array($this->targetDirectory))))
&& ($fileOptions['media'] === 'all')
|| $this->checkBaseDirectory($filenameFromMainDir, array_merge($options['baseDirectories'], array($this->targetDirectory))))
&& ($fileOptions['media'] === 'all')
) {
$filesToInclude[] = $filenameFromMainDir;
// remove the file from the incoming file array
......
......@@ -1592,7 +1592,7 @@ class t3lib_cs {
return $crop.substr($string,$i);
}
}
*/
*/
}
return $string;
}
......
......@@ -601,10 +601,10 @@ class t3lib_folderTree extends t3lib_treeView {
if ($treeName && $treeName == $this->treeName) {
if (in_array($storageHashNumber, $this->storageHashNumbers)) {
if ($doExpand == 1) {
// set
// set
$this->stored[$storageHashNumber][$numericFolderHash] = 1;
} else {
// clear
// clear
unset($this->stored[$storageHashNumber][$numericFolderHash]);
}
$this->savePosition();
......
......@@ -126,8 +126,8 @@ final class t3lib_iconWorks {
*/
public static function getIconImage($table, $row = array(), $backPath, $params = '', $shaded = FALSE) {
$str = '<img' .
self::skinImg($backPath, self::getIcon($table, $row, $shaded), 'width="18" height="16"') .
(trim($params) ? ' ' . trim($params) : '');
self::skinImg($backPath, self::getIcon($table, $row, $shaded), 'width="18" height="16"') .
(trim($params) ? ' ' . trim($params) : '');
if (!stristr($str, 'alt="')) {
$str .= ' alt=""';
}
......
......@@ -393,7 +393,7 @@ class t3lib_loadDBGroup {
$oldMMs_index = array_search($item, $oldMMs);
$whereClause = $uidLocal_field . '=' . $uid . ' AND ' . $uidForeign_field . '=' . $val['id'] .
($this->MM_hasUidField ? ' AND uid=' . intval($oldMMs_inclUid[$oldMMs_index][2]) : ''); // In principle, selecting on the UID is all we need to do if a uid field is available since that is unique! But as long as it "doesn't hurt" we just add it to the where clause. It should all match up.
($this->MM_hasUidField ? ' AND uid=' . intval($oldMMs_inclUid[$oldMMs_index][2]) : ''); // In principle, selecting on the UID is all we need to do if a uid field is available since that is unique! But as long as it "doesn't hurt" we just add it to the where clause. It should all match up.
if ($tablename) {
$whereClause .= ' AND tablenames=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($tablename, $MM_tableName);
}
......
......@@ -124,7 +124,7 @@ class t3lib_loadModules {
User defined modules were found in ../typo3conf/
Today almost all modules reside in extensions and they are found by the _PATHS array of the incoming $TBE_MODULES array
*/
*/
// Setting paths for 1) core modules (old concept from mod/) and 2) user-defined modules (from ../typo3conf)
$paths = array();
$paths['defMods'] = PATH_typo3 . 'mod/'; // Path of static modules
......
......@@ -1517,22 +1517,22 @@ class t3lib_PageRenderer implements t3lib_Singleton {
}
// postTransform for possible manuipulation of concatenated and compressed files
if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_pagerenderer.php']['render-postTransform'])) {
$params = array(
'jsLibs' => &$this->jsLibs,
'jsFooterLibs' => &$this->jsFooterLibs,
'jsFiles' => &$this->jsFiles,
'jsFooterFiles' => &$this->jsFooterFiles,
'cssFiles' => &$this->cssFiles,
'headerData' => &$this->headerData,
'footerData' => &$this->footerData,
'jsInline' => &$this->jsInline,
'jsFooterInline' => &$this->jsFooterInline,
'cssInline' => &$this->cssInline,
);
$params = array(
'jsLibs' => &$this->jsLibs,
'jsFooterLibs' => &$this->jsFooterLibs,
'jsFiles' => &$this->jsFiles,
'jsFooterFiles' => &$this->jsFooterFiles,
'cssFiles' => &$this->cssFiles,
'headerData' => &$this->headerData,
'footerData' => &$this->footerData,
'jsInline' => &$this->jsInline,
'jsFooterInline' => &$this->jsFooterInline,
'cssInline' => &$this->cssInline,
);
foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_pagerenderer.php']['render-postTransform'] as $hook) {
t3lib_div::callUserFunction($hook, $params, $this);
}
}
}
$metaTags = implode(LF, $this->metaTags);
// remove ending slashes from static header block
......@@ -1552,9 +1552,9 @@ class t3lib_PageRenderer implements t3lib_Singleton {
$properties['file'] = t3lib_div::resolveBackPath($properties['file']);
$properties['file'] = t3lib_div::createVersionNumberedFilename($properties['file']);
$tag = '<link rel="' . htmlspecialchars($properties['rel']) . '" type="text/css" href="' .
htmlspecialchars($properties['file']) . '" media="' . htmlspecialchars($properties['media']) . '"' .
($properties['title'] ? ' title="' . htmlspecialchars($properties['title']) . '"' : '') .
$endingSlash . '>';
htmlspecialchars($properties['file']) . '" media="' . htmlspecialchars($properties['media']) . '"' .
($properties['title'] ? ' title="' . htmlspecialchars($properties['title']) . '"' : '') .
$endingSlash . '>';
if ($properties['allWrap'] && strpos($properties['allWrap'], '|') !== FALSE) {
$tag = str_replace('|', $tag, $properties['allWrap']);
}
......@@ -1772,19 +1772,19 @@ class t3lib_PageRenderer implements t3lib_Singleton {
if (count($mods)) {
foreach ($mods as $module) {
$out .= '<script src="' . $this->processJsFile($this->backPath .
$this->scriptaculousPath . $module . '.js') . '" type="text/javascript"></script>' . LF;
$this->scriptaculousPath . $module . '.js') . '" type="text/javascript"></script>' . LF;
unset($this->jsFiles[$this->backPath . $this->scriptaculousPath . $module . '.js']);
}
}
$out .= '<script src="' . $this->processJsFile($this->backPath . $this->scriptaculousPath .
'scriptaculous.js') . '" type="text/javascript"></script>' . LF;
'scriptaculous.js') . '" type="text/javascript"></script>' . LF;
unset($this->jsFiles[$this->backPath . $this->scriptaculousPath . 'scriptaculous.js']);
}
// include extCore, but only if ExtJS is not included
if ($this->addExtCore && !$this->addExtJS) {
$out .= '<script src="' . $this->processJsFile($this->backPath .
$this->extCorePath . 'ext-core' . ($this->enableExtCoreDebug ? '-debug' : '') . '.js') .
$this->extCorePath . 'ext-core' . ($this->enableExtCoreDebug ? '-debug' : '') . '.js') .
'" type="text/javascript"></script>' . LF;
unset($this->jsFiles[$this->backPath . $this->extCorePath . 'ext-core' . ($this->enableExtCoreDebug ? '-debug' : '') . '.js']);
}
......@@ -1793,11 +1793,11 @@ class t3lib_PageRenderer implements t3lib_Singleton {
if ($this->addExtJS) {
// use the base adapter all the time
$out .= '<script src="' . $this->processJsFile($this->backPath . $this->extJsPath .
'adapter/' . ($this->enableExtJsDebug ?
'adapter/' . ($this->enableExtJsDebug ?
str_replace('.js', '-debug.js', $this->extJSadapter) : $this->extJSadapter)) .
'" type="text/javascript"></script>' . LF;
$out .= '<script src="' . $this->processJsFile($this->backPath . $this->extJsPath .
'ext-all' . ($this->enableExtJsDebug ? '-debug' : '') . '.js') .
'ext-all' . ($this->enableExtJsDebug ? '-debug' : '') . '.js') .
'" type="text/javascript"></script>' . LF;
// add extJS localization
......@@ -1814,7 +1814,7 @@ class t3lib_PageRenderer implements t3lib_Singleton {
$extJsLocaleFile = $this->extJsPath . 'locale/ext-lang-' . $extJsLang . '.js';
if (file_exists(PATH_typo3 . $extJsLocaleFile)) {
$out .= '<script src="' . $this->processJsFile($this->backPath .
$extJsLocaleFile) . '" type="text/javascript" charset="utf-8"></script>' . LF;
$extJsLocaleFile) . '" type="text/javascript" charset="utf-8"></script>' . LF;
}
......
......@@ -71,13 +71,13 @@ class t3lib_pageTree extends t3lib_treeView {
$this->fieldArray = array_merge(
$this->fieldArray,
array(
'hidden',
'starttime',
'endtime',
'fe_group',
'module',
'extendToSubpages',
'nav_hide')
'hidden',
'starttime',
'endtime',
'fe_group',
'module',
'extendToSubpages',
'nav_hide')
);
}
$this->table = 'pages';
......
......@@ -939,21 +939,21 @@ class t3lib_parsehtml_proc extends t3lib_parsehtml {
if (!isset($this->procOptions['typohead']) || $this->procOptions['typohead']) {
$type = intval(substr($tagName, 1));
$blockSplit[$k] = '<typohead' .
($type != 6 ? ' type="' . $type . '"' : '') .
($attribArray['align'] ? ' align="' . $attribArray['align'] . '"' : '') .
($attribArray['class'] ? ' class="' . $attribArray['class'] . '"' : '') .
'>' .
$innerContent .
'</typohead>' .
$lastBR;
($type != 6 ? ' type="' . $type . '"' : '') .
($attribArray['align'] ? ' align="' . $attribArray['align'] . '"' : '') .
($attribArray['class'] ? ' class="' . $attribArray['class'] . '"' : '') .
'>' .
$innerContent .
'</typohead>' .
$lastBR;
} else {
$blockSplit[$k] = '<' . $tagName .
($attribArray['align'] ? ' align="' . htmlspecialchars($attribArray['align']) . '"' : '') .
($attribArray['class'] ? ' class="' . htmlspecialchars($attribArray['class']) . '"' : '') .
'>' .
$innerContent .
'</' . $tagName . '>' .
$lastBR;
($attribArray['align'] ? ' align="' . htmlspecialchars($attribArray['align']) . '"' : '') .
($attribArray['class'] ? ' class="' . htmlspecialchars($attribArray['class']) . '"' : '') .
'>' .
$innerContent .
'</' . $tagName . '>' .
$lastBR;
}
} else {
// Eliminate true linebreaks inside Hx tags
......@@ -1045,8 +1045,8 @@ class t3lib_parsehtml_proc extends t3lib_parsehtml {
case 'article':
case 'aside':
$blockSplit[$k] = $tag .
$this->TS_transform_rte($this->removeFirstAndLastTag($blockSplit[$k]), $css) .
'</' . $tagName . '>';
$this->TS_transform_rte($this->removeFirstAndLastTag($blockSplit[$k]), $css) .
'</' . $tagName . '>';
break;
case 'typolist': // Transform typolist blocks into OL/UL lists. Type 1 is expected to be numerical block
if (!isset($this->procOptions['typolist']) || $this->procOptions['typolist']) {
......@@ -1056,8 +1056,8 @@ class t3lib_parsehtml_proc extends t3lib_parsehtml {
$lines = explode(LF, $tListContent);
$typ = $attribArray['type'] == 1 ? 'ol' : 'ul';
$blockSplit[$k] = '<' . $typ . '>' . LF .
'<li>' . implode('</li>' . LF . '<li>', $lines) . '</li>' .
'</' . $typ . '>';
'<li>' . implode('</li>' . LF . '<li>', $lines) . '</li>' .
'</' . $typ . '>';
}
break;
case 'typohead': // Transform typohead into Hx tags.
......@@ -1070,8 +1070,8 @@ class t3lib_parsehtml_proc extends t3lib_parsehtml {
$align = $attribArray['align'] ? ' align="' . $attribArray['align'] . '"' : '';
$class = $attribArray['class'] ? ' class="' . $attribArray['class'] . '"' : '';
$blockSplit[$k] = '<h' . $typ . $align . $class . '>' .
$tC .
'</h' . $typ . '>';
$tC .
'</h' . $typ . '>';
}
break;
}
......@@ -1569,15 +1569,15 @@ class t3lib_parsehtml_proc extends t3lib_parsehtml {
function defaultTStagMapping($code, $direction = 'rte') {
if ($direction == 'db') {
$code = $this->mapTags($code, array( // Map tags
'strong' => 'b',
'em' => 'i'
));
'strong' => 'b',
'em' => 'i'
));
}
if ($direction == 'rte') {
$code = $this->mapTags($code, array( // Map tags
'b' => 'strong',
'i' => 'em'
));
'b' => 'strong',
'i' => 'em'
));
}
return $code;
}
......
......@@ -120,11 +120,11 @@ class t3lib_positionMap {
if ($prev_dat['row']['uid'] == $id) {
if (!$this->dontPrintPageInsertIcons && $this->checkNewPageInPid($id) && !($prev_dat['invertedDepth'] > $t3lib_pageTree->tree[$cc]['invertedDepth'])) { // 1) It must be allowed to create a new page and 2) If there are subpages there is no need to render a subpage icon here - it'll be done over the subpages...
$code .= '<span class="nobr">' .
$this->insertQuadLines($dat['blankLineCode']) .
'<img src="clear.gif" width="18" height="8" align="top" alt="" />' .
'<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($id, $id, 1)) . '" onmouseover="' . htmlspecialchars('changeImg(\'mImgSubpage' . $cc . '\',0);') . '" onmouseout="' . htmlspecialchars('changeImg(\'mImgSubpage' . $cc . '\',1);') . '">' .
'<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgSubpage' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' .
'</a></span><br />';
$this->insertQuadLines($dat['blankLineCode']) .
'<img src="clear.gif" width="18" height="8" align="top" alt="" />' .
'<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($id, $id, 1)) . '" onmouseover="' . htmlspecialchars('changeImg(\'mImgSubpage' . $cc . '\',0);') . '" onmouseout="' . htmlspecialchars('changeImg(\'mImgSubpage' . $cc . '\',1);') . '">' .
'<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgSubpage' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' .
'</a></span><br />';
}
}
......@@ -135,11 +135,11 @@ class t3lib_positionMap {
if (!$this->dontPrintPageInsertIcons && $this->checkNewPageInPid($prev_dat['row']['pid'])) {
$prevPid = (-$prev_dat['row']['uid']);
$code .= '<span class="nobr">' .
$this->insertQuadLines($dat['blankLineCode']) .
'<img src="clear.gif" width="18" height="1" align="top" alt="" />' .
'<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($prevPid, $prev_dat['row']['pid'], 2)) . '" onmouseover="' . htmlspecialchars('changeImg(\'mImgAfter' . $cc . '\',0);') . '" onmouseout="' . htmlspecialchars('changeImg(\'mImgAfter' . $cc . '\',1);') . '">' .
'<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgAfter' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' .
'</a></span><br />';
$this->insertQuadLines($dat['blankLineCode']) .
'<img src="clear.gif" width="18" height="1" align="top" alt="" />' .
'<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($prevPid, $prev_dat['row']['pid'], 2)) . '" onmouseover="' . htmlspecialchars('changeImg(\'mImgAfter' . $cc . '\',0);') . '" onmouseout="' . htmlspecialchars('changeImg(\'mImgAfter' . $cc . '\',1);') . '">' .
'<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgAfter' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' .
'</a></span><br />';
}
// Then set the current prevPid
......@@ -152,10 +152,10 @@ class t3lib_positionMap {
}
if (!$this->dontPrintPageInsertIcons && $this->checkNewPageInPid($dat['row']['pid'])) {
$code .= '<span class="nobr">' .
$this->insertQuadLines($dat['blankLineCode']) .
'<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($prevPid, $dat['row']['pid'], 3)) . '" onmouseover="' . htmlspecialchars('changeImg(\'mImg' . $cc . '\',0);') . '" onmouseout="' . htmlspecialchars('changeImg(\'mImg' . $cc . '\',1);') . '">' .
'<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImg' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' .
'</a></span><br />';
$this->insertQuadLines($dat['blankLineCode']) .
'<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($prevPid, $dat['row']['pid'], 3)) . '" onmouseover="' . htmlspecialchars('changeImg(\'mImg' . $cc . '\',0);') . '" onmouseout="' . htmlspecialchars('changeImg(\'mImg' . $cc . '\',1);') . '">' .
'<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImg' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' .
'</a></span><br />';
}
// The line with the icon and title:
......@@ -176,11 +176,11 @@ class t3lib_positionMap {
if ($prev_dat['row']['uid'] == $id) {
if (!$this->dontPrintPageInsertIcons && $this->checkNewPageInPid($id)) {
$code .= '<span class="nobr">' .
$this->insertQuadLines($saveLatestUid[$latestInvDepth]['blankLineCode'], 1) .
'<img src="clear.gif" width="18" height="8" align="top" alt="" />' .
'<a href="#" onclick="' . $this->onClickEvent($id, $id, 4) . '" onmouseover="' . htmlspecialchars('changeImg(\'mImgSubpage' . $cc . '\',0);') . '" onmouseout="' . htmlspecialchars('changeImg(\'mImgSubpage' . $cc . '\',1);') . '">' .
'<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgSubpage' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' .
'</a></span><br />';
$this->insertQuadLines($saveLatestUid[$latestInvDepth]['blankLineCode'], 1) .
'<img src="clear.gif" width="18" height="8" align="top" alt="" />' .
'<a href="#" onclick="' . $this->onClickEvent($id, $id, 4) . '" onmouseover="' . htmlspecialchars('changeImg(\'mImgSubpage' . $cc . '\',0);') . '" onmouseout="' . htmlspecialchars('changeImg(\'mImgSubpage' . $cc . '\',1);') . '">' .
'<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgSubpage' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' .
'</a></span><br />';
}
}
......@@ -189,10 +189,10 @@ class t3lib_positionMap {
$prevPid = (-$dat['row']['uid']);
if (!$this->dontPrintPageInsertIcons && $this->checkNewPageInPid($dat['row']['pid'])) {
$code .= '<span class="nobr">' .
$this->insertQuadLines($dat['blankLineCode'], 1) .
'<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($prevPid, $dat['row']['pid'], 5)) . '" onmouseover="' . htmlspecialchars('changeImg(\'mImgEnd' . $a . '\',0);') . '" onmouseout="' . htmlspecialchars('changeImg(\'mImgEnd' . $a . '\',1);') . '">' .
'<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgEnd' . $a . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' .
'</a></span><br />';
$this->insertQuadLines($dat['blankLineCode'], 1) .
'<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($prevPid, $dat['row']['pid'], 5)) . '" onmouseover="' . htmlspecialchars('changeImg(\'mImgEnd' . $a . '\',0);') . '" onmouseout="' . htmlspecialchars('changeImg(\'mImgEnd' . $a . '\',1);') . '">' .
'<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgEnd' . $a . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' .
'</a></span><br />';
}
}
......@@ -473,7 +473,7 @@ class t3lib_positionMap {
}
$table .= '</table></div>';
} else {
// Traverse the columns here:
// Traverse the columns here:
foreach ($colPosArray as $kk => $vv) {
$row1 .= '<td align="center" width="' . round(100 / $count) . '%"><div class="t3-page-colHeader t3-row-header">' .
$this->wrapColumnHeader($GLOBALS['LANG']->sL(t3lib_BEfunc::getLabelFromItemlist('tt_content', 'colPos', $vv, $pid), 1), $vv) .
......@@ -523,8 +523,8 @@ class t3lib_positionMap {
function insertPositionIcon($row, $vv, $kk, $moveUid, $pid) {
$cc = hexdec(substr(md5($row['uid'] . '-' . $vv . '-' . $kk), 0, 4));
return '<a href="#" onclick="' . htmlspecialchars($this->onClickInsertRecord($row, $vv, $moveUid, $pid, $this->cur_sys_language)) . '" onmouseover="' . htmlspecialchars('changeImg(\'mImg' . $cc . '\',0);') . '" onmouseout="' . htmlspecialchars('changeImg(\'mImg' . $cc . '\',1);') . '">' .
'<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/newrecord2_marker_d.gif', 'width="100" height="8"') . ' name="mImg' . $cc . '" border="0" align="top" title="' . $GLOBALS['LANG']->getLL($this->l_insertNewRecordHere, 1) . '" alt="" />' .
'</a>';
'<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/newrecord2_marker_d.gif', 'width="100" height="8"') . ' name="mImg' . $cc . '" border="0" align="top" title="' . $GLOBALS['LANG']->getLL($this->l_insertNewRecordHere, 1) . '" alt="" />' .
'</a>';
}
/**
......
......@@ -1451,8 +1451,8 @@ class t3lib_queryGenerator {
}
}
$fieldlist = $this->extFieldLists['queryFields'] .
',pid' .
($GLOBALS['TCA'][$this->table]['ctrl']['delete'] ? ',' . $GLOBALS['TCA'][$this->table]['ctrl']['delete'] : '');
',pid' .
($GLOBALS['TCA'][$this->table]['ctrl']['delete'] ? ',' . $GLOBALS['TCA'][$this->table]['ctrl']['delete'] : '');
if (!$GLOBALS['SOBE']->MOD_SETTINGS['show_deleted']) {
$qString .= t3lib_BEfunc::deleteClause($this->table);
}
......
......@@ -253,14 +253,14 @@ class t3lib_recordList {
case 'fwd':
$href = $this->listURL() . '&pointer=' . ($pointer - $this->iLimit) . $tParam;
$content = '<a href="' . htmlspecialchars($href) . '">' .
t3lib_iconWorks::getSpriteIcon('actions-move-up') .
'</a> <i>[1 - ' . $pointer . ']</i>';
t3lib_iconWorks::getSpriteIcon('actions-move-up') .
'</a> <i>[1 - ' . $pointer . ']</i>';
break;
case 'rwd':
$href = $this->listURL() . '&pointer=' . $pointer . $tParam;
$content = '<a href="' . htmlspecialchars($href) . '">' .
t3lib_iconWorks::getSpriteIcon('actions-move-down') .
'</a> <i>[' . ($pointer + 1) . ' - ' . $this->totalItems . ']</i>';
t3lib_iconWorks::getSpriteIcon('actions-move-down') .
'</a> <i>[' . ($pointer + 1) . ' - ' . $this->totalItems . ']</i>';
break;
}
return $content;
......@@ -274,7 +274,7 @@ class t3lib_recordList {
*/
function listURL($altId = '') {
return $this->script .
'?id=' . (strcmp($altId, '') ? $altId : $this->id);
'?id=' . (strcmp($altId, '') ? $altId : $this->id);
}
/**
......
......@@ -937,7 +937,7 @@ class t3lib_refindex {
// Searching lost indexes for non-existing tables:
$where = 'tablename NOT IN (' .
implode(',', $GLOBALS['TYPO3_DB']->fullQuoteArray($tableNames, 'sys_refindex')) .
')';
')';
$lostTables = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('hash', 'sys_refindex', $where);
if (count($lostTables)) {
$Err = 'Index table hosted ' . count($lostTables) . ' indexes for non-existing tables, now removed';
......
......@@ -92,9 +92,9 @@ class t3lib_Registry implements t3lib_Singleton {
$GLOBALS['TYPO3_DB']->exec_INSERTquery(
'sys_registry',
array(
'entry_namespace' => $namespace,
'entry_key' => $key,
'entry_value' => $serializedValue
'entry_namespace' => $namespace,
'entry_key' => $key,
'entry_value' => $serializedValue
)
);
} else {
......@@ -103,7 +103,7 @@ class t3lib_Registry implements t3lib_Singleton {
'entry_namespace = ' . $GLOBALS['TYPO3_DB']->fullQuoteStr($namespace, 'sys_registry')
. ' AND entry_key = ' . $GLOBALS['TYPO3_DB']->fullQuoteStr($key, 'sys_registry'),
array(
'entry_value' => $serializedValue
'entry_value' => $serializedValue
)
);
}
......
......@@ -73,9 +73,9 @@ class t3lib_SpriteManager {
// Create cache filename, the hash includes all icons, registered CSS styles registered and the extension list
$this->tempFileName = PATH_site . self::$tempPath .
md5(serialize($GLOBALS['TBE_STYLES']['spritemanager']) .
md5(serialize($GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageNames'])) .
$GLOBALS['TYPO3_CONF_VARS']['EXT']['extList']) . '.inc';
md5(serialize($GLOBALS['TBE_STYLES']['spritemanager']) .
md5(serialize($GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageNames'])) .
$GLOBALS['TYPO3_CONF_VARS']['EXT']['extList']) . '.inc';
// Regenerate cache file if not already existing
if (!@file_exists($this->tempFileName)) {
......
......@@ -1632,13 +1632,13 @@ class t3lib_sqlparser {
$query = 'SELECT ' . ($components['STRAIGHT_JOIN'] ? $components['STRAIGHT_JOIN'] . '' : '') . '
' . $this->compileFieldList($components['SELECT']) . '
FROM ' . $this->compileFromTables($components['FROM']) .
(strlen($where) ? '
(strlen($where) ? '
WHERE ' . $where : '') .
(strlen($groupBy) ? '
(strlen($groupBy) ? '
GROUP BY ' . $groupBy : '') .
(strlen($orderBy) ? '
(strlen($orderBy) ? '
ORDER BY ' . $orderBy : '') .
(strlen($limit) ? '
(strlen($limit) ? '
LIMIT ' . $limit : '');
return $query;
......@@ -1728,7 +1728,7 @@ class t3lib_sqlparser {
// Make query:
$query = 'DELETE FROM ' . $components['TABLE'] .
(strlen($where) ? '
(strlen($where) ? '
WHERE ' . $where : '');
return $query;
......
......@@ -720,13 +720,13 @@ class t3lib_stdGraphic {
*/
function addToMap($cords, $conf) {
$this->map .= '<area' .
' shape="poly"' .
' coords="' . implode(',', $cords) . '"' .
' href="' . htmlspecialchars($conf['url']) . '"' .
($conf['target'] ? ' target="' . htmlspecialchars($conf['target']) . '"' : '') .
$JS .
(strlen($conf['titleText']) ? ' title="' . htmlspecialchars($conf['titleText']) . '"' : '') .
' alt="' . htmlspecialchars($conf['altText']) . '" />';
' shape="poly"' .
' coords="' . implode(',', $cords) . '"' .
' href="' . htmlspecialchars($conf['url']) . '"' .
($conf['target'] ? ' target="' . htmlspecialchars($conf['target']) . '"' : '') .
$JS .
(strlen($conf['titleText']) ? ' title="' . htmlspecialchars($conf['titleText']) . '"' : '') .
' alt="' . htmlspecialchars($conf['altText']) . '" />';
}
/**
......
This diff is collapsed.
......@@ -69,9 +69,9 @@ class t3lib_TCEforms_FE extends t3lib_TCEforms {
foreach ($paletteArray as $content) {
$hRow[] = '<td' . $bgColor . '><font face="verdana" size="1">&nbsp;</font></td><td nowrap="nowrap"' . $bgColor . '><font color="#666666" face="verdana" size="1">' . $content['NAME'] . '</font></td>';
$iRow[] = '<td valign="top">' .
'<img name="req_' . $content['TABLE'] . '_' . $content['ID'] . '_' . $content['FIELD'] . '" src="clear.gif" width="10" height="10" alt="" />' .
'<img name="cm_' . $content['TABLE'] . '_' . $content['ID'] . '_' . $content['FIELD'] . '" src="clear.gif" width="7" height="10" alt="" />' .
'</td><td nowrap="nowrap" valign="top">' . $content['ITEM'] . $content['HELP_ICON'] . '</td>';
'<img name="req_' . $content['TABLE'] . '_' . $content['ID'] . '_' . $content['FIELD'] . '" src="clear.gif" width="10" height="10" alt="" />' .
'<img name="cm_' . $content['TABLE'] . '_' . $content['ID'] . '_' . $content['FIELD'] . '" src="clear.gif" width="7" height="10" alt="" />' .
'</td><td nowrap="nowrap" valign="top">' . $content['ITEM'] . $content['HELP_ICON'] . '</td>';
}
$out = '<table border="0" cellpadding="0" cellspacing="0">
<tr><td><img src="clear.gif" width="' . intval($this->paletteMargin) . '" height="1" alt="" /></td>' . implode('', $hRow) . '</tr>
......
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