[TASK] Cleanup ext:sv 81/23481/3
authorWouter Wolters <typo3@wouterwolters.nl>
Thu, 29 Aug 2013 22:20:13 +0000 (00:20 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 31 Aug 2013 09:12:14 +0000 (11:12 +0200)
* Remove old class files
* Move image and language files to ExtBase structure
* Delete unused CSS file

Change-Id: Icbf13d62397f0f5a1eb2bcccd76e9b81541d27b1
Resolves: #51593
Releases: 6.2
Reviewed-on: https://review.typo3.org/23481
Reviewed-by: Kai Ole Hartwig
Tested-by: Kai Ole Hartwig
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
18 files changed:
typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
typo3/sysext/openid/ext_localconf.php
typo3/sysext/rsaauth/sv1/class.tx_rsaauth_sv1.php
typo3/sysext/saltedpasswords/ext_localconf.php
typo3/sysext/sv/Classes/AuthenticationService.php
typo3/sysext/sv/Classes/Report/ServicesListReport.php
typo3/sysext/sv/Resources/Private/Language/locallang.xlf [new file with mode: 0644]
typo3/sysext/sv/Resources/Public/Images/tx_sv_report.png [new file with mode: 0755]
typo3/sysext/sv/class.tx_sv_auth.php [deleted file]
typo3/sysext/sv/class.tx_sv_authbase.php [deleted file]
typo3/sysext/sv/class.tx_sv_loginformhook.php [deleted file]
typo3/sysext/sv/ext_autoload.php [deleted file]
typo3/sysext/sv/ext_localconf.php
typo3/sysext/sv/ext_tables.php
typo3/sysext/sv/reports/class.tx_sv_reports_serviceslist.php [deleted file]
typo3/sysext/sv/reports/locallang.xlf [deleted file]
typo3/sysext/sv/reports/tx_sv_report.css [deleted file]
typo3/sysext/sv/reports/tx_sv_report.png [deleted file]

index e3e0374..28f594b 100644 (file)
@@ -346,7 +346,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
                // to 'superchallenged' because of the password in the database is stored as md5 hash.
                // @deprecated since 4.7
                // These lines are here for compatibility purpose only, can be removed in 6.1.
-               // @see tx_sv_auth::processLoginData()
+               // @see \TYPO3\CMS\Sv\AuthenticationService::processLoginData()
                if (!empty($securityLevel) && !in_array($securityLevel, $standardSecurityLevels)) {
                        $this->security_level = $securityLevel;
                } else {
index b2b0e67..2d85c67 100644 (file)
@@ -10,7 +10,7 @@ if (!defined('TYPO3_MODE')) {
        'subtype' => 'getUserFE,authUserFE,getUserBE,authUserBE',
        'available' => TRUE,
        'priority' => 75,
-       // Must be higher than for tx_sv_auth (50) or tx_sv_auth will deny request unconditionally
+       // Must be higher than for \TYPO3\CMS\Sv\AuthenticationService (50) or \TYPO3\CMS\Sv\AuthenticationService will deny request unconditionally
        'quality' => 50,
        'os' => '',
        'exec' => '',
index 0a27ff7..8015faa 100644 (file)
@@ -21,7 +21,7 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('sv') . 'class.tx_sv_auth.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('sv') . 'Classes/AuthenticationService.php';
 /*
  * @deprecated since 6.0, the classname tx_rsaauth_sv1 and this file is obsolete
  * and will be removed with 6.2. The class was renamed and is now located at:
index 9288615..682de4b 100644 (file)
@@ -20,7 +20,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/saltedpasswords']['saltMethods']
        'subtype' => 'authUserFE,authUserBE',
        'available' => TRUE,
        'priority' => 70,
-       // must be higher than tx_sv_auth (50) and rsaauth (60) but lower than OpenID (75)
+       // must be higher than \TYPO3\CMS\Sv\AuthenticationService (50) and rsaauth (60) but lower than OpenID (75)
        'quality' => 70,
        'os' => '',
        'exec' => '',
index bf70128..b265974 100644 (file)
@@ -26,11 +26,7 @@ namespace TYPO3\CMS\Sv;
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-/**
- * Service 'User authentication' for the 'sv' extension.
- *
- * @author René Fritz <r.fritz@colorcube.de>
- */
+
 /**
  * Authentication services class
  *
index ff22e61..625d3a1 100644 (file)
@@ -45,7 +45,7 @@ class ServicesListReport implements \TYPO3\CMS\Reports\ReportInterface {
         */
        public function __construct(\TYPO3\CMS\Reports\Controller\ReportController $reportsModule) {
                $this->reportsModule = $reportsModule;
-               $GLOBALS['LANG']->includeLLFile('EXT:sv/reports/locallang.xlf');
+               $GLOBALS['LANG']->includeLLFile('EXT:sv/Resources/Private/Language/locallang.xlf');
        }
 
        /**
diff --git a/typo3/sysext/sv/Resources/Private/Language/locallang.xlf b/typo3/sysext/sv/Resources/Private/Language/locallang.xlf
new file mode 100644 (file)
index 0000000..55dc5d8
--- /dev/null
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0">
+       <file source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:37Z" product-name="sv">
+               <header/>
+               <body>
+                       <trans-unit id="report_title" xml:space="preserve">
+                               <source>Installed Services</source>
+                       </trans-unit>
+                       <trans-unit id="report_description" xml:space="preserve">
+                               <source>List of all installed services with information and status for each of them.</source>
+                       </trans-unit>
+                       <trans-unit id="report_explanation" xml:space="preserve">
+                               <source>This report displays a list of installed services, with detailed information about each of them. The services are ordered by type, priority and quality. Unavailable services are highlighted with an error status.</source>
+                       </trans-unit>
+                       <trans-unit id="externals_explanation" xml:space="preserve">
+                               <source>The "Externals" column shows which external programs a given service relies on. If such program is missing or not executable, the service will be unavailable. Search paths for executables are listed at the bottom of this report.</source>
+                       </trans-unit>
+                       <trans-unit id="service_type" xml:space="preserve">
+                               <source>Service type: %s</source>
+                       </trans-unit>
+                       <trans-unit id="service" xml:space="preserve">
+                               <source>Service</source>
+                       </trans-unit>
+                       <trans-unit id="priority" xml:space="preserve">
+                               <source>Priority</source>
+                       </trans-unit>
+                       <trans-unit id="quality" xml:space="preserve">
+                               <source>Quality</source>
+                       </trans-unit>
+                       <trans-unit id="subtypes" xml:space="preserve">
+                               <source>Subtypes</source>
+                       </trans-unit>
+                       <trans-unit id="os" xml:space="preserve">
+                               <source>OS</source>
+                       </trans-unit>
+                       <trans-unit id="externals" xml:space="preserve">
+                               <source>Externals</source>
+                       </trans-unit>
+                       <trans-unit id="available" xml:space="preserve">
+                               <source>Available</source>
+                       </trans-unit>
+                       <trans-unit id="any" xml:space="preserve">
+                               <source>Any</source>
+                       </trans-unit>
+                       <trans-unit id="search_paths" xml:space="preserve">
+                               <source>Configured search paths for external programs</source>
+                       </trans-unit>
+                       <trans-unit id="path" xml:space="preserve">
+                               <source>Path</source>
+                       </trans-unit>
+                       <trans-unit id="valid" xml:space="preserve">
+                               <source>Valid</source>
+                       </trans-unit>
+                       <trans-unit id="no_search_paths" xml:space="preserve">
+                               <source>No search paths configured.</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/sv/Resources/Public/Images/tx_sv_report.png b/typo3/sysext/sv/Resources/Public/Images/tx_sv_report.png
new file mode 100755 (executable)
index 0000000..ebd6e17
Binary files /dev/null and b/typo3/sysext/sv/Resources/Public/Images/tx_sv_report.png differ
diff --git a/typo3/sysext/sv/class.tx_sv_auth.php b/typo3/sysext/sv/class.tx_sv_auth.php
deleted file mode 100644 (file)
index dceadc6..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_sv_auth and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/sv/Classes/AuthenticationService.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('sv') . 'Classes/AuthenticationService.php';
-?>
\ No newline at end of file
diff --git a/typo3/sysext/sv/class.tx_sv_authbase.php b/typo3/sysext/sv/class.tx_sv_authbase.php
deleted file mode 100644 (file)
index 5449745..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2004-2013 René Fritz <r.fritz@colorcube.de>
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the textfile GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
-// @TODO: Find out if we still need this require
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('core') . 'Classes/Service/AbstractService.php';
-
-/**
- * Service base class for 'User authentication'.
- *
- * @author René Fritz <r.fritz@colorcube.de>
- */
-
-/*
- * @deprecated since 6.0, the classname tx_sv_authbase and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/sv/Classes/AbstractAuthenticationService.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('sv') . 'Classes/AbstractAuthenticationService.php';
-?>
diff --git a/typo3/sysext/sv/class.tx_sv_loginformhook.php b/typo3/sysext/sv/class.tx_sv_loginformhook.php
deleted file mode 100644 (file)
index 8127a4d..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_sv_loginformhook and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/sv/Classes/LoginFormHook.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('sv') . 'Classes/LoginFormHook.php';
-?>
\ No newline at end of file
diff --git a/typo3/sysext/sv/ext_autoload.php b/typo3/sysext/sv/ext_autoload.php
deleted file mode 100644 (file)
index b5b87bf..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-// Register necessary class names with autoloader
-$extensionPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('sv');
-return array(
-       'tx_sv_reports_serviceslist' => $extensionPath . 'reports/class.tx_sv_reports_serviceslist.php'
-);
-?>
\ No newline at end of file
index 618b696..9394e66 100644 (file)
@@ -3,18 +3,23 @@ if (!defined('TYPO3_MODE')) {
        die('Access denied.');
 }
 // Register base authentication service
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addService($_EXTKEY, 'auth', 'TYPO3\\CMS\\Sv\\AuthenticationService', array(
-       'title' => 'User authentication',
-       'description' => 'Authentication with username/password.',
-       'subtype' => 'getUserBE,authUserBE,getUserFE,authUserFE,getGroupsFE,processLoginDataBE,processLoginDataFE',
-       'available' => TRUE,
-       'priority' => 50,
-       'quality' => 50,
-       'os' => '',
-       'exec' => '',
-       'className' => 'TYPO3\\CMS\\Sv\\AuthenticationService'
-));
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addService(
+       $_EXTKEY,
+       'auth',
+       'TYPO3\\CMS\\Sv\\AuthenticationService',
+       array(
+               'title' => 'User authentication',
+               'description' => 'Authentication with username/password.',
+               'subtype' => 'getUserBE,authUserBE,getUserFE,authUserFE,getGroupsFE,processLoginDataBE,processLoginDataFE',
+               'available' => TRUE,
+               'priority' => 50,
+               'quality' => 50,
+               'os' => '',
+               'exec' => '',
+               'className' => 'TYPO3\\CMS\\Sv\\AuthenticationService'
+       )
+);
 // Add hooks to the backend login form
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/index.php']['loginFormHook'][$_EXTKEY] = 'EXT:' . $_EXTKEY . '/class.tx_sv_loginformhook.php:TYPO3\\CMS\\Sv\\LoginFormHook->getLoginFormTag';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/index.php']['loginScriptHook'][$_EXTKEY] = 'EXT:' . $_EXTKEY . '/class.tx_sv_loginformhook.php:TYPO3\\CMS\\Sv\\LoginFormHook->getLoginScripts';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/index.php']['loginFormHook'][$_EXTKEY] = 'TYPO3\\CMS\\Sv\\LoginFormHook->getLoginFormTag';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/index.php']['loginScriptHook'][$_EXTKEY] = 'TYPO3\\CMS\\Sv\\LoginFormHook->getLoginScripts';
 ?>
\ No newline at end of file
index 16030ad..26cc930 100644 (file)
@@ -2,11 +2,11 @@
 if (!defined('TYPO3_MODE')) {
        die('Access denied.');
 }
-if (TYPO3_MODE == 'BE') {
+if (TYPO3_MODE === 'BE') {
        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['sv']['services'] = array(
                'title' => 'LLL:EXT:sv/reports/locallang.xlf:report_title',
                'description' => 'LLL:EXT:sv/reports/locallang.xlf:report_description',
-               'icon' => 'EXT:sv/reports/tx_sv_report.png',
+               'icon' => 'EXT:sv/Resources/Public/Images/tx_sv_report.png',
                'report' => 'TYPO3\\CMS\\Sv\\Report\\ServicesListReport'
        );
 }
diff --git a/typo3/sysext/sv/reports/class.tx_sv_reports_serviceslist.php b/typo3/sysext/sv/reports/class.tx_sv_reports_serviceslist.php
deleted file mode 100644 (file)
index 55e47d1..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_sv_reports_ServicesList and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/sv/Classes/Report/ServicesListReport.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('sv') . 'Classes/Report/ServicesListReport.php';
-?>
\ No newline at end of file
diff --git a/typo3/sysext/sv/reports/locallang.xlf b/typo3/sysext/sv/reports/locallang.xlf
deleted file mode 100644 (file)
index 55dc5d8..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0">
-       <file source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:37Z" product-name="sv">
-               <header/>
-               <body>
-                       <trans-unit id="report_title" xml:space="preserve">
-                               <source>Installed Services</source>
-                       </trans-unit>
-                       <trans-unit id="report_description" xml:space="preserve">
-                               <source>List of all installed services with information and status for each of them.</source>
-                       </trans-unit>
-                       <trans-unit id="report_explanation" xml:space="preserve">
-                               <source>This report displays a list of installed services, with detailed information about each of them. The services are ordered by type, priority and quality. Unavailable services are highlighted with an error status.</source>
-                       </trans-unit>
-                       <trans-unit id="externals_explanation" xml:space="preserve">
-                               <source>The "Externals" column shows which external programs a given service relies on. If such program is missing or not executable, the service will be unavailable. Search paths for executables are listed at the bottom of this report.</source>
-                       </trans-unit>
-                       <trans-unit id="service_type" xml:space="preserve">
-                               <source>Service type: %s</source>
-                       </trans-unit>
-                       <trans-unit id="service" xml:space="preserve">
-                               <source>Service</source>
-                       </trans-unit>
-                       <trans-unit id="priority" xml:space="preserve">
-                               <source>Priority</source>
-                       </trans-unit>
-                       <trans-unit id="quality" xml:space="preserve">
-                               <source>Quality</source>
-                       </trans-unit>
-                       <trans-unit id="subtypes" xml:space="preserve">
-                               <source>Subtypes</source>
-                       </trans-unit>
-                       <trans-unit id="os" xml:space="preserve">
-                               <source>OS</source>
-                       </trans-unit>
-                       <trans-unit id="externals" xml:space="preserve">
-                               <source>Externals</source>
-                       </trans-unit>
-                       <trans-unit id="available" xml:space="preserve">
-                               <source>Available</source>
-                       </trans-unit>
-                       <trans-unit id="any" xml:space="preserve">
-                               <source>Any</source>
-                       </trans-unit>
-                       <trans-unit id="search_paths" xml:space="preserve">
-                               <source>Configured search paths for external programs</source>
-                       </trans-unit>
-                       <trans-unit id="path" xml:space="preserve">
-                               <source>Path</source>
-                       </trans-unit>
-                       <trans-unit id="valid" xml:space="preserve">
-                               <source>Valid</source>
-                       </trans-unit>
-                       <trans-unit id="no_search_paths" xml:space="preserve">
-                               <source>No search paths configured.</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/sv/reports/tx_sv_report.css b/typo3/sysext/sv/reports/tx_sv_report.css
deleted file mode 100644 (file)
index 3ce4955..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Services report styles */
-
-.tx_sv_reportlist td {
-       vertical-align: middle;
-}
-
-.tx_sv_reportlist td.typo3-message {
-       vertical-align: top;
-}
-
-.tx_sv_reportlist td.cell {
-       background-image: none;
-       padding: 3px;
-       border-left: none;
-       border-right: none;
-}
-
-.tx_sv_reportlist td.first-cell {
-       background-image: none;
-       padding: 3px;
-       border-right: none;
-}
-
-.tx_sv_reportlist td.last-cell {
-       border-left: none;
-}
-
-.service-header {
-       margin-bottom: 4px;
-}
-
-.service-title {
-       font-weight: bold;
-}
-
-.service-description {
-       margin-bottom: 6px;
-       font-style: italic;
-}
diff --git a/typo3/sysext/sv/reports/tx_sv_report.png b/typo3/sysext/sv/reports/tx_sv_report.png
deleted file mode 100755 (executable)
index ebd6e17..0000000
Binary files a/typo3/sysext/sv/reports/tx_sv_report.png and /dev/null differ