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

@@ -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);
-

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);

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);
+
 ?>
+

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);
+
 ?>
+