[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.63,1.419.2.64 serendipity_genpage.inc.php,1.33.2.9,1.33.2.10 serendipity_plugin_api.php,1.23.2.8,1.23.2.9

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30812

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php serendipity_genpage.inc.php 
	serendipity_plugin_api.php 
Log Message:
only show sidebars when asked for


Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.23.2.8
retrieving revision 1.23.2.9
diff -u -d -r1.23.2.8 -r1.23.2.9
--- serendipity_plugin_api.php	28 Oct 2004 20:17:10 -0000	1.23.2.8
+++ serendipity_plugin_api.php	4 Nov 2004 13:42:54 -0000	1.23.2.9
@@ -244,6 +244,29 @@
         return serendipity_db_query($sql);
     }
 
+    /* Retrieves a list of plugin instances */
+    function count_plugins($filter = '*', $negate = false)
+    {
+        global $serendipity;
+
+        $sql = "SELECT COUNT(placement) AS count from {$serendipity['dbPrefix']}plugins ";
+
+        if ($filter !== '*') {
+            if ($negate) {
+                $sql .= "WHERE placement != '$filter' ";
+            } else {
+                $sql .= "WHERE placement='$filter' ";
+            }
+        }
+
+        $count = serendipity_db_query($sql, true);
+        if (is_array($count) && isset($count[0])) {
+            return (int)$count[0];
+        }
+
+        return 0;
+    }
+
     /* Creates an instance of a named plugin */
     function &load_plugin($instance_id)
     {

Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.33.2.9
retrieving revision 1.33.2.10
diff -u -d -r1.33.2.9 -r1.33.2.10
--- serendipity_genpage.inc.php	30 Sep 2004 18:05:44 -0000	1.33.2.9
+++ serendipity_genpage.inc.php	4 Nov 2004 13:42:54 -0000	1.33.2.10
@@ -11,7 +11,6 @@
     $serendipity['smarty_raw_mode'] = false;
 }
 
-
 $serendipity['smarty']->assign(
     array(
         'head_charset'              => LANG_CHARSET,
@@ -34,6 +33,9 @@
         'serendipityBaseURL'        => $serendipity['baseURL'],
         'serendipityRewritePrefix'  => $serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '',
         'serendipityIndexFile'      => $serendipity['indexFile'],
+
+        'leftSidebarElements'       => serendipity_plugin_api::count_plugins('left'),
+        'rightSidebarElements'      => serendipity_plugin_api::count_plugins('right')
     )
 );