Inspection of "Scrutinizer fixes." - mbirth/cops - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 3facbb...d7e1eb )

by Markus

created 2016-06-29 21:19 UTC

Status

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -8,8 +8,8 @@  discard block
 block discarded – undo
 
 require_once 'config.php';
 
-define ('VERSION', '1.0.0RC4');
-define ('DB', 'db');
+define('VERSION', '1.0.0RC4');
+define('DB', 'db');
 date_default_timezone_set($config['default_timezone']);
 
 
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 function serverSideRender($data)
 {
     // Get the templates
-    $theme = getCurrentTemplate ();
+    $theme = getCurrentTemplate();
     $header = file_get_contents('templates/' . $theme . '/header.html');
     $footer = file_get_contents('templates/' . $theme . '/footer.html');
     $main = file_get_contents('templates/' . $theme . '/main.html');
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
     $page = file_get_contents('templates/' . $theme . '/page.html');
 
     // Generate the function for the template
-    $template = new doT ();
-    $dot = $template->template ($page, array ('bookdetail' => $bookdetail,
+    $template = new doT();
+    $dot = $template->template($page, array('bookdetail' => $bookdetail,
                                               'header' => $header,
                                               'footer' => $footer,
                                               'main' => $main));
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
     }
     // Execute the template
     if (!empty ($data)) {
-        return $dot ($data);
+        return $dot($data);
     }
 
     return NULL;
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
 
 function notFound()
 {
-    header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
+    header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
     header('Status: 404 Not Found');
 
     $_SERVER['REDIRECT_STATUS'] = 404;
@@ -76,8 +76,8 @@  discard block
 block discarded – undo
 {
     global $config;
     if (isset($_COOKIE[$option])) {
-        if (isset($config ['cops_' . $option]) && is_array ($config ['cops_' . $option])) {
-            return explode (',', $_COOKIE[$option]);
+        if (isset($config ['cops_' . $option]) && is_array($config ['cops_' . $option])) {
+            return explode(',', $_COOKIE[$option]);
         } else {
             return $_COOKIE[$option];
         }
@@ -91,12 +91,12 @@  discard block
 block discarded – undo
 
 function getCurrentCss()
 {
-    return 'templates/' . getCurrentTemplate () . '/styles/style-' . getCurrentOption('style') . '.css';
+    return 'templates/' . getCurrentTemplate() . '/styles/style-' . getCurrentOption('style') . '.css';
 }
 
 function getCurrentTemplate()
 {
-    return getCurrentOption ('template');
+    return getCurrentOption('template');
 }
 
 function getUrlWithVersion($url)
@@ -160,10 +160,10 @@  discard block
 block discarded – undo
     libxml_use_internal_errors(true);
 
     $doc->loadHTML('<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>' .
-                        $html  . '</body></html>'); // Load the HTML
+                        $html . '</body></html>'); // Load the HTML
     $output = $doc->saveXML($doc->documentElement); // Transform to an Ansi xml stream
     $output = xml2xhtml($output);
-    if (preg_match ('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
+    if (preg_match('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
         $output = $matches [1]; // Remove <html><body>
     }
     /*
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
     }
     */
 
-    if (!are_libxml_errors_ok ()) $output = 'HTML code not valid.';
+    if (!are_libxml_errors_ok()) $output = 'HTML code not valid.';
 
     libxml_use_internal_errors(false);
     return $output;
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
     //echo var_dump($langs);
     $lang_file = NULL;
     foreach ($langs as $language => $val) {
-        $temp_file = dirname(__FILE__). '/lang/Localization_' . $language . '.json';
+        $temp_file = dirname(__FILE__) . '/lang/Localization_' . $language . '.json';
         if (file_exists($temp_file)) {
             $lang = $language;
             $lang_file = $temp_file;
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
         }
     }
     if (empty ($lang_file)) {
-        $lang_file = dirname(__FILE__). '/lang/Localization_' . $lang . '.json';
+        $lang_file = dirname(__FILE__) . '/lang/Localization_' . $lang . '.json';
     }
     return array($lang, $lang_file);
 }
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
  * This method is based on this page
  * http://www.mind-it.info/2010/02/22/a-simple-approach-to-localization-in-php/
  */
-function localize($phrase, $count=-1, $reset=false)
+function localize($phrase, $count = -1, $reset = false)
 {
     global $config;
     if ($count == 0)
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
         $lang_file_en = NULL;
         list ($lang, $lang_file) = getLangAndTranslationFile();
         if ($lang != 'en') {
-            $lang_file_en = dirname(__FILE__). '/lang/' . 'Localization_en.json';
+            $lang_file_en = dirname(__FILE__) . '/lang/' . 'Localization_en.json';
         }
 
         $lang_file_content = file_get_contents($lang_file);
@@ -309,8 +309,8 @@  discard block
 block discarded – undo
         $translations = json_decode($lang_file_content, true);
 
         /* Clean the array of all unfinished translations */
-        foreach (array_keys ($translations) as $key) {
-            if (preg_match ('/^##TODO##/', $key)) {
+        foreach (array_keys($translations) as $key) {
+            if (preg_match('/^##TODO##/', $key)) {
                 unset ($translations [$key]);
             }
         }
@@ -318,10 +318,10 @@  discard block
 block discarded – undo
         {
             $lang_file_content = file_get_contents($lang_file_en);
             $translations_en = json_decode($lang_file_content, true);
-            $translations = array_merge ($translations_en, $translations);
+            $translations = array_merge($translations_en, $translations);
         }
     }
-    if (array_key_exists ($phrase, $translations)) {
+    if (array_key_exists($phrase, $translations)) {
         return $translations[$phrase];
     }
     return $phrase;
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
         $urlParams = '';
     }
     $start = '';
-    if (preg_match ('#^\?(.*)#', $urlParams, $matches)) {
+    if (preg_match('#^\?(.*)#', $urlParams, $matches)) {
         $start = '?';
         $urlParams = $matches[1];
     }

Please login to merge, or discard this patch.

fetch.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -19,10 +19,10 @@  discard block
 block discarded – undo
         }
     }
 
-    $expires = 60*60*24*14;
+    $expires = 60 * 60 * 24 * 14;
     header('Pragma: public');
     header('Cache-Control: maxage=' . $expires);
-    header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
+    header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
     $bookId = getURLParam('id', NULL);
     $type   = getURLParam('type', 'jpg');
     $idData = getURLParam('data', NULL);
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
     }
 
     if (!$book) {
-        notFound ();
+        notFound();
         return;
     }
 
@@ -55,15 +55,15 @@  discard block
 block discarded – undo
             header('Content-Type: image/jpeg');
             //by default, we don't cache
             $thumbnailCacheFullpath = null;
-            if ( isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '' ) {
+            if (isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '') {
                 $thumbnailCacheFullpath = $config['cops_thumbnail_cache_directory'];
                 //if multiple databases, add a subfolder with the database ID
-                $thumbnailCacheFullpath .= !is_null(GetUrlParam (DB)) ? 'db-' . GetUrlParam (DB) . DIRECTORY_SEPARATOR : '';
+                $thumbnailCacheFullpath .= !is_null(GetUrlParam(DB))?'db-' . GetUrlParam(DB) . DIRECTORY_SEPARATOR:'';
                 //when there are lots of thumbnails, it's better to save files in subfolders, so if the book's uuid is
                 //"01234567-89ab-cdef-0123-456789abcdef", we will save the thumbnail in .../0/12/34567-89ab-cdef-0123-456789abcdef-...
                 $thumbnailCacheFullpath .= substr($book->uuid, 0, 1) . DIRECTORY_SEPARATOR . substr($book->uuid, 1, 2) . DIRECTORY_SEPARATOR;
                 //check if cache folder exists or create it
-                if ( file_exists($thumbnailCacheFullpath) || mkdir($thumbnailCacheFullpath, 0700, true) ) {
+                if (file_exists($thumbnailCacheFullpath) || mkdir($thumbnailCacheFullpath, 0700, true)) {
                     //we name the thumbnail from the book's uuid and it's dimensions (width and/or height)
                     $thumbnailCacheName = substr($book->uuid, 3) . '-' . getURLParam('width') . 'x' . getURLParam('height') . '.jpg';
                     $thumbnailCacheFullpath = $thumbnailCacheFullpath . $thumbnailCacheName;
@@ -73,20 +73,20 @@  discard block
 block discarded – undo
                 }
             }
 
-            if ( $thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath) ) {
+            if ($thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath)) {
                 //return the already cached thumbnail
-                readfile( $thumbnailCacheFullpath );
+                readfile($thumbnailCacheFullpath);
                 return;
             }
 
-            if ($book->getThumbnail (getURLParam('width'), getURLParam('height'), $thumbnailCacheFullpath)) {
+            if ($book->getThumbnail(getURLParam('width'), getURLParam('height'), $thumbnailCacheFullpath)) {
                 //if we don't cache the thumbnail, imagejpeg() in $book->getThumbnail() already return the image data
-                if ( $thumbnailCacheFullpath === null ) {
+                if ($thumbnailCacheFullpath === null) {
                     // The cover had to be resized
                     return;
                 } else {
                     //return the just cached thumbnail
-                    readfile( $thumbnailCacheFullpath );
+                    readfile($thumbnailCacheFullpath);
                     return;
                 }
             }

Please login to merge, or discard this patch.

		@@ -8,8 +8,8 @@ discard block
		block discarded – undo
8	8
9	9	require_once 'config.php';
10	10
11		-define ('VERSION', '1.0.0RC4');
12		-define ('DB', 'db');
	11	+define('VERSION', '1.0.0RC4');
	12	+define('DB', 'db');
13	13	date_default_timezone_set($config['default_timezone']);
14	14
15	15
		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	function serverSideRender($data)
23	23	{
24	24	// Get the templates
25		- $theme = getCurrentTemplate ();
	25	+ $theme = getCurrentTemplate();
26	26	$header = file_get_contents('templates/' . $theme . '/header.html');
27	27	$footer = file_get_contents('templates/' . $theme . '/footer.html');
28	28	$main = file_get_contents('templates/' . $theme . '/main.html');
		@@ -30,8 +30,8 @@ discard block
		block discarded – undo
30	30	$page = file_get_contents('templates/' . $theme . '/page.html');
31	31
32	32	// Generate the function for the template
33		- $template = new doT ();
34		- $dot = $template->template ($page, array ('bookdetail' => $bookdetail,
	33	+ $template = new doT();
	34	+ $dot = $template->template($page, array('bookdetail' => $bookdetail,
35	35	'header' => $header,
36	36	'footer' => $footer,
37	37	'main' => $main));
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	}
43	43	// Execute the template
44	44	if (!empty ($data)) {
45		- return $dot ($data);
	45	+ return $dot($data);
46	46	}
47	47
48	48	return NULL;
		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58
59	59	function notFound()
60	60	{
61		- header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
	61	+ header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
62	62	header('Status: 404 Not Found');
63	63
64	64	$_SERVER['REDIRECT_STATUS'] = 404;
		@@ -76,8 +76,8 @@ discard block
		block discarded – undo
76	76	{
77	77	global $config;
78	78	if (isset($_COOKIE[$option])) {
79		- if (isset($config ['cops_' . $option]) && is_array ($config ['cops_' . $option])) {
80		- return explode (',', $_COOKIE[$option]);
	79	+ if (isset($config ['cops_' . $option]) && is_array($config ['cops_' . $option])) {
	80	+ return explode(',', $_COOKIE[$option]);
81	81	} else {
82	82	return $_COOKIE[$option];
83	83	}
		@@ -91,12 +91,12 @@ discard block
		block discarded – undo
91	91
92	92	function getCurrentCss()
93	93	{
94		- return 'templates/' . getCurrentTemplate () . '/styles/style-' . getCurrentOption('style') . '.css';
	94	+ return 'templates/' . getCurrentTemplate() . '/styles/style-' . getCurrentOption('style') . '.css';
95	95	}
96	96
97	97	function getCurrentTemplate()
98	98	{
99		- return getCurrentOption ('template');
	99	+ return getCurrentOption('template');
100	100	}
101	101
102	102	function getUrlWithVersion($url)
		@@ -160,10 +160,10 @@ discard block
		block discarded – undo
160	160	libxml_use_internal_errors(true);
161	161
162	162	$doc->loadHTML('<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>' .
163		- $html . '</body></html>'); // Load the HTML
	163	+ $html . '</body></html>'); // Load the HTML
164	164	$output = $doc->saveXML($doc->documentElement); // Transform to an Ansi xml stream
165	165	$output = xml2xhtml($output);
166		- if (preg_match ('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
	166	+ if (preg_match('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
167	167	$output = $matches [1]; // Remove <html><body>
168	168	}
169	169	/*
		@@ -175,7 +175,7 @@ discard block
		block discarded – undo
175	175	}
176	176	*/
177	177
178		- if (!are_libxml_errors_ok ()) $output = 'HTML code not valid.';
	178	+ if (!are_libxml_errors_ok()) $output = 'HTML code not valid.';
179	179
180	180	libxml_use_internal_errors(false);
181	181	return $output;
		@@ -264,7 +264,7 @@ discard block
		block discarded – undo
264	264	//echo var_dump($langs);
265	265	$lang_file = NULL;
266	266	foreach ($langs as $language => $val) {
267		- $temp_file = dirname(__FILE__). '/lang/Localization_' . $language . '.json';
	267	+ $temp_file = dirname(__FILE__) . '/lang/Localization_' . $language . '.json';
268	268	if (file_exists($temp_file)) {
269	269	$lang = $language;
270	270	$lang_file = $temp_file;
		@@ -272,7 +272,7 @@ discard block
		block discarded – undo
272	272	}
273	273	}
274	274	if (empty ($lang_file)) {
275		- $lang_file = dirname(__FILE__). '/lang/Localization_' . $lang . '.json';
	275	+ $lang_file = dirname(__FILE__) . '/lang/Localization_' . $lang . '.json';
276	276	}
277	277	return array($lang, $lang_file);
278	278	}
		@@ -281,7 +281,7 @@ discard block
		block discarded – undo
281	281	* This method is based on this page
282	282	* http://www.mind-it.info/2010/02/22/a-simple-approach-to-localization-in-php/
283	283	*/
284		-function localize($phrase, $count=-1, $reset=false)
	284	+function localize($phrase, $count = -1, $reset = false)
285	285	{
286	286	global $config;
287	287	if ($count == 0)
		@@ -301,7 +301,7 @@ discard block
		block discarded – undo
301	301	$lang_file_en = NULL;
302	302	list ($lang, $lang_file) = getLangAndTranslationFile();
303	303	if ($lang != 'en') {
304		- $lang_file_en = dirname(__FILE__). '/lang/' . 'Localization_en.json';
	304	+ $lang_file_en = dirname(__FILE__) . '/lang/' . 'Localization_en.json';
305	305	}
306	306
307	307	$lang_file_content = file_get_contents($lang_file);
		@@ -309,8 +309,8 @@ discard block
		block discarded – undo
309	309	$translations = json_decode($lang_file_content, true);
310	310
311	311	/* Clean the array of all unfinished translations */
312		- foreach (array_keys ($translations) as $key) {
313		- if (preg_match ('/^##TODO##/', $key)) {
	312	+ foreach (array_keys($translations) as $key) {
	313	+ if (preg_match('/^##TODO##/', $key)) {
314	314	unset ($translations [$key]);
315	315	}
316	316	}
		@@ -318,10 +318,10 @@ discard block
		block discarded – undo
318	318	{
319	319	$lang_file_content = file_get_contents($lang_file_en);
320	320	$translations_en = json_decode($lang_file_content, true);
321		- $translations = array_merge ($translations_en, $translations);
	321	+ $translations = array_merge($translations_en, $translations);
322	322	}
323	323	}
324		- if (array_key_exists ($phrase, $translations)) {
	324	+ if (array_key_exists($phrase, $translations)) {
325	325	return $translations[$phrase];
326	326	}
327	327	return $phrase;
		@@ -333,7 +333,7 @@ discard block
		block discarded – undo
333	333	$urlParams = '';
334	334	}
335	335	$start = '';
336		- if (preg_match ('#^\?(.*)#', $urlParams, $matches)) {
	336	+ if (preg_match('#^\?(.*)#', $urlParams, $matches)) {
337	337	$start = '?';
338	338	$urlParams = $matches[1];
339	339	}

		@@ -19,10 +19,10 @@ discard block
		block discarded – undo
19	19	}
20	20	}
21	21
22		- $expires = 606024*14;
	22	+ $expires = 60 * 60 * 24 * 14;
23	23	header('Pragma: public');
24	24	header('Cache-Control: maxage=' . $expires);
25		- header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
	25	+ header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
26	26	$bookId = getURLParam('id', NULL);
27	27	$type = getURLParam('type', 'jpg');
28	28	$idData = getURLParam('data', NULL);
		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
33	33	}
34	34
35	35	if (!$book) {
36		- notFound ();
	36	+ notFound();
37	37	return;
38	38	}
39	39
		@@ -55,15 +55,15 @@ discard block
		block discarded – undo
55	55	header('Content-Type: image/jpeg');
56	56	//by default, we don't cache
57	57	$thumbnailCacheFullpath = null;
58		- if ( isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '' ) {
	58	+ if (isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '') {
59	59	$thumbnailCacheFullpath = $config['cops_thumbnail_cache_directory'];
60	60	//if multiple databases, add a subfolder with the database ID
61		- $thumbnailCacheFullpath .= !is_null(GetUrlParam (DB)) ? 'db-' . GetUrlParam (DB) . DIRECTORY_SEPARATOR : '';
	61	+ $thumbnailCacheFullpath .= !is_null(GetUrlParam(DB))?'db-' . GetUrlParam(DB) . DIRECTORY_SEPARATOR:'';
62	62	//when there are lots of thumbnails, it's better to save files in subfolders, so if the book's uuid is
63	63	//"01234567-89ab-cdef-0123-456789abcdef", we will save the thumbnail in .../0/12/34567-89ab-cdef-0123-456789abcdef-...
64	64	$thumbnailCacheFullpath .= substr($book->uuid, 0, 1) . DIRECTORY_SEPARATOR . substr($book->uuid, 1, 2) . DIRECTORY_SEPARATOR;
65	65	//check if cache folder exists or create it
66		- if ( file_exists($thumbnailCacheFullpath) \|\| mkdir($thumbnailCacheFullpath, 0700, true) ) {
	66	+ if (file_exists($thumbnailCacheFullpath) \|\| mkdir($thumbnailCacheFullpath, 0700, true)) {
67	67	//we name the thumbnail from the book's uuid and it's dimensions (width and/or height)
68	68	$thumbnailCacheName = substr($book->uuid, 3) . '-' . getURLParam('width') . 'x' . getURLParam('height') . '.jpg';
69	69	$thumbnailCacheFullpath = $thumbnailCacheFullpath . $thumbnailCacheName;
		@@ -73,20 +73,20 @@ discard block
		block discarded – undo
73	73	}
74	74	}
75	75
76		- if ( $thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath) ) {
	76	+ if ($thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath)) {
77	77	//return the already cached thumbnail
78		- readfile( $thumbnailCacheFullpath );
	78	+ readfile($thumbnailCacheFullpath);
79	79	return;
80	80	}
81	81
82		- if ($book->getThumbnail (getURLParam('width'), getURLParam('height'), $thumbnailCacheFullpath)) {
	82	+ if ($book->getThumbnail(getURLParam('width'), getURLParam('height'), $thumbnailCacheFullpath)) {
83	83	//if we don't cache the thumbnail, imagejpeg() in $book->getThumbnail() already return the image data
84		- if ( $thumbnailCacheFullpath === null ) {
	84	+ if ($thumbnailCacheFullpath === null) {
85	85	// The cover had to be resized
86	86	return;
87	87	} else {
88	88	//return the just cached thumbnail
89		- readfile( $thumbnailCacheFullpath );
	89	+ readfile($thumbnailCacheFullpath);
90	90	return;
91	91	}
92	92	}

mbirth / cops

Push — master ( 3facbb...d7e1eb )

Status

Category

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch