ejessyp / flowerflow

htdocs/cimage/img.php

Spacing +63 added lines, -63 removed lines

@@ -11,7 +11,7 @@ 
 /**
  * Custom exception handler.
  */
-set_exception_handler(function ($exception) {
+set_exception_handler(function($exception) {
     errorPage(
         "<p><b>img.php: Uncaught exception:</b> <p>"
         . $exception->getMessage()
@@ -28,7 +28,7 @@ 
  * Get configuration options from file, if the file exists, else use $config
  * if its defined or create an empty $config.
  */
-$configFile = __DIR__.'/'.basename(__FILE__, '.php').'_config.php';
+$configFile = __DIR__ . '/' . basename(__FILE__, '.php') . '_config.php';
 
 if (is_file($configFile)) {
     $config = require $configFile;
@@ -47,11 +47,11 @@ 
  * Setup the autoloader, but not when using a bundle.
  */
 if (!defined("CIMAGE_BUNDLE")) {
-    if (!isset($config["autoloader"])) {
+    if (!isset($config[ "autoloader" ])) {
         die("CImage: Missing autoloader.");
     }
 
-    require $config["autoloader"];
+    require $config[ "autoloader" ];
 }
 
 
@@ -88,7 +88,7 @@ 
 }
 
 // Specific settings for each mode
-if ($mode == 'strict') {
+if ($mode=='strict') {
 
     error_reporting(0);
     ini_set('display_errors', 0);
@@ -97,7 +97,7 @@ 
     $status = false;
     $verboseFile = false;
 
-} elseif ($mode == 'production') {
+} elseif ($mode=='production') {
 
     error_reporting(-1);
     ini_set('display_errors', 0);
@@ -106,14 +106,14 @@ 
     $status = false;
     $verboseFile = false;
 
-} elseif ($mode == 'development') {
+} elseif ($mode=='development') {
 
     error_reporting(-1);
     ini_set('display_errors', 1);
     ini_set('log_errors', 0);
     $verboseFile = false;
 
-} elseif ($mode == 'test') {
+} elseif ($mode=='test') {
 
     error_reporting(-1);
     ini_set('display_errors', 1);
@@ -155,20 +155,20 @@ 
 if ($pwd) {
     switch ($pwdType) {
         case 'md5':
-            $passwordMatch = ($pwdConfig === md5($pwd));
+            $passwordMatch = ($pwdConfig===md5($pwd));
             break;
         case 'hash':
             $passwordMatch = password_verify($pwd, $pwdConfig);
             break;
         case 'text':
-            $passwordMatch = ($pwdConfig === $pwd);
+            $passwordMatch = ($pwdConfig===$pwd);
             break;
         default:
             $passwordMatch = false;
     }
 }
 
-if ($pwdAlways && $passwordMatch !== true) {
+if ($pwdAlways && $passwordMatch!==true) {
     errorPage("Password required and does not match or exists.", 403);
 }
 
@@ -184,19 +184,19 @@ 
 $allowHotlinking = getConfig('allow_hotlinking', true);
 $hotlinkingWhitelist = getConfig('hotlinking_whitelist', array());
 
-$serverName  = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
-$referer     = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
+$serverName  = isset($_SERVER[ 'SERVER_NAME' ]) ? $_SERVER[ 'SERVER_NAME' ] : null;
+$referer     = isset($_SERVER[ 'HTTP_REFERER' ]) ? $_SERVER[ 'HTTP_REFERER' ] : null;
 $refererHost = parse_url($referer, PHP_URL_HOST);
 
 if (!$allowHotlinking) {
     if ($passwordMatch) {
         ; // Always allow when password match
         verbose("Hotlinking since passwordmatch");
-    } elseif ($passwordMatch === false) {
+    } elseif ($passwordMatch===false) {
         errorPage("Hotlinking/leeching not allowed when password missmatch.", 403);
     } elseif (!$referer) {
         errorPage("Hotlinking/leeching not allowed and referer is missing.", 403);
-    } elseif (strcmp($serverName, $refererHost) == 0) {
+    } elseif (strcmp($serverName, $refererHost)==0) {
         ; // Allow when serverName matches refererHost
         verbose("Hotlinking disallowed but serverName matches refererHost.");
     } elseif (!empty($hotlinkingWhitelist)) {
@@ -283,7 +283,7 @@ 
  */
 $allowRemote = getConfig('remote_allow', false);
 
-if ($allowRemote && $passwordMatch !== false) {
+if ($allowRemote && $passwordMatch!==false) {
     $cacheRemote = $cache->getPathToSubdir("remote");
     
     $pattern = getConfig('remote_pattern', null);
@@ -307,10 +307,10 @@ 
 verbose("shortcut = $shortcut");
 
 if (isset($shortcut)
-    && isset($shortcutConfig[$shortcut])) {
+    && isset($shortcutConfig[ $shortcut ])) {
 
-    parse_str($shortcutConfig[$shortcut], $get);
-    verbose("shortcut-constant = {$shortcutConfig[$shortcut]}");
+    parse_str($shortcutConfig[ $shortcut ], $get);
+    verbose("shortcut-constant = {$shortcutConfig[ $shortcut ]}");
     $_GET = array_merge($_GET, $get);
 }
 
@@ -345,7 +345,7 @@ 
 preg_match($validFilename, $srcImage)
     or errorPage('Source filename contains invalid characters.', 404);
 
-if ($dummyEnabled && $srcImage === $dummyFilename) {
+if ($dummyEnabled && $srcImage===$dummyFilename) {
 
     // Prepare to create a dummy image and use it as the source image.
     $dummyImage = true;
@@ -368,7 +368,7 @@ 
         preg_match($validFilename, $srcImage)
             or errorPage('Source (alt) filename contains invalid characters.', 404);
 
-        if ($dummyEnabled && $srcImage === $dummyFilename) {
+        if ($dummyEnabled && $srcImage===$dummyFilename) {
             // Check if src-alt is the dummy image
             $dummyImage = true;
         }
@@ -388,7 +388,7 @@ 
     // Check that the image is a file below the directory 'image_path'.
     $imageDir = realpath($imagePath);
 
-    substr_compare($imageDir, $pathToImage, 0, strlen($imageDir)) == 0
+    substr_compare($imageDir, $pathToImage, 0, strlen($imageDir))==0
         or errorPage(
             'Security constraint: Source image is not below the directory "image_path"
             as specified in the config file img_config.php.',
@@ -404,7 +404,7 @@ 
  * Manage size constants from config file, use constants to replace values
  * for width and height.
  */
-$sizeConstant = getConfig('size_constant', function () {
+$sizeConstant = getConfig('size_constant', function() {
 
     // Set sizes to map constant to value, easier to use with width or height
     $sizes = array(
@@ -418,7 +418,7 @@ 
     $gridColumns     = 24;
 
     for ($i = 1; $i <= $gridColumns; $i++) {
-        $sizes['c' . $i] = ($gridColumnWidth + $gridGutterWidth) * $i - $gridGutterWidth;
+        $sizes[ 'c' . $i ] = ($gridColumnWidth + $gridGutterWidth)*$i - $gridGutterWidth;
     }
 
     return $sizes;
@@ -435,12 +435,12 @@ 
 $maxWidth     = getConfig('max_width', 2000);
 
 // Check to replace predefined size
-if (isset($sizes[$newWidth])) {
-    $newWidth = $sizes[$newWidth];
+if (isset($sizes[ $newWidth ])) {
+    $newWidth = $sizes[ $newWidth ];
 }
 
 // Support width as % of original width
-if ($newWidth && $newWidth[strlen($newWidth)-1] == '%') {
+if ($newWidth && $newWidth[ strlen($newWidth) - 1 ]=='%') {
     is_numeric(substr($newWidth, 0, -1))
         or errorPage('Width % not numeric.', 404);
 } else {
@@ -460,12 +460,12 @@ 
 $maxHeight = getConfig('max_height', 2000);
 
 // Check to replace predefined size
-if (isset($sizes[$newHeight])) {
-    $newHeight = $sizes[$newHeight];
+if (isset($sizes[ $newHeight ])) {
+    $newHeight = $sizes[ $newHeight ];
 }
 
 // height
-if ($newHeight && $newHeight[strlen($newHeight)-1] == '%') {
+if ($newHeight && $newHeight[ strlen($newHeight) - 1 ]=='%') {
     is_numeric(substr($newHeight, 0, -1))
         or errorPage('Height % out of range.', 404);
 } else {
@@ -482,7 +482,7 @@ 
  * aspect-ratio, ar - affecting the resulting image width, height and resize options
  */
 $aspectRatio         = get(array('aspect-ratio', 'ar'));
-$aspectRatioConstant = getConfig('aspect_ratio_constant', function () {
+$aspectRatioConstant = getConfig('aspect_ratio_constant', function() {
     return array(
         '3:1'    => 3/1,
         '3:2'    => 3/2,
@@ -496,15 +496,15 @@ 
 
 // Check to replace predefined aspect ratio
 $aspectRatios = call_user_func($aspectRatioConstant);
-$negateAspectRatio = ($aspectRatio && $aspectRatio[0] == '!') ? true : false;
+$negateAspectRatio = ($aspectRatio && $aspectRatio[ 0 ]=='!') ? true : false;
 $aspectRatio = $negateAspectRatio ? substr($aspectRatio, 1) : $aspectRatio;
 
-if (isset($aspectRatios[$aspectRatio])) {
-    $aspectRatio = $aspectRatios[$aspectRatio];
+if (isset($aspectRatios[ $aspectRatio ])) {
+    $aspectRatio = $aspectRatios[ $aspectRatio ];
 }
 
 if ($negateAspectRatio) {
-    $aspectRatio = 1 / $aspectRatio;
+    $aspectRatio = 1/$aspectRatio;
 }
 
 is_null($aspectRatio)
@@ -565,10 +565,10 @@ 
 
 verbose("fill-to-fit = $fillToFit");
 
-if ($fillToFit !== null) {
+if ($fillToFit!==null) {
 
     if (!empty($fillToFit)) {
-        $bgColor   = $fillToFit;
+        $bgColor = $fillToFit;
         verbose("fillToFit changed bgColor to = $bgColor");
     }
 
@@ -611,7 +611,7 @@ 
 $useOriginal = getDefined(array('skip-original', 'so'), false, true);
 $useOriginalDefault = getConfig('skip_original', false);
 
-if ($useOriginalDefault === true) {
+if ($useOriginalDefault===true) {
     verbose("skip original is default ON");
     $useOriginal = false;
 }
@@ -755,13 +755,13 @@ 
 $filters = array();
 $filter = get(array('filter', 'f'));
 if ($filter) {
-    $filters[] = $filter;
+    $filters[ ] = $filter;
 }
 
 for ($i = 0; $i < 10; $i++) {
     $filter = get(array("filter{$i}", "f{$i}"));
     if ($filter) {
-        $filters[] = $filter;
+        $filters[ ] = $filter;
     }
 }
 
@@ -778,7 +778,7 @@ 
 
 verbose("outputformat = $outputFormat");
 
-if ($outputFormat == 'ascii') {
+if ($outputFormat=='ascii') {
     $defaultOptions = getConfig(
         'ascii-options',
         array(
@@ -791,25 +791,25 @@ 
     $options = get('ascii');
     $options = explode(',', $options);
 
-    if (isset($options[0]) && !empty($options[0])) {
-        $defaultOptions['characterSet'] = $options[0];
+    if (isset($options[ 0 ]) && !empty($options[ 0 ])) {
+        $defaultOptions[ 'characterSet' ] = $options[ 0 ];
     }
 
-    if (isset($options[1]) && !empty($options[1])) {
-        $defaultOptions['scale'] = $options[1];
+    if (isset($options[ 1 ]) && !empty($options[ 1 ])) {
+        $defaultOptions[ 'scale' ] = $options[ 1 ];
     }
 
-    if (isset($options[2]) && !empty($options[2])) {
-        $defaultOptions['luminanceStrategy'] = $options[2];
+    if (isset($options[ 2 ]) && !empty($options[ 2 ])) {
+        $defaultOptions[ 'luminanceStrategy' ] = $options[ 2 ];
     }
 
     if (count($options) > 3) {
         // Last option is custom character string
-        unset($options[0]);
-        unset($options[1]);
-        unset($options[2]);
+        unset($options[ 0 ]);
+        unset($options[ 1 ]);
+        unset($options[ 2 ]);
         $characterString = implode($options);
-        $defaultOptions['customCharacterSet'] = $characterString;
+        $defaultOptions[ 'customCharacterSet' ] = $characterString;
     }
 
     $img->setAsciiOptions($defaultOptions);
@@ -923,7 +923,7 @@ 
 /**
  * Prepare a dummy image and use it as source image.
  */
-if ($dummyImage === true) {
+if ($dummyImage===true) {
     $dummyDir = $cache->getPathToSubdir("dummy");
 
     $img->setSaveFolder($dummyDir)
@@ -983,7 +983,7 @@ 
 if ($status) {
     $text  = "img.php version = " . CIMAGE_VERSION . "\n";
     $text .= "PHP version = " . PHP_VERSION . "\n";
-    $text .= "Running on: " . $_SERVER['SERVER_SOFTWARE'] . "\n";
+    $text .= "Running on: " . $_SERVER[ 'SERVER_SOFTWARE' ] . "\n";
     $text .= "Allow remote images = $allowRemote\n";
 
     $res = $cache->getStatusOfSubdir("");
@@ -1015,10 +1015,10 @@ 
     $no = extension_loaded('gd') ? null : 'NOT';
     $text .= "Extension gd is $no loaded.<br>";
 
-    $text .= checkExternalCommand("PNG LOSSY", $postProcessing["png_lossy"], $postProcessing["png_lossy_cmd"]);
-    $text .= checkExternalCommand("PNG FILTER", $postProcessing["png_filter"], $postProcessing["png_filter_cmd"]);
-    $text .= checkExternalCommand("PNG DEFLATE", $postProcessing["png_deflate"], $postProcessing["png_deflate_cmd"]);
-    $text .= checkExternalCommand("JPEG OPTIMIZE", $postProcessing["jpeg_optimize"], $postProcessing["jpeg_optimize_cmd"]);
+    $text .= checkExternalCommand("PNG LOSSY", $postProcessing[ "png_lossy" ], $postProcessing[ "png_lossy_cmd" ]);
+    $text .= checkExternalCommand("PNG FILTER", $postProcessing[ "png_filter" ], $postProcessing[ "png_filter_cmd" ]);
+    $text .= checkExternalCommand("PNG DEFLATE", $postProcessing[ "png_deflate" ], $postProcessing[ "png_deflate_cmd" ]);
+    $text .= checkExternalCommand("JPEG OPTIMIZE", $postProcessing[ "jpeg_optimize" ], $postProcessing[ "jpeg_optimize_cmd" ]);
 
     if (!$no) {
         $text .= print_r(gd_info(), 1);
@@ -1101,12 +1101,12 @@ 
  */
 if ($verbose) {
     $query = array();
-    parse_str($_SERVER['QUERY_STRING'], $query);
-    unset($query['verbose']);
-    unset($query['v']);
-    unset($query['nocache']);
-    unset($query['nc']);
-    unset($query['json']);
+    parse_str($_SERVER[ 'QUERY_STRING' ], $query);
+    unset($query[ 'verbose' ]);
+    unset($query[ 'v' ]);
+    unset($query[ 'nocache' ]);
+    unset($query[ 'nc' ]);
+    unset($query[ 'json' ]);
     $url1 = '?' . htmlentities(urldecode(http_build_query($query)));
     $url2 = '?' . urldecode(http_build_query($query));
     echo <<<EOD

view/user/login.php

Spacing +2 added lines, -2 removed lines

@@ -10,9 +10,9 @@
 //echo showEnvironment(get_defined_vars(), get_defined_functions());
 
 // Prepare classes
-$classes[] = "article";
+$classes[ ] = "article";
 if (isset($class)) {
-    $classes[] = $class;
+    $classes[ ] = $class;
 }
 ?>
 <article <?= classList($classes) ?>>

src/function.php

Spacing +9 added lines, -9 removed lines

@@ -9,8 +9,8 @@ 
  */
 function getGet($key, $default = null)
 {
-    return isset($_GET[$key])
-        ? $_GET[$key]
+    return isset($_GET[ $key ])
+        ? $_GET[ $key ]
         : $default;
 }
 
@@ -30,8 +30,8 @@ 
         return array_replace($key, array_intersect_key($_POST, $key));
     }
 
-    return isset($_POST[$key])
-        ? $_POST[$key]
+    return isset($_POST[ $key ])
+        ? $_POST[ $key ]
         : $default;
 }
 
@@ -66,8 +66,8 @@ 
  */
 function orderby2($column, $route)
 {
-    $asc = mergeQueryString(["orderby" => $column, "order" => "asc"], $route);
-    $desc = mergeQueryString(["orderby" => $column, "order" => "desc"], $route);
+    $asc = mergeQueryString([ "orderby" => $column, "order" => "asc" ], $route);
+    $desc = mergeQueryString([ "orderby" => $column, "order" => "desc" ], $route);
 
     return <<<EOD
 <span class="orderby">
@@ -92,8 +92,8 @@ 
 function mergeQueryString($options, $prepend = "?")
 {
     // Parse querystring into array
-    $query = [];
-    parse_str($_SERVER["QUERY_STRING"], $query);
+    $query = [ ];
+    parse_str($_SERVER[ "QUERY_STRING" ], $query);
 
     // Merge query string with new options
     $query = array_merge($query, $options);
@@ -141,7 +141,7 @@ 
 function slugify($str)
 {
     $str = mb_strtolower(trim($str));
-    $str = str_replace(['å','ä'], 'a', $str);
+    $str = str_replace([ 'å', 'ä' ], 'a', $str);
     $str = str_replace('ö', 'o', $str);
     $str = preg_replace('/[^a-z0-9-]/', '-', $str);
     $str = trim(preg_replace('/-+/', '-', $str), '-');

src/Page/Page.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
      */
     public function add(
         $template,
-        array $data = [],
+        array $data = [ ],
         string $region = "main",
         int $sort = 0
     ) : object {
@@ -71,7 +71,7 @@ 
      *
      * @return object
      */
-    public function render(array $data = [], int $status = 200)
+    public function render(array $data = [ ], int $status = 200)
     {
         $view = $this->di->get("view");
         $view->add($this->layout, $data, "layout");

src/Controller/ErrorHandlerController.php

Spacing +3 added lines, -3 removed lines

@@ -51,13 +51,13 @@
         $page->add(
             "anax/v2/error/default",
             [
-                "header" => $pages[$path][0],
-                "text" => $pages[$path][1],
+                "header" => $pages[ $path ][ 0 ],
+                "text" => $pages[ $path ][ 1 ],
             ]
         );
 
         return $page->render([
-            "title" => $pages[$path][0]
+            "title" => $pages[ $path ][ 0 ]
         ], $path);
     }
 }

src/Controller/FlatFileContentController.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
         $content = file_get_contents($file);
         $content = $this->di->get("textfilter")->parse(
             $content,
-            ["frontmatter", "variable", "shortcode", "markdown", "titlefromheader"]
+            [ "frontmatter", "variable", "shortcode", "markdown", "titlefromheader" ]
         );
 
         // Add content as a view and then render the page

src/Controller/DevelopmentController.php

Spacing +2 added lines, -2 removed lines

@@ -47,14 +47,14 @@
 
         $page = $this->di->get("page");
         $page->add(
-            "anax/v2/dev/{$pages[$path]}",
+            "anax/v2/dev/{$pages[ $path ]}",
             [
                 "mount" => "dev/"
             ]
         );
 
         return $page->render([
-            "title" => ucfirst($pages[$path]),
+            "title" => ucfirst($pages[ $path ]),
             "baseTitle" => " | Anax development utilities"
         ]);
     }

src/User/HTMLForm/UserLoginForm.php

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
                 "submit" => [
                     "type" => "submit",
                     "value" => "Login",
-                    "callback" => [$this, "callbackSubmit"]
+                    "callback" => [ $this, "callbackSubmit" ]
                 ],
             ]
         );
@@ -58,8 +58,8 @@ 
     public function callbackSubmit()
     {
         // Get values from the submitted form
-        $username       = $this->form->value("username");
-        $password      = $this->form->value("password");
+        $username = $this->form->value("username");
+        $password = $this->form->value("password");
 
         // Try to login
         $user = new User();

src/User/HTMLForm/CreateUserForm.php

Spacing +6 added lines, -6 removed lines

@@ -43,13 +43,13 @@ 
                 "email" => [
                     "type" =>"email",
                     "label" => "Email",
-                    "validation" => ["email"],
+                    "validation" => [ "email" ],
                 ],
 
                 "submit" => [
                     "type" => "submit",
                     "value" => "Register",
-                    "callback" => [$this, "callbackSubmit"]
+                    "callback" => [ $this, "callbackSubmit" ]
                 ],
             ]
         );
@@ -66,13 +66,13 @@ 
     public function callbackSubmit() : bool
     {
         // Get values from the submitted form
-        $username       = $this->form->value("username");
+        $username = $this->form->value("username");
         $password      = $this->form->value("password");
         $passwordAgain = $this->form->value("password-again");
         $email         = $this->form->value("email");
 
         // Check password matches
-        if ($password !== $passwordAgain ) {
+        if ($password!==$passwordAgain) {
             $this->form->rememberValues();
             $this->form->addOutput("Password did not match.");
             return false;
@@ -82,8 +82,8 @@ 
         $db = $this->di->get("dbqb");
         $password = password_hash($password, PASSWORD_DEFAULT);
         $db->connect()
-        ->insert("users", ["username", "password", "email"])
-        ->execute([$username, $password, $email]);
+        ->insert("users", [ "username", "password", "email" ])
+        ->execute([ $username, $password, $email ]);
 
         // $this->form->addOutput("User was created.");
         return true;