From a52e9051550b157c16edf10dea4414a836857796 Mon Sep 17 00:00:00 2001
From: robbt <robbt@azone.org>
Date: Mon, 11 May 2020 10:13:35 -0400
Subject: [PATCH 1/5] Added form - need to add CORS to db code

---
 .../airtime-setup/forms/general-settings.php   | 18 ++++++++++++++++++
 .../build/airtime-setup/setup-config.php       |  2 +-
 airtime_mvc/public/setup/general-setup.php     |  5 +++--
 3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/airtime_mvc/build/airtime-setup/forms/general-settings.php b/airtime_mvc/build/airtime-setup/forms/general-settings.php
index f15e06d5a..d3729f6a5 100644
--- a/airtime_mvc/build/airtime-setup/forms/general-settings.php
+++ b/airtime_mvc/build/airtime-setup/forms/general-settings.php
@@ -19,6 +19,20 @@
             <span class="glyphicon glyphicon-remove form-control-feedback"></span>
         </div>
         <input class="form-control" type="hidden" name="generalErr" id="generalErr" aria-describedby="helpBlock"/>
+        <p>The CORS URL can be setup during install if you are accessing your LibreTime instance behind a Proxy.
+            This is common with docker setups. If you have a reverse proxy setup enter the URL below, otherwise you
+            can safely ignore this.
+        </p>
+        <div id="corsSlideToggle">
+            <span><strong>CORS URL </strong></span><span id="corsCaret" class="caret"></span><hr/>
+        </div>
+        <div id="corsFormBody">
+            <div class="form-group">
+                <label class="control-label" for="corsURL">CORS URLs</label>
+                <textarea class="form-control" id="corsURL" rows="4" cols="50">
+                </textarea>
+            </div>
+        </div>
     </div>
     <div>
         <input type="submit" formtarget="generalSettingsForm" class="btn btn-primary btn-next" value="Next &#10097;"/>
@@ -27,6 +41,10 @@
 </form>
 
 <script>
+    $("#corsSlideToggle").click(function() {
+        $("#corsFormBody").slideToggle(500);
+        $("#corsCaret").toggleClass("caret-up");
+    });
     $("#generalSettingsForm").submit(function(e) {
         submitForm(e, "GeneralSetup");
     });
diff --git a/airtime_mvc/build/airtime-setup/setup-config.php b/airtime_mvc/build/airtime-setup/setup-config.php
index c116767cf..485009835 100644
--- a/airtime_mvc/build/airtime-setup/setup-config.php
+++ b/airtime_mvc/build/airtime-setup/setup-config.php
@@ -13,7 +13,7 @@
     <body>
         <div class="header">
             <h3 class="logo">
-                <img src="css/images/airtime_logo_jp.png" id="airtimeLogo" /><br/>
+                <img src="css/images/libretime_logo_jp.png" id="LibreTimeLogo" /><br/>
                 <strong>Setup</strong>
             </h3>
             <strong>Step <span id="stepCount">1</span> of 5</strong>
diff --git a/airtime_mvc/public/setup/general-setup.php b/airtime_mvc/public/setup/general-setup.php
index 7e86bdb69..a7d5a959e 100644
--- a/airtime_mvc/public/setup/general-setup.php
+++ b/airtime_mvc/public/setup/general-setup.php
@@ -15,8 +15,8 @@ class GeneralSetup extends Setup {
 
     // Constant form field names for passing errors back to the front-end
     const GENERAL_PORT = "generalPort",
-        GENERAL_HOST = "generalHost";
-
+        GENERAL_HOST = "generalHost",
+        CORS_URL = "corsURL";
     // Array of key->value pairs for airtime.conf
     protected static $_properties;
 
@@ -30,6 +30,7 @@ class GeneralSetup extends Setup {
             "api_key" => $this->generateRandomString(),
             "base_url" => $settings[self::GENERAL_HOST],
             "base_port" => $settings[self::GENERAL_PORT],
+            "cors_url" => $settings[self::CORS_URL]
         );
     }
 

From 7ee9a220af5864181736da56da4c7eb80be2f7e0 Mon Sep 17 00:00:00 2001
From: robbt <robbt@azone.org>
Date: Tue, 12 May 2020 12:24:02 -0400
Subject: [PATCH 2/5] failed attempt at doing things without initiation of
 entire MVC framework

---
 .../airtime-setup/forms/general-settings.php  |  3 +-
 airtime_mvc/public/setup/general-setup.php    | 78 ++++++++++++++++++-
 2 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/build/airtime-setup/forms/general-settings.php b/airtime_mvc/build/airtime-setup/forms/general-settings.php
index d3729f6a5..e31eada08 100644
--- a/airtime_mvc/build/airtime-setup/forms/general-settings.php
+++ b/airtime_mvc/build/airtime-setup/forms/general-settings.php
@@ -29,8 +29,7 @@
         <div id="corsFormBody">
             <div class="form-group">
                 <label class="control-label" for="corsURL">CORS URLs</label>
-                <textarea class="form-control" id="corsURL" rows="4" cols="50">
-                </textarea>
+                <textarea class="form-control" id="corsURL" rows="4" cols="50"></textarea>
             </div>
         </div>
     </div>
diff --git a/airtime_mvc/public/setup/general-setup.php b/airtime_mvc/public/setup/general-setup.php
index a7d5a959e..f70f00410 100644
--- a/airtime_mvc/public/setup/general-setup.php
+++ b/airtime_mvc/public/setup/general-setup.php
@@ -1,5 +1,18 @@
 <?php
 
+define("CONFIG_PATH", dirname(dirname( __DIR__)) . "/application/configs/");
+
+require_once(dirname(dirname( __DIR__)) . "/../vendor/propel/propel1/runtime/lib/Propel.php");
+require_once(CONFIG_PATH . 'conf.php');
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/CcPref.php");
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/CcPrefPeer.php");
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/CcPrefQuery.php");
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/map/CcPrefTableMap.php");
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/om/BaseCcPref.php");
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/om/BaseCcPrefPeer.php");
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/om/BaseCcPrefQuery.php");
+
+
 /**
  * User: sourcefabric
  * Date: 08/12/14
@@ -9,14 +22,15 @@
  * Wrapper class for validating and setting up general settings during the installation process
  */
 class GeneralSetup extends Setup {
-
+    static $corsUrl;
     // airtime.conf section header
     protected static $_section = "[general]";
 
     // Constant form field names for passing errors back to the front-end
     const GENERAL_PORT = "generalPort",
-        GENERAL_HOST = "generalHost",
-        CORS_URL = "corsURL";
+        GENERAL_HOST = "generalHost";
+    const CORS_URL = "corsURL";
+
     // Array of key->value pairs for airtime.conf
     protected static $_properties;
 
@@ -25,7 +39,7 @@ class GeneralSetup extends Setup {
     static $errors = array();
 
     function __construct($settings) {
-
+        self::$corsUrl = $settings[self::CORS_URL];
         self::$_properties = array(
             "api_key" => $this->generateRandomString(),
             "base_url" => $settings[self::GENERAL_HOST],
@@ -43,11 +57,67 @@ class GeneralSetup extends Setup {
         if (count(self::$errors) <= 0) {
             $this->writeToTemp();
         }
+        $this->setupCorsUrl();
 
         return array(
             "message" => self::$message,
             "errors" => self::$errors
         );
     }
+    /**
+     * If the user entered a CORS Url then add it to the system preferences
+     * TODO Make sure we check for existing CORS URLs and display them on initial form
+     */
+    function setupCorsUrl() {
+        try {
+            $_SERVER['AIRTIME_CONF'] = AIRTIME_CONF_TEMP_PATH;
+            Propel::init(CONFIG_PATH . "airtime-conf-production.php");
+            $con = Propel::getConnection();
+        } catch(Exception $e) {
+            self::$message = "Failed to insert Cors URL; database isn't configured properly!";
+            self::$errors[] = self::MEDIA_FOLDER;
+            return;
+        }
 
+        $this->runCorsUrlQuery($con);
+    }
+
+    function runCorsUrlQuery($con) {
+        try {
+            //Check if key already exists
+            $sql = "SELECT valstr FROM cc_pref"
+                ." WHERE keystr = 'allowed_cors_urls'";
+
+            $paramMap = array();
+            $paramMap[':key'] = 'allowed_cors_urls';
+
+            $sql .= " FOR UPDATE";
+
+            $result = Application_Common_Database::prepareAndExecute($sql,
+                $paramMap,
+                Application_Common_Database::ROW_COUNT,
+                PDO::FETCH_ASSOC,
+                $con);
+
+            if ($result > 1) {
+
+            }
+            else {
+                $pref = new CcPref();
+                //if (self::$corsUrl != '') {
+                $pref->setKeyStr('allowed_cors_urls')
+                    ->setValStr(self::$corsUrl)
+                    ->save();
+                //$pref::setValue('allowed_cors_urls', self::CORS_URL);
+                self::$message = "Saved cors_url";
+                //}
+                Propel::close();
+                //unset($_SERVER['AIRTIME_CONF']);
+            }
+        } catch (Exception $e) {
+            self::$message = "Failed to insert " . self::$corsUrl . " into cc_pref" . $e;
+            self::$errors[] = self::CORS_URL;
+        }
+
+    }
 }
\ No newline at end of file

From f9c009a1be06fe24f4293346f784ae3acbc707f3 Mon Sep 17 00:00:00 2001
From: robbt <robbt@azone.org>
Date: Tue, 12 May 2020 13:20:46 -0400
Subject: [PATCH 3/5] Working cors URL update

---
 .../airtime-setup/forms/general-settings.php  |   8 +--
 .../public/css/images/libretime_logo_jp.png   | Bin 0 -> 9898 bytes
 airtime_mvc/public/js/setup/setup-config.js   |  10 ++++
 airtime_mvc/public/setup/general-setup.php    |  53 ++++++------------
 4 files changed, 29 insertions(+), 42 deletions(-)
 create mode 100644 airtime_mvc/public/css/images/libretime_logo_jp.png

diff --git a/airtime_mvc/build/airtime-setup/forms/general-settings.php b/airtime_mvc/build/airtime-setup/forms/general-settings.php
index e31eada08..80c1689ec 100644
--- a/airtime_mvc/build/airtime-setup/forms/general-settings.php
+++ b/airtime_mvc/build/airtime-setup/forms/general-settings.php
@@ -26,11 +26,9 @@
         <div id="corsSlideToggle">
             <span><strong>CORS URL </strong></span><span id="corsCaret" class="caret"></span><hr/>
         </div>
-        <div id="corsFormBody">
-            <div class="form-group">
-                <label class="control-label" for="corsURL">CORS URLs</label>
-                <textarea class="form-control" id="corsURL" rows="4" cols="50"></textarea>
-            </div>
+        <div class="form-group">
+                <label class="control-label" for="corsUrl">CORS URLs</label>
+                <textarea name="corsUrl" class="form-control" id="corsUrl" rows="4" cols="50"></textarea>
         </div>
     </div>
     <div>
diff --git a/airtime_mvc/public/css/images/libretime_logo_jp.png b/airtime_mvc/public/css/images/libretime_logo_jp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d237e4be02f99b50dcada9872427735c17372cf0
GIT binary patch
literal 9898
zcmV;bCRN#qP)<h;3K|Lk000e1NJLTq004sk001Ni1^@s6s)UI!000@xdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3*tvKzOOh5us}y#&m|axf$!dI!Dy{tigVPqO`@
z{i1y>U5YGL0Xdu@tDODMe_!`s{8xReE|=EpsMYgd9(lyci|#-FeSQa@-`}6N()Y9Q
z>-#R|?+1~$bkO&}YTx50@0UNm(7wlq_3Qht?eBT|_e9?hew;Ar%8?h}<NEhRDSqA$
z-+#OD{oc&~vYqdryW{(~tj|Zk|2sE=aSG>4(M3xkdH(LYO8Wen{3-k$Qs5w;`g@(<
z-{r4k=YGEYEqJ;9b?p579+7?xh4VkYP=AZj_x(`*I(9EY|GJ{^<7NEygIU9mOZ+)@
z_w;-1v%8rqk*e;yDgQmid&Pl-GpF~p%1`4@;dOgIgP+b8HyJx*bMdoX7$Fkv8*(^d
zh8yht-eI%E94$6}$GBs9@AcH;h?@i``22($TN>#&G7{4!Yl*kx&$Wbi-SMusL+8pT
zaAXXeEbxs#{kXq+^FR6dd7^t&x*;f-xxQGjuBe)38Oogg<|q;p?l-38#rOTVpK1N$
zKP5Ji!Sce~+2Hi+bBa~MAGMWUo)gCvpPm1-Mrh}I0v5!z3yYzybMTd74mJ1|V+(;e
zcJeb>c}zJjG7w6MC%8*)QmQ1UM_rrmwD69NC4SxpT1Z4mH8oN*(j-|q7wV_wP7TeH
zN_M4`T3YF4lvz{FwbWW$6-LdLT5hG))>?0)&7OMhrPtni@1xHVM*_misH3^j#~5>R
z(aEVN-<}*X=ZY(>yvnMpt-i*ZoATLtmtA+;eUCj)Jn7K>r=I3cKjTabMk!ggV%3^;
z8#XVscGJzb+<M#Xcij0iYu~K?nzis-=Kg)w!Z&NmSboQ~KeEQ#t^GJf5S$d{jEuz`
z$aqr*DCnr1`5tnP%A9iMN2DoABx|84IVUJ%WH4KZ<%XZR`y+GzHgB%vf0VcQcbRia
z-Tz1CoKpAA+@JII7g;;=F-m#~QWq+wK3#zA#&mtZJ=c0eIy>K(M+>*66YZo5vc%h}
zA8GevVeNI#G4uPZF&f`FiLkk1Txi=GvCd^Nja7QLco$zY7B<IP&5j5-Y)gZcj?z~h
zGbA{AW$P`kb=--$bXzHyT_VBK(>^z?m{*28V=2wgo%pou%STj#`EmUirx|fDqi{w|
zuI@8{U@Lv-iov)_k6ehJZhP?Wc1A7aX_gK=uC0!+ysmF-nf2Y_mnC-vQnjvRiI=TX
z18lzbxzg=Dr(HZp6ReW<UWIr;nw*y;k7GOaUEB5Zx<N{8S4(-HT&?b?;77B0s)S0-
zXL~!XP^+G>c|(w#xUAER<@Q5NCdav*a!t3kljaGh%((rw8z-%ix<Hs6s9^iJxxZB|
z3x1tbBaD-KD#p2}BP*#DD~n>gK9|6;qwPS!$3oD@4(#RZQg61E%QALb*#W&U$BB2I
z##P61XRS!UPU8SiLEF7K1Dm|(X`4y@DT<RJrMTuSXNOs-Z>ye)Y7!z=OKy(hstP!@
zHNv70hpt}jiZTxI2>R4KmEZ2JYr>`d#yI0T6x=A+-&6(!8E-vh<#DO)7H#)TF&>-w
zw9p21U|t&{cI<&VX{V(#r_rOt!W&&mcPFR6N#H7%001<N)SuAk1A=&{qUKrj?#1Hi
z8z|UjyG@9}_B4>h8_^8Kt(Arr-wCbX;>q0RRylzJ3mvyQ@8?Saj}hCMgY2+}RzTvp
z`tZ#V4$aY%akW<b;c9+Opxmxq#7b%#hyq}Sk7IY*d?R!WO~MuOc_}z+b6^>5fk$PX
z0=x|3LHL0-8l`Wts8F8U`l0LS@Qw7N%K{0FRM5CR=3F~HsUC9Wj?OY+e1co}m>6BU
z+23g!wj4sw8j0>C`GfMKn~0slkx!?wHb;!==r_9^NbRT5X@sKpn_CZ)uv40}Dd(j*
zPFm*cA*Y>|0D*Q3fWf|;9Be^o9pqHY=R){ngQ}^Gyb0vab_hrmLgz*+G&lk1tzb>K
z7QHQYp*;0+fm-Ti)txg<Xf@Na%P3LsoVNB{y0a5dJJ_UO=q5-Y(f3f5>VAOObmXb-
zu+JR(<bUe|jrsoJ|LJe{`x}WA0P<$5q;&=>ys^T7I}Z@s=((|<CArnpC7D2+kSw^c
z8&y`jIA@FkZN}WuvLI%qPakN3;E13`FwY43jCw^mwHcsLKpzQPT;u?vAY4mzlY>x8
zBu)kx1rT!O2?i6!y7r#LKa8x@Pvy@@YMcNHz!pXXRT?p-HA)A84zcra8C^JP-=#;c
z5p&%I-UM3E3AfBkUcv#$Nkc%MxJ6Mk<rKguU^=JDyHdgf^<BzpgN6w})vmYW2GGg-
zcGkJ6@!Uf^kSi$cwn;w&#JADRYd1szU$hm52r|&P39Vf=J8NAn4dn}#kvcVlCW_I_
zKrJzzY=9nvd`Bz_=LX{e#cU~}ip+yRKw5um(wXrd^tj}PfZap9-gPj#AUVuy0ag3}
zTLa<7`>D(WPSQANCNu;1$D*dX4_0ZUn4Zj}bq;4V9I^qrx7w%~p%p-O(KZMp;ZWh?
zo2^jCgtOk2{Wvu(eZO?N2+gvI5zrTj=%8g&7?!vmV1u^kL=wV+a<M-b$%KOGG>)%%
zC(uQP9KakDOTF7gNTjcJ4I$!jH!ubGgCam$Y~`$$fy~ZNzmqW-z9u$J6B5i<uO#Dk
zM?!%kL{!U>oEFYRp-fEhz>Y!v<S<-bQ85Uwwje)GZnS}mIi`f*B!Aq_BtBMTnT1S;
zqjv^4!7c|dAkEmIcPO5KZX;$0Pk<!$8`w}3YlLtPVsvmYfuJamz9<VSgEH780W?T(
zB-o#>Np=!|MefMk5`<7i^QcoiUE-P%h_n|FLuX#d3BiKyrM}qBMlRJ!GmfjkU?j5#
zcS-z^V@0`8=Co%6Y9~EH5UBXDJaJtp7vva*G0MxP+5!0?8Usz>_Z9&64%i(w4VECS
zPV?qgl4O;%rD*ZDpkpL$6CoFaJRqA22j{he)C?3IpjZ^xE*EqGBZLLSs0{%c<*^c|
z4@H6LPzP2l9qG#kRNNRQfv53mr^$)TgwvDYW9I{`!h#NI0%wDYaM(!joppFSf?jl#
z99%AF06{gnk!UBA_|qzCJbGchuvu)@g?OevXhbdvmsI-yBFPIX2}V?yQLBIoQOp3<
zL>_DawjP3LFO;3SaEMk&A2|lT0SZTiYG|wsQn1VgF;L00K^oGiXyVaVR5a-css!(<
zI`b~qHXeUS4}qH~d^WIsc|nBfZ+RlaQ>Nl+5a|Q8m(r6F0B#_K;`+%8@Wa6#kyNH-
z%*V^3$JX^0T|6`P1Fb%N;02g-VMdaol>_BXVCK?9-P6~EezRs!`alt$6iSdGU<vj}
zn4}3t6`R=c_bcea;Ku;gDDvo_a3G;dFkwj&eE^yW417l8HPjzI3Dsvv9=2jM8b)Uy
z%w(tLa0#}_{B&|WUaW_%xiuq|Fe;T^-FCbbWw0eTK!#EKz_mr>?~`VjNt&JFX!MSQ
zh&CHVJe4dzZeXB)J~0#w8Y*a=`@$On6@t)C2MJ6#an!io-Ri0~ysPGE)16Uo;5ah!
zmXwRgpuewoGQKMr&2hpLNLGZ_dY@noL3a=lVk+(ef><+FYjcr^OaY;w3>gMeSs?>g
z!kO@+x>!RKOVh1XvTuk@kBnz4jx8a018;z=d`B8~5$PZe>x~QyR1J!YHbINlTXZt|
zfTqnC-GHvyprRWIYiJruL9x>mcVRNr4ETixH1+VPpsl86g<=H!P{}C~dqf5WAVxuo
z&5A?~{X@M(NCl0UQ$&zaQ%H9Y$pMm3v?>w3mguTi5|Eo}y_7BA-)JxCKUVMwZ{ah#
z6c`;%BeMvu240`t=nV}xX{av!Py8jVpYjhXY&2Y(Sj9aiei}2IP^@eu5-MVYP(|M#
zstwW=waI!VfLYtYd=XD4T~Z;W5+=)qY#V568|kvezPw8xHj=zw;lkYd&Bf-gn{~hM
zmXp$afHy2Fk&YKY8B5g2UJe<Oh|tIH^o}=}!7Cc+I4^(SOO;~5TjN@h;AO=vYS46&
zR=_-GP$KqcmH}>XXimiW#Y~@_<k4K_<gg5mnRG6Y<)Vb{-aF7(haFL6AR@2OkYYp>
zj|^cIHDYmSbIJMOu>XZZR_H1gvjMh+dLR&;&50U2pSK5dp5+pNkfim2ei)z-s!kIn
z7mz>n02BnSA{-CIc_}pDu3eZGZ*|e~>{gC9BRQat!$OnSL<owL5G&CELj(O`;BbTn
z*9vg#*0`W(E|h`S3>ZU^tr-;oK;f?c+|KUzenyCB<RKFdv17T|7<-9om4O)E?5Se;
zqhxq`Dwp>?1R3CBf*i0*M{OyUE%If3Kmh=cv`CzkG}76qnfeHuLMAGdJ8_+$nS;~l
zLA)NFy`-uDs0^J%%sBLjQw8i7U^ur=NG(7Ul);||2sxoPZn=?qb5!(`MdLum1suQ#
zw2cY{vyeL=3|P;eA$>Kk4o6Et2qmZLQ3SHy`>9%p?9J;ga=#<|*kM^+o|rWzze9-B
zu@uRUr4$5P(m%=@6H5MIed2NIRW%oO7~_w6pt@rpbRZ<*J9d{Ysk#BfxoCa-J{d1!
zi_|B*OIX&a)zR;UPvuGhZP7H}McXW)DS5Be7s?61oVdgZ5^O;VWrZY6<&?XK$CxWP
zjP<im^dReI=R+Nh1jfRs>#AypE9Irbykssm?8?F{9A|hUIi@ZPu`Qy7tBmbZe@BA`
z<$y10H((tw{aAypb9YJrBrNDdxG|4aWA!K#?_xw0O)*h6@GRh7@{kyzN@{Nhj7s_p
zal)=njf0k|ED({407zVjqAM4jjq6k)0WW9aw;p}3CGjFExP>AGIS`#)6H)<v(uF`h
z&1q#laBc|^!CFt7IPyvIr6%L$3xihA74-p6aZXfH*o0*F4cSRW;Mb3j8gVrsW;v=9
zdu}m7B~`Z|(9_bj6e#{HDaimMauiDIW!TuTO^|J?Lwai~Qzk2Vg_s#HhVr`_q0wMq
zhhbvTXykyvL%b-;jJm9oZo%wm_D1i^bruy<2eYxvEvcmeG<F7?;rO~{LooDCtW_Ec
zy;UfoMMd_HPQ*&>CgclQE<4M`B?(`OyIa+GEP_d#-baWFMcBGgq#9l$amq$wWz7=_
zd;zazcetVhZjaUqUn7AOXwA6jRd_(dOUjR}!o!*T=~gD#*EN*^7Z-d-3Bs;sPBL)<
z*7+VyV+W)VL658P5d;r4k!%zRo}3J6%m5)QP5sVcb(N0IX-^!a+yeTyX|SMK<KOt9
z$ubV8PrD$rrY4-g4o8DplxlPfVe;;tW_fEif_I`Y5I#v_or<Dj$i7ctOAeULp^637
zfOD$9VQD+<;Lxa*8rfYA<pj+g<}4_98XT!<D3tyYekd=la7Tn&5ja?-BS)~_FnPG#
zrC)}>gF2*c@wMwSm6O*OPvC;!b17Zk{xCm%fm{YX42C2cb7oX63!5@W86jB%-Xb&=
zc+jvg(vbw<WF?jEmL|A3Z)gI$uCT0}Ch(5Vu2^0C8Pts_lyuuHSoUI_fKp;z)K#sx
z7Yj&&UZjcfTu4M({rvDv?r)9LFx?LUxKS5Z#0*42|MH8`gVPcyZ*sU{o_$<FhHu-P
zwh!Hf#^{bqcAG{mq7{uE(W+ratioEb*p>ym6~TtXgZu*&(OuEZ27?z?@0t={7Grc@
zqYWySEl6u=LeMp<!sDWf_rNiex?Eu`+8@B5P9xm2F>iMfpsitfRvkyUi4bXQ={1yZ
zro^$zk5c>7r|!qcsH}+x#|;z+9G8Wi+8QHg8H_uL%2=3eR%Z9%iRp0#`KT&8t~x>+
zb3AbVF%A3Ovp{LeM~k4;VCRjFE^Du2%r{CG<_H1^z*^fO8Zz8>$Rxri9F3c4VZzp+
zkX$;4f_z}o^Qc4~9S3$zpeRZI^0lBbG-ym!dq|V2rh<zwr)w0T+XJnji8U1P84%z2
zR^9c6&ucNHYS-}oK&S~3q2YeV5pB?gQt485L(L&l3}AoO2n`8$SPm7Un;C6mv8A&R
z7Jx68HisJk)6pIiEiqX(>JXWf_~8_dFT@fy1%@S|hWteDwgl*nqw(m`lt+Hv4c4Ct
z9}%4bIQk0MMMbbIX<|a0W5`Iik;DXV>IE*PJ8{<%w%{px2kAG5AU_HkH!_|T0O2!A
z(G27n9mm=<&?n<87PkQ%m<FE&^!P{icR66|K-=#YknRW_s>dWh3G=LwGOfO-`5~9f
zRS4Wg#i`^alalUZ!`O=!c@H*d+5l(|8U=M5ASFy+DYR_UO&JnWNC>BkSE+&X<5ssE
z6g)E1D@GU#aIuNsjO@T9pahCQ!=ekG*dwH-CmBpe6F@i(8h~wao_OmfN#!_{W?{=w
z$OK@c$~8AJ-G@hTV9ry6k$_H|515Rv<C+sUf)3$yNB2-qa&Yr!z9aV6#E^9a&7GE%
z2>gKYlFkj9;@*sx2k9pu+D%hW=!@90WG9JGQtbdlmj2S17MDjkg0nOwI7}cCsG*!^
zJwG#XdcaO=OK1+zf`1UChB3yPG!>w#-;732->gSz?Tz?wI#D;pbqDTfBv%Hx${w9S
zX)RPC-5>EN?5QoUwbAr3XoBY7ng9?k)Ui6`4}*=xzqEixdohf`^~dQ0ebQYx@Rk^<
zp%M&|2VP-P3h5B>N@td|E<ym^b4JrBA0hGX$U)+=thZh^<z$<sNRno>Bw<|IaGPQF
z(X*{fE=#9Pzhae&-MT}fyAlU~h%ZNQH3Xm2{Orcpsj?s%q~EByfyZdB=VP&L2*s%p
zPtYLlqW(~7M*}tXh`sA0yZ0cEg@gNn&>E+~_>=&UG|-<6jRk>6aEy2%;ElE;h)@se
zFoSONAc)pog{?H!&m4n6#9wFX3#h1?6QFd^z9=e<j9xxtfqYp*q*F1U0$u@Vr?NqI
zdZfT}?|sv~cg_S+wB6{gp$C1M5o_HXLn;NDKhWP){1s$N<4}-GH|=7j35g79j|Ry#
zvBiqKK|<iWhezGLaUucX{O>LmZVlj~Fv%*Cf$oPv@vx<w)x5#N0P~x~+v&t>X}a2%
zrV0=t@(<$A0pBL?0o_Ky@1kin@G;ot%5CCY-n;@Zr#2`kunQs(0(MPq8dX+>G;F*P
zcg+XYP&B5VK;XM8;{GvIG=fGt1OR3_=+e30K*j^;;Ob~nl;|9)Zs;~S3Rl9mp6x<1
zIuqB8yJYXE7*rx03BIGd+mWLr(lMVV$pxUSO)#(l$WeNwX<P-<xqBA8tW{A0VBF4m
zY>fnHHOO&d)}%)~fhAgU>p-*aw0N+b6@X6}?P-oxVrjQ;x@$@GAXahFx|0Q(i#$cn
z*a8@%4VDm|lF~-KmN+z>NSJen!qi>arH36R?j%dd5=ey58&w6}xHzlI4#En0Xl;X_
zdKd<*^}A8gBotY*^i-Li!+;fQLI2LuC%nEj?w%rf=<{lPMgN$lBtwsSWbucJ0#%6(
zYEA~NQ-4LRiY(W&RVZzYUIDUbbGQQNM5?5$DU$BK(%(zdMckd9U85><a9Bw>Kj?@4
z)cgd`mNjv}PvJEcxM)C`Esd@)%AJjt_k=+i`0DZuS?<_%Xp$yE2xVk@=>Y>p8)4H?
z=DP8)8*M6HM@3N}@_lqQvVPA2_eXdVqvEJ>JOtpU*$;1F@<4jXz8^?uNt_{`^q`1m
z1%o)E%sEqHoj`!TX}Zbm{1Y(gVCnEEOMz}kgIwiMGD4NsqLsXEwjtkzcbRgb^C8iw
zXE6f484YPwXh$A#$$FvzRx~|bQi|@<(aKzc{-75SwzMCe7B-X}fkHZv<zvgZ2%dH;
z_`6f5Nkgc<-b8L``iC3@0Q49Ng*K}0d{FTk$88Wj@OL)+J37%Eo*2V`xkuTfBiqrv
zUZkyQABY{z<pF$};Oe0(u*+}%Zmqq0L-^<Z9yD;sr>pxz*myK-?**oPw=1x%&k4;y
z?V&jG4w^C@-LQg6{idtmxC{FgVs%?LttAthFq)IUd2HY3jW~m%excVG-~3_%J-P|!
z#c6a4-k%nL%@FJ~RRrt+VOmxN19~+L6!f6Ro4V6|n8LJyZ4?iT06=Ap5pha5x1s@J
zaX=N+IkP4W&^B1d3SN&<P%2_Q*HgIWLgwf};jCwr)T>ea5(-KjKd_wco(fe5Rl!%;
zbkP0Kffv_oy0t^~A|)gkS@fbCqGpOo_qdwwtX5&ap3#C?6Ry$6q(@Ekv{8O`lTM>`
z71$upMP+EDOLwu`DrlLgursNHfq$j4qi#);)TUxXq3T9r0AuJFxRgTQLbszQak$1o
zK<k#*m_xVvrA4x)U{3dDy@p+nUNLdBgPyBMdWHd++cr(e`j9(m;>i#Knr`#08Z|0w
zdRC>}>9C!-1ma}bzn9tnN59=KZ_us?LOtIVH2-K>q=vMfr^td+fN;p{%Si4rx{WGC
z)`HK)(VFjG2Dn(Gp3Wg9={@#!MM9L0N$P^P;wCz!)hM&$HMY>R1@pOa2=Yw{KZE6=
zC-vUlEyKdEH&KRV;rMrK;`HQzo>)qO1|3Ha!Q5D%V#_h2`sY!$can~y`dOH|Gi_ya
zTs>LQ?VT>thKsJ@lE`zw96yD;(CrL}n8ZiYbFq&lgg3F_>J^2eTegi<xA{(^hog1x
zhXxTkR?V%K^ngQt=x!2Tj%u!P;$h~LA$m^<KA(oJ{ij*`zx~$ZWW)V06^F%E0YPn=
z00006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru<OK^1
z4i8zzGClwR3|~n^K~#9!?VNd#RMi#6f466bWfY7X=FNcO12H^$0G$a$T-ds?gGP-D
zu2BpoO3Ech6PHvfYK)qwaf!RQ$0aU+6{D@wC>j;x3<Q|wjR^Aqg>C@}iUP_^_st)D
zUVG<NvkaLYt+G#5SKZ~^`|jNH-E+Qk-UX$#CMc-^;gHhV`+!$1&wYZgLDB<;bVKXM
zfQKy4jZ>1MOQ=wz(%I{QDZry?+c~4lfnX2mj@HitlYnQ^wo_YD)z<)qwCzj+ek0W~
zU|QOC`gZNI^o78Wq_Qh8J#9OCmekdSU`X3eKj1!7E5Nyy=dSEhD4=cw5=PU$z&)#m
z*OfHZ6<}C3Vidq%f!&P$TSG&?_eh>g*v{U?a}7?<wC(f)sPYzV0Zsyz8IPP8+OX-^
zlFGUO455!d83&k~Jzpy>-)H7@Us<&Z-cQ@kIqP4W-N|Ip=?TmPW~6PW8-V4xp8#h7
zS>w^0Qug3(CAAetl-8P-a2=JKHoXOmlJ+bx%JSTQi$&N=!91X!^i8!q_r5|C#v+m4
zC`JJNfu6uRV6jr6c`v>4iY{OgDuL&Lh&0`4dG7f}|6RaTW5^WCa~~|Ju1H`=+s;Vf
z9i#ne%X3c#Sb5|`%9bquyD)oSUd<{Mt!`PAKee%Fq!zdmI11=q$N&f*xiwy&_{325
zP~a^gioQ&=JohE(-v?*`c9FhCmgj~`sw<wGn9`oWalKzITe5td_-|iYfD?TnOq@88
zSTyoy;NQUUTLA)q1^gapjzuG*^NpUn5co;p+1pcJxr^1nG^1}w+IB{jR96Hrq->`G
z__5J8r^<8Z1AI92`v6x1%5WcNTb{dKtU<SI>y~4HWCz~45m*z8Mq&maW&#fw&kR&>
zx>3JZA{$>$D(0q)8+Q-~hr<;Ihr<;Ig~Oq53mD23)B$^$E+XIg`NrYEp+?_xmgoM<
zj5dJtfL{WWfro&4;C^5pT7QaC{e%x(1hfLjh;m29qLH!j`o!BZ*KdJS40mw8%m>b(
zX59A|0>gYak{(ujv9)0C4*ijJHQ}+q0AN#NQ}T(e^gjix1){BOnRONAWnW77rNGTa
zh@Qp+`)}v5*}~JF0@iAXRC(@4MFRscI?(n{qkOVq6##BDIKmhKf)Y?%2n>qXCzb`~
z`vhn@G8(y8!9Kua2EZPSMIuAviNqGmb62Nr=TU<!9-OwF11-;8Y`rj(wC%(VFbw3g
z&3%A1JNS403^)~71r$oJj|Te4uSS$mY&j1&aXZhP0UY43P36{BR4@!T>K|uAs>P^}
zH_Gp4>xMP}oPNqF09OTo@}UoeSTxedKz#<S7rdO9wJ8>ftU$5W7;_+sQ-DXM{&*mA
zm;fx6@|(bA2G^+tUh1TMxP@G{b*)mNddO6C0T|{OuJ1r#sFYs-HcR;f4KFBJ8)a%%
zQQd?r#FvHDOLN39Wjj4pZo_?vS3ms}0PEI$ydQA5=|0Xp`=`$f5cZRkrGX8=rzrI{
za78?k$i||P^MI(~4$kz!kX5`B(rf^F`_{pD$9sXb_v@@p(CBjD8NqH@0XI?!j1zJ^
zr?DxS0yw0umMvd?Q6q=qBZX=MMrn9!Zc}o-jO_=Eko{<AY)XD8Jn1in%ed6Hx*Dcd
z85!TS?d;*NO=oln$fj*4EC*tZMz2$-@wxrfZ&+UQ+LY~dS1=an1<VO%kW;o(sdCn^
zH_)OhD&|%#UZ6w3-huEh7jr^i+NY}*8|6a-efOMp+G&1y5YPkI0(>DT&*zcj^@-Jz
zSMcSKBO{S=fa(@E11vK72K$AK*2{p5(Kn#e;%n4N3bjC?7U*m{{^Xz9_ke!@&jKxV
zHR0m{TDNQ|Q>b||_8Pzi{-I#l$RR^iT}}9Uz>{&$0bX5A_{xTchK?-nBwzus0G(f3
zqqN<iQ1it?J`3u-wCzL{ER?pVfyHL@mA0K9Dp(G@C|smLwYI*JvYlN+z;}!n|JNu7
zH)Xj|KA`=<YL}w`SPy(CQO4T^PPIuwE0tnjqyB+W&I7gYvgV9f8eh8V!__(D5^ncM
zB-8_#R-3aHrc4I92_VRX)CIuhawskWE|zHQ+NnQ1`-o0j+Zn)IgXirbAn?T6YM>Ih
zM1XK0FkSX_nv7ozL=^lXB(B1jR-+uu7i==hy^L~OJdxN~Ag3@`EXX(^Wm}sI*<fF`
z80DbvZYz)@DYiVj`<{Cp*VvSt3jA8yc317AEdQ|dzjN9HLr}Z{{7TwyYivs1-q@79
z6^M&VIj)n|_Pph}XA<HV!>Yeeh@&jeJ<A}%jzL;`0PkhX)Xy!?eH^$!`i={UDfeX;
zqx@Om#ilz+nF@<VBh`UtH%k<;2Kd|{M7~r9oc21S)_Vs*^JN!-;r062`QXB|?|TG6
z)7X^UFmmKbbT-=^^49Lsx|;Cjx|;B2$<7wCx;rb20j#BN7V>+Tl)9fF#5nLiC<cWx
zdQ;kVHcOZfV3h+O^VOG1Q{ll7rvEm`+=P5ipuL+|A@lU{JEl&Z3NX>+DLs4jT5Z$^
z6>=FVd+@Fb)oUw&EH=sZW%oexte~~ikTt@r*Ts~Z@}EvxTect{-v09`iQG)dlmn{`
zGS=4^^-+j+%)ZVb39l>EM#GZ)Iu?yQ9<NXMCVoEw)*yLteu2xDE*S$HW=1J9X3X%(
z&29lc;u<7xP+;-Pc4G4?>T1Hn1LSdg+0&EjYQp!S$)LE<a95368!#{Fepy!&ULt>g
z7WiFbQ?gZ}i|WRv<f^YJ$+!TBiJQOM^4t}&@0A+5hvWfY4ocZh4}faV%}8wTOEhH<
z?g8*}{j80^BLUWbos?II|4K=Dt;E#CqLE#JhXV_|$0)}FC((TW(7?Eso!E>%aw_vb
zjoxEBV@3ig6e-|nX}iC%DY?Dm&((4WCP)NQUsn@;w}YwsP8AJzh&$O0Sd_M%*V48#
z8%Qe{9s=f@Cr9OC;zHTT-4*HtqkgUM0>rvJ9*ah<5RP!Hu-XygKCX*JBNJp}?lR_h
za>~!oeHS2g=xBg*jlM5{S%EBJo-gQ*nc5W4yp>-@+?v!?hTJV-zyE4cU~l<*Z$Wc$
z&a5acF0)zOZC)<=&1FwW)^k3&%<E|35ziD@-#X)ctpy@8>C<h7n{Jka=8Gq7s{*Nl
zX8+(w{^D>+Y#|o<V4y+6a+TVDaQ}eGz1i~IOT~Qb39K}To2ya7s=P&Qa?+0l?$U6S
z%6*YMPLvoIpL#sG+fxyFX`6&IeRIrKkBHaLS}*T940yxHYUV$qud)Z1g-~gO)6BL!
zcWhUks8c6RVo7szg;FZhuyA3vBV#8|o=kFXV>t??LZP;X`3p7Q07(rT5>i=Ru0ym{
z3E@;r4;fA6M{5=u;a>_xf2+l96(t2Pmt1an?w|b1k<szJ73zT<$g`W_;R#yv>dT45
z=aLcYuHfB(EBJwbxh8EpM@!PjmrKkHUP(GfLId8O4e+GVR)xlN2Y(dP@5?o5+sUV*
zU#_3E0k{ch+CldFFq+vu5G31qTL1{p`9NrzGzm%Cm|%Lkq`J-*|EAMELiYSb(;}@H
zUe)5Z$;rF`xZN0+%!br3|2qaiEHb_frH&zY58*KJlRf}k;1yt6ygt!vE<kQs%`x1=
zdSIxZPnT5cn@0Z(%X5z}sjf(1kWIf^GE}}?V0rEx04oO$R%KcB9Jxy{D}iyA=PudW
zq_Jq^2#K!&R>bQQ{kOG<wC((Y9Mjdn33AzmRRe~Ug|vRh2x~QPh;KDY(#dWj;10};
z-*su*u>txnZPq$>HSHN-?6!bVAaPV3i$=D2quKJ@yMSK^7nqq}oYt3^`3*_GmVi)f
z%OEH83L{^DWX=w^Ja=<PCXGcSSCNY@{PWy5o=9{k(IUJgLGI&^pW&;qJl89!t@xIK
zjN(RetlpPe;BV;xPI(9C{cd~6VRsM+{@1l`fheW~gsuWZ-yC5)mG+;q4?@$?e@XSd
zK)rtl$Jf&SL(p`}LU)wZ)rDXX|Lp-Mkozj=0b?xBO?PnK;6K#0Ix<-P8-OViiOkh-
zmbE0QOX})kFo-f{lgl2Cu{`&Kj!by;s8NNKe?UhUW_j+z<Zk&)tn%E?OR6fqly5^B
zFYe5Qt(BG4DtEial%2Y-XnF4Rl8U}&%kY1NC+)AW6(*D=`F4N-s1jdq{svAMKR#62
c?r*mI4<W@#OHV*Au>b%707*qoM6N<$f>r9?oB#j-

literal 0
HcmV?d00001

diff --git a/airtime_mvc/public/js/setup/setup-config.js b/airtime_mvc/public/js/setup/setup-config.js
index f5926c844..81294f55a 100644
--- a/airtime_mvc/public/js/setup/setup-config.js
+++ b/airtime_mvc/public/js/setup/setup-config.js
@@ -87,6 +87,7 @@ function formSlide(dir) {
         steps = parseInt(stepCount.html());
     stepCount.html((dir == "next") ? (steps + 1) : (steps - 1));
     hideRMQForm();
+    hideCORSForm();
 }
 
 /**
@@ -112,6 +113,15 @@ function hideRMQForm() {
     $("#advCaret").removeClass("caret-up");
 }
 
+/**
+ * Hide the RMQ form when the slider is called to avoid showing
+ * scrollbars on slider panels that fit vertically
+ */
+function hideCORSForm() {
+    $("#corsFormBody").slideUp(500);
+    $("#corsCaret").removeClass("caret-up");
+}
+
 function submitForm(e, obj) {
     resetFeedback();
     e.preventDefault();
diff --git a/airtime_mvc/public/setup/general-setup.php b/airtime_mvc/public/setup/general-setup.php
index f70f00410..7032f1055 100644
--- a/airtime_mvc/public/setup/general-setup.php
+++ b/airtime_mvc/public/setup/general-setup.php
@@ -22,30 +22,33 @@ require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/om/BaseCc
  * Wrapper class for validating and setting up general settings during the installation process
  */
 class GeneralSetup extends Setup {
-    static $corsUrl;
     // airtime.conf section header
     protected static $_section = "[general]";
 
+    // Array of key->value pairs for airtime.conf
+    protected static $_properties;
+
     // Constant form field names for passing errors back to the front-end
     const GENERAL_PORT = "generalPort",
         GENERAL_HOST = "generalHost";
-    const CORS_URL = "corsURL";
+    const CORS_URL = "corsUrl";
 
-    // Array of key->value pairs for airtime.conf
-    protected static $_properties;
+    static $cors_url;
 
     // Message and error fields to return to the front-end
     static $message = null;
     static $errors = array();
 
     function __construct($settings) {
-        self::$corsUrl = $settings[self::CORS_URL];
+
         self::$_properties = array(
             "api_key" => $this->generateRandomString(),
             "base_url" => $settings[self::GENERAL_HOST],
             "base_port" => $settings[self::GENERAL_PORT],
             "cors_url" => $settings[self::CORS_URL]
         );
+        self::$cors_url = $settings[self::CORS_URL];
+
     }
 
     /**
@@ -57,8 +60,11 @@ class GeneralSetup extends Setup {
         if (count(self::$errors) <= 0) {
             $this->writeToTemp();
         }
-        $this->setupCorsUrl();
-
+        if (strlen(self::$cors_url) == 0) {
+        }
+        else {
+            $this->setupCorsUrl();
+        }
         return array(
             "message" => self::$message,
             "errors" => self::$errors
@@ -75,7 +81,7 @@ class GeneralSetup extends Setup {
             $con = Propel::getConnection();
         } catch(Exception $e) {
             self::$message = "Failed to insert Cors URL; database isn't configured properly!";
-            self::$errors[] = self::MEDIA_FOLDER;
+            self::$errors[] = self::CORS_URL;
             return;
         }
 
@@ -84,38 +90,11 @@ class GeneralSetup extends Setup {
 
     function runCorsUrlQuery($con) {
         try {
-            //Check if key already exists
-            $sql = "SELECT valstr FROM cc_pref"
-                ." WHERE keystr = 'allowed_cors_urls'";
-
-            $paramMap = array();
-            $paramMap[':key'] = 'allowed_cors_urls';
-
-            $sql .= " FOR UPDATE";
-
-            $result = Application_Common_Database::prepareAndExecute($sql,
-                $paramMap,
-                Application_Common_Database::ROW_COUNT,
-                PDO::FETCH_ASSOC,
-                $con);
-
-            if ($result > 1) {
-
-            }
-            else {
-                $pref = new CcPref();
-                //if (self::$corsUrl != '') {
-                $pref->setKeyStr('allowed_cors_urls')
-                    ->setValStr(self::$corsUrl)
-                    ->save();
-                //$pref::setValue('allowed_cors_urls', self::CORS_URL);
-                self::$message = "Saved cors_url";
-                //}
+        Application_Model_Preference::SetAllowedCorsUrls(self::$cors_url);
                 Propel::close();
                 //unset($_SERVER['AIRTIME_CONF']);
-            }
         } catch (Exception $e) {
-            self::$message = "Failed to insert " . self::$corsUrl . " into cc_pref" . $e;
+            self::$message = "Failed to insert " . self::$cors_url . " into cc_pref" . $e;
             self::$errors[] = self::CORS_URL;
         }
 

From a36856ce6ab43d818345cb7c971ce7aba1b18adf Mon Sep 17 00:00:00 2001
From: robbt <robbt@azone.org>
Date: Tue, 12 May 2020 13:32:48 -0400
Subject: [PATCH 4/5] Hid CORS form and added additional text

---
 airtime_mvc/build/airtime-setup/forms/general-settings.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/build/airtime-setup/forms/general-settings.php b/airtime_mvc/build/airtime-setup/forms/general-settings.php
index 80c1689ec..a6055f666 100644
--- a/airtime_mvc/build/airtime-setup/forms/general-settings.php
+++ b/airtime_mvc/build/airtime-setup/forms/general-settings.php
@@ -21,15 +21,18 @@
         <input class="form-control" type="hidden" name="generalErr" id="generalErr" aria-describedby="helpBlock"/>
         <p>The CORS URL can be setup during install if you are accessing your LibreTime instance behind a Proxy.
             This is common with docker setups. If you have a reverse proxy setup enter the URL below, otherwise you
-            can safely ignore this.
+            can safely ignore this. If you are reinstalling LibreTime on an existing setup you can ignore this as well,
+            the settings in your existing database will be retained unless you enter new values below.
         </p>
         <div id="corsSlideToggle">
             <span><strong>CORS URL </strong></span><span id="corsCaret" class="caret"></span><hr/>
         </div>
+        <div id="corsFormBody">
         <div class="form-group">
                 <label class="control-label" for="corsUrl">CORS URLs</label>
                 <textarea name="corsUrl" class="form-control" id="corsUrl" rows="4" cols="50"></textarea>
         </div>
+        </div>
     </div>
     <div>
         <input type="submit" formtarget="generalSettingsForm" class="btn btn-primary btn-next" value="Next &#10097;"/>

From 70a309d147da636c53b3d0b01f4adbccf55dce14 Mon Sep 17 00:00:00 2001
From: robbt <robbt@azone.org>
Date: Wed, 13 May 2020 08:55:57 -0400
Subject: [PATCH 5/5] Added instructions for 1 URL per line and example URL

---
 airtime_mvc/build/airtime-setup/forms/general-settings.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/build/airtime-setup/forms/general-settings.php b/airtime_mvc/build/airtime-setup/forms/general-settings.php
index a6055f666..50426a543 100644
--- a/airtime_mvc/build/airtime-setup/forms/general-settings.php
+++ b/airtime_mvc/build/airtime-setup/forms/general-settings.php
@@ -21,7 +21,8 @@
         <input class="form-control" type="hidden" name="generalErr" id="generalErr" aria-describedby="helpBlock"/>
         <p>The CORS URL can be setup during install if you are accessing your LibreTime instance behind a Proxy.
             This is common with docker setups. If you have a reverse proxy setup enter the URL below, otherwise you
-            can safely ignore this. If you are reinstalling LibreTime on an existing setup you can ignore this as well,
+	    can safely ignore this. Please enter one URL per line. Include the entire URL such as http://example.com
+            If you are reinstalling LibreTime on an existing setup you can ignore this as well,
             the settings in your existing database will be retained unless you enter new values below.
         </p>
         <div id="corsSlideToggle">
