From d7e4d7ebde5f0eeedb89ea56183b6ea45ffe093a Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Tue, 3 May 2022 10:58:46 +0200
Subject: [PATCH] Moved config entries from application/config/docsbox.php to
 config/cis.config-default.inc.php and config/vilesci.config-default.inc.php

---
 application/config/docsbox.php        | 7 -------
 application/libraries/DocsboxLib.php  | 3 +--
 config/cis.config-default.inc.php     | 8 ++++++++
 config/vilesci.config-default.inc.php | 8 ++++++++
 4 files changed, 17 insertions(+), 9 deletions(-)
 delete mode 100644 application/config/docsbox.php

diff --git a/application/config/docsbox.php b/application/config/docsbox.php
deleted file mode 100644
index ca64698f9..000000000
--- a/application/config/docsbox.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-define('DOCSBOX_SERVER', 'http://docconverter.technikum-wien.at/');
-define('DOCSBOX_PATH_API', 'api/v1/');
-define('DOCSBOX_CONVERSION_TIMEOUT', 30);
-define('DOCSBOX_WAITING_SLEEP_TIME', 1);
-
diff --git a/application/libraries/DocsboxLib.php b/application/libraries/DocsboxLib.php
index 5ec028a49..7d5af7106 100644
--- a/application/libraries/DocsboxLib.php
+++ b/application/libraries/DocsboxLib.php
@@ -17,7 +17,6 @@
  *
  */
 
-require_once(dirname(__FILE__).'/../config/docsbox.php');
 require_once(dirname(__FILE__).'/../../vendor/nategood/httpful/bootstrap.php');
 
 use \ZipArchive as ZipArchive;
@@ -48,7 +47,7 @@ class DocsboxLib
 	public static function convert($inputFileName, $outputFileName, $format)
 	{
 		// If a format has not been given
-		if (isEmptyString($format)) $format = self::DEFAULT_FORMAT;
+		if (($format == null) || ($format != null && ctype_space($format) === true)) $format = self::DEFAULT_FORMAT;
 
 		// Posts the file to docsbox
 		$queueId = self::_postFile($inputFileName);
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index 9d31548f6..e43859e1e 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -256,4 +256,12 @@ define('CIS_ZEITWUNSCH_GD', false);
 
 // Covid-Status anzeigen
 define('CIS_SHOW_COVID_STATUS', false);
+
+// Docsbox configs
+define('DOCSBOX_SERVER', 'http://docconverter.technikum-wien.at/');
+define('DOCSBOX_PATH_API', 'api/v1/');
+define('DOCSBOX_CONVERSION_TIMEOUT', 30); // seconds
+define('DOCSBOX_WAITING_SLEEP_TIME', 1);
+
 ?>
+
diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php
index cd45e6979..b1340fbfb 100644
--- a/config/vilesci.config-default.inc.php
+++ b/config/vilesci.config-default.inc.php
@@ -254,4 +254,12 @@ define('BIS_STANDORTCODE_LEHRGAENGE', '0');
 
 // bPk Abfrage
 define('BPK_FUER_ALLE_BENUTZER_ABFRAGEN', false);
+
+// Docsbox configs
+define('DOCSBOX_SERVER', 'http://docconverter.technikum-wien.at/');
+define('DOCSBOX_PATH_API', 'api/v1/');
+define('DOCSBOX_CONVERSION_TIMEOUT', 30); // seconds
+define('DOCSBOX_WAITING_SLEEP_TIME', 1);
+
 ?>
+