[geeklog-cvs] Geeklog-1.x/plugins/staticpages functions.inc, 1.121, 1.122

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv94080

Modified Files:
	functions.inc 
Log Message:
Define {lastupdate} and {hits} in centerblocks but stripped them from the default centerblock template file


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/functions.inc,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** functions.inc	12 May 2008 10:29:55 -0000	1.121
--- functions.inc	12 May 2008 10:49:14 -0000	1.122
***************
*** 843,847 ****
          $perms = ' AND ' . $perms;
      }
!     $spsql = "SELECT sp_id,sp_title,sp_content,sp_format,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,sp_php,sp_inblock,sp_help FROM {$_TABLES['staticpage']} WHERE (sp_centerblock = 1)" . COM_getLangSql ('sp_id', 'AND') . ' AND ' . $moresql . $perms . " ORDER BY " . $sort;
      $result = DB_query ($spsql);
  
--- 843,847 ----
          $perms = ' AND ' . $perms;
      }
!     $spsql = "SELECT sp_id,sp_title,sp_content,sp_format,sp_date,sp_hits,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,sp_php,sp_inblock,sp_help FROM {$_TABLES['staticpage']} WHERE (sp_centerblock = 1)" . COM_getLangSql ('sp_id', 'AND') . ' AND ' . $moresql . $perms . " ORDER BY " . $sort;
      $result = DB_query ($spsql);
  
***************
*** 907,910 ****
--- 907,926 ----
                  );
                  $spage->set_var('edit_icon', $icon);
+             }
+ 
+             $spage->set_var('info_separator', 'hidden');
+             if ($_SP_CONF['show_date'] == 1) {
+                 $curtime = COM_getUserDateTimeFormat($S['sp_date']);
+                 $lastupdate = $LANG_STATIC['lastupdated']. ' ' . $curtime[0];
+                 $spage->set_var('lastupdate', $lastupdate);
+             }
+ 
+             if ($_SP_CONF['show_hits'] == 1) {
+                 if ($_SP_CONF['show_date'] == 1) {
+                     $spage->set_var('info_separator', 'visible');
+                 }
+                 $hits = COM_numberFormat($S['sp_hits']) . ' '
+                                          . $LANG_STATIC['hits'];
+                 $spage->set_var('hits', $hits);
              }