diff --git a/admin/adminAppQueue.php b/admin/adminAppQueue.php index ba5df18..3e9e75c 100644 --- a/admin/adminAppQueue.php +++ b/admin/adminAppQueue.php @@ -373,15 +373,12 @@ if ($aClean['sSub']) /* output the appropriate editors depending on whether we are processing an application */ /* and a version or just a version */ if($oApp) - { - $oApp->OutputEditor($sVendor); - $oVersion->OutputEditor(false, false); - } else - { - $oVersion->OutputEditor(false, false); - } - $oTest->OutputEditor($aClean['sDistribution']); - + $oApp->outputEditor($sVendor); + + $oVersion->outputEditor(false, false); + + $oTest->outputEditor($aClean['sDistribution']); + echo html_frame_start("Reply text", "90%", "", 0); echo "\n"; echo '',"\n"; diff --git a/admin/adminMaintainerQueue.php b/admin/adminMaintainerQueue.php index 5cd8d7e..48cff2f 100644 --- a/admin/adminMaintainerQueue.php +++ b/admin/adminMaintainerQueue.php @@ -53,7 +53,7 @@ if ($aClean['sSub']) Maintainer::ObjectDisplayQueueProcessingHelp(); $oMaintainer = new maintainer($aClean['iMaintainerId']); - $oMaintainer->OutputEditor(); + $oMaintainer->outputEditor(); echo "
email Text
\n"; diff --git a/admin/adminTestResults.php b/admin/adminTestResults.php index 6efb39f..ff540cc 100644 --- a/admin/adminTestResults.php +++ b/admin/adminTestResults.php @@ -98,7 +98,7 @@ if ($aClean['sSub']) echo html_back_link(1, $_SERVER['PHP_SELF']); - $oTest->OutputEditor(); + $oTest->outputEditor(); echo html_frame_start("Reply text", "90%", "", 0); echo "
\n"; echo '',"\n"; diff --git a/admin/editAppFamily.php b/admin/editAppFamily.php index c06c065..5c45e60 100644 --- a/admin/editAppFamily.php +++ b/admin/editAppFamily.php @@ -39,7 +39,7 @@ else echo "\n"; - $oApp->OutputEditor(""); + $oApp->outputEditor(""); echo '
email Text
', "\n"; echo '',"\n"; diff --git a/admin/editAppNote.php b/admin/editAppNote.php index 391c8c7..21cbd62 100644 --- a/admin/editAppNote.php +++ b/admin/editAppNote.php @@ -45,7 +45,7 @@ if(!empty($aClean['sSub'])) echo "\n"; /* display the editor for this note */ - $oNote->OutputEditor(); + $oNote->outputEditor(); echo '
'; echo ' ',"\n"; diff --git a/admin/editAppVersion.php b/admin/editAppVersion.php index ecc915d..598794c 100644 --- a/admin/editAppVersion.php +++ b/admin/editAppVersion.php @@ -28,9 +28,9 @@ if(!empty($aClean['sSubmit'])) echo "\n"; if($_SESSION['current']->hasPriv("admin")) - $oVersion->OutputEditor(true, true); /* false = not allowing the user to modify the parent application */ + $oVersion->outputEditor(true, true); /* false = not allowing the user to modify the parent application */ else - $oVersion->OutputEditor(false, true); /* false = not allowing the user to modify the parent application */ + $oVersion->outputEditor(false, true); /* false = not allowing the user to modify the parent application */ echo '
',"\n"; echo '',"\n"; @@ -87,7 +87,7 @@ if(!empty($aClean['sSubmit'])) echo ""; /* Download URL editor */ - echo downloadurl::OutputEditor($oVersion, "editAppVersion.php"); + echo downloadurl::outputEditor($oVersion, "editAppVersion.php"); /* only admins can move versions */ if($_SESSION['current']->hasPriv("admin")) diff --git a/admin/editDistribution.php b/admin/editDistribution.php index a17aaac..5068e99 100644 --- a/admin/editDistribution.php +++ b/admin/editDistribution.php @@ -29,7 +29,7 @@ else echo '',"\n"; - $oDistribution->OutputEditor(); + $oDistribution->outputEditor(); echo '
',"\n"; echo ' ',"\n"; diff --git a/admin/editVendor.php b/admin/editVendor.php index 8d1338a..f501bb4 100644 --- a/admin/editVendor.php +++ b/admin/editVendor.php @@ -22,7 +22,7 @@ else // Show the form echo '',"\n"; - $oVendor->OutputEditor(); + $oVendor->outputEditor(); echo '
',"\n"; echo ' ',"\n"; diff --git a/appsubmit.php b/appsubmit.php index 2fe7ad2..31b8a7a 100644 --- a/appsubmit.php +++ b/appsubmit.php @@ -347,15 +347,11 @@ if ($aClean['sSub']) $oTest->sTestedDate = date('Y-m-d H:i:s'); if($aClean['sAppType'] == 'application') - { - $oApp->OutputEditor($aClean['sAppVendorName']); - $oVersion->OutputEditor(false, false); - } else - { - $oVersion->OutputEditor(false, false); - } + $oApp->outputEditor($aClean['sAppVendorName']); - $oTest->OutputEditor($aClean['sDistribution'],true); + $oVersion->outputEditor(false, false); + + $oTest->outputEditor($aClean['sDistribution'],true); echo "\n"; diff --git a/include/application.php b/include/application.php index c96a351..949ffe7 100644 --- a/include/application.php +++ b/include/application.php @@ -499,7 +499,7 @@ class Application { /* output a html table and this applications values to the fields for editing */ - function OutputEditor($sVendorName) + function outputEditor($sVendorName) { HtmlAreaLoaderScript(array("app_editor")); @@ -575,8 +575,8 @@ class Application { return $errors; } - /* retrieves values from $aValues that were output by OutputEditor() */ - /* $aValues can be $_REQUEST or any array with the values from OutputEditor() */ + /* retrieves values from $aValues that were output by outputEditor() */ + /* $aValues can be $_REQUEST or any array with the values from outputEditor() */ function GetOutputEditorValues($aValues) { $this->iAppId = $aValues['iAppId']; diff --git a/include/distribution.php b/include/distribution.php index 35e3d89..5dac91a 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -360,7 +360,7 @@ class distribution{ mail_appdb($sEmail, $sSubject ,$sMsg); } - function OutputEditor() + function outputEditor() { echo html_frame_start("Distribution Form", "90%", "", 0); echo "
\n"; @@ -378,8 +378,8 @@ class distribution{ echo html_frame_end(); } - /* retrieves values from $_REQUEST that were output by OutputEditor() */ - /* $aValues can be $_REQUEST or any array with the values from OutputEditor() */ + /* retrieves values from $_REQUEST that were output by outputEditor() */ + /* $aValues can be $_REQUEST or any array with the values from outputEditor() */ function GetOutputEditorValues($aValues) { $this->iDistributionId = $aValues['iDistributionId']; diff --git a/include/downloadurl.php b/include/downloadurl.php index d227c12..9588327 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -57,7 +57,7 @@ class downloadurl } /* Output an editor for Download URL fields */ - function OutputEditor($oVersion, $sFormAction) + function outputEditor($oVersion, $sFormAction) { /* Check for correct permissions */ if(!downloadurl::canEdit($oVersion->iVersionId)) diff --git a/include/maintainer.php b/include/maintainer.php index 17c6437..74a1c88 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -401,7 +401,7 @@ class maintainer echo "
\n\n"; } - function OutputEditor() + function outputEditor() { //view application details echo html_frame_start("New Maintainer Form",600,"",0); diff --git a/include/note.php b/include/note.php index 332c6a6..d44cb00 100644 --- a/include/note.php +++ b/include/note.php @@ -227,7 +227,7 @@ class Note { } - function OutputEditor() + function outputEditor() { HtmlAreaLoaderScript(array("editor")); @@ -251,8 +251,8 @@ class Note { echo html_frame_end(); } - /* retrieves values from $aValue that were output by OutputEditor() */ - /* $aValues can be $_REQUEST or any array with the values from OutputEditor() */ + /* retrieves values from $aValue that were output by outputEditor() */ + /* $aValues can be $_REQUEST or any array with the values from outputEditor() */ function GetOutputEditorValues($aValues) { $this->iVersionId = $aValues['iVersionId']; diff --git a/include/testData.php b/include/testData.php index 2a3a718..ac52a34 100644 --- a/include/testData.php +++ b/include/testData.php @@ -491,7 +491,7 @@ class testData{ } // show the fields for editing - function OutputEditor($sDistribution="", $bNewDist=false) + function outputEditor($sDistribution="", $bNewDist=false) { HtmlAreaLoaderScript(array("Test1", "Test2", "Test3")); @@ -553,7 +553,7 @@ class testData{ echo html_frame_end(); } - /* $aValues can be $aValues or any array with the values from OutputEditor() */ + /* $aValues can be $aValues or any array with the values from outputEditor() */ function CheckOutputEditorInput($aValues, $sDistribution="") { $errors = ""; @@ -602,8 +602,8 @@ class testData{ } - /* retrieves values from $aValues that were output by OutputEditor() */ - /* $aValues can be $_REQUEST or any array with the values from OutputEditor() */ + /* retrieves values from $aValues that were output by outputEditor() */ + /* $aValues can be $_REQUEST or any array with the values from outputEditor() */ function GetOutputEditorValues($aValues) { $this->iTestingId = $aValues['iTestingId']; diff --git a/include/vendor.php b/include/vendor.php index 6380241..0a6064d 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -118,7 +118,7 @@ class Vendor { } } - function OutputEditor() + function outputEditor() { echo html_frame_start("Vendor Form", "90%", "", 0); echo "\n"; diff --git a/include/version.php b/include/version.php index 01a61e2..78e124e 100644 --- a/include/version.php +++ b/include/version.php @@ -531,7 +531,7 @@ class Version { /* if $editParentApplication is true that means we need to display fields */ /* to let the user change the parent application of this version */ /* otherwise, if $editParentAppliation is false, we leave them out */ - function OutputEditor($editParentApplication, $editRatingAndRelease) + function outputEditor($editParentApplication, $editRatingAndRelease) { HtmlAreaLoaderScript(array("version_editor")); echo html_frame_start("Version Form", "90%", "", 0); diff --git a/testResults.php b/testResults.php index 88c8b73..603340a 100644 --- a/testResults.php +++ b/testResults.php @@ -129,7 +129,7 @@ if ($aClean['sSub']) } // View Test Details - $oTest->OutputEditor($aClean['sDistribution'],true); + $oTest->outputEditor($aClean['sDistribution'],true); echo 'Back to Version';