adjusted entrypoint scripts to comment out entire sample files for easier re-configuration

replaced array_merge with array_replace_recursive
2021-08-12 16:28:37 +01:00 · 2021-08-12 15:35:54 +01:00 · 2021-08-12 15:35:20 +01:00 · 2021-08-12 14:56:23 +01:00 · 2021-08-12 14:55:54 +01:00 · 2021-08-12 13:41:58 +01:00
14 changed files with 254 additions and 150 deletions
--- a/entrypoint.sh
+++ b/entrypoint.sh
@ -1,3 +1,29 @@
 #!/usr/bin/env bash
-cp /var/www/html/sample-config/* /var/www/html/config/
+echo Removing old sample files…
+rm /var/www/html/config/*.sample.ini
+
+function write_file() {
+  while read line;
+  do
+    first_char=${line:0:1}
+
+    if [[ $first_char != ";" ]]; then
+      line="; "$line
+    fi
+    echo $line >> $2
+  done < $1
+}
+
+echo Setting up new sample config files…
+def_conf="/var/www/html/default-config/config.default.ini"
+new_conf="/var/www/html/config/config.sample.ini"
+write_file $def_conf $new_conf
+
+def_serv="/var/www/html/default-config/services.default.ini"
+new_serv="/var/www/html/config/services.sample.ini"
+write_file $def_serv $new_serv
+
+
+
+echo Running HTTPD…
 exec apache2-foreground
--- a/examples/dashboard.html
+++ b/examples/dashboard.html
@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <title>DAVDiscover Dashboard Example</title>
-  </head>
-  <body>
-    <p>This is to show the basic output of DAVDiscover, displaying the first few URLs</p>
-    
-  </body>
-</html>
--- a/src/core/init.php
+++ b/src/core/init.php
@ -22,30 +22,36 @@ class Init {
    $loader->request_page();
  }
  private function get_config(){
-    // define the config file location
-    $config = Core::root_dir()."/config/config.ini";
+    // parse the default config file for default values
+    $default_config = parse_ini_file(Core::root_dir()."/default-config/config.default.ini", true);
+    // define the custom config file location
+    $config_file = Core::root_dir()."/config/config.ini";
+    $config = array();
+    if (file_exists($config_file)) {
+      // if a custom config file exists then parse that file too
+      $config = parse_ini_file($config_file, true);
+    }
+    // merge the default config with the custom config
+    Core::$Config = array_merge($default_config,$config);
+    Core::$Config["PrimaryDomain"] = Core::$Config["Domain"][0];

-    // if it doesn't exist, use the sample file
-    // YOU REALLY SHOULD HAVE YOUR OWN CONFIG FILE!!!
+    // parse the default services file for default values
+    $default_services = parse_ini_file(Core::root_dir()."/default-config/services.default.ini", true);

-    if (!file_exists($config)) {
-      $config = Core::root_dir()."/sample-config/config.sample.ini";
+    // define the custom services file location
+    $services_file = Core::root_dir()."/config/services.ini";
+    $services = array();
+    if (file_exists($services_file)) {
+      // if a custom config file exists then parse that file too
+      $services = parse_ini_file($services_file, true);
    }

-    // define services file location
-    $services = Core::root_dir()."/config/services.ini";
+    // merge the default config with the custom config
+    // using replace recursive as the config file contains arrays itself
+    Core::$Config["Services"] = array_replace_recursive($default_services,$services);

-    // if it doesn't exist, use the sample file
-    // YOU REALLY SHOULD HAVE YOUR OWN SERVICES FILE!!!
-
-    if (!file_exists($services)) {
-      $services = Core::root_dir()."/sample-config/services.sample.ini";
-    }
-
-    // Store the config settings in the Core::Config variable
-    // the "true" means it's going to parse the headers as well.
-    Core::$Config = parse_ini_file($config, true);
-    Core::$Config["Services"] = parse_ini_file($services, true);
+    // get the current git commit, if it exists. For testing
    Core::$Config["CommitID"] = Core::get_current_git_commit();
+
  }
 }
--- a/src/core/init/core.php
+++ b/src/core/init/core.php
@ -1,6 +1,6 @@
 <?php class Core {
  public static $Config;
-  public const VERSION = "0.0.2";
+  public const VERSION = "0.0.6";
  public static $CurrentPage;
  public static function root_dir(){
    return $_SERVER['DOCUMENT_ROOT'];
--- a/src/core/init/loader.php
+++ b/src/core/init/loader.php
@ -28,11 +28,7 @@ class Loader {
        } else {
          Core::$CurrentPage = $p;
        }
-          require_once(Core::root_dir()."/public/respond.php");
-        // } else {
-        //   Core::$CurrentPage = "Error";
-        //   require_once(Core::RootDir()."/public/error.php");
-        // }
+        require_once(Core::root_dir()."/public/respond.php");
        break;
    }
  }
--- a/src/core/init/responder.php
+++ b/src/core/init/responder.php
@ -37,7 +37,7 @@ class Responder {
  private function get_response(){
    $resp = false;
    // Handle the requested URL, using as many known autoconfiguration urls as possible
-    switch (Core::$CurrentPage){
+    switch (strtolower(Core::$CurrentPage)){
      case "get/test":
        $resp = $this->dummy_response();
        break;
@ -49,13 +49,14 @@ class Responder {
        $resp = $this->moz_auto_config();
        break;
      case "autodiscover/autodiscover.xml":
-      case "Autodiscover/Autodiscover.xml":
        $resp = $this->ms_autodiscover();
        break;
      case "autodiscover/autodiscover.json":
-      case "Autodiscover/Autodiscover.json":
        $resp = $this->ms_autodiscover_json();
        break;
+      case "get/config":
+        $resp = $this->get_config();
+        break;
      case "none":
      case "test":
      case "home":
@ -67,6 +68,26 @@ class Responder {
    }
    return $resp;
  }
+  private function get_config(){
+    $response = new Response();
+    $response->message = "Here's your config...";
+    foreach (Core::$Config as $k => $v){
+      $response->content[$k] = $v;
+    }
+    return $response;
+  }
+  private function get_username($service,$email_address) {
+    $username = "%EMAILADDRESS%";
+    if(!$service["UsernameIsFQDN"]) {
+      preg_match("/^[^@]+/",$email_address,$matches);
+      if (count($matches) > 0){
+        $username = $matches[0];
+      }
+    } else if ($service["RequireLogonDomain"]) {
+      $username = preg_replace("/[^@]+$/",Core::$Config["LogonDomain"],$email_address,1);
+    }
+    return $username;
+  }
  private function all_urls(){
    $response = new Response();
    // Not really useful, unless some lovely app developers want to parse it for their app :)
@ -75,6 +96,9 @@ class Responder {

    // Cycle through each service and add to payload
    foreach (Core::$Config["Services"] as $key => $service){
+      if (!$service["Enabled"]) {
+        continue;
+      }
      $response->content[$key] = $service;
    }

@ -132,7 +156,7 @@ class Response {
  public $url;
  public $content_type = "json";
  public $message;
-  public $headers_set = false;
+  // public $headers_set = false;
  public $content = array();
  public function __construct(){
    // add requested page to response. I don't know why, but it could helpful for diagnostics at some point
--- a/src/default-config/config.default.ini
+++ b/src/default-config/config.default.ini
@ -4,11 +4,10 @@
 ; The URL of this application
 BaseURL = "https://autoconfig.example.com"

-; Set the base email domain for use with this service
-Domain = example.com
+; Set the email domains for use with this service. The first one is primary.
+; each will need their own DNS A record for autoconfig.domain.name
+Domain[] = example.com
+Domain[] = example2.com

 ; If you use a different domain to authenticate with, enter it here
 LogonDomain = example.local
-
-; Change to true if you need the domain/logondomain to form part of the username
-RequireAuthDomain = false
--- a/src/default-config/services.default.ini
+++ b/src/default-config/services.default.ini
@ -0,0 +1,116 @@
+; The Incoming mail Server Config
+[InMail]
+
+; Enable this service
+Enabled = true
+
+; Mail Type, i.e. IMAP, POP3
+Type = "IMAP"
+
+; Your IMAP server
+Server = "imap.example.com"
+
+; Your IMAP port
+Port = 993
+
+; The socket type : SSL, STARTTLS, or NONE
+SocketType = SSL
+
+; Use Secure Password Authentication
+SPA = false
+
+; Change to true if you need the domain/logondomain to form part of the username
+UsernameIsFQDN = false
+
+; Do you need to authenticate to your mail server? You should! so this should be false!
+NoAuthRequired = false
+
+; Authentication type,
+;"password-cleartext" : Send password in the clear
+;                       (dangerous, if SSL isn't used either).
+;                       AUTH PLAIN, LOGIN or protocol-native login.
+;"password-encrypted" : A secure encrypted password mechanism.
+;                       Can be CRAM-MD5 or DIGEST-MD5. Not NTLM.
+;"NTLM":                Use NTLM (or NTLMv2 or successors),
+;                       the Windows login mechanism.
+Authentication = password-cleartext
+
+
+
+; The Outgoing mail server config
+[OutMail]
+
+; Enable this service
+Enabled = true
+
+; Mail type, likely to only be SMTP
+Type = "SMTP"
+
+; Your SMTP server
+Server = "smtp.example.com"
+
+; Your SMTP port
+Port = 465
+
+; The socket type : SSL, STARTTLS or NONE
+SocketType = SSL
+
+; See InMail > Authentication
+Authentication = password-cleartext
+
+; Use Secure Password Authentication
+SPA = false
+
+; Change to true if you need the domain/logondomain to form part of the username
+UsernameIsFQDN = false
+
+; Do you need to authenticate to your mail server? You should! so this should be false!
+NoAuthRequired = false
+
+; Use POP Authentication? You probably shouldn't be.
+POPAuth = false
+
+; This setting is here to limit errors, I'm not sure what it does yet.
+SMTPLast = false
+
+
+; Currently not implemented, see https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
+[Calendar]
+; Disable this service
+Enabled = false
+Server = "https://example.com/remote.php/dav/"
+Port = 443
+Type = CalDAV
+Authentication = http-basic
+UsernameIsFQDN = false
+
+; Currently not implemented, see https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
+[AddressBook]
+; Disable this service
+Enabled = false
+Server = "https://example.com/remote.php/dav/"
+Port = 443
+Type = CardDAV
+Authentication = http-basic
+UsernameIsFQDN = false
+
+; Currently not implemented, see https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
+[WebMail]
+; Disable this service
+Enabled = false
+Server = https://mail.example.com
+UsernameDivID = "username"
+UsernameDivName = "username"
+PasswordDivName = "password"
+SubmitButtonID = "submit"
+SubmitButtonName = "submit"
+UsernameIsFQDN = false
+
+
+; In theory, additional custom services can be configured and will be displayed with
+; their options on the /get/all URL of this service. The third-party clients would need to
+; check this service as part of their development for this to work
+; Will not be shown in autodiscover.xml/json or config-v1.1.xml/autoconfig.xml
+; i.e Nextcloud - ideally a nextcloud client could check autoconfig for this URL for ease of set up
+;[Nextcloud]
+;Server = https://nextcloud.example.com
--- a/src/public/autoconfig.php
+++ b/src/public/autoconfig.php
@ -1,91 +1,64 @@
 <?php
-
-// Errrrrrrrrgh, this is sooooo messy, I'm going to tidy this up
-// It's basically configuring the format of the email address dependent on
-// variables set in the config file.
-// i.e. if the domain isn't required for authentication then it strips the
-// username back to just the pre-@ part. Or, if the username requires a different
-// logon domain, then it replaces the email domain with the localdomain
-//
-// TODO: TIDY THIS UP!!
-$conf = Core::$Config["Services"];
+// Get some core information to help with generation.
+$services = Core::$Config["Services"];
 $data = Core::get_get_data();
-$email_provided = false;
-$display_name = false;
-$emailaddress = false;
-if ($data["emailaddress"]) {
+if (isset($data["emailaddress"])) {
  $email_address = $data["emailaddress"];
-  $display_name = $email_address;
-  $email_provided = true;
-} else if ($data["path"]) {
-  $query = parse_url($data["path"]);
-  $email_address = explode("=",$query["query"]);
-  if ($email_address[0] == "emailaddress") {
-    $email_address = $email[1];
-    $email_provided = true;
-    $display_name = $email_address;
-  }
 }
-if ($email_provided) {
-  if(!Core::$Config["RequireAuthDomain"]) {
-    $email_address = str_ireplace("@".Core::$Config["Domain"],"",$email_address);
-  } else if (Core::$Config["LogonDomain"]) {
-    $email_address = str_ireplace(Core::$Config["Domain"],Core::$Config["LogonDomain"],$email_address);
-  }
-}
-
 // The below link has config-v1.1.xml information
 // https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
 ?>
 <clientConfig version="1.1">
- <emailProvider id="<?php echo Core::$Config["Domain"]?>">
-   <domain><?php echo Core::$Config["Domain"]?></domain>
-   <displayName><?php echo $email_provided ? $display_name : "%EMAILADDRESS%" ;?></displayName>
-   <?php if($conf["InMail"]){
-     $in = $conf["InMail"]; ?>
-     <incomingServer type="<?php echo strtolower($in["Type"]);?>">
-       <hostname><?php echo $in["Server"];?></hostname>
-       <port><?php echo $in["Port"];?></port>
-       <socketType><?php echo $in["SocketType"];?></socketType>
-       <username><?php echo $email_provided ? $email_address : "%EMAILADDRESS%";?></username>
-       <authentication><?php echo $in["Authentication"];?></authentication>
+ <emailProvider id="<?php echo Core::$Config["PrimaryDomain"]?>">
+   <?php foreach (Core::$Config["Domain"] as $domain){ ?>
+   <domain><?php echo $domain; ?></domain>
+   <?php } ?>
+   <displayName>%EMAILADDRESS%</displayName>
+   <?php if($services["InMail"]&& $services["InMail"]["Enabled"]){
+     $service = $services["InMail"]; ?>
+     <incomingServer type="<?php echo strtolower($service["Type"]);?>">
+       <hostname><?php echo $service["Server"];?></hostname>
+       <port><?php echo $service["Port"];?></port>
+       <socketType><?php echo $service["SocketType"];?></socketType>
+       <username><?php echo $this->get_username($service,$email_address); ?></username>
+       <authentication><?php echo $service["Authentication"];?></authentication>
     </incomingServer>
   <?php }
-   if($conf["OutMail"]){
-     $out = $conf["OutMail"]; ?>
-   <outgoingServer type="<?php echo strtolower($out["Type"]);?>">
-     <hostname><?php echo $out["Server"];?></hostname>
-     <port><?php echo $out["Port"];?></port>
-     <socketType><?php echo $out["SocketType"];?></socketType>
-     <username><?php echo $email_provided ? $email_address : "%EMAILADDRESS%";?></username>
-     <authentication><?php echo $out["Authentication"];?></authentication>
+   if($services["OutMail"]&& $services["OutMail"]["Enabled"]){
+     $service = $services["OutMail"]; ?>
+   <outgoingServer type="<?php echo strtolower($service["Type"]);?>">
+     <hostname><?php echo $service["Server"];?></hostname>
+     <port><?php echo $service["Port"];?></port>
+     <socketType><?php echo $service["SocketType"];?></socketType>
+     <username><?php echo $this->get_username($service,$email_address);?></username>
+     <authentication><?php echo $service["Authentication"];?></authentication>
   </outgoingServer>
   <?php }
-   if ($conf["AddressBook"]) {
-     $card = $conf["AddressBook"]; ?>
-    <addressBook type="<?php echo strtolower($card["Type"]); ?>">
-      <username><?php echo $email_provided ? $email_address : "%EMAILADDRESS%";?></username>
-      <authentication><?php echo $card["Authentication"] ? $card["Authentication"] : "http-basic" ;?></authentication>
-      <serverURL><?php echo $card["Server"];?></serverURL>
+   if ($services["AddressBook"] && $services["AddressBook"]["Enabled"]) {
+     $service = $services["AddressBook"]; ?>
+    <addressBook type="<?php echo strtolower($service["Type"]); ?>">
+      <username><?php echo $this->get_username($service,$email_address);?></username>
+      <authentication><?php echo $service["Authentication"];?></authentication>
+      <serverURL><?php echo $service["Server"];?></serverURL>
    </addressBook>
    <?php }
-    if ($conf["Calendar"]){
-      $cal = $conf["Calendar"] ;?>
-    <calendar type="<?php echo strtolower($cal["Type"]);?>">
-      <username><?php echo $email_provided ? $email_address : "%EMAILADDRESS%";?></username>
-      <authentication><?php echo $card["Authentication"] ? $card["Authentication"] : "http-basic" ;?></authentication>
-      <serverURL><?php echo $card["Server"];?></serverURL>
+    if ($services["Calendar"] && $services["Calendar"]["Enabled"]){
+      $service = $services["Calendar"] ;?>
+    <calendar type="<?php echo strtolower($service["Type"]);?>">
+      <username><?php echo $this->get_username($service,$email_address);?></username>
+      <authentication><?php echo $service["Authentication"];?></authentication>
+      <serverURL><?php echo $service["Server"];?></serverURL>
    </calendar>
    <?php }
-    if ($conf["WebMail"]) {
-      $wm = $conf["WebMail"]; ?>
+    if ($services["WebMail"] && $services["WebMail"]["Enabled"]) {
+      $service = $services["WebMail"]; ?>
    <webMail>
-      <loginPage url="<?php echo $wm["Server"];?>" />
-      <loginPageInfo url="<?php echo $wm["Server"];?>">
-        <username><?php echo $email_provided ? $email_address : "%EMAILADDRESS%";?></username>
-        <usernameField id="<?php echo $wm["UsernameDivID"];?>" name="<?php echo $wm["UsernameDivName"];?>" />
-        <passwordField name="<?php echo $wm["PasswordDivName"];?>" />
-        <loginButton id="<?php echo $wm["SubmitButtonID"];?>" name="<?php echo $wm["SubmitButtonName"];?>"/>
+      <loginPage url="<?php echo $service["Server"];?>" />
+      <loginPageInfo url="<?php echo $service["Server"];?>">
+        <username><?php echo $this->get_username($service,$email_address);?></username>
+        <usernameField id="<?php echo $service["UsernameDivID"];?>" name="<?php echo $service["UsernameDivName"];?>" />
+        <passwordField name="<?php echo $service["PasswordDivName"];?>" />
+        <loginButton id="<?php echo $service["SubmitButtonID"];?>" name="<?php echo $service["SubmitButtonName"];?>"/>
      </loginPageInfo>
    </webMail>
    <?php } ?>
--- a/src/public/autodiscover.php
+++ b/src/public/autodiscover.php
@ -8,38 +8,38 @@ preg_match("/\<EMailAddress\>(.*?)\<\/EMailAddress\>/", $data, $matches);
 // <?xml version="1.0" \?\>
 // <Autodiscover xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/requestschema/2006">
 //   <Request>
-//     <EMailAddress>psw@wilde.cloud</EMailAddress>
+//     <EMailAddress>your@email.address</EMailAddress>
 //     <AcceptableResponseSchema>http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a</AcceptableResponseSchema>
 //   </Request>
 // </Autodiscover>

 echo '<?xml version="1.0" encoding="utf-8" ?>';?>
-<Autodiscover xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006">
+<Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006">
  <Response xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a">
       <Account>
           <AccountType>email</AccountType>
           <Action>settings</Action>
-           <?php if ($conf["InMail"]){
+           <?php if ($conf["InMail"] && $conf["InMail"]["Enabled"]){
             $in = $conf["InMail"];?>
            <Protocol>
                <Type><?php echo $in["Type"];?></Type>
                <Server><?php echo $in["Server"];?></Server>
                <Port><?php echo $in["Port"];?></Port>
                <DomainRequired><?php echo Core::$Config["RequireAuthDomain"] ? "on" : "off";?></DomainRequired>
-                <LoginName><?php echo $matches[1]; ?></LoginName>
+                <LoginName><?php echo isset($matches[1]) ? $matches[1] : false ; ?></LoginName>
                <SPA><?php echo $in["SPA"] ? "on" : "off";?></SPA>
                <SSL><?php echo $in["SocketType"] == "SSL" ? "on" : "off";?></SSL>
                <AuthRequired><?php echo $in["NoAuthRequired"] ? "off" : "on";?></AuthRequired>
            </Protocol>
            <?php }
-            if ($conf["OutMail"]) {
+            if ($conf["OutMail"]&& $conf["OutMail"]["Enabled"]) {
              $out = $conf["OutMail"];?>
            <Protocol>
                <Type><?php echo $out["Type"];?></Type>
                <Server><?php echo $out["Server"];?></Server>
                <Port><?php echo $out["Port"];?></Port>
                <DomainRequired><?php echo Core::$Config["RequireAuthDomain"] ? "on" : "off";?></DomainRequired>
-                <LoginName><?php echo $matches[1]; ?></LoginName>
+                <LoginName><?php echo isset($matches[1]) ? $matches[1] : false ; ?></LoginName>
                <SPA><?php echo $in["SPA"] ? "on" : "off";?></SPA>
                <Encryption><?php echo $in["SocketType"];?></Encryption>
                <AuthRequired><?php echo $in["NoAuthRequired"] ? "off" : "on";?></AuthRequired>
--- a/src/sample-config/services.sample.ini
+++ b/src/sample-config/services.sample.ini
@ -1,25 +0,0 @@
-[InMail]
-Type = "IMAP"
-Server = "imap.example.com"
-Port = 993
-SocketType = SSL
-Authentication = password-cleartext
-
-[OutMail]
-Type = "SMTP"
-Server = "smtp.example.com"
-Port = 465
-SocketType = SSL
-Authentication = password-cleartext
-
-; Currently not implemented
-;[Calendar]
-;Server = "https://example.com/remote.php/dav/"
-;Port = 443
-;Type = CalDAV
-
-; Currently not implemented
-;[AddressBook]
-;Server = "https://example.com/remote.php/dav/"
-;Port = 443
-;Type = CardDAV
--- a/src/xmltest
+++ b/src/xmltest
@ -1 +0,0 @@
-<EMailAddress>psw@wilde.cloud</EMailAddress>
--- a/test-entry.sh
+++ b/test-entry.sh
@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 a2enmod rewrite
 service apache2 stop
-exec apache2-foreground
+exec bash /entrypoint.sh
--- a/test-server.sh
+++ b/test-server.sh
@ -5,6 +5,7 @@ podman run --name mailautoconf-test \
  -v ./src:/var/www/html/ \
  -v ./config:/var/www/html/config \
  -v ./test-entry.sh:/test-entry.sh \
+  -v ./entrypoint.sh:/entrypoint.sh \
  --entrypoint "/bin/bash" \
  php:7.4-apache \
  /test-entry.sh
Author	SHA1	Message	Date
Paul Wilde	807e0c3586	adjusted entrypoint scripts to comment out entire sample files for easier re-configuration	2021-08-12 16:28:37 +01:00
Paul Wilde	34c065a788	replaced array_merge with array_replace_recursive	2021-08-12 15:35:54 +01:00
Paul Wilde	11bc449966	replaced array_merge with array_replace_recursive	2021-08-12 15:35:20 +01:00
Paul Wilde	51b25e1580	new version number	2021-08-12 14:56:23 +01:00
Paul Wilde	b0327c0a4e	tidied up some code, i.e. new autoconf function	2021-08-12 14:55:54 +01:00
Paul Wilde	30302dfb84	config and services files changes and handling thereof	2021-08-12 13:41:58 +01:00
Paul Wilde	48692b4765	removed test xml file	2021-08-12 12:01:43 +01:00
Paul Wilde	bcc9f7f196	Added more documentation in services.sample.ini	2021-08-12 11:59:33 +01:00
Paul Wilde	0464bcd6ba	removed unecessary commented code	2021-08-12 11:22:59 +01:00
Paul Wilde	40fa248e31	added strtolower for page name so I can remove uppercase variances of the page url	2021-08-12 11:20:10 +01:00
Paul Wilde	99257788e5	increment version number	2021-08-12 10:38:16 +01:00
				`@ -1 +0,0 @@`
				`<EMailAddress>psw@wilde.cloud</EMailAddress>`