Permalink
Browse files

Updated license statements to reflect change to GNU GPLv3 with an exc…

…eption.
  • Loading branch information...
1 parent dbe8e97 commit 8c9a1a5638366ba8f3dcb1eaf68df7a25b801758 martijn.niji@gmail.com committed Apr 26, 2009
Showing with 1,778 additions and 1,061 deletions.
  1. +21 −15 admin/index.php
  2. +20 −15 admin/javascripts/frog.js
  3. +20 −15 admin/stylesheets/admin.css
  4. +20 −15 admin/stylesheets/login.css
  5. +20 −15 admin/stylesheets/toolbar.css
  6. +20 −15 admin/themes/black_and_white/styles.css
  7. +20 −15 admin/themes/default/styles.css
  8. +58 −0 exception.txt
  9. +17 −10 frog/Framework.php
  10. +13 −8 frog/app/classes/Page.php
  11. +16 −10 frog/app/controllers/LayoutController.php
  12. +17 −10 frog/app/controllers/LoginController.php
  13. +17 −10 frog/app/controllers/PageController.php
  14. +17 −10 frog/app/controllers/PluginController.php
  15. +17 −10 frog/app/controllers/SettingController.php
  16. +16 −10 frog/app/controllers/SnippetController.php
  17. +16 −10 frog/app/controllers/TranslateController.php
  18. +17 −10 frog/app/controllers/UserController.php
  19. +13 −8 frog/app/main.php
  20. +17 −10 frog/app/models/AuthUser.php
  21. +16 −10 frog/app/models/Behavior.php
  22. +16 −10 frog/app/models/Filter.php
  23. +16 −10 frog/app/models/Layout.php
  24. +17 −10 frog/app/models/Page.php
  25. +16 −10 frog/app/models/PagePart.php
  26. +16 −10 frog/app/models/PageTag.php
  27. +16 −10 frog/app/models/Permission.php
  28. +17 −10 frog/app/models/Plugin.php
  29. +17 −10 frog/app/models/Setting.php
  30. +16 −10 frog/app/models/Snippet.php
  31. +16 −10 frog/app/models/Tag.php
  32. +16 −10 frog/app/models/User.php
  33. +16 −10 frog/app/models/UserPermission.php
  34. +17 −10 frog/app/views/404.php
  35. +16 −10 frog/app/views/comment/edit.php
  36. +16 −10 frog/app/views/comment/index.php
  37. +16 −10 frog/app/views/comment/sidebar.php
  38. +16 −10 frog/app/views/layout/edit.php
  39. +16 −10 frog/app/views/layout/index.php
  40. +16 −10 frog/app/views/layout/sidebar.php
  41. +16 −10 frog/app/views/login/forgot.php
  42. +17 −10 frog/app/views/login/login.php
  43. +16 −10 frog/app/views/page/children.php
  44. +16 −10 frog/app/views/page/edit.php
  45. +16 −10 frog/app/views/page/index.php
  46. +16 −10 frog/app/views/page/part_edit.php
  47. +16 −10 frog/app/views/setting/index.php
  48. +16 −10 frog/app/views/snippet/edit.php
  49. +16 −10 frog/app/views/snippet/index.php
  50. +16 −10 frog/app/views/snippet/sidebar.php
  51. +16 −10 frog/app/views/translate/core.php
  52. +16 −10 frog/app/views/translate/index.php
  53. +16 −10 frog/app/views/translate/plugins.php
  54. +16 −10 frog/app/views/translate/sidebar.php
  55. +16 −10 frog/app/views/user/edit.php
  56. +16 −10 frog/app/views/user/index.php
  57. +16 −10 frog/app/views/user/sidebar.php
  58. +16 −10 frog/helpers/Email.php
  59. +16 −10 frog/helpers/I18n.php
  60. +20 −1 frog/helpers/Kses.php
  61. +22 −0 frog/helpers/Pagination.php
  62. +15 −10 frog/helpers/Upload.php
  63. +16 −10 frog/helpers/Zip.php
  64. +16 −10 frog/libraries/DoLite.php
  65. +16 −10 frog/libraries/do_lite_drivers/DoMysql.php
  66. +16 −10 frog/libraries/do_lite_drivers/DoPgsql.php
  67. +16 −10 frog/libraries/do_lite_drivers/DoSqlite.php
  68. +16 −10 frog/plugins/archive/archive.php
  69. +16 −10 frog/plugins/archive/index.php
  70. +16 −12 frog/plugins/archive/readme.txt
  71. +17 −10 frog/plugins/comment/Comment.php
  72. +17 −10 frog/plugins/comment/CommentController.php
  73. +17 −10 frog/plugins/comment/enable.php
  74. +17 −10 frog/plugins/comment/image.php
  75. +18 −11 frog/plugins/comment/index.php
  76. +15 −11 frog/plugins/comment/readme.txt
  77. +18 −11 frog/plugins/comment/views/documentation.php
  78. +17 −10 frog/plugins/comment/views/edit.php
  79. +17 −10 frog/plugins/comment/views/index.php
  80. +17 −10 frog/plugins/comment/views/moderation.php
  81. +17 −10 frog/plugins/comment/views/settings.php
  82. +17 −10 frog/plugins/comment/views/sidebar.php
  83. +17 −10 frog/plugins/file_manager/FileManagerController.php
  84. +20 −15 frog/plugins/file_manager/file_manager.js
  85. +17 −10 frog/plugins/file_manager/index.php
  86. +17 −10 frog/plugins/file_manager/views/index.php
  87. +17 −10 frog/plugins/file_manager/views/sidebar.php
  88. +17 −10 frog/plugins/file_manager/views/view.php
  89. +15 −9 frog/plugins/markdown/filter_markdown.php
  90. +16 −10 frog/plugins/markdown/index.php
  91. +17 −12 frog/plugins/markdown/readme.txt
  92. +16 −10 frog/plugins/page_not_found/index.php
  93. +17 −12 frog/plugins/page_not_found/readme.txt
  94. +16 −10 frog/plugins/skeleton/SkeletonController.php
  95. +16 −10 frog/plugins/skeleton/enable.php
  96. +17 −11 frog/plugins/skeleton/index.php
  97. +3 −1 frog/plugins/skeleton/readme.txt
  98. +16 −10 frog/plugins/skeleton/views/documentation.php
  99. +16 −10 frog/plugins/skeleton/views/settings.php
  100. +16 −10 frog/plugins/skeleton/views/sidebar.php
  101. +16 −10 frog/plugins/sqlite3/index.php
  102. +14 −9 frog/plugins/textile/filter_textile.php
  103. +16 −10 frog/plugins/textile/index.php
  104. +13 −8 frog/plugins/textile/readme.txt
  105. +20 −15 frog/utils.php
  106. +3 −2 readme.txt
View
@@ -1,21 +1,27 @@
<?php
/**
- Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
- Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
-
- This program 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.
-
- This program 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
+ * Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
+ * Copyright (C) 2008 Martijn van der Kleijn <martijn.niji@gmail.com>
+ *
+ * This file is part of Frog CMS.
+ *
+ * Frog CMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Frog CMS 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
+ * along with Frog CMS. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Frog CMS has made an exception to the GNU General Public License for plugins.
+ * See exception.txt for details and the full text.
*/
// Constantes --------------------------------------------------------------
@@ -1,20 +1,25 @@
/**
- Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
- Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
-
- This program 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.
-
- This program 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
+ * Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
+ *
+ * This file is part of Frog CMS.
+ *
+ * Frog CMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Frog CMS 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
+ * along with Frog CMS. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Frog CMS has made an exception to the GNU General Public License for plugins.
+ * See exception.txt for details and the full text.
*/
/* String.js ---------------------------------------------------------------*/
@@ -1,20 +1,25 @@
/**
- Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
- Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
-
- This program 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.
-
- This program 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
+ * Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
+ *
+ * This file is part of Frog CMS.
+ *
+ * Frog CMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Frog CMS 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
+ * along with Frog CMS. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Frog CMS has made an exception to the GNU General Public License for plugins.
+ * See exception.txt for details and the full text.
*/
/* Reset ------------------------------------------------------------------ */
@@ -1,20 +1,25 @@
/**
- Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
- Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
-
- This program 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.
-
- This program 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
+ * Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
+ *
+ * This file is part of Frog CMS.
+ *
+ * Frog CMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Frog CMS 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
+ * along with Frog CMS. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Frog CMS has made an exception to the GNU General Public License for plugins.
+ * See exception.txt for details and the full text.
*/
* {
@@ -1,20 +1,25 @@
/**
- Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
- Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
-
- This program 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.
-
- This program 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
+ * Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
+ *
+ * This file is part of Frog CMS.
+ *
+ * Frog CMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Frog CMS 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
+ * along with Frog CMS. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Frog CMS has made an exception to the GNU General Public License for plugins.
+ * See exception.txt for details and the full text.
*/
.filter_toolbar {
@@ -1,20 +1,25 @@
/**
- Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
- Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
-
- This program 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.
-
- This program 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
+ * Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
+ *
+ * This file is part of Frog CMS.
+ *
+ * Frog CMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Frog CMS 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
+ * along with Frog CMS. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Frog CMS has made an exception to the GNU General Public License for plugins.
+ * See exception.txt for details and the full text.
*/
/* General ---------------------------------------------------------------- */
@@ -1,18 +1,23 @@
/**
- Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
- Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
-
- This program 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.
-
- This program 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
+ * Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
+ *
+ * This file is part of Frog CMS.
+ *
+ * Frog CMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Frog CMS 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
+ * along with Frog CMS. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Frog CMS has made an exception to the GNU General Public License for plugins.
+ * See exception.txt for details and the full text.
*/
View
@@ -0,0 +1,58 @@
+ Frog CMS exception to GNU GPL
+ Version 1, 15 April 2009
+
+ Copyright (C) 2009 Philippe Archambault and Martijn van der Kleijn
+ <http://www.madebyfrog.com/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+TERMS AND CONDITIONS
+
+0. Definitions
+
+“The Program” refers to Frog, a PHP-based content management system. It does not
+include the Plugins distributed along with Frog.
+
+“This Exception” refers to version 1 of the Frog CMS exception to the GNU GPL.
+
+“GNU GPL” refers to version 3 of the GNU General Public License.
+
+“A Plugin” refers to a set of files which work together and have the intention
+to extend or modify the behaviour of the Program, and use the Plugin interface
+that is part of the Program.
+
+1. Exceptions
+
+Linking the Program statically or dynamically with Plugins is making a combined
+work based on the Program. Using inheritance to create new functionality such
+as a Plugin is considered to “modify” the Program according to the definitions
+set forth in the GNU GPL.
+
+Thus, the terms and conditions of the GNU GPL cover the whole combination of the
+Program including any Plugins.
+
+As a special exception, the copyright holders of the Program give you permission
+to create Plugins, and to copy and distribute those Plugins under terms of your
+choice, provided that those terms do not place additional restrictions on the
+Plugin or the Program.
+
+The Plugin must include the complete text with the terms that apply to it. The
+Plugin, or the documentation that accompanies it, must always clearly state for
+which version of the Program the Plugin was designed.
+
+2. Termination of the Exception
+
+The Exception is automatically terminated when the copyrights on the Program are
+violated in any manner.
+
+The Exception is automatically terminated when the terms placed on the Plugin
+are more restrictive than the GNU GPL.
+
+This Exception is automatically terminated when the terms placed on the Plugin
+would in any way compromise the validity of the GNU GPL for the Program beyond
+the exceptions listed in this document.
+
+This Exception cannot be used for a Plugin when the intent of the Plugin is to
+remove the code or portions of the code that are part of the Program from under
+the GNU GPL license.
View
@@ -1,20 +1,27 @@
<?php
-/*
+/**
* Frog CMS - Content Management Simplified. <http://www.madebyfrog.com>
+ * Copyright (C) 2008 Philippe Archambault <philippe.archambault@gmail.com>
+ * Copyright (C) 2008 Martijn van der Kleijn <martijn.niji@gmail.com>
+ *
+ * This file is part of Frog CMS.
*
- * This program 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.
+ * Frog CMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * Frog CMS 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 Affero General Public License for more details.
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Frog CMS. If not, see <http://www.gnu.org/licenses/>.
*
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * Frog CMS has made an exception to the GNU General Public License for plugins.
+ * See exception.txt for details and the full text.
*/
/**
@@ -24,7 +31,7 @@
*
* @author Philippe Archambault <philippe.archambault@gmail.com>
* @version 1.6
- * @license http://www.gnu.org/licenses/agpl.html AGPL License
+ * @license http://www.gnu.org/licenses/gpl.html GPL License
* @copyright Philippe Archambault, 2008
*
* @todo Replace the customized Framework with the latest uncustomized Green Framework?
Oops, something went wrong.

0 comments on commit 8c9a1a5

Please sign in to comment.