diff --git a/i_entrance/j_server_get_admin_status.php b/i_entrance/j_server_get_admin_status.php index ca8b13e3..67d83838 100644 --- a/i_entrance/j_server_get_admin_status.php +++ b/i_entrance/j_server_get_admin_status.php @@ -17,7 +17,7 @@ $result = []; $server = []; -$storage = new \sammo\KVStorage(RootDB::db(), 'git_path'); +$storage = KVStorage::getStorage(RootDB::db(), 'git_path'); $serverGitPath = $storage->getAll(); $rootServer = Util::array_last(ServConfig::getServerList())->getShortName(); @@ -81,7 +81,7 @@ foreach (ServConfig::getServerList() as $setting) { 'lastGitPath' => ($serverGitPath[$serverDir][0])??($serverDir == $rootServer?'devel':'origin/devel') ]; $server[] = $state; -} +} Json::die([ 'acl' => $session->acl, diff --git a/j_updateServer.php b/j_updateServer.php index 49fbbb00..eedb8169 100644 --- a/j_updateServer.php +++ b/j_updateServer.php @@ -178,7 +178,7 @@ $session = Session::requireLogin(null)->setReadOnly(); $request = $_POST + $_GET; $rootDB = RootDB::db(); -$storage = new \sammo\KVStorage($rootDB, 'git_path'); +$storage = KVStorage::getStorage($rootDB, 'git_path'); $tmpFile = 'd_log/arc.zip'; $v = new Validator($request);