choteaumt
/
rosehill
mirror of https://github.com/City-of-Bloomington/rosehill.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More post-migration updates

This commit is contained in:
Ron Bronson 2017-10-16 10:24:50 -04:00
parent 598a4cbc0a
commit 9043e7285a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blocks/html/deeds/deedList.inc
View File

@ -44,7 +44,7 @@
$url = new URL(BASE_URL.'/deeds/deleteDeed.php'); $url = new URL(BASE_URL.'/deeds/deleteDeed.php');
$url->deed_id = $deed->getId(); $url->deed_id = $deed->getId();
$url->return_url = "http://$_SERVER[SERVER_NAME]$_SERVER[REQUEST_URI]"; $url->return_url = "https://'.BASE_HOST.$_SERVER['REQUEST_URI']";
$deleteButton = " $deleteButton = "
<button type=\"button\" class=\"delete\" onclick=\"COB.deleteConfirmation('$url');\"> <button type=\"button\" class=\"delete\" onclick=\"COB.deleteConfirmation('$url');\">
Delete Delete

4
blocks/html/interments/intermentList.inc
View File

@ -7,7 +7,7 @@
* @param GET sort * @param GET sort
*/ */
$previousSort = isset($_GET['sort']) ? $_GET['sort'] : 'deceasedDate'; $previousSort = isset($_GET['sort']) ? $_GET['sort'] : 'deceasedDate';
$url = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']); $url = new URL('https://'.BASE_HOST.$_SERVER['REQUEST_URI']);
$url->purgeEmptyParameters(); $url->purgeEmptyParameters();
$return_url = $url->__toString(); $return_url = $url->__toString();
?> ?>
@ -65,7 +65,7 @@ $return_url = $url->__toString();
"; ";
$url = new URL(BASE_URL.'/interments/deleteInterment.php'); $url = new URL(BASE_URL.'/interments/deleteInterment.php');
$url->interment_id = $interment->getId(); $url->interment_id = $interment->getId();
$url->return_url = "http://$_SERVER[SERVER_NAME]$_SERVER[REQUEST_URI]"; $url->return_url = "https://'.BASE_HOST.$_SERVER['REQUEST_URI']);
$deleteButton = " $deleteButton = "
<button type=\"button\" class=\"delete\" onclick=\"COB.deleteConfirmation('$url');\"> <button type=\"button\" class=\"delete\" onclick=\"COB.deleteConfirmation('$url');\">
Delete Delete

2
html/interments/home.php
View File

@ -28,7 +28,7 @@ if ($template->outputFormat=='html') {
} }
if (userIsAllowed('Interments') && !count($search)) { if (userIsAllowed('Interments') && !count($search)) {
$return_url = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']); $return_url = new URL('https://'.BASE_HOST.$_SERVER['REQUEST_URI']);
$template->blocks[] = new Block('interments/addIntermentForm.inc', $template->blocks[] = new Block('interments/addIntermentForm.inc',
array('return_url'=>$return_url)); array('return_url'=>$return_url));
} }

2
libraries/framework/blocks/html/pageNavigation.inc
View File

@ -6,7 +6,7 @@
* @param Zend_Paginator $this->pages * @param Zend_Paginator $this->pages
*/ */
if ($this->pages->pageCount > 1) { if ($this->pages->pageCount > 1) {
$url = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']); $url = new URL('https://'.BASE_HOST.$_SERVER['REQUEST_URI']);
$url->purgeEmptyParameters(); $url->purgeEmptyParameters();
echo '<ul class="pageNavigation">'; echo '<ul class="pageNavigation">';