Ticket #300: dgm.patch

php/themes/dgm/templates/cache_pager.tpl

@@ -1 @@
-
-{if count($data.pages) > 1}
+{if $pages.total > 1}
 <div align="center">
-{if $offset > 0}
-<a href="list-cache.php{$msid}cache_type={$cache_type}&amp;offset={$data.prev}">&lt;&lt; {$lang.link_prev} </a>&nbsp;|
-{/if}
-{strip}
-{foreach key=page item=start from=$data.pages}
-{if $start != $offset}
-  <a href="list-cache.php{$msid}cache_type={$cache_type}&amp;offset={$start}">{$page}</a>
-  {else}
-     {$page}
-  {/if}
-  {if $page < count($data.pages)}
-&nbsp;|&nbsp;
-   {/if}
-{/foreach}
-{/strip}
-{if $data.to < $data.numrows}
-  | <a href="list-cache.php{$msid}cache_type={$cache_type}&amp;offset={$data.next}">{$lang.link_next}&gt;&gt;</a>
-{/if}
+{$links}
 </div>
 {/if}
 <div>

php/themes/dgm/templates/list-cache-table.tpl

@@ -47 +47 @@
         </div>
      *}   
         <div class="cache_select">
-            <input type="checkbox" class="cachecheck" name="cache_item[{$row[hamloop].id}]" value="{$row[hamloop].id}">
+            <input type="checkbox" class="cachecheck" name="cache_item[generic][{$row[hamloop].id}]" value="{$row[hamloop].id}">
         </div>
       </div> <!-- cache row -->
     {/strip}

php/themes/dgm/templates/viewmail.tpl

@@ -7 +7 @@
 {if ! $error}
 <div class="viewmail_container">
 <form action="list-cache.php{$msid}cache_type={$cache_type}" name="cache" method="post">
-<input type="hidden" name="cache_item[{$id}]" value="{$id}">
+<input type="hidden" name="cache_item[generic][{$id}]" value="{$id}">
 
 <div class="viewmail_table">
 {include file="viewmail_menu.tpl" showraw=true}

php/cache.php

@@ -205 +205 @@
     }
     
     function set_select() {
-       $this->select_stmt = "SELECT maia_mail.id, maia_mail.received_date, maia_mail.score, " .
-                     "maia_mail.sender_email, maia_mail.subject, maia_mail.envelope_to " .
+       $this->select_count = "SELECT COUNT(*) " .
               "FROM maia_mail, maia_mail_recipients " .
               "WHERE maia_mail.id = maia_mail_recipients.mail_id " .
               "AND maia_mail_recipients.type = '". $this->get_sort_abbrev() ."' " .
-              "AND maia_mail_recipients.recipient_id = ? " .
-              "ORDER BY maia_mail." . $this->sortby['column'] . " " . $this->sort_order;
+              "AND maia_mail_recipients.recipient_id = ? ";
+
+        $this->select_stmt = "SELECT maia_mail.id, maia_mail.received_date, maia_mail.score, " .
+               "maia_mail.sender_email, maia_mail.subject, maia_mail.envelope_to " .
+              "FROM maia_mail, maia_mail_recipients " .
+              "WHERE maia_mail.id = maia_mail_recipients.mail_id " .
+              "AND maia_mail_recipients.type = '". $this->get_sort_abbrev() ."' " .
+              "AND maia_mail_recipients.recipient_id = ? " . 
+              " ORDER BY maia_mail." . $this->sortby['column'] . " " . $this->sort_order;
+        
     }
     
     function confirm_cache($euid) {    
@@ -222 +229 @@
                 $rescued = 0;
         global $_POST, $lang;
         $items = $_POST['cache_item'];
-        foreach ($items as $mail_id => $value) {
-                // report item
-                if ($_POST['submit'] == "spam") {
-                     switch ($this->type) {
-                       case 'ham':
-                          // Mark the item as Confirmed Spam
-                          $update = "UPDATE maia_mail_recipients SET type = 'C' " .
-                                    "WHERE recipient_id = ? AND mail_id = ?";
-                          $this->dbh->query($update, array($euid, $mail_id));
-                          record_mail_stats($euid, $mail_id, "fn");
-                          $reported++;
-                          break;
-                       case 'spam':
-                         confirm_spam($euid, $mail_id);
-                         $confirmed++;
-                       default:
-                     }
-                 //send item
-                } elseif ($_POST['submit'] == "ham") {
-                    switch ($this->type) {
-                       case 'ham':
-                          confirm_ham($euid, $mail_id);
-                          $confirmed++;
-                          break;
-                       default:
-                          $result = rescue_item($euid, $mail_id);
-                          if (strncmp($result, "2", 1) == 0) {
-                            $rescued++;
-                          } else {
-                                $message .= $result . "\n";                    
-                          }                      
-                    }
+        foreach ($items as $type => $mail_item) {
+                foreach ($mail_item as $mail_id => $value) {
+                        if ($type == "generic") {
+                                $newtype = $_POST['submit'];
+                        } else {
+                                $newtype = $type;
+                        }
+                        // report item
+                        if ($newtype == "spam") {
+                                switch ($this->type) {
+                                case 'ham':
+                                        // Mark the item as Confirmed Spam
+                                        $update = "UPDATE maia_mail_recipients SET type = 'C' " .
+                                                "WHERE recipient_id = ? AND mail_id = ?";
+                                        $this->dbh->query($update, array($euid, $mail_id));
+                                        record_mail_stats($euid, $mail_id, "fn");
+                                        $reported++;
+                                        break;
+                                case 'spam':
+                                        confirm_spam($euid, $mail_id);
+                                        $confirmed++;
+                                default:
+                                }
+                        //send item
+                        } elseif ($newtype == "ham") {
+                                switch ($this->type) {
+                                case 'ham':
+                                        confirm_ham($euid, $mail_id);
+                                        $confirmed++;
+                                        break;
+                                default:
+                                        $result = rescue_item($euid, $mail_id);
+                                        if (strncmp($result, "2", 1) == 0) {
+                                        $rescued++;
+                                        } else {
+                                                $message .= $result . "\n";                    
+                                        }                      
+                                }
                        
                        
-                    //delete item.
-                } elseif ($_POST['submit'] == "delete") {
+                        //delete item.
+                        } elseif ($newtype == "delete") {
 
-                    delete_mail_reference($euid, $mail_id);
-                    $deleted++;
+                                delete_mail_reference($euid, $mail_id);
+                                $deleted++;
 
-                }
-        }
-       
+                        }
+                }
+        }
+        $message = "confirmed = " . $confirmed . "<br>reported = " . $reported . "<br>";       
         //$sth->free(); */
         update_mail_stats($euid, "suspected_ham");
         if ($confirmed > 0) {
-            $message .= sprintf($lang['text_ham_confirmed'], $confirmed) . ".<br>";
+                if ($this->type == "ham") {    
+                        $message .= sprintf($lang['text_ham_confirmed'], $confirmed) . ".<br>";
+                } else {
+                        $message .= sprintf($lang['text_spam_confirmed'], $confirmed) . ".<br>";
+                }
         }
 
         if ($reported > 0) {
             $message .= sprintf($lang['text_spam_reported'], $reported) . ".<br>";
         }
         if ($deleted > 0) {
-            $message .= sprintf($lang['text_ham_deleted'], $deleted) . ".<br>";
+            if ( $this->type == "ham") {
+                $message .= sprintf($lang['text_ham_deleted'], $deleted) . ".<br>";
+                } else {
+                $message .= sprintf($lang['text_spam_deleted'], $deleted) . ".<br>";        
+                }
+        }
+        if ($rescued > 0) {
+                $message .= sprintf($lang['text_spam_rescued'], $rescued) . ".<br>";
         }
-        $this->smarty->assign("message", $message);
+        $this->smarty->assign("message", $message);
     
     }
     
@@ -285 +310 @@
         global $lang, $msid, $html_charset, $offset;
         $magic_quotes = get_magic_quotes_gpc();
         $nothing_to_show = true;
-        
+        $offset = 0;
         $this->smarty->assign("msid", $msid);
         $this->smarty->assign("lang", $lang);
-
-           $sth = $this->dbh->query($this->select_stmt, array($euid));
-           if ($sth->numRows() > 0)
+error_log($this->select_count,0);
+error_log($euid,0);
+           $numRows = $this->dbh->getOne($this->select_count, array($euid));
+error_log($numRows,0);
+           if ($numRows > 0)
            {
               $select2 = "SELECT email FROM users WHERE maia_user_id = ?";
               $sth2 = $this->dbh->query($select2, array($euid));
@@ -301 +328 @@
               $personal_addresses = array_flip($personal_addresses);
               $domain_default = is_a_domain_default_user($euid);
               $per_page = get_user_value($euid, "items_per_page");
-              $pager = new DB_Pager($sth, $offset, $per_page);
-              $data = $pager->build();
+
+              $pagerOptions = array(
+                 'mode'    => 'Sliding',
+                 'delta'   => 5,
+                 'perPage' => $per_page,
+                 'totalItems' => $numRows,
+                 );
+
+              $paged_data = Pager_Wrapper_DB($this->dbh, $this->select_stmt, $pagerOptions, null, null, array($euid));
+              //$paged_data['data'];  //paged data
+              //$paged_data['links']; //xhtml links for page navigation
+              //$paged_data['page_numbers']; //array('current', 'total');
+                      
+                
+
+
+              //$pager = new DB_Pager($sth, $offset, $per_page);
+              //$data = $pager->build();
               $maxid = 0;
               $nothing_to_show = false;
         
-              $this->smarty->assign("data", $data);
+              $this->smarty->assign("data", $paged_data['data']);
               $this->smarty->assign("offset", $offset);
+print_r($paged_data['page_numbers']);
+              $this->smarty->assign("pages", $paged_data['page_numbers']);
         
-        
-            if ($sth->numrows() == 1) {
+            if ($numRows == 1) {
                 $item_text = $lang['text_item'];
             } else {
                 $item_text = $lang['text_items'];
@@ -319 +363 @@
             $count = 0;
             $rows = array();
         
-              while ($row = $pager->fetchrow())
+              foreach ($paged_data['data'] as $row)
               {
                 if ($row["id"] > $maxid) {
                       $maxid = $row["id"];
@@ -357 +401 @@
                   $rows[$count]['subject'] = $subject;
                   $count++;
           }
-          $sth->free();
+          //$sth->free();
               $this->smarty->assign("row", $rows); 
               $this->smarty->assign("maxid", $maxid);
+//print_r($paged_data['links']);
+              $this->smarty->assign("links", $paged_data['links']);
         }
         $this->smarty->assign("nothing_to_show", $nothing_to_show);   
         $this->smarty->display("list-cache.tpl");