From 851a5d8262a495ffcc29d1cc834cd38bc19da663 Mon Sep 17 00:00:00 2001 From: TYPO3 Release Team Date: Fri, 9 Oct 2015 00:08:57 +0200 Subject: [PATCH] [TASK] Make TYPO3 Core PSR-2 standard compliant In our efforts to achieve a better interoperability with other PHP projects, the PHP code base of the TYPO3 Core switches to the PHP coding guideline standard PSR-2. See http://www.php-fig.org/psr/psr-2/ for more information. Resolves: #70515 Releases: master Change-Id: I734c0d838af157003decfeb5fc0a11dddcb87bf5 Reviewed-on: http://review.typo3.org/43918 Reviewed-by: TYPO3 Release Team Tested-by: TYPO3 Release Team --- Classes/FrontendEditPanel.php | 549 +++++++++++++++++----------------- ext_emconf.php | 36 +-- 2 files changed, 295 insertions(+), 290 deletions(-) diff --git a/Classes/FrontendEditPanel.php b/Classes/FrontendEditPanel.php index 0e1d3a0..264848e 100644 --- a/Classes/FrontendEditPanel.php +++ b/Classes/FrontendEditPanel.php @@ -28,302 +28,307 @@ use TYPO3\CMS\Frontend\View\AdminPanelView; /** * View class for the edit panels in frontend editing. */ -class FrontendEditPanel { +class FrontendEditPanel +{ + /** + * The Content Object Renderer + * + * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer + */ + protected $cObj; - /** - * The Content Object Renderer - * - * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer - */ - protected $cObj; + /** + * Property for accessing TypoScriptFrontendController centrally + * + * @var TypoScriptFrontendController + */ + protected $frontendController; - /** - * Property for accessing TypoScriptFrontendController centrally - * - * @var TypoScriptFrontendController - */ - protected $frontendController; + /** + * Property for accessing DatabaseConnection centrally + * + * @var DatabaseConnection + */ + protected $databaseConnection; - /** - * Property for accessing DatabaseConnection centrally - * - * @var DatabaseConnection - */ - protected $databaseConnection; + /** + * @var FrontendBackendUserAuthentication + */ + protected $backendUser; - /** - * @var FrontendBackendUserAuthentication - */ - protected $backendUser; + /** + * @var \TYPO3\CMS\Core\Imaging\IconFactory + */ + protected $iconFactory; - /** - * @var \TYPO3\CMS\Core\Imaging\IconFactory - */ - protected $iconFactory; + /** + * Constructor for the edit panel + * + * @param DatabaseConnection $databaseConnection + * @param TypoScriptFrontendController $frontendController + * @param FrontendBackendUserAuthentication $backendUser + */ + public function __construct(DatabaseConnection $databaseConnection = null, TypoScriptFrontendController $frontendController = null, FrontendBackendUserAuthentication $backendUser = null) + { + $this->databaseConnection = $databaseConnection ?: $GLOBALS['TYPO3_DB']; + $this->frontendController = $frontendController ?: $GLOBALS['TSFE']; + $this->backendUser = $backendUser ?: $GLOBALS['BE_USER']; + $this->cObj = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class); + $this->cObj->start(array()); + $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class); + } - /** - * Constructor for the edit panel - * - * @param DatabaseConnection $databaseConnection - * @param TypoScriptFrontendController $frontendController - * @param FrontendBackendUserAuthentication $backendUser - */ - public function __construct(DatabaseConnection $databaseConnection = NULL, TypoScriptFrontendController $frontendController = NULL, FrontendBackendUserAuthentication $backendUser = NULL) { - $this->databaseConnection = $databaseConnection ?: $GLOBALS['TYPO3_DB']; - $this->frontendController = $frontendController ?: $GLOBALS['TSFE']; - $this->backendUser = $backendUser ?: $GLOBALS['BE_USER']; - $this->cObj = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class); - $this->cObj->start(array()); - $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class); - } + /** + * Generates the "edit panels" which can be shown for a page or records on a page when the Admin Panel is enabled for a backend users surfing the frontend. + * With the "edit panel" the user will see buttons with links to editing, moving, hiding, deleting the element + * This function is used for the cObject EDITPANEL and the stdWrap property ".editPanel" + * + * @param string $content A content string containing the content related to the edit panel. For cObject "EDITPANEL" this is empty but not so for the stdWrap property. The edit panel is appended to this string and returned. + * @param array $conf TypoScript configuration properties for the editPanel + * @param string $currentRecord The "table:uid" of the record being shown. If empty string then $this->currentRecord is used. For new records (set by $conf['newRecordFromTable']) it's auto-generated to "[tablename]:NEW + * @param array $dataArr Alternative data array to use. Default is $this->data + * @param string $table + * @param array $allow + * @param int $newUID + * @param array $hiddenFields + * @return string The input content string with the editPanel appended. This function returns only an edit panel appended to the content string if a backend user is logged in (and has the correct permissions). Otherwise the content string is directly returned. + */ + public function editPanel($content, array $conf, $currentRecord = '', array $dataArr = array(), $table = '', array $allow = array(), $newUID = 0, array $hiddenFields = array()) + { + $hiddenFieldString = $command = ''; - /** - * Generates the "edit panels" which can be shown for a page or records on a page when the Admin Panel is enabled for a backend users surfing the frontend. - * With the "edit panel" the user will see buttons with links to editing, moving, hiding, deleting the element - * This function is used for the cObject EDITPANEL and the stdWrap property ".editPanel" - * - * @param string $content A content string containing the content related to the edit panel. For cObject "EDITPANEL" this is empty but not so for the stdWrap property. The edit panel is appended to this string and returned. - * @param array $conf TypoScript configuration properties for the editPanel - * @param string $currentRecord The "table:uid" of the record being shown. If empty string then $this->currentRecord is used. For new records (set by $conf['newRecordFromTable']) it's auto-generated to "[tablename]:NEW - * @param array $dataArr Alternative data array to use. Default is $this->data - * @param string $table - * @param array $allow - * @param int $newUID - * @param array $hiddenFields - * @return string The input content string with the editPanel appended. This function returns only an edit panel appended to the content string if a backend user is logged in (and has the correct permissions). Otherwise the content string is directly returned. - */ - public function editPanel($content, array $conf, $currentRecord = '', array $dataArr = array(), $table = '', array $allow = array(), $newUID = 0, array $hiddenFields = array()) { - $hiddenFieldString = $command = ''; + // Special content is about to be shown, so the cache must be disabled. + $this->frontendController->set_no_cache('Frontend edit panel is shown', true); - // Special content is about to be shown, so the cache must be disabled. - $this->frontendController->set_no_cache('Frontend edit panel is shown', TRUE); + $formName = 'TSFE_EDIT_FORM_' . substr($this->frontendController->uniqueHash(), 0, 4); + $formTag = '
'; + $sortField = $GLOBALS['TCA'][$table]['ctrl']['sortby']; + $labelField = $GLOBALS['TCA'][$table]['ctrl']['label']; + $hideField = $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled']; - $formName = 'TSFE_EDIT_FORM_' . substr($this->frontendController->uniqueHash(), 0, 4); - $formTag = ''; - $sortField = $GLOBALS['TCA'][$table]['ctrl']['sortby']; - $labelField = $GLOBALS['TCA'][$table]['ctrl']['label']; - $hideField = $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled']; + $panel = ''; + if (isset($allow['toolbar']) && $this->backendUser->adminPanel instanceof AdminPanelView) { + $panel .= $this->backendUser->adminPanel->ext_makeToolBar(); + } + if (isset($allow['edit'])) { + $icon = '' . $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL)->render() . ''; + $panel .= $this->editPanelLinkWrap($icon, $formName, 'edit', $dataArr['_LOCALIZED_UID'] ? $table . ':' . $dataArr['_LOCALIZED_UID'] : $currentRecord); + } + // Hiding in workspaces because implementation is incomplete + if (isset($allow['move']) && $sortField && $this->backendUser->workspace === 0) { + $icon = '' . $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL)->render() . ''; + $panel .= $this->editPanelLinkWrap($icon, $formName, 'up'); + $icon = '' . $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL)->render() . ''; + $panel .= $this->editPanelLinkWrap($icon, $formName, 'down'); + } + // Hiding in workspaces because implementation is incomplete + // Hiding for localizations because it is unknown what should be the function in that case + if (isset($allow['hide']) && $hideField && $this->backendUser->workspace === 0 && !$dataArr['_LOCALIZED_UID']) { + if ($dataArr[$hideField]) { + $icon = $this->iconFactory->getIcon('actions-edit-unhide')->render(); + $panel .= $this->editPanelLinkWrap($icon, $formName, 'unhide'); + } else { + $icon = $this->iconFactory->getIcon('actions-edit-hide')->render(); + $panel .= $this->editPanelLinkWrap($icon, $formName, 'hide', '', $this->backendUser->extGetLL('p_hideConfirm')); + } + } + if (isset($allow['new'])) { + if ($table === 'pages') { + $icon = '' + . $this->iconFactory->getIcon('actions-page-new', Icon::SIZE_SMALL)->render() + . ''; + $panel .= $this->editPanelLinkWrap($icon, $formName, 'new', $currentRecord, ''); + } else { + $icon = '' + . $this->iconFactory->getIcon('actions-document-new', Icon::SIZE_SMALL)->render() + . ''; + $panel .= $this->editPanelLinkWrap($icon, $formName, 'new', $currentRecord, '', $newUID); + } + } + // Hiding in workspaces because implementation is incomplete + // Hiding for localizations because it is unknown what should be the function in that case + if (isset($allow['delete']) && $this->backendUser->workspace === 0 && !$dataArr['_LOCALIZED_UID']) { + $icon = '' + . $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render() + . ''; + $panel .= $this->editPanelLinkWrap($icon, $formName, 'delete', '', $this->backendUser->extGetLL('p_deleteConfirm')); + } + // Final + $labelTxt = $this->cObj->stdWrap($conf['label'], $conf['label.']); + foreach ((array)$hiddenFields as $name => $value) { + $hiddenFieldString .= '' . LF; + } - $panel = ''; - if (isset($allow['toolbar']) && $this->backendUser->adminPanel instanceof AdminPanelView) { - $panel .= $this->backendUser->adminPanel->ext_makeToolBar(); - } - if (isset($allow['edit'])) { - $icon = '' . $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL)->render() . ''; - $panel .= $this->editPanelLinkWrap($icon, $formName, 'edit', $dataArr['_LOCALIZED_UID'] ? $table . ':' . $dataArr['_LOCALIZED_UID'] : $currentRecord); - } - // Hiding in workspaces because implementation is incomplete - if (isset($allow['move']) && $sortField && $this->backendUser->workspace === 0) { - $icon = '' . $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL)->render() . ''; - $panel .= $this->editPanelLinkWrap($icon, $formName, 'up'); - $icon = '' . $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL)->render() . ''; - $panel .= $this->editPanelLinkWrap($icon, $formName, 'down'); - } - // Hiding in workspaces because implementation is incomplete - // Hiding for localizations because it is unknown what should be the function in that case - if (isset($allow['hide']) && $hideField && $this->backendUser->workspace === 0 && !$dataArr['_LOCALIZED_UID']) { - if ($dataArr[$hideField]) { - $icon = $this->iconFactory->getIcon('actions-edit-unhide')->render(); - $panel .= $this->editPanelLinkWrap($icon, $formName, 'unhide'); - } else { - $icon = $this->iconFactory->getIcon('actions-edit-hide')->render(); - $panel .= $this->editPanelLinkWrap($icon, $formName, 'hide', '', $this->backendUser->extGetLL('p_hideConfirm')); - } - } - if (isset($allow['new'])) { - if ($table === 'pages') { - $icon = '' - . $this->iconFactory->getIcon('actions-page-new', Icon::SIZE_SMALL)->render() - . ''; - $panel .= $this->editPanelLinkWrap($icon, $formName, 'new', $currentRecord, ''); - } else { - $icon = '' - . $this->iconFactory->getIcon('actions-document-new', Icon::SIZE_SMALL)->render() - . ''; - $panel .= $this->editPanelLinkWrap($icon, $formName, 'new', $currentRecord, '', $newUID); - } - } - // Hiding in workspaces because implementation is incomplete - // Hiding for localizations because it is unknown what should be the function in that case - if (isset($allow['delete']) && $this->backendUser->workspace === 0 && !$dataArr['_LOCALIZED_UID']) { - $icon = '' - . $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render() - . ''; - $panel .= $this->editPanelLinkWrap($icon, $formName, 'delete', '', $this->backendUser->extGetLL('p_deleteConfirm')); - } - // Final - $labelTxt = $this->cObj->stdWrap($conf['label'], $conf['label.']); - foreach ((array)$hiddenFields as $name => $value) { - $hiddenFieldString .= '' . LF; - } - - $panel = ' + $panel = ' ' . $formTag . $hiddenFieldString . '
' - . $panel . - ($labelTxt ? '
' . sprintf($labelTxt, htmlspecialchars(GeneralUtility::fixed_lgd_cs($dataArr[$labelField], 50))) . '
' : '') . ' + . $panel . + ($labelTxt ? '
' . sprintf($labelTxt, htmlspecialchars(GeneralUtility::fixed_lgd_cs($dataArr[$labelField], 50))) . '
' : '') . '
'; - // Wrap the panel - if ($conf['innerWrap']) { - $panel = $this->cObj->wrap($panel, $conf['innerWrap']); - } - if ($conf['innerWrap.']) { - $panel = $this->cObj->stdWrap($panel, $conf['innerWrap.']); - } + // Wrap the panel + if ($conf['innerWrap']) { + $panel = $this->cObj->wrap($panel, $conf['innerWrap']); + } + if ($conf['innerWrap.']) { + $panel = $this->cObj->stdWrap($panel, $conf['innerWrap.']); + } - // Wrap the complete panel - if ($conf['outerWrap']) { - $panel = $this->cObj->wrap($panel, $conf['outerWrap']); - } - if ($conf['outerWrap.']) { - $panel = $this->cObj->stdWrap($panel, $conf['outerWrap.']); - } - if ($conf['printBeforeContent']) { - $finalOut = $panel . $content; - } else { - $finalOut = $content . $panel; - } + // Wrap the complete panel + if ($conf['outerWrap']) { + $panel = $this->cObj->wrap($panel, $conf['outerWrap']); + } + if ($conf['outerWrap.']) { + $panel = $this->cObj->stdWrap($panel, $conf['outerWrap.']); + } + if ($conf['printBeforeContent']) { + $finalOut = $panel . $content; + } else { + $finalOut = $content . $panel; + } - $hidden = $this->isDisabled($table, $dataArr) ? ' typo3-feedit-element-hidden' : ''; - $outerWrapConfig = isset($conf['stdWrap.']) - ? $conf['stdWrap.'] - : array('wrap' => '
|
'); - $finalOut = $this->cObj->stdWrap($finalOut, $outerWrapConfig); + $hidden = $this->isDisabled($table, $dataArr) ? ' typo3-feedit-element-hidden' : ''; + $outerWrapConfig = isset($conf['stdWrap.']) + ? $conf['stdWrap.'] + : array('wrap' => '
|
'); + $finalOut = $this->cObj->stdWrap($finalOut, $outerWrapConfig); - return $finalOut; - } + return $finalOut; + } - /** - * Adds an edit icon to the content string. The edit icon links to EditDocumentController with proper parameters for editing the table/fields of the context. - * This implements TYPO3 context sensitive editing facilities. Only backend users will have access (if properly configured as well). - * - * @param string $content The content to which the edit icons should be appended - * @param string $params The parameters defining which table and fields to edit. Syntax is [tablename]:[fieldname],[fieldname],[fieldname],... OR [fieldname],[fieldname],[fieldname],... (basically "[tablename]:" is optional, default table is the one of the "current record" used in the function). The fieldlist is sent as "&columnsOnly=" parameter to EditDocumentController - * @param array $conf TypoScript properties for configuring the edit icons. - * @param string $currentRecord The "table:uid" of the record being shown. If empty string then $this->currentRecord is used. For new records (set by $conf['newRecordFromTable']) it's auto-generated to "[tablename]:NEW - * @param array $dataArr Alternative data array to use. Default is $this->data - * @param string $addUrlParamStr Additional URL parameters for the link pointing to EditDocumentController - * @param string $table - * @param int $editUid - * @param string $fieldList - * @return string The input content string, possibly with edit icons added (not necessarily in the end but just after the last string of normal content. - */ - public function editIcons($content, $params, array $conf = array(), $currentRecord = '', array $dataArr = array(), $addUrlParamStr = '', $table, $editUid, $fieldList) { - // Special content is about to be shown, so the cache must be disabled. - $this->frontendController->set_no_cache('Display frontend edit icons', TRUE); - $iconTitle = $this->cObj->stdWrap($conf['iconTitle'], $conf['iconTitle.']); - $iconImg = '' - . $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL)->render() - . ''; - $nV = GeneralUtility::_GP('ADMCMD_view') ? 1 : 0; + /** + * Adds an edit icon to the content string. The edit icon links to EditDocumentController with proper parameters for editing the table/fields of the context. + * This implements TYPO3 context sensitive editing facilities. Only backend users will have access (if properly configured as well). + * + * @param string $content The content to which the edit icons should be appended + * @param string $params The parameters defining which table and fields to edit. Syntax is [tablename]:[fieldname],[fieldname],[fieldname],... OR [fieldname],[fieldname],[fieldname],... (basically "[tablename]:" is optional, default table is the one of the "current record" used in the function). The fieldlist is sent as "&columnsOnly=" parameter to EditDocumentController + * @param array $conf TypoScript properties for configuring the edit icons. + * @param string $currentRecord The "table:uid" of the record being shown. If empty string then $this->currentRecord is used. For new records (set by $conf['newRecordFromTable']) it's auto-generated to "[tablename]:NEW + * @param array $dataArr Alternative data array to use. Default is $this->data + * @param string $addUrlParamStr Additional URL parameters for the link pointing to EditDocumentController + * @param string $table + * @param int $editUid + * @param string $fieldList + * @return string The input content string, possibly with edit icons added (not necessarily in the end but just after the last string of normal content. + */ + public function editIcons($content, $params, array $conf = array(), $currentRecord = '', array $dataArr = array(), $addUrlParamStr = '', $table, $editUid, $fieldList) + { + // Special content is about to be shown, so the cache must be disabled. + $this->frontendController->set_no_cache('Display frontend edit icons', true); + $iconTitle = $this->cObj->stdWrap($conf['iconTitle'], $conf['iconTitle.']); + $iconImg = '' + . $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL)->render() + . ''; + $nV = GeneralUtility::_GP('ADMCMD_view') ? 1 : 0; - $url = BackendUtility::getModuleUrl( - 'record_edit', - array( - 'edit[' . $table . '][' . $editUid . ']' => 'edit', - 'columnsOnly' => $fieldList, - 'noView' => $nV - ) - ) . $addUrlParamStr; - $icon = $this->editPanelLinkWrap_doWrap($iconImg, $url); - if ($conf['beforeLastTag'] < 0) { - $content = $icon . $content; - } elseif ($conf['beforeLastTag'] > 0) { - $cBuf = rtrim($content); - $secureCount = 30; - while ($secureCount && substr($cBuf, -1) == '>' && substr($cBuf, -4) != '') { - $cBuf = rtrim(preg_replace('/<[^<]*>$/', '', $cBuf)); - $secureCount--; - } - $content = strlen($cBuf) && $secureCount ? substr($content, 0, strlen($cBuf)) . $icon . substr($content, strlen($cBuf)) : ($content = $icon . $content); - } else { - $content .= $icon; - } - return $content; - } + $url = BackendUtility::getModuleUrl( + 'record_edit', + array( + 'edit[' . $table . '][' . $editUid . ']' => 'edit', + 'columnsOnly' => $fieldList, + 'noView' => $nV + ) + ) . $addUrlParamStr; + $icon = $this->editPanelLinkWrap_doWrap($iconImg, $url); + if ($conf['beforeLastTag'] < 0) { + $content = $icon . $content; + } elseif ($conf['beforeLastTag'] > 0) { + $cBuf = rtrim($content); + $secureCount = 30; + while ($secureCount && substr($cBuf, -1) == '>' && substr($cBuf, -4) != '') { + $cBuf = rtrim(preg_replace('/<[^<]*>$/', '', $cBuf)); + $secureCount--; + } + $content = strlen($cBuf) && $secureCount ? substr($content, 0, strlen($cBuf)) . $icon . substr($content, strlen($cBuf)) : ($content = $icon . $content); + } else { + $content .= $icon; + } + return $content; + } - /** - * Helper function for editPanel() which wraps icons in the panel in a link with the action of the panel. - * The links are for some of them not simple hyperlinks but onclick-actions which submits a little form which the panel is wrapped in. - * - * @param string $string The string to wrap in a link, typ. and image used as button in the edit panel. - * @param string $formName The name of the form wrapping the edit panel. - * @param string $cmd The command of the link. There is a predefined list available: edit, new, up, down etc. - * @param string $currentRecord The "table:uid" of the record being processed by the panel. - * @param string $confirm Text string with confirmation message; If set a confirm box will be displayed before carrying out the action (if Yes is pressed) - * @param int|string $nPid "New pid" - for new records - * @return string A tag wrapped string. - */ - protected function editPanelLinkWrap($string, $formName, $cmd, $currentRecord = '', $confirm = '', $nPid = '') { - $nV = GeneralUtility::_GP('ADMCMD_view') ? 1 : 0; - if ($cmd == 'edit') { - $rParts = explode(':', $currentRecord); - $out = $this->editPanelLinkWrap_doWrap($string, BackendUtility::getModuleUrl('record_edit', array('edit[' . $rParts[0] . '][' . $rParts[1] . ']' => 'edit', 'noView=' . $nV)), $currentRecord); - } elseif ($cmd == 'new') { - $rParts = explode(':', $currentRecord); - if ($rParts[0] == 'pages') { - $out = $this->editPanelLinkWrap_doWrap($string, BackendUtility::getModuleUrl('db_new', ['id' => $rParts[1], 'pagesOnly' => 1]), $currentRecord); - } else { - if (!(int)$nPid) { - $nPid = MathUtility::canBeInterpretedAsInteger($rParts[1]) ? -$rParts[1] : $this->frontendController->id; - } - $out = $this->editPanelLinkWrap_doWrap($string, BackendUtility::getModuleUrl('record_edit', array('edit[' . $rParts[0] . '][' . $nPid . ']' => 'new', 'noView' => $nV)), $currentRecord); - } - } else { - if ($confirm && $this->backendUser->jsConfirmation(JsConfirmation::FE_EDIT)) { - // Gets htmlspecialchared later - $cf1 = 'if (confirm(' . GeneralUtility::quoteJSvalue($confirm, TRUE) . ')) {'; - $cf2 = '}'; - } else { - $cf1 = ($cf2 = ''); - } - $out = '' . $string . ''; - } - return $out; - } + /** + * Helper function for editPanel() which wraps icons in the panel in a link with the action of the panel. + * The links are for some of them not simple hyperlinks but onclick-actions which submits a little form which the panel is wrapped in. + * + * @param string $string The string to wrap in a link, typ. and image used as button in the edit panel. + * @param string $formName The name of the form wrapping the edit panel. + * @param string $cmd The command of the link. There is a predefined list available: edit, new, up, down etc. + * @param string $currentRecord The "table:uid" of the record being processed by the panel. + * @param string $confirm Text string with confirmation message; If set a confirm box will be displayed before carrying out the action (if Yes is pressed) + * @param int|string $nPid "New pid" - for new records + * @return string A tag wrapped string. + */ + protected function editPanelLinkWrap($string, $formName, $cmd, $currentRecord = '', $confirm = '', $nPid = '') + { + $nV = GeneralUtility::_GP('ADMCMD_view') ? 1 : 0; + if ($cmd == 'edit') { + $rParts = explode(':', $currentRecord); + $out = $this->editPanelLinkWrap_doWrap($string, BackendUtility::getModuleUrl('record_edit', array('edit[' . $rParts[0] . '][' . $rParts[1] . ']' => 'edit', 'noView=' . $nV)), $currentRecord); + } elseif ($cmd == 'new') { + $rParts = explode(':', $currentRecord); + if ($rParts[0] == 'pages') { + $out = $this->editPanelLinkWrap_doWrap($string, BackendUtility::getModuleUrl('db_new', ['id' => $rParts[1], 'pagesOnly' => 1]), $currentRecord); + } else { + if (!(int)$nPid) { + $nPid = MathUtility::canBeInterpretedAsInteger($rParts[1]) ? -$rParts[1] : $this->frontendController->id; + } + $out = $this->editPanelLinkWrap_doWrap($string, BackendUtility::getModuleUrl('record_edit', array('edit[' . $rParts[0] . '][' . $nPid . ']' => 'new', 'noView' => $nV)), $currentRecord); + } + } else { + if ($confirm && $this->backendUser->jsConfirmation(JsConfirmation::FE_EDIT)) { + // Gets htmlspecialchared later + $cf1 = 'if (confirm(' . GeneralUtility::quoteJSvalue($confirm, true) . ')) {'; + $cf2 = '}'; + } else { + $cf1 = ($cf2 = ''); + } + $out = '' . $string . ''; + } + return $out; + } - /** - * Creates a link to a script (eg. EditDocumentController or NewRecordController) which either opens in the current frame OR in a pop-up window. - * - * @param string $string The string to wrap in a link, typ. and image used as button in the edit panel. - * @param string $url The URL of the link. Should be absolute if supposed to work with path set. - * @return string A tag wrapped string. - * @see editPanelLinkWrap() - */ - protected function editPanelLinkWrap_doWrap($string, $url) { - $onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=sysext/backend/Resources/Private/Templates/Close.html') . ',\'FEquickEditWindow\',\'width=690,height=500,status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;'; - return '' . $string . ''; - } + /** + * Creates a link to a script (eg. EditDocumentController or NewRecordController) which either opens in the current frame OR in a pop-up window. + * + * @param string $string The string to wrap in a link, typ. and image used as button in the edit panel. + * @param string $url The URL of the link. Should be absolute if supposed to work with path set. + * @return string A tag wrapped string. + * @see editPanelLinkWrap() + */ + protected function editPanelLinkWrap_doWrap($string, $url) + { + $onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=sysext/backend/Resources/Private/Templates/Close.html') . ',\'FEquickEditWindow\',\'width=690,height=500,status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;'; + return '' . $string . ''; + } - /** - * Returns TRUE if the input table/row would be hidden in the frontend, according to the current time and simulate user group - * - * @param string $table The table name - * @param array $row The data record - * @return bool - */ - protected function isDisabled($table, array $row) { - $status = FALSE; - if ( - $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled'] && - $row[$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled']] || - $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['fe_group'] && - $this->frontendController->simUserGroup && - $row[$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['fe_group']] == $this->frontendController->simUserGroup || - $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['starttime'] && - $row[$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['starttime']] > $GLOBALS['EXEC_TIME'] || - $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['endtime'] && - $row[$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['endtime']] && - $row[$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['endtime']] < $GLOBALS['EXEC_TIME'] - ) { - $status = TRUE; - } - - return $status; - } + /** + * Returns TRUE if the input table/row would be hidden in the frontend, according to the current time and simulate user group + * + * @param string $table The table name + * @param array $row The data record + * @return bool + */ + protected function isDisabled($table, array $row) + { + $status = false; + if ( + $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled'] && + $row[$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled']] || + $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['fe_group'] && + $this->frontendController->simUserGroup && + $row[$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['fe_group']] == $this->frontendController->simUserGroup || + $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['starttime'] && + $row[$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['starttime']] > $GLOBALS['EXEC_TIME'] || + $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['endtime'] && + $row[$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['endtime']] && + $row[$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['endtime']] < $GLOBALS['EXEC_TIME'] + ) { + $status = true; + } + return $status; + } } diff --git a/ext_emconf.php b/ext_emconf.php index 0aa45c3..d87ace9 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -1,21 +1,21 @@ 'Frontend Editing', - 'description' => '', - 'category' => 'fe', - 'author' => 'Jeff Segars, David Slayback', - 'author_email' => 'jeff@webempoweredchurch.org, dave@webempoweredchurch.org', - 'author_company' => 'Web-Empowered Church', - 'state' => 'stable', - 'uploadfolder' => 0, - 'createDirs' => '', - 'clearCacheOnLoad' => 0, - 'version' => '7.6.0', - 'constraints' => array( - 'depends' => array( - 'typo3' => '7.6.0-7.6.99', - ), - 'conflicts' => array(), - 'suggests' => array(), - ), + 'title' => 'Frontend Editing', + 'description' => '', + 'category' => 'fe', + 'author' => 'Jeff Segars, David Slayback', + 'author_email' => 'jeff@webempoweredchurch.org, dave@webempoweredchurch.org', + 'author_company' => 'Web-Empowered Church', + 'state' => 'stable', + 'uploadfolder' => 0, + 'createDirs' => '', + 'clearCacheOnLoad' => 0, + 'version' => '7.6.0', + 'constraints' => array( + 'depends' => array( + 'typo3' => '7.6.0-7.6.99', + ), + 'conflicts' => array(), + 'suggests' => array(), + ), );