summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHorus32014-09-22 20:28:25 +0200
committerHorus32014-09-22 20:28:25 +0200
commit9e1b66f564659de67f8eb6c44b12ef0050c31970 (patch)
treeca5e661962ec9168bb6edc8de0a5e911c96ecfcb
parent9c814f9b2859ea41ee18230a32008bb757d10ef3 (diff)
downloadvfs-9e1b66f564659de67f8eb6c44b12ef0050c31970.tar.gz
fixed bugsHEADmaster
-rw-r--r--public_html/class/vfsdata.php2
-rw-r--r--public_html/class/vfsuser.php6
-rw-r--r--public_html/vfs_bootstrap.php4
-rw-r--r--public_html/vfs_config.php6
4 files changed, 10 insertions, 8 deletions
diff --git a/public_html/class/vfsdata.php b/public_html/class/vfsdata.php
index 92d9745..05fced6 100644
--- a/public_html/class/vfsdata.php
+++ b/public_html/class/vfsdata.php
@@ -62,7 +62,7 @@ class vfsdata {
$length = $tmp_length;
- for ( $i=0; $i<$length, $i++ ) {
+ for ( $i=0; $i<$length; $i++ ) {
$sql = $vfsdb->prepare("SELECT id, parent FROM files WHERE owner = %d AND parent = %d AND name = %s " . $visibility . ";", $this->userid, $parentdir, $folder[$i]);
$parentdir_db = $vfsdb->doQuery($sql);
diff --git a/public_html/class/vfsuser.php b/public_html/class/vfsuser.php
index c0bc83f..761d149 100644
--- a/public_html/class/vfsuser.php
+++ b/public_html/class/vfsuser.php
@@ -75,9 +75,9 @@ class vfsuser {
}
# check if valid user
- publlic function isValidUser(){
+ public function isValidUser(){
if( ( is_bool($this->query) && ! $this->query ) || is_null($this->query) )
- return false
+ return false;
return true;
}
@@ -100,7 +100,7 @@ class vfsuser {
$this->login = true;
# start a session if needed
- if ( session_status() != PHP_SESSION_ACTIVE )
+ if ( session_status() != PHP_SESSION_ACTIVE ) {
session_name(VFS_SESSION);
session_start();
}
diff --git a/public_html/vfs_bootstrap.php b/public_html/vfs_bootstrap.php
index 065c73e..2b8a965 100644
--- a/public_html/vfs_bootstrap.php
+++ b/public_html/vfs_bootstrap.php
@@ -1,5 +1,5 @@
<?php
-# loads the vfs environment
+### loads the vfs environment
require_once( dirname(__FILE__) . '/vfs_config.php');
@@ -51,6 +51,8 @@ if ( $_SERVER['HTTP_HOST'] != HOST){
require(ABSPATH . 'functions.php');
require(ABSPATH . VFS_CLASS . 'mysql.php');
require(ABSPATH . VFS_CLASS . 'vfsuser.php');
+require(ABSPATH . VFS_CLASS . 'vfsdata.php');
+# first install only
if ( file_exists(ABSPATH . 'setup.php') )
require(ABSPATh . 'setup.php');
diff --git a/public_html/vfs_config.php b/public_html/vfs_config.php
index f2b9aef..4c19c4c 100644
--- a/public_html/vfs_config.php
+++ b/public_html/vfs_config.php
@@ -12,12 +12,12 @@ define('DBPREFIX', 'vfs_');
define('PEPPER_IS_FILE', false);
define('PEPPER', 'somelongstringhere');
-# how many invites new user gets per default
-define('INVITES_DEFAULT', 5);
-
# define('PEPPER_IS_FILE', true);
# define('PEPPER', dirname(__FILE__) . '/../pepper.txt');
+### how many invites new user gets per default
+define('INVITES_DEFAULT', 5);
+
### absolute path
# define('ABSPATH', dirname(__FILE__) . '/');