Inspection of "Bugfix .htaccess file" - dcngmbh/moox_core - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 32a562...9d37f1 )

by Jakub

created 2016-03-16 08:10 UTC

Status

Indentation +106 added lines, -106 removed lines patch added patch discarded remove patch

@@ -8,90 +8,90 @@  discard block
 block discarded – undo
 
 class InstallService {
     
-    /**
-    * @var string
-    */
-    protected $extKey = 'moox_core';
+	/**
+	 * @var string
+	 */
+	protected $extKey = 'moox_core';
     
-    /**
-     * @var string
-     */
-    protected $messageQueueByIdentifier = '';
+	/**
+	 * @var string
+	 */
+	protected $messageQueueByIdentifier = '';
 
-    /**
-     * Initializes the install service
-     */
-    public function __construct(){
-	    if(VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 7000000){
-		    $this->messageQueueByIdentifier = 'extbase.flashmessages.tx_extensionmanager_tools_extensionmanagerextensionmanager';
-	    }else{
-		    $this->messageQueueByIdentifier = 'core.template.flashMessages';
-	    }
-    }
+	/**
+	 * Initializes the install service
+	 */
+	public function __construct(){
+		if(VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 7000000){
+			$this->messageQueueByIdentifier = 'extbase.flashmessages.tx_extensionmanager_tools_extensionmanagerextensionmanager';
+		}else{
+			$this->messageQueueByIdentifier = 'core.template.flashMessages';
+		}
+	}
 
-    /**
-     * @param string $extension
-     */
-    public function generateApacheHtaccess($extension = NULL){
-        if($extension == $this->extKey){
-            if(substr($_SERVER['SERVER_SOFTWARE'], 0, 6) === 'Apache'){
-                $this->createDefaultHtaccessFile();
-            }else{
-                /**
-                 * Add Flashmessage that the system it not running on an apache webserver and the url rewritings must be handled manually
-                 */
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                   'The Bootstrap Package uses RealUrl to generate SEO friendly URLs by default, please take care of the URLs rewriting settings for your environment yourself.'
-                    . 'You can also deactivate RealUrl by changing your TypoScript setup to "config.tx_realurl_enable = 0".',
-                   'TYPO3 is not running on an Apache-Webserver',
-                   FlashMessage::WARNING,
-                   TRUE
-                );
-                $this->addFlashMessage($flashMessage);
-                return;
-            }
-        }
-    }
-    /**
+	/**
+	 * @param string $extension
+	 */
+	public function generateApacheHtaccess($extension = NULL){
+		if($extension == $this->extKey){
+			if(substr($_SERVER['SERVER_SOFTWARE'], 0, 6) === 'Apache'){
+				$this->createDefaultHtaccessFile();
+			}else{
+				/**
+				 * Add Flashmessage that the system it not running on an apache webserver and the url rewritings must be handled manually
+				 */
+				$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				   'The Bootstrap Package uses RealUrl to generate SEO friendly URLs by default, please take care of the URLs rewriting settings for your environment yourself.'
+					. 'You can also deactivate RealUrl by changing your TypoScript setup to "config.tx_realurl_enable = 0".',
+				   'TYPO3 is not running on an Apache-Webserver',
+				   FlashMessage::WARNING,
+				   TRUE
+				);
+				$this->addFlashMessage($flashMessage);
+				return;
+			}
+		}
+	}
+	/**
 	 * Creates .htaccess file inside the root directory
 	 *
 	 * @param string $htaccessFile Path of .htaccess file
 	 * @return void
 	 */
-    public function createDefaultHtaccessFile(){
-        $htaccessFile = GeneralUtility::getFileAbsFileName(".htaccess");
+	public function createDefaultHtaccessFile(){
+		$htaccessFile = GeneralUtility::getFileAbsFileName(".htaccess");
                 
-        if(file_exists($htaccessFile)){
+		if(file_exists($htaccessFile)){
             
-            /**
-             * Add Flashmessage that there is already an .htaccess file and we are not going to override this.
-             */
-            $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                'There is already an Apache .htaccess file in the root directory, please make sure that the url rewritings are set properly.'
-                . 'An example configuration is located at: typo3conf/ext/moox_core/Configuration/Apache/.htaccess',
-                'Apache .htaccess file already exists',
-                FlashMessage::NOTICE,
-                TRUE
-            );
-            $this->addFlashMessage($flashMessage);
+			/**
+			 * Add Flashmessage that there is already an .htaccess file and we are not going to override this.
+			 */
+			$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				'There is already an Apache .htaccess file in the root directory, please make sure that the url rewritings are set properly.'
+				. 'An example configuration is located at: typo3conf/ext/moox_core/Configuration/Apache/.htaccess',
+				'Apache .htaccess file already exists',
+				FlashMessage::NOTICE,
+				TRUE
+			);
+			$this->addFlashMessage($flashMessage);
 			return;
 	}
                    
-        $htaccessContent = GeneralUtility::getUrl(ExtensionManagementUtility::extPath($this->extKey).'/Configuration/Apache/_.htaccess');
-        GeneralUtility::writeFile($htaccessFile, $htaccessContent, TRUE);
+		$htaccessContent = GeneralUtility::getUrl(ExtensionManagementUtility::extPath($this->extKey).'/Configuration/Apache/_.htaccess');
+		GeneralUtility::writeFile($htaccessFile, $htaccessContent, TRUE);
         
-        /**
-         * Add Flashmessage that the example htaccess file was placed in the root directory
-         */
-        $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-            'For RealURL and optimization purposes an example .htaccess file was placed in your root directory.'
-            . ' Please check if the RewriteBase correctly set for your environment. ',
-            'Apache example .htaccess was placed in the root directory.',
-            FlashMessage::OK,
-            TRUE
-       );
-       $this->addFlashMessage($flashMessage);
-    }
+		/**
+		 * Add Flashmessage that the example htaccess file was placed in the root directory
+		 */
+		$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+			'For RealURL and optimization purposes an example .htaccess file was placed in your root directory.'
+			. ' Please check if the RewriteBase correctly set for your environment. ',
+			'Apache example .htaccess was placed in the root directory.',
+			FlashMessage::OK,
+			TRUE
+	   );
+	   $this->addFlashMessage($flashMessage);
+	}
 
 	/**
 	 * Creates AdditionalConfiguration.php file inside the typo3conf directory
@@ -143,39 +143,39 @@  discard block
 block discarded – undo
 	 * @param string $robotsFile Path of robots.txt file
 	 * @return void
 	 */
-    public function createDefaultRobots($extension = NULL){
+	public function createDefaultRobots($extension = NULL){
 	if($extension == $this->extKey){
 	
-	    $robotsFile = GeneralUtility::getFileAbsFileName("robots.txt");
+		$robotsFile = GeneralUtility::getFileAbsFileName("robots.txt");
 		    
-	    if(file_exists($robotsFile)){
+		if(file_exists($robotsFile)){
 		
 		/**
 		 * Add Flashmessage that there is already an robots.txt file and we are not going to override this.
 		 */
 		$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-		    'There is already an robots.txt file in the root directory.'
-		    . 'An example robots.txt is located at: typo3conf/ext/moox_core/Configuration/Robots/robots.txt',
-		    'robots.txt file already exists',
-		    FlashMessage::NOTICE,
-		    TRUE
+			'There is already an robots.txt file in the root directory.'
+			. 'An example robots.txt is located at: typo3conf/ext/moox_core/Configuration/Robots/robots.txt',
+			'robots.txt file already exists',
+			FlashMessage::NOTICE,
+			TRUE
 		);
 		$this->addFlashMessage($flashMessage);
-			    return;
-		    }
+				return;
+			}
 		       
-	    $robotsContent .= "User-Agent: * \n";
-	    $robotsContent .= " \n";
-	    $robotsContent .= "Allow: / \n";
-	    $robotsContent .= "Disallow: /typo3/ \n";
-	    $robotsContent .= " \n";
-	    $robotsContent .= "Sitemap: http://" .$_SERVER['HTTP_HOST']. "/sitemap.xml";
-	    GeneralUtility::writeFile($robotsFile, $robotsContent, TRUE);
+		$robotsContent .= "User-Agent: * \n";
+		$robotsContent .= " \n";
+		$robotsContent .= "Allow: / \n";
+		$robotsContent .= "Disallow: /typo3/ \n";
+		$robotsContent .= " \n";
+		$robotsContent .= "Sitemap: http://" .$_SERVER['HTTP_HOST']. "/sitemap.xml";
+		GeneralUtility::writeFile($robotsFile, $robotsContent, TRUE);
 	    
-	    /**
-	     * Add Flashmessage that the example AdditionalCOnfiguration.php file was placed in the typo3conf directory
-	     */
-	    $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+		/**
+		 * Add Flashmessage that the example AdditionalCOnfiguration.php file was placed in the typo3conf directory
+		 */
+		$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
 		'robots.txt file was placed in your root directory.',
 		'robots.txt was placed in the root directory.',
 		FlashMessage::OK,
@@ -184,21 +184,21 @@  discard block
 block discarded – undo
 	   $this->addFlashMessage($flashMessage);
 	   
 	}
-    }
+	}
     
-    /**
-     * Adds a Flash Message to the Flash Message Queue
-     *
-     * @param FlashMessage $flashMessage
-     */
-    public function addFlashMessage(FlashMessage $flashMessage){
-	    if($flashMessage){
-		    /** @var $flashMessageService \TYPO3\CMS\Core\Messaging\FlashMessageService */
-		    $flashMessageService = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');
-		    /** @var $flashMessageQueue \TYPO3\CMS\Core\Messaging\FlashMessageQueue */
-		    $flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($this->messageQueueByIdentifier);
-		    $flashMessageQueue->enqueue($flashMessage);
-	    }
-    }
+	/**
+	 * Adds a Flash Message to the Flash Message Queue
+	 *
+	 * @param FlashMessage $flashMessage
+	 */
+	public function addFlashMessage(FlashMessage $flashMessage){
+		if($flashMessage){
+			/** @var $flashMessageService \TYPO3\CMS\Core\Messaging\FlashMessageService */
+			$flashMessageService = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');
+			/** @var $flashMessageQueue \TYPO3\CMS\Core\Messaging\FlashMessageQueue */
+			$flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($this->messageQueueByIdentifier);
+			$flashMessageQueue->enqueue($flashMessage);
+		}
+	}
 
 }

Please login to merge, or discard this patch.

		@@ -8,90 +8,90 @@ discard block
		block discarded – undo
8	8
9	9	class InstallService {
10	10
11		- /**
12		- * @var string
13		- */
14		- protected $extKey = 'moox_core';
	11	+ /**
	12	+ * @var string
	13	+ */
	14	+ protected $extKey = 'moox_core';
15	15
16		- /**
17		- * @var string
18		- */
19		- protected $messageQueueByIdentifier = '';
	16	+ /**
	17	+ * @var string
	18	+ */
	19	+ protected $messageQueueByIdentifier = '';
20	20
21		- /**
22		- * Initializes the install service
23		- */
24		- public function __construct(){
25		- if(VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 7000000){
26		- $this->messageQueueByIdentifier = 'extbase.flashmessages.tx_extensionmanager_tools_extensionmanagerextensionmanager';
27		- }else{
28		- $this->messageQueueByIdentifier = 'core.template.flashMessages';
29		- }
30		- }
	21	+ /**
	22	+ * Initializes the install service
	23	+ */
	24	+ public function __construct(){
	25	+ if(VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 7000000){
	26	+ $this->messageQueueByIdentifier = 'extbase.flashmessages.tx_extensionmanager_tools_extensionmanagerextensionmanager';
	27	+ }else{
	28	+ $this->messageQueueByIdentifier = 'core.template.flashMessages';
	29	+ }
	30	+ }
31	31
32		- /**
33		- * @param string $extension
34		- */
35		- public function generateApacheHtaccess($extension = NULL){
36		- if($extension == $this->extKey){
37		- if(substr($_SERVER['SERVER_SOFTWARE'], 0, 6) === 'Apache'){
38		- $this->createDefaultHtaccessFile();
39		- }else{
40		- /**
41		- * Add Flashmessage that the system it not running on an apache webserver and the url rewritings must be handled manually
42		- */
43		- $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
44		- 'The Bootstrap Package uses RealUrl to generate SEO friendly URLs by default, please take care of the URLs rewriting settings for your environment yourself.'
45		- . 'You can also deactivate RealUrl by changing your TypoScript setup to "config.tx_realurl_enable = 0".',
46		- 'TYPO3 is not running on an Apache-Webserver',
47		- FlashMessage::WARNING,
48		- TRUE
49		- );
50		- $this->addFlashMessage($flashMessage);
51		- return;
52		- }
53		- }
54		- }
55		- /**
	32	+ /**
	33	+ * @param string $extension
	34	+ */
	35	+ public function generateApacheHtaccess($extension = NULL){
	36	+ if($extension == $this->extKey){
	37	+ if(substr($_SERVER['SERVER_SOFTWARE'], 0, 6) === 'Apache'){
	38	+ $this->createDefaultHtaccessFile();
	39	+ }else{
	40	+ /**
	41	+ * Add Flashmessage that the system it not running on an apache webserver and the url rewritings must be handled manually
	42	+ */
	43	+ $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
	44	+ 'The Bootstrap Package uses RealUrl to generate SEO friendly URLs by default, please take care of the URLs rewriting settings for your environment yourself.'
	45	+ . 'You can also deactivate RealUrl by changing your TypoScript setup to "config.tx_realurl_enable = 0".',
	46	+ 'TYPO3 is not running on an Apache-Webserver',
	47	+ FlashMessage::WARNING,
	48	+ TRUE
	49	+ );
	50	+ $this->addFlashMessage($flashMessage);
	51	+ return;
	52	+ }
	53	+ }
	54	+ }
	55	+ /**
56	56	* Creates .htaccess file inside the root directory
57	57	*
58	58	* @param string $htaccessFile Path of .htaccess file
59	59	* @return void
60	60	*/
61		- public function createDefaultHtaccessFile(){
62		- $htaccessFile = GeneralUtility::getFileAbsFileName(".htaccess");
	61	+ public function createDefaultHtaccessFile(){
	62	+ $htaccessFile = GeneralUtility::getFileAbsFileName(".htaccess");
63	63
64		- if(file_exists($htaccessFile)){
	64	+ if(file_exists($htaccessFile)){
65	65
66		- /**
67		- * Add Flashmessage that there is already an .htaccess file and we are not going to override this.
68		- */
69		- $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
70		- 'There is already an Apache .htaccess file in the root directory, please make sure that the url rewritings are set properly.'
71		- . 'An example configuration is located at: typo3conf/ext/moox_core/Configuration/Apache/.htaccess',
72		- 'Apache .htaccess file already exists',
73		- FlashMessage::NOTICE,
74		- TRUE
75		- );
76		- $this->addFlashMessage($flashMessage);
	66	+ /**
	67	+ * Add Flashmessage that there is already an .htaccess file and we are not going to override this.
	68	+ */
	69	+ $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
	70	+ 'There is already an Apache .htaccess file in the root directory, please make sure that the url rewritings are set properly.'
	71	+ . 'An example configuration is located at: typo3conf/ext/moox_core/Configuration/Apache/.htaccess',
	72	+ 'Apache .htaccess file already exists',
	73	+ FlashMessage::NOTICE,
	74	+ TRUE
	75	+ );
	76	+ $this->addFlashMessage($flashMessage);
77	77	return;
78	78	}
79	79
80		- $htaccessContent = GeneralUtility::getUrl(ExtensionManagementUtility::extPath($this->extKey).'/Configuration/Apache/_.htaccess');
81		- GeneralUtility::writeFile($htaccessFile, $htaccessContent, TRUE);
	80	+ $htaccessContent = GeneralUtility::getUrl(ExtensionManagementUtility::extPath($this->extKey).'/Configuration/Apache/_.htaccess');
	81	+ GeneralUtility::writeFile($htaccessFile, $htaccessContent, TRUE);
82	82
83		- /**
84		- * Add Flashmessage that the example htaccess file was placed in the root directory
85		- */
86		- $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
87		- 'For RealURL and optimization purposes an example .htaccess file was placed in your root directory.'
88		- . ' Please check if the RewriteBase correctly set for your environment. ',
89		- 'Apache example .htaccess was placed in the root directory.',
90		- FlashMessage::OK,
91		- TRUE
92		- );
93		- $this->addFlashMessage($flashMessage);
94		- }
	83	+ /**
	84	+ * Add Flashmessage that the example htaccess file was placed in the root directory
	85	+ */
	86	+ $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
	87	+ 'For RealURL and optimization purposes an example .htaccess file was placed in your root directory.'
	88	+ . ' Please check if the RewriteBase correctly set for your environment. ',
	89	+ 'Apache example .htaccess was placed in the root directory.',
	90	+ FlashMessage::OK,
	91	+ TRUE
	92	+ );
	93	+ $this->addFlashMessage($flashMessage);
	94	+ }
95	95
96	96	/**
97	97	* Creates AdditionalConfiguration.php file inside the typo3conf directory
		@@ -143,39 +143,39 @@ discard block
		block discarded – undo
143	143	* @param string $robotsFile Path of robots.txt file
144	144	* @return void
145	145	*/
146		- public function createDefaultRobots($extension = NULL){
	146	+ public function createDefaultRobots($extension = NULL){
147	147	if($extension == $this->extKey){
148	148
149		- $robotsFile = GeneralUtility::getFileAbsFileName("robots.txt");
	149	+ $robotsFile = GeneralUtility::getFileAbsFileName("robots.txt");
150	150
151		- if(file_exists($robotsFile)){
	151	+ if(file_exists($robotsFile)){
152	152
153	153	/**
154	154	* Add Flashmessage that there is already an robots.txt file and we are not going to override this.
155	155	*/
156	156	$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
157		- 'There is already an robots.txt file in the root directory.'
158		- . 'An example robots.txt is located at: typo3conf/ext/moox_core/Configuration/Robots/robots.txt',
159		- 'robots.txt file already exists',
160		- FlashMessage::NOTICE,
161		- TRUE
	157	+ 'There is already an robots.txt file in the root directory.'
	158	+ . 'An example robots.txt is located at: typo3conf/ext/moox_core/Configuration/Robots/robots.txt',
	159	+ 'robots.txt file already exists',
	160	+ FlashMessage::NOTICE,
	161	+ TRUE
162	162	);
163	163	$this->addFlashMessage($flashMessage);
164		- return;
165		- }
	164	+ return;
	165	+ }
166	166
167		- $robotsContent .= "User-Agent: * \n";
168		- $robotsContent .= " \n";
169		- $robotsContent .= "Allow: / \n";
170		- $robotsContent .= "Disallow: /typo3/ \n";
171		- $robotsContent .= " \n";
172		- $robotsContent .= "Sitemap: http://" .$_SERVER['HTTP_HOST']. "/sitemap.xml";
173		- GeneralUtility::writeFile($robotsFile, $robotsContent, TRUE);
	167	+ $robotsContent .= "User-Agent: * \n";
	168	+ $robotsContent .= " \n";
	169	+ $robotsContent .= "Allow: / \n";
	170	+ $robotsContent .= "Disallow: /typo3/ \n";
	171	+ $robotsContent .= " \n";
	172	+ $robotsContent .= "Sitemap: http://" .$_SERVER['HTTP_HOST']. "/sitemap.xml";
	173	+ GeneralUtility::writeFile($robotsFile, $robotsContent, TRUE);
174	174
175		- /**
176		- * Add Flashmessage that the example AdditionalCOnfiguration.php file was placed in the typo3conf directory
177		- */
178		- $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
	175	+ /**
	176	+ * Add Flashmessage that the example AdditionalCOnfiguration.php file was placed in the typo3conf directory
	177	+ */
	178	+ $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
179	179	'robots.txt file was placed in your root directory.',
180	180	'robots.txt was placed in the root directory.',
181	181	FlashMessage::OK,
		@@ -184,21 +184,21 @@ discard block
		block discarded – undo
184	184	$this->addFlashMessage($flashMessage);
185	185
186	186	}
187		- }
	187	+ }
188	188
189		- /**
190		- * Adds a Flash Message to the Flash Message Queue
191		- *
192		- * @param FlashMessage $flashMessage
193		- */
194		- public function addFlashMessage(FlashMessage $flashMessage){
195		- if($flashMessage){
196		- /** @var $flashMessageService \TYPO3\CMS\Core\Messaging\FlashMessageService */
197		- $flashMessageService = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');
198		- /** @var $flashMessageQueue \TYPO3\CMS\Core\Messaging\FlashMessageQueue */
199		- $flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($this->messageQueueByIdentifier);
200		- $flashMessageQueue->enqueue($flashMessage);
201		- }
202		- }
	189	+ /**
	190	+ * Adds a Flash Message to the Flash Message Queue
	191	+ *
	192	+ * @param FlashMessage $flashMessage
	193	+ */
	194	+ public function addFlashMessage(FlashMessage $flashMessage){
	195	+ if($flashMessage){
	196	+ /** @var $flashMessageService \TYPO3\CMS\Core\Messaging\FlashMessageService */
	197	+ $flashMessageService = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');
	198	+ /** @var $flashMessageQueue \TYPO3\CMS\Core\Messaging\FlashMessageQueue */
	199	+ $flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($this->messageQueueByIdentifier);
	200	+ $flashMessageQueue->enqueue($flashMessage);
	201	+ }
	202	+ }
203	203
204	204	}

dcngmbh / moox_core

Push — master ( 32a562...9d37f1 )

Status

Category

Indentation +106 added lines, -106 removed lines patch added patch discarded remove patch