Fixed bug #12709: Forgotten flash message in user setup (Thanks to Georg Ringer)
authorSteffen Kamper <info@sk-typo3.de>
Wed, 13 Jan 2010 23:42:45 +0000 (23:42 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Wed, 13 Jan 2010 23:42:45 +0000 (23:42 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6763 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/alt_db_navframe.php
typo3/mod/tools/em/class.em_index.php
typo3/mod/web/func/index.php
typo3/sysext/cms/layout/db_layout.php
typo3/sysext/setup/mod/index.php

index fcdbfe3..4abd0a2 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-01-13  Steffen Kamper  <info@sk-typo3.de>
 
+       * Fixed bug #12709: Forgotten flash message in user setup (Thanks to Georg Ringer)
        * Fixed bug #11968: Sporadic random Backend Logoffs / Add X-UA-Compatible flag (Thanks to Steffen Gebert)
        * Fixed bug #12924: Bugfix: t3lib_tcemain checkFullLanguageAccess is too restrictive (Thanks to Tolleiv Nietsch)
        * Fixed bug #13211: Change focus to login field when OpenId is selected at login (Thanks to Steffen Gebert)
index 1edf306..6136519 100644 (file)
@@ -209,15 +209,25 @@ class SC_alt_db_navframe {
 
                        // Outputting Temporary DB mount notice:
                if ($this->active_tempMountPoint)       {
-                       $this->content.= '
-       <div class="bgColor4 c-notice">
-               <img'.t3lib_iconWorks::skinImg('','gfx/icon_note.gif','width="18" height="16"').' align="top" alt="" />'.
-               '<a href="'.htmlspecialchars(t3lib_div::linkThisScript(array('setTempDBmount' => 0))).'">'.
-               $LANG->sl('LLL:EXT:lang/locallang_core.xml:labels.temporaryDBmount',1).
-               '</a><br />
-               '.$LANG->sl('LLL:EXT:lang/locallang_core.xml:labels.path',1).': <span title="'.htmlspecialchars($this->active_tempMountPoint['_thePathFull']).'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($this->active_tempMountPoint['_thePath'],-50)).'</span>
-       </div>
+                       $flashText = '
+                               <a href="' . htmlspecialchars(t3lib_div::linkThisScript(array('setTempDBmount' => 0))) . '">' .
+                               $LANG->sl('LLL:EXT:lang/locallang_core.xml:labels.temporaryDBmount',1) .
+                               '</a>           <br />' . 
+                               $LANG->sl('LLL:EXT:lang/locallang_core.xml:labels.path',1) . ': <span title="' .
+                               htmlspecialchars($this->active_tempMountPoint['_thePathFull']) . '">' . 
+                               htmlspecialchars(t3lib_div::fixed_lgd_cs($this->active_tempMountPoint['_thePath'],-50)).
+                               '</span>
                        ';
+
+                       $flashMessage = t3lib_div::makeInstance(
+                               't3lib_FlashMessage',
+                               $flashText,
+                               '',
+                               t3lib_FlashMessage::INFO
+                       );
+
+               
+                       $this->content.= $flashMessage->render();
                }
 
                        // Outputting page tree:
index 3dd849a..f8bb1f1 100644 (file)
@@ -2507,12 +2507,16 @@ EXTENSION KEYS:
                                                                $eC=2;
                                                        }
                                                        if (!$this->fe_user['username'])        {
-                                                               $content .= '<br /><br /><img src="' . $GLOBALS['BACK_PATH'] .
-                                                                       'gfx/icon_note.gif" width="18" height="16" align="top" alt="" />' .
+                                                               $flashMessage = t3lib_div::makeInstance(
+                                                                       't3lib_FlashMessage',
                                                                        sprintf($GLOBALS['LANG']->getLL('ext_details_no_username'),
                                                                                '<a href="index.php?SET[function]=3">', '</a>'
-                                                                       ) .
-                                                                       '<br />';
+                                                                       ),
+                                                                       '',
+                                                                       t3lib_FlashMessage::INFO
+                                                               );
+                                                               $content .= '<br />' . $flashMessage->render();
+
                                                        }
                                                }
                                                $this->content .= $this->doc->section(
index 6781d3f..9eb7740 100755 (executable)
@@ -143,8 +143,14 @@ class SC_mod_web_func_index extends t3lib_SCbase {
                        $markers['CONTENT'] = $this->content;
                } else {
                                // If no access or if ID == zero
-                       $this->content = $this->doc->section($LANG->getLL('title'), $LANG->getLL('clickAPage_content'), 0, 1);
-
+                       $flashMessage = t3lib_div::makeInstance(
+                               't3lib_FlashMessage',
+                               $LANG->getLL('clickAPage_content'),
+                               $LANG->getLL('title'),
+                               t3lib_FlashMessage::INFO
+                       );
+                       $this->content = $flashMessage->render();
+                       
                                // Setting up the buttons and markers for docheader
                        $docHeaderButtons = $this->getButtons();
                        $markers['CSH'] = $docHeaderButtons['csh'];
index fdbcc82..7424582 100755 (executable)
@@ -563,7 +563,13 @@ class SC_db_layout {
                                if (top.fsMod) top.fsMod.recentIds["web"] = '.intval($this->id).';
                        ');
 
-                       $body = $this->doc->section($LANG->getLL('clickAPage_header'), $LANG->getLL('clickAPage_content'), 0, 1);
+                       $flashMessage = t3lib_div::makeInstance(
+                               't3lib_FlashMessage',
+                               $LANG->getLL('clickAPage_content'),
+                               $LANG->getLL('clickAPage_header'),
+                               t3lib_FlashMessage::INFO
+                       );
+                       $body = $flashMessage->render();
 
                                // Setting up the buttons and markers for docheader
                        $docHeaderButtons = array(
index 92ed563..fccbb8c 100755 (executable)
@@ -374,7 +374,13 @@ class SC_mod_user_setup_index {
 
                        // Notice
                $this->content .= $this->doc->spacer(30);
-               $this->content .= $this->doc->section('', $LANG->getLL('activateChanges'));
+               $flashMessage = t3lib_div::makeInstance(
+                       't3lib_FlashMessage',
+                       $LANG->getLL('activateChanges'),
+                       '',
+                       t3lib_FlashMessage::INFO
+               );
+               $this->content .= $flashMessage->render();
 
                        // Setting up the buttons and markers for docheader
                $docHeaderButtons = $this->getButtons();