Updating rmt serveur management

diff --git a/www/gessql.php b/www/gessql.php
index a23204b8ecaddb07eb19f129f625a8a5bb40144e..b1ea48d08440522410b0a42265a76493c71d9c01 100644 (file)
--- a/www/gessql.php
+++ b/www/gessql.php
@@ -121,7 +121,6 @@ class probe       {
     public function goNext(): int
     {
       if ($this->limit !== null) {
-
           $last=max($this->getnumrec(),$this->limit);
           $this->offset = min($last-$this->limit,$this->offset+$this->limit);
           }
@@ -324,45 +323,6 @@ while ($proceed==true) {
 rou_alert(0,"$OPEP, now logname=<$logname>");
 }
 
-//==============================================================
-//
-//      Function to retreive remote SMTP serveur list
-//
-//==============================================================
-function sql_getremotelist($dbsql,$remoteip,$limit,$skip)
-
-{
-$OPEP="gessql.php:sql_getremotelist";
-
-$strlim="";
-$strskip="";
-$select="";
-if ($remoteip!=NULL) 
-  $select="where remoteip like '%$remoteip%'";
-$strsel="Select * from remotes $select order by remoteip asc";
-if ($limit!=NULL) 
-  $strlim="limit $limit";
-if ($skip!=NULL) 
-  $strskip="offset $skip";
-$stmt=$dbsql->Select("$strsel $strlim $strskip");
-return $stmt->fetchAll();
-}
-//==============================================================
-//
-//      Function to return the number of record within remotes
-//      table according a select.
-//
-//==============================================================
-function sql_getnumremotes($dbsql,$remoteip)
-
-{
-$OPEP="gessql.php:sql_getnumremotes";
-
-$select=NULL;
-if ($remoteip!=NULL) 
-  $select="where remoteip like '%$remoteip%'";
-return sql_getnumrec($dbsql,$select,"remotes");
-}
 //==============================================================
 //
 //      Function to retreive user email list

diff --git a/www/lvlrmt.php b/www/lvlrmt.php
index a934910768e3bf07492b4207dd12031b5389479e..d141bec38d695e070ff5320bbd6c1c856f80a1a8 100644 (file)
--- a/www/lvlrmt.php
+++ b/www/lvlrmt.php
@@ -90,39 +90,38 @@ $limit=20;
 $offset=0;
 $remoteip="";
 $dbsql=sql_connect();
-if (isset($_POST['remoteip']))
-  $remoteip=trim(($_POST['remoteip']));
 if (isset($_POST['limit']))
   $limit=intval($_POST['limit']);
 if (isset($_POST['offset']))
   $offset=intval($_POST['offset']);
-$numrec=sql_getnumremotes($dbsql,$remoteip);
+$rqst=NEW probe("remotes",$limit,$offset);
+if (isset($_POST['remoteip'])) {
+  $remoteip=trim(($_POST['remoteip']));
+  $rqst->where("remoteip","like","%$remoteip%")
+}
+$numrec=$rqst->getnumrec();
 if (isset($_POST['scanner'])) {
   $scanner=$_POST['scanner'];
   switch ($scanner) {
-    case "golast"       :
-      $offset=$numrec-$limit;
+     case "golast"       :
+      $offset=$rqst->goLast();
       break;
     case "gonext"       :
-
-      $offset+=$limit;
-      if ($offset>($numrec-$limit))
-        $offset=$numrec-$limit;
+      $offset=$rqst->goNext();
       break;
     case "goprevious"   :
-      $offset-=$limit;
+      $offset=$rqst->goPrevious();
       break;
     case "gofirst"       :
-      $offset=0;
+      $offset=$rqst->goFirst();
       break;
     default             :
       break;
     }
-  if ($offset<0)
-    $offset=0;
-  rou_alert(0,"$OPEP JMPDBG offset=<$offset>");
   }
-$remotes=sql_getremotelist($dbsql,$remoteip,$limit,$offset);
+$remotes=$rqst->order("remoteip asc")
+              ->limit($limit)
+              ->get()
 $line="";
 $count=$offset;
 foreach($remotes as $remote) {