From 989a7b8720316028b92667306e9d109819ae4a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Mon, 31 Oct 2022 13:23:03 +0100 Subject: [PATCH] =?UTF-8?q?Neuen=20Config=20f=C3=BCr=20BASE=5FLOCATION=20h?= =?UTF-8?q?inzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/cis.config-default.inc.php | 9 ++++++--- config/vilesci.config-default.inc.php | 8 +++++--- include/meta/angular-tablesorter.php | 9 +++------ include/meta/angular.php | 5 +---- include/meta/easyui.php | 15 ++++++--------- include/meta/jquery-tablesorter.php | 12 +++++------- include/meta/jquery.php | 5 +---- include/meta/jsoneditor.php | 7 ++----- 8 files changed, 29 insertions(+), 41 deletions(-) diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php index 9d31548f6..66d855b61 100644 --- a/config/cis.config-default.inc.php +++ b/config/cis.config-default.inc.php @@ -44,14 +44,17 @@ define('PAABGABE_PATH','/var/fhcomplete/documents/paabgabe/'); // Pfad zu den Rauminfos define('RAUMINFO_PATH','/var/www/html/build/rauminfos/'); +// Pfad zu Applikation +define('BASE_LOCATION','/'); + // URL zu RDF Verzeichnis -define('XML_ROOT','http://www.fhcomplete.org/build/rdf/'); +define('XML_ROOT','http://www.fhcomplete.org'.BASE_LOCATION.'rdf/'); // URL zu Application Root -define('APP_ROOT','http://www.fhcomplete.org/build/'); +define('APP_ROOT','http://www.fhcomplete.org/'.BASE_LOCATION); // Pfad zu Document Root define('DOC_ROOT','/var/www/html/build/'); // URL zu Vilesci Root -define('VILESCI_ROOT','http://www.fhcomplete.org/build/'); +define('VILESCI_ROOT','http://www.fhcomplete.org/'); // Externe Funktionen - Unterordner im Include-Verzeichnis define('EXT_FKT_PATH','tw'); diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php index 19d1ba07e..2227916a9 100644 --- a/config/vilesci.config-default.inc.php +++ b/config/vilesci.config-default.inc.php @@ -33,14 +33,16 @@ define('INFOSCREEN_PASSWORD', ''); // Name des Servers (benoetigt fuer Cronjobs define('SERVER_NAME', 'localhost'); +// Pfad zu Applikation +define('BASE_LOCATION','/'); // URL zu FHComplete Root -define('APP_ROOT', 'http://www.fhcomlete.org/build/'); +define('APP_ROOT', 'http://www.fhcomlete.org'.BASE_LOCATION); // URL zu RDF Verzeichnis -define('XML_ROOT', 'http://www.fhcomlete.org/build/rdf/'); +define('XML_ROOT', 'http://www.fhcomlete.org'.BASE_LOCATION.'rdf/'); // Pfad zu Document Root define('DOC_ROOT', '/var/www/html/build/'); // URL zu CIS -define('CIS_ROOT', 'http://www.fhcomlete.org/build/'); +define('CIS_ROOT', 'http://www.fhcomlete.org/'); // Externe Funktionen - Unterordner im Include-Verzeichnis define('EXT_FKT_PATH', 'tw'); diff --git a/include/meta/angular-tablesorter.php b/include/meta/angular-tablesorter.php index 01ff44431..60dd9560f 100644 --- a/include/meta/angular-tablesorter.php +++ b/include/meta/angular-tablesorter.php @@ -17,15 +17,12 @@ * * Authors: Andreas Moik */ - -$dr = isset($_SERVER['CONTEXT_PREFIX']) ? $_SERVER["CONTEXT_PREFIX"].'/' : '/'; - //Originaldateien des Herstellers -echo ''; +echo ''; -echo ''; +echo ''; //Anpassungen -echo ''; +echo ''; ?> diff --git a/include/meta/angular.php b/include/meta/angular.php index 8cf159b3e..e82eaf0f3 100644 --- a/include/meta/angular.php +++ b/include/meta/angular.php @@ -17,10 +17,7 @@ * * Authors: Andreas Moik */ - -$dr = isset($_SERVER['CONTEXT_PREFIX']) ? $_SERVER["CONTEXT_PREFIX"].'/' : '/'; - //Originaldateien des Herstellers -echo ''; +echo ''; ?> diff --git a/include/meta/easyui.php b/include/meta/easyui.php index 1689b7778..18b1a6911 100644 --- a/include/meta/easyui.php +++ b/include/meta/easyui.php @@ -17,19 +17,16 @@ * * Authors: Andreas Moik */ - -$dr = isset($_SERVER['CONTEXT_PREFIX']) ? $_SERVER["CONTEXT_PREFIX"].'/' : '/'; - //Originaldateien des Herstellers -echo ''; -echo ''; +echo ''; +echo ''; -echo ''; -echo ''; +echo ''; +echo ''; //Anpassungen -echo ''; -echo ''; +echo ''; +echo ''; ?> diff --git a/include/meta/jquery-tablesorter.php b/include/meta/jquery-tablesorter.php index 04fd9451e..ee7ac8d39 100644 --- a/include/meta/jquery-tablesorter.php +++ b/include/meta/jquery-tablesorter.php @@ -17,15 +17,13 @@ * * Authors: Andreas Moik */ - -$dr = isset($_SERVER['CONTEXT_PREFIX']) ? $_SERVER["CONTEXT_PREFIX"].'/' : '/'; - + //Originaldateien des Herstellers -echo ''; -echo ''; -echo ''; +echo ''; +echo ''; +echo ''; //Anpassungen -echo ''; +echo ''; ?> diff --git a/include/meta/jquery.php b/include/meta/jquery.php index 2ebaea9b7..166e79330 100644 --- a/include/meta/jquery.php +++ b/include/meta/jquery.php @@ -17,10 +17,7 @@ * * Authors: Andreas Moik */ - -$dr = isset($_SERVER['CONTEXT_PREFIX']) ? $_SERVER["CONTEXT_PREFIX"].'/' : '/'; - //Originaldateien des Herstellers -echo ''; +echo ''; ?> diff --git a/include/meta/jsoneditor.php b/include/meta/jsoneditor.php index 55bb68837..b84fe0d15 100644 --- a/include/meta/jsoneditor.php +++ b/include/meta/jsoneditor.php @@ -17,11 +17,8 @@ * * Authors: Andreas Moik */ - -$dr = isset($_SERVER['CONTEXT_PREFIX']) ? $_SERVER["CONTEXT_PREFIX"].'/' : '/'; - //Originaldateien des Herstellers -echo ''; -echo ''; +echo ''; +echo ''; ?>