[Openupload-svn-update] SF.net SVN: openupload:[389] branches/v0.4

[<ts...@us...>]

Revision: 389
          http://openupload.svn.sourceforge.net/openupload/?rev=389&view=rev
Author:   tsdogs
Date:     2010-11-20 11:17:37 +0000 (Sat, 20 Nov 2010)

Log Message:
-----------
fix upgrade problems + add version option in setup

Modified Paths:
--------------
    branches/v0.4/lib/modules/default/admin.inc.php
    branches/v0.4/www/setup.inc.php

Modified: branches/v0.4/lib/modules/default/admin.inc.php
===================================================================
--- branches/v0.4/lib/modules/default/admin.inc.php	2010-11-20 10:52:58 UTC (rev 388)
+++ branches/v0.4/lib/modules/default/admin.inc.php	2010-11-20 11:17:37 UTC (rev 389)
@@ -1113,13 +1113,13 @@
      /* run the upgrade */
     if (isset($_GET['upgrade'])) {
       $errors = array();
-      $fields = array('');
+      $fields = array('ip','user_login','module','action','realaction','plugin','result','moreinfo');
       $logs = app()->db->read('activitylog');        
       foreach ($logs as $l) {
         foreach ($fields as $f) {
           $l[$f]=htmlentities($l[$f]);
         }
-        if (app()->db->update('activitylog',$l,array('id' => $l['id'])))
+        if (!app()->db->update('activitylog',$l,array('id' => $l['id'])))
           $errors[] = 'ERROR updating activitylog ID: '.$l['id'];
       }
       /* now update the files */
@@ -1133,8 +1133,8 @@
       $users = app()->db->read('users');
       foreach ($users as $u) {
         $u['name']=htmlentities($u['name']);
-        if (app()->db->update('users',$u,array('login' => $u['login'])))
-           $errors[] = 'ERROR updating users ID: '.$u['login'];
+        if (!app()->db->update('users',$u,array('id' => $u['id'])))
+           $errors[] = 'ERROR updating user ID: '.$u['login'];
       }
       app()->tpl->assign('upgradeerrors',$errors);
       if (count($errors)==0) {

Modified: branches/v0.4/www/setup.inc.php
===================================================================
--- branches/v0.4/www/setup.inc.php	2010-11-20 10:52:58 UTC (rev 388)
+++ branches/v0.4/www/setup.inc.php	2010-11-20 11:17:37 UTC (rev 389)
@@ -300,6 +300,7 @@
       array ( 'id' => '1', 'plugin' => 'mimetypes', 'group_name' => '%5', 'name' => 'message', 'value' => 'Pdf, Jpeg'),
       array ( 'id' => '2', 'plugin' => 'mimetypes', 'group_name' => '%5', 'name' => 'allowed', 'value' => 'application/pdf'."\n".'image/jpeg'),
       array ( 'id' => '3', 'plugin' => 'expire', 'group_name' => '*', 'name' => 'days', 'value' => '30'),
+      array ( 'id' => '4', 'plugin' => 'upgrade', 'group_name' => '*', 'name' => 'version', 'value' => '0.4.2'),
     ),
   ),
   'mode_1' => array ( /* Private mode */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.