clean code

This commit is contained in:
CHIEFSOFT\ameye
2024-07-04 21:26:09 -04:00
parent ea0dba9f9d
commit 60ef644862
3 changed files with 43 additions and 36 deletions
+15 -14
View File
@@ -654,8 +654,8 @@ class WrenchApi extends BaseController
}
if ( $call_backend == true && $in["action"] !='' ){
$wrenchboard = new \App\Models\BackendModel();
$ret = $wrenchboard->wrenchboard_api($in, $out);
// $wrenchboard = new \App\Models\BackendModel();
$ret = $this->wrenchboard->wrenchboard_api($in, $out);
$out['internal_return'] = $ret;
}
else
@@ -664,18 +664,19 @@ class WrenchApi extends BaseController
}
$this->doCacheStep($in, $out);
$final_out = ( new \App\Models\ResultFormatter() )->processOutJson($in, $out);
$final_out["environment"] = $current_env + 0; // force convert to interger = $this->getSiteConfigurations("system.live");
$final_out["session_image_server"] = $primary_image_sever; // ( $final_out["environment"] > 0 )? 'https://apigate.nebula.g1.wrenchboard.com/en/wrench/api/v1/getmedia/' : "https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/getmedia/";
//$final_out["session_image_server"] = "https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/getmedia/";
$final_out["server_tag"] = $server_tag;
$final_out["language"] = "en";
$final_out["ip_loc"] = $ip_loc;
$final_out["current_version"] = 20240306;
$final_out["family_types"] = $this->familyTypes();
$final_out["history_types"] = $this->historyTypes();
//return json_encode( ( new \App\Models\ResultFormatter() )->processOutJson($in, $out));
return json_encode( $final_out );
// $final_out = ( new \App\Models\ResultFormatter() )->processOutJson($in, $out);
// $final_out["environment"] = $current_env + 0; // force convert to interger = $this->getSiteConfigurations("system.live");
// $final_out["session_image_server"] = $primary_image_sever; // ( $final_out["environment"] > 0 )? 'https://apigate.nebula.g1.wrenchboard.com/en/wrench/api/v1/getmedia/' : "https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/getmedia/";
// //$final_out["session_image_server"] = "https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/getmedia/";
// $final_out["server_tag"] = $server_tag;
// $final_out["language"] = "en";
// $final_out["ip_loc"] = $ip_loc;
// $final_out["current_version"] = 20240306;
// $final_out["family_types"] = $this->familyTypes();
// $final_out["history_types"] = $this->historyTypes();
// //return json_encode( ( new \App\Models\ResultFormatter() )->processOutJson($in, $out));
return $this->summaryReturnData($in,$out); //json_encode( $final_out );
}
private function childBanners(): array