* Always use fputs() for writing to logfiles. There is no case when it can't be...
authorMichael Stucki <michael.stucki@typo3.org>
Wed, 23 Nov 2005 23:51:39 +0000 (23:51 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Wed, 23 Nov 2005 23:51:39 +0000 (23:51 +0000)
* !!! Removed $TYPO3_CONF_VARS['FE']['logfile_write']. See above.
* If logfile does not exist, try to create it automatically
* Fixed bug #187: config.stat_apache_pagenames code [type] ends up empty
* Fixed bug #1161: Cannot give access to all modules to a backend user when there are many backend modules loaded. Thanks to Valentin Schmid.
* Fixed bug #1672: Change name of "Edit page header" to "Edit page properties". Many thanks to Valentin Schmid who made the patch for this.
* Fixed bug #1549: Improve description of imagecaption fields
* Fixed bug #1592: Show website (magnifying glass icon) opens a new browser without all the toolbars
* Fixed bug #76: t3lib_div::writeFile() changes permissions without need

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@879 709f56b5-9817-0410-a4d7-c38de5d9e867

24 files changed:
ChangeLog
t3lib/class.t3lib_befunc.php
t3lib/class.t3lib_div.php
t3lib/class.t3lib_tceforms.php
t3lib/class.t3lib_tsfebeuserauth.php
t3lib/config_default.php
t3lib/stddb/tbl_be.php
typo3/alt_clickmenu.php
typo3/mod/user/ws/index.php
typo3/stylesheet.css
typo3/sysext/cms/layout/class.tx_cms_layout.php
typo3/sysext/cms/layout/db_layout.php
typo3/sysext/cms/layout/locallang.xml
typo3/sysext/cms/locallang_csh_weblayout.xml
typo3/sysext/cms/tslib/class.tslib_fe.php
typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php
typo3/sysext/cms/web_info/locallang.xml
typo3/sysext/context_help/locallang_csh_ttcontent.xml
typo3/sysext/extra_page_cm_options/class.tx_extrapagecmoptions.php
typo3/sysext/indexed_search/class.indexer.php
typo3/sysext/lang/locallang_csh_pages.xml
typo3/sysext/lang/locallang_misc.xml
typo3/sysext/lang/locallang_mod_web_list.xml
typo3/sysext/lang/locallang_tsfe.xml

index d2cc9e7..2658b4c 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,29 @@
-2005-11-23     Dmitry Dulepov  <typo3@fm-world.ru>
+2005-11-23  Michael Stucki  <michael@typo3.org>
+
+       * Always use fputs() for writing to logfiles. There is no case when it can't be used, so the alternative "echo" call was never needed.
+       * !!! Removed $TYPO3_CONF_VARS['FE']['logfile_write']. See above.
+       * If logfile does not exist, try to create it automatically
+       * Fixed bug #187: config.stat_apache_pagenames code [type] ends up empty
+       * Fixed bug #1161: Cannot give access to all modules to a backend user when there are many backend modules loaded. Thanks to Valentin Schmid.
+       * Fixed bug #1672: Change name of "Edit page header" to "Edit page properties". Many thanks to Valentin Schmid who made the patch for this.
+       * Fixed bug #1549: Improve description of imagecaption fields
+       * Fixed bug #1592: Show website (magnifying glass icon) opens a new browser without all the toolbars
+       * Fixed bug #76: t3lib_div::writeFile() changes permissions without need
+
+2005-11-23  Dmitry Dulepov  <typo3@fm-world.ru>
+
        * Added workspace list display in User/Workspace module
 
-2005-11-23 Andreas Otto <andreas.otto@dkd.de>
+2005-11-23  Andreas Otto  <andreas.otto@dkd.de>
+
        * Methods imageLinkWrap() and typolink() in class.tslib_content.php: Made the JS PopUps accessible if JS is not available in the user's web browser. Add the TARGET-attribute only if the used doctype allows this.
 
 2005-11-23  Sebastian Kurfuerst  <sebastian@garbage-group.de>
 
        * XHTML Compliance: prefix local anchors with a string (bug #1243)
        * Feature request #1453: stdWrap for fontColor attribute of GIFBUILDER?s TEXT-object
-       * Usability: Add Focus in install tool login form (bug #1584)
-       * Bug #1637: adjustment to collapsable menu
+       * Usability: Add focus in install tool login form (bug #1584)
+       * Bug #1637: Adjustment to collapsable menu
 
 2005-11-19  Michael Stucki  <michael@typo3.org>
 
index f2bad95..681ab9b 100755 (executable)
@@ -2232,7 +2232,7 @@ class t3lib_BEfunc        {
                        }
                }
 
-               return "previewWin=window.open('".$url."','newTypo3FrontendWindow','status=1,menubar=1,resizable=1,location=1,scrollbars=1,toolbar=1');".
+               return "previewWin=window.open('".$url."','newTYPO3frontendWindow');".
                                ($switchFocus ? 'previewWin.focus();' : '');
        }
 
index 4f8c964..916391b 100755 (executable)
@@ -2114,11 +2114,15 @@ class t3lib_div {
         * @return      boolean         True if the file was successfully opened and written to.
         */
        function writeFile($file,$content)      {
+               if (!@is_file($file))   { $changePermissions=true; }
+
                if ($fd = fopen($file,'wb'))    {
                        fwrite($fd,$content);
-                       fclose($fd);
+                       fclose($fd );
 
-                       t3lib_div::fixPermissions($file);       // Change the permissions of the file
+                       if ($changePermissions) {       // Change the permissions only if the file has just been created
+                               t3lib_div::fixPermissions($file);
+                       }
 
                        return true;
                }
@@ -3297,8 +3301,8 @@ class t3lib_div {
         * @return      array           An array with two num. keys: key0: The data structure is returned in this key (array) UNLESS an error happend in which case an error string is returned (string). key1: The used sheet key value!
         */
        function resolveSheetDefInDS($dataStructArray,$sheet='sDEF')    {
-               if (!is_array ($dataStructArray)) return 'Data structure must be an array'; 
-               
+               if (!is_array ($dataStructArray)) return 'Data structure must be an array';
+
                if (is_array($dataStructArray['sheets']))       {
                        $singleSheet = FALSE;
                        if (!isset($dataStructArray['sheets'][$sheet])) {
index 6b41de8..08f154a 100755 (executable)
@@ -2810,7 +2810,7 @@ class t3lib_TCEforms      {
 
        /**
         * Wraps the icon of a relation item (database record or file) in a link opening the context menu for the item.
-        * Icons will be wrapped only if $this->enableClickMenu is set. This must be done only if a global SOBE object exists and if the necessary JavaScript for displaying the context menus has been added to the page header.
+        * Icons will be wrapped only if $this->enableClickMenu is set. This must be done only if a global SOBE object exists and if the necessary JavaScript for displaying the context menus has been added to the page properties.
         *
         * @param       string          The icon HTML to wrap
         * @param       string          Table name (eg. "pages" or "tt_content") OR the absolute path to the file
index 56b623a..66e9992 100755 (executable)
@@ -590,7 +590,7 @@ class t3lib_tsfeBeUserAuth extends t3lib_beUserAuth {
                if ($perms&2)   {
                        $params='&edit[pages]['.$id.']=edit';
                        $toolBar.='<a href="'.htmlspecialchars(TYPO3_mainDir.'alt_doc.php?'.$params.'&noView=1&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
-                                       '<img src="t3lib/gfx/edit2.gif" width="11" height="12" hspace="2" border="0" align="top" title="'.$this->extGetLL('edit_editPageHeader').'" alt="" /></a>';
+                                       '<img src="t3lib/gfx/edit2.gif" width="11" height="12" hspace="2" border="0" align="top" title="'.$this->extGetLL('edit_editPageProperties').'" alt="" /></a>';
                }
                if ($this->check('modules','web_list')) {
                        $toolBar.='<a href="'.htmlspecialchars(TYPO3_mainDir.'db_list.php?id='.$id.'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
index 2692d6d..031d090 100755 (executable)
@@ -165,7 +165,6 @@ $TYPO3_CONF_VARS = Array(
                'tidy_option' => 'cached',                              // options [all, cached, output]. 'all' = the content is always passed through 'tidy' before it may be stored in cache. 'cached' = only if the page is put into the cache, 'output' = only the output code just before it's echoed out.
                'tidy_path' => 'tidy -i --quiet true --tidy-mark true -wrap 0 -raw',            // Path with options for tidy. For XHTML output, add " --output-xhtml true"
                'logfile_dir' => '',                                    // Path where TYPO3 should write webserver-style logfiles to. This path must be write-enabled for the webserver. If this path is outside of PATH_site, you have to allow it using [BE][lockRootPath]
-               'logfile_write' => '',                                  // Keywords for write-mode of logfiles. Default is Unix "echo". Keyword "fputs" will make PHP use "fputs" instead (compliant with safe_mode)
                'publish_dir' => '',                                    // Path where TYPO3 should write staticly published documents. This path must be write-enabled for the webserver. Remember slash AFTER! Eg: 'publish/' or '/www/htdocs/publish/'. See admPanel option 'publish'
                'addAllowedPaths' => '',                                // Additional relative paths (comma-list) to allow TypoScript resources be in. Should be prepended with '/'. If not, then any path where the first part is like this path will match. That is: 'myfolder/ , myarchive' will match eg. 'myfolder/', 'myarchive/', 'myarchive_one/', 'myarchive_2/' ... No check is done to see if this directory actually exists in the root of the site. Paths are matched by simply checking if these strings equals the first part of any TypoScript resource filepath. (See class template, function init() in t3lib/class.t3lib_tsparser.php)
                'allowedTempPaths' => '',                               // Additional paths allowed for temporary images. Used with imgResource. Eg. 'alttypo3temp/,another_temp_dir/';
index 28af5b9..988abb3 100755 (executable)
@@ -338,7 +338,7 @@ $TCA['be_users'] = Array (
                                'special' => 'modListUser',
                                'size' => '5',
                                'autoSizeMax' => 50,
-                               'maxitems' => '15',
+                               'maxitems' => '100',
                                'renderMode' => $GLOBALS['TYPO3_CONF_VARS']['BE']['accessListRenderMode'],
                                'iconsInOptionTags' => 1,
                        )
@@ -409,7 +409,7 @@ $TCA['be_groups'] = Array (
                                'internal_type' => 'db',
                                        'allowed' => 'pages',
                                'size' => '3',
-                               'maxitems' => '10',
+                               'maxitems' => '20',
                                'autoSizeMax' => 10,
                                'show_thumbs' => '1'
                        )
@@ -421,7 +421,7 @@ $TCA['be_groups'] = Array (
                                'foreign_table' => 'sys_filemounts',
                                'foreign_table_where' => ' AND sys_filemounts.pid=0 ORDER BY sys_filemounts.title',
                                'size' => '3',
-                               'maxitems' => '10',
+                               'maxitems' => '20',
                                'autoSizeMax' => 10,
                                'renderMode' => $GLOBALS['TYPO3_CONF_VARS']['BE']['accessListRenderMode'],
                                'iconsInOptionTags' => 1,
@@ -571,7 +571,7 @@ $TCA['be_groups'] = Array (
                                'special' => 'modListGroup',
                                'size' => '5',
                                'autoSizeMax' => 50,
-                               'maxitems' => '15',
+                               'maxitems' => '100',
                                'renderMode' => $GLOBALS['TYPO3_CONF_VARS']['BE']['accessListRenderMode'],
                                'iconsInOptionTags' => 1,
                        )
index f93eeb6..479ed2e 100755 (executable)
@@ -595,11 +595,23 @@ class clickMenu {
         * @param       integer         page uid to edit (PID)
         * @return      array           Item array, element in $menuItems
         * @internal
+        * @deprecated          Use DB_editPageProperties instead
         */
        function DB_editPageHeader($uid)        {
+               return $this->DB_editPageProperties($uid);
+       }
+
+       /**
+        * Adding CM element for edit page properties
+        *
+        * @param       integer         page uid to edit (PID)
+        * @return      array           Item array, element in $menuItems
+        * @internal
+        */
+       function DB_editPageProperties($uid)    {
                $url = 'alt_doc.php?edit[pages]['.$uid.']=edit';
                return $this->linkItem(
-                       $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->getLL('CM_editPageHeader')),
+                       $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->getLL('CM_editPageProperties')),
                        $this->excludeIcon('<img'.t3lib_iconWorks::skinImg($this->PH_backPath,'gfx/edit2.gif','width="11" height="12"').' alt="" />'),
                        $this->urlRefForCM($url,'returnUrl'),
                        1       // no top frame CM!
index 584b845..26f5c85 100755 (executable)
@@ -197,7 +197,7 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
                $this->doc->backPath = $BACK_PATH;
                $this->doc->docType = 'xhtml_trans';
 
-                               // JavaScript
+                       // JavaScript
                $plusIcon = t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/ol/plusbullet.gif', 'width="18" height="16"', 1);
                $minusIcon = t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/ol/minusbullet.gif', 'width="18" height="16"', 1);
                $this->doc->JScode = $this->doc->wrapScriptTags('
@@ -222,17 +222,15 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
                                }
                        }
 
-                       function expandCollapse(rowNumber) {
+                       function expandCollapse(rowNumber)      {
                                elementId = \'wl_\' + rowNumber;
                                element = document.getElementById(elementId);
                                image = document.getElementById(elementId + \'i\');
-                               if (element.style)
-                               {
-                                       if (element.style.display == \'none\') {
+                               if (element.style)      {
+                                       if (element.style.display == \'none\')  {
                                                element.style.display = \'\';
                                                image.src = \'' . $minusIcon . '\';
-                                       }
-                                       else {
+                                       } else {
                                                element.style.display = \'none\';
                                                image.src = \'' . $plusIcon . '\';
                                        }
@@ -1318,135 +1316,133 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
 
        /**
         * Generates HTML to display a list of workspaces.
-        * 
-        * @return      string  Generated HTML code
+        *
+        * @return      string          Generated HTML code
         */
-       function workspaceList_displayUserWorkspaceList() {
+       function workspaceList_displayUserWorkspaceList()       {
                global  $BACK_PATH, $TYPO3_CONF_VARS;
 
-               // table header
+                       // table header
                $content = $this->workspaceList_displayUserWorkspaceListHeader();
 
-               // get & walk workspace list generating content
+                       // get & walk workspace list generating content
                $wkspList = $this->workspaceList_getUserWorkspaceList();
-               $rowNum = 1;  
-               foreach ($wkspList as $wksp) {
+               $rowNum = 1;
+               foreach ($wkspList as $wksp)    {
                        $currentWksp = ($GLOBALS['BE_USER']->workspace == $wksp['uid']);
-                       
+
                        // Each workspace data occupies two rows:
                        // (1) Folding + Icons + Title + Description
                        // (2) Information about workspace (initially hidden)
 
                        $cssClass = ($currentWksp ? 'bgColor3-20' : 'bgColor4-20');
-                       // Start first row
+                               // Start first row
                        $content .= '<tr class="' . $cssClass . '">';
-                       
-                       // row #1, column #1: expand icon
+
+                               // row #1, column #1: expand icon
                        $content .= '<td>' .
                                                '<a href="javascript:expandCollapse(' . $rowNum . ')">' .
                                                '<img ' . t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/ol/plusbullet.gif', 'width="18" height="16"') . ' id="wl_' . $rowNum . 'i" border="0" hspace="1" alt="Show more" />' .
                                                '</a></td>';
 
-                       // row #1, column #2: icon panel
-                       $content .= '<td nowrap="nowrap">';     // FireFox will attempt wrap due to `width="1"` on topmost column 
+                               // row #1, column #2: icon panel
+                       $content .= '<td nowrap="nowrap">';     // Mozilla Firefox will attempt wrap due to `width="1"` on topmost column
                        $content .= $this->workspaceList_displayIcons($currentWksp, $wksp);
                        $content .= '</td>';
 
-                       // row #1, column #3: current workspace indicator
+                               // row #1, column #3: current workspace indicator
                        // TODO move style to system stylesheet
-                       $content .= '<td nowrap="nowrap" style="text-align: center">';  // FireFox will attempt wrap due to `width="1"` on topmost column 
+                       $content .= '<td nowrap="nowrap" style="text-align: center">';  // Mozilla Firefox will attempt wrap due to `width="1"` on topmost column
                        $content .= (!$currentWksp ? '&nbsp;' : '<img ' . t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/icon_ok.gif', 'width="18" height="16"') . ' id="wl_' . $rowNum . 'i" border="0" hspace="1" alt="This is a current workspace!" />');
                        $content .= '</td>';
 
-                       // row #1, column #4 and 5: title and description
+                               // row #1, column #4 and 5: title and description
                        $content .= '<td nowrap="nowrap">' . $wksp['title'] . '</td>' .
                                                '<td>' . $wksp['description'] . '</td>';
                        $content .= '</tr>';
 
-                       // row #2, column #1 and #2
+                               // row #2, column #1 and #2
                        // TODO move style to system stylesheet (2 lines below)
                        $content .= '<tr id="wl_' . $rowNum . '" class="bgColor" style="display: none">';
                        $content .= '<td colspan="2" style="border-right: none;">&nbsp;</td>';
 
-                       // row #2, column #3, #4 and #4
+                               // row #2, column #3, #4 and #4
                        // TODO move style to system stylesheet
                        $content .= '<td colspan="3" style="border-left: none;">' .
                                                $this->workspaceList_formatWorkspaceData($cssClass, $wksp) .
                                                '</td>';
-                       
+
                        $content .= '</tr>';
                        $rowNum++;
                }
                $content .= '</table>';
 
-               $newWkspUrl = $BACK_PATH . 'alt_doc.php?returnUrl=' .
+               $newWkspUrl = $BACK_PATH . 'alt_doc.php?returnUrl='.
                                        rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')) .
                                        '&edit[sys_workspace][0]=new';
 
-               // workspace creation link
-               if ($GLOBALS['BE_USER']->isAdmin() || 0 != ($GLOBALS['BE_USER']->groupData['workspace_perms'] & 4)) {
-                       // TODO move style to system stylesheet
+                       // workspace creation link
+               if ($GLOBALS['BE_USER']->isAdmin() || 0 != ($GLOBALS['BE_USER']->groupData['workspace_perms'] & 4))     {
+                               // TODO move style to system stylesheet
                        $content .= '<br /><a href="' . $newWkspUrl . '">' .
                                                '<img ' .
                                                t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/new_el.gif', 'width="11" height="12"') .
                                                ' alt="Create new workspace" style="margin-right: 5px; border: none; float: left;" />' .
                                                'Create new workspace</a>';
                }
-               return $content;                        
+               return $content;
        }
 
        /**
         * Retrieves a list of workspaces where user has access.
-        * 
-        * @return      array   A list of workspaces available to the current BE user
+        *
+        * @return      array           A list of workspaces available to the current BE user
         */
-       function workspaceList_getUserWorkspaceList() {
-               // Get BE users if necessary
-               if (!is_array($this->be_user_Array)) {
+       function workspaceList_getUserWorkspaceList()   {
+                       // Get BE users if necessary
+               if (!is_array($this->be_user_Array))    {
                        $this->be_user_Array = t3lib_BEfunc::getUserNames();
                }
-               // Get list of all workspaces. Note: system workspaces will be always displayed before custom ones!
+                       // Get list of all workspaces. Note: system workspaces will be always displayed before custom ones!
                $workspaces = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*','sys_workspace','pid=0'.t3lib_BEfunc::deleteClause('sys_workspace'),'','title');
                $availableWorkspaces = array();
 
-               // Live
+                       // Live
                $wksp = $this->workspaceList_createFakeWorkspaceRecord(0);
                $wksp = $GLOBALS['BE_USER']->checkWorkspace($wksp);
                $availableWorkspaces[] = $wksp;
 
-               // Draft 
+                       // Draft
                $wksp = $this->workspaceList_createFakeWorkspaceRecord(-1);
                $wksp = $GLOBALS['BE_USER']->checkWorkspace($wksp);
-               $availableWorkspaces[] = $wksp; 
-
-               // Custom
-               foreach($workspaces as $rec) {
-                       // see if user can access this workspace in any way
-                       if (false !== ($result = $GLOBALS['BE_USER']->checkWorkspace($rec))) {
-                               // `$result` contains `$rec` plus access type through '_ACCESS' key
-                               $availableWorkspaces[] = $result;
+               $availableWorkspaces[] = $wksp;
+
+                       // Custom
+               foreach($workspaces as $rec)    {
+                               // see if user can access this workspace in any way
+                       if (false !== ($result = $GLOBALS['BE_USER']->checkWorkspace($rec)))    {
+                               $availableWorkspaces[] = $result;       // `$result` contains `$rec` plus access type through '_ACCESS' key
                        }
                }
                return $availableWorkspaces;
        }
-       
+
        /**
         * Create inner information panel for workspace list. This panel is
         * initially hidden and becomes visible when user click on the expand
         * icon on the very left of workspace list against the workspace he
         * wants to explore.
-        * 
-        * @param   string  $cssClass   CSS class to use for panel
-        * @param   array   &$wksp   Workspace information
-        * @return  string  Formatted workspace information
+        *
+        * @param       string          CSS class to use for panel
+        * @param       array           Workspace information
+        * @return      string          Formatted workspace information
         */
-       function workspaceList_formatWorkspaceData($cssClass, &$wksp) {
+       function workspaceList_formatWorkspaceData($cssClass, &$wksp)   {
                global $TYPO3_CONF_VARS;
 
                // TODO Remove substr below when new CSS classes are added to the system stylesheet!
                $cssClass2 = substr($cssClass, 0, strlen($cssClass) - 3);
-               // use system date format!
-               $dateFormat = $TYPO3_CONF_VARS["SYS"]["ddmmyy"] . ' ' . $TYPO3_CONF_VARS["SYS"]["hhmm"];
+               $dateFormat = $TYPO3_CONF_VARS['SYS']['ddmmyy'] . ' ' . $TYPO3_CONF_VARS['SYS']['hhmm'];        // use system date format!
 
                // TODO how handle mount points for users in custom workspaces here??? Should all mountpoints be visible here or not?
                // TODO move styles to system stylesheet (all lines below!)
@@ -1471,20 +1467,21 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
 
        /**
         * Retrieves and formats file and database mount points lists.
-        * 
-        * @param   string  $tableName  Table name for mount points
-        * @param   string  $uidList    Comma-separated list of UIDs
-        * @return  string  Generated HTML
+        *
+        * @param       string          Table name for mount points
+        * @param       string          Comma-separated list of UIDs
+        * @return      string          Generated HTML
         */
-       function workspaceList_getMountPoints($tableName, $uidList) {
+       function workspaceList_getMountPoints($tableName, $uidList)     {
                $MPs = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid,title', $tableName, 'deleted=0 AND hidden=0 AND uid IN (' . $uidList . ')', '', 'title');
-               if (count($MPs) == 0) {
-                       // No mount points!
-                       return 'none';  // TODO Localize this
+               if (count($MPs) == 0)   {
+                               // No mount points!
+                       // TODO Localize this
+                       return 'none';
                }
                $content_array = array();
-               foreach ($MPs as $mp) {
-                       // Will show UID on hover. Just convinient to user.
+               foreach ($MPs as $mp)   {
+                               // Will show UID on hover. Just convinient to user.
                        $content_array[] = '<span title="UID: ' . $mp['uid'] . '">' . $mp['title'] . '</span>';
                }
                return implode('<br />', $content_array);
@@ -1493,10 +1490,10 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
        /**
         * Creates a header for the workspace list table. This function only makes
         * <code>workspaceList_displayUserWorkspaceList()</code> smaller.
-        * 
-        * @return      string  Generated content 
+        *
+        * @return      string          Generated content
         */
-       function workspaceList_displayUserWorkspaceListHeader() {
+       function workspaceList_displayUserWorkspaceListHeader() {
                // TODO Localize all strings below
                // TODO may need own style in system stylesheet
                // TODO CSH lables?
@@ -1512,20 +1509,19 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
 
        /**
         * Generates a list of <code>&lt;option&gt;</code> tags with user names.
-        * 
-        * @param       array   &$wksp  Workspace record
-        * @return      Generated content
+        *
+        * @param       array           Workspace record
+        * @return      string          Generated content
         */
        function workspaceList_getUserList($cssClass, &$wksp) {
                // TODO Localize strings on three lines below
                $content = $this->workspaceList_getUserListWithAccess($cssClass, $wksp['adminusers'], 'Admins:'); // admins
                $content .= $this->workspaceList_getUserListWithAccess($cssClass, $wksp['members'], 'Members:'); // members
                $content .= $this->workspaceList_getUserListWithAccess($cssClass, $wksp['reviewers'], 'Reviewers:'); // reviewers
-               if ($content != '') {
+               if ($content != '')     {
                        // TODO may need own style in system stylesheet
                        $content = '<table cellpadding="0" cellspacing="1" width="100%" class="lrPadding workspace-overview">' . $content . '</table>';
-               }
-               else {
+               } else {
                        // TODO Localize this
                        $content = ($wksp['uid'] > 0 ? 'Admins only' : 'no restrictions');      // TODO Check with Kasper - is this correct?
                }
@@ -1534,21 +1530,21 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
 
        /**
         * Generates a list of user names that has access to the database.
-        * 
-        * @param       array   &$list  A list of user IDs separated by comma
-        * @param       string  $access Access string
-        * @return      Generated content
+        *
+        * @param       array           A list of user IDs separated by comma
+        * @param       string          Access string
+        * @return      string          Generated content
         */
-       function workspaceList_getUserListWithAccess($cssClass, &$list, $access) {
-               if ($list == '') {
+       function workspaceList_getUserListWithAccess($cssClass, &$list, $access)        {
+               if ($list=='')  {
                        return '';      // no users, no need to go futher
                }
                $content_array = array();
                $userIDs = explode(',', $list);
 
-               // get user names and sort
-               foreach ($userIDs as $userUID) {
-                       $content_array[] = $this->be_user_Array[$userUID]['username']; 
+                       // get user names and sort
+               foreach ($userIDs as $userUID)  {
+                       $content_array[] = $this->be_user_Array[$userUID]['username'];
                }
                sort($content_array);
 
@@ -1562,47 +1558,45 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
 
        /**
         * Creates a list of icons for workspace.
-        * 
-        * @param       boolean $currentWorkspace       <code>true</code> if current workspace
-        * @param       array   &$wksp  Workspace record
-        * @return      string  Generated content 
+        *
+        * @param       boolean         <code>true</code> if current workspace
+        * @param       array           Workspace record
+        * @return      string          Generated content
         */
-       function workspaceList_displayIcons($currentWorkspace, &$wksp) {
+       function workspaceList_displayIcons($currentWorkspace, &$wksp)  {
                global  $BACK_PATH;
 
                $content = '';
-               // `edit workspace` button
-               if ($this->workspaceList_hasEditAccess($wksp)) {
-                       // User can modify workspace parameters, display corresponding link and icon
+                       // `edit workspace` button
+               if ($this->workspaceList_hasEditAccess($wksp))  {
+                               // User can modify workspace parameters, display corresponding link and icon
                        $editUrl = $BACK_PATH . 'alt_doc.php?returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')) .
                                                '&amp;edit[sys_workspace][' . $wksp['uid'] .']=edit';
                        $content .= '<a href="' . $editUrl . '" Xonclick="alert(\'Click!\')"/>' .
                                        '<img ' . t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/edit2.gif', 'width="11" height="12"') . ' border="0" alt="Edit workspace" align="middle" hspace="1" />' .   // TODO Localize this!
                                        '</a>';
-               }
-               else {
-                       // User can NOT modify workspace parameters, display space
-                       // Get only withdth and height from skinning API
+               } else {
+                               // User can NOT modify workspace parameters, display space
+                               // Get only withdth and height from skinning API
                        $content .= '<img src="clear.gif" ' .
                                        t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/edit2.gif', 'width="11" height="12"', 2) .
                                        ' border="0" alt="" hspace="1" align="middle" />';
                }
-               // `switch workspace` button
-               if (!$currentWorkspace) {
-                       // Workspace switching button
-                       //
-                       // Notice: `top.shortcutFrame.changeWorkspace(0)` does not work
-                       // under MSIE in this script because alt_shortcut.php and this
-                       // script are in different directories!
+                       // `switch workspace` button
+               if (!$currentWorkspace) {
+                               // Workspace switching button
+                               //
+                               // Notice: `top.shortcutFrame.changeWorkspace(0)` does not work
+                               // under MSIE in this script because alt_shortcut.php and this
+                               // script are in different directories!
                        $content .= '<a href="" onclick="top.shortcutFrame.document.location.href=\'' .
                                        $BACK_PATH . 'alt_shortcut.php?changeWorkspace=' . $wksp['uid'] . '\'"/>' .
                                        '<img ' . t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/switch.gif', 'width="11" height="10"') . ' border="0" alt="Switch workspace" align="middle" hspace="1" />' .        // TODO Localize this!
                                        '</a>';
-               }
-               else {
-                       // Current workspace: empty space instead of workspace switching button
-                       //
-                       // Here get only width and height from skinning API
+               } else {
+                               // Current workspace: empty space instead of workspace switching button
+                               //
+                               // Here get only width and height from skinning API
                        $content .= '<img src="clear.gif" ' .
                                        t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/switch.png', 'width="18" height="16"', 2) .
                                        ' border="0" alt="" hspace="1" align="middle" />';
@@ -1615,24 +1609,24 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
         * workspace is custom and user is admin or the the owner of the workspace.
         * This function assumes that <code>$wksp</code> were passed through
         * <code>$GLOBALS['BE_USER']->checkWorkspace()</code> function to obtain
-        * <code>_ACCESS</code> attribute of the workspace. 
+        * <code>_ACCESS</code> attribute of the workspace.
         *
-        * @param       array   &$wksp  Workspace record
-        * @return      boolean <code>true</code> if user can modify workspace parameters
+        * @param       array           Workspace record
+        * @return      boolean         <code>true</code> if user can modify workspace parameters
         */
-       function workspaceList_hasEditAccess(&$wksp) {
+       function workspaceList_hasEditAccess(&$wksp)    {
                $access = &$wksp['_ACCESS'];
-               return ($wksp['uid'] > 0 && ($access == 'admin' || $access == 'owner')); 
+               return ($wksp['uid'] > 0 && ($access == 'admin' || $access == 'owner'));
        }
 
        /**
         * Creates a fake workspace record for system workspaces. Record contains
         * all fields found in <code>sys_workspaces</code>.
-        * 
-        * @param       integer $uid    System workspace ID. Currently <code>0</code> and <code>-1</code> are accepted.
-        * @return      array   Generated record (see <code>sys_workspaces</code> for structure)
+        *
+        * @param       integer         System workspace ID. Currently <code>0</code> and <code>-1</code> are accepted.
+        * @return      array           Generated record (see <code>sys_workspaces</code> for structure)
         */
-       function workspaceList_createFakeWorkspaceRecord($uid) {
+       function workspaceList_createFakeWorkspaceRecord($uid)  {
                global  $BE_USER;
 
                $record = array(
index 39c8aac..b23b3b5 100755 (executable)
@@ -221,7 +221,7 @@ BODY#typo3-alt-menu-php A { text-decoration: none; }
 TABLE#typo3-vmenu TR.c-mainitem TD { background-color: #D9D9D8; padding: 1px 1px 1px 1px; border: #9BA1A8 1px solid; vertical-align: middle; width: 100px; }
 TABLE#typo3-vmenu TR.c-mainitem TD SPAN.c-label A { text-decoration : underline; }
 TABLE#typo3-vmenu TR.c-mainitem TD IMG { vertical-align: middle; margin-right: 2px;}
-TABLE#typo3-vmenu TR.c-mainitem TD SPAN.c-label { position: relative; top: 1px; cursor:default;}
+TABLE#typo3-vmenu TR.c-mainitem TD SPAN.c-label { position: relative; top: 1px; cursor: default; }
 TABLE#typo3-vmenu TR.c-mainitem TD SPAN.c-iconCollapse { position:absolute; left:90px; cursor:pointer; }
 TABLE#typo3-vmenu TR.c-mainitem-HL TD { background-color: #AAAAAA; padding: 1px 1px 1px 1px; border: #9BA1A8 1px solid; vertical-align: middle;}
 TABLE#typo3-vmenu TR.c-mainitem-HL TD SPAN.c-label A { text-decoration : underline; }
index 4771fd0..728a41c 100755 (executable)
@@ -123,7 +123,7 @@ class tx_cms_layout extends recordList {
        var $pI_showStat=1;                                             // If true, hit statistics are shown in the page info box.
        var $nextThree = 3;                                             // The number of successive records to edit when showing content elements.
        var $pages_noEditColumns=0;                             // If true, disables the edit-column icon for tt_content elements
-       var $option_showBigButtons=1;                   // If true, shows bit buttons for editing page header, moving, creating elements etc. in the columns view.
+       var $option_showBigButtons=1;                   // If true, shows big buttons for editing page properties, moving, creating elements etc. in the columns view.
        var $option_newWizard=1;                                // If true, new-wizards are linked to rather than the regular new-element list.
        var $ext_function=0;                                    // If set to "1", will link a big button to content element wizard.
        var $doEdit=1;                                                  // If true, elements will have edit icons (probably this is whethere the user has permission to edit the page content). Set externally.
@@ -719,11 +719,11 @@ class tx_cms_layout extends recordList {
                        $bArray=array();
 
                        if (!$GLOBALS['SOBE']->current_sys_language)    {
-                               if ($this->ext_CALC_PERMS&2)    $bArray[0]=$GLOBALS['SOBE']->doc->t3Button(t3lib_BEfunc::editOnClick('&edit[pages]['.$id."]=edit",$this->backPath,''),$GLOBALS['LANG']->getLL('editPageTitle'));
+                               if ($this->ext_CALC_PERMS&2)    $bArray[0]=$GLOBALS['SOBE']->doc->t3Button(t3lib_BEfunc::editOnClick('&edit[pages]['.$id."]=edit",$this->backPath,''),$GLOBALS['LANG']->getLL('editPageProperties'));
                        } else {
                                if ($this->doEdit && $GLOBALS['BE_USER']->check('tables_modify','pages_language_overlay'))      {
                                        list($languageOverlayRecord) = t3lib_BEfunc::getRecordsByField('pages_language_overlay','pid',$id,'AND sys_language_uid='.intval($GLOBALS['SOBE']->current_sys_language));
-                                       $bArray[0]=$GLOBALS['SOBE']->doc->t3Button(t3lib_BEfunc::editOnClick('&edit[pages_language_overlay]['.$languageOverlayRecord['uid']."]=edit",$this->backPath,''),$GLOBALS['LANG']->getLL('editPageTitle_curLang'));
+                                       $bArray[0]=$GLOBALS['SOBE']->doc->t3Button(t3lib_BEfunc::editOnClick('&edit[pages_language_overlay]['.$languageOverlayRecord['uid']."]=edit",$this->backPath,''),$GLOBALS['LANG']->getLL('editPageProperties_curLang'));
                                }
                        }
                        if ($this->ext_CALC_PERMS&4 || $this->ext_CALC_PERMS&2) $bArray[1]=$GLOBALS['SOBE']->doc->t3Button("document.location='".$this->backPath."move_el.php?table=pages&uid=".$id.'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))."';",$GLOBALS['LANG']->getLL('move_page'));
@@ -2332,13 +2332,13 @@ class tx_cms_layout extends recordList {
         * Creates an info-box for the current page (identified by input record).
         *
         * @param       array           Page record
-        * @param       boolean         If set, there will be shown an edit icon, linking to editing of the page header.
+        * @param       boolean         If set, there will be shown an edit icon, linking to editing of the page properties.
         * @return      string          HTML for the box.
         */
        function getPageInfoBox($rec,$edit=0)   {
                global $LANG;
 
-                       // If editing of the page header is allowed:
+                       // If editing of the page properties is allowed:
                if ($edit)      {
                        $params='&edit[pages]['.$rec['uid'].']=edit';
                        $editIcon='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath)).'">'.
index daa2f1e..051461f 100755 (executable)
@@ -432,7 +432,7 @@ class SC_db_layout {
                                // Creating the top edit page icon:
                        if ($this->CALC_PERMS&2)        {
                                $params='&edit[pages]['.$this->id.']=edit';
-                               $this->editIcon='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$BACK_PATH)).'"><img'.t3lib_iconWorks::skinImg($BACK_PATH,'gfx/edit2.gif','width="11" height="12"').' vspace="2" align="top" title="'.$LANG->getLL('editPageTitle',1).'" alt="" /></a>';
+                               $this->editIcon='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$BACK_PATH)).'"><img'.t3lib_iconWorks::skinImg($BACK_PATH,'gfx/edit2.gif','width="11" height="12"').' vspace="2" align="top" title="'.$LANG->getLL('editPageProperties',1).'" alt="" /></a>';
                        } else {
                                $this->editIcon='';
                        }
@@ -544,7 +544,7 @@ class SC_db_layout {
                } else {
                        $inValue = 'pages:'.$this->id;
                        $is_selected+=intval($edit_record==$inValue);
-                       $opt[]='<option value="'.$inValue.'"'.($edit_record==$inValue?' selected="selected"':'').'>[ '.$LANG->getLL('editPageHeader',1).' ]</option>';
+                       $opt[]='<option value="'.$inValue.'"'.($edit_record==$inValue?' selected="selected"':'').'>[ '.$LANG->getLL('editPageProperties',1).' ]</option>';
                }
 
                        // Selecting all content elements from this language:
@@ -671,14 +671,14 @@ class SC_db_layout {
                                '</a>';
 
                $toolBar.='<a href="'.htmlspecialchars($this->local_linkThisScript(array('edit_record'=>'pages:'.$this->id))).'">'.
-                               '<img'.t3lib_iconWorks::skinImg($BACK_PATH,'gfx/edit2.gif','width="11" height="12"').' class="c-inputButton" title="'.$LANG->getLL('editPageHeader',1).'" alt="" />'.
+                               '<img'.t3lib_iconWorks::skinImg($BACK_PATH,'gfx/edit2.gif','width="11" height="12"').' class="c-inputButton" title="'.$LANG->getLL('editPageProperties',1).'" alt="" />'.
                                '</a>';
                $toolBar.='<img src="clear.gif" width="15" height="1" align="top" alt="" />';
 
                        // CSH:
                $toolBar.= t3lib_BEfunc::cshItem($this->descrTable,'quickEdit',$BACK_PATH,'',FALSE,'margin-top: 0px; margin-bottom: 0px;');
 
-                       // Setting page header:
+                       // Setting page properties:
                $hS2 = '
                        <table border="0" cellpadding="0" cellspacing="0" width="460">
                                <tr>
@@ -1029,7 +1029,7 @@ class SC_db_layout {
                $this->doc->postCode.= $CMparts[2];
 
 
-                       // Draw the page header.
+                       // Draw the page properties.
                $headerSection = $this->doc->getHeader('pages',$this->pageinfo,$this->pageinfo['_thePath']).'<br />'.
                                                $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.path',1).': '.
                                                '<span title="'.htmlspecialchars($this->pageinfo['_thePathFull']).'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($this->pageinfo['_thePath'],-50)).'</span>';
@@ -1053,10 +1053,10 @@ class SC_db_layout {
                $toolBar.='<a href="#" onclick="'.htmlspecialchars('jumpToUrl(\''.$BACK_PATH.'db_new.php?id='.$this->id.'&pagesOnly=1&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')).'\');return false;').'">'.
                                        '<img'.t3lib_iconWorks::skinImg($BACK_PATH,'gfx/new_page.gif','width="13" height="12"').' hspace="0" vspace="2" align="top" title="'.$LANG->getLL('newPage',1).'" alt="" />'.
                                        '</a>';
-                       // Edit page header:
+                       // Edit page properties:
                $params='&edit[pages]['.$this->id.']=edit';
                $toolBar.='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$BACK_PATH)).'">'.
-                                       '<img'.t3lib_iconWorks::skinImg($BACK_PATH,'gfx/edit2.gif','width="11" height="12"').' hspace="2" vspace="2" align="top" title="'.$LANG->getLL('editPageHeader',1).'" alt="" />'.
+                                       '<img'.t3lib_iconWorks::skinImg($BACK_PATH,'gfx/edit2.gif','width="11" height="12"').' hspace="2" vspace="2" align="top" title="'.$LANG->getLL('editPageProperties',1).'" alt="" />'.
                                        '</a>';
 
                        // Add CSH (Context Sensitive Help) icon to tool bar:
@@ -1089,7 +1089,7 @@ class SC_db_layout {
                                </tr>
                        </table>';
 
-                       // Create page header:
+                       // Create page properties:
                $this->content.=$this->doc->startPage($LANG->getLL('title'));
                $this->content.=$this->doc->section('',$hS2);
 
index 2e5c9b7..c4bc291 100755 (executable)
@@ -27,8 +27,7 @@
                        <label index="deleteItem">Delete</label>
                        <label index="deleteWarning">Are you sure you want to delete this record?</label>
                        <label index="editColumn">Edit this column</label>
-                       <label index="editPageTitle">Edit page header</label>
-                       <label index="editPageTitle_curLang">Edit translation header</label>
+                       <label index="editPageProperties_curLang">Edit translation properties</label>
                        <label index="editInRTE">Edit in Rich Text Editor</label>
                        <label index="newPageContent">Create page content</label>
                        <label index="newPageContent_copyForLang">Copy default content elements</label>
@@ -44,7 +43,7 @@
                        <label index="newLabel">NEW</label>
                        <label index="defaultLanguage">Default</label>
                        <label index="editLanguageHeader">Edit language header</label>
-                       <label index="editPageHeader">Edit page header</label>
+                       <label index="editPageProperties">Edit page properties</label>
                        <label index="newRecordGeneral">Create new record</label>
                        <label index="newContentElement">Create new content element</label>
                        <label index="CEonThisPage">Content elements on this page:</label>
index 3169503..7aa24eb 100755 (executable)
@@ -32,7 +32,7 @@ The page information view shows some statistical data about a page. This include
 
 
 &lt;b&gt;General options&lt;/b&gt;
-In the top of the Page module you will find a row of icons that will bring you right to various features such as History/Undo (1), Create new content element (2), Move page (3), Create new page (4) and Edit page header (5). See image below.
+In the top of the Page module you will find a row of icons that will bring you right to various features such as History/Undo (1), Create new content element (2), Move page (3), Create new page (4) and Edit page properties (5). See image below.
 
 &lt;b&gt;Defining number of displayed columns [Admin]&lt;/b&gt;
 Administrators can configure the Page module to display only the content columns that the website uses. This is done by Page TSconfig (so it can be configured per branch in the page tree!) and this particular option has the object path &quot;mod.web_layout.tt_content.colPos_list&quot;.
@@ -52,7 +52,7 @@ EXT:cms/cshimages/pagemodule_14.png,
 EXT:cms/cshimages/pagemodule_15.png</label>
                        <label index=".image_descr">Click the Page module, then the title of a page in the page tree.
 The page module is now activated in the right frame, showing the content of the page you clicked in the page tree.
-These buttons are direct links to the History/Undo function (1), Create new content element wizard (2), Move page wizard (3), Create new page wizard (4) and Edit page header form (5). See the links for more details.</label>
+These buttons are direct links to the History/Undo function (1), Create new content element wizard (2), Move page wizard (3), Create new page wizard (4) and Edit page properties form (5). See the links for more details.</label>
                        <label index="quickEdit.alttitle">Quick Edit</label>
                        <label index="quickEdit.description">The Quick Editor gives you direct access to the form fields of the page content.</label>
                        <label index="quickEdit.details">The Quick Editor is designed to cut down the number of clicks involved in getting to edit the page content. Simply by clicking the page title in the page tree you've got the first content element in the normal column loaded in the list frame. In the toolbar in the top you can select the other content elements on the page in the selector box.</label>
@@ -101,7 +101,7 @@ Click the icon of a content element if you wish to access the context menu of th
                        <label index="_columns_multi.image">EXT:cms/cshimages/pagemodule_12.png</label>
                        <label index="columns_multi.image_descr">When your website supports multiple content element zones in the template you will be able to use another column than the &quot;Normal&quot; column. Here the &quot;Left&quot; column is enabled. TYPO3 offers four columns by default, &quot;Normal&quot;, &quot;Right&quot;, &quot;Left&quot; and &quot;Border&quot;. Their significance depends on individual implementations in the frontend templates.</label>
                        <label index="button_panel.alttitle">The &quot;Big Buttons&quot;</label>
-                       <label index="button_panel.description">These buttons will bring you to four most used functions in relation to building pages. From here you can edit the page header (eg. the page title), you can move the current page to another position in the page tree, create a new page somewhere in the page tree or create new content elements on this page.</label>
+                       <label index="button_panel.description">These buttons will bring you to four most used functions in relation to building pages. From here you can edit the page properties (eg. the page title), you can move the current page to another position in the page tree, create a new page somewhere in the page tree or create new content elements on this page.</label>
                        <label index="_button_panel.seeAlso">xMOD_csh_corebe:TCEforms,
 xMOD_csh_corebe:move_el_pages,
 xMOD_csh_corebe:new_pages,
index d70c22e..e5b9ca6 100755 (executable)
                                                // STAT:
                                        $theLogFile = $this->TYPO3_CONF_VARS['FE']['logfile_dir'].$this->config['config']['stat_apache_logfile'];
                                                // Add PATH_site left to $theLogFile if the path is not absolute yet
-                                       if(!t3lib_div::isAbsPath($theLogFile)) $theLogFile = PATH_site.$theLogFile;
+                                       if (!t3lib_div::isAbsPath($theLogFile)) $theLogFile = PATH_site.$theLogFile;
 
                                        if ($this->config['config']['stat_apache'] && $this->config['config']['stat_apache_logfile'] && !strstr($this->config['config']['stat_apache_logfile'],'/'))    {
-                                               if(t3lib_div::isAllowedAbsPath($theLogFile) && @is_file($theLogFile) && @is_writable($theLogFile))      {
-                                                       $this->config['stat_vars']['logFile'] = $theLogFile;
+                                               if (t3lib_div::isAllowedAbsPath($theLogFile))   {
+                                                       if (!@is_file($theLogFile))     {
+                                                               touch($theLogFile);     // Try to create the logfile
+                                                               t3lib_div::fixPermissions($theLogFile);
+                                                       }
 
-                                                               // set page name later on
-                                                       $setStatPageName = true;
-                                               } else {
-                                                       $GLOBALS['TT']->setTSlogMessage('Could not set logfile path. Check filepath and permissions.',3);
+                                                       if (@is_file($theLogFile) && @is_writable($theLogFile)) {
+                                                               $this->config['stat_vars']['logFile'] = $theLogFile;
+                                                               $setStatPageName = true;        // Set page name later on
+                                                       } else {
+                                                               $GLOBALS['TT']->setTSlogMessage('Could not set logfile path. Check filepath and permissions.',3);
+                                                       }
                                                }
                                        }
+
                                        $this->config['FEData'] = $this->tmpl->setup['FEData'];
                                        $this->config['FEData.'] = $this->tmpl->setup['FEData.'];
                                }
                        $pageName = str_replace('[title]', $shortTitle ,$pageName);
                        $pageName = str_replace('[uid]',$this->page['uid'],$pageName);
                        $pageName = str_replace('[alias]',$this->page['alias'],$pageName);
-                       $pageName = str_replace('[type]',$this->page['type'],$pageName);
+                       $pageName = str_replace('[type]',$this->type,$pageName);
                        $temp = $this->config['rootLine'];
                        array_pop($temp);
                        if ($this->config['config']['stat_apache_noRoot'])      {
@@ -2940,25 +2946,11 @@ if (version == "n3") {
                                                        $LogLine.= ' "'.t3lib_div::getIndpEnv('HTTP_REFERER').'" "'.t3lib_div::getIndpEnv('HTTP_USER_AGENT').'"';
                                                }
 
-                                               switch($this->TYPO3_CONF_VARS['FE']['logfile_write'])   {
-                                                       case 'fputs':
-                                                               $GLOBALS['TT']->push('Write to log file (fputs)');
-                                                                       $logfilehandle = fopen($this->config['stat_vars']['logFile'], 'a');
-                                                                       fputs($logfilehandle, $LogLine."\n");
-                                                                       @fclose($logfilehandle);
-                                                               $GLOBALS['TT']->pull();
-                                                       break;
-                                                       default:
-                                                               $GLOBALS['TT']->push('Write to log file (echo)');
-                                                                       if (TYPO3_OS=="WIN") {
-                                                                               $execCmd = 'echo '.$LogLine.' >> '.$this->config['stat_vars']['logFile'];
-                                                                       } else {
-                                                                               $execCmd = 'echo "'.addslashes($LogLine).'" >> '.$this->config['stat_vars']['logFile'];
-                                                                       }
-                                                                       exec($execCmd);
-                                                               $GLOBALS['TT']->pull();
-                                                       break;
-                                               }
+                                               $GLOBALS['TT']->push('Write to log file (fputs)');
+                                                       $logfilehandle = fopen($this->config['stat_vars']['logFile'], 'a');
+                                                       fputs($logfilehandle, $LogLine.chr(10));
+                                                       @fclose($logfilehandle);
+                                               $GLOBALS['TT']->pull();
 
                                                $GLOBALS['TT']->setTSlogMessage('Writing to logfile: OK',0);
                                        } else {
index 5829d25..9c338df 100644 (file)
@@ -288,7 +288,7 @@ class tx_cms_webinfo_lang extends t3lib_extobjbase {
                if (is_array($langRecUids[0]))  {
                        $params = '&edit[pages]['.implode(',',$langRecUids[0]).']=edit&columnsOnly=title,nav_title,l18n_cfg,hidden';
                        $editIco = '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$GLOBALS['BACK_PATH'])).'">
-                               <img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/edit2.gif','width="11" height="12"').' title="'.$LANG->getLL('lang_renderl10n_editPageHeaders','1').'" border="0" alt="" />
+                               <img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/edit2.gif','width="11" height="12"').' title="'.$LANG->getLL('lang_renderl10n_editPageProperties','1').'" border="0" alt="" />
                                </a>';
                } else $editIco = '';
                $tCells[] = '<td class="c-leftLine" colspan="2">'.
index 25ad973..0a915f8 100755 (executable)
@@ -27,9 +27,9 @@
                        <label index="pI_lastChangeContent">Last change, content</label>
                        <label index="hits_title">Hit Statistics</label>
                        <label index="lang_renderl10n_viewPage">View page</label>
-                       <label index="lang_renderl10n_editDefaultLanguagePage">Edit default language page header</label>
+                       <label index="lang_renderl10n_editDefaultLanguagePage">Edit default language page properties</label>
                        <label index="lang_renderl10n_editLangOverlays">Edit all language overlay records</label>
-                       <label index="lang_renderl10n_editPageHeaders">Edit all page headers</label>
+                       <label index="lang_renderl10n_editPageProperties">Edit all page properties</label>
                        <label index="lang_renderl10n_editPage">Edit page</label>
                        <label index="lang_renderl10n_editPageLang">Edit page translation</label>
                        <label index="lang_renderl10n_badThingThereAre">ERROR: there are two or more page overlay records for this language! Only one is allowed!</label>
index dd4ccec..b9fccc5 100755 (executable)
@@ -300,7 +300,8 @@ tt_content:image</label>
                        <label index="_imagecols.seeAlso">tt_content:image_noRows,
 tt_content:image</label>
                        <label index="imagecaption.description">Enter a caption for the image block</label>
-                       <label index="imagecaption.details">By default the caption is positioned below the whole image block. However your website template may be configured to allow individual image captions. In that case each line in this field will be the image caption of the corresponding image in the list.
+                       <label index="imagecaption.details">By default the caption is positioned below the whole image block. However your website template may be configured to allow individual image captions by setting &quot;styles.content.imgtext.captionSplit=1&quot; in your template constants.
+                       In that case each line in this field will be the image caption of the corresponding image in the list.
 
 The caption text field is also used by the content element type &quot;Filelinks&quot; where each line represents a description of a file in the list.</label>
                        <label index="_imagecaption.seeAlso">tt_content:imagecaption_position,
index 047bf93..fa9d4b2 100755 (executable)
@@ -102,8 +102,8 @@ class tx_extrapagecmoptions {
                                                $localItems['hide'] = $backRef->DB_hideUnhide($table,$backRef->rec,$TCA[$table]['ctrl']['enablecolumns']['disabled']);
                                if (!in_array('edit_access',$backRef->disabledItems) && is_array($TCA[$table]['ctrl']['enablecolumns']))
                                                $localItems['edit_access'] = $backRef->DB_editAccess($table,$uid);
-                               if (!in_array('edit_pageheader',$backRef->disabledItems) && $table=='pages' && $backRef->editPageIconSet)
-                                               $localItems['edit_pageheader'] = $backRef->DB_editPageHeader($uid);
+                               if (!in_array('edit_pageproperties',$backRef->disabledItems) && $table=='pages' && $backRef->editPageIconSet)
+                                               $localItems['edit_pageproperties'] = $backRef->DB_editPageProperties($uid);
                        }
 
                                // Find delete element among the input menu items and insert the local items just before that:
index 6ac2c42..ad98101 100755 (executable)
@@ -270,7 +270,7 @@ class tx_indexedsearch_indexer {
                                                $this->indexTypo3PageContent();
 
                                        } else $this->log_setTSlogMessage('Index page? No, page was set to "no_cache" and so cannot be indexed.');
-                               } else $this->log_setTSlogMessage('Index page? No, The "No Search" flag has been set in the page header!');
+                               } else $this->log_setTSlogMessage('Index page? No, The "No Search" flag has been set in the page properties!');
                        } else $this->log_setTSlogMessage('Index page? No, Ordinary Frontend indexing during rendering is disabled.');
                        $this->log_pull();
                }
index 9d274fb..508970f 100755 (executable)
@@ -78,7 +78,7 @@ If you click the red &quot;+&quot; you will get the page mounted temporarily in
 
 A General Record Storage Page is typically a page of the &quot;SysFolder&quot; type.</label>
                        <label index="_storage_pid.seeAlso">The Storage Folder | http://typo3.org/documentation/document-library/doc_tut_ftb1/The_Storage_Folder/</label>
-                       <label index="editlock.description">If set, non-Admin users cannot edit the page header or any records on the page (except subpages). They cannot create new records or pages on the page either.</label>
+                       <label index="editlock.description">If set, non-Admin users cannot edit the page properties or any records on the page (except subpages). They cannot create new records or pages on the page either.</label>
                </languageKey>
                <languageKey index="dk">EXT:csh_dk/lang/dk.locallang_csh_pages.xml</languageKey>
                <languageKey index="lv">EXT:csh_lv/lang/lv.locallang_csh_pages.xml</languageKey>
index 10d26fe..14ae752 100755 (executable)
@@ -50,7 +50,7 @@
                        <label index="CM_moveWizard">Move element</label>
                        <label index="CM_moveWizard_page">Move page</label>
                        <label index="CM_newWizard">'Create New' wizard</label>
-                       <label index="CM_editPageHeader">Edit page header</label>
+                       <label index="CM_editPageProperties">Edit page properties</label>
                        <label index="CM_db_list">Web&gt;List module</label>
                        <label index="noEditPage">You asked to edit page &quot;%s&quot; but you cannot edit this page. Now loading backend as usual.</label>
                </languageKey>
index db89587..02564aa 100755 (executable)
@@ -25,7 +25,7 @@
                        <label index="clip_deleteMarkedWarning">Are you sure you want to delete all marked records from the table '%s'?</label>
                        <label index="showInfo">Display information</label>
                        <label index="edit">Edit record</label>
-                       <label index="editPage">Edit page header</label>
+                       <label index="editPage">Edit page properties</label>
                        <label index="new">New record</label>
                        <label index="newPage">Create new page after this page</label>
                        <label index="newRecord">Create new record after this record</label>
index 11165ef..a8ac2ec 100755 (executable)
@@ -36,7 +36,7 @@
                        <label index="edit_newContentElement">Create new content element</label>
                        <label index="edit_move_page">Move page</label>
                        <label index="edit_newPage">Create new page</label>
-                       <label index="edit_editPageHeader">Edit page header</label>
+                       <label index="edit_editPageProperties">Edit page properties</label>
                        <label index="edit_db_list">Web&gt;List module</label>
                        <label index="tsdebug">TypoScript</label>
                        <label index="tsdebug_tree">Tree display:</label>