From aaaf9367a65b68c4eee255649323f8faa3955e22 Mon Sep 17 00:00:00 2001 From: Marc-Etienne Vargenau Date: Wed, 1 Jun 2016 14:46:31 +0200 Subject: [PATCH] Use consistent case --- src/common/docman/Document.class.php | 2 +- src/common/docman/actions/addfile.php | 4 +-- src/common/docman/actions/enforcereserve.php | 2 +- src/common/docman/actions/lock.php | 2 +- src/common/docman/actions/movefile.php | 2 +- src/common/docman/actions/reservefile.php | 2 +- src/common/docman/views/admin.php | 2 +- src/common/docman/views/editdocgroup.php | 2 +- src/common/docman/views/listfile.php | 4 +-- src/common/docman/views/pendingfiles.php | 2 +- src/common/docman/views/tree.php | 20 ++++++------- src/common/forum/ForumMessage.class.php | 30 +++++++++---------- src/common/frs/FRSFile.class.php | 2 +- src/common/frs/FRSPackage.class.php | 4 +-- src/common/frs/FRSRelease.class.php | 2 +- src/common/frs/include/frs_utils.php | 2 +- src/common/include/GroupJoinRequest.class.php | 2 +- src/common/include/Navigation.class.php | 4 +-- src/common/include/PluginManager.class.php | 6 ++-- src/common/include/RBAC.php | 2 +- src/common/include/TroveCat.class.php | 6 ++-- src/common/include/User.class.php | 2 +- src/common/pm/ProjectGroup.class.php | 2 +- src/common/reporting/Report.class.php | 16 +++++----- src/common/reporting/ReportSetup.class.php | 2 +- src/common/tracker/ArtifactFile.class.php | 2 +- src/common/tracker/ArtifactType.class.php | 4 +-- .../widget/Widget_MyArtifacts.class.php | 10 +++---- .../Widget_MyProjectsLastDocuments.class.php | 2 +- src/common/widget/Widget_MySurveys.class.php | 2 +- .../widget/Widget_ProjectInfo.class.php | 2 +- .../Widget_ProjectPublicAreas.class.php | 2 +- src/plugins/authbuiltin/www/post-login.php | 6 ++-- src/www/account/index.php | 4 +-- src/www/admin/pluginman.php | 2 +- src/www/dbimage.php | 4 +-- src/www/docman/view.php | 8 ++--- src/www/forum/forum.php | 2 +- src/www/forum/message.php | 2 +- src/www/forum/myforums.php | 5 ++-- src/www/include/project_summary.php | 4 +-- src/www/pm/include/ProjectGroupHTML.class.php | 2 +- src/www/project/admin/users.php | 6 ++-- src/www/project/report/index.php | 2 +- src/www/project/request.php | 2 +- src/www/scm/index.php | 2 +- src/www/snapshots.php | 6 ++-- src/www/soap/tracker/tracker.php | 26 ++++++++-------- src/www/survey/admin/show_csv.php | 2 +- src/www/survey/admin/survey.php | 2 +- src/www/tarballs.php | 6 ++-- src/www/trove/TroveCategory.class.php | 2 +- src/www/trove/TroveCategoryLabel.class.php | 8 ++--- src/www/trove/index.php | 16 +++++----- 54 files changed, 135 insertions(+), 134 deletions(-) diff --git a/src/common/docman/Document.class.php b/src/common/docman/Document.class.php index cdf84a2641..586376d325 100644 --- a/src/common/docman/Document.class.php +++ b/src/common/docman/Document.class.php @@ -196,7 +196,7 @@ class Document extends FFError { db_begin(); $result = db_query_params('INSERT INTO doc_data (group_id, createdate, doc_group, stateid) VALUES ($1, $2, $3, $4)', - array($this->Group->getId(), time(), $doc_group, $doc_initstatus)); + array($this->Group->getID(), time(), $doc_group, $doc_initstatus)); $docid = db_insertid($result, 'doc_data', 'docid'); if (!$result || !$docid) { diff --git a/src/common/docman/actions/addfile.php b/src/common/docman/actions/addfile.php index 97f1afcf6e..bddba04ae2 100644 --- a/src/common/docman/actions/addfile.php +++ b/src/common/docman/actions/addfile.php @@ -187,10 +187,10 @@ if (!$d->create($uploaded_data_name, $uploaded_data_type, $data, $doc_group, $ti setcookie("gforgecurrentdocdata", "", time() - 3600); } if (forge_check_perm('docman', $group_id, 'approve')) { - $feedback = sprintf(_('Document %s submitted successfully.'), $d->getFilename()); + $feedback = sprintf(_('Document %s submitted successfully.'), $d->getFileName()); session_redirect($redirecturl); } else { - $feedback = sprintf(_('Document %s has been successfully uploaded and is waiting to be approved.'), $d->getFilename()); + $feedback = sprintf(_('Document %s has been successfully uploaded and is waiting to be approved.'), $d->getFileName()); session_redirect($baseurl); } } diff --git a/src/common/docman/actions/enforcereserve.php b/src/common/docman/actions/enforcereserve.php index 609da68c33..71be6310be 100644 --- a/src/common/docman/actions/enforcereserve.php +++ b/src/common/docman/actions/enforcereserve.php @@ -37,7 +37,7 @@ $arr_fileid = explode(',', getStringFromRequest('fileid')); $feedback = _('Document(s)').' '; foreach ($arr_fileid as $fileid) { $d = new Document($g, $fileid); - $feedback .= $d->getFilename().' '; + $feedback .= $d->getFileName().' '; if ($d->isError() || !$d->setReservedBy('0')) { $error_msg = $d->getErrorMessage(); session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid); diff --git a/src/common/docman/actions/lock.php b/src/common/docman/actions/lock.php index 07831aa404..dc1b78f55d 100644 --- a/src/common/docman/actions/lock.php +++ b/src/common/docman/actions/lock.php @@ -39,7 +39,7 @@ $itemid = getIntFromRequest('itemid'); // hack to use this action as a getLocked action. // if the param lock is missing, then we return the status of the lock. $lock = getIntFromRequest('lock', 2); -$type = getStringfromRequest('type'); +$type = getStringFromRequest('type'); $childgroup_id = getIntFromRequest('childgroup_id'); if ($childgroup_id) { $g = group_get_object($childgroup_id); diff --git a/src/common/docman/actions/movefile.php b/src/common/docman/actions/movefile.php index 1b5b9b74be..44aa9636d5 100644 --- a/src/common/docman/actions/movefile.php +++ b/src/common/docman/actions/movefile.php @@ -55,7 +55,7 @@ foreach ($arr_fileid as $fileid) { session_redirect($redirecturl); } var_dump($d); - if ($d->isError() || !$d->update($d->getFilename(), $d->getFileType(), NULL, $moveto_dirid, $d->getName(), $d->getDescription(), $d->getStateID(), $d->getVersion())) { + if ($d->isError() || !$d->update($d->getFileName(), $d->getFileType(), NULL, $moveto_dirid, $d->getName(), $d->getDescription(), $d->getStateID(), $d->getVersion())) { $error_msg = $d->getErrorMessage(); session_redirect($redirecturl); } diff --git a/src/common/docman/actions/reservefile.php b/src/common/docman/actions/reservefile.php index 22ecc60839..6e8acc80f9 100644 --- a/src/common/docman/actions/reservefile.php +++ b/src/common/docman/actions/reservefile.php @@ -40,7 +40,7 @@ $arr_fileid = explode(',', getStringFromRequest('fileid')); $feedback = _('Document(s)').' '; foreach ($arr_fileid as $fileid) { $d = document_get_object($fileid, $group_id); - $feedback .= $d->getFilename().' '; + $feedback .= $d->getFileName().' '; if ($d->isError() || !$d->setReservedBy('1', user_getid())) { $feedback = ''; $error_msg = $d->getErrorMessage(); diff --git a/src/common/docman/views/admin.php b/src/common/docman/views/admin.php index d7fb21b28a..60e15f269b 100644 --- a/src/common/docman/views/admin.php +++ b/src/common/docman/views/admin.php @@ -93,7 +93,7 @@ if (forge_get_config('use_webdav')) { echo html_ao('ul'); $webdavStatus = '1'; $labelWebdavInterface = _('Enable Webdav Interface'); - if ($g->useWebDav()) { + if ($g->useWebdav()) { $webdavStatus = '0'; $labelWebdavInterface = _('Disable Webdav Interface'); } diff --git a/src/common/docman/views/editdocgroup.php b/src/common/docman/views/editdocgroup.php index ae1b579513..97382f5de6 100644 --- a/src/common/docman/views/editdocgroup.php +++ b/src/common/docman/views/editdocgroup.php @@ -71,7 +71,7 @@ if ($dg->getState() == 2) { $cells[][] = $dm->showSelectNestedGroups($newdgf->getNested(array(1, 5)), 'parent_dirid', true, false); $labelSubmit = _('Restore'); } else { - $cells[][] = $dm->showSelectNestedGroups($dgf->getNested(array(1, 5)), 'parent_dirid', true, $dg->getParentId(), array($dg->getID())); + $cells[][] = $dm->showSelectNestedGroups($dgf->getNested(array(1, 5)), 'parent_dirid', true, $dg->getParentID(), array($dg->getID())); $labelSubmit = _('Edit'); } $cells[][] = ''; diff --git a/src/common/docman/views/listfile.php b/src/common/docman/views/listfile.php index e249b2e857..03b5b480b8 100644 --- a/src/common/docman/views/listfile.php +++ b/src/common/docman/views/listfile.php @@ -362,7 +362,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) { } $nextcell .= util_make_link($redirecturl.'&action=monitorfile&option='.$option.'&fileid='.$d->getID(), $image, array('title' => $titleMonitor)); } - $nextcell .= util_make_link('#', html_image('ic/mail-send.png', 22, 22, array('alt' => _('Notify'))), array('onclick' => 'javascript:controllerListFile.toggleNotifyUserView({action:\''.util_make_uri($notifyaction).'\', lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' , id:'.$d->getID().', groupId:'.$d->Group->getID().', docgroupId:'.$d->getDocGroupID().', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFilename()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\', docManURL:\''.util_make_uri('/docman').'\'})', 'title' => _('Notify users')), true); + $nextcell .= util_make_link('#', html_image('ic/mail-send.png', 22, 22, array('alt' => _('Notify'))), array('onclick' => 'javascript:controllerListFile.toggleNotifyUserView({action:\''.util_make_uri($notifyaction).'\', lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' , id:'.$d->getID().', groupId:'.$d->Group->getID().', docgroupId:'.$d->getDocGroupID().', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFileName()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\', docManURL:\''.util_make_uri('/docman').'\'})', 'title' => _('Notify users')), true); $cells[][] = $nextcell; } echo $HTML->multiTableRow(array(), $cells); @@ -422,7 +422,7 @@ if ($DocGroupName) { statusDict:'.$dm->getStatusNameList('json').', docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').', title:\''.addslashes($localDocumentObject->getName()).'\', - filename:\''.addslashes($localDocumentObject->getFilename()).'\', + filename:\''.addslashes($localDocumentObject->getFileName()).'\', description:\''.addslashes($localDocumentObject->getDescription()).'\', isURL:\''.$localDocumentObject->isURL().'\', isText:\''.$localDocumentObject->isText().'\', diff --git a/src/common/docman/views/pendingfiles.php b/src/common/docman/views/pendingfiles.php index 814793f811..15e2a09b7f 100644 --- a/src/common/docman/views/pendingfiles.php +++ b/src/common/docman/views/pendingfiles.php @@ -107,7 +107,7 @@ jQuery(document).ready(function() { $editfileaction .= '&childgroup_id='.$childgroup_id; } $editfileaction .= '&group_id='.$group_id; - $cells[][] = util_make_link('#', html_image('docman/edit-file.png', 22, 22, array('alt' => _('Edit this document'))), array('onclick' => 'javascript:controllerListPending.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\', lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,id:'.$d->getID().', groupId:'.$d->Group->getID().', docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().', statusDict:'.$dm->getStatusNameList('json').', docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFilename()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})', 'title' => _('Edit this document')), true). + $cells[][] = util_make_link('#', html_image('docman/edit-file.png', 22, 22, array('alt' => _('Edit this document'))), array('onclick' => 'javascript:controllerListPending.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\', lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,id:'.$d->getID().', groupId:'.$d->Group->getID().', docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().', statusDict:'.$dm->getStatusNameList('json').', docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFileName()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})', 'title' => _('Edit this document')), true). util_make_link('#', html_image('docman/validate.png', 22, 22, array('alt' => _('Activate in this folder'))), array('onclick' => 'window.location.href=\''.util_make_uri($redirecturl.'&action=validatefile&fileid='.$d->getID()).'\'', 'title' => _('Activate in this folder')), true); echo $HTML->multiTableRow(array(), $cells); } diff --git a/src/common/docman/views/tree.php b/src/common/docman/views/tree.php index 58d3e7bd6e..5c484237f8 100644 --- a/src/common/docman/views/tree.php +++ b/src/common/docman/views/tree.php @@ -41,14 +41,14 @@ if (!forge_check_perm('docman', $group_id, 'read')) { } echo html_ao('div', array('id' => 'documenttree')); -echo html_ao('ul', array('id' => $g->getUnixname().'-tree')); +echo html_ao('ul', array('id' => $g->getUnixName().'-tree')); $dm->getTree($dirid, $linkmenu); echo html_ac(html_ap() - 1); echo html_ao('script', array('type' => 'text/javascript')); echo '//getUnixname().'-tree\').simpleTreeMenu) != "undefined") { - jQuery(\'#'.$g->getUnixname().'-tree\').simpleTreeMenu(); + if (typeof(jQuery(\'#'.$g->getUnixName().'-tree\').simpleTreeMenu) != "undefined") { + jQuery(\'#'.$g->getUnixName().'-tree\').simpleTreeMenu(); } }); //]]>'."\n"; @@ -65,14 +65,14 @@ if (isset($projectIDsArray) && is_array($projectIDsArray)) { echo html_e('hr'); echo html_e('h5', array(), _('Child project')._(': ').util_make_link('/docman/?group_id='.$groupObject->getID(),$groupObject->getPublicName(), array('title'=>_('Browse document manager for this project.'))), false); $dmc = new DocumentManager($groupObject); - echo html_ao('ul', array('id' => $groupObject->getUnixname().'-tree')); + echo html_ao('ul', array('id' => $groupObject->getUnixName().'-tree')); $dmc->getTree($dirid, $linkmenu); echo html_ac(html_ap() - 1); echo html_ao('script', array('type' => 'text/javascript')); echo '//getUnixname().'-tree\').simpleTreeMenu) != "undefined") { - jQuery(\'#'.$groupObject->getUnixname().'-tree\').simpleTreeMenu(); + if (typeof(jQuery(\'#'.$groupObject->getUnixName().'-tree\').simpleTreeMenu) != "undefined") { + jQuery(\'#'.$groupObject->getUnixName().'-tree\').simpleTreeMenu(); } }); //]]>'."\n"; @@ -85,8 +85,8 @@ if ($childgroup_id) { echo html_ao('script', array('type' => 'text/javascript')); echo '//getUnixname().'-tree\').simpleTreeMenu) != "undefined") { - jQuery(\'#'.$groupObject->getUnixname().'-tree\').simpleTreeMenu(\'expandToNode\', jQuery(\'#leaf-'.$dirid.'\')); + if (typeof(jQuery(\'#'.$groupObject->getUnixName().'-tree\').simpleTreeMenu) != "undefined") { + jQuery(\'#'.$groupObject->getUnixName().'-tree\').simpleTreeMenu(\'expandToNode\', jQuery(\'#leaf-'.$dirid.'\')); } }); //]]>'."\n"; @@ -95,8 +95,8 @@ if ($childgroup_id) { echo html_ao('script', array('type' => 'text/javascript')); echo '//getUnixname().'-tree\').simpleTreeMenu) != "undefined") { - jQuery(\'#'.$g->getUnixname().'-tree\').simpleTreeMenu(\'expandToNode\', jQuery(\'#leaf-'.$dirid.'\')); + if (typeof(jQuery(\'#'.$g->getUnixName().'-tree\').simpleTreeMenu) != "undefined") { + jQuery(\'#'.$g->getUnixName().'-tree\').simpleTreeMenu(\'expandToNode\', jQuery(\'#leaf-'.$dirid.'\')); } }); //]]>'."\n"; diff --git a/src/common/forum/ForumMessage.class.php b/src/common/forum/ForumMessage.class.php index 4f2674d9ea..d219a11c00 100644 --- a/src/common/forum/ForumMessage.class.php +++ b/src/common/forum/ForumMessage.class.php @@ -696,13 +696,13 @@ Or reply to this e-mail entering your response between the following markers: $extra_headers .= "Reply-To: ".$this->Forum->getReturnEmailAddress()."\n"; } $extra_headers .= "Precedence: Bulk\n" - ."List-Id: ".$this->Forum->getName()." Forum->getId()."@".forge_get_config('web_host').">\n" - ."List-Help: ".util_make_url ('/forum/forum.php?id='.$this->Forum->getId())."\n" - ."Message-Id: getId()."@".forge_get_config('web_host').">"; - $parentid = $this->getParentId(); + ."List-Id: ".$this->Forum->getName()." Forum->getID()."@".forge_get_config('web_host').">\n" + ."List-Help: ".util_make_url ('/forum/forum.php?id='.$this->Forum->getID())."\n" + ."Message-Id: getID()."@".forge_get_config('web_host').">"; + $parentid = $this->getParentID(); if (!empty($parentid)) { $extra_headers .= "\nIn-Reply-To: ".$this->Forum->getReturnEmailAddress()."\n" - ."References: getParentId()."@".forge_get_config('web_host').">"; + ."References: getParentID()."@".forge_get_config('web_host').">"; } $subject="[" . $this->Forum->getUnixName() ."][".$this->getID()."] ".util_unconvert_htmlspecialchars($this->getSubject()); @@ -758,13 +758,13 @@ Or reply to this e-mail entering your response between the following markers: $extra_headers .= "Sender: \n"; $extra_headers .= "Reply-To: ".$this->Forum->getReturnEmailAddress()."\n"; $extra_headers .= "Precedence: Bulk\n" - ."List-Id: ".$this->Forum->getName()." Forum->getId()."@".forge_get_config('web_host').">\n" - ."List-Help: ".util_make_url('/forum/forum.php?id='.$this->Forum->getId())."\n" - ."Message-Id: getId()."@".forge_get_config('web_host').">"; - $parentid = $this->getParentId(); + ."List-Id: ".$this->Forum->getName()." Forum->getID()."@".forge_get_config('web_host').">\n" + ."List-Help: ".util_make_url('/forum/forum.php?id='.$this->Forum->getID())."\n" + ."Message-Id: getID()."@".forge_get_config('web_host').">"; + $parentid = $this->getParentID(); if (!empty($parentid)) { $extra_headers .= "\nIn-Reply-To: ".$this->Forum->getReturnEmailAddress()."\n" - ."References: getParentId()."@".forge_get_config('web_host').">"; + ."References: getParentID()."@".forge_get_config('web_host').">"; } $subject="[" . $this->Forum->getUnixName() ."][".$this->getID()."] ".util_unconvert_htmlspecialchars($this->getSubject()); @@ -865,13 +865,13 @@ Or reply to this e-mail entering your response between the following markers: $extra_headers .= "Sender: \n"; $extra_headers .= "Reply-To: ".$this->Forum->getReturnEmailAddress()."\n"; $extra_headers .= "Precedence: Bulk\n" - ."List-Id: ".$this->Forum->getName()." Forum->getId()."@".forge_get_config('web_host').">\n" - ."List-Help: ".util_make_url('/forum/forum.php?id='.$this->Forum->getId())."\n" - ."Message-Id: getId()."@".forge_get_config('web_host').">"; - $parentid = $this->getParentId(); + ."List-Id: ".$this->Forum->getName()." Forum->getID()."@".forge_get_config('web_host').">\n" + ."List-Help: ".util_make_url('/forum/forum.php?id='.$this->Forum->getID())."\n" + ."Message-Id: getID()."@".forge_get_config('web_host').">"; + $parentid = $this->getParentID(); if (!empty($parentid)) { $extra_headers .= "\nIn-Reply-To: ".$this->Forum->getReturnEmailAddress()."\n" - ."References: getParentId()."@".forge_get_config('web_host').">"; + ."References: getParentID()."@".forge_get_config('web_host').">"; } $subject="[" . $this->Forum->getUnixName() ."][".$this->getID()."] ".util_unconvert_htmlspecialchars($this->getSubject()); diff --git a/src/common/frs/FRSFile.class.php b/src/common/frs/FRSFile.class.php index d6b30a5eb8..374e3f1a8b 100644 --- a/src/common/frs/FRSFile.class.php +++ b/src/common/frs/FRSFile.class.php @@ -145,7 +145,7 @@ class FRSFile extends FFError { // $resfile = db_query_params('SELECT filename FROM frs_file WHERE filename=$1 AND release_id=$2', array($name, - $this->FRSRelease->getId())); + $this->FRSRelease->getID())); if (!$resfile || db_numrows($resfile) > 0) { $this->setError(_('That filename already exists in this release').' '.db_error()); return false; diff --git a/src/common/frs/FRSPackage.class.php b/src/common/frs/FRSPackage.class.php index d73c782140..4015c1a166 100644 --- a/src/common/frs/FRSPackage.class.php +++ b/src/common/frs/FRSPackage.class.php @@ -179,7 +179,7 @@ class FRSPackage extends FFError { db_begin(); $result = db_query_params('INSERT INTO frs_package(group_id, name, status_id) VALUES ($1, $2, $3)', - array($this->Group->getId(), + array($this->Group->getID(), htmlspecialchars($name), 1)); if (!$result) { @@ -590,7 +590,7 @@ class FRSPackage extends FFError { $zipPath = $this->getReleaseZipPath($release_id); $release = frsrelease_get_object($release_id); $filesPath = forge_get_config('upload_dir').'/'.$this->Group->getUnixName().'/'.$this->getFileName().'/'.$release->getFileName(); - if ($zip->open($zipPath, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE) != true) { + if ($zip->open($zipPath, ZipArchive::CREATE | ZipArchive::OVERWRITE) != true) { $this->setError(_('Cannot open the file archive')._(': ').$zipPath.'.'); return false; } diff --git a/src/common/frs/FRSRelease.class.php b/src/common/frs/FRSRelease.class.php index 468f0f747c..1300fb1aa2 100644 --- a/src/common/frs/FRSRelease.class.php +++ b/src/common/frs/FRSRelease.class.php @@ -148,7 +148,7 @@ class FRSRelease extends FFError { db_begin(); $result = db_query_params('INSERT INTO frs_release(package_id,notes,changes,preformatted,name,release_date,released_by,status_id) VALUES ($1,$2,$3,$4,$5,$6,$7,$8)', - array($this->FRSPackage->getId(), + array($this->FRSPackage->getID(), htmlspecialchars($notes), htmlspecialchars($changes), $preformatted, diff --git a/src/common/frs/include/frs_utils.php b/src/common/frs/include/frs_utils.php index a6f97107b3..51cb28e1c9 100644 --- a/src/common/frs/include/frs_utils.php +++ b/src/common/frs/include/frs_utils.php @@ -167,7 +167,7 @@ function frs_add_file_from_form($release, $type_id, $processor_id, $release_date $filechecks = true; } elseif ($release->getFRSPackage()->getGroup()->usesDocman() && $docman_fileid) { $doc = new Document($release->getFRSPackage()->getGroup(), $docman_fileid); - $fname = $doc->getFilename(); + $fname = $doc->getFileName(); $infile = DocumentStorage::instance()->get($docman_fileid); $move = false; $filechecks = true; diff --git a/src/common/include/GroupJoinRequest.class.php b/src/common/include/GroupJoinRequest.class.php index 6f24be724c..51b2392524 100644 --- a/src/common/include/GroupJoinRequest.class.php +++ b/src/common/include/GroupJoinRequest.class.php @@ -235,7 +235,7 @@ class GroupJoinRequest extends FFError { $user->getRealName(), $user->getUnixName()); $body .= "\n"; $body .= sprintf(_('You can approve this request here: %s'), - util_make_url('/project/admin/users.php?group_id='.$this->Group->getId())); + util_make_url('/project/admin/users.php?group_id='.$this->Group->getID())); $body .= "\n\n"; $body .= _('Comments by the user:'); $body .= "\n"; diff --git a/src/common/include/Navigation.class.php b/src/common/include/Navigation.class.php index 8d8198562c..dc93d14d22 100644 --- a/src/common/include/Navigation.class.php +++ b/src/common/include/Navigation.class.php @@ -326,7 +326,7 @@ class Navigation extends FFError { $menu['titles'][] = $project->getPublicName(); $menu['tooltips'][] = _('Project home page, widgets selected to follow specific items.'); if (isset ($GLOBALS['sys_noforcetype']) && $GLOBALS['sys_noforcetype']) { - $menu['urls'][] = util_make_uri('/project/?group_id') .$project->getId(); + $menu['urls'][] = util_make_uri('/project/?group_id') .$project->getID(); } else { $menu['urls'][] = util_make_uri('/projects/') .$project->getUnixName().'/'; } @@ -473,7 +473,7 @@ class Navigation extends FFError { } // Project/Task Manager - if ($group->usesPm()) { + if ($group->usesPM()) { $menu['titles'][] = _('Tasks'); $menu['tooltips'][] = _('Project Management.'); $menu['urls'][] = util_make_uri('/pm/?group_id=' . $group_id); diff --git a/src/common/include/PluginManager.class.php b/src/common/include/PluginManager.class.php index 799c6c69da..62b325b205 100644 --- a/src/common/include/PluginManager.class.php +++ b/src/common/include/PluginManager.class.php @@ -48,11 +48,11 @@ class PluginManager extends FFError { } /** - * GetPlugins() - get a list of installed plugins + * getPlugins() - get a list of installed plugins * * @return array hash of plugin id => plugin names */ - function GetPlugins() { + function getPlugins() { $this->plugins_data = array(); $res = db_query_params('SELECT plugin_id, plugin_name FROM plugins', array()); @@ -178,7 +178,7 @@ class PluginManager extends FFError { * */ function LoadPlugins() { - $plugins_data = $this->GetPlugins(); + $plugins_data = $this->getPlugins(); foreach ($plugins_data as $p_id => $p_name) { if (!$this->LoadPlugin($p_name)) { // we can't find the plugin so we remove it from the array diff --git a/src/common/include/RBAC.php b/src/common/include/RBAC.php index 61c4c03cf7..dc198b469b 100644 --- a/src/common/include/RBAC.php +++ b/src/common/include/RBAC.php @@ -1251,7 +1251,7 @@ class RoleAnonymous extends BaseRole implements PFO_RoleAnonymous { } } -class RoleLoggedIn extends BaseRole implements PFO_RoleLoggedIn { +class RoleLoggedIn extends BaseRole implements PFO_RoleLoggedin { // This role is implemented as a singleton private static $_instance ; private $_role_id ; diff --git a/src/common/include/TroveCat.class.php b/src/common/include/TroveCat.class.php index 99e79d4b38..6430cf2b60 100644 --- a/src/common/include/TroveCat.class.php +++ b/src/common/include/TroveCat.class.php @@ -74,7 +74,7 @@ class TroveCat extends FFError { } } - function getId() { + function getID() { return $this->data_array['trove_cat_id']; } @@ -86,7 +86,7 @@ class TroveCat extends FFError { return $this->data_array['fullname']; } - function getParentId() { + function getParentID() { return $this->data_array['parent']; } @@ -94,7 +94,7 @@ class TroveCat extends FFError { return $this->data_array['root_parent']; } - function getIdsFullPath() { + function getIDsFullPath() { return $this->data_array['fullpath_ids']; } diff --git a/src/common/include/User.class.php b/src/common/include/User.class.php index 7b1d816d84..3bec0df74e 100644 --- a/src/common/include/User.class.php +++ b/src/common/include/User.class.php @@ -937,7 +937,7 @@ Use one below, but make sure it is entered as the single line.) $hook_params['user_email'] = $email; plugin_hook("user_setemail", $hook_params); - if (!$this->fetchData($this->getId())) { + if (!$this->fetchData($this->getID())) { db_rollback(); return false; } diff --git a/src/common/pm/ProjectGroup.class.php b/src/common/pm/ProjectGroup.class.php index d03d6136d6..7ff9615240 100644 --- a/src/common/pm/ProjectGroup.class.php +++ b/src/common/pm/ProjectGroup.class.php @@ -164,7 +164,7 @@ class ProjectGroup extends FFError { db_begin(); $result = db_query_params('INSERT INTO project_group_list (group_id,project_name,description,send_all_posts_to) VALUES ($1,$2,$3,$4)', - array($this->Group->getId(), + array($this->Group->getID(), htmlspecialchars($project_name), htmlspecialchars($description), $send_all_posts_to)); diff --git a/src/common/reporting/Report.class.php b/src/common/reporting/Report.class.php index 2d95b614d7..129bfc3876 100644 --- a/src/common/reporting/Report.class.php +++ b/src/common/reporting/Report.class.php @@ -22,14 +22,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -DEFINE('REPORT_DAY_SPAN',24*60*60); -DEFINE('REPORT_WEEK_SPAN',7*24*60*60); -DEFINE('REPORT_MONTH_SPAN',30*24*60*60); - -DEFINE('REPORT_TYPE_DAILY',1); -DEFINE('REPORT_TYPE_WEEKLY',2); -DEFINE('REPORT_TYPE_MONTHLY',3); -DEFINE('REPORT_TYPE_OA',4); +define('REPORT_DAY_SPAN',24*60*60); +define('REPORT_WEEK_SPAN',7*24*60*60); +define('REPORT_MONTH_SPAN',30*24*60*60); + +define('REPORT_TYPE_DAILY',1); +define('REPORT_TYPE_WEEKLY',2); +define('REPORT_TYPE_MONTHLY',3); +define('REPORT_TYPE_OA',4); class Report extends FFError { diff --git a/src/common/reporting/ReportSetup.class.php b/src/common/reporting/ReportSetup.class.php index 68147cf969..f81cc49e0b 100644 --- a/src/common/reporting/ReportSetup.class.php +++ b/src/common/reporting/ReportSetup.class.php @@ -1391,7 +1391,7 @@ class ReportSetup extends Report { * @param string $status_name The category name. * @return boolean Success. */ - function updateStatusId($status_id, $status_name) { + function updateStatusID($status_id, $status_name) { return db_query_params ('UPDATE project_status SET status_name=$1 WHERE status_id=$2', array($status_name, $status_id)); diff --git a/src/common/tracker/ArtifactFile.class.php b/src/common/tracker/ArtifactFile.class.php index 9880244867..63942edef6 100644 --- a/src/common/tracker/ArtifactFile.class.php +++ b/src/common/tracker/ArtifactFile.class.php @@ -180,7 +180,7 @@ class ArtifactFile extends FFError { if (!array_key_exists('time', $importData)){ $this->Artifact->addHistory('File Added',$id.': '.$filename); } - $this->Artifact->UpdateLastModifiedDate(); + $this->Artifact->updateLastModifiedDate(); $this->clearError(); return $id; } diff --git a/src/common/tracker/ArtifactType.class.php b/src/common/tracker/ArtifactType.class.php index 7fbbadb874..517ad60101 100644 --- a/src/common/tracker/ArtifactType.class.php +++ b/src/common/tracker/ArtifactType.class.php @@ -222,7 +222,7 @@ class ArtifactType extends FFError { if ($email_address) { $invalid_emails = validate_emails($email_address); if (count($invalid_emails) > 0) { - $this->SetError(_('E-mail address(es) appeared invalid')._(': ').implode(',', $invalid_emails)); + $this->setError(_('E-mail address(es) appeared invalid')._(': ').implode(',', $invalid_emails)); return false; } } @@ -993,7 +993,7 @@ class ArtifactType extends FFError { if ($email_address) { $invalid_emails = validate_emails($email_address); if (count($invalid_emails) > 0) { - $this->SetError(_('E-mail address(es) appeared invalid')._(': ').implode(',', $invalid_emails)); + $this->setError(_('E-mail address(es) appeared invalid')._(': ').implode(',', $invalid_emails)); return false; } } diff --git a/src/common/widget/Widget_MyArtifacts.class.php b/src/common/widget/Widget_MyArtifacts.class.php index 3e9b700b3b..048eab3d0b 100644 --- a/src/common/widget/Widget_MyArtifacts.class.php +++ b/src/common/widget/Widget_MyArtifacts.class.php @@ -113,16 +113,16 @@ class Widget_MyArtifacts extends Widget { $atf = new ArtifactsForUser(@UserManager::instance()->getCurrentUser()); $my_artifacts = array(); if ($this->_artifact_show == 'ASM'){ - $my_artifacts = $atf->getArtifactsFromSQLWithParams('SELECT * FROM artifact_vw av where (av.submitted_by=$1 OR av.assigned_to=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY av.group_artifact_id, av.artifact_id DESC',array( UserManager::instance()->getCurrentUser()->getID())); + $my_artifacts = $atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where (av.submitted_by=$1 OR av.assigned_to=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY av.group_artifact_id, av.artifact_id DESC',array( UserManager::instance()->getCurrentUser()->getID())); } if ($this->_artifact_show == 'AS'){ - $my_artifacts = $atf->getArtifactsFromSQLWithParams('SELECT * FROM artifact_vw av where (av.submitted_by=$1 OR av.assigned_to=$1) AND av.status_id=1 ORDER BY av.group_artifact_id, av.artifact_id DESC',array( UserManager::instance()->getCurrentUser()->getID())); + $my_artifacts = $atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where (av.submitted_by=$1 OR av.assigned_to=$1) AND av.status_id=1 ORDER BY av.group_artifact_id, av.artifact_id DESC',array( UserManager::instance()->getCurrentUser()->getID())); } if ($this->_artifact_show == 'AM'){ - $my_artifacts = $atf->getArtifactsFromSQLWithParams('SELECT * FROM artifact_vw av where (av.assigned_to=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY av.group_artifact_id, av.artifact_id DESC',array( UserManager::instance()->getCurrentUser()->getID())); + $my_artifacts = $atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where (av.assigned_to=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY av.group_artifact_id, av.artifact_id DESC',array( UserManager::instance()->getCurrentUser()->getID())); } if ($this->_artifact_show == 'SM'){ - $my_artifacts = $atf->getArtifactsFromSQLWithParams('SELECT * FROM artifact_vw av where (av.submitted_by=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY av.group_artifact_id, av.artifact_id DESC',array( UserManager::instance()->getCurrentUser()->getID())); + $my_artifacts = $atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where (av.submitted_by=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY av.group_artifact_id, av.artifact_id DESC',array( UserManager::instance()->getCurrentUser()->getID())); } if ($this->_artifact_show== 'S') { $my_artifacts = $atf->getSubmittedArtifactsByGroup(); @@ -131,7 +131,7 @@ class Widget_MyArtifacts extends Widget { $my_artifacts = $atf->getAssignedArtifactsByGroup(); } if ($this->_artifact_show== 'M') { - $my_artifacts = $atf->getArtifactsFromSQLWithParams('SELECT * FROM artifact_vw av where (av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY av.group_artifact_id, av.artifact_id DESC',array( UserManager::instance()->getCurrentUser()->getID()));; + $my_artifacts = $atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where (av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY av.group_artifact_id, av.artifact_id DESC',array( UserManager::instance()->getCurrentUser()->getID()));; } if (count($my_artifacts) > 0) { diff --git a/src/common/widget/Widget_MyProjectsLastDocuments.class.php b/src/common/widget/Widget_MyProjectsLastDocuments.class.php index 66bff292e0..befe4828cd 100644 --- a/src/common/widget/Widget_MyProjectsLastDocuments.class.php +++ b/src/common/widget/Widget_MyProjectsLastDocuments.class.php @@ -114,7 +114,7 @@ class Widget_MyProjectsLastDocuments extends Widget { } } $html .= ''.$docurl.''; - $html .= ''.$doc->getFilename().''; + $html .= ''.$doc->getFileName().''; $html .= ''.make_user_link($doc->getCreatorUserName(), $doc->getCreatorRealName()).''; if ( $doc->getUpdated() ) { $html .= ''.date(_('Y-m-d H:i'), $doc->getUpdated()).''; diff --git a/src/common/widget/Widget_MySurveys.class.php b/src/common/widget/Widget_MySurveys.class.php index a1c1ded170..6d116d805e 100644 --- a/src/common/widget/Widget_MySurveys.class.php +++ b/src/common/widget/Widget_MySurveys.class.php @@ -119,7 +119,7 @@ class Widget_MySurveys extends Widget { foreach ($surveys as $survey) { $i++ ; if (!$hide_now) { - $group_survey_id = $survey->getId(); + $group_survey_id = $survey->getID(); $survey_title = $survey->getTitle(); $html .= ' boxGetAltRowStyle($i) .'>'. diff --git a/src/common/widget/Widget_ProjectInfo.class.php b/src/common/widget/Widget_ProjectInfo.class.php index 59fa0bd33c..25a3b0b2c1 100644 --- a/src/common/widget/Widget_ProjectInfo.class.php +++ b/src/common/widget/Widget_ProjectInfo.class.php @@ -84,7 +84,7 @@ class Widget_ProjectInfo extends Widget { } $result .= '
'.sprintf (_('Activity Ranking: %d'), $actv_res)."\n"; $result .= '
'._('View project').' '.util_make_link('/project/stats/?group_id='.$group_id, _('Statistics')); - if ( ($project->usesTracker() && forge_get_config('use_tracker')) || ($project->usesPm() && forge_get_config('use_pm')) ) { + if ( ($project->usesTracker() && forge_get_config('use_tracker')) || ($project->usesPM() && forge_get_config('use_pm')) ) { $result .= sprintf(_(' or Activity'),util_make_uri('/project/report/?group_id='.$group_id))."\n"; } $result .= '
'.sprintf(_('View list of RSS feeds available for this project.'), util_make_uri('/export/rss_project.php?group_id='.$group_id)). ' ' . html_image('ic/rss.png',16,16,array()); diff --git a/src/common/widget/Widget_ProjectPublicAreas.class.php b/src/common/widget/Widget_ProjectPublicAreas.class.php index 54887de095..2b9c3cb541 100644 --- a/src/common/widget/Widget_ProjectPublicAreas.class.php +++ b/src/common/widget/Widget_ProjectPublicAreas.class.php @@ -150,7 +150,7 @@ class Widget_ProjectPublicAreas extends Widget { // ##################### Task Manager - if ($project->usesPm()) { + if ($project->usesPM()) { $result .= '
'; $link_content = $HTML->getPmPic('') . ' ' . _('Tasks'); $result .= util_make_link('/pm/?group_id='.$group_id, $link_content); diff --git a/src/plugins/authbuiltin/www/post-login.php b/src/plugins/authbuiltin/www/post-login.php index a4a32316c4..18d5946358 100644 --- a/src/plugins/authbuiltin/www/post-login.php +++ b/src/plugins/authbuiltin/www/post-login.php @@ -27,9 +27,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Header("Expires: Wed, 11 Nov 1998 11:11:11 GMT"); -Header("Cache-Control: no-cache"); -Header("Cache-Control: must-revalidate"); +header("Expires: Wed, 11 Nov 1998 11:11:11 GMT"); +header("Cache-Control: no-cache"); +header("Cache-Control: must-revalidate"); require_once '../../../www/env.inc.php'; require_once $gfcommon.'include/pre.php'; diff --git a/src/www/account/index.php b/src/www/account/index.php index 420ee40654..9da23c381e 100644 --- a/src/www/account/index.php +++ b/src/www/account/index.php @@ -115,7 +115,7 @@ echo $HTML->boxTop(_('Account options')); echo html_e('p', array(), _('Welcome').html_e('strong', array(), $u->getRealName())); echo html_e('p', array(), _('Account options')._(':')); echo html_ao('ul'); -echo html_e('li', array(), util_make_link_u($u->getUnixName(),$u->getId(),html_e('strong', array(), _('View My Profile')))); +echo html_e('li', array(), util_make_link_u($u->getUnixName(),$u->getID(),html_e('strong', array(), _('View My Profile')))); if(forge_get_config('use_people')) { echo html_e('li', array(), util_make_link('/people/editprofile.php', html_e('strong', array(), _('Edit My Skills Profile')))); } @@ -260,7 +260,7 @@ echo $HTML->boxTop(_('Preferences')); usesRatings()) print ' checked="checked"'; ?> />

diff --git a/src/www/admin/pluginman.php b/src/www/admin/pluginman.php index 553f7d2288..ee0ec5b27e 100644 --- a/src/www/admin/pluginman.php +++ b/src/www/admin/pluginman.php @@ -148,7 +148,7 @@ if (!$pm->PluginIsInstalled('scmcvs')) { } // [#411] Prevent admin from desactivating the last auth plugin. -$plugins = $pm->GetPlugins(); +$plugins = $pm->getPlugins(); $auth_plugins = array(); foreach($plugins as $p) { if (preg_match('/^auth/', $p)) { diff --git a/src/www/dbimage.php b/src/www/dbimage.php index ea23065aa6..12c9dcf195 100644 --- a/src/www/dbimage.php +++ b/src/www/dbimage.php @@ -38,6 +38,6 @@ $filename=db_result($res,0,'filename'); $type=db_result($res,0,'filetype'); $data=base64_decode(db_result($res,0,'bin_data')); -Header('Content-disposition: filename="'.str_replace('"', '', $filename).'"'); -Header("Content-type: $type"); +header('Content-disposition: filename="'.str_replace('"', '', $filename).'"'); +header("Content-type: $type"); echo $data; diff --git a/src/www/docman/view.php b/src/www/docman/view.php index c2b8e1fa96..ea79de0970 100644 --- a/src/www/docman/view.php +++ b/src/www/docman/view.php @@ -143,7 +143,7 @@ if (is_numeric($docid)) { $file = forge_get_config('data_path').'/docman/'.$filename; $zip = new ZipArchive; - if ( !$zip->open($file, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)) { + if ( !$zip->open($file, ZipArchive::CREATE | ZipArchive::OVERWRITE)) { @unlink($file); exit_error(_('Unable to open ZIP archive for backup'), 'docman'); } @@ -181,7 +181,7 @@ if (is_numeric($docid)) { session_redirect('/docman/?group_id='.$group_id.'&view=admin'); } } elseif ($docid === 'webdav') { - if (forge_get_config('use_webdav') && $g->useWebDav()) { + if (forge_get_config('use_webdav') && $g->useWebdav()) { require_once $gfcommon.'docman/include/webdav.php'; $_SERVER['SCRIPT_NAME'] = ''; /* we need the group id for check authentification. */ @@ -229,7 +229,7 @@ if (is_numeric($docid)) { $file = forge_get_config('data_path').'/docman/'.$filename; @unlink($file); $zip = new ZipArchive; - if ( !$zip->open($file, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)) { + if ( !$zip->open($file, ZipArchive::CREATE | ZipArchive::OVERWRITE)) { @unlink($file); exit_error(_('Unable to open ZIP archive for download as ZIP'), 'docman'); } @@ -289,7 +289,7 @@ if (is_numeric($docid)) { $file = forge_get_config('data_path').'/docman/'.$filename; @unlink($file); $zip = new ZipArchive; - if (!$zip->open($file, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)) { + if (!$zip->open($file, ZipArchive::CREATE | ZipArchive::OVERWRITE)) { @unlink($file); exit_error(_('Unable to open ZIP archive for download as ZIP'), 'docman'); } diff --git a/src/www/forum/forum.php b/src/www/forum/forum.php index 467d77bf2c..26c0504bc1 100644 --- a/src/www/forum/forum.php +++ b/src/www/forum/forum.php @@ -142,7 +142,7 @@ if ($forum_id) { } //echo "
style: $style|max_rows: $max_rows|offset: $offset+"; - $fmf->setUp($offset, $style, $max_rows, $set); + $fmf->setup($offset, $style, $max_rows, $set); $style=$fmf->getStyle(); $max_rows=$fmf->max_rows; diff --git a/src/www/forum/message.php b/src/www/forum/message.php index 1d88e54528..ce40f14971 100644 --- a/src/www/forum/message.php +++ b/src/www/forum/message.php @@ -93,7 +93,7 @@ if ($msg_id) { exit_error($fmf->getErrorMessage(),'forums'); } - $fmf->setUp(0,'threaded',200,''); + $fmf->setup(0,'threaded',200,''); $style=$fmf->getStyle(); $max_rows=$fmf->max_rows; $offset=$fmf->offset; diff --git a/src/www/forum/myforums.php b/src/www/forum/myforums.php index 739182ac78..eef1937831 100644 --- a/src/www/forum/myforums.php +++ b/src/www/forum/myforums.php @@ -66,7 +66,8 @@ if (count($monitoredForumsIdsArray) < 1) { exit; } -$tablearr = array(_('Project'),_('Forum'), _('Threads'), _('Posts'), _('Last Post'), _('New Content?')); +$tablearr = array(_('Project'),_('Forum'), _('Threads'), + _('Posts'), _('Last Post'), _('New Content?')); echo $HTML->listTableTop($tablearr); $i = 0; @@ -96,7 +97,7 @@ for($i = 0; $i < sizeof($monitoredForumsIdsArray); $i++) { exit_error($fmf->getErrorMessage(), 'forums'); } - $fmf->setUp($offset,$style,$max_rows,$set); + $fmf->setup($offset,$style,$max_rows,$set); $style=$fmf->getStyle(); $max_rows=$fmf->max_rows; $offset=$fmf->offset; diff --git a/src/www/include/project_summary.php b/src/www/include/project_summary.php index 3905dd5523..4159b9b030 100644 --- a/src/www/include/project_summary.php +++ b/src/www/include/project_summary.php @@ -203,7 +203,7 @@ function project_summary($group_id, $mode, $no_table) { // ##################### Tasks - if ($project->usesPm()) { + if ($project->usesPM()) { $return .= '
'; @@ -214,7 +214,7 @@ function project_summary($group_id, $mode, $no_table) { if ($mode != 'compact') { //get a list of publicly available subprojects $result = db_query_params('SELECT * FROM project_group_list WHERE group_id=$1', - array($group_id)); + array($group_id)); $rows = db_numrows($result); if (!$result || $rows < 1) { $return .= '
There are no public subprojects available'; diff --git a/src/www/pm/include/ProjectGroupHTML.class.php b/src/www/pm/include/ProjectGroupHTML.class.php index 96ed841023..d211fe7300 100644 --- a/src/www/pm/include/ProjectGroupHTML.class.php +++ b/src/www/pm/include/ProjectGroupHTML.class.php @@ -45,7 +45,7 @@ function pm_header($params) { exit_no_group(); } - if (!$project->usesPm()) { + if (!$project->usesPM()) { exit_disabled('home'); } diff --git a/src/www/project/admin/users.php b/src/www/project/admin/users.php index 5d23b1f9ae..7c8dab02f0 100644 --- a/src/www/project/admin/users.php +++ b/src/www/project/admin/users.php @@ -201,11 +201,11 @@ if (count($reqs) > 0) { } $content .= $HTML->openForm(array('action' => getStringFromServer('PHP_SELF').'?group_id='.$group_id, 'method' => 'post')); $content .= html_e('input', array('type' => 'hidden', 'name' => 'submit', 'value' => 'y')); - $content .= html_e('input', array('type' => 'hidden', 'name' => 'form_userid', 'value' => $user->getId())); + $content .= html_e('input', array('type' => 'hidden', 'name' => 'form_userid', 'value' => $user->getID())); $content .= html_e('input', array('type' => 'hidden', 'name' => 'form_unix_name', 'value' => $user->getUnixName())); $content .= $HTML->listTableTop(); $localcells = array(); - $localcells[] = array(util_display_user($user->getUnixName(), $user->getId(), $user->getRealName()), 'style' => 'white-space: nowrap;'); + $localcells[] = array(util_display_user($user->getUnixName(), $user->getID(), $user->getRealName()), 'style' => 'white-space: nowrap;'); $localcells[] = array(role_box($group_id,'role_id'). html_e('input', array('type' => 'submit', 'name' => 'acceptpending', 'value' => _('Accept'))). html_e('input', array('type' => 'submit', 'name' => 'rejectpending', 'value' => _('Reject'))), @@ -311,7 +311,7 @@ foreach ($roles as $r) { html_e('input', array('type' => 'submit', 'name' => 'edit', 'value' => _('Edit Permissions')))). $HTML->closeForm(); - if ($r->getHomeProject() != NULL && $r->getHomeProject()->getId() == $group_id) { + if ($r->getHomeProject() != NULL && $r->getHomeProject()->getID() == $group_id) { $localcontent .= $HTML->openForm(array('action' => '/project/admin/roledelete.php?group_id='.$group_id , 'method' => 'post')). html_e('div', array('class' => 'float_right'), html_e('input', array('type' => 'hidden', 'name' => 'role_id', 'value' => $r->getID())). html_e('input', array('type' => 'submit', 'name' => 'delete', 'value' => _('Delete role')))). diff --git a/src/www/project/report/index.php b/src/www/project/report/index.php index 909b8a7709..5528f4f99c 100644 --- a/src/www/project/report/index.php +++ b/src/www/project/report/index.php @@ -148,7 +148,7 @@ foreach ($group->getUsers() as $member) { } else { $cells[][] = $link; } - $cells[][] = util_make_link('/sendmessage.php?touser='.$member->getId(), sprintf(_('Contact %s'), $member->getRealName())); + $cells[][] = util_make_link('/sendmessage.php?touser='.$member->getID(), sprintf(_('Contact %s'), $member->getRealName())); $roles = RBACEngine::getInstance()->getAvailableRolesForUser ($member) ; sortRoleList ($roles) ; $role_names = array () ; diff --git a/src/www/project/request.php b/src/www/project/request.php index 3b0155704d..3470b096fe 100644 --- a/src/www/project/request.php +++ b/src/www/project/request.php @@ -43,7 +43,7 @@ $group = group_get_object($group_id); if ($submit) { $gjr=new GroupJoinRequest($group); $usr=&session_get_user(); - if (!$gjr->create($usr->getId(),$comments)) { + if (!$gjr->create($usr->getID(),$comments)) { $error_msg = $gjr->getErrorMessage(); session_redirect('/projects/'.$group->getUnixName()); } else { diff --git a/src/www/scm/index.php b/src/www/scm/index.php index 6ce30c0ca8..347081dd88 100644 --- a/src/www/scm/index.php +++ b/src/www/scm/index.php @@ -35,7 +35,7 @@ session_require_perm('scm', $group_id, 'read'); // Check if there is an associated scm plugin and issue a warning if none. $scm_plugin = ''; -foreach (PluginManager::instance()->GetPlugins() as $p) { +foreach (PluginManager::instance()->getPlugins() as $p) { $plugin = PluginManager::instance()->GetPluginObject($p); if (isset($plugin->provides['scm']) && $plugin->provides['scm'] && $group->usesPlugin($p)) { $scm_plugin = $p; diff --git a/src/www/snapshots.php b/src/www/snapshots.php index 4efeb0ed8d..845407f8db 100644 --- a/src/www/snapshots.php +++ b/src/www/snapshots.php @@ -54,10 +54,10 @@ $group_name=$group->getUnixName(); $filename=$group_name.'-scm-latest.tar.gz'; if (file_exists(forge_get_config('scm_snapshots_path').'/'.$filename)) { - Header('Content-disposition: filename="'.str_replace('"', '', $filename).'"'); - Header('Content-type: application/x-gzip'); + header('Content-disposition: filename="'.str_replace('"', '', $filename).'"'); + header('Content-type: application/x-gzip'); $length = filesize(forge_get_config('scm_snapshots_path').'/'.$filename); - Header('Content-length: '.$length); + header('Content-length: '.$length); readfile_chunked(forge_get_config('scm_snapshots_path').'/'.$filename); } else { diff --git a/src/www/soap/tracker/tracker.php b/src/www/soap/tracker/tracker.php index ef2546d27b..a814f19206 100644 --- a/src/www/soap/tracker/tracker.php +++ b/src/www/soap/tracker/tracker.php @@ -169,17 +169,17 @@ $server->wsdl->addComplexType( 'sequence', '', array( - 'artifact_id' => array('name'=>'artifact_id', 'type' => 'xsd:int'), - 'group_artifact_id' => array('name'=>'group_artifact_id', 'type' => 'xsd:int'), - 'status_id' => array('name'=>'status_id', 'type' => 'xsd:int'), - 'priority' => array('name'=>'priority', 'type' => 'xsd:int'), - 'submitted_by' => array('name'=>'submitted_by', 'type' => 'xsd:int'), - 'assigned_to' => array('name'=>'assigned_to', 'type' => 'xsd:int'), - 'open_date' => array('name'=>'open_date', 'type' => 'xsd:int'), - 'close_date' => array('name'=>'close_date', 'type' => 'xsd:int'), - 'summary' => array('name'=>'summary', 'type' => 'xsd:string'), - 'details' => array('name'=>'details', 'type' => 'xsd:string'), - 'extra_fields'=>array('name'=>'extra_fields', 'type' => 'tns:ArrayOfArtifactExtraFieldsData') + 'artifact_id' => array('name'=>'artifact_id', 'type' => 'xsd:int'), + 'group_artifact_id' => array('name'=>'group_artifact_id', 'type' => 'xsd:int'), + 'status_id' => array('name'=>'status_id', 'type' => 'xsd:int'), + 'priority' => array('name'=>'priority', 'type' => 'xsd:int'), + 'submitted_by' => array('name'=>'submitted_by', 'type' => 'xsd:int'), + 'assigned_to' => array('name'=>'assigned_to', 'type' => 'xsd:int'), + 'open_date' => array('name'=>'open_date', 'type' => 'xsd:int'), + 'close_date' => array('name'=>'close_date', 'type' => 'xsd:int'), + 'summary' => array('name'=>'summary', 'type' => 'xsd:string'), + 'details' => array('name'=>'details', 'type' => 'xsd:string'), + 'extra_fields'=>array('name'=>'extra_fields', 'type' => 'tns:ArrayOfArtifactExtraFieldsData') ) ); //ArrayOfArtifactExtraFieldsData @@ -464,7 +464,7 @@ $server->register( function artifactTypeSetMonitor($session_ser,$group_id,$group_artifact_id) { continue_session($session_ser); - $a =& artifacttype_get_object($group_artifact_id); + $a =& artifactType_get_object($group_artifact_id); if (!$a || !is_object($a)) { return new soap_fault('','artifactTypeSetMonitor','Could Not Get ArtifactType','Could Not Get ArtifactType'); } elseif ($a->isError()) { @@ -476,7 +476,7 @@ function artifactTypeSetMonitor($session_ser,$group_id,$group_artifact_id) { function artifactTypeIsMonitoring($session_ser,$group_id,$group_artifact_id) { continue_session($session_ser); - $a =& artifacttype_get_object($group_artifact_id); + $a =& artifactType_get_object($group_artifact_id); if (!$a || !is_object($a)) { return new soap_fault('','artifactTypeIsMonitoring','Could Not Get ArtifactType','Could Not Get ArtifactType'); } elseif ($a->isError()) { diff --git a/src/www/survey/admin/show_csv.php b/src/www/survey/admin/show_csv.php index e4e8eb20c2..152d1f815d 100644 --- a/src/www/survey/admin/show_csv.php +++ b/src/www/survey/admin/show_csv.php @@ -70,7 +70,7 @@ if ($survey_id) { /* Get questions of this survey */ $questions = & $s->getQuestionInstances(); foreach ($questions as $cur_question){ - $qid = $cur_question->getId(); + $qid = $cur_question->getID(); $lib = $cur_question->getQuestion(); $type = $cur_question->getQuestionType(); $header[$qid]=$lib; diff --git a/src/www/survey/admin/survey.php b/src/www/survey/admin/survey.php index 682d5f4642..e5f91df4b3 100644 --- a/src/www/survey/admin/survey.php +++ b/src/www/survey/admin/survey.php @@ -92,7 +92,7 @@ if ($s->isError()) { $title = $survey_id ? _('Edit a Survey') : _('Add a Survey'); $sh->header(array('title'=>$title, 'modal'=>1)); -echo ($sh->ShowAddSurveyForm($s)); +echo ($sh->showAddSurveyForm($s)); /* Show list of Survey */ $sf = new SurveyFactory($g); diff --git a/src/www/tarballs.php b/src/www/tarballs.php index 54b974bc71..bbae208d91 100644 --- a/src/www/tarballs.php +++ b/src/www/tarballs.php @@ -54,10 +54,10 @@ $group_name=$group->getUnixName(); $filename=$group_name.'-scmroot.tar.gz'; if (file_exists(forge_get_config('scm_tarballs_path').'/'.$filename)) { - Header('Content-disposition: filename="'.str_replace('"', '', $filename).'"'); - Header("Content-type: application/x-gzip"); + header('Content-disposition: filename="'.str_replace('"', '', $filename).'"'); + header("Content-type: application/x-gzip"); $length = filesize(forge_get_config('scm_tarballs_path').'/'.$filename); - Header("Content-length: ".$length); + header("Content-length: ".$length); readfile_chunked(forge_get_config('scm_tarballs_path').'/'.$filename); } else { diff --git a/src/www/trove/TroveCategory.class.php b/src/www/trove/TroveCategory.class.php index 00e2ee4691..3f1db592c4 100644 --- a/src/www/trove/TroveCategory.class.php +++ b/src/www/trove/TroveCategory.class.php @@ -117,7 +117,7 @@ class TroveCategory extends FFError { } } - function getId() { + function getID() { return $this->categoryId; } diff --git a/src/www/trove/TroveCategoryLabel.class.php b/src/www/trove/TroveCategoryLabel.class.php index 3b770d593d..e8c3ddd29b 100644 --- a/src/www/trove/TroveCategoryLabel.class.php +++ b/src/www/trove/TroveCategoryLabel.class.php @@ -55,7 +55,7 @@ class TroveCategoryLabel extends FFError { } } else { $this->dataArray =& $dataArray; - if ($this->dataArray['category_id'] != $this->category->getId()) { + if ($this->dataArray['category_id'] != $this->category->getID()) { $this->dataArray = null; return false; } @@ -74,7 +74,7 @@ class TroveCategoryLabel extends FFError { db_begin(); $result = db_query_params("INSERT INTO trove_category_labels (category_id, label, language_id) VALUES ($1, $2, $3)", - array($this->category->getId(), $label, $languageId)); + array($this->category->getID(), $label, $languageId)); echo db_error(); if (!$result) { db_rollback(); @@ -94,7 +94,7 @@ class TroveCategoryLabel extends FFError { . "WHERE trove_category_labels.label_id=$1 " . "AND trove_category_labels.category_id=$2 " . "AND supported_languages.language_id=trove_category_labels.language_id", - array($labelId, $this->category->getId())); + array($labelId, $this->category->getID())); if (!$res || db_numrows($res) < 1) { return false; @@ -117,7 +117,7 @@ class TroveCategoryLabel extends FFError { } } - function getId() { + function getID() { return $this->labelId; } diff --git a/src/www/trove/index.php b/src/www/trove/index.php index 29ce564733..516a0c3e6b 100644 --- a/src/www/trove/index.php +++ b/src/www/trove/index.php @@ -72,8 +72,8 @@ if($filter) { $filterCategory =& $filterCategories[$i]; echo '
      ' .$filterCategory->getFullPath() - .' ['._('Remove Filter').']' + .' ['._('Remove Filter').']' .''; } @@ -100,13 +100,13 @@ if($filter) { // also make anchor if not current echo '
'; - if (($rootCategory->getId() == $category->getRootParentId()) - || ($rootCategory->getId() == $category->getId())) { + if (($rootCategory->getID() == $category->getRootParentId()) + || ($rootCategory->getID() == $category->getID())) { echo html_image('ic/ofolder15.png','15','13',array()); echo '  '.$rootCategory->getLocalizedLabel().''; } else { - echo ''; + echo ''; echo html_image('ic/cfolder15.png', '15', '13', array()); echo '  '.$rootCategory->getLocalizedLabel(); echo ''; @@ -123,13 +123,13 @@ if($filter) { echo html_image('ic/ofolder15.png', '15', '13', array()); echo '  '; - if($parentCategories[$i]['id'] != $category->getId()) { + if($parentCategories[$i]['id'] != $category->getID()) { echo ''; } else { echo ''; } echo $parentCategories[$i]['name']; - if($parentCategories[$i]['id'] != $category->getId()) { + if($parentCategories[$i]['id'] != $category->getID()) { echo ''; } else { echo ''; @@ -145,7 +145,7 @@ if($filter) { $childCategory =& $childrenCategories[$i]; echo $currentIndent; - echo ''; + echo ''; echo html_image('ic/cfolder15.png', '15', '13', array()); echo '  '.$childCategory->getLocalizedLabel().''; echo ' (' -- 2.30.2