From 997d26ec8bd2375f14dc9cb4f778b462cd00d190 Mon Sep 17 00:00:00 2001 From: inghamn Date: Fri, 18 Dec 2009 17:40:05 +0000 Subject: [PATCH] Fixed Typo: They're spelled "interments" git-svn-id: https://rosehill.googlecode.com/svn/branches/php@10 100bd78a-fc82-11de-b5bc-ffd2847a4b57 --- access_control.inc | 4 +- blocks/html/internments/addInternmentForm.inc | 64 ++++++------- blocks/html/internments/findForm.inc | 2 +- blocks/html/internments/internmentList.inc | 36 +++---- .../html/internments/updateInternmentForm.inc | 96 +++++++++---------- classes/Cemetery.php | 2 +- classes/Internment.php | 14 +-- classes/InternmentList.php | 18 ++-- html/internments/addInternment.php | 18 ++-- html/internments/home.php | 10 +- html/internments/updateInternment.php | 18 ++-- templates/html/partials/menubar.inc | 2 +- 12 files changed, 142 insertions(+), 142 deletions(-) diff --git a/access_control.inc b/access_control.inc index 272b986..1c69b2a 100644 --- a/access_control.inc +++ b/access_control.inc @@ -19,7 +19,7 @@ foreach ($roles as $role) { */ $ZEND_ACL->add(new Zend_Acl_Resource('Users')); $ZEND_ACL->add(new Zend_Acl_Resource('Deeds')); -$ZEND_ACL->add(new Zend_Acl_Resource('Internments')); +$ZEND_ACL->add(new Zend_Acl_Resource('Interments')); $ZEND_ACL->add(new Zend_Acl_Resource('Cemeteries')); @@ -30,4 +30,4 @@ $ZEND_ACL->add(new Zend_Acl_Resource('Cemeteries')); $ZEND_ACL->allow('Administrator'); $ZEND_ACL->allow('Editor','Deeds'); -$ZEND_ACL->allow('Editor','Internments'); \ No newline at end of file +$ZEND_ACL->allow('Editor','Interments'); \ No newline at end of file diff --git a/blocks/html/internments/addInternmentForm.inc b/blocks/html/internments/addInternmentForm.inc index eea0839..015e45a 100644 --- a/blocks/html/internments/addInternmentForm.inc +++ b/blocks/html/internments/addInternmentForm.inc @@ -5,55 +5,55 @@ * @author Cliff Ingham */ ?> -

Add Internment

+

Add Interment

-
Internment Info +
Interment Info - - + - - + - - + - - + - - + - - + - - + - - + @@ -85,7 +85,7 @@
- - Lot +
- - Page +
- - - - - +
+ + + + +
+
+
- - - -
+ + + +
+
-
diff --git a/blocks/html/internments/findForm.inc b/blocks/html/internments/findForm.inc index 70b423d..eb15d1e 100644 --- a/blocks/html/internments/findForm.inc +++ b/blocks/html/internments/findForm.inc @@ -6,7 +6,7 @@ */ ?>

Search Burial Records

- +
- * @param InternmentList $this->internmentList + * @param IntermentList $this->intermentList */ ?>

+ "; } ?> - Internments + Interments

@@ -31,28 +31,28 @@ internmentList as $internment) { + foreach ($this->intermentList as $interment) { $editButton = ''; - if (userIsAllowed('Internments')) { - $url = new URL(BASE_URL.'/internments/updateInternment.php'); - $url->internment_id = $internment->getId(); + if (userIsAllowed('Interments')) { + $url = new URL(BASE_URL.'/interments/updateInterment.php'); + $url->interment_id = $interment->getId(); $editButton = " "; } - $last = View::escape($internment->getLastname()); - $first = View::escape($internment->getFirstname()); - $date = $internment->getDeceasedDate('n/j/Y'); - $cemetery = View::escape($internment->getCemetery()); + $last = View::escape($interment->getLastname()); + $first = View::escape($interment->getFirstname()); + $date = $interment->getDeceasedDate('n/j/Y'); + $cemetery = View::escape($interment->getCemetery()); $section_lot = array(); - if ($internment->getSection()) { - $section_lot[] = $internment->getSection(); + if ($interment->getSection()) { + $section_lot[] = $interment->getSection(); } - if ($internment->getLot()) { - $section_lot[] = $internment->getLot(); + if ($interment->getLot()) { + $section_lot[] = $interment->getLot(); } $section_lot = View::escape(implode(', ',$section_lot)); @@ -71,9 +71,9 @@
internmentList->getPaginator()) { + if ($this->intermentList->getPaginator()) { $pageNavigation = new Block('pageNavigation.inc', - array('pages'=>$this->internmentList->getPaginator()->getPages())); + array('pages'=>$this->intermentList->getPaginator()->getPages())); echo $pageNavigation->render('html'); } ?> \ No newline at end of file diff --git a/blocks/html/internments/updateInternmentForm.inc b/blocks/html/internments/updateInternmentForm.inc index 32dfe1d..bef1c76 100644 --- a/blocks/html/internments/updateInternmentForm.inc +++ b/blocks/html/internments/updateInternmentForm.inc @@ -3,91 +3,91 @@ * @copyright 2009 City of Bloomington, Indiana * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt * @author Cliff Ingham - * @param Internment $this->internment + * @param Interment $this->interment */ ?> -

Update Internment

+

Update Interment

-
Internment Info - +
Interment Info + - - + - - + - - + - - + - - + - - + - - + - - +
- - + + + value="interment->getLot()); ?>" />
- - + + + value="interment->getPageNumber()); ?>" />
- - - - - +
+ + + + +
+
+
- - + + - - - -
+
-
diff --git a/classes/Cemetery.php b/classes/Cemetery.php index 56237c7..451a819 100644 --- a/classes/Cemetery.php +++ b/classes/Cemetery.php @@ -147,6 +147,6 @@ class Cemetery */ public function getSections() { - return Internment::getSections($this); + return Interment::getSections($this); } } diff --git a/classes/Internment.php b/classes/Internment.php index b613aaf..636ad2b 100644 --- a/classes/Internment.php +++ b/classes/Internment.php @@ -4,7 +4,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt * @author Cliff Ingham */ -class Internment +class Interment { private $id; private $section; @@ -45,7 +45,7 @@ class Internment } else { $zend_db = Database::getConnection(); - $sql = 'select * from internments where id=?'; + $sql = 'select * from interments where id=?'; $result = $zend_db->fetchRow($sql,array($id)); } @@ -60,7 +60,7 @@ class Internment } } else { - throw new Exception('internments/unknownInternment'); + throw new Exception('interments/unknownInterment'); } } else { @@ -114,14 +114,14 @@ class Internment private function update($data) { $zend_db = Database::getConnection(); - $zend_db->update('internments',$data,"id='{$this->id}'"); + $zend_db->update('interments',$data,"id='{$this->id}'"); } private function insert($data) { $zend_db = Database::getConnection(); - $zend_db->insert('internments',$data); - $this->id = $zend_db->lastInsertId('internments','id'); + $zend_db->insert('interments',$data); + $this->id = $zend_db->lastInsertId('interments','id'); } //---------------------------------------------------------------- @@ -441,7 +441,7 @@ class Internment { $zend_db = Database::getConnection(); $select = new Zend_Db_Select($zend_db); - $select->distinct()->from('internments','section'); + $select->distinct()->from('interments','section'); $select->where('section is not null'); if ($cemetery) { $select->where('cemetery_id=?',$cemetery->getId()); diff --git a/classes/InternmentList.php b/classes/InternmentList.php index f655978..7b320d4 100644 --- a/classes/InternmentList.php +++ b/classes/InternmentList.php @@ -1,12 +1,12 @@ */ -class InternmentList extends ZendDbResultIterator +class IntermentList extends ZendDbResultIterator { /** * Creates a basic select statement for the collection. @@ -46,9 +46,9 @@ class InternmentList extends ZendDbResultIterator */ public function find($fields=null,$order='id',$limit=null,$groupBy=null) { - $this->select->from('internments'); + $this->select->from('interments'); - // Finding on fields from the internments table is handled here + // Finding on fields from the interments table is handled here if (count($fields)) { foreach ($fields as $key=>$value) { switch ($key) { @@ -65,7 +65,7 @@ class InternmentList extends ZendDbResultIterator // Finding on fields from other tables requires joining those tables. // You can handle fields from other tables by adding the joins here // If you add more joins you probably want to make sure that the - // above foreach only handles fields from the internments table. + // above foreach only handles fields from the interments table. $this->select->order($order); if ($limit) { @@ -78,16 +78,16 @@ class InternmentList extends ZendDbResultIterator } /** - * Hydrates all the Internment objects from a database result set + * Hydrates all the Interment objects from a database result set * * This is a callback function, called from ZendDbResultIterator. It is * called once per row of the result. * * @param int $key The index of the result row to load - * @return Internment + * @return Interment */ protected function loadResult($key) { - return new Internment($this->result[$key]); + return new Interment($this->result[$key]); } } diff --git a/html/internments/addInternment.php b/html/internments/addInternment.php index 7e2880f..a15cac4 100644 --- a/html/internments/addInternment.php +++ b/html/internments/addInternment.php @@ -5,22 +5,22 @@ * @author Cliff Ingham */ -if (!userIsAllowed('Internments')) { +if (!userIsAllowed('Interments')) { $_SESSION['errorMessages'][] = new Exception('noAccessAllowed'); - header('Location: '.BASE_URL.'/internments'); + header('Location: '.BASE_URL.'/interments'); exit(); } -if (isset($_POST['internment'])) { - $internment = new Internment(); - foreach ($_POST['internment'] as $field=>$value) { +if (isset($_POST['interment'])) { + $interment = new Interment(); + foreach ($_POST['interment'] as $field=>$value) { $set = 'set'.ucfirst($field); - $internment->$set($value); + $interment->$set($value); } try { - $internment->save(); - header('Location: '.BASE_URL.'/internments'); + $interment->save(); + header('Location: '.BASE_URL.'/interments'); exit(); } catch(Exception $e) { @@ -29,5 +29,5 @@ if (isset($_POST['internment'])) { } $template = new Template(); -$template->blocks[] = new Block('internments/addInternmentForm.inc'); +$template->blocks[] = new Block('interments/addIntermentForm.inc'); echo $template->render(); \ No newline at end of file diff --git a/html/internments/home.php b/html/internments/home.php index a311b60..983a54e 100644 --- a/html/internments/home.php +++ b/html/internments/home.php @@ -29,14 +29,14 @@ foreach ($_GET as $field=>$value) { } if (count($search)) { - $internmentList = new InternmentList($search,20,$currentPage); + $intermentList = new IntermentList($search,20,$currentPage); } $template = new Template(); -$template->blocks[] = new Block('internments/findForm.inc'); -if (isset($internmentList)) { - $template->blocks[] = new Block('internments/internmentList.inc', - array('internmentList'=>$internmentList)); +$template->blocks[] = new Block('interments/findForm.inc'); +if (isset($intermentList)) { + $template->blocks[] = new Block('interments/intermentList.inc', + array('intermentList'=>$intermentList)); } echo $template->render(); \ No newline at end of file diff --git a/html/internments/updateInternment.php b/html/internments/updateInternment.php index f0d4e94..f7c40ff 100644 --- a/html/internments/updateInternment.php +++ b/html/internments/updateInternment.php @@ -4,22 +4,22 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt * @author Cliff Ingham */ -if (!userIsAllowed('Internments')) { +if (!userIsAllowed('Interments')) { $_SESSION['errorMessages'][] = new Exception('noAccessAllowed'); - header('Location: '.BASE_URL.'/internments'); + header('Location: '.BASE_URL.'/interments'); exit(); } -$internment = new Internment($_REQUEST['internment_id']); -if (isset($_POST['internment'])) { - foreach ($_POST['internment'] as $field=>$value) { +$interment = new Interment($_REQUEST['interment_id']); +if (isset($_POST['interment'])) { + foreach ($_POST['interment'] as $field=>$value) { $set = 'set'.ucfirst($field); - $internment->$set($value); + $interment->$set($value); } try { - $internment->save(); - header('Location: '.BASE_URL.'/internments'); + $interment->save(); + header('Location: '.BASE_URL.'/interments'); exit(); } catch (Exception $e) { @@ -28,5 +28,5 @@ if (isset($_POST['internment'])) { } $template = new Template(); -$template->blocks[] = new Block('internments/updateInternmentForm.inc',array('internment'=>$internment)); +$template->blocks[] = new Block('interments/updateIntermentForm.inc',array('interment'=>$interment)); echo $template->render(); \ No newline at end of file diff --git a/templates/html/partials/menubar.inc b/templates/html/partials/menubar.inc index dd98792..ce21a0e 100644 --- a/templates/html/partials/menubar.inc +++ b/templates/html/partials/menubar.inc @@ -1,5 +1,5 @@
-