Version 6.1.2

Author: bihor

Classes/Domain/Repository/SessionRepository.php

@@ -96,11 +96,18 @@ public function getAllTypes()
         //print_r($res->getSQL());
         $result = $res-> executeQuery()->fetchAllAssociative();
 
+        $listDone = false;
+        $ctypeDone = false;
         foreach ($result as $row) {
             if ($row['list_type']) {
+                if (!$listDone && $ctypeDone) {
+                    $types['3#0'] = '--- list_types ---';
+                }
                 $types['1#' . $row['list_type']] = $row['list_type'];
+                $listDone = true;
             } elseif ($row['CType'] && $row['CType'] != 'list') {
                 $types['2#' . $row['CType']] = $row['CType'];
+                $ctypeDone = true;
             }
         }
         return $types;
@@ -1438,23 +1445,20 @@ protected function getDomain($uid, $sys_language_uid = 0)
         if (isset($root['is_siteroot'])) {
             try {
                 $site = $this->siteFinder->getSiteByPageId($root['uid']);   // oder $uid;
-                $base = $site->getConfiguration()['base'];
+                $host = $site->getBase()->getHost();
+                $scheme = $site->getBase()->getScheme();
+                $domain = $scheme . '://' . $host;
+                //$base = $site->getConfiguration()['base'];
                 $lang = $site->getConfiguration()['languages'];
                 $lang = $lang[$sys_language_uid]['base'] ?? '';
-                if ((str_starts_with((string)$base, 'http')) && (str_starts_with((string)$lang, 'http'))) {
-                    // wenn die Domain beides mal benutzt wird, entfernen wir sie bei der Sprache
-                    $parse_url = parse_url((string)$lang);
-                    $lang = $parse_url['path'];
+                if (str_starts_with((string)$lang, 'http')) {
+                    // Wenn die andere Sprache eine andere Domain hat, dann wird die Domain übernommen.
+                    $domain = $lang;
+                } else {
+                    $domain .= $lang;
                 }
-                $domain = rtrim((string)$base, '/') . rtrim((string)$lang, '/');
-                if ((!str_starts_with((string)$base, 'http')) && (strlen((string)$base) > 4)) {
-                    if (str_starts_with((string)$base, '//')) {
-                        // muss nicht sein:   $domain = 'http:' . $domain;
-                    } elseif (str_starts_with((string)$base, '/')) {
-                        $domain = 'http:/' . $domain;
-                    } else {
-                        $domain = 'http://' . $domain;
-                    }
+                if (str_ends_with($domain, '/')) {
+                    $domain = substr($domain, 0, -1);
                 }
             } catch (\Exception) {
                 return '';

README.md

@@ -1,6 +1,6 @@
 # backendtools
 
-Version 6.1.1
+Version 6.1.2
 
 8 admin tools for extensions, pages, (backend) layouts, slug, redirects, files, images and links:
 extension-list, recent pages and content elements, used (backend) layouts, import redirects, check redirects,
@@ -41,3 +41,7 @@ Version 6.0.7:
 Version 6.1.0:
 - New select option: language.
 - New language added: german.
+
+Version 6.1.2:
+- Adding hash (jump mark) to urls.
+- Bugfix: respect site-variants.

Resources/Private/Templates/Session/Latest.html

@@ -144,7 +144,7 @@ <h1><f:translate key="title.latest" /></h1>
 					<td><f:format.date format="d.m.Y">{page.ptstamp}</f:format.date></td>
 					<td><f:if condition="{page.pdeleted} == 1"><f:then><span style="color:#bb0000;font-weight:bold;">{f:translate(key: 'yes')}</span></f:then><f:else>{f:translate(key: 'no')}</f:else></f:if> /
 						<f:if condition="{page.phidden} == 1"><f:then><span style="color:#bb0000;font-weight:bold;">{f:translate(key: 'yes')}</span></f:then><f:else>{f:translate(key: 'no')}</f:else></f:if></td>
-					<td><a href="{page.domain}{page.slug}" target="extern">{page.title}</a></td>
+					<td><a href="{page.domain}{page.slug}#c{page.uid}" target="extern">{page.title}</a></td>
 				</tr>
 			</f:for>
 		</tbody>

Resources/Private/Templates/Session/List.html

@@ -158,7 +158,7 @@ <h1><f:translate key="title.list" /></h1>
 					</td>
 					<td><f:if condition="{page.pdeleted} == 1"><f:then><span style="color:#bb0000;font-weight:bold;">{f:translate(key: 'yes')}</span></f:then><f:else>{f:translate(key: 'no')}</f:else></f:if> /
 						<f:if condition="{page.phidden} == 1"><f:then><span style="color:#bb0000;font-weight:bold;">{f:translate(key: 'yes')}</span></f:then><f:else>{f:translate(key: 'no')}</f:else></f:if></td>
-					<td><a href="{page.domain}{page.slug}" target="extern">{page.title}</a></td>
+					<td><a href="{page.domain}{page.slug}#c{page.uid}" target="extern">{page.title}</a></td>
 				</tr>
 			</f:for>
 		</tbody>

Resources/Private/Templates/Session/Pagesearch.html

@@ -137,7 +137,7 @@ <h1>{f:translate(key: 'title.links')}</h1>
                             <f:else>{f:translate(key: 'no')}</f:else>
                         </f:if>
                     </td>
-                    <td><a href="{page.domain}{page.slug}" target="extern">{page.title}</a></td>
+                    <td><a href="{page.domain}{page.slug}#c{page.uid}" target="extern">{page.title}</a></td>
                     </tr>
                 </f:for>
                 </tbody>

ext_emconf.php

@@ -17,7 +17,7 @@
     'author' => 'Kurt Gusbeth',
     'author_company' => 'fixpunkt für digitales GmbH',
     'state' => 'stable',
-    'version' => '6.1.1',
+    'version' => '6.1.2',
     'constraints' => [
         'depends' => [
             'typo3' => '12.4.0-13.4.99',