Pass in the proxy hostname for url generation

Fixes #25
City-of-Bloomington · Jun 14, 2017 · d146a5d · d146a5d
1 parent 90c95b2
commit d146a5d
Show file tree

Hide file tree

Showing 5 changed files with 142 additions and 72 deletions.
diff --git a/blocks/html/embed/chooseService.inc b/blocks/html/embed/chooseService.inc
@@ -1,14 +1,14 @@
 <?php
 /**
- * @copyright 2011-2016 City of Bloomington, Indiana
+ * @copyright 2011-2017 City of Bloomington, Indiana
  * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt
  * @param Endpoint $this->endpoint
  * @param GET group
  */
 use Application\Models\Endpoint;
 use Blossom\Classes\Url;
 
-$url = new Url(Url::current_url());
+$url = new Url(Url::current_url(APPLICATION_HOST));
 $url->group = $_GET['group'];
 
 $title = $_GET['group'] === Endpoint::FEATURED
@@ -26,7 +26,7 @@ $title = $_GET['group'] === Endpoint::FEATURED
 			: $this->endpoint->getServiceList();
 
 		if ($services) {
-            $url = new Url(Url::current_url());
+            $url = new Url(Url::current_url(APPLICATION_HOST));
 
 			foreach ($services as $s) {
 				$url->service_code = $s->service_code;
@@ -36,4 +36,4 @@ $title = $_GET['group'] === Endpoint::FEATURED
 		}
 	?>
 	</ul>
-</article>
+</article>
diff --git a/blocks/html/people/info.inc b/blocks/html/people/info.inc
@@ -1,13 +1,13 @@
 <?php
 /**
- * @copyright 2009-2016 City of Bloomington, Indiana
+ * @copyright 2009-2017 City of Bloomington, Indiana
  * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt
  * @param Person $this->person
  */
 use Application\Models\Person;
 use Blossom\Classes\Url;
 
-$return_url = Url::current_url();
+$return_url = Url::current_url(APPLICATION_HOST);
 $h = $this->template->getHelper('buttonLink');
 
 $username = $this->person->getUsername();
@@ -34,7 +34,7 @@ echo "
         <h1>$name</h1>
         <div class=\"tools\">$editButton</div>
     </header>
-    
+
 	<table>
 		<tr><th>{$this->_('email')}</th>
 			<td>{$this->person->getEmail()}</td>

diff --git a/blocks/html/people/list.inc b/blocks/html/people/list.inc
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright 2009-2016 City of Bloomington, Indiana
+ * @copyright 2009-2017 City of Bloomington, Indiana
  * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt
  * @param array $this->people
  */
@@ -12,7 +12,7 @@ use Blossom\Classes\Url;
         <h1><?= $this->translate(['person','people',2]); ?></h1>
         <div class="tools">
         <?php
-            $return_url = Url::current_url();
+            $return_url = Url::current_url(APPLICATION_HOST);
             $helper = $this->template->getHelper('buttonLink');
 
             if (Person::isAllowed('people', 'add')) {