sorting problem

root
1 parent b3fe75a4
Showing 4 changed files with 21 additions and 13 deletions
lib/smbind.class.php
src/recordread.php
src/recordwrite.php
templates/recordread.tpl
@@ -1093,15 +1093,16 @@
                     $this->record['pri'] = 0;
                 }
                 if ((is_numeric($this->record['id'])) && ($this->record['id'] > 0)) {
-                    $res = $this->db->query("UPDATE records SET " .
+                    $sq = "UPDATE records SET " .
                         "zone = " . $this->record['zone'] . ", " .
                         "host = '" . $this->record['host'] . "', " .
                         "ttl = " . $this->record['ttl'] . ", " .
                         "type = '" . $this->record['type'] . "', " .
                         "pri = " . $this->record['pri'] . ", " .
                         "destination = '" . $this->record['destination'] .
-                        "' WHERE id = " . $this->record['id']
-                    );
+                        "' WHERE id = " . $this->record['id'];
+                    $res = $this->db->query($sq);
+//                    error_log($sq);
                     if (MDB2::isError($res)) {
                         $this->err .= $res->getMessage() . "\n" . $res->getDebugInfo();
                         error_log($this->err);
@@ -1115,14 +1116,15 @@
                         $this->record['id'] = $id;
                         return true;
                     } else {
-                        $res = $this->db->query("INSERT INTO records (zone, host, ttl, type, pri, destination) VALUES (" .
+                        $sq = "INSERT INTO records (zone, host, ttl, type, pri, destination) VALUES (" .
                             $this->record['zone'] . ", '" .
                             $this->record['host'] . "', " .
                             $this->record['ttl'] . ", '" .
                             $this->record['type'] . "', " .
                             $this->record['pri'] . ", '" .
-                            $this->record['destination'] . "')"
-                        );
+                            $this->record['destination'] . "')";
+                        $res = $this->db->query($sq);
+//                        error_log($sq);
                         if (MDB2::isError($res)) {
                             $this->err .= $res->getMessage() . "\n" . $res->getDebugInfo();
                             error_log($this->err);
@@ -1155,7 +1157,9 @@
         public function eraseRecord() {
             if ($this->is_identified()) {
-                $res = $this->db->query("DELETE FROM records WHERE id = " . $this->record['id']);
+                $sq = "DELETE FROM records WHERE id = " . $this->record['id'];
+//                error_log($sq);
+                $res = $this->db->query($sq);
                 if (MDB2::isError($res)) {
                     $this->err .= $res->getMessage() . "\n" . $res->getDebugInfo();
                     error_log($this->err);
@@ -31,6 +31,7 @@ if ($znum) {
         $smarty->assign("zone", $zonerec);
         $smarty->assign("pagetitle", "Editing master zone");
         $smarty->assign("rcount", sizeof($rec));
+//        error_log(sizeof($rec));
         $smarty->assign("record",$rec);
         $smarty->assign("types", $types);
         $smarty->assign("userlist", $users);
@@ -29,11 +29,14 @@ if ($znum) {
                     $nrec[$key] = (($key == 'host') && ($nrec[$key] == '')) ? '@' :$nrec[$key];
                     $nrec[$key] = (($key == 'destination') && ($nrec[$key] == '')) ? '@' :$nrec[$key];
                 }
-                if ($nrec['host'] != $nrec['destination']) {
-                    $urec = new masterRecord(intval($_POST['host_id'][$x]));
-                    $urec->loadRecord();
-                    $urec->setRecord($nrec);
-                    $xrec = $urec->getRecordRaw();
+                if (strtoupper($nrec['type']) != 'MX') $nrec['pri'] = '0';
+                $urec = new masterRecord(intval($_POST['host_id'][$x]));
+                $urec->loadRecord();
+                $xrec = serialize($urec->getRecordRaw());
+                $urec->setRecord($nrec);
+                $yrec = serialize($urec->getRecordRaw());
+                if ($xrec != $yrec) {
+//                    error_log($yrec . "#" . $xrec);
                     $urec->saveRecord();
                 }
             }
@@ -96,7 +96,7 @@
 </tr>
 {/section}
 </table>{else}<p>There are no other records in this zone at the moment.</p>{/if}
-<input type=hidden name=total value="{$smarty.section.i.total}">
+<input type=hidden name=total value="{$rcount}">
 </div></div>
 <div class=submit><input class=submit-button type=submit name=Submit value="Save">&nbsp;<input type=button class=submit-button id=cancel value="Cancel" name ="cancel"></div>
 </form>