Skip to content
Snippets Groups Projects
Commit 2ef1a3ab authored by Rasmus Fuhse's avatar Rasmus Fuhse
Browse files

fix configs of 4.1

parent c0e5c74e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
OwnCloudPlugin.class.php
+ 3
− 3
View file @ 2ef1a3ab
......@@ -39,7 +39,7 @@ class OwnCloudPlugin extends StudIPPlugin implements FilesystemPlugin {
$args = func_get_args();
$file_id = implode("/", array_map("rawurlencode", $args));
$url = Config::get()->OWNCLOUD_ENDPOINT ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT;
$url = UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT ?: Config::get()->OWNCLOUD_ENDPOINT_USER;
if ($url[strlen($url) - 1] !== "/") {
$url .= "/";
}
......@@ -109,7 +109,7 @@ class OwnCloudPlugin extends StudIPPlugin implements FilesystemPlugin {
$file->content_terms_of_use_id = 'UNDEF_LICENSE';
if ($with_blob) {
$url = Config::get()->OWNCLOUD_ENDPOINT ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT;
$url = Config::get()->OWNCLOUD_ENDPOINT ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT_USER;
if ($url[strlen($url) - 1] !== "/") {
$url .= "/";
}
......@@ -171,7 +171,7 @@ class OwnCloudPlugin extends StudIPPlugin implements FilesystemPlugin {
protected function getType($id)
{
$url = Config::get()->OWNCLOUD_ENDPOINT ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT;
$url = Config::get()->OWNCLOUD_ENDPOINT ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT_USER;
if ($url[strlen($url) - 1] !== "/") {
$url .= "/";
}
......
classes/OAuth.class.php 100644 → 100755
+ 5
− 5
View file @ 2ef1a3ab
......@@ -54,12 +54,12 @@ class OAuth {
static public function refreshAccessToken()
{
$owncloud = \Config::get()->OWNCLOUD_ENDPOINT ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT;
$owncloud = \Config::get()->OWNCLOUD_ENDPOINT ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT_USER;
if ($owncloud[strlen($owncloud) - 1] !== "/") {
$owncloud .= "/";
}
$client_id = \Config::get()->OWNCLOUD_CLIENT_ID ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID; // The client ID assigned to you by the provider
$client_secret = \Config::get()->OWNCLOUD_CLIENT_SECRET ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_SECRET; // The client password assigned to you by the provider
$client_id = \Config::get()->OWNCLOUD_CLIENT_ID ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID_USER; // The client ID assigned to you by the provider
$client_secret = \Config::get()->OWNCLOUD_CLIENT_SECRET ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_SECRET_USER; // The client password assigned to you by the provider
$header = array();
......@@ -92,12 +92,12 @@ class OAuth {
if (!$json) {
\URLHelper::setBaseURL($GLOBALS['ABSOLUTE_URI_STUDIP']);
//Muss den Nutzer weiterleiten auf den Server, wo der Nutzer die App freischaltet
$owncloud = \Config::get()->OWNCLOUD_ENDPOINT ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT;
$owncloud = \Config::get()->OWNCLOUD_ENDPOINT ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT_USER;
if ($owncloud[strlen($owncloud) - 1] !== "/") {
$owncloud .= "/";
}
\URLHelper::setBaseURL($GLOBALS['ABSOLUTE_URI_STUDIP']);
$client_id = \Config::get()->OWNCLOUD_CLIENT_ID ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID;
$client_id = \Config::get()->OWNCLOUD_CLIENT_ID ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID_USER;
$redirect_uri = \URLHelper::getURL("plugin.php/owncloudplugin/oauth/receive_access_token", array(), true);
$url = $owncloud."index.php/apps/oauth2/authorize";
......
classes/OwncloudFolder.class.php 100644 → 100755
+ 1
− 1
View file @ 2ef1a3ab
......@@ -314,7 +314,7 @@ class OwncloudFolder extends VirtualFolderType {
protected function getWebDavURL()
{
$url = Config::get()->OWNCLOUD_ENDPOINT ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT;
$url = Config::get()->OWNCLOUD_ENDPOINT ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT_USER;
if ($url[strlen($url) - 1] !== "/") {
$url .= "/";
}
......
controllers/configure.php
+ 1
− 1
View file @ 2ef1a3ab
......@@ -14,7 +14,7 @@ class ConfigureController extends PluginController
$config = UserConfig::get($GLOBALS['user']->id);
$data = Request::getArray("owncloud");
foreach ($data as $key => $value) {
$config->store("OWNCLOUD_".strtoupper($key), $value);
$config->store("OWNCLOUD_".strtoupper($key)."_USER", $value);
}
if (!$data['activated']) {
$config->store("OWNCLOUD_ACTIVATED", 0);
......
controllers/oauth.php
+ 5
− 5
View file @ 2ef1a3ab
......@@ -6,12 +6,12 @@ class OauthController extends PluginController
{
URLHelper::setBaseURL($GLOBALS['ABSOLUTE_URI_STUDIP']);
//Muss den Nutzer weiterleiten auf den Server, wo der Nutzer die App freischaltet
$owncloud = Config::get()->OWNCLOUD_ENDPOINT ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT;
$owncloud = Config::get()->OWNCLOUD_ENDPOINT ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT_USER;
if ($owncloud[strlen($owncloud) - 1] !== "/") {
$owncloud .= "/";
}
URLHelper::setBaseURL($GLOBALS['ABSOLUTE_URI_STUDIP']);
$client_id = Config::get()->OWNCLOUD_CLIENT_ID ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID;
$client_id = Config::get()->OWNCLOUD_CLIENT_ID ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID_USER;
$redirect_uri = PluginEngine::getURL($this->plugin, array(), "oauth/receive_access_token", true);
$url = $owncloud."index.php/apps/oauth2/authorize";
......@@ -30,7 +30,7 @@ class OauthController extends PluginController
public function receive_access_token_action()
{
//Save the access token and refresh-token
$owncloud = Config::get()->OWNCLOUD_ENDPOINT ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT;
$owncloud = Config::get()->OWNCLOUD_ENDPOINT ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT_USER;
if ($owncloud[strlen($owncloud) - 1] !== "/") {
$owncloud .= "/";
}
......@@ -40,8 +40,8 @@ class OauthController extends PluginController
}
$client_id = \Config::get()->OWNCLOUD_CLIENT_ID ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID; // The client ID assigned to you by the provider
$client_secret = \Config::get()->OWNCLOUD_CLIENT_SECRET ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_SECRET; // The client password assigned to you by the provider
$client_id = \Config::get()->OWNCLOUD_CLIENT_ID ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID_USER; // The client ID assigned to you by the provider
$client_secret = \Config::get()->OWNCLOUD_CLIENT_SECRET ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_SECRET_USER; // The client password assigned to you by the provider
URLHelper::setBaseURL($GLOBALS['ABSOLUTE_URI_STUDIP']);
$redirect_uri = PluginEngine::getURL($this->plugin, array(), "oauth/receive_access_token", true);
......
migrations/1_init_plugin.php
+ 10
− 1
View file @ 2ef1a3ab
......@@ -2,9 +2,18 @@
class InitPlugin extends Migration {
public function up() {
$configs = array("OWNCLOUD_ENDPOINT", "OWNCLOUD_CLIENT_ID", "OWNCLOUD_CLIENT_SECRET", "OWNCLOUD_ACTIVATED", "OWNCLOUD_ACCESS_TOKEN", "OWNCLOUD_ACCESS_TOKEN_EXPIRES", "OWNCLOUD_REFRESH_TOKEN");
$configs = array("OWNCLOUD_ENDPOINT", "OWNCLOUD_CLIENT_ID", "OWNCLOUD_CLIENT_SECRET");
$userconfigs = array("OWNCLOUD_ENDPOINT", "OWNCLOUD_CLIENT_ID", "OWNCLOUD_CLIENT_SECRET", "OWNCLOUD_ACTIVATED", "OWNCLOUD_ACCESS_TOKEN", "OWNCLOUD_ACCESS_TOKEN_EXPIRES", "OWNCLOUD_REFRESH_TOKEN");
foreach ($configs as $config) {
Config::get()->create($config, array(
'value' => "",
'type' => "string",
'range' => "global",
'section' => "Owncloud"
));
}
foreach ($userconfigs as $config) {
UserConfig::get()->create($config."_USER", array(
'value' => "",
'type' => in_array($config, ["OWNCLOUD_ACTIVATED"]) ? "boolean" : "string",
'range' => "user",
......
views/configure/myarea.php
+ 4
− 4
View file @ 2ef1a3ab
......@@ -11,7 +11,7 @@
<? if (\Owncloud\OAuth::isReady()) : ?>
<?= MessageBox::info(_("OwnCloud ist verknüpft")) ?>
<? elseif(UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT) : ?>
<? elseif(UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT_USER) : ?>
<div style="text-align: center;">
<?= \Studip\LinkButton::create(_("OwnCloud für Stud.IP freigeben"), PluginEngine::getURL($plugin, array(), "oauth/request_access_token")) ?>
</div>
......@@ -20,21 +20,21 @@
<? if (!Config::get()->OWNCLOUD_ENDPOINT) : ?>
<label>
<?= _("Adresse der OwnCloud") ?>
<input type="text" name="owncloud[endpoint]" value="<?= htmlReady(UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT) ?>" placeholder="<?= "z.B. https://myserver.tdl/owncloud" ?>">
<input type="text" name="owncloud[endpoint]" value="<?= htmlReady(UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT_USER) ?>" placeholder="<?= "z.B. https://myserver.tdl/owncloud" ?>">
</label>
<? endif ?>
<? if (!Config::get()->OWNCLOUD_CLIENT_ID) : ?>
<label>
<?= _("App-ID") ?>
<input type="text" name="owncloud[client_id]" value="<?= htmlReady(UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID) ?>">
<input type="text" name="owncloud[client_id]" value="<?= htmlReady(UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID_USER) ?>">
</label>
<? endif ?>
<? if (!Config::get()->OWNCLOUD_CLIENT_SECRET) : ?>
<label>
<?= _("Secret") ?>
<input type="text" name="owncloud[client_secret]" value="<?= htmlReady(UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_SECRET) ?>">
<input type="text" name="owncloud[client_secret]" value="<?= htmlReady(UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_SECRET_USER) ?>">
</label>
<label>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment