Changeset 19

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
Files:
1 added
8 modified

Legend:

Unmodified
Added
Removed

  • trunk/dotnode-dotpage.php

    r16 r19  
    3535$smarty->compile_id = 'hp'; 
    3636$smarty->cache_lifetime = 600; 
     37$smarty->caching = true; 
    3738 
    3839if(!$smarty->is_cached('index.tpl', $login.'.'.$lang.'.'.$_SERVER['PHP_SELF'] )) 

  • trunk/dotnode-xml.php

    r16 r19  
    3434$smarty->template_dir = SMARTYPATH.'/templates_xml/'; 
    3535$smarty->compile_id = 'xml'; 
     36$smarty->caching = true'; 
    3637 
    3738session_start(); 

  • 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?> 

  • trunk/smarty/templates/messages/inbox.tpl

    r1 r19  
    2626<h2>{t}Inbox{/t}</h2> 
    2727<form action='/action/messages/group_delete' method='post' onSubmit="return confirm('{t}Confirm delete ?{/t}')"> 
     28 
    2829<div id='msglist'> 
    2930<table> 
    3031<tr><th class='profileHeader' colspan='4'>{t}Inbox messages{/t}</th></tr> 
    31 {strip} 
    32 <tr><td class='{cycle values='odd,even'} pagination' colspan='4'> 
    33 {t}Page:{/t} 
    34 {foreach from=$pagination.pages item=none key=page} 
    35 {if $pagination.current_page == $page} 
    36 &nbsp;<strong>{$page}</strong> 
    37 {else} 
    38 &nbsp;<a href='/messages/{$token[1]}/{$page}'>{$page}</a> 
    39 {/if} 
    40 {/foreach} 
    41 </td></tr> 
    42 {/strip} 
     32<tr><td class='{cycle values='odd,even'} pagination' colspan='4'>{$pager.all}</td></tr> 
    4333{foreach name=messages from=$messages item=message key=id_mess} 
    4434<tr class='{cycle values='odd,even'}'> 
    … …  
    5141<tr><td align='center'>{t}No message{/t}</td></tr> 
    5242{/foreach} 
    53 {strip} 
    54 <tr><td class='{cycle values='odd,even'} pagination' colspan='4'> 
    55 {t}Page:{/t} 
    56 {foreach from=$pagination.pages item=none key=page} 
    57 {if $pagination.current_page == $page} 
    58 &nbsp;<strong>{$page}</strong> 
    59 {else} 
    60 &nbsp;<a href='/messages/{$token[1]}/{$page}'>{$page}</a> 
    61 {/if} 
    62 {/foreach} 
    63 </td></tr> 
    64 {/strip} 
    65  
     43<tr><td class='{cycle values='odd,even'} pagination' colspan='4'>{$pager.all}</td></tr> 
    6644</table> 
    6745</div> 
     46 
    6847{if $pagination.nb_elements > 1} 
    6948<input type='submit' value='{t}Delete selection{/t}' /> 

  • trunk/smarty/templates/messages/saved.tpl

    r1 r19  
    2323<table> 
    2424<tr><th class='profileHeader' colspan='4'>{t}Saved messages{/t}</th></tr> 
    25 {strip} 
    26 <tr><td class='{cycle values='odd,even'} pagination' colspan='4'> 
    27 {t}Page:{/t} 
    28 {foreach from=$pagination.pages item=none key=page} 
    29 {if $pagination.current_page == $page} 
    30 &nbsp;<strong>{$page}</strong> 
    31 {else} 
    32 &nbsp;<a href='/messages/{$token[1]}/{$page}'>{$page}</a> 
    33 {/if} 
    34 {/foreach} 
    35 </td></tr> 
    36 {/strip} 
     25<tr><td class='{cycle values='odd,even'} pagination' colspan='4'>{$pager.all}</td></tr> 
    3726{foreach name=messages from=$messages item=message key=id_mess} 
    3827<tr class='{cycle values='odd,even'}'> 
    … …  
    4534<tr><td align='center'>{t}No message{/t}</td></tr> 
    4635{/foreach} 
    47 {strip} 
    48 <tr><td class='{cycle values='odd,even'} pagination' colspan='4'> 
    49 {t}Page:{/t} 
    50 {foreach from=$pagination.pages item=none key=page} 
    51 {if $pagination.current_page == $page} 
    52 &nbsp;<strong>{$page}</strong> 
    53 {else} 
    54 &nbsp;<a href='/messages/{$token[1]}/{$page}'>{$page}</a> 
    55 {/if} 
    56 {/foreach} 
    57 </td></tr> 
    58 {/strip} 
     36<tr><td class='{cycle values='odd,even'} pagination' colspan='4'>{$pager.all}</td></tr> 
    5937</table> 
    6038</div> {* msglist *} 

  • trunk/smarty/templates/messages/sent.tpl

    r1 r19  
    1818<table> 
    1919<tr><th class='profileHeader' colspan='4'>{t}Sent messages{/t}</th></tr> 
    20 {strip} 
    21 <tr><td class='{cycle values='odd,even'} pagination' colspan='4'> 
    22 {t}Page:{/t} 
    23 {foreach from=$pagination.pages item=none key=page} 
    24 {if $pagination.current_page == $page} 
    25 &nbsp;<strong>{$page}</strong> 
    26 {else} 
    27 &nbsp;<a href='/messages/{$token[1]}/{$page}'>{$page}</a> 
    28 {/if} 
    29 {/foreach} 
    30 </td></tr> 
    31 {/strip} 
     20<tr><td class='{cycle values='odd,even'} pagination' colspan='4'>{$pager.all}</td></tr> 
    3221{foreach name=messages from=$messages item=message key=id_mess} 
    3322<tr class='{cycle values='odd,even'}'> 
    … …  
    4029<tr><td align='center'>{t}No message{/t}</td></tr> 
    4130{/foreach} 
    42 {strip} 
    43 <tr><td class='{cycle values='odd,even'} pagination' colspan='4'> 
    44 {t}Page:{/t} 
    45 {foreach from=$pagination.pages item=none key=page} 
    46 {if $pagination.current_page == $page} 
    47 &nbsp;<strong>{$page}</strong> 
    48 {else} 
    49 &nbsp;<a href='/messages/{$token[1]}/{$page}'>{$page}</a> 
    50 {/if} 
    51 {/foreach} 
    52 </td></tr> 
    53 {/strip} 
     31<tr><td class='{cycle values='odd,even'} pagination' colspan='4'>{$pager.all}</td></tr> 
    5432</table> 
    5533</div>