From b17a9c08dde4f723570e5293c89a7009dd331d84 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 4 Sep 2014 12:03:32 +0200 Subject: [PATCH] Allow forcing shorturl by default fixes #141 --- htdocs/application/config/stikked.php.dist | 1 + htdocs/application/controllers/main.php | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/htdocs/application/config/stikked.php.dist b/htdocs/application/config/stikked.php.dist index ffe1d4f..d3c00c9 100644 --- a/htdocs/application/config/stikked.php.dist +++ b/htdocs/application/config/stikked.php.dist @@ -87,6 +87,7 @@ $config['cron_key'] = ''; $config['yourls_url'] = ''; $config['yourls_signature'] = ''; $config['gwgd_url'] = ''; +$config['shorturl_selected'] = false; /** * Credentials for the backup URL diff --git a/htdocs/application/controllers/main.php b/htdocs/application/controllers/main.php index acc6e8f..65aa2ee 100644 --- a/htdocs/application/controllers/main.php +++ b/htdocs/application/controllers/main.php @@ -315,6 +315,12 @@ class Main extends CI_Controller $this->db_session->set_userdata('expire', $default_expiration); } + if (!$this->db_session->userdata('snipurl')) + { + $shorturl_selected = config_item('shorturl_selected'); + $this->db_session->set_userdata('snipurl', $shorturl_selected); + } + if ($this->db_session->flashdata('settings_changed')) { $data['status_message'] = 'Settings successfully changed';