Skip to content

Fixing updated xajaxResponse function names in Issue #7 #8

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

Open
muel9560 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixing updated xajaxResponse function names in Issue #7 #8

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec151b0
fixing xajaxResponse::addAssign to xajaxResponse::assign
muel9560 Jun 22, 2025
eeee81a
fixing xajaxResponse::getXML to getOutput
muel9560 Jun 22, 2025
affd207
trying printOutput instead
muel9560 Jun 22, 2025
4d5b396
fixing addScript to includeScript
muel9560 Jun 22, 2025
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
68 changes: 34 additions & 34 deletions rack_maint.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ function ws_display_list($window_name, $form) {
// Check permissions
if (! (auth('rack_add') or auth('advanced'))){
$response = new xajaxResponse();
$response->addScript("alert('Permission denied!');");
return($response->getXML());
$response->includeScript("alert('Permission denied!');");
return($response->printOutput());
}

// If the group supplied an array in a string, build the array and store it in $form
Expand Down Expand Up @@ -255,10 +255,10 @@ class="act"
// Insert the new table into the window
// Instantiate the xajaxResponse object
$response = new xajaxResponse();
$response->addAssign("{$form['form_id']}_racks_count", "innerHTML", "({$count})");
$response->addAssign("{$form['content_id']}", "innerHTML", $html);
// $response->addScript($js);
return($response->getXML());
$response->assign("{$form['form_id']}_racks_count", "innerHTML", "({$count})");
$response->assign("{$form['content_id']}", "innerHTML", $html);
// $response->includeScript($js);
return($response->printOutput());
}


Expand Down Expand Up @@ -1285,8 +1285,8 @@ function ws_rack_editor($window_name, $form='') {
// Check permissions
if (! (auth('rack_add') or auth('advanced'))){
$response = new xajaxResponse();
$response->addScript("alert('Permission denied!');");
return($response->getXML());
$response->includeScript("alert('Permission denied!');");
return($response->printOutput());
}

// If the user supplied an array in a string, build the array and store it in $form
Expand Down Expand Up @@ -1468,8 +1468,8 @@ function ws_ru_editor($window_name, $form='') {
// Check permissions
if (! (auth('rack_add') or auth('advanced'))){
$response = new xajaxResponse();
$response->addScript("alert('Permission denied!');");
return($response->getXML());
$response->includeScript("alert('Permission denied!');");
return($response->printOutput());
}

// If the user supplied an array in a string, build the array and store it in $form
Expand Down Expand Up @@ -1696,8 +1696,8 @@ function ws_rack_save($window_name, $form='') {
// Check permissions
if (! (auth('rack_add') or auth('advanced'))){
$response = new xajaxResponse();
$response->addScript("alert('Permission denied!');");
return($response->getXML());
$response->includeScript("alert('Permission denied!');");
return($response->printOutput());
}

// Instantiate the xajaxResponse object
Expand Down Expand Up @@ -1733,8 +1733,8 @@ function ws_rack_save($window_name, $form='') {
}

// Insert the new table into the window
$response->addScript($js);
return($response->getXML());
$response->includeScript($js);
return($response->printOutput());
}


Expand All @@ -1758,8 +1758,8 @@ function ws_save($window_name, $form='') {
// Check permissions
if (! (auth('rack_add') or auth('advanced'))){
$response = new xajaxResponse();
$response->addScript("alert('Permission denied!');");
return($response->getXML());
$response->includeScript("alert('Permission denied!');");
return($response->printOutput());
}

// Instantiate the xajaxResponse object
Expand Down Expand Up @@ -1796,8 +1796,8 @@ function ws_save($window_name, $form='') {
}

// Insert the new table into the window
$response->addScript($js);
return($response->getXML());
$response->includeScript($js);
return($response->printOutput());
}


Expand All @@ -1819,8 +1819,8 @@ function ws_rack_delete($window_name, $form='') {
// Check permissions
if (! (auth('rack_del') or auth('advanced'))){
$response = new xajaxResponse();
$response->addScript("alert('Permission denied!');");
return($response->getXML());
$response->includeScript("alert('Permission denied!');");
return($response->printOutput());
}

// If an array in a string was provided, build the array and store it in $form
Expand All @@ -1843,8 +1843,8 @@ function ws_rack_delete($window_name, $form='') {
$js .= $form['js']; // usually js will refresh the window we got called from

// Return an XML response
$response->addScript($js);
return($response->getXML());
$response->includeScript($js);
return($response->printOutput());
}


Expand All @@ -1868,8 +1868,8 @@ function ws_delete($window_name, $form='') {
// Check permissions
if (! (auth('rack_del') or auth('advanced'))){
$response = new xajaxResponse();
$response->addScript("alert('Permission denied!');");
return($response->getXML());
$response->includeScript("alert('Permission denied!');");
return($response->printOutput());
}

// If an array in a string was provided, build the array and store it in $form
Expand All @@ -1892,8 +1892,8 @@ function ws_delete($window_name, $form='') {
$js .= $form['js']; // usually js will refresh the window we got called from

// Return an XML response
$response->addScript($js);
return($response->getXML());
$response->includeScript($js);
return($response->printOutput());
}


Expand Down Expand Up @@ -1931,9 +1931,9 @@ function ws_display_info($window_name, $form='') {
// Insert the new html into the window
// Instantiate the xajaxResponse object
$response = new xajaxResponse();
$response->addAssign("rack_unit_info", "innerHTML", $html);
if ($js) { $response->addScript($js); }
return($response->getXML());
$response->assign("rack_unit_info", "innerHTML", $html);
if ($js) { $response->includeScript($js); }
return($response->printOutput());

}*/

Expand Down Expand Up @@ -2041,8 +2041,8 @@ function ws_display($window_name, $form='') {
array_pop($_SESSION['ona']['work_space']['history']);
$html .= "<br><center><font color=\"red\"><b>Rack doesn't exist!</b></font></center>";
$response = new xajaxResponse();
$response->addAssign("work_space_content", "innerHTML", $html);
return($response->getXML());
$response->assign("work_space_content", "innerHTML", $html);
return($response->printOutput());
}

// get location info
Expand Down Expand Up @@ -2461,9 +2461,9 @@ class="act"
// Insert the new html into the window
// Instantiate the xajaxResponse object
$response = new xajaxResponse();
$response->addAssign("work_space_content", "innerHTML", $html);
if ($js) { $response->addScript($js); }
return($response->getXML());
$response->assign("work_space_content", "innerHTML", $html);
if ($js) { $response->includeScript($js); }
return($response->printOutput());
}


Expand Down