[Php-blog-plugin-cvs] additional_plugins/serendipity_event_staticpage serendipity_event_staticpage.php, 1.115, 1.116

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

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_staticpage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7035

Modified Files:
	serendipity_event_staticpage.php 
Log Message:
Fix external plugin listing bug

Index: serendipity_event_staticpage.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_staticpage/serendipity_event_staticpage.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- serendipity_event_staticpage.php	24 Aug 2007 10:40:39 -0000	1.115
+++ serendipity_event_staticpage.php	25 Aug 2007 11:48:24 -0000	1.116
@@ -81,7 +81,7 @@
         $propbag->add('page_configuration', $this->config);
         $propbag->add('type_configuration', $this->config_types);
         $propbag->add('author', 'Marco Rinck, Garvin Hicking, David Rolston, Falk Doering, Stephan Manske');
-        $propbag->add('version', '3.57');
+        $propbag->add('version', '3.59');
         $propbag->add('requirements',  array(
             'serendipity' => '0.8',
             'smarty'      => '2.6.7',
@@ -1474,14 +1474,14 @@
 
         $q = "SELECT id, pagetitle, permalink, pre_content
                 FROM ".$serendipity['dbPrefix']."staticpages
-               WHERE content = \'plugin\'
+               WHERE content = 'plugin'
               ORDER BY pageorder";
         $res = (array)serendipity_db_query($q, false, 'assoc');
         foreach($res as $plugin){
             $ret[$plugin['pre_content']] = array(
                 'pagetitle' => $plugin['pagetitle'],
                 'permalink' => $plugin['permalink'],
-                'id' => $plugin['id']
+                'id'        => $plugin['id']
             );
         }
         return $ret;
@@ -1632,33 +1632,33 @@
 
                 $plugins = $this->selectPlugins();
                 $insplugins = $this->fetchPlugins();
-                if(isset($serendipity['POST']['typeSubmit'])) {
+                if (isset($serendipity['POST']['typeSubmit'])) {
                     foreach($insplugins as $key => $values) {
-                        if(empty($serendipity['POST']['externalPlugins'][$key])) {
+                        if (empty($serendipity['POST']['externalPlugins'][$key])) {
                             serendipity_db_query('DELETE FROM '.$serendipity['dbPrefix'].'staticpages WHERE id = '.(int)$values['id']);
                         }
                     }
-                    if(count($serendipity['POST']['externalPlugins'])) {
+                    if (count($serendipity['POST']['externalPlugins'])) {
                         foreach($serendipity['POST']['externalPlugins'] as $plugin) {
                             $this->staticpage =  array(
-                                'permalink' => $plugins[$plugin]['link'],
-                                'content' => 'plugin',
+                                'permalink'   => $plugins[$plugin]['link'],
+                                'content'     => 'plugin',
                                 'pre_content' => $plugin,
-                                'pagetitle' => $plugins[$plugin]['name'],
-                                'headline' => $plugins[$plugin]['name']
+                                'pagetitle'   => $plugins[$plugin]['name'],
+                                'headline'    => $plugins[$plugin]['name']
                             );
                             $this->updateStaticPage();
                         }
                     }
                 }
                 $insplugins = $this->fetchPlugins();
-                if(is_array($plugins)) {
+                if (is_array($plugins)) {
                     echo '<form action="serendipity_admin.php" method="post" name="serendipityPlugins">';
                     echo '<input type="hidden" name="serendipity[adminModule]" value="event_display" />';
                     echo '<input type="hidden" name="serendipity[adminAction]" value="staticpages" />';
                     echo '<input type="hidden" name="serendipity[staticpagecategory]" value="pageadd" />';
                     foreach($plugins as $key => $plugin) {
-                        if(isset($insplugins[$key])) {
+                        if (isset($insplugins[$key])) {
                             $c = 'checked="checked"';
                         } else {
                             $c = '';
@@ -2317,7 +2317,7 @@
     {
         global $serendipity;
 
-        $q = 'SELECT id, pagetitle, permalink, publishstatus
+        $q = 'SELECT *
                 FROM '.$serendipity['dbPrefix'].'staticpages
                WHERE id = '.(int)$staticpage_id.'
                LIMIT 1';