Commit ac219874 authored by Franco Fichtner's avatar Franco Fichtner

mvc: apply style

parent cd949343
...@@ -145,7 +145,6 @@ $di->set('router', function () { ...@@ -145,7 +145,6 @@ $di->set('router', function () {
"action" => 2, "action" => 2,
"params" => 3 "params" => 3
)); ));
} }
$router->handle(); $router->handle();
......
...@@ -134,7 +134,6 @@ $di->set('router', function () { ...@@ -134,7 +134,6 @@ $di->set('router', function () {
"action" => 2, "action" => 2,
"params" => 3 "params" => 3
)); ));
} }
$router->handle(); $router->handle();
......
...@@ -199,7 +199,6 @@ class ApiControllerBase extends ControllerRoot ...@@ -199,7 +199,6 @@ class ApiControllerBase extends ControllerRoot
} else { } else {
echo json_encode($data); echo json_encode($data);
} }
} else { } else {
// output raw data // output raw data
echo $data; echo $data;
......
...@@ -71,7 +71,6 @@ class SystemhealthController extends ApiControllerBase ...@@ -71,7 +71,6 @@ class SystemhealthController extends ApiControllerBase
"recorded_time" => ($step * (int)$value->pdp_per_row) * "recorded_time" => ($step * (int)$value->pdp_per_row) *
($this->countRows($value) - $firstValue_rowNumber) ($this->countRows($value) - $firstValue_rowNumber)
]); ]);
} }
} }
return ($info); return ($info);
...@@ -224,7 +223,6 @@ class SystemhealthController extends ApiControllerBase ...@@ -224,7 +223,6 @@ class SystemhealthController extends ApiControllerBase
$last = $rra_info[0]["firstValue_timestamp"]; $last = $rra_info[0]["firstValue_timestamp"];
$first = $rra_info[$last_rra_key]["firstValue_timestamp"] + $rra_info[$last_rra_key]["recorded_time"] - $first = $rra_info[$last_rra_key]["firstValue_timestamp"] + $rra_info[$last_rra_key]["recorded_time"] -
$rra_info[$last_rra_key]["full_step"]; $rra_info[$last_rra_key]["full_step"];
} else { } else {
$first = 0; $first = 0;
$last = 0; $last = 0;
...@@ -370,7 +368,6 @@ class SystemhealthController extends ApiControllerBase ...@@ -370,7 +368,6 @@ class SystemhealthController extends ApiControllerBase
$skip_nan = true; $skip_nan = true;
$condensed_row_values[$count_values][$column_counter] = "NaN"; $condensed_row_values[$count_values][$column_counter] = "NaN";
} elseif ($skip_nan == false) { } elseif ($skip_nan == false) {
if ($archValue["type"] == "overview") { if ($archValue["type"] == "overview") {
// overwrite this values and skip averaging, looks better for overview // overwrite this values and skip averaging, looks better for overview
...@@ -424,12 +421,9 @@ class SystemhealthController extends ApiControllerBase ...@@ -424,12 +421,9 @@ class SystemhealthController extends ApiControllerBase
} }
} }
$rowCount++; $rowCount++;
} }
} }
} }
} }
$key_counter++; $key_counter++;
...@@ -555,7 +549,6 @@ class SystemhealthController extends ApiControllerBase ...@@ -555,7 +549,6 @@ class SystemhealthController extends ApiControllerBase
if (trim((string)$xml->rra[$count]->cf) != "AVERAGE") { if (trim((string)$xml->rra[$count]->cf) != "AVERAGE") {
unset($xml->rra[$count]); unset($xml->rra[$count]);
} }
} }
$data_sets_full = $this->getDataSetInfo($xml); // get dataSet information to include in answer $data_sets_full = $this->getDataSetInfo($xml); // get dataSet information to include in answer
......
...@@ -166,7 +166,6 @@ class ServiceController extends ApiControllerBase ...@@ -166,7 +166,6 @@ class ServiceController extends ApiControllerBase
} else { } else {
$status = "error generating ids template (".$bckresult.")"; $status = "error generating ids template (".$bckresult.")";
} }
} }
return array("status" => $status); return array("status" => $status);
} }
......
...@@ -85,7 +85,6 @@ class SettingsController extends ApiControllerBase ...@@ -85,7 +85,6 @@ class SettingsController extends ApiControllerBase
$cnf->save(); $cnf->save();
$result["result"] = "saved"; $result["result"] = "saved";
} }
} }
return $result; return $result;
......
...@@ -171,7 +171,6 @@ class Radius implements IAuthConnector ...@@ -171,7 +171,6 @@ class Radius implements IAuthConnector
break; break;
default: default:
syslog(LOG_ERR, "Unexpected return value:$radius\n"); syslog(LOG_ERR, "Unexpected return value:$radius\n");
} }
radius_close($radius); radius_close($radius);
} }
...@@ -240,7 +239,6 @@ class Radius implements IAuthConnector ...@@ -240,7 +239,6 @@ class Radius implements IAuthConnector
break; break;
default: default:
syslog(LOG_ERR, "Unexpected return value:$radius\n"); syslog(LOG_ERR, "Unexpected return value:$radius\n");
} }
radius_close($radius); radius_close($radius);
} }
...@@ -310,7 +308,6 @@ class Radius implements IAuthConnector ...@@ -310,7 +308,6 @@ class Radius implements IAuthConnector
break; break;
default: default:
syslog(LOG_ERR, "Unexpected return value:$radius\n"); syslog(LOG_ERR, "Unexpected return value:$radius\n");
} }
radius_close($radius); radius_close($radius);
} }
...@@ -388,7 +385,6 @@ class Radius implements IAuthConnector ...@@ -388,7 +385,6 @@ class Radius implements IAuthConnector
default: default:
break; break;
} }
} }
return true; return true;
break; break;
......
...@@ -119,7 +119,6 @@ class Backend ...@@ -119,7 +119,6 @@ class Backend
$this->getLogger()->error("Timeout (".$timeout.") executing : ".$event); $this->getLogger()->error("Timeout (".$timeout.") executing : ".$event);
return null; return null;
} }
} }
return str_replace($endOfStream, "", $resp); return str_replace($endOfStream, "", $resp);
......
...@@ -189,7 +189,6 @@ abstract class BaseModel ...@@ -189,7 +189,6 @@ abstract class BaseModel
// add object as child to this node // add object as child to this node
$internal_data->addChildNode($xmlNode->getName(), $fieldObject); $internal_data->addChildNode($xmlNode->getName(), $fieldObject);
} }
} }
} }
...@@ -401,7 +400,6 @@ abstract class BaseModel ...@@ -401,7 +400,6 @@ abstract class BaseModel
} else { } else {
$target_node = $target_node->xpath($str_parts[$i])[0]; $target_node = $target_node->xpath($str_parts[$i])[0];
} }
} }
} }
...@@ -466,7 +464,6 @@ abstract class BaseModel ...@@ -466,7 +464,6 @@ abstract class BaseModel
} else { } else {
return null; return null;
} }
} }
return $node; return $node;
} }
......
...@@ -499,8 +499,6 @@ abstract class BaseField ...@@ -499,8 +499,6 @@ abstract class BaseField
foreach ($this->getAttributes() as $AttrKey => $AttrValue) { foreach ($this->getAttributes() as $AttrKey => $AttrValue) {
$subnode->addAttribute($AttrKey, $AttrValue); $subnode->addAttribute($AttrKey, $AttrValue);
} }
} }
foreach ($this->__items as $key => $FieldNode) { foreach ($this->__items as $key => $FieldNode) {
......
...@@ -127,7 +127,6 @@ class ACL ...@@ -127,7 +127,6 @@ class ACL
$this->ACLtags[$aclID] = $aclPayload; $this->ACLtags[$aclID] = $aclPayload;
} }
} }
} }
} }
......
...@@ -67,5 +67,4 @@ class BaseModelTest extends \PHPUnit_Framework_TestCase ...@@ -67,5 +67,4 @@ class BaseModelTest extends \PHPUnit_Framework_TestCase
{ {
BaseModelTest::$model->general->FromEmailXXX = "test@test.nl"; BaseModelTest::$model->general->FromEmailXXX = "test@test.nl";
} }
} }
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
*/ */
namespace tests\OPNsense\Base\FieldTypes; namespace tests\OPNsense\Base\FieldTypes;
/** /**
* Class Field_Framework_TestCase * Class Field_Framework_TestCase
* @package tests\OPNsense\Base\FieldTypes * @package tests\OPNsense\Base\FieldTypes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment