[FIX] Firmware für Router mit dem Namen "-gl-inet-" wird nun als "GL-Inet (alt)" angezeigt und Firmware mit nur "-gl-" als "GL-Inet", da das "inet" im Namen der Firmware der aktuellen Router fehlt.
This commit is contained in:
Caspar Armster
parent
1adea2e18e
commit
b38564632f
@ -55,6 +55,12 @@
|
|||||||
),
|
),
|
||||||
array(
|
array(
|
||||||
"name" => "GL-Inet",
|
"name" => "GL-Inet",
|
||||||
|
"filename" => "-gl-",
|
||||||
|
"offset_modell" => 3,
|
||||||
|
"offset_version" => 4
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
"name" => "GL-Inet (alt)",
|
||||||
"filename" => "gl-inet",
|
"filename" => "gl-inet",
|
||||||
"offset_modell" => 8,
|
"offset_modell" => 8,
|
||||||
"offset_version" => -1
|
"offset_version" => -1
|
||||||
|
|||||||
@ -5,119 +5,119 @@
|
|||||||
* @license Licensed under GPLv3
|
* @license Licensed under GPLv3
|
||||||
*/
|
*/
|
||||||
if(!is_dir($firmware_download_path)) {
|
if(!is_dir($firmware_download_path)) {
|
||||||
throw new Exception("Firmwareverzeichnis existiert nicht!");
|
throw new Exception("Firmwareverzeichnis existiert nicht!");
|
||||||
}
|
}
|
||||||
$err = 0;
|
$err = 0;
|
||||||
for( $i=0; $i<count($entwicklung); $i++ ) {
|
for( $i=0; $i<count($entwicklung); $i++ ) {
|
||||||
for( $j=0; $j<count($installation); $j++ ) {
|
for( $j=0; $j<count($installation); $j++ ) {
|
||||||
if(is_dir($firmware_download_path.$entwicklung[$i]."/")) {
|
if(is_dir($firmware_download_path.$entwicklung[$i]."/")) {
|
||||||
if(is_dir($firmware_download_path.$entwicklung[$i]."/".$installation[$j]."/")) {
|
if(is_dir($firmware_download_path.$entwicklung[$i]."/".$installation[$j]."/")) {
|
||||||
$variante[$entwicklung[$i]][$installation[$j]] = 1;
|
$variante[$entwicklung[$i]][$installation[$j]] = 1;
|
||||||
$files[$entwicklung[$i]][$installation[$j]] = array_slice(scandir($firmware_download_path.$entwicklung[$i]."/".$installation[$j]."/"), 2);
|
$files[$entwicklung[$i]][$installation[$j]] = array_slice(scandir($firmware_download_path.$entwicklung[$i]."/".$installation[$j]."/"), 2);
|
||||||
for( $x=0; $x<count($files[$entwicklung[$i]][$installation[$j]]); $x++ ) {
|
for( $x=0; $x<count($files[$entwicklung[$i]][$installation[$j]]); $x++ ) {
|
||||||
if(is_dir($firmware_download_path.$entwicklung[$i]."/".$installation[$j]."/".$files[$entwicklung[$i]][$installation[$j]][$x])) {
|
if(is_dir($firmware_download_path.$entwicklung[$i]."/".$installation[$j]."/".$files[$entwicklung[$i]][$installation[$j]][$x])) {
|
||||||
array_splice($files[$entwicklung[$i]][$installation[$j]], $x, 1);
|
array_splice($files[$entwicklung[$i]][$installation[$j]], $x, 1);
|
||||||
$x--;
|
$x--;
|
||||||
} else {
|
} else {
|
||||||
$pos = stripos($files[$entwicklung[$i]][$installation[$j]][$x], 'manifest');
|
$pos = stripos($files[$entwicklung[$i]][$installation[$j]][$x], 'manifest');
|
||||||
if($pos !== false) {
|
if($pos !== false) {
|
||||||
array_splice($files[$entwicklung[$i]][$installation[$j]], $x, 1);
|
array_splice($files[$entwicklung[$i]][$installation[$j]], $x, 1);
|
||||||
$x--;
|
$x--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for( $i=0; $i<count($entwicklung); $i++ ) {
|
for( $i=0; $i<count($entwicklung); $i++ ) {
|
||||||
for( $j=0; $j<count($installation); $j++ ) {
|
for( $j=0; $j<count($installation); $j++ ) {
|
||||||
if($variante[$entwicklung[$i]][$installation[$j]] == 1) {
|
if($variante[$entwicklung[$i]][$installation[$j]] == 1) {
|
||||||
$x = 0;
|
$x = 0;
|
||||||
while($files[$entwicklung[$i]][$installation[$j]][$x] !== false) {
|
while($files[$entwicklung[$i]][$installation[$j]][$x] !== false) {
|
||||||
$pos_hersteller[$entwicklung[$i]][$installation[$j]] = stripos($files[$entwicklung[$i]][$installation[$j]][$x], "tp-link");
|
$pos_hersteller[$entwicklung[$i]][$installation[$j]] = stripos($files[$entwicklung[$i]][$installation[$j]][$x], "tp-link");
|
||||||
if ($pos_hersteller[$entwicklung[$i]][$installation[$j]] !== false) {
|
if ($pos_hersteller[$entwicklung[$i]][$installation[$j]] !== false) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
$x++;
|
$x++;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$pos_hersteller[$entwicklung[$i]][$installation[$j]] = 0;
|
$pos_hersteller[$entwicklung[$i]][$installation[$j]] = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$router = array();
|
$router = array();
|
||||||
for( $i=0; $i<count($entwicklung); $i++ ) {
|
for( $i=0; $i<count($entwicklung); $i++ ) {
|
||||||
for( $j=0; $j<count($installation); $j++ ) {
|
for( $j=0; $j<count($installation); $j++ ) {
|
||||||
if($variante[$entwicklung[$i]][$installation[$j]] == 1) {
|
if($variante[$entwicklung[$i]][$installation[$j]] == 1) {
|
||||||
for( $x=0; $x<count($files[$entwicklung[$i]][$installation[$j]]); $x++) {
|
for( $x=0; $x<count($files[$entwicklung[$i]][$installation[$j]]); $x++) {
|
||||||
for( $y=0; $y<$anzahl_hersteller; $y++) {
|
for( $y=0; $y<$anzahl_hersteller; $y++) {
|
||||||
if($pos = stripos($files[$entwicklung[$i]][$installation[$j]][$x], $hersteller[$y]['filename'], $pos_hersteller[$entwicklung[$i]][$installation[$j]]-1) !== false) {
|
if($pos = stripos($files[$entwicklung[$i]][$installation[$j]][$x], $hersteller[$y]['filename'], $pos_hersteller[$entwicklung[$i]][$installation[$j]]-1) !== false) {
|
||||||
$router_tmp[$x]['hersteller'] = $hersteller[$y]['name'];
|
$router_tmp[$x]['hersteller'] = $hersteller[$y]['name'];
|
||||||
switch($router_tmp[$x]['hersteller']) {
|
switch($router_tmp[$x]['hersteller']) {
|
||||||
case "D-Link":
|
case "D-Link":
|
||||||
$router_tmp[$x]['version'] = substr($files[$entwicklung[$i]][$installation[$j]][$x], strripos($files[$entwicklung[$i]][$installation[$j]][$x], "rev"), -4-$offset_sysupgrade[$j]);
|
$router_tmp[$x]['version'] = substr($files[$entwicklung[$i]][$installation[$j]][$x], strripos($files[$entwicklung[$i]][$installation[$j]][$x], "rev"), -4-$offset_sysupgrade[$j]);
|
||||||
break;
|
break;
|
||||||
case "GL-Inet":
|
case "GL-Inet (alt)":
|
||||||
$router_tmp[$x]['version'] = substr($files[$entwicklung[$i]][$installation[$j]][$x], strripos($files[$entwicklung[$i]][$installation[$j]][$x], "v"), -4-$offset_sysupgrade[$j]);
|
$router_tmp[$x]['version'] = substr($files[$entwicklung[$i]][$installation[$j]][$x], strripos($files[$entwicklung[$i]][$installation[$j]][$x], "v"), -4-$offset_sysupgrade[$j]);
|
||||||
break;
|
break;
|
||||||
case "TP-Link":
|
case "TP-Link":
|
||||||
$router_tmp[$x]['version'] = substr($files[$entwicklung[$i]][$installation[$j]][$x], strripos($files[$entwicklung[$i]][$installation[$j]][$x], "v"), -4-$offset_sysupgrade[$j]);
|
$router_tmp[$x]['version'] = substr($files[$entwicklung[$i]][$installation[$j]][$x], strripos($files[$entwicklung[$i]][$installation[$j]][$x], "v"), -4-$offset_sysupgrade[$j]);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$router_tmp[$x]['version'] = "Alle";
|
$router_tmp[$x]['version'] = "Alle";
|
||||||
}
|
}
|
||||||
$router_tmp[$x]['modell'] = strtoupper(substr($files[$entwicklung[$i]][$installation[$j]][$x], $pos_hersteller[$entwicklung[$i]][$installation[$j]]+$hersteller[$y]['offset_modell'], strripos($files[$entwicklung[$i]][$installation[$j]][$x], ".", -4)-strlen($files[$entwicklung[$i]][$installation[$j]][$x])-strlen($router_tmp[$x]['version'])+$hersteller[$y]['offset_version']-$offset_sysupgrade[$j]));
|
$router_tmp[$x]['modell'] = strtoupper(substr($files[$entwicklung[$i]][$installation[$j]][$x], $pos_hersteller[$entwicklung[$i]][$installation[$j]]+$hersteller[$y]['offset_modell'], strripos($files[$entwicklung[$i]][$installation[$j]][$x], ".", -4)-strlen($files[$entwicklung[$i]][$installation[$j]][$x])-strlen($router_tmp[$x]['version'])+$hersteller[$y]['offset_version']-$offset_sysupgrade[$j]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(isset($router_tmp[$x]['hersteller']) != true) {
|
if(isset($router_tmp[$x]['hersteller']) != true) {
|
||||||
$error_text[$err]="Unbekannten Hersteller im Dateinamen gefunden, bitte Script updaten! (".$files[$entwicklung[$i]][$installation[$j]][$x].")";
|
$error_text[$err]="Unbekannten Hersteller im Dateinamen gefunden, bitte Script updaten! (".$files[$entwicklung[$i]][$installation[$j]][$x].")";
|
||||||
$err++;
|
$err++;
|
||||||
} else {
|
} else {
|
||||||
$router_neu = 1;
|
$router_neu = 1;
|
||||||
for( $z=0; $z<count($router); $z++) {
|
for( $z=0; $z<count($router); $z++) {
|
||||||
if(isset($router[$z])) {
|
if(isset($router[$z])) {
|
||||||
if((strcasecmp($router[$z]->hersteller, $router_tmp[$x]['hersteller']) == 0) && (strcasecmp($router[$z]->modell, $router_tmp[$x]['modell']) == 0) && (strcasecmp($router[$z]->version, $router_tmp[$x]['version']) == 0)) {
|
if((strcasecmp($router[$z]->hersteller, $router_tmp[$x]['hersteller']) == 0) && (strcasecmp($router[$z]->modell, $router_tmp[$x]['modell']) == 0) && (strcasecmp($router[$z]->version, $router_tmp[$x]['version']) == 0)) {
|
||||||
$entinst = $entwicklung[$i].$installation[$j];
|
$entinst = $entwicklung[$i].$installation[$j];
|
||||||
$entinstlink = $entwicklung[$i].$installation[$j]."link";
|
$entinstlink = $entwicklung[$i].$installation[$j]."link";
|
||||||
$router[$z]->$entinst = 1;
|
$router[$z]->$entinst = 1;
|
||||||
$router[$z]->$entinstlink = $firmware_download_path.$entwicklung[$i]."/".$installation[$j]."/".$files[$entwicklung[$i]][$installation[$j]][$x];
|
$router[$z]->$entinstlink = $firmware_download_path.$entwicklung[$i]."/".$installation[$j]."/".$files[$entwicklung[$i]][$installation[$j]][$x];
|
||||||
$router_neu = 0;
|
$router_neu = 0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($router_neu == 1) {
|
if($router_neu == 1) {
|
||||||
$z = count($router);
|
$z = count($router);
|
||||||
$router[$z] = new ffrouter();
|
$router[$z] = new ffrouter();
|
||||||
$router[$z]->hersteller = $router_tmp[$x]['hersteller'];
|
$router[$z]->hersteller = $router_tmp[$x]['hersteller'];
|
||||||
$router[$z]->version = $router_tmp[$x]['version'];
|
$router[$z]->version = $router_tmp[$x]['version'];
|
||||||
$router[$z]->modell = $router_tmp[$x]['modell'];
|
$router[$z]->modell = $router_tmp[$x]['modell'];
|
||||||
$entinst = $entwicklung[$i].$installation[$j];
|
$entinst = $entwicklung[$i].$installation[$j];
|
||||||
$entinstlink = $entwicklung[$i].$installation[$j]."link";
|
$entinstlink = $entwicklung[$i].$installation[$j]."link";
|
||||||
$router[$z]->$entinst = 1;
|
$router[$z]->$entinst = 1;
|
||||||
$router[$z]->$entinstlink = $firmware_download_path.$entwicklung[$i]."/".$installation[$j]."/".$files[$entwicklung[$i]][$installation[$j]][$x];
|
$router[$z]->$entinstlink = $firmware_download_path.$entwicklung[$i]."/".$installation[$j]."/".$files[$entwicklung[$i]][$installation[$j]][$x];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$router_tmp = array();
|
$router_tmp = array();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for( $i=0; $i<count($router); $i++ ) { // Routerbilder einbauen
|
for( $i=0; $i<count($router); $i++ ) { // Routerbilder einbauen
|
||||||
if(is_dir(strtolower("router_images/".$router[$i]->hersteller))) {
|
if(is_dir(strtolower("router_images/".$router[$i]->hersteller))) {
|
||||||
if(is_file(strtolower("router_images/".$router[$i]->hersteller."/".$router[$i]->modell."-".$router[$i]->version.".jpg"))) {
|
if(is_file(strtolower("router_images/".$router[$i]->hersteller."/".$router[$i]->modell."-".$router[$i]->version.".jpg"))) {
|
||||||
$router[$i]->imagefront = strtolower("router_images/".$router[$i]->hersteller."/".$router[$i]->modell."-".$router[$i]->version.".jpg");
|
$router[$i]->imagefront = strtolower("router_images/".$router[$i]->hersteller."/".$router[$i]->modell."-".$router[$i]->version.".jpg");
|
||||||
} else {
|
} else {
|
||||||
$router[$i]->imagefront = "router_images/keinbild.jpg";
|
$router[$i]->imagefront = "router_images/keinbild.jpg";
|
||||||
}
|
}
|
||||||
if(is_file(strtolower("router_images/".$router[$i]->hersteller."/".$router[$i]->modell."-".$router[$i]->version."_back.jpg"))) {
|
if(is_file(strtolower("router_images/".$router[$i]->hersteller."/".$router[$i]->modell."-".$router[$i]->version."_back.jpg"))) {
|
||||||
$router[$i]->imageback = strtolower("router_images/".$router[$i]->hersteller."/".$router[$i]->modell."-".$router[$i]->version."_back.jpg");
|
$router[$i]->imageback = strtolower("router_images/".$router[$i]->hersteller."/".$router[$i]->modell."-".$router[$i]->version."_back.jpg");
|
||||||
} else {
|
} else {
|
||||||
$router[$i]->imageback = "router_images/keinbild.jpg";
|
$router[$i]->imageback = "router_images/keinbild.jpg";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$router[$i]->imagefront = "router_images/keinbild.jpg";
|
$router[$i]->imagefront = "router_images/keinbild.jpg";
|
||||||
$router[$i]->imageback = "router_images/keinbild.jpg";
|
$router[$i]->imageback = "router_images/keinbild.jpg";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user