[geeklog-cvs] geeklog: Minor corrections, refinements, and cosmetics

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ec370986aa11
changeset: 6589:ec370986aa11
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Dec 25 22:48:45 2008 +0100
description:
Minor corrections, refinements, and cosmetics

diffstat:

3 files changed, 28 insertions(+), 15 deletions(-)
plugins/calendar/autoinstall.php              |    9 ++++++-
plugins/calendar/functions.inc                |    2 -
public_html/admin/install/install-plugins.php |   32 ++++++++++++++-----------

diffs (106 lines):

diff -r c26c11b34fd9 -r ec370986aa11 plugins/calendar/autoinstall.php
--- a/plugins/calendar/autoinstall.php	Thu Dec 25 22:11:00 2008 +0100
+++ b/plugins/calendar/autoinstall.php	Thu Dec 25 22:48:45 2008 +0100
@@ -59,11 +59,18 @@
         $pi_name . '.submit'    => array($pi_admin)
     );
 
+    $tables = array(
+        'events',
+        'eventsubmission',
+        'personal_events'
+    );
+
     $inst_parms = array(
         'info'      => $info,
         'groups'    => $groups,
         'features'  => $features,
-        'mappings'  => $mappings
+        'mappings'  => $mappings,
+        'tables'    => $tables
     );
 
     return $inst_parms;
diff -r c26c11b34fd9 -r ec370986aa11 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Thu Dec 25 22:11:00 2008 +0100
+++ b/plugins/calendar/functions.inc	Thu Dec 25 22:48:45 2008 +0100
@@ -57,7 +57,7 @@
     $_CA_CONF = $ca_config->get_config('calendar');
 }
 
-$_CA_CONF['version'] = '1.0.2';
+$_CA_CONF['version'] = '1.1.0';
 
 // +---------------------------------------------------------------------------+
 // | Geeklog Plugin API Implementations                                        |
diff -r c26c11b34fd9 -r ec370986aa11 public_html/admin/install/install-plugins.php
--- a/public_html/admin/install/install-plugins.php	Thu Dec 25 22:11:00 2008 +0100
+++ b/public_html/admin/install/install-plugins.php	Thu Dec 25 22:48:45 2008 +0100
@@ -207,12 +207,18 @@
                         $upload_success = $archive->extract($_CONF['path'] . 'plugins/');
 
                     }
+
+                    $plg_path = $_CONF['path'] . 'plugins/' . $pi_name . '/';
                     if ($upload_success) { 
 
-                        if (file_exists($_CONF['path'] . 'plugins/' . $pi_name . '/public_html')) {
-                            rename($_CONF['path'] . 'plugins/' . $pi_name . '/public_html', $_CONF['path_html'] . $pi_name);
+                        if (file_exists($plg_path . 'public_html')) {
+                            rename($plg_path . 'public_html',
+                                   $_CONF['path_html'] . $pi_name);
                         }
-                        rename($_CONF['path'] . 'plugins/' . $pi_name . '/admin', $_CONF['path_html'] . 'admin/plugins/' . $pi_name);
+                        if (file_exists($plg_path . 'admin')) {
+                            rename($plg_path . 'admin', $_CONF['path_html']
+                                   . 'admin/plugins/' . $pi_name);
+                        }
 
                     }
 
@@ -248,8 +254,10 @@
         $fd = opendir($plugins_dir);
         while (($plugin = @readdir($fd)) == TRUE) {
 
-            if (is_dir ($plugins_dir . $plugin) && ($plugin != '.') && ($plugin != '..') &&
-                    ($plugin != 'CVS') && (substr ($plugin, 0 , 1) != '.')) {
+            if (($plugin <> '.') && ($plugin <> '..') && ($plugin <> 'CVS') &&
+                    (substr($plugin, 0, 1) <> '.') &&
+                    (substr($plugin, 0, 1) <> '_') &&
+                    is_dir($plugins_dir . $plugin)) {
 
                 clearstatcache ();
 
@@ -287,8 +295,10 @@
             $fd = opendir($plugins_dir);
             while (($plugin = @readdir($fd)) == TRUE) {
     
-                if (is_dir ($plugins_dir . $plugin) && ($plugin != '.') && ($plugin != '..') &&
-                        ($plugin != 'CVS') && (substr ($plugin, 0 , 1) != '.') && ($plugin != '__MACOSX')) {
+                if (($plugin <> '.') && ($plugin <> '..') &&
+                        ($plugin <> 'CVS') && (substr($plugin, 0, 1) <> '.') &&
+                        (substr($plugin, 0, 1) <> '_') &&
+                        is_dir($plugins_dir . $plugin)) {
     
                     clearstatcache ();
                     $plugin_dir = $plugins_dir . $plugin;
@@ -423,17 +433,13 @@
 
                         $display .= '<tr>' . LB
                             . '<td align="center"><input type="checkbox" name="plugins[' . $plugin . '][install]"'
-                                . ($missing_public_html || $missing_admin || $missing_autoinstall ? ' disabled="true"' : ' checked="checked"') . XHTML . '>' . LB
+                                . ($missing_autoinstall ? ' disabled="disabled"' : ' checked="checked"') . XHTML . '>' . LB
                             . '</td>' . LB
                             . '<td valign="top">' . LB
                                 . '<input type="hidden" name="plugins[' . $plugin . '][name]" value="' . $plugin . '"' . XHTML . '>' 
                                 . '<input type="hidden" name="plugins[' . $plugin . '][pi_url]" value="' . $pi_url . '"' . XHTML . '>'
                                 . $pi_display_name . LB
-                                . ($missing_public_html || $missing_admin 
-                                    ? '<br' . XHTML . '><br' . XHTML . '><p><small><span class="error">Warning:</span> This plugin is not fully installed. Check that the plugin has been correctly installed to:<br' . XHTML . '><br' . XHTML . '>' 
-                                        . ($missing_public_html ? '<code>' . $_CONF['path_html'] . '</code><br' . XHTML . '>' : '') 
-                                        . ($missing_admin ? '<code>' . $admin_dir . '</code><br' . XHTML . '>' : '') . '</small></p>'
-                                    : '')
+                                . ($missing_autoinstall ? '<p><small><b>Note:</b> This plugin requires manual activation from the Plugins admin panel.</small></p>' : '')
                             . '</td>' . LB
                             . '<td align="center"><input type="hidden" name="plugins[' . $plugin . '][version]" value="' . $pi_version . '"' . XHTML . '>' 
                                 . $pi_version