friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changes: 

- added type-hint + intval() (@MrPetovan)
- also changed `if (!$foo == '')` to `if ($foo != '')`
- added some spaces for better readability
pull/1265/head
Roland Häder 2022-06-24 23:34:04 +02:00
parent 3ab46781b1
commit 02d4a560a1
No known key found for this signature in database
GPG Key ID: C82EDE5DDFA0BA77
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
convert/convert.php
View File

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

6
impressum/impressum.php
View File

@ -47,10 +47,10 @@ function impressum_footer(App $a, string &$body)
{ {
$text = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum','footer_text'))); $text = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum','footer_text')));
if (! $text == '') { if ($text != '') {
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/impressum/impressum.css" media="all" />'; 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 class="clear"></div>';
$body .= '<div id="impressum_footer">'.$text.'</div>'; $body .= '<div id="impressum_footer">' . $text . '</div>';
} }
} }