Changes:

- added type-hint + intval() (@MrPetovan)
- also changed `if (!$foo == '')` to `if ($foo != '')`
- added some spaces for better readability

diff --git a/convert/convert.php b/convert/convert.php
index 9c72cbeddc46c8d21f8eddd6a745a305dbebda94..53e6d2d3a94cd689724c2a5a11c2a14669a2100d 100644 (file)
--- a/convert/convert.php
+++ b/convert/convert.php
@@ -44,15 +44,15 @@ function convert_content(App $a) {
                private function findBaseUnit($from, $to)
                {
                        while (list($skey, $sval) = each($this->bases)) {
-                                       if ($skey == $from || $to == $skey || in_array($to, $sval) || in_array($from, $sval)) {
-                                               return $skey;
-                                       }
+                               if ($skey == $from || $to == $skey || in_array($to, $sval) || in_array($from, $sval)) {
+                                       return $skey;
+                               }
                        }
 
                        return false;
                }
 
-               public function getTable($value, $from_unit, $to_unit, $precision): string
+               public function getTable(int $value, $from_unit, $to_unit, $precision): string
                {
                        $string = '';
 
@@ -176,10 +176,10 @@ function convert_content(App $a) {
                ]
        ];
 
-       while (list($key,$val) = each($conversions)) {
+       while (list($key, $val) = each($conversions)) {
                $conv->addConversion($val['base'], $val['conv']);
                $list[$key][] = $val['base'];
-               while (list($ukey,$uval) = each($val['conv'])) {
+               while (list($ukey, $uval) = each($val['conv'])) {
                        $list[$key][] = $ukey;
                }
        }
@@ -187,8 +187,7 @@ function convert_content(App $a) {
        $o .= '<h3>Unit Conversions</h3>';
 
        if (isset($_POST['from_unit']) && isset($_POST['value'])) {
-               $_POST['value'] = $_POST['value'] + 0;
-               $o .= ($conv->getTable($_POST['value'], $_POST['from_unit'], $_POST['to_unit'], 5)) . '</p>';
+               $o .= ($conv->getTable(intval($_POST['value']), $_POST['from_unit'], $_POST['to_unit'], 5)) . '</p>';
        } else {
                $o .= '<p>Select:</p>';
        }
@@ -204,9 +203,9 @@ function convert_content(App $a) {
        $o .= '<select name="from_unit" size="12">';
 
        reset($list);
-       while(list($key,$val) = each($list)) {
+       while(list($key, $val) = each($list)) {
                $o .=  "\n\t<optgroup label=\"$key\">";
-               while(list($ukey,$uval) = each($val)) {
+               while(list($ukey, $uval) = each($val)) {
                        $selected = (($uval == $_POST['from_unit']) ? ' selected="selected" ' : '');
                        $o .=  "\n\t\t<option value=\"$uval\" $selected >$uval</option>";
                }

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 8a0543603d959e24272f4def71b70ab3c77c0abe..3fba0085130af81cc40e7f7c1c4abd4934bdab2a 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -47,10 +47,10 @@ function impressum_footer(App $a, string &$body)
 {
        $text = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum','footer_text')));
 
-       if (! $text == '') {
-               DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/impressum/impressum.css" media="all" />';
+       if ($text != '') {
+               DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/impressum/impressum.css" media="all" />';
                $body .= '<div class="clear"></div>';
-               $body .= '<div id="impressum_footer">'.$text.'</div>';
+               $body .= '<div id="impressum_footer">' . $text . '</div>';
        }
 }