Xaraya / Postnuke CVS Notices - Message

Note: this list is kept only as a demonstration for CVSNotice. For the latest CVS notices, see the Xaraya and Postnuke sites

Directory filter : [ all ] / postnuke_modules / articles [ view in CVS ]

Date	Directory [filter]	File(s) [view]	Author [filter]
28 Jul 2002 02:03:21	postnuke_modules/articles	pnuser.php,1.29,1.30	Mike
	switch to $data array

Update of /home/cvsroot/postnuke_modules/articles
In directory ns7.hostnuke.net:/tmp/cvs-serv27280

Modified Files:
	pnuser.php 
Log Message:
switch to $data array


Index: pnuser.php
===================================================================
RCS file: /home/cvsroot/postnuke_modules/articles/pnuser.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** pnuser.php	28 Jul 2002 01:39:11 -0000	1.29
--- pnuser.php	28 Jul 2002 02:03:19 -0000	1.30
***************
*** 175,186 ****
                                      'modid' => pnModGetIDFromName('articles')));
  
!             $trail = pnModAPIFunc('categories',
!                                   'user',
!                                   'getcat',
!                                   array('cid' => $cids[0],
!                                         'return_itself' => true,
!                                         'getchildren' => true));
  // TODO: make sure permissions are taken into account here !
!             foreach ($trail as $info) {
                  if ($info['cid'] == $cids[0]) {
                      $startindent = $info['indentation'];
--- 175,186 ----
                                      'modid' => pnModGetIDFromName('articles')));
  
!             $tree = pnModAPIFunc('categories',
!                                  'user',
!                                  'getcat',
!                                  array('cid' => $cids[0],
!                                        'return_itself' => true,
!                                        'getchildren' => true));
  // TODO: make sure permissions are taken into account here !
!             foreach ($tree as $info) {
                  if ($info['cid'] == $cids[0]) {
                      $startindent = $info['indentation'];
***************
*** 368,372 ****
      $icons = '';
      // display one (or more) bread-crumb trails of categories
!     $trails = array();
      foreach ($cids as $cid => $ids) {
          $trailitem['cid'] = $cid;
--- 368,372 ----
      $icons = '';
      // display one (or more) bread-crumb trails of categories
!     $data['trails'] = array();
      foreach ($cids as $cid => $ids) {
          $trailitem['cid'] = $cid;
***************
*** 380,392 ****
          $trailitem['parentlinks'] = array();
          foreach ($trail as $info) {
!             $item['link'] = pnModURL('articles',
                                      'user',
                                      'view',
                                      array('cids' => array($info['cid'])));
!             $item['title'] = pnVarPrepForDisplay(pnVarCensor($info['name']));
              if ($info['cid'] != $cid) {
!                 $item['join'] = ' - ';
              } else {
!                 $item['join'] = '';
              }
              $trailitem['parentlinks'][] = $item;
--- 380,392 ----
          $trailitem['parentlinks'] = array();
          foreach ($trail as $info) {
!             $item['plink'] = pnModURL('articles',
                                      'user',
                                      'view',
                                      array('cids' => array($info['cid'])));
!             $item['ptitle'] = pnVarPrepForDisplay(pnVarCensor($info['name']));
              if ($info['cid'] != $cid) {
!                 $item['pjoin'] = ' - ';
              } else {
!                 $item['pjoin'] = '';
              }
              $trailitem['parentlinks'][] = $item;
***************
*** 402,438 ****
              }
          }
!         $trails[] = $trailitem;
      }
-     $article['trails'] = $trails;
  
      // Display article
  
  // TODO: improve the case where we have several icons :)
!     $article['topic_icons'] = $icons;
  
  // TODO: output from hooks comes here ?
!     $article['comments'] = ''; 
  // TODO: to be defined
!     $article['counter'] = ''; 
!     $article['notes'] = '';
  
      if ($article['pubtypeid'] == 1) {
  // TODO: add pnVarCensor ?
!         $article['author'] = pnUserGetVar('name', $article['authorid']);
!         $article['date'] = strftime(_DATETIMELONG, $article['pubdate']);
      }
  
      // Navigation links
!     $article['publinks'] = articles_user_getpublinks();
!     $article['maplink'] = pnModURL('articles','user','viewmap',array());
  
      // Hooks
!     $article['hooks'] = pnModCallHooks('item',
!                                        'display',
!                                        $aid,
!                                        pnModURL('articles',
!                                                 'user',
!                                                 'display',
!                                                 array('aid' => $aid)));
  
      // Template depending on publication type
--- 402,440 ----
              }
          }
!         $data['trails'][] = $trailitem;
      }
  
      // Display article
  
  // TODO: improve the case where we have several icons :)
!     $data['topic_icons'] = $icons;
  
  // TODO: output from hooks comes here ?
!     $data['comments'] = ''; 
  // TODO: to be defined
!     $data['counter'] = ''; 
!     $data['notes'] = '';
  
      if ($article['pubtypeid'] == 1) {
  // TODO: add pnVarCensor ?
!         $data['author'] = pnUserGetVar('name', $article['authorid']);
!         $data['date'] = strftime(_DATETIMELONG, $article['pubdate']);
!         $data['summary'] = $article['summary'];
      }
+     $data['title'] = $article['title'];
+     $data['body'] = $article['body'];
  
      // Navigation links
!     $data['publinks'] = articles_user_getpublinks();
!     $data['maplink'] = pnModURL('articles','user','viewmap',array());
  
      // Hooks
!     $data['hooks'] = pnModCallHooks('item',
!                                     'display',
!                                     $aid,
!                                     pnModURL('articles',
!                                              'user',
!                                              'display',
!                                              array('aid' => $aid)));
  
      // Template depending on publication type
***************
*** 440,444 ****
  
      // return template out
!     return pnModTemplate('articles', 'user', $template . '-content', $article);
  }
  
--- 442,446 ----
  
      // return template out
!     return pnModTemplate('articles', 'user', $template . '-content', $data);
  }
  
***************
*** 487,491 ****
  
  // TODO: make sure permissions are taken into account here !
!     $trail = pnModAPIFunc('categories',
                            'user',
                            'getcat',
--- 489,493 ----
  
  // TODO: make sure permissions are taken into account here !
!     $tree = pnModAPIFunc('categories',
                            'user',
                            'getcat',
***************
*** 493,497 ****
      $startindent = 0;
      $oldindent = 0;
!     foreach ($trail as $info) {
          $tags = '';
          if ($info['indentation'] > $oldindent) {
--- 495,499 ----
      $startindent = 0;
      $oldindent = 0;
!     foreach ($tree as $info) {
          $tags = '';
          if ($info['indentation'] > $oldindent) {

View Statistics - Next Notice - Previous Notice