Commit eb0ab3bf authored by Michael Stucki's avatar Michael Stucki
Browse files

* Added two hooks for tx_timtaw, written by Sebastian Kurfuerst

* FORM object is finally able to create a reset button (closes #0000743, thanks to Michael Scharkow)
* FE editing: Up/Down buttons in panel did not work (closes #0000849, thanks to Peter Niederlag for pointing me on this)
* typeNum 0 is now set automatically by default: If a page object has no typeNum and typeNum '0' is not defined, TYPO3 will automatically do that now
* Renamed admin function links in the left down corner of the BE (closes #0000025)
* EM: Display privacy message before connecting to the online repository


git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@584 709f56b5-9817-0410-a4d7-c38de5d9e867
parent 53f3688b
2005-03-25 Michael Stucki <michael@typo3.org>
* Added two hooks for tx_timtaw, written by Sebastian Kurfuerst
* FORM object is finally able to create a reset button (closes #0000743, thanks to Michael Scharkow)
* FE editing: Up/Down buttons in panel did not work (closes #0000849, thanks to Peter Niederlag for pointing me on this)
* typeNum 0 is now set automatically by default: If a page object has no typeNum and typeNum '0' is not defined, TYPO3 will automatically do that now
* Renamed admin function links in the left down corner of the BE (closes #0000025)
* EM: Display privacy message before connecting to the online repository
2005-03-16 Ingmar Schlecht <ingmar@typo3.org>
* Fixed bug #0000335 in class.t3lib_extfilefunc.php: If $this->dont_use_exec_commands was set, it was impossible to delete any directories, which is now possible again. It's still impossible to delete direcories recursively though.
......
......@@ -2610,7 +2610,7 @@ class t3lib_div {
return str_replace('//','/', str_replace('\\','/', (php_sapi_name()=='cgi'||php_sapi_name()=='isapi' ||php_sapi_name()=='cgi-fcgi')&&($_SERVER['ORIG_PATH_TRANSLATED']?$_SERVER['ORIG_PATH_TRANSLATED']:$_SERVER['PATH_TRANSLATED'])? ($_SERVER['ORIG_PATH_TRANSLATED']?$_SERVER['ORIG_PATH_TRANSLATED']:$_SERVER['PATH_TRANSLATED']):($_SERVER['ORIG_SCRIPT_FILENAME']?$_SERVER['ORIG_SCRIPT_FILENAME']:$_SERVER['SCRIPT_FILENAME'])));
break;
case 'REQUEST_URI':
// Typical application of REQUEST_URI is return urls, forms submitting to itselt etc. Eg: returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))
// Typical application of REQUEST_URI is return urls, forms submitting to itself etc. Example: returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))
if (!$_SERVER['REQUEST_URI']) { // This is for ISS/CGI which does not have the REQUEST_URI available.
return '/'.ereg_replace('^/','',t3lib_div::getIndpEnv('SCRIPT_NAME')).
($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING']:'');
......
......@@ -132,16 +132,16 @@ class t3lib_tsfeBeUserAuth extends t3lib_beUserAuth {
reset($this->extAdminConfig['enable.']);
while(list($k,$v)=each($this->extAdminConfig['enable.'])) {
if ($v) {
// Enable panel
$this->extAdmEnabled=1;
// Init TSFE_EDIT variables:
$this->TSFE_EDIT = t3lib_div::_POST('TSFE_EDIT');
$this->extAdmEnabled=1; // Enable panel
break;
}
}
}
// Init TSFE_EDIT variables if either the admPanel is enabled or if forceDisplayIcons is set
if($this->extAdmEnabled || $this->extGetFeAdminValue('edit', 'displayIcons')) {
$this->TSFE_EDIT = t3lib_div::_POST('TSFE_EDIT');
}
}
/**
......@@ -940,7 +940,7 @@ class t3lib_tsfeBeUserAuth extends t3lib_beUserAuth {
* @see index_ts.php
*/
function extEditAction() {
global $TCA;
global $TCA, $TYPO3_CONF_VARS;
// Commands:
list($table,$uid) = explode(':',$this->TSFE_EDIT['record']);
if ($this->TSFE_EDIT['cmd'] && $table && $uid && isset($TCA[$table])) {
......@@ -949,6 +949,17 @@ class t3lib_tsfeBeUserAuth extends t3lib_beUserAuth {
$recData=array();
$cmdData=array();
$cmd=$this->TSFE_EDIT['cmd'];
// ****************
// extEditAction HOOK
// ****************
if (is_array($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php']['extEditAction'])) {
$_params = array();
foreach($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php']['extEditAction'] as $_funcRef) {
t3lib_div::callUserFunction($_funcRef,$_params,$this);
}
}
switch($cmd) {
case 'hide':
case 'unhide':
......
......@@ -837,6 +837,8 @@ class t3lib_TStemplate {
$tN = $this->setup[$theKey.'.']['typeNum'];
if (isset($tN)) {
$this->setup['types.'][$tN] = $theKey;
} elseif(!$this->setup['types.'][0]) { // If there is no type 0 yet and typeNum was not set, we use the current object as the default
$this->setup['types.'][0] = $theKey;
}
}
}
......
......@@ -824,7 +824,8 @@ EXTENSION KEYS:
$onCLick = "document.location='index.php?ter_connect=1&ter_search='+escape(this.form['_lookUp'].value);return false;";
$content.= '<br />
Look up: <input type="text" name="_lookUp" value="" />
<input type="submit" value="Connect to online repository" onclick="'.htmlspecialchars($onCLick).'" />';
<input type="submit" value="Connect to online repository" onclick="'.htmlspecialchars($onCLick).'" />
<br /><br /><strong>PRIVACY NOTICE:</strong><br /> '.$this->privacyNotice;
$this->content.=$this->doc->section('Extensions in TYPO3 Extension Repository',$content,0,1);
}
......
......@@ -1772,11 +1772,16 @@ class tslib_cObj {
} else $image='';
if($image) {
$fieldCode = str_replace('<img','<input type="image"'.$addParams.' name="'.$confData['fieldname'].'"' ,$image);
} else {
} else {
$fieldCode=sprintf('<input type="submit" name="%s"'.$elementIdAttribute.' value="%s"'.$addParams.' />',
$confData['fieldname'], t3lib_div::deHSCentities(htmlspecialchars($value)));
}
break;
case 'reset':
$value=trim($parts[2]);
$fieldCode=sprintf('<input type="reset" name="%s"'.$elementIdAttribute.' value="%s"'.$addParams.' />',
$confData['fieldname'], t3lib_div::deHSCentities(htmlspecialchars($value)));
break;
case 'label':
$fieldCode = nl2br(htmlspecialchars(trim($parts[2])));
break;
......
......@@ -161,6 +161,16 @@ $TT->push('Front End user initialized','');
$TSFE->initFEuser();
$TT->pull();
// ****************
// PRE BE_USER HOOK
// ****************
if (is_array($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/index_ts.php']['preBeUser'])) {
foreach($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/index_ts.php']['preBeUser'] as $_funcRef) {
$_params = array();
t3lib_div::callUserFunction($_funcRef, $_params ,$this);
}
}
// *********
// BE_USER
// *********
......@@ -208,8 +218,8 @@ if ($_COOKIE['be_typo_user']) { // If the backend cookie is set, we proceed and
$BE_USER->ext_forcePreview=1;
}
// Include classes for editing IF editing module in Admin Panel is open (it is assumed that $TSFE->displayEditIcons is set only if the Edit module is open in the Admin Panel)
if ($BE_USER->extAdmModuleEnabled('edit') && $BE_USER->extIsAdmMenuOpen('edit')) {
// Include classes for editing IF editing module in Admin Panel is open
if (($BE_USER->extAdmModuleEnabled('edit') && $BE_USER->extIsAdmMenuOpen('edit')) || $TSFE->displayEditIcons == 1) {
$TSFE->includeTCA();
if ($BE_USER->extIsEditAction()) {
require_once (PATH_t3lib.'class.t3lib_tcemain.php');
......
......@@ -143,8 +143,8 @@ Would you like to save now in order to refresh the display?</label>
<label index="rm.clearCache_clearCache">Clear cache</label>
<label index="rm.clearCache_thisPage">This page</label>
<label index="rm.clearCache_pages">Clear Page Cache</label>
<label index="rm.clearCache_all">Clear All Cache</label>
<label index="rm.clearCache_allTypo3Conf">Clear temp_CACHED</label>
<label index="rm.clearCache_all">Clear FE cache</label>
<label index="rm.clearCache_allTypo3Conf">Clear cache in typo3conf/</label>
<label index="rm.adminFunctions">Admin functions</label>
<label index="rm.edit">Edit</label>
<label index="rm.export">Export</label>
......
......@@ -174,7 +174,7 @@ class SC_mod_tools_config_index {
// Variable name:
if (t3lib_div::_GP('varname')) {
$this->content.= '<div style="margin: 10px 10px 10px 10px; padding: 10px 10px 10px 10px; background-color: #eeeeee; border: 1px solid black;">Variable: <br/>
<input type="text" name="_" value="'.htmlspecialchars(t3lib_div::_GP('varname')).'" size="80" /><br/>
<input type="text" name="_" value="'.trim(htmlspecialchars(t3lib_div::_GP('varname'))).'" size="80" /><br/>
(Now, copy/paste this value into the configuration file where you can set it. This is all you can do from here...)
</div>
';
......
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