From 28e87414db5516d05bff26d448e67d6d52ce9eec Mon Sep 17 00:00:00 2001
From: Jon Gilkison <jon.gilkison@gmail.com>
Date: Wed, 15 Jun 2016 19:34:48 +0700
Subject: [PATCH] Fix trailing slash on CDN Add select option

---
 classes/ilab-media-tool-base.php        | 33 +++++++++++++++++++++++++
 classes/tools/s3/ilab-media-s3-tool.php |  3 +++
 tools.json                              | 14 ++++++++++-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/classes/ilab-media-tool-base.php b/classes/ilab-media-tool-base.php
index af304f16..554d3967 100644
--- a/classes/ilab-media-tool-base.php
+++ b/classes/ilab-media-tool-base.php
@@ -42,6 +42,8 @@ abstract class ILabMediaToolBase {
      */
     protected $options_group;
 
+    private $select_options = [];
+
     /**
      * Creates a new instance.  Subclasses should do any setup dependent on being enabled in setup()
      * @param $toolName
@@ -167,6 +169,9 @@ public function registerSettings()
                             case 'number':
                                 $this->registerNumberFieldSetting($option,$optionInfo['title'],$group,(isset($optionInfo['description']) ? $optionInfo['description'] : null));
                                 break;
+                            case 'select':
+                                $this->registerSelectSetting($option,$optionInfo['options'],$optionInfo['title'],$group,(isset($optionInfo['description']) ? $optionInfo['description'] : null));
+                                break;
                         }
                     }
                 }
@@ -307,6 +312,34 @@ public function renderNumberFieldSetting($args)
             echo "<p class='description'>".$args['description']."</p>";
     }
 
+    protected function registerSelectSetting($option_name,$options,$title,$settings_slug,$description=null)
+    {
+        $this->select_options[$option_name] = $options;
+        add_settings_field($option_name,$title,[$this,'renderSelectSetting'],$this->options_page,$settings_slug,['option'=>$option_name,'description'=>$description]);
+    }
+
+    public function renderSelectSetting($args)
+    {
+        $option = $args['option'];
+        $options = $this->select_options[$option];
+
+        $value=get_option($args['option']);
+
+        echo "<select name=\"{$option}\">\n";
+        foreach($options as $val => $name) {
+            $opt = "\t<option value=\"{$val}\"";
+            if ($val == $value)
+                $opt .= " selected";
+            $opt .= ">{$name}</option>\n";
+
+            echo $opt;
+        }
+        echo "</select>\n";
+
+        if ($args['description'])
+            echo "<p class='description'>".$args['description']."</p>";
+    }
+
     public function haveSettingsChanged() {
         if (get_transient("settings_changed_".$this->toolName)) {
             delete_transient("settings_changed_".$this->toolName);
diff --git a/classes/tools/s3/ilab-media-s3-tool.php b/classes/tools/s3/ilab-media-s3-tool.php
index c1cc604d..60ea48fa 100644
--- a/classes/tools/s3/ilab-media-s3-tool.php
+++ b/classes/tools/s3/ilab-media-s3-tool.php
@@ -34,6 +34,9 @@ public function __construct($toolName, $toolInfo, $toolManager)
             $this->cdn = "https://s3-{$this->region}.amazonaws.com/{$this->bucket}";
         }
 
+        if ($this->cdn)
+            $this->cdn=trim($this->cdn,'/');
+
         $this->docCdn = get_option('ilab-doc-s3-cdn-base', $this->cdn);
 
         $this->settingsError = get_option('ilab-s3-settings-error', false);
diff --git a/tools.json b/tools.json
index ca8608f2..172f8f07 100644
--- a/tools.json
+++ b/tools.json
@@ -379,7 +379,19 @@
             "ilab-media-s3-region": {
               "title": "AWS Region",
               "description": "If you are supplying this value through a .env file, or environment variables, the key is: <strong>ILAB_AWS_S3_REGION</strong>",
-              "type": "text-field",
+              "type": "select",
+              "options": {
+                "us-east-1": "US East (N. Virginia)",
+                "us-west-1": "US West (N. California)",
+                "us-west-2": "US West (Oregon)",
+                "eu-west-1": "EU (Ireland)",
+                "eu-central-1": "EU (Frankfurt)",
+                "ap-northeast-1": "Asia Pacific (Tokyo)",
+                "ap-northeast-2": "Asia Pacific (Seoul)",
+                "ap-southeast-1": "Asia Pacific (Singapore)",
+                "ap-southeast-2": "Asia Pacific (Sydney)",
+                "sa-east-1": "South America (São Paulo)"
+              },
               "watch": true
             }
           }