From c79d78a0b7c5e14c6852a4b1383e6fd34706d33d Mon Sep 17 00:00:00 2001 From: inghamn Date: Tue, 14 Jun 2011 13:29:37 +0000 Subject: [PATCH] Updated license to refer to AGPL instead of the plain GPL. Fixes issue 3 git-svn-id: https://rosehill.googlecode.com/svn/trunk@70 100bd78a-fc82-11de-b5bc-ffd2847a4b57 --- GPL.txt => AGPL.txt | 0 LICENSE.txt | 33 +++---------------- access_control.inc | 2 +- blocks/html/cemeteries/addCemeteryForm.inc | 2 +- blocks/html/cemeteries/cemeteryInfo.inc | 2 +- blocks/html/cemeteries/cemeteryList.inc | 2 +- blocks/html/cemeteries/updateCemeteryForm.inc | 2 +- blocks/html/deeds/addDeedForm.inc | 2 +- blocks/html/deeds/deedList.inc | 2 +- blocks/html/deeds/findForm.inc | 2 +- blocks/html/deeds/updateDeedForm.inc | 2 +- blocks/html/errorMessages.inc | 2 +- blocks/html/interments/addIntermentForm.inc | 2 +- blocks/html/interments/findForm-skinny.inc | 2 +- blocks/html/interments/findForm.inc | 2 +- blocks/html/interments/intermentInfo.inc | 2 +- blocks/html/interments/intermentList.inc | 2 +- blocks/html/interments/mapLinks.inc | 2 +- blocks/html/interments/maps.inc | 2 +- .../html/interments/partials/findFields.inc | 2 +- .../html/interments/updateIntermentForm.inc | 2 +- blocks/html/people/addPersonForm.inc | 2 +- blocks/html/people/personInfo.inc | 2 +- blocks/html/people/personList.inc | 2 +- blocks/html/people/updatePersonForm.inc | 2 +- blocks/html/sections/addSectionForm.inc | 2 +- blocks/html/sections/updateSectionForm.inc | 2 +- blocks/html/serviceButtons.inc | 2 +- blocks/html/users/addUserForm.inc | 2 +- blocks/html/users/updateUserForm.inc | 2 +- blocks/html/users/userList.inc | 2 +- blocks/json/cemeteries/cemeteryInfo.inc | 2 +- blocks/json/cemeteries/cemeteryList.inc | 2 +- blocks/json/interments/intermentList.inc | 2 +- blocks/xml/cemeteries/cemeteryInfo.inc | 2 +- blocks/xml/cemeteries/cemeteryList.inc | 2 +- blocks/xml/interments/intermentList.inc | 2 +- classes/Cemetery.php | 2 +- classes/CemeteryList.php | 2 +- classes/Deed.php | 2 +- classes/DeedList.php | 2 +- classes/Interment.php | 2 +- classes/IntermentList.php | 2 +- classes/Map.php | 2 +- classes/Person.php | 2 +- classes/PersonList.php | 2 +- classes/Role.php | 2 +- classes/RoleList.php | 2 +- classes/Section.php | 2 +- classes/SectionList.php | 2 +- classes/User.php | 2 +- classes/UserList.php | 2 +- configuration.inc.default | 2 +- html/cemeteries/addCemetery.php | 2 +- html/cemeteries/home.php | 2 +- html/cemeteries/updateCemetery.php | 2 +- html/cemeteries/viewCemetery.php | 2 +- html/deeds/addDeed.php | 2 +- html/deeds/deleteDeed.php | 2 +- html/deeds/home.php | 2 +- html/deeds/updateDeed.php | 2 +- html/home.php | 2 +- html/interments/addInterment.php | 2 +- html/interments/deleteInterment.php | 2 +- html/interments/home.php | 2 +- html/interments/maps.php | 2 +- html/interments/updateInterment.php | 2 +- html/interments/viewInterment.php | 2 +- html/js/functions.js | 2 +- html/login/home.php | 2 +- html/login/login.php | 2 +- html/login/logout.php | 2 +- html/people/addPerson.php | 2 +- html/people/home.php | 2 +- html/people/updatePerson.php | 2 +- html/people/viewPerson.php | 2 +- html/sections/addSection.php | 2 +- html/sections/updateSection.php | 2 +- html/services/home.php | 2 +- html/users/addUser.php | 2 +- html/users/deleteUser.php | 2 +- html/users/home.php | 2 +- html/users/updateUser.php | 2 +- .../framework/blocks/html/pageNavigation.inc | 2 +- libraries/framework/classes/Block.php | 2 +- libraries/framework/classes/Database.php | 2 +- libraries/framework/classes/Date.php | 2 +- .../classes/ExternalAuthentication.php | 2 +- libraries/framework/classes/Inflector.php | 2 +- libraries/framework/classes/LDAP.php | 2 +- libraries/framework/classes/LDAPEntry.php | 2 +- libraries/framework/classes/Paginator.php | 2 +- libraries/framework/classes/SystemUser.php | 2 +- libraries/framework/classes/Template.php | 2 +- libraries/framework/classes/URL.php | 2 +- libraries/framework/classes/View.php | 2 +- .../classes/ZendDbResultIterator.php | 2 +- libraries/framework/errorMessages.php | 2 +- libraries/framework/globalFunctions.php | 2 +- libraries/framework/inflections.inc | 2 +- scripts/generateBlocks.php | 2 +- scripts/generateClasses.php | 2 +- scripts/generateControllers.php | 2 +- scripts/generateLists.php | 2 +- scripts/generateTests.php | 2 +- 105 files changed, 108 insertions(+), 131 deletions(-) rename GPL.txt => AGPL.txt (100%) diff --git a/GPL.txt b/AGPL.txt similarity index 100% rename from GPL.txt rename to AGPL.txt diff --git a/LICENSE.txt b/LICENSE.txt index 3da701d..890b593 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ -Copyright (C) 2006-2008 City of Bloomington, Indiana. All rights reserved. +Copyright 2006-2011 City of Bloomington, Indiana. All rights reserved. -This Scaffolding is free software; you can redistribute it and/or modify +This application is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. @@ -17,14 +17,14 @@ are permitted provided that the following conditions are met: -This Scaffolding is distributed in the hope that it will be useful, +This application is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License +You should have received a copy of the GNU Affero General Public License along with this scaffolding; if not, you can get a copy at: -http://www.gnu.org/copyleft/gpl.html +http://www.gnu.org/licenses/agpl.txt Or, write to Free Software Foundation, Inc. @@ -32,29 +32,6 @@ Free Software Foundation, Inc. Boston, MA 02110-1301, USA ---------------------------------------------------------------------- - Yahoo's YUI Javascript Toolkit ---------------------------------------------------------------------- -This scaffolding includes an installation of the YUI Javascript Toolkit -The YUI Toolkit is released under the BSD license - -Software License Agreement (BSD License) -Copyright (c) 2008, Yahoo! Inc. -All rights reserved. - -Redistribution and use of this software in source and binary forms, with or -without modification, are permitted provided that the following conditions are -met: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation and/or - other materials provided with the distribution. -* Neither the name of Yahoo! Inc. nor the names of its contributors may be - used to endorse or promote products derived from this software without specific - prior written permission of Yahoo! Inc. - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/access_control.inc b/access_control.inc index 687dbe3..1fbf435 100644 --- a/access_control.inc +++ b/access_control.inc @@ -1,7 +1,7 @@ */ $ZEND_ACL = new Zend_Acl(); diff --git a/blocks/html/cemeteries/addCemeteryForm.inc b/blocks/html/cemeteries/addCemeteryForm.inc index bfb5381..cd3a771 100644 --- a/blocks/html/cemeteries/addCemeteryForm.inc +++ b/blocks/html/cemeteries/addCemeteryForm.inc @@ -1,7 +1,7 @@ */ ?> diff --git a/blocks/html/cemeteries/cemeteryInfo.inc b/blocks/html/cemeteries/cemeteryInfo.inc index f57abd1..0f43fc7 100644 --- a/blocks/html/cemeteries/cemeteryInfo.inc +++ b/blocks/html/cemeteries/cemeteryInfo.inc @@ -1,7 +1,7 @@ * @param Cemetery $this->cemetery */ diff --git a/blocks/html/cemeteries/cemeteryList.inc b/blocks/html/cemeteries/cemeteryList.inc index 01b67fb..48d53b8 100644 --- a/blocks/html/cemeteries/cemeteryList.inc +++ b/blocks/html/cemeteries/cemeteryList.inc @@ -1,7 +1,7 @@ */ ?> diff --git a/blocks/html/cemeteries/updateCemeteryForm.inc b/blocks/html/cemeteries/updateCemeteryForm.inc index 2ddea51..071bcad 100644 --- a/blocks/html/cemeteries/updateCemeteryForm.inc +++ b/blocks/html/cemeteries/updateCemeteryForm.inc @@ -1,7 +1,7 @@ * @param Cemetery $this->cemetery */ diff --git a/blocks/html/deeds/addDeedForm.inc b/blocks/html/deeds/addDeedForm.inc index b725e14..9b0d70d 100644 --- a/blocks/html/deeds/addDeedForm.inc +++ b/blocks/html/deeds/addDeedForm.inc @@ -1,7 +1,7 @@ */ ?> diff --git a/blocks/html/deeds/deedList.inc b/blocks/html/deeds/deedList.inc index 99f15be..4b18269 100644 --- a/blocks/html/deeds/deedList.inc +++ b/blocks/html/deeds/deedList.inc @@ -1,7 +1,7 @@ * @param DeedList $this->deedList */ diff --git a/blocks/html/deeds/findForm.inc b/blocks/html/deeds/findForm.inc index 85d5810..8e74be3 100644 --- a/blocks/html/deeds/findForm.inc +++ b/blocks/html/deeds/findForm.inc @@ -1,7 +1,7 @@ */ ?> diff --git a/blocks/html/deeds/updateDeedForm.inc b/blocks/html/deeds/updateDeedForm.inc index 6d2c47d..6e1c4f0 100644 --- a/blocks/html/deeds/updateDeedForm.inc +++ b/blocks/html/deeds/updateDeedForm.inc @@ -1,7 +1,7 @@ @param Deed $this->deed */ diff --git a/blocks/html/errorMessages.inc b/blocks/html/errorMessages.inc index bdfce52..9e2c707 100644 --- a/blocks/html/errorMessages.inc +++ b/blocks/html/errorMessages.inc @@ -1,7 +1,7 @@ * @param array $this->errorMessages */ diff --git a/blocks/html/interments/addIntermentForm.inc b/blocks/html/interments/addIntermentForm.inc index 1612cd0..4b3d54d 100644 --- a/blocks/html/interments/addIntermentForm.inc +++ b/blocks/html/interments/addIntermentForm.inc @@ -1,7 +1,7 @@ * @param URL $this->return_url */ diff --git a/blocks/html/interments/findForm-skinny.inc b/blocks/html/interments/findForm-skinny.inc index 71b34b0..0787884 100644 --- a/blocks/html/interments/findForm-skinny.inc +++ b/blocks/html/interments/findForm-skinny.inc @@ -1,7 +1,7 @@ */ ?> diff --git a/blocks/html/interments/findForm.inc b/blocks/html/interments/findForm.inc index 087e746..6e8d3d3 100644 --- a/blocks/html/interments/findForm.inc +++ b/blocks/html/interments/findForm.inc @@ -1,7 +1,7 @@ */ ?> diff --git a/blocks/html/interments/intermentInfo.inc b/blocks/html/interments/intermentInfo.inc index df3cddd..c6f3b56 100644 --- a/blocks/html/interments/intermentInfo.inc +++ b/blocks/html/interments/intermentInfo.inc @@ -1,7 +1,7 @@ * @param Interment $this->interment */ diff --git a/blocks/html/interments/intermentList.inc b/blocks/html/interments/intermentList.inc index 372009f..854d7e1 100644 --- a/blocks/html/interments/intermentList.inc +++ b/blocks/html/interments/intermentList.inc @@ -1,7 +1,7 @@ * @param IntermentList $this->intermentList * @param GET sort diff --git a/blocks/html/interments/mapLinks.inc b/blocks/html/interments/mapLinks.inc index 52b03fb..65aae20 100644 --- a/blocks/html/interments/mapLinks.inc +++ b/blocks/html/interments/mapLinks.inc @@ -1,7 +1,7 @@ interment */ $mapURL = BASE_URL.'/interments/maps.php?interment_id='.$this->interment->getId(); diff --git a/blocks/html/interments/maps.inc b/blocks/html/interments/maps.inc index ba3b304..2eb13ea 100644 --- a/blocks/html/interments/maps.inc +++ b/blocks/html/interments/maps.inc @@ -1,7 +1,7 @@ * @param Interment $this->interment */ diff --git a/blocks/html/interments/partials/findFields.inc b/blocks/html/interments/partials/findFields.inc index cf468d6..b5bfa0a 100644 --- a/blocks/html/interments/partials/findFields.inc +++ b/blocks/html/interments/partials/findFields.inc @@ -1,7 +1,7 @@ */ ?> diff --git a/blocks/html/interments/updateIntermentForm.inc b/blocks/html/interments/updateIntermentForm.inc index eeb0ef8..de0a348 100644 --- a/blocks/html/interments/updateIntermentForm.inc +++ b/blocks/html/interments/updateIntermentForm.inc @@ -1,7 +1,7 @@ * @param Interment $this->interment * @param string $this->return_url diff --git a/blocks/html/people/addPersonForm.inc b/blocks/html/people/addPersonForm.inc index 1acb23c..5f64be7 100644 --- a/blocks/html/people/addPersonForm.inc +++ b/blocks/html/people/addPersonForm.inc @@ -1,7 +1,7 @@ */ ?> diff --git a/blocks/html/people/personInfo.inc b/blocks/html/people/personInfo.inc index 09fe581..90295fe 100644 --- a/blocks/html/people/personInfo.inc +++ b/blocks/html/people/personInfo.inc @@ -1,7 +1,7 @@ * @param Person $this->person */ diff --git a/blocks/html/people/personList.inc b/blocks/html/people/personList.inc index c4f529a..36cba3d 100644 --- a/blocks/html/people/personList.inc +++ b/blocks/html/people/personList.inc @@ -1,7 +1,7 @@ * @param PersonList $this->personList */ diff --git a/blocks/html/people/updatePersonForm.inc b/blocks/html/people/updatePersonForm.inc index f06808a..201a8ce 100644 --- a/blocks/html/people/updatePersonForm.inc +++ b/blocks/html/people/updatePersonForm.inc @@ -1,7 +1,7 @@ * @param Person $this->person */ diff --git a/blocks/html/sections/addSectionForm.inc b/blocks/html/sections/addSectionForm.inc index 5acdf0f..4649042 100644 --- a/blocks/html/sections/addSectionForm.inc +++ b/blocks/html/sections/addSectionForm.inc @@ -1,7 +1,7 @@ * @param Cemetery $this->cemetery */ diff --git a/blocks/html/sections/updateSectionForm.inc b/blocks/html/sections/updateSectionForm.inc index bef1b0b..731550e 100644 --- a/blocks/html/sections/updateSectionForm.inc +++ b/blocks/html/sections/updateSectionForm.inc @@ -1,7 +1,7 @@ * @param Section $this->section */ diff --git a/blocks/html/serviceButtons.inc b/blocks/html/serviceButtons.inc index 149d9d8..be3dd1d 100644 --- a/blocks/html/serviceButtons.inc +++ b/blocks/html/serviceButtons.inc @@ -3,7 +3,7 @@ * Renders buttons for each of the known output formats, pointing to the current URL * * @copyright 2010 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ $serviceURL = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']); diff --git a/blocks/html/users/addUserForm.inc b/blocks/html/users/addUserForm.inc index b46c645..cd21b56 100644 --- a/blocks/html/users/addUserForm.inc +++ b/blocks/html/users/addUserForm.inc @@ -1,7 +1,7 @@ */ ?> diff --git a/blocks/html/users/updateUserForm.inc b/blocks/html/users/updateUserForm.inc index 36d0be5..75e7769 100644 --- a/blocks/html/users/updateUserForm.inc +++ b/blocks/html/users/updateUserForm.inc @@ -1,7 +1,7 @@ * @param User $this->user */ diff --git a/blocks/html/users/userList.inc b/blocks/html/users/userList.inc index ce8b4f4..c82af03 100644 --- a/blocks/html/users/userList.inc +++ b/blocks/html/users/userList.inc @@ -1,7 +1,7 @@ * @param UserList $this->userList */ diff --git a/blocks/json/cemeteries/cemeteryInfo.inc b/blocks/json/cemeteries/cemeteryInfo.inc index dddcddc..97a9e6d 100644 --- a/blocks/json/cemeteries/cemeteryInfo.inc +++ b/blocks/json/cemeteries/cemeteryInfo.inc @@ -1,7 +1,7 @@ * @param Cemetery $this->cemetery */ diff --git a/blocks/json/cemeteries/cemeteryList.inc b/blocks/json/cemeteries/cemeteryList.inc index 16233f0..da987d3 100644 --- a/blocks/json/cemeteries/cemeteryList.inc +++ b/blocks/json/cemeteries/cemeteryList.inc @@ -1,7 +1,7 @@ */ $cemeteries = array(); diff --git a/blocks/json/interments/intermentList.inc b/blocks/json/interments/intermentList.inc index 0379d91..439a66a 100644 --- a/blocks/json/interments/intermentList.inc +++ b/blocks/json/interments/intermentList.inc @@ -1,7 +1,7 @@ * @param IntermentList $this->intermentList * @param GET sort diff --git a/blocks/xml/cemeteries/cemeteryInfo.inc b/blocks/xml/cemeteries/cemeteryInfo.inc index 2920f80..3d53f83 100644 --- a/blocks/xml/cemeteries/cemeteryInfo.inc +++ b/blocks/xml/cemeteries/cemeteryInfo.inc @@ -1,7 +1,7 @@ * @param Cemetery $this->cemetery */ diff --git a/blocks/xml/cemeteries/cemeteryList.inc b/blocks/xml/cemeteries/cemeteryList.inc index b5d02e5..7deca78 100644 --- a/blocks/xml/cemeteries/cemeteryList.inc +++ b/blocks/xml/cemeteries/cemeteryList.inc @@ -2,7 +2,7 @@ */ foreach ($this->cemeteryList as $cemetery) { diff --git a/blocks/xml/interments/intermentList.inc b/blocks/xml/interments/intermentList.inc index 933c4a4..85afda7 100644 --- a/blocks/xml/interments/intermentList.inc +++ b/blocks/xml/interments/intermentList.inc @@ -2,7 +2,7 @@ * @param IntermentList $this->intermentList * @param GET sort diff --git a/classes/Cemetery.php b/classes/Cemetery.php index ae869bc..58e6750 100644 --- a/classes/Cemetery.php +++ b/classes/Cemetery.php @@ -1,7 +1,7 @@ */ class Cemetery diff --git a/classes/CemeteryList.php b/classes/CemeteryList.php index 42f45c0..aaa50f5 100644 --- a/classes/CemeteryList.php +++ b/classes/CemeteryList.php @@ -13,7 +13,7 @@ */ /** * @copyright 2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ class CemeteryList extends ZendDbResultIterator diff --git a/classes/Deed.php b/classes/Deed.php index 3f8e997..b640639 100644 --- a/classes/Deed.php +++ b/classes/Deed.php @@ -1,7 +1,7 @@ */ class Deed diff --git a/classes/DeedList.php b/classes/DeedList.php index 0b78e6d..9970106 100644 --- a/classes/DeedList.php +++ b/classes/DeedList.php @@ -13,7 +13,7 @@ */ /** * @copyright 2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ class DeedList extends ZendDbResultIterator diff --git a/classes/Interment.php b/classes/Interment.php index 2b433c3..1c7991c 100644 --- a/classes/Interment.php +++ b/classes/Interment.php @@ -1,7 +1,7 @@ */ class Interment diff --git a/classes/IntermentList.php b/classes/IntermentList.php index e59c527..f3d2d09 100644 --- a/classes/IntermentList.php +++ b/classes/IntermentList.php @@ -12,7 +12,7 @@ * of whatever extra $fields you need * * @copyright 2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ class IntermentList extends ZendDbResultIterator diff --git a/classes/Map.php b/classes/Map.php index c9cb960..16a2b95 100644 --- a/classes/Map.php +++ b/classes/Map.php @@ -1,7 +1,7 @@ */ class Map diff --git a/classes/Person.php b/classes/Person.php index 21252d4..1aef596 100644 --- a/classes/Person.php +++ b/classes/Person.php @@ -1,7 +1,7 @@ */ class Person diff --git a/classes/PersonList.php b/classes/PersonList.php index 9a1f093..da71fc1 100644 --- a/classes/PersonList.php +++ b/classes/PersonList.php @@ -3,7 +3,7 @@ * A collection class for Person objects * * @copyright 2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ class PersonList extends ZendDbResultIterator diff --git a/classes/Role.php b/classes/Role.php index a320664..f535eb6 100644 --- a/classes/Role.php +++ b/classes/Role.php @@ -1,7 +1,7 @@ */ class Role diff --git a/classes/RoleList.php b/classes/RoleList.php index 52af461..e70d8b7 100644 --- a/classes/RoleList.php +++ b/classes/RoleList.php @@ -1,7 +1,7 @@ */ class RoleList extends ZendDbResultIterator diff --git a/classes/Section.php b/classes/Section.php index 5efa799..f041361 100644 --- a/classes/Section.php +++ b/classes/Section.php @@ -1,7 +1,7 @@ */ class Section diff --git a/classes/SectionList.php b/classes/SectionList.php index a7525d0..48968cc 100644 --- a/classes/SectionList.php +++ b/classes/SectionList.php @@ -12,7 +12,7 @@ * of whatever extra $fields you need * * @copyright 2010 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ class SectionList extends ZendDbResultIterator diff --git a/classes/User.php b/classes/User.php index dcb4cef..f8c4b3f 100644 --- a/classes/User.php +++ b/classes/User.php @@ -1,7 +1,7 @@ */ class User extends SystemUser diff --git a/classes/UserList.php b/classes/UserList.php index acc9f31..a6ecca6 100644 --- a/classes/UserList.php +++ b/classes/UserList.php @@ -12,7 +12,7 @@ * of whatever extra $fields you need * * @copyright 2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ class UserList extends ZendDbResultIterator diff --git a/configuration.inc.default b/configuration.inc.default index 6faffc8..e86ff46 100644 --- a/configuration.inc.default +++ b/configuration.inc.default @@ -5,7 +5,7 @@ */ define('COPYRIGHT',"/** * @copyright 2007-2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */"); /** diff --git a/html/cemeteries/addCemetery.php b/html/cemeteries/addCemetery.php index f97e3e7..0936ddd 100644 --- a/html/cemeteries/addCemetery.php +++ b/html/cemeteries/addCemetery.php @@ -1,7 +1,7 @@ */ if (!userIsAllowed('Cemeteries')) { diff --git a/html/cemeteries/home.php b/html/cemeteries/home.php index ef939b2..ace4835 100644 --- a/html/cemeteries/home.php +++ b/html/cemeteries/home.php @@ -1,7 +1,7 @@ */ $cemeteryList = new CemeteryList(); diff --git a/html/cemeteries/updateCemetery.php b/html/cemeteries/updateCemetery.php index c0efdc1..7a5b0b4 100644 --- a/html/cemeteries/updateCemetery.php +++ b/html/cemeteries/updateCemetery.php @@ -1,7 +1,7 @@ */ if (!userIsAllowed('Cemeteries')) { diff --git a/html/cemeteries/viewCemetery.php b/html/cemeteries/viewCemetery.php index fa1078b..81c48d0 100644 --- a/html/cemeteries/viewCemetery.php +++ b/html/cemeteries/viewCemetery.php @@ -1,7 +1,7 @@ * @param $_GET cemetery_id * @param $_GET section (optional) diff --git a/html/deeds/addDeed.php b/html/deeds/addDeed.php index 301c866..e26d65a 100644 --- a/html/deeds/addDeed.php +++ b/html/deeds/addDeed.php @@ -1,7 +1,7 @@ */ if (!userIsAllowed('Deeds')) { diff --git a/html/deeds/deleteDeed.php b/html/deeds/deleteDeed.php index ea3bf40..ea51e31 100644 --- a/html/deeds/deleteDeed.php +++ b/html/deeds/deleteDeed.php @@ -1,7 +1,7 @@ * @param GET deed_id * @param GET return_url diff --git a/html/deeds/home.php b/html/deeds/home.php index add0f55..8894ab6 100644 --- a/html/deeds/home.php +++ b/html/deeds/home.php @@ -1,7 +1,7 @@ */ $currentPage = isset($_GET['page']) ? (int)$_GET['page'] : 1; diff --git a/html/deeds/updateDeed.php b/html/deeds/updateDeed.php index afb75dd..b8679d4 100644 --- a/html/deeds/updateDeed.php +++ b/html/deeds/updateDeed.php @@ -1,7 +1,7 @@ */ diff --git a/html/home.php b/html/home.php index 5bf5613..7dc0c9a 100644 --- a/html/home.php +++ b/html/home.php @@ -1,7 +1,7 @@ */ include APPLICATION_HOME.'/html/interments/home.php'; \ No newline at end of file diff --git a/html/interments/addInterment.php b/html/interments/addInterment.php index 943fbe5..cffe36d 100644 --- a/html/interments/addInterment.php +++ b/html/interments/addInterment.php @@ -1,7 +1,7 @@ * @param REQUEST return_url */ diff --git a/html/interments/deleteInterment.php b/html/interments/deleteInterment.php index 2ccce84..492ea1f 100644 --- a/html/interments/deleteInterment.php +++ b/html/interments/deleteInterment.php @@ -1,7 +1,7 @@ * @param GET interment_id * @param GET return_url diff --git a/html/interments/home.php b/html/interments/home.php index 7d29f84..0424c18 100644 --- a/html/interments/home.php +++ b/html/interments/home.php @@ -1,7 +1,7 @@ */ $knownFields = array('lastname','firstname','cemetery_id','section_id','lot'); diff --git a/html/interments/maps.php b/html/interments/maps.php index 3da2f82..cb7dba3 100644 --- a/html/interments/maps.php +++ b/html/interments/maps.php @@ -1,7 +1,7 @@ * @param GET interment_id */ diff --git a/html/interments/updateInterment.php b/html/interments/updateInterment.php index 66a0957..1444c49 100644 --- a/html/interments/updateInterment.php +++ b/html/interments/updateInterment.php @@ -1,7 +1,7 @@ * @param REQUEST return_url */ diff --git a/html/interments/viewInterment.php b/html/interments/viewInterment.php index d29934a..20c21e5 100644 --- a/html/interments/viewInterment.php +++ b/html/interments/viewInterment.php @@ -1,7 +1,7 @@ * @param GET interment_id */ diff --git a/html/js/functions.js b/html/js/functions.js index 3648d54..fce07f7 100644 --- a/html/js/functions.js +++ b/html/js/functions.js @@ -1,6 +1,6 @@ /** * @copyright 2010 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ var COB = {}; diff --git a/html/login/home.php b/html/login/home.php index 96aef62..bd5a51e 100644 --- a/html/login/home.php +++ b/html/login/home.php @@ -3,7 +3,7 @@ * Logs a user into the system using CAS * * @copyright 2006-2010 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ if (isset($_REQUEST['return_url'])) { diff --git a/html/login/login.php b/html/login/login.php index 642bdd0..c7f1bc3 100644 --- a/html/login/login.php +++ b/html/login/login.php @@ -3,7 +3,7 @@ * Logs a user into the system using this application's internal authentication * * @copyright 2006-2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ try { diff --git a/html/login/logout.php b/html/login/logout.php index ccf3f1c..20263c8 100644 --- a/html/login/logout.php +++ b/html/login/logout.php @@ -3,7 +3,7 @@ * Logs a user out of the system * * @copyright 2008-2010 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ if (isset($_COOKIE[CAS_COOKIE])) { diff --git a/html/people/addPerson.php b/html/people/addPerson.php index 4c6a84d..4107951 100644 --- a/html/people/addPerson.php +++ b/html/people/addPerson.php @@ -1,7 +1,7 @@ */ if (!userIsAllowed('Users')) { diff --git a/html/people/home.php b/html/people/home.php index 6c06cfd..8254c53 100644 --- a/html/people/home.php +++ b/html/people/home.php @@ -1,7 +1,7 @@ */ if (!userIsAllowed('Users')) { diff --git a/html/people/updatePerson.php b/html/people/updatePerson.php index b90d7a3..f0920da 100644 --- a/html/people/updatePerson.php +++ b/html/people/updatePerson.php @@ -1,7 +1,7 @@ * @param Request person_id */ diff --git a/html/people/viewPerson.php b/html/people/viewPerson.php index d5c9be6..5fdaeca 100644 --- a/html/people/viewPerson.php +++ b/html/people/viewPerson.php @@ -1,7 +1,7 @@ * @param GET person_id */ diff --git a/html/sections/addSection.php b/html/sections/addSection.php index 31226a7..85ce52b 100644 --- a/html/sections/addSection.php +++ b/html/sections/addSection.php @@ -1,7 +1,7 @@ * @param REQUEST cemetery_id */ diff --git a/html/sections/updateSection.php b/html/sections/updateSection.php index 89fce2e..c930ac5 100644 --- a/html/sections/updateSection.php +++ b/html/sections/updateSection.php @@ -1,7 +1,7 @@ * @param GET section_id */ diff --git a/html/services/home.php b/html/services/home.php index d3f8297..6eb242f 100644 --- a/html/services/home.php +++ b/html/services/home.php @@ -1,7 +1,7 @@ */ $template = new Template(); diff --git a/html/users/addUser.php b/html/users/addUser.php index 51049da..9012b73 100644 --- a/html/users/addUser.php +++ b/html/users/addUser.php @@ -1,7 +1,7 @@ * @param GET person_id */ diff --git a/html/users/deleteUser.php b/html/users/deleteUser.php index ed42225..8d12d6b 100644 --- a/html/users/deleteUser.php +++ b/html/users/deleteUser.php @@ -1,7 +1,7 @@ * @param GET user_id */ diff --git a/html/users/home.php b/html/users/home.php index dd361d4..601752a 100644 --- a/html/users/home.php +++ b/html/users/home.php @@ -1,7 +1,7 @@ */ if (!userIsAllowed('Users')) { diff --git a/html/users/updateUser.php b/html/users/updateUser.php index 5c212d3..e97aeb9 100644 --- a/html/users/updateUser.php +++ b/html/users/updateUser.php @@ -1,7 +1,7 @@ * @param REQUEST user_id */ diff --git a/libraries/framework/blocks/html/pageNavigation.inc b/libraries/framework/blocks/html/pageNavigation.inc index 5555a8f..1609bdc 100644 --- a/libraries/framework/blocks/html/pageNavigation.inc +++ b/libraries/framework/blocks/html/pageNavigation.inc @@ -1,7 +1,7 @@ * @param Zend_Paginator $this->pages */ diff --git a/libraries/framework/classes/Block.php b/libraries/framework/classes/Block.php index ab4974a..48688b5 100644 --- a/libraries/framework/classes/Block.php +++ b/libraries/framework/classes/Block.php @@ -10,7 +10,7 @@ * APPLICATION_HOME/blocks/json/.. * * @copyright 2006-2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ class Block extends View diff --git a/libraries/framework/classes/Database.php b/libraries/framework/classes/Database.php index 9e775cc..7ee6d50 100644 --- a/libraries/framework/classes/Database.php +++ b/libraries/framework/classes/Database.php @@ -3,7 +3,7 @@ * Singleton for the Database connection * * @copyright 2006-2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ class Database diff --git a/libraries/framework/classes/Date.php b/libraries/framework/classes/Date.php index d005539..6727501 100644 --- a/libraries/framework/classes/Date.php +++ b/libraries/framework/classes/Date.php @@ -1,7 +1,7 @@ */ class Date extends DateTime diff --git a/libraries/framework/classes/ExternalAuthentication.php b/libraries/framework/classes/ExternalAuthentication.php index 50828e9..efe063e 100644 --- a/libraries/framework/classes/ExternalAuthentication.php +++ b/libraries/framework/classes/ExternalAuthentication.php @@ -1,7 +1,7 @@ */ diff --git a/libraries/framework/classes/Inflector.php b/libraries/framework/classes/Inflector.php index b14d4bf..ac379b0 100644 --- a/libraries/framework/classes/Inflector.php +++ b/libraries/framework/classes/Inflector.php @@ -26,7 +26,7 @@ * Relicensed under GPL * Redistributions must retain all copyright notices * @copyright 2006-2008 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt */ class Inflector { diff --git a/libraries/framework/classes/LDAP.php b/libraries/framework/classes/LDAP.php index 42d4ac5..8b11523 100644 --- a/libraries/framework/classes/LDAP.php +++ b/libraries/framework/classes/LDAP.php @@ -1,7 +1,7 @@ */ class LDAP implements ExternalAuthentication diff --git a/libraries/framework/classes/LDAPEntry.php b/libraries/framework/classes/LDAPEntry.php index f544aad..a7477bf 100644 --- a/libraries/framework/classes/LDAPEntry.php +++ b/libraries/framework/classes/LDAPEntry.php @@ -8,7 +8,7 @@ * the fields used in this class. * * @copyright 2006-2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ class LDAPEntry diff --git a/libraries/framework/classes/Paginator.php b/libraries/framework/classes/Paginator.php index 9b3c199..b7a328f 100644 --- a/libraries/framework/classes/Paginator.php +++ b/libraries/framework/classes/Paginator.php @@ -3,7 +3,7 @@ * Takes an array and splits it up into pages (an array of arrays) * * @copyright 2008-2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ class Paginator implements ArrayAccess,SeekableIterator,Countable diff --git a/libraries/framework/classes/SystemUser.php b/libraries/framework/classes/SystemUser.php index 61d6d68..925746c 100644 --- a/libraries/framework/classes/SystemUser.php +++ b/libraries/framework/classes/SystemUser.php @@ -7,7 +7,7 @@ * Applications should use these public functions for their own users. * * @copyright 2006-2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ abstract class SystemUser diff --git a/libraries/framework/classes/Template.php b/libraries/framework/classes/Template.php index 04d0a01..e189311 100644 --- a/libraries/framework/classes/Template.php +++ b/libraries/framework/classes/Template.php @@ -5,7 +5,7 @@ * The template collects all the blocks from the controller * * @copyright 2006-2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ class Template extends View diff --git a/libraries/framework/classes/URL.php b/libraries/framework/classes/URL.php index fab4d76..89088b3 100644 --- a/libraries/framework/classes/URL.php +++ b/libraries/framework/classes/URL.php @@ -8,7 +8,7 @@ * echo $url->getURL(); * * @copyright 2006-2009 City of Bloomington, Indiana. - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ class URL diff --git a/libraries/framework/classes/View.php b/libraries/framework/classes/View.php index e122b95..3fd43bc 100644 --- a/libraries/framework/classes/View.php +++ b/libraries/framework/classes/View.php @@ -1,7 +1,7 @@ */ abstract class View diff --git a/libraries/framework/classes/ZendDbResultIterator.php b/libraries/framework/classes/ZendDbResultIterator.php index 9bb8a2d..e97344c 100644 --- a/libraries/framework/classes/ZendDbResultIterator.php +++ b/libraries/framework/classes/ZendDbResultIterator.php @@ -1,7 +1,7 @@ * */ diff --git a/libraries/framework/errorMessages.php b/libraries/framework/errorMessages.php index c9ac474..1e989ec 100644 --- a/libraries/framework/errorMessages.php +++ b/libraries/framework/errorMessages.php @@ -1,7 +1,7 @@ */ if (isset($_SESSION['errorMessages'])) { diff --git a/libraries/framework/globalFunctions.php b/libraries/framework/globalFunctions.php index f934dbb..9b0a131 100644 --- a/libraries/framework/globalFunctions.php +++ b/libraries/framework/globalFunctions.php @@ -2,7 +2,7 @@ /** * Global, shared functions for all PHP web applications * @copyright 2006-2009 City of Bloomington, Indiana. - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham * @package GlobalFunctions */ diff --git a/libraries/framework/inflections.inc b/libraries/framework/inflections.inc index 00739dc..c89f8b1 100644 --- a/libraries/framework/inflections.inc +++ b/libraries/framework/inflections.inc @@ -21,7 +21,7 @@ * Relicensed under GPL * Redistributions must retain all copyright notices * @copyright 2006 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt */ /** * This is a key => value array of regex used to match words. diff --git a/scripts/generateBlocks.php b/scripts/generateBlocks.php index afef13b..94e3c66 100644 --- a/scripts/generateBlocks.php +++ b/scripts/generateBlocks.php @@ -1,7 +1,7 @@ */ include '../configuration.inc'; diff --git a/scripts/generateClasses.php b/scripts/generateClasses.php index b59b740..177bc6c 100644 --- a/scripts/generateClasses.php +++ b/scripts/generateClasses.php @@ -3,7 +3,7 @@ * Generates ActiveRecord class files for each of the database tables * * @copyright 2006-2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ include '../configuration.inc'; diff --git a/scripts/generateControllers.php b/scripts/generateControllers.php index 522a041..cb6e98b 100644 --- a/scripts/generateControllers.php +++ b/scripts/generateControllers.php @@ -1,7 +1,7 @@ */ include '../configuration.inc'; diff --git a/scripts/generateLists.php b/scripts/generateLists.php index 72f4ca8..0d03d30 100644 --- a/scripts/generateLists.php +++ b/scripts/generateLists.php @@ -3,7 +3,7 @@ * Generates a Collection class for each the ActiveRecord objects * * @copyright 2006-2009 City of Bloomington, Indiana - * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt + * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt * @author Cliff Ingham */ include '../configuration.inc'; diff --git a/scripts/generateTests.php b/scripts/generateTests.php index 392b739..faf0723 100644 --- a/scripts/generateTests.php +++ b/scripts/generateTests.php @@ -1,7 +1,7 @@ */ include '../configuration.inc';