Commit cde8eb71 authored by Alan Garcia's avatar Alan Garcia

Mini modif

parent 9a50431a
...@@ -328,7 +328,7 @@ class DB_Sql { ...@@ -328,7 +328,7 @@ class DB_Sql {
$this->Seq_Table, $this->Seq_Table,
$seq_name, $seq_name,
$currentid); $currentid);
$id = @mysql_query($q, $this->Link_ID); @mysql_query($q, $this->Link_ID);
} else { } else {
$currentid = $res["nextid"]; $currentid = $res["nextid"];
} }
...@@ -337,7 +337,7 @@ class DB_Sql { ...@@ -337,7 +337,7 @@ class DB_Sql {
$this->Seq_Table, $this->Seq_Table,
$nextid, $nextid,
$seq_name); $seq_name);
$id = @mysql_query($q, $this->Link_ID); @mysql_query($q, $this->Link_ID);
$this->unlock(); $this->unlock();
} else { } else {
$this->halt("cannot lock ".$this->Seq_Table." - has it been created?"); $this->halt("cannot lock ".$this->Seq_Table." - has it been created?");
...@@ -348,8 +348,6 @@ class DB_Sql { ...@@ -348,8 +348,6 @@ class DB_Sql {
/* public: return table metadata */ /* public: return table metadata */
function metadata($table='',$full=false) { function metadata($table='',$full=false) {
$count = 0;
$id = 0;
$res = array(); $res = array();
/* /*
......
...@@ -168,19 +168,21 @@ class m_upnp { ...@@ -168,19 +168,21 @@ class m_upnp {
$status=array(); $statusout=array(); $bad=false; $status=array(); $statusout=array(); $bad=false;
unset($out); unset($out);
exec("upnpc -l 2>&1",$res,$out); exec("upnpc -l 2>&1",$res,$out);
foreach($out as $line) { if ( is_array($out) && !empty($out)) {
// example line: 1 TCP 222->192.168.0.5:22 'libminiupnpc' '' foreach($out as $line) {
if (preg_match("#^ *([0-9]+) (TCP|UDP) *([0-9]+)\-\>([0-9\.]+):([0-9]+) *#",$line,$mat)) { // example line: 1 TCP 222->192.168.0.5:22 'libminiupnpc' ''
if ($mat[4]==$L_INTERNAL_IP) { if (preg_match("#^ *([0-9]+) (TCP|UDP) *([0-9]+)\-\>([0-9\.]+):([0-9]+) *#",$line,$mat)) {
$status[]=array("protocol" => $mat[2], "port" => $mat[3]); if ($mat[4]==$L_INTERNAL_IP) {
} else { $status[]=array("protocol" => $mat[2], "port" => $mat[3]);
$statusout[]=array("protocol" => $mat[2], "port" => $mat[3], "ip" => $mat[4]); } else {
} $statusout[]=array("protocol" => $mat[2], "port" => $mat[3], "ip" => $mat[4]);
} }
if (preg_match("#No IGD UPnP Device found on the network#",$line)) { }
$bad=true; if (preg_match("#No IGD UPnP Device found on the network#",$line)) {
} $bad=true;
} // For each line in upnpc -l (check list) }
} // For each line in upnpc -l (check list)
}
// No UPnP peripheral !! maybe you should not have installed AlternC-upnp altogether ? // No UPnP peripheral !! maybe you should not have installed AlternC-upnp altogether ?
if ($bad) { if ($bad) {
......
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