Skip to content

Commit

Permalink
This should tighten up our digital borders. close opendcim#366
Browse files Browse the repository at this point in the history
  • Loading branch information
@wilpig
wilpig committed Mar 3, 2014
1 parent f5da9d7 commit 7f3aec4
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 39 deletions.
4 changes: 2 additions & 2 deletions config.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ function UpdateConfig(){
$i++;
}

$sql='update fac_Config set Value=\''.addslashes($valueStr).'\' where Parameter=\''.$key.'\'';
$sql='update fac_Config set Value=\''.sanitize($valueStr).'\' where Parameter=\''.$key.'\'';
$dbh->query( $sql );
}else{
if(preg_match('/[m|w]Date/',$key)){
if($value!='now'){$value='blank';} // if someone puts a weird value in default it back to blank
}
$sql="update fac_Config set Value=\"".addslashes($value)."\" where Parameter=\"$key\";";
$sql="update fac_Config set Value=\"".sanitize($value)."\" where Parameter=\"$key\";";
$dbh->query($sql);
}
}
Expand Down
34 changes: 17 additions & 17 deletions customers.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ class Contact {

function MakeSafe(){
$this->ContactID=intval($this->ContactID);
$this->UserID=addslashes(trim($this->UserID));
$this->LastName=addslashes(trim($this->LastName));
$this->FirstName=addslashes(trim($this->FirstName));
$this->Phone1=addslashes(trim($this->Phone1));
$this->Phone2=addslashes(trim($this->Phone2));
$this->Phone3=addslashes(trim($this->Phone3));
$this->Email=addslashes(trim($this->Email));
$this->UserID=sanitize($this->UserID);
$this->LastName=sanitize($this->LastName);
$this->FirstName=sanitize($this->FirstName);
$this->Phone1=sanitize($this->Phone1);
$this->Phone2=sanitize($this->Phone2);
$this->Phone3=sanitize($this->Phone3);
$this->Email=sanitize($this->Email);
}

function MakeDisplay(){
Expand Down Expand Up @@ -225,11 +225,11 @@ class Department {

function MakeSafe(){
$this->DeptID=intval($this->DeptID);
$this->Name=addslashes(trim($this->Name));
$this->ExecSponsor=addslashes(trim($this->ExecSponsor));
$this->SDM=addslashes(trim($this->SDM));
$this->Classification=addslashes(trim($this->Classification));
$this->DeptColor=addslashes(trim($this->DeptColor));
$this->Name=sanitize($this->Name);
$this->ExecSponsor=sanitize($this->ExecSponsor);
$this->SDM=sanitize($this->SDM);
$this->Classification=sanitize($this->Classification);
$this->DeptColor=sanitize($this->DeptColor);
}

function MakeDisplay(){
Expand Down Expand Up @@ -372,7 +372,7 @@ function AssignContacts($MemberList){
function GetDepartmentByContact($UserID){
$sql="SELECT a.* FROM fac_Department a, fac_DeptContacts b, fac_Contact c
WHERE a.DeptID=b.DeptID AND b.ContactID=c.ContactID AND
c.UserID=\"".addslashes($UserID)."\";";
c.UserID=\"".sanitize($UserID)."\";";

// If someone is assigned to more than one department, just return the first hit
if($row=$this->query($sql)->fetch()){
Expand All @@ -388,7 +388,7 @@ class Escalations {

function MakeSafe(){
$this->EscalationID=intval($this->EscalationID);
$this->Details=addslashes(trim($this->Details));
$this->Details=sanitize($this->Details);
}

function MakeDisplay(){
Expand Down Expand Up @@ -475,7 +475,7 @@ class EscalationTimes {

function MakeSafe(){
$this->EscalationTimeID=intval($this->EscalationTimeID);
$this->TimePeriod=addslashes(trim($this->TimePeriod));
$this->TimePeriod=sanitize($this->TimePeriod);
}

function MakeDisplay(){
Expand Down Expand Up @@ -573,8 +573,8 @@ class User {
var $Disabled;

function MakeSafe(){
$this->UserID=addslashes(trim($this->UserID));
$this->Name=addslashes(trim($this->Name));
$this->UserID=sanitize($this->UserID);
$this->Name=sanitize($this->Name);
$this->AdminOwnDevices=intval($this->AdminOwnDevices);
$this->ReadAccess=intval($this->ReadAccess);
$this->WriteAccess=intval($this->WriteAccess);
Expand Down
40 changes: 20 additions & 20 deletions infrastructure.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ class BinAudits {

function MakeSafe(){
$this->BinID=intval($this->BinID);
$this->UserID=addslashes(trim($this->UserID));
$this->AuditStamp=addslashes(trim($this->AuditStamp));
$this->UserID=sanitize($this->UserID);
$this->AuditStamp=sanitize($this->AuditStamp);
}

function MakeDisplay(){
Expand Down Expand Up @@ -192,12 +192,12 @@ class DataCenter {

function MakeSafe(){
$this->DataCenterID=intval($this->DataCenterID);
$this->Name=addslashes(trim($this->Name));
$this->Name=sanitize($this->Name);
$this->SquareFootage=intval($this->SquareFootage);
$this->DeliveryAddress=addslashes(trim($this->DeliveryAddress));
$this->Administrator=addslashes(trim($this->Administrator));
$this->DeliveryAddress=sanitize($this->DeliveryAddress);
$this->Administrator=sanitize($this->Administrator);
$this->MaxkW=intval($this->MaxkW);
$this->DrawingFileName=addslashes(trim($this->DrawingFileName));
$this->DrawingFileName=sanitize($this->DrawingFileName);
$this->EntryLogging=intval($this->EntryLogging);
$this->ContainerID=intval($this->ContainerID);
$this->MapX=abs($this->MapX);
Expand Down Expand Up @@ -792,16 +792,16 @@ function MakeSafe(){

$this->TemplateID=intval($this->TemplateID);
$this->ManufacturerID=intval($this->ManufacturerID);
$this->Model=addslashes(trim($this->Model));
$this->Model=sanitize($this->Model);
$this->Height=intval($this->Height);
$this->Weight=intval($this->Weight);
$this->Wattage=intval($this->Wattage);
$this->DeviceType=(in_array($this->DeviceType, $validDeviceTypes))?$this->DeviceType:'Server';
$this->PSCount=intval($this->PSCount);
$this->NumPorts=intval($this->NumPorts);
$this->Notes=addslashes(trim(sanitize($this->Notes,false)));
$this->FrontPictureFile=addslashes(trim($this->FrontPictureFile));
$this->RearPictureFile=addslashes(trim($this->RearPictureFile));
$this->Notes=sanitize($this->Notes,false);
$this->FrontPictureFile=sanitize($this->FrontPictureFile);
$this->RearPictureFile=sanitize($this->RearPictureFile);
$this->ChassisSlots=intval($this->ChassisSlots);
$this->RearChassisSlots=intval($this->RearChassisSlots);
}
Expand Down Expand Up @@ -1276,7 +1276,7 @@ class Manufacturer {

function MakeSafe(){
$this->ManufacturerID=intval($this->ManufacturerID);
$this->Name=addslashes(trim($this->Name));
$this->Name=sanitize($this->Name);
}

function MakeDisplay(){
Expand Down Expand Up @@ -1379,8 +1379,8 @@ class Supplies {

function MakeSafe(){
$this->SupplyID=intval($this->SupplyID);
$this->PartNum=addslashes(trim($this->PartNum));
$this->PartName=addslashes(trim($this->PartName));
$this->PartNum=sanitize($this->PartNum);
$this->PartName=sanitize($this->PartName);
$this->MinQty=intval($this->MinQty);
$this->MaxQty=intval($this->MaxQty);
}
Expand Down Expand Up @@ -1478,7 +1478,7 @@ class SupplyBin {

function MakeSafe(){
$this->BinID=intval($this->BinID);
$this->Location=addslashes(trim($this->Location));
$this->Location=sanitize($this->Location);
}

function MakeDisplay(){
Expand Down Expand Up @@ -1578,7 +1578,7 @@ class Zone {
function MakeSafe(){
$this->ZoneID=intval($this->ZoneID);
$this->DataCenterID=intval($this->DataCenterID);
$this->Description=addslashes(trim($this->Description));
$this->Description=sanitize($this->Description);
// ensure all coordinates are positive values
$this->MapX1=abs($this->MapX1);
$this->MapY1=abs($this->MapY1);
Expand Down Expand Up @@ -2058,7 +2058,7 @@ class CabRow {

function MakeSafe() {
$this->CabRowID=intval($this->CabRowID);
$this->Name=addslashes(trim($this->Name));
$this->Name=sanitize($this->Name);
$this->ZoneID=intval($this->ZoneID);
$this->CabOrder=($this->CabOrder=="ASC")?"ASC":"DESC";
}
Expand Down Expand Up @@ -2192,9 +2192,9 @@ class Container {

function MakeSafe(){
$this->ContainerID=intval($this->ContainerID);
$this->Name=addslashes(trim($this->Name));
$this->Name=sanitize($this->Name);
$this->ParentID=intval($this->ParentID);
$this->DrawingFileName=addslashes(trim($this->DrawingFileName));
$this->DrawingFileName=sanitize($this->DrawingFileName);
$this->MapX=abs($this->MapX);
$this->MapY=abs($this->MapY);
}
Expand Down Expand Up @@ -2708,10 +2708,10 @@ class TemplatePorts {
function MakeSafe() {
$this->TemplateID=intval($this->TemplateID);
$this->PortNumber=intval($this->PortNumber);
$this->Label=addslashes(trim($this->Label));
$this->Label=sanitize($this->Label);
$this->MediaID=intval($this->MediaID);
$this->ColorID=intval($this->ColorID);
$this->PortNotes=addslashes(trim($this->PortNotes));
$this->PortNotes=sanitize($this->PortNotes);
}

function MakeDisplay(){
Expand Down

0 comments on commit 7f3aec4

Please sign in to comment.