Changeset 19 for trunk/inc

Show
Ignore:
Timestamp:
08/12/05 11:29:23 (7 years ago)
Author:
alexx
Message:
  • Fix 'cache not set' view by mat in -xml et -dotpage
  • New pager system for "messages" (with Pager_dotnode that extends PEAR Pager class)
Location:
trunk/inc/messages
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/inc/messages/inbox.inc.php

    r15 r19  
    2323 ******************** http://opensource.ikse.net/projects/dotnode ***/ 
    2424 
     25include_once(INCLUDESPATH.'/pager.inc.php'); 
     26 
    2527$_SMARTY['Title'] =  'Messages'; 
    2628 
    27 /** Pagination ***************/ 
    28 $pagination['nb_elements'] = $db->getOne('SELECT COUNT(id) FROM message WHERE id=? AND box=?', array($_SESSION['my_id'], 'inbox') ); 
    29 $pagination['elmt_by_page'] = 20; 
    30 if($pagination['nb_elements'] > 0) 
    31         $pagination['nb_pages'] = ceil($pagination['nb_elements']/$pagination['elmt_by_page']); 
    32 else 
    33         $pagination['nb_pages'] = 1; 
    34  
    35 if(is_numeric($token[2]) &&  
    36    $token[2] <= $pagination['nb_pages'] &&  
    37    $token[2] > 0 ) 
    38         $pagination['current_page'] = $token[2]; 
    39 else 
    40 { 
    41         header('Location: /messages/inbox/1'); 
    42         exit(); 
    43 } 
    44  
    45 $pagination['pages'] = @array_fill(1,$pagination['nb_pages'], NULL); 
    46  
    47 $_SMARTY['pagination'] =  $pagination; 
    48 /******************************/ 
    49  
    50 $messages_r = $db->query('SELECT id_mess, id_from, from_str, type, dest, subject, message, flag, date FROM message WHERE id=? AND box=? ORDER by date DESC LIMIT ?,?', array($_SESSION['my_id'],'inbox',  ($pagination['current_page']-1)*$pagination['elmt_by_page'], $pagination['elmt_by_page'])); 
     29$messages_r = $db->query('SELECT id_mess, id_from, from_str, type, dest, subject, message, flag, date FROM message WHERE id=? AND box=? ORDER by date DESC', array($_SESSION['my_id'],'inbox')); 
    5130 
    5231if(!DB::isError($messages_r) ) 
    … …  
    5938$_SESSION['nb_new_messages_timestamp'] = 1; 
    6039 
     40$pager =& Pager_dotnode::factory($messages); 
    6141 
    62 $_SMARTY['messages'] =  $messages; 
     42$_SMARTY['pager'] = $pager->getLinks(); 
     43 
     44// $pager->getPageData() return '' if no data element 
     45// For smarty reason, i prefere an empty array to use foreach / foreachelse 
     46if(!is_array($_SMARTY['messages'] = $pager->getPageData())) 
     47        $_SMARTY['messages'] = array(); 
    6348?> 

  • trunk/inc/messages/saved.inc.php

    r15 r19  
    2323 ******************** http://opensource.ikse.net/projects/dotnode ***/ 
    2424 
     25include_once(INCLUDESPATH.'/pager.inc.php'); 
     26 
    2527$_SMARTY['Title'] =  'Messages'; 
    2628 
    27 /** Pagination ***************/ 
    28 $pagination['nb_elements'] = $db->getOne('SELECT COUNT(id) FROM message WHERE id=? AND box=?', array($_SESSION['my_id'], 'save') ); 
    29 $pagination['elmt_by_page'] = 20; 
    30  
    31 if($pagination['nb_elements'] > 0) 
    32         $pagination['nb_pages'] = ceil($pagination['nb_elements']/$pagination['elmt_by_page']); 
    33 else 
    34         $pagination['nb_pages'] = 1; 
    35  
    36 if(is_numeric($token[2]) &&  
    37    $token[2] <= $pagination['nb_pages'] &&  
    38    $token[2] > 0 ) 
    39         $pagination['current_page'] = $token[2]; 
    40 else 
    41 {        
    42         header('Location: /messages/saved/1'); 
    43         exit(); 
    44 } 
    45  
    46 $pagination['pages'] = @array_fill(1,$pagination['nb_pages'], NULL); 
    47  
    48 $_SMARTY['pagination'] =  $pagination; 
    49 /******************************/ 
    50  
    51  
    52 $messages_r = $db->query('SELECT id_mess, id_from, from_str, type, dest, subject, message, flag, date FROM message WHERE id=? AND box=? ORDER by date DESC LIMIT ?,?', array($_SESSION['my_id'],'save', ($pagination['current_page']-1)*$pagination['elmt_by_page'],   $pagination['elmt_by_page']) ); 
     29$messages_r = $db->query('SELECT id_mess, id_from, from_str, type, dest, subject, message, flag, date FROM message WHERE id=? AND box=? ORDER by date DESC', array($_SESSION['my_id'],'save') ); 
    5330 
    5431if(!DB::isError($messages_r) ) 
    … …  
    5835        error_log($_SERVER['HTTP_HOST'].' | '.__FILE__.' | '.$messages_r->getUserInfo()); 
    5936 
    60 $_SMARTY['messages'] =  $messages; 
     37$pager =& Pager_dotnode::factory($messages); 
    6138 
     39$_SMARTY['pager'] = $pager->getLinks(); 
     40 
     41// $pager->getPageData() return '' if no data element 
     42// For smarty reason, i prefere an empty array to use foreach / foreachelse 
     43if(!is_array($_SMARTY['messages'] = $pager->getPageData())) 
     44        $_SMARTY['messages'] = array(); 
    6245?> 

  • trunk/inc/messages/sent.inc.php

    r15 r19  
    2323 ******************** http://opensource.ikse.net/projects/dotnode ***/ 
    2424 
     25include_once(INCLUDESPATH.'/pager.inc.php'); 
     26 
    2527$_SMARTY['Title'] =  'Messages'; 
    2628 
    27 /** Pagination ***************/ 
    28 $pagination['nb_elements'] = $db->getOne('SELECT COUNT(id_from) FROM message WHERE id_from=? AND box=?', array($_SESSION['my_id'], 'send') ); 
    29 $pagination['elmt_by_page'] = 20; 
    30 if($pagination['nb_elements'] > 0) 
    31         $pagination['nb_pages'] = ceil($pagination['nb_elements']/$pagination['elmt_by_page']); 
    32 else 
    33         $pagination['nb_pages'] = 1; 
    34  
    35 if(is_numeric($token[2]) && 
    36    $token[2] <= $pagination['nb_pages'] && 
    37    $token[2] > 0 ) 
    38         $pagination['current_page'] = $token[2]; 
    39 else 
    40 {        
    41         header('Location: /messages/sent/1'); 
    42         exit(); 
    43 } 
    44  
    45 $pagination['pages'] = @array_fill(1,$pagination['nb_pages'], NULL); 
    46  
    47 $_SMARTY['pagination'] =  $pagination; 
    48 /******************************/ 
    49  
    50 $messages_r = $db->query('SELECT id, id_mess, id_from, from_str, type, dest, subject, message, flag, date FROM message WHERE id_from=? AND box=? ORDER by date DESC LIMIT ?,?', array($_SESSION['my_id'],'send', ($pagination['current_page']-1)*$pagination['elmt_by_page'],  
    51 $pagination['elmt_by_page'] )); 
     29$messages_r = $db->query('SELECT id, id_mess, id_from, from_str, type, dest, subject, message, flag, date FROM message WHERE id_from=? AND box=? ORDER by date DESC', array($_SESSION['my_id'],'send') ); 
    5230 
    5331$cache=array(); 
    … …  
    7250        error_log($_SERVER['HTTP_HOST'].' | '.__FILE__.' | '.$messages_r->getUserInfo()); 
    7351 
    74 $_SMARTY['messages'] =  $messages; 
     52$pager =& Pager_dotnode::factory($messages); 
    7553 
     54$_SMARTY['pager'] = $pager->getLinks(); 
     55 
     56// $pager->getPageData() return '' if no data element 
     57// For smarty reason, i prefere an empty array to use foreach / foreachelse 
     58if(!is_array($_SMARTY['messages'] = $pager->getPageData())) 
     59        $_SMARTY['messages'] = array(); 
    7660?>