[TASK] Remove deprecated methods with deprecation log
authorXavier Perseguers <typo3@perseguers.ch>
Fri, 20 May 2011 11:46:55 +0000 (13:46 +0200)
committerOliver Hader <oliver@typo3.org>
Tue, 12 Jul 2011 14:10:00 +0000 (16:10 +0200)
Remove methods and files scheduled for removal since TYPO3 4.5.

Change-Id: I6ea863ae95f0433def4137cd4be1dc01ffc34bce
Resolves: #23010
Reviewed-on: http://review.typo3.org/1988
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
Reviewed-by: Oliver Klee
Reviewed-by: Stefan Neufeind
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
12 files changed:
t3lib/class.t3lib_htmlmail.php
typo3/alt_menu.php
typo3/alt_palette.php
typo3/class.db_list_extra.inc
typo3/jsfunc.tbe_editor.js
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/cms/tslib/class.tslib_fe.php
typo3/sysext/cms/tslib/class.tslib_menu.php
typo3/sysext/cms/tslib/class.tslib_pibase.php
typo3/sysext/simulatestatic/class.tx_simulatestatic.php
typo3/sysext/t3skin/stylesheets/structure/element_palette.css [deleted file]
typo3/sysext/t3skin/stylesheets/visual/element_palette.css [deleted file]

index 7b7c889..a494165 100644 (file)
  * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  * @package    TYPO3
  * @subpackage t3lib
+ *
+ * @deprecated since TYPO3 4.5, this file will be removed in TYPO3 4.7. Please use t3lib_mail instead (SwiftMail based).
  */
 class t3lib_htmlmail {
                // Headerinfo:
@@ -175,6 +177,7 @@ class t3lib_htmlmail {
         * See function sendTheMail for more info
         *
         * @return      void
+        * @deprecated since TYPO3 4.5, this method will be removed in TYPO3 4.7. Use t3lib_mail instead.
         */
        public function __construct() {
                t3lib_div::logDeprecatedFunction();
index cbe7d62..14db2bd 100644 (file)
@@ -43,7 +43,7 @@ require ('template.php');
 require_once ('class.alt_menu_functions.inc');
 
 
-t3lib_div::deprecationLog('alt_palette.php is deprecated since TYPO3 4.5, this file will be removed in TYPO3 4.7. The TYPO3 backend is using typo3/backend.php with less frames, which makes this file obsolete.');
+t3lib_div::deprecationLog('alt_menu.php is deprecated since TYPO3 4.5, this file will be removed in TYPO3 4.7. The TYPO3 backend is using typo3/backend.php with less frames, which makes this file obsolete.');
 
 
 
index 727e604..179577a 100644 (file)
  */
 
 
-require('init.php');
-require('template.php');
-$LANG->includeLLFile('EXT:lang/locallang_alt_doc.xml');
-
-
 t3lib_div::deprecationLog('alt_palette.php is deprecated since TYPO3 4.5, this file will be removed in TYPO3 4.7. The TYPO3 backend is using typo3/backend.php with less frames, which makes this file obsolete.');
 
-
-
-
-/**
- * Class for rendering the form fields.
- * Extending the TCEforms class
- *
- * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
- * @deprecated since TYPO3 4.3, will be removed in TYPO3 4.6
- */
-class formRender extends t3lib_TCEforms {
-
-       /**
-        * Creates the HTML content for the palette
-        * (Horizontally, for display in the top frame)
-        * (Used if GET var "backRef" IS set)
-        *
-        * @deprecated since TYPO3 4.3, will be removed in TYPO3 4.6
-        * @param       array           Array of information from which the fields are built.
-        * @return      string          HTML output
-        */
-       function printPalette($palArr)  {
-               t3lib_div::logDeprecatedFunction();
-
-               $out='';
-
-                       // For each element on the palette, write a few table cells with the field name, content and control images:
-               foreach($palArr as $content)    {
-                       $iRow[]='
-                               <td>'.
-                                       '<img name="req_'.$content['TABLE'].'_'.$content['ID'].'_'.$content['FIELD'].'" class="c-reqIcon" src="clear.gif" width="10" height="10" alt="" />'.
-                                       '<img name="cm_'.$content['TABLE'].'_'.$content['ID'].'_'.$content['FIELD'].'" class="c-cmIcon" src="clear.gif" width="7" height="10" alt="" />'.
-                               '</td>
-                               <td class="c-label">'.
-                                       $content['NAME'].'&nbsp;'.
-                               '</td>
-                               <td class="c-csh">'.
-                                       $content['ITEM'].$content['HELP_ICON'].
-                               '</td>';
-               }
-
-                       // Finally, wrap it all in a table:
-               $out='
-
-
-
-                       <!--
-                               TCEforms palette, rendered in top frame.
-                       -->
-                       <table border="0" cellpadding="0" cellspacing="0" id="typo3-TCEforms-palette">
-                               <tr>
-                                       <td class="c-close">'.
-                                       '<a href="#" onclick="closePal();return false;">' . t3lib_iconWorks::getSpriteIcon('actions-document-close', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.close', TRUE))) . '</a>'.
-                                       '</td>'.
-                               implode('',$iRow).'
-                               </tr>
-                       </table>
-
-                       ';
-
-                       // Return the result:
-               return $out;
-       }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/**
- * Child class for alternative rendering of form fields (when the secondary fields are shown in a little window rather than the top bar).
- * (Used if GET var "backRef" is not set, presuming a window is opened instead.)
- *
- * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
- */
-class formRender_vert extends t3lib_TCEforms {
-
-       /**
-        * Creates the HTML content for the palette.
-        * (Vertically, for display in a browser window, not top frame)
-        *
-        * @param       array           Array of information from which the fields are built.
-        * @return      string          HTML output
-        */
-       function printPalette($palArr)  {
-               $out='';
-               $bgColor=' bgcolor="'.$this->colorScheme[2].'"';
-
-                       // For each element on the palette, write a few table cells with the field name, content and control images:
-               foreach($palArr as $content)    {
-                       $iRow[]='
-                               <tr>
-                                       <td><img src="clear.gif" width="'.intval($this->paletteMargin).'" height="1" alt="" /></td>
-                                       <td'.$bgColor.'>&nbsp;</td>
-                                       <td nowrap="nowrap"'.$bgColor.'><font color="'.$this->colorScheme[4].'">'.$content['NAME'].'</font></td>
-                               </tr>';
-                       $iRow[]='
-                               <tr>
-                                       <td></td>
-                                       <td valign="top"><img name="req_'.$content['TABLE'].'_'.$content['ID'].'_'.$content['FIELD'].'" src="clear.gif" width="10" height="10" vspace="4" alt="" /><img name="cm_'.$content['TABLE'].'_'.$content['ID'].'_'.$content['FIELD'].'" src="clear.gif" width="7" height="10" vspace="4" alt="" /></td>
-                                       <td nowrap="nowrap" valign="top">'.$content['ITEM'].$content['HELP_ICON'].'</td>
-                               </tr>';
-               }
-
-                       // Adding the close button:
-               $iRow[]='
-                       <tr>
-                               <td></td>
-                               <td></td>
-                               <td nowrap="nowrap" valign="top">
-                                       <br />
-                                       <input type="submit" value="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.close',1).'" onclick="closePal(); return false;" />
-                               </td>
-                       </tr>';
-
-                       // Finally, wrap it all in a table:
-               $out='
-                       <table border="0" cellpadding="0" cellspacing="0" id="typo3-TCEforms-palette-vert">
-                               '.implode('',$iRow).'
-                       </table>';
-
-                       // Return content:
-               return $out;
-       }
-}
-
-
-
-
-
-
-
-
-
-
-
-/**
- * Script Class for rendering the palette form for TCEforms in some other frame (in top frame, horizontally)
- * It can also be called in a pop-up window in which case a vertically oriented set of form fields are rendered instead.
- *
- * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
- */
-class SC_alt_palette {
-
-               // Internal:
-       var $content;           // Content accumulation
-       var $backRef;           // String, which is the reference back to the window which opened this one.
-       var $formRef;           // String, which is the reference to the form.
-       var $doc;                       // Template object.
-
-               // Internal, static: GPvar:
-       var $formName;                  // Form name
-       var $GPbackref;                 // The value of the original backRef GPvar (not necessarily the same as $this->backRef)
-       var $inData;                    // Contains tablename, uid and palette number
-       var $prependFormFieldNames;             // Prefix for form fields.
-       var $rec;                               // The "record" with the data to display in the form fields.
-
-
-
-
-
-       /**
-        * Constructor for the class
-        *
-        * @return      void
-        */
-       function init() {
-
-                       // Setting GPvars, etc.
-               $this->formName = $this->sanitizeHtmlName(t3lib_div::_GP('formName'));
-               $this->GPbackref = $this->sanitizeHtmlName(t3lib_div::_GP('backRef'));
-               $this->inData = t3lib_div::_GP('inData');
-                       // safeguards the input with whitelisting
-               if (!preg_match('/^[a-zA-Z0-9\-_\:]+$/', $this->inData)) {
-                       $this->inData = '';
-               }
-               $this->prependFormFieldNames =
-                       $this->sanitizeHtmlName(t3lib_div::_GP('prependFormFieldNames'));
-               $this->rec = t3lib_div::_GP('rec');
-
-                       // Making references:
-               $this->backRef = $this->GPbackref ? $this->GPbackref : 'window.opener';
-
-               $this->formRef = $this->backRef.'.document.'.$this->formName;
-
-                       // Start template object:
-               $this->doc = t3lib_div::makeInstance('template');
-               $this->doc->bodyTagMargins['x']=0;
-               $this->doc->bodyTagMargins['y']=0;
-               $this->doc->form='<form action="#" method="post" name="'.htmlspecialchars($this->formName).'" onsubmit="return false;">';
-               $this->doc->backPath = '';
-
-                       // In case the palette is opened in a SEPARATE window (as the case is with frontend editing) then another body-tag id should be used (so we don't get the background image for the palette shown!)
-               if (!$this->GPbackref)  $this->doc->bodyTagId.= '-vert';
-
-                       // Setting JavaScript functions for the header:
-               $this->doc->JScode = $this->doc->wrapScriptTags('
-                       var serialNumber = "";
-                       function timeout_func() {       //
-                               if ('.$this->backRef.' && '.$this->backRef.'.document && '.$this->formRef.')    {
-                                       if ('.$this->formRef.'["_serialNumber"])        {
-                                               if (serialNumber) {
-                                                       if ('.$this->formRef.'["_serialNumber"].value != serialNumber) {closePal(); return false;}
-                                               } else {
-                                                       serialNumber = '.$this->formRef.'["_serialNumber"].value;
-                                               }
-                                       }
-                                       window.setTimeout("timeout_func();",1*1000);
-                               } else closePal();
-                       }
-                       function closePal()     {       //
-                               '.($this->GPbackref?'window.location.href="alt_topmenu_dummy.php";':'close();').'
-                       }
-                       timeout_func();
-                       onBlur="alert();";
-               ');
-       }
-
-       /**
-        * Sanitizes HTML names, IDs, frame names etc.
-        *
-        * @param string $input the string to sanitize
-        *
-        * @return string the unchanged $input if $input is considered to be harmless,
-        *                an empty string otherwise
-        */
-       protected function sanitizeHtmlName($input) {
-               $result = $input;
-
-               if (!preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $result)) {
-                       $result = '';
-               }
-
-               return $result;
-       }
-
-       /**
-        * Main function, rendering the palette form
-        *
-        * @return      void
-        */
-       function main() {
-
-               $this->content='';
-
-               $inData = explode(':',$this->inData);
-
-                       // Begin edit:
-               if (is_array($inData) && count($inData)==3)     {
-
-                               // Create the TCEforms object:
-                       $tceforms = $this->GPbackref ? new formRender() : new formRender_vert();
-                       $tceforms->initDefaultBEMode();
-                       $tceforms->palFieldTemplate='###FIELD_PALETTE###';
-                       $tceforms->palettesCollapsed=0;
-                       $tceforms->isPalettedoc=$this->backRef;
-
-                       $tceforms->formName = $this->formName;
-                       $tceforms->prependFormFieldNames = $this->prependFormFieldNames;
-
-                               // Initialize other data:
-                       $table=$inData[0];
-                       $theUid=$inData[1];
-                       $thePalNum = $inData[2];
-                       $this->rec['uid']=$theUid;
-
-                               // Getting the palette fields rendered:
-                       $panel.=$tceforms->getPaletteFields($table,$this->rec,$thePalNum,'',implode(',',array_keys($this->rec)));
-                       $formContent=$panel;
-
-                               // Add all the content, including JavaScript as needed.
-                       $this->content.=$tceforms->printNeededJSFunctions_top().$formContent.$tceforms->printNeededJSFunctions();
-               }
-
-               // Assemble the page:
-               $tempContent = $this->content;
-               $this->content = $this->doc->startPage('TYPO3 Edit Palette');
-               $this->content.= $tempContent;
-       }
-
-       /**
-        * Outputting the accumulated content to screen
-        *
-        * @return      void
-        */
-       function printContent() {
-               $this->content.= $this->doc->endPage();
-               $this->content = $this->doc->insertStylesAndJS($this->content);
-               echo $this->content;
-       }
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/alt_palette.php'])) {
-       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/alt_palette.php']);
-}
-
-
-
-// Make instance:
-$SOBE = t3lib_div::makeInstance('SC_alt_palette');
-$SOBE->init();
-$SOBE->main();
-$SOBE->printContent();
-
 ?>
\ No newline at end of file
index 185f7d7..0884080 100644 (file)
@@ -716,28 +716,6 @@ class localRecordList extends recordList {
        }
 
        /**
-        * Write sys_refindex entries for current record to $this->references
-        *
-        * @param       string          Table name
-        * @param       integer         Uid of current record
-        * @return      void
-        *
-        * @deprecated since 4.4, will be removed in TYPO3 4.6 - Use getReferenceCount instead
-        */
-       function setReferences($table, $uid) {
-               t3lib_div::logDeprecatedFunction();
-
-               $rows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
-                       'tablename, recuid, field',
-                       'sys_refindex',
-                       'ref_table='.$GLOBALS['TYPO3_DB']->fullQuoteStr($table,'sys_refindex').
-                               ' AND ref_uid='.intval($uid).
-                               ' AND deleted=0'
-               );
-               $this->references = $rows;
-       }
-
-       /**
         * Gets the number of records referencing the record with the UID $uid in
         * the table $tableName.
         *
@@ -1452,29 +1430,6 @@ class localRecordList extends recordList {
        }
 
        /**
-        * Make reference count
-        *
-        * @param       string          Table name
-        * @param       integer         UID of record
-        * @return      string          HTML-table
-        *
-        * @deprecated since 4.4, will be removed in TYPO3 4.6 - Use createReferenceHtml() instead
-        */
-       function makeRef($table,$uid)   {
-               t3lib_div::logDeprecatedFunction();
-
-                       // Compile information for title tag:
-               $infoData=array();
-               if (is_array($this->references)) {
-                       foreach ($this->references as $row) {
-                               $infoData[]=$row['tablename'].':'.$row['recuid'].':'.$row['field'];
-                       }
-               }
-
-               return count($infoData) ? '<a href="#" onclick="'.htmlspecialchars('top.launchView(\''.$table.'\', \''.$uid.'\'); return false;').'" title="'.htmlspecialchars(t3lib_div::fixed_lgd_cs(implode(' / ',$infoData),100)).'">'.count($infoData).'</a>' : '';
-       }
-
-       /**
         * Creates the HTML for a reference count for the record with the UID $uid
         * in the table $tableName.
         *
index 2315aad..f906a31 100644 (file)
@@ -504,22 +504,6 @@ var TBE_EDITOR = {
                if(ePos == -1) { ePos = theStr.length; }
                return (theStr.substring(sPos+lengthOfDelim,ePos));
        },
-       palUrl: function(inData,fieldList,fieldNum,table,uid,isOnFocus) {
-               var url = TBE_EDITOR.backPath+'alt_palette.php?inData='+inData+'&formName='+TBE_EDITOR.formnameUENC+'&prependFormFieldNames='+TBE_EDITOR.prependFormFieldNamesUENC;
-               var field = "";
-               var theField="";
-               for (var a=0; a<fieldNum;a++)   {
-                       field = TBE_EDITOR.split(fieldList, ",", a+1);
-                       theField = TBE_EDITOR.prependFormFieldNames+'['+table+']['+uid+']['+field+']';
-                       if (document[TBE_EDITOR.formname][theField]) url+="&rec["+field+"]="+TBE_EDITOR.rawurlencode(document[TBE_EDITOR.formname][theField].value);
-               }
-               if (top.topmenuFrame)   {
-                       top.topmenuFrame.location.href = url+"&backRef="+(top.content.list_frame ? (top.content.list_frame.view_frame ? "top.content.list_frame.view_frame" : "top.content.list_frame") : "top.content");
-               } else if (!isOnFocus) {
-                       var vHWin=window.open(url,"palette","height=300,width=200,status=0,menubar=0,scrollbars=1");
-                       vHWin.focus();
-               }
-       },
        curSelected: function(theField) {
                var fObjSel = document[TBE_EDITOR.formname][theField];
                var retVal="";
@@ -611,7 +595,6 @@ var TBE_EDITOR_initRequired = TBE_EDITOR.initRequired;
 var TBE_EDITOR_setImage = TBE_EDITOR.setImage;
 var TBE_EDITOR_submitForm = TBE_EDITOR.submitForm;
 var TBE_EDITOR_split = TBE_EDITOR.split;
-var TBE_EDITOR_palUrl = TBE_EDITOR.palUrl;
 var TBE_EDITOR_curSelected = TBE_EDITOR.curSelected;
 var TBE_EDITOR_rawurlencode = TBE_EDITOR.rawurlencode;
 var TBE_EDITOR_str_replace = TBE_EDITOR.str_replace;
index 9db737c..9f2c334 100644 (file)
@@ -1150,19 +1150,6 @@ class tslib_cObj {
                        $GLOBALS['TSFE']->imagesOnPage[] = $info[3]; // This array is used to collect the image-refs on the page...
 
 
-                               // Backwards compatibility if altText is not set and alttext is set
-                               // @deprecated since TYPO3 4.3, will be removed in TYPO3 4.6
-                       if (strlen($conf['alttext']) || is_array($conf['alttext.'])) {
-                               $GLOBALS['TSFE']->logDeprecatedTyposcript(
-                                       'IMAGE.alttext',
-                                       'use IMAGE.altText instead - src: ' . $info[3] . ' - original image: ' . $info['origFile']
-                               );
-                               if (!strlen($conf['altText']) && !is_array($conf['altText.'])) {
-                                       $conf['altText'] = $conf['alttext'];
-                                       $conf['altText.'] = $conf['alttext.'];
-                               }
-                       }
-
                        $altParam = $this->getAltParam($conf);
                        if($conf['params'] && !isset($conf['params.'])) {
                                $params = ' ' . $conf['params'];
index d7be9e0..58558e6 100644 (file)
@@ -3817,127 +3817,6 @@ if (version == "n3") {
 
 
        /**
-        * Make simulation filename (without the ".html" ending, only body of filename)
-        *
-        * @param       string          The page title to use
-        * @param       mixed           The page id (integer) or alias (string)
-        * @param       integer         The type number
-        * @param       string          Query-parameters to encode (will be done only if caching is enabled and TypoScript configured for it. I don't know it this makes much sense in fact...)
-        * @param       boolean         The "no_cache" status of the link.
-        * @return      string          The body of the filename.
-        * @see getSimulFileName(), t3lib_tstemplate::linkData(), tslib_frameset::frameParams()
-        * @deprecated since TYPO3 4.3, will be removed in TYPO3 4.6, please use the "simulatestatic" sysext directly
-        * @todo        Deprecated but still used in the Core!
-        */
-       function makeSimulFileName($inTitle, $page, $type, $addParams = '', $no_cache = FALSE) {
-               t3lib_div::logDeprecatedFunction();
-
-               if (t3lib_extMgm::isLoaded('simulatestatic')) {
-                       $parameters = array(
-                               'inTitle' => $inTitle,
-                               'page' => $page,
-                               'type' => $type,
-                               'addParams' => $addParams,
-                               'no_cache' => $no_cache,
-                       );
-                       return t3lib_div::callUserFunction(
-                               'EXT:simulatestatic/class.tx_simulatestatic.php:&tx_simulatestatic->makeSimulatedFileNameCompat',
-                               $parameters,
-                               $this
-                       );
-               } else {
-                       return FALSE;
-               }
-       }
-
-       /**
-        * Processes a query-string with GET-parameters and returns two strings, one with the parameters that CAN be encoded and one array with those which can't be encoded (encoded by the M5 or B6 methods)
-        *
-        * @param       string          Query string to analyse
-        * @return      array           Two num keys returned, first is the parameters that MAY be encoded, second is the non-encodable parameters.
-        * @see makeSimulFileName(), t3lib_tstemplate::linkData()
-        * @deprecated since TYPO3 4.3, will be removed in TYPO3 4.6, please use the "simulatestatic" sysext directly
-        */
-       function simulateStaticDocuments_pEnc_onlyP_proc($linkVars)     {
-               t3lib_div::logDeprecatedFunction();
-
-               if (t3lib_extMgm::isLoaded('simulatestatic')) {
-                       return t3lib_div::callUserFunction(
-                               'EXT:simulatestatic/class.tx_simulatestatic.php:&tx_simulatestatic->processEncodedQueryString',
-                               $linkVars,
-                               $this
-                       );
-               } else {
-                       return FALSE;
-               }
-       }
-
-       /**
-        * Returns the simulated static file name (*.html) for the current page (using the page record in $this->page)
-        *
-        * @return      string          The filename (without path)
-        * @see makeSimulFileName()
-        * @deprecated since TYPO3 4.3, will be removed in TYPO3 4.6, please use the "simulatestatic" sysext directly
-        * @todo        Deprecated but still used in the Core!
-        */
-       function getSimulFileName()     {
-               t3lib_div::logDeprecatedFunction();
-
-               return $this->makeSimulFileName(
-                       $this->page['title'],
-                       ($this->page['alias'] ? $this->page['alias'] : $this->id),
-                       $this->type
-               ) . '.html';
-       }
-
-       /**
-        * Checks and sets replacement character for simulateStaticDocuments. Default is underscore.
-        *
-        * @return      void
-        * @deprecated since TYPO3 4.3, will be removed in TYPO3 4.6, please use the "simulatestatic" sysext directly
-        */
-       function setSimulReplacementChar() {
-               t3lib_div::logDeprecatedFunction();
-
-               $replacement = $defChar = t3lib_div::compat_version('4.0') ? '-' : '_';
-               if (isset($this->config['config']['simulateStaticDocuments_replacementChar'])) {
-                       $replacement = trim($this->config['config']['simulateStaticDocuments_replacementChar']);
-                       if (urlencode($replacement) != $replacement) {
-                                       // Invalid character
-                               $replacement = $defChar;
-                       }
-               }
-               $this->config['config']['simulateStaticDocuments_replacementChar'] = $replacement;
-       }
-
-       /**
-        * Converts input string to an ASCII based file name prefix
-        *
-        * @param       string          String to base output on
-        * @param       integer         Number of characters in the string
-        * @param       string          Character to put in the end of string to merge it with the next value.
-        * @return      string          String
-        * @deprecated since TYPO3, 4.3, will be removed in TYPO3 4.6, please use the "simulatestatic" sysext directly
-        * @todo        Deprecated but still used in the Core!
-        */
-       function fileNameASCIIPrefix($inTitle,$titleChars,$mergeChar='.')       {
-               t3lib_div::logDeprecatedFunction();
-               $out = $this->csConvObj->specCharsToASCII($this->renderCharset, $inTitle);
-                       // Get replacement character
-               $replacementChar = $this->config['config']['simulateStaticDocuments_replacementChar'];
-               $replacementChars = '_\-' . ($replacementChar != '_' && $replacementChar != '-' ? $replacementChar : '');
-               $out = preg_replace('/[^A-Za-z0-9_-]/', $replacementChar, trim(substr($out, 0, $titleChars)));
-               $out = preg_replace('/([' . $replacementChars . ']){2,}/', '\1', $out);
-               $out = preg_replace('/[' . $replacementChars . ']?$/', '', $out);
-               $out = preg_replace('/^[' . $replacementChars . ']?/', '', $out);
-               if (strlen($out)) {
-                       $out.= $mergeChar;
-               }
-
-               return $out;
-       }
-
-       /**
         * Encryption (or decryption) of a single character.
         * Within the given range the character is shifted with the supplied offset.
         *
index 95b5936..69dc973 100644 (file)
@@ -863,27 +863,6 @@ class tslib_menu {
        }
 
        /**
-        * Includes the PHP script defined for the HMENU special type "userdefined".
-        * This script is supposed to populate the array $menuItemsArray with a set of page records comprising the menu.
-        * The "userdefined" type is deprecated since "userfunction" has arrived since and is a better choice for many reasons (like using classes/functions for rendering the menu)
-        *
-        * @param       array           TypoScript parameters for "special.". In particular the property "file" is reserved and specifies the file to include. Seems like any other property can be used freely by the script.
-        * @param       string          The sorting field. Can be used from the script in the $incFile.
-        * @return      array           An array with the menu items
-        * @deprecated since TYPO3 3.6, this function will be removed in TYPO3 4.6, use HMENU of type "userfunction" instead of "userdefined"
-        * @access private
-        */
-       function includeMakeMenu($conf,$altSortField)   {
-               t3lib_div::logDeprecatedFunction();
-
-               $incFile = $GLOBALS['TSFE']->tmpl->getFileName($conf['file']);
-               if ($incFile && $GLOBALS['TSFE']->checkFileInclude($incFile))   {
-                       include($incFile);
-               }
-               return is_array($menuItemsArray) ? $menuItemsArray : array();
-       }
-
-       /**
         * Checks if a page is OK to include in the final menu item array. Pages can be excluded if the doktype is wrong, if they are hidden in navigation, have a uid in the list of banned uids etc.
         *
         * @param       array           Array of menu items
index c893f70..496be4f 100644 (file)
@@ -984,103 +984,6 @@ class tslib_pibase {
         **************************/
 
        /**
-        * Makes a standard query for listing of records based on standard input vars from the 'browser' ($this->internal['results_at_a_time'] and $this->piVars['pointer']) and 'searchbox' ($this->piVars['sword'] and $this->internal['searchFieldList'])
-        * Set $count to 1 if you wish to get a count(*) query for selecting the number of results.
-        * Notice that the query will use $this->conf['pidList'] and $this->conf['recursive'] to generate a PID list within which to search for records.
-        *
-        * @param       string          See pi_exec_query()
-        * @param       boolean         See pi_exec_query()
-        * @param       string          See pi_exec_query()
-        * @param       mixed           See pi_exec_query()
-        * @param       string          See pi_exec_query()
-        * @param       string          See pi_exec_query()
-        * @param       string          See pi_exec_query()
-        * @param       boolean         If set, the function will return the query not as a string but array with the various parts.
-        * @return      mixed           The query build.
-        * @access private
-        * @deprecated since TYPO3 3.6, this function will be removed in TYPO3 4.5, use pi_exec_query() instead!
-        * @todo        Deprecated but still used in the Core!
-        */
-       function pi_list_query($table,$count=0,$addWhere='',$mm_cat='',$groupBy='',$orderBy='',$query='',$returnQueryArray=FALSE)       {
-               t3lib_div::logDeprecatedFunction();
-
-               // Begin Query:
-               if (!$query)    {
-                               // Fetches the list of PIDs to select from.
-                               // TypoScript property .pidList is a comma list of pids. If blank, current page id is used.
-                               // TypoScript property .recursive is a int+ which determines how many levels down from the pids in the pid-list subpages should be included in the select.
-                       $pidList = $this->pi_getPidList($this->conf['pidList'],$this->conf['recursive']);
-                       if (is_array($mm_cat))  {
-                               $query='FROM '.$table.','.$mm_cat['table'].','.$mm_cat['mmtable'].LF.
-                                               ' WHERE '.$table.'.uid='.$mm_cat['mmtable'].'.uid_local AND '.$mm_cat['table'].'.uid='.$mm_cat['mmtable'].'.uid_foreign '.LF.
-                                               (strcmp($mm_cat['catUidList'],'')?' AND '.$mm_cat['table'].'.uid IN ('.$mm_cat['catUidList'].')':'').LF.
-                                               ' AND '.$table.'.pid IN ('.$pidList.')'.LF.
-                                               $this->cObj->enableFields($table).LF;   // This adds WHERE-clauses that ensures deleted, hidden, starttime/endtime/access records are NOT selected, if they should not! Almost ALWAYS add this to your queries!
-                       } else {
-                               $query='FROM '.$table.' WHERE pid IN ('.$pidList.')'.LF.
-                                               $this->cObj->enableFields($table).LF;   // This adds WHERE-clauses that ensures deleted, hidden, starttime/endtime/access records are NOT selected, if they should not! Almost ALWAYS add this to your queries!
-                       }
-               }
-
-                       // Split the "FROM ... WHERE" string so we get the WHERE part and TABLE names separated...:
-               list($TABLENAMES, $WHERE) = preg_split('/WHERE/i', trim($query), 2);
-               $TABLENAMES = trim(substr(trim($TABLENAMES),5));
-               $WHERE = trim($WHERE);
-
-                       // Add '$addWhere'
-               if ($addWhere)  {$WHERE.=' '.$addWhere.LF;}
-
-                       // Search word:
-               if ($this->piVars['sword'] && $this->internal['searchFieldList'])       {
-                       $WHERE.=$this->cObj->searchWhere($this->piVars['sword'],$this->internal['searchFieldList'],$table).LF;
-               }
-
-               if ($count) {
-                       $queryParts = array(
-                               'SELECT' => 'count(*)',
-                               'FROM' => $TABLENAMES,
-                               'WHERE' => $WHERE,
-                               'GROUPBY' => '',
-                               'ORDERBY' => '',
-                               'LIMIT' => ''
-                       );
-               } else {
-                               // Order by data:
-                       if (!$orderBy && $this->internal['orderBy'])    {
-                               if (t3lib_div::inList($this->internal['orderByList'],$this->internal['orderBy']))       {
-                                       $orderBy = 'ORDER BY '.$table.'.'.$this->internal['orderBy'].($this->internal['descFlag']?' DESC':'');
-                               }
-                       }
-
-                               // Limit data:
-                       $pointer = $this->piVars['pointer'];
-                       $pointer = intval($pointer);
-                       $results_at_a_time = t3lib_utility_Math::forceIntegerInRange($this->internal['results_at_a_time'],1,1000);
-                       $LIMIT = ($pointer*$results_at_a_time).','.$results_at_a_time;
-
-                               // Add 'SELECT'
-                       $queryParts = array(
-                               'SELECT' => $this->pi_prependFieldsWithTable($table,$this->pi_listFields),
-                               'FROM' => $TABLENAMES,
-                               'WHERE' => $WHERE,
-                               'GROUPBY' => $GLOBALS['TYPO3_DB']->stripGroupBy($groupBy),
-                               'ORDERBY' => $GLOBALS['TYPO3_DB']->stripOrderBy($orderBy),
-                               'LIMIT' => $LIMIT
-                       );
-               }
-
-               $query = $GLOBALS['TYPO3_DB']->SELECTquery (
-                                       $queryParts['SELECT'],
-                                       $queryParts['FROM'],
-                                       $queryParts['WHERE'],
-                                       $queryParts['GROUPBY'],
-                                       $queryParts['ORDERBY'],
-                                       $queryParts['LIMIT']
-                               );
-               return $returnQueryArray ? $queryParts : $query;
-       }
-
-       /**
         * Executes a standard SELECT query for listing of records based on standard input vars from the 'browser' ($this->internal['results_at_a_time'] and $this->piVars['pointer']) and 'searchbox' ($this->piVars['sword'] and $this->internal['searchFieldList'])
         * Set $count to 1 if you wish to get a count(*) query for selecting the number of results.
         * Notice that the query will use $this->conf['pidList'] and $this->conf['recursive'] to generate a PID list within which to search for records.
index c461587..9fb88ae 100644 (file)
@@ -266,28 +266,6 @@ class tx_simulatestatic {
         *******************************************/
 
        /**
-        * This is just a wrapper function to use the params from the array split up. Can be deleted once the function in class.t3lib_fe.php is deleted
-        *
-        * @param       array           Parameter array delivered from tslib_fe::makeSimulFileName
-        * @param       tslib_fe        Reference to the calling TSFE instance
-        * @return      string          The body of the filename.
-        * @see makeSimulatedFileName()
-        * @deprecated since TYPO3 4.3, will be deleted in TYPO3 4.6
-        */
-       public function makeSimulatedFileNameCompat(array &$parameters, tslib_fe &$parentObject) {
-               t3lib_div::logDeprecatedFunction();
-
-               return $this->makeSimulatedFileName(
-                       $parameters['inTitle'],
-                       $parameters['page'],
-                       $parameters['type'],
-                       $parameters['addParams'],
-                       $parameters['no_cache']
-               );
-       }
-
-
-       /**
         * Make simulation filename (without the ".html" ending, only body of filename)
         *
         * @param       string          The page title to use
@@ -296,7 +274,6 @@ class tx_simulatestatic {
         * @param       string          Query-parameters to encode (will be done only if caching is enabled and TypoScript configured for it. I don't know it this makes much sense in fact...)
         * @param       boolean         The "no_cache" status of the link.
         * @return      string          The body of the filename.
-        * @see getSimulFileName(), t3lib_tstemplate::linkData(), tslib_frameset::frameParams()
         */
        public function makeSimulatedFileName($inTitle, $page, $type, $addParams = '', $no_cache = FALSE) {
                        // Default value is 30 but values > 1 will be override this
diff --git a/typo3/sysext/t3skin/stylesheets/structure/element_palette.css b/typo3/sysext/t3skin/stylesheets/structure/element_palette.css
deleted file mode 100644 (file)
index aca26c8..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* - - - - - - - - - - - - - - - - - - - - -
-Palette display for TCEforms (top frame, alt_palette.php)
-
-- - - - - - - - - - - - - - - - - - - - - */
-
-body#typo3-alt-palette-php {
-       margin-left: 6px;
-       margin-top: 8px;
-}
-
-body#typo3-alt-palette-php table#typo3-TCEforms-palette {
-       bottom: 1px;
-       height: 20px;
-       position: absolute;
-}
-
-body#typo3-alt-palette-php table td {
-       height: 20px;
-       margin: 0;
-       padding: 0;
-       vertical-align: middle;
-}
-
-body#typo3-alt-palette-php table img {
-       margin: 0;
-       padding: 0;
-}
-
-body#typo3-alt-palette-php table td.c-csh input.checkbox {
-       margin: 0px 3px 0 0;
-}
-
-body#typo3-alt-palette-php span.nbsp {
-       display: none;
-}
-
-table#typo3-TCEforms-palette tr td.c-label {
-       padding-top: 3px;
-}
-
-table#typo3-TCEforms-palette tr td.c-close {
-       padding-top: 3px;
-}
\ No newline at end of file
diff --git a/typo3/sysext/t3skin/stylesheets/visual/element_palette.css b/typo3/sysext/t3skin/stylesheets/visual/element_palette.css
deleted file mode 100644 (file)
index 808a4cc..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* - - - - - - - - - - - - - - - - - - - - -
-Palette display for TCEforms (top frame, alt_palette.php)
-
-- - - - - - - - - - - - - - - - - - - - - */
-
-body#typo3-alt-palette-php {
-       background-image: url('../../icons/gfx/topmenu_background_palette.jpg');
-}
-
-table#typo3-TCEforms-palette td {
-       white-space: nowrap;
-}
-
-table#typo3-TCEforms-palette td.c-label {
-       color: #fff;
-}
-
-body#typo3-alt-palette-php table td.c-csh input.checkbox {
-       background-color: transparent;
-}
\ No newline at end of file