diff options
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/DB_Upgrade.php | 24 | ||||
| -rw-r--r-- | Zotlabs/Module/Cloud.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Filestorage.php | 2 |
3 files changed, 15 insertions, 13 deletions
diff --git a/Zotlabs/Lib/DB_Upgrade.php b/Zotlabs/Lib/DB_Upgrade.php index 13adaced5..2ee29c314 100644 --- a/Zotlabs/Lib/DB_Upgrade.php +++ b/Zotlabs/Lib/DB_Upgrade.php @@ -8,9 +8,10 @@ class DB_Upgrade { function __construct($db_revision) { - $build = get_config('system','db_version',0); + + $build = get_config('system', PLATFORM_NAME . '_db_version', 0); if(! intval($build)) - $build = set_config('system','db_version',$db_revision); + $build = set_config('system', PLATFORM_NAME . '_db_version', $db_revision); if($build == $db_revision) { // Nothing to be done. @@ -24,14 +25,17 @@ class DB_Upgrade { } $current = intval($db_revision); - if(($stored < $current) && file_exists('install/update.php')) { + + $update_file = 'install/' . PLATFORM_NAME . '/update.php'; + + if(($stored < $current) && file_exists($update_file)) { Config::Load('database'); // We're reporting a different version than what is currently installed. // Run any existing update scripts to bring the database up to current. - require_once('install/update.php'); + require_once($update_file); // make sure that boot.php and update.php are the same release, we might be // updating from git right this very second and the correct version of the update.php @@ -39,7 +43,8 @@ class DB_Upgrade { if($db_revision == UPDATE_VERSION) { for($x = $stored; $x < $current; $x ++) { - if(function_exists('update_r' . $x)) { + $func = PLATFORM_NAME . '_update_' . $x; + if(function_exists($func)) { // There could be a lot of processes running or about to run. // We want exactly one process to run the update command. // So store the fact that we're taking responsibility @@ -48,12 +53,11 @@ class DB_Upgrade { // If the update fails or times-out completely you may need to // delete the config entry to try again. - if(get_config('database','update_r' . $x)) + if(get_config('database', $func)) break; - set_config('database','update_r' . $x, '1'); + set_config('database',$func, '1'); // call the specific update - $func = 'update_r' . $x; $retval = $func(); if($retval) { @@ -93,11 +97,11 @@ class DB_Upgrade { pop_lang(); } else { - set_config('database','update_r' . $x, 'success'); + set_config('database',$func, 'success'); } } } - set_config('system','db_version', $db_revision); + set_config('system', PLATFORM_NAME . '_db_version', $db_revision); } } } diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php index 2b6d7bcbe..7370eeda3 100644 --- a/Zotlabs/Module/Cloud.php +++ b/Zotlabs/Module/Cloud.php @@ -60,11 +60,9 @@ class Cloud extends \Zotlabs\Web\Controller { $_SERVER['QUERY_STRING'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['QUERY_STRING']); $_SERVER['QUERY_STRING'] = strip_zids($_SERVER['QUERY_STRING']); - $_SERVER['QUERY_STRING'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism', '', $_SERVER['QUERY_STRING']); $_SERVER['REQUEST_URI'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['REQUEST_URI']); $_SERVER['REQUEST_URI'] = strip_zids($_SERVER['REQUEST_URI']); - $_SERVER['REQUEST_URI'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism', '', $_SERVER['REQUEST_URI']); $rootDirectory = new \Zotlabs\Storage\Directory('/', $auth); diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php index 874445145..785dff394 100644 --- a/Zotlabs/Module/Filestorage.php +++ b/Zotlabs/Module/Filestorage.php @@ -130,7 +130,7 @@ class Filestorage extends \Zotlabs\Web\Controller { $f = $r[0]; $channel = \App::get_channel(); - $cloudpath = get_cloudpath($f) . (intval($f['is_dir']) ? '?f=&davguest=1' : ''); + $cloudpath = get_cloudpath($f); $parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']); $aclselect_e = populate_acl($f, false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')); |