Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #355: fix PHP Notices on Organizations index page. #356

Merged
merged 1 commit into from
Mar 1, 2018
Merged

Issue #355: fix PHP Notices on Organizations index page. #356

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions organizations/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@
//except we don't want it to retain if they press the 'index' button
//check what referring script is

if ($_SESSION['ref_script'] != "orgDetail.php"){
if (isset($_SESSION['ref_script']) && $_SESSION['ref_script'] != "orgDetail.php") {
$reset='Y';
}
else {
$reset = 'N';
}

$_SESSION['ref_script']=$currentPage;

Expand All @@ -55,8 +58,8 @@
<tr>
<td class='searchRow'><label for='searchName'><b><?php echo _("Name (contains)");?></b></label>
<br />
<input type='text' name='searchOrganizationName' id='searchOrganizationName' style='width:145px' value="<?php if ($reset != 'Y') echo $_SESSION['org_organizationName']; ?>" /><br />
<div id='div_searchName' style='<?php if ((!$_SESSION['org_organizationName']) || ($reset == 'Y')) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchOrganizationName' value='<?php echo _("go!");?>' class='searchButton' /></div>
<input type='text' name='searchOrganizationName' id='searchOrganizationName' style='width:145px' value="<?php if ($reset != 'Y' && isset($_SESSION['org_organizationName'])) echo $_SESSION['org_organizationName']; ?>" /><br />
<div id='div_searchName' style='<?php if ((!isset($_SESSION['org_organizationName'])) || ($reset == 'Y')) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchOrganizationName' value='<?php echo _("go!");?>' class='searchButton' /></div>
</td>
</tr>

Expand All @@ -72,7 +75,7 @@
$organizationRole = new OrganizationRole();

foreach($organizationRole->allAsArray() as $display) {
if (($_SESSION['org_organizationRoleID'] == $display['organizationRoleID']) && ($reset != 'Y')){
if ((isset($_SESSION['org_organizationRoleID'])) && ($_SESSION['org_organizationRoleID'] == $display['organizationRoleID']) && ($reset != 'Y')) {
echo "<option value='" . $display['organizationRoleID'] . "' selected>" . $display['shortName'] . "</option>";
}else{
echo "<option value='" . $display['organizationRoleID'] . "'>" . $display['shortName'] . "</option>";
Expand All @@ -88,8 +91,8 @@
<tr>
<td class='searchRow'><label for='searchContact'><b><?php echo _("Contact Name (contains)");?></b></label>
<br />
<input type='text' name='searchContactName' id='searchContactName' style='width:145px' value="<?php if ($reset != 'Y') echo $_SESSION['org_contactName']; ?>" /><br />
<div id='div_searchContact' style='<?php if ((!$_SESSION['org_contactName']) || ($reset == 'Y')) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchContactName' value='<?php echo _("go!");?>' class='searchButton' /></div>
<input type='text' name='searchContactName' id='searchContactName' style='width:145px' value="<?php if ($reset != 'Y' && isset($_SESSION['org_contactName'])) echo $_SESSION['org_contactName']; ?>" /><br />
<div id='div_searchContact' style='<?php if ((!isset($_SESSION['org_contactName'])) || ($reset == 'Y')) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchContactName' value='<?php echo _("go!");?>' class='searchButton' /></div>
</td>
</tr>

Expand Down Expand Up @@ -134,20 +137,20 @@
<?php
//used to default to previously selected values when back button is pressed
//if the startWith is defined set it so that it will default to the first letter picked
if (($_SESSION['org_startWith']) && ($reset != 'Y')){
if ((isset($_SESSION['org_startWith'])) && ($reset != 'Y')){
echo "startWith = '" . $_SESSION['org_startWith'] . "';";
echo "$(\"#span_letter_" . $_SESSION['org_startWith'] . "\").removeClass('searchLetter').addClass('searchLetterSelected');";
}

if (($_SESSION['org_pageStart']) && ($reset != 'Y')){
if ((isset($_SESSION['org_pageStart'])) && ($reset != 'Y')){
echo "pageStart = '" . $_SESSION['org_pageStart'] . "';";
}

if (($_SESSION['org_numberOfRecords']) && ($reset != 'Y')){
if ((isset($_SESSION['org_numberOfRecords'])) && ($reset != 'Y')){
echo "numberOfRecords = '" . $_SESSION['org_numberOfRecords'] . "';";
}

if (($_SESSION['org_orderBy']) && ($reset != 'Y')){
if ((isset($_SESSION['org_orderBy'])) && ($reset != 'Y')){
echo "orderBy = \"" . $_SESSION['org_orderBy'] . "\";";
}

Expand Down