From 5fd9c7c349c93d5918e3e9893b998414c71017db Mon Sep 17 00:00:00 2001
From: Frank Agerholm <fae@netuse.de>
Date: Wed, 16 Jan 2019 17:41:14 +0100
Subject: [PATCH] Retwis Title configuration option

---
 config.php | 28 ++++++++++++++++------------
 header.php |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/config.php b/config.php
index 5ff0b20..65a95cf 100644
--- a/config.php
+++ b/config.php
@@ -1,26 +1,30 @@
 <?php
 
+
+
+function get_cfg_from_env($name, $default='') {
+  $ret = null;
+  $tmp = getent($name);
+  if( isset($tmp) and $tmp != '' ) {
+    $ret = $tmp;
+  }
+  return $ret;
+}
+
 // New configuration array for Client-Options
 $redis_options = array();
 
 // some default values...
-$redis_options["schema"] = "tcp";
-$redis_options["host"] = "localhost";
-$redis_options["port"] = 6379;
-$redis_options["password"] = "password";
+$redis_options["schema"] = get_cfg_from_env("REDIS_OPTIONS_SCHEMA","tcp");
+$redis_options["host"] = get_cfg_from_env("REDIS_OPTIONS_HOST","localhost");
+$redis_options["port"] = get_cfg_from_env("REDIS_OPTIONS_PORT",6379);
+$redis_options["password"] = get_cfg_from_env("REDIS_OPTIONS_PASSWORD","password");
 
+$redis_title = get_cfg_from_env("REDIS_TITLE","");
 
 // read configuration from file if exists ...
 if( is_file("./.htconfig.php") ) {
   include_once("./.htconfig.php");
 }
 
-// get redis configuration options from environment variables
-foreach( $redis_options as $k => $v) {
-  $tmp = getenv(strtoupper("REDIS_OPTIONS_" . $k));
-  if( isset($tmp) and $tmp != '' ) {
-    $redis_options[$k] = $tmp;
-  }
-}
-
 ?>
diff --git a/header.php b/header.php
index 527a21e..4aab7ac 100644
--- a/header.php
+++ b/header.php
@@ -9,6 +9,6 @@
 <div id="page">
 <div id="header">
 <a href="/"><img style="border:none" src="logo.png" width="192" height="85" alt="Retwis"></a>
-<?php echo gethostname(); ?>
+<?php echo $redis_title; ?>
 <?php include("navbar.php") ?>
 </div>