Freifunk-Rhein-Sieg/ffrs-fw-dl
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[FEAT] Hersteller 8devices und Meraki hinzugefügt

Browse Source
This commit is contained in:
CasparA 2016-05-12 09:57:11 +02:00
parent 07db262298
commit b3ba905afc
3 changed files with 102 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
config.inc.php
View File

@ -18,19 +18,21 @@
$variante['stable']['sysupgrade'] = 0;
$hersteller = array(
0 => "Alfa",
1 => "Allnet",
2 => "Buffalo",
3 => "D-Link",
4 => "GL-Inet",
5 => "LeMaker",
6 => "Linksys",
7 => "Netgear",
8 => "Onion",
9 => "Raspberry Pi",
10 => "TP-Link",
11 => "Ubiquiti",
12 => "Western Digital",
13 => "x86",
0 => "8devices",
1 => "Alfa",
2 => "Allnet",
3 => "Buffalo",
4 => "D-Link",
5 => "GL-Inet",
6 => "LeMaker",
7 => "Linksys",
8 => "Meraki",
9 => "Netgear",
10 => "Onion",
11 => "Raspberry Pi",
12 => "TP-Link",
13 => "Ubiquiti",
14 => "Western Digital",
15 => "x86",
);
?>

80
ffrouter_parsen.function.php
View File

@ -159,6 +159,11 @@ if($variante['stable']['factory'] == 1) {
}
if($variante['beta']['factory'] == 1) {
for( $i=0; $i<count($files['beta']['factory']); $i++) {
if($pos = stripos($files['beta']['factory'][$i], "8devices", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "8devices";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['beta']['factory'][$i], $pos_hersteller+7, strlen($files['beta']['factory'][$i])-$pos_hersteller-11));
}
if($pos = stripos($files['beta']['factory'][$i], "alfa", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "Alfa";
$router_tmp[$i]['version'] = "Alle";
@ -194,6 +199,11 @@ if($variante['beta']['factory'] == 1) {
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['beta']['factory'][$i], $pos_hersteller+6, strlen($files['beta']['factory'][$i])-$pos_hersteller-10));
}
if($pos = stripos($files['broken']['factory'][$i], "meraki", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "Meraki";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['broken']['factory'][$i], $pos_hersteller+5, strlen($files['broken']['factory'][$i])-$pos_hersteller-9));
}
if($pos = stripos($files['beta']['factory'][$i], "netgear", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "Netgear";
$router_tmp[$i]['version'] = "Alle";
@ -244,6 +254,11 @@ if($variante['beta']['factory'] == 1) {
$router_tmp = array();
if($variante['beta']['sysupgrade'] == 1) {
for( $i=0; $i<count($files['beta']['sysupgrade']); $i++) {
if($pos = stripos($files['beta']['sysupgrade'][$i], "8devices", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "8devices";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['beta']['sysupgrade'][$i], $pos_hersteller+7, strlen($files['beta']['sysupgrade'][$i])-$pos_hersteller-22));
}
if($pos = stripos($files['beta']['sysupgrade'][$i], "alfa", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "Alfa";
$router_tmp[$i]['version'] = "Alle";
@ -279,6 +294,11 @@ if($variante['beta']['sysupgrade'] == 1) {
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['beta']['sysupgrade'][$i], $pos_hersteller+6, strlen($files['beta']['sysupgrade'][$i])-$pos_hersteller-21));
}
if($pos = stripos($files['beta']['sysupgrade'][$i], "meraki", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "Meraki";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['beta']['sysupgrade'][$i], $pos_hersteller+5, strlen($files['beta']['sysupgrade'][$i])-$pos_hersteller-20));
}
if($pos = stripos($files['beta']['sysupgrade'][$i], "netgear", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "Netgear";
$router_tmp[$i]['version'] = "Alle";
@ -339,6 +359,11 @@ if($variante['beta']['sysupgrade'] == 1) {
$router_tmp = array();
if($variante['broken']['factory'] == 1) {
for( $i=0; $i<count($files['broken']['factory']); $i++) {
if($pos = stripos($files['broken']['factory'][$i], "8devices", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "8devices";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['broken']['factory'][$i], $pos_hersteller+9, strlen($files['broken']['factory'][$i])-$pos_hersteller-13));
}
if($pos = stripos($files['broken']['factory'][$i], "alfa", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "Alfa";
$router_tmp[$i]['version'] = "Alle";
@ -374,6 +399,11 @@ if($variante['broken']['factory'] == 1) {
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['broken']['factory'][$i], $pos_hersteller+8, strlen($files['broken']['factory'][$i])-$pos_hersteller-12));
}
if($pos = stripos($files['broken']['factory'][$i], "meraki", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "Meraki";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['broken']['factory'][$i], $pos_hersteller+7, strlen($files['broken']['factory'][$i])-$pos_hersteller-11));
}
if($pos = stripos($files['broken']['factory'][$i], "netgear", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "Netgear";
$router_tmp[$i]['version'] = "Alle";
@ -434,6 +464,11 @@ if($variante['broken']['factory'] == 1) {
$router_tmp = array();
if($variante['broken']['sysupgrade'] == 1) {
for( $i=0; $i<count($files['broken']['sysupgrade']); $i++) {
if($pos = stripos($files['broken']['sysupgrade'][$i], "8devices", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "8devices";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['broken']['sysupgrade'][$i], $pos_hersteller+9, strlen($files['broken']['sysupgrade'][$i])-$pos_hersteller-24));
}
if($pos = stripos($files['broken']['sysupgrade'][$i], "alfa", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "Alfa";
$router_tmp[$i]['version'] = "Alle";
@ -469,6 +504,11 @@ if($variante['broken']['sysupgrade'] == 1) {
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['broken']['sysupgrade'][$i], $pos_hersteller+8, strlen($files['broken']['sysupgrade'][$i])-$pos_hersteller-23));
}
if($pos = stripos($files['broken']['sysupgrade'][$i], "meraki", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "Meraki";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['broken']['sysupgrade'][$i], $pos_hersteller+7, strlen($files['broken']['sysupgrade'][$i])-$pos_hersteller-22));
}
if($pos = stripos($files['broken']['sysupgrade'][$i], "netgear", $pos_hersteller-2) !== false) {
$router_tmp[$i]['hersteller'] = "Netgear";
$router_tmp[$i]['version'] = "Alle";
@ -529,6 +569,11 @@ if($variante['broken']['sysupgrade'] == 1) {
$router_tmp = array();
if($variante['experimental']['factory'] == 1) {
for( $i=0; $i<count($files['experimental']['factory']); $i++) {
if($pos = stripos($files['experimental']['factory'][$i], "8devices", $pos_hersteller-3) !== false) {
$router_tmp[$i]['hersteller'] = "8devices";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['experimental']['factory'][$i], $pos_hersteller+6, strlen($files['experimental']['factory'][$i])-$pos_hersteller-10));
}
if($pos = stripos($files['experimental']['factory'][$i], "alfa", $pos_hersteller-3) !== false) {
$router_tmp[$i]['hersteller'] = "Alfa";
$router_tmp[$i]['version'] = "Alle";
@ -564,6 +609,11 @@ if($variante['experimental']['factory'] == 1) {
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['experimental']['factory'][$i], $pos_hersteller+5, strlen($files['experimental']['factory'][$i])-$pos_hersteller-9));
}
if($pos = stripos($files['experimental']['factory'][$i], "meraki", $pos_hersteller-3) !== false) {
$router_tmp[$i]['hersteller'] = "Meraki";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['experimental']['factory'][$i], $pos_hersteller+4, strlen($files['experimental']['factory'][$i])-$pos_hersteller-8));
}
if($pos = stripos($files['experimental']['factory'][$i], "netgear", $pos_hersteller-3) !== false) {
$router_tmp[$i]['hersteller'] = "Netgear";
$router_tmp[$i]['version'] = "Alle";
@ -624,6 +674,11 @@ if($variante['experimental']['factory'] == 1) {
$router_tmp = array();
if($variante['experimental']['sysupgrade'] == 1) {
for( $i=0; $i<count($files['experimental']['sysupgrade']); $i++) {
if($pos = stripos($files['experimental']['sysupgrade'][$i], "8devices", $pos_hersteller-3) !== false) {
$router_tmp[$i]['hersteller'] = "8devices";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['experimental']['sysupgrade'][$i], $pos_hersteller+6, strlen($files['experimental']['sysupgrade'][$i])-$pos_hersteller-21));
}
if($pos = stripos($files['experimental']['sysupgrade'][$i], "alfa", $pos_hersteller-3) !== false) {
$router_tmp[$i]['hersteller'] = "Alfa";
$router_tmp[$i]['version'] = "Alle";
@ -659,6 +714,11 @@ if($variante['experimental']['sysupgrade'] == 1) {
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['experimental']['sysupgrade'][$i], $pos_hersteller+5, strlen($files['experimental']['sysupgrade'][$i])-$pos_hersteller-20));
}
if($pos = stripos($files['experimental']['sysupgrade'][$i], "meraki", $pos_hersteller-3) !== false) {
$router_tmp[$i]['hersteller'] = "Meraki";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['experimental']['sysupgrade'][$i], $pos_hersteller+4, strlen($files['experimental']['sysupgrade'][$i])-$pos_hersteller-19));
}
if($pos = stripos($files['experimental']['sysupgrade'][$i], "netgear", $pos_hersteller-3) !== false) {
$router_tmp[$i]['hersteller'] = "Netgear";
$router_tmp[$i]['version'] = "Alle";
@ -719,6 +779,11 @@ if($variante['experimental']['sysupgrade'] == 1) {
$router_tmp = array();
if($variante['stable']['factory'] == 1) {
for( $i=0; $i<count($files['stable']['factory']); $i++) {
if($pos = stripos($files['stable']['factory'][$i], "8devices", $pos_hersteller) !== false) {
$router_tmp[$i]['hersteller'] = "8devices";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['stable']['factory'][$i], $pos_hersteller+9, strlen($files['stable']['factory'][$i])-$pos_hersteller-13));
}
if($pos = stripos($files['stable']['factory'][$i], "alfa", $pos_hersteller) !== false) {
$router_tmp[$i]['hersteller'] = "Alfa";
$router_tmp[$i]['version'] = "Alle";
@ -754,6 +819,11 @@ if($variante['stable']['factory'] == 1) {
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['stable']['factory'][$i], $pos_hersteller+8, strlen($files['stable']['factory'][$i])-$pos_hersteller-12));
}
if($pos = stripos($files['stable']['factory'][$i], "meraki", $pos_hersteller) !== false) {
$router_tmp[$i]['hersteller'] = "Meraki";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['stable']['factory'][$i], $pos_hersteller+7, strlen($files['stable']['factory'][$i])-$pos_hersteller-11));
}
if($pos = stripos($files['stable']['factory'][$i], "netgear", $pos_hersteller) !== false) {
$router_tmp[$i]['hersteller'] = "Netgear";
$router_tmp[$i]['version'] = "Alle";
@ -815,6 +885,11 @@ if($variante['stable']['factory'] == 1) {
$router_tmp = array();
if($variante['stable']['sysupgrade'] == 1) {
for( $i=0; $i<count($files['stable']['sysupgrade']); $i++) {
if($pos = stripos($files['stable']['sysupgrade'][$i], "8devices", $pos_hersteller) !== false) {
$router_tmp[$i]['hersteller'] = "8devices";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['stable']['sysupgrade'][$i], $pos_hersteller+9, strlen($files['stable']['sysupgrade'][$i])-$pos_hersteller-24));
}
if($pos = stripos($files['stable']['sysupgrade'][$i], "alfa", $pos_hersteller) !== false) {
$router_tmp[$i]['hersteller'] = "Alfa";
$router_tmp[$i]['version'] = "Alle";
@ -850,6 +925,11 @@ if($variante['stable']['sysupgrade'] == 1) {
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['stable']['sysupgrade'][$i], $pos_hersteller+8, strlen($files['stable']['sysupgrade'][$i])-$pos_hersteller-23));
}
if($pos = stripos($files['stable']['sysupgrade'][$i], "meraki", $pos_hersteller) !== false) {
$router_tmp[$i]['hersteller'] = "Meraki";
$router_tmp[$i]['version'] = "Alle";
$router_tmp[$i]['modell'] = strtoupper(substr($files['stable']['sysupgrade'][$i], $pos_hersteller+7, strlen($files['stable']['sysupgrade'][$i])-$pos_hersteller-22));
}
if($pos = stripos($files['stable']['sysupgrade'][$i], "netgear", $pos_hersteller) !== false) {
$router_tmp[$i]['hersteller'] = "Netgear";
$router_tmp[$i]['version'] = "Alle";

12
index.php
View File

@ -49,7 +49,7 @@ function populateA(s1,s2){
EOT;
for( $i=0; $i<count($hersteller); $i++) {
echo("\nif(s1.value == \"".$hersteller[$i]."\"){\n");
echo("var optionArray = [\"|\"");
echo("var optionArray = [\"|Modell auswählen\"");
$j=0;
while( $j<count($router) ) {
if($router[$j]->hersteller == $hersteller[$i]) {
@ -110,7 +110,7 @@ EOT;
$i=0;
while( $i<count($router) ) {
echo("\nif(s1.value == \"".$router[$i]->modell."\"){\n");
echo("var optionArray = [\"|\"");
echo("var optionArray = [\"|Version auswählen\"");
echo(",\"".$i."|".$router[$i]->version."\"");
if( $i<count($router)-1 ) {
while($router[$i]->modell == $router[$i+1]->modell) {
@ -165,7 +165,7 @@ EOT;
echo("\nif(s1.value == \"".$i."\"){\n");
echo("var newImageFront = \"".$router[$i]->imagefront."\";\n");
echo("var newImageBack = \"".$router[$i]->imageback."\";\n");
echo("var optionArray = [\"|\"");
echo("var optionArray = [\"|Erstinstallation?\"");
if( ($router[$i]->betafactory == 1) || ($router[$i]->brokenfactory == 1) || ($router[$i]->experimentalfactory == 1) || ($router[$i]->stablefactory == 1) ) {
echo(",\"".$i."J|Ja\"");
}
@ -207,7 +207,7 @@ EOT;
$i=0;
while( $i<count($router) ) {
echo("\nif(s1.value == \"".$i."J\"){\n");
echo("var optionArray = [\"|\"");
echo("var optionArray = [\"|Entwicklungsstadium?\"");
if( ($router[$i]->betafactory == 1) ) {
echo(",\"".$i."Jbeta|Beta\"");
}
@ -223,7 +223,7 @@ EOT;
echo("];\n");
echo("}\n");
echo("\nif(s1.value == \"".$i."N\"){\n");
echo("var optionArray = [\"|\"");
echo("var optionArray = [\"|Entwicklungsstadium?\"");
if( ($router[$i]->betasysupgrade == 1) ) {
echo(",\"".$i."Nbeta|Beta\"");
}
@ -372,7 +372,7 @@ EOT;
</div>
<div class="panel-body">
<select id="slct1" name="slct1" onchange="populateA(this.id,'slct2')">
<option value=""></option>
<option value="">Hersteller auswählen</option>
EOT;
for( $i=0; $i<count($hersteller); $i++) {
echo("<option value=\"".$hersteller[$i]."\">".$hersteller[$i]."</option>");