[geeklog-cvs] Geeklog-1.x/public_html/admin/install index.php, 1.15, 1.16

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv31786

Modified Files:
	index.php 
Log Message:
fixing plugin upgrades

Index: index.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** index.php	9 Sep 2007 07:59:43 -0000	1.15
--- index.php	11 Sep 2007 05:28:24 -0000	1.16
***************
*** 476,480 ****
                              require_once('config-install.php');
                              install_config();
!                             
                              $config = config::create();
                              $config->set('site_name', urldecode($site_name));
--- 476,480 ----
                              require_once('config-install.php');
                              install_config();
! 
                              $config = config::create();
                              $config->set('site_name', urldecode($site_name));
***************
*** 896,900 ****
  }
  
- 
  /**
   * Perform database upgrades
--- 896,899 ----
***************
*** 1254,1266 ****
              $config->set('path_pear', $_CONF['path_system'] . 'pear/');
  
              if (INST_pluginExists('polls')) {
!                 upgrade_PollsPlugin();
              }
              if (INST_pluginExists('staticpages')) {
!                 upgrade_StaticpagesPlugin();
              }
              if (INST_pluginExists('links')) {
!                 upgrade_LinksPlugin();
              }
              $current_gl_version = '1.4.2';
              $_SQL = '';
--- 1253,1294 ----
              $config->set('path_pear', $_CONF['path_system'] . 'pear/');
  
+ 
+             if (INST_pluginExists('calendar')) {
+                 $check = upgrade_CalendarPlugin();
+                 if (!$check) {
+                     echo "Error updating the calendar";
+                     return false;
+                 }
+             }
              if (INST_pluginExists('polls')) {
!                 $check = upgrade_PollsPlugin();
!                 if (!$check) {
!                     echo "Error updating the polls";
!                     return false;
!                 }
              }
              if (INST_pluginExists('staticpages')) {
!                 $check = upgrade_StaticpagesPlugin();
!                 if (!$check) {
!                     echo "Error updating the staticpages";
!                     return false;
!                 }
              }
              if (INST_pluginExists('links')) {
!                 $check = upgrade_LinksPlugin();
!                 if (!$check) {
!                     echo "Error updating the links";
!                     return false;
!                 }
              }
+             if (INST_pluginExists('spamx')) {
+                 $check = upgrade_SpamXPlugin();
+                 if (!$check) {
+                     echo "Error updating the spamx";
+                     return false;
+                 }
+             }
+ 
+ 
              $current_gl_version = '1.4.2';
              $_SQL = '';