[Openupload-svn-update] SF.net SVN: openupload:[52] trunk/lib/modules/db/txt.inc.php

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

Revision: 52
          http://openupload.svn.sourceforge.net/openupload/?rev=52&view=rev
Author:   tsdogs
Date:     2008-10-22 18:34:43 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
fix app() function dependency.

Modified Paths:
--------------
    trunk/lib/modules/db/txt.inc.php

Modified: trunk/lib/modules/db/txt.inc.php
===================================================================
--- trunk/lib/modules/db/txt.inc.php	2008-10-22 17:46:24 UTC (rev 51)
+++ trunk/lib/modules/db/txt.inc.php	2008-10-22 18:34:43 UTC (rev 52)
@@ -7,14 +7,13 @@
   var $rootdir;
   var $prefix;
 
-  function txtDB() {
+  function txtDB($config) {
     $this->tables = array (
       "files" => array (
         "type" => "file",
         "fields" => array (
           "id", "name", "mime", "description", "size", "remove", "user_id", "ip", "upload_date",
         )
-        
       ),
       "users" => array (
         "type" => "file",
@@ -59,7 +58,7 @@
       "plugin_options" => array (
         "type" => "file",
         "fields" => array (
-          "id", "plugin", "group_id", "option", "value",
+          "id", "plugin", "group_id", "name", "value",
         ),
         "auto_increment" => "id",
       ),
@@ -71,6 +70,9 @@
         "auto_increment" => "id",
       ),
     );
+    $this->baseDir=$config['rootdir'];
+    $this->prefix=$config['prefix'];
+
   }
 
   function readTxt ($file) {
@@ -108,8 +110,6 @@
 
   function init() {
     /* initialize file names */
-    $this->baseDir=app()->config['database']['rootdir'];
-    $this->prefix=app()->config['database']['prefix'];
     if (!is_dir($this->baseDir)) {
        die(tr('ERROR: database folder not found!'));
     }


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