Shout: Fix licensing and copyright across application

diff --git a/shout/COPYING b/shout/COPYING
new file mode 100644 (file)
index 0000000..25e7105
--- /dev/null
+++ b/shout/COPYING
@@ -0,0 +1,25 @@
+Copyright (c) 2005-2009, Alkaloid Networks LLC
+All rights reserved.
+
+Redistribution and use 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 the Alkaloid Networks LLC nor the names of its
+      contributors may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+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
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

diff --git a/shout/config/conf.xml b/shout/config/conf.xml
index 3175115..d158a92 100644 (file)
--- a/shout/config/conf.xml
+++ b/shout/config/conf.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0"?>
-<!-- $Id$ -->
+<!--
+ * conf.xml defines the configuration parameters for Shout.
+ *
+ * Copyright 2005-2010 Alkaloid Networks LLC (http://projects.alkaloid.net)
+ *
+ * See the enclosed file COPYING for license information (BSD). If you
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.php.
+ *
+ * @author  Ben Klang <ben@alkaloid.net>
+ * @since   Shout 0.1
+ * @package Shout
+-->
 <configuration>
  <configtab name="storage" desc="Storage">
   <configsection name="storage">

diff --git a/shout/devices.php b/shout/devices.php
index 14d1587..3a2ec55 100644 (file)
--- a/shout/devices.php
+++ b/shout/devices.php
@@ -1,9 +1,12 @@
 <?php
 /**
- * Copyright 2009 Ben Klang <ben@alkaloid.net>
+ * Copyright 2009-2010 Alkaloid Networks LLC (http://projects.alkaloid.net)
  *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ * See the enclosed file COPYING for license information (BSD). If you
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.php.
+ *
+ * @author  Ben Klang <ben@alkaloid.net>
  */
 @define('SHOUT_BASE', dirname(__FILE__));
 require_once SHOUT_BASE . '/lib/base.php';

diff --git a/shout/extensions.php b/shout/extensions.php
index 7368281..48a7f73 100644 (file)
--- a/shout/extensions.php
+++ b/shout/extensions.php
@@ -1,11 +1,12 @@
 <?php
 /**
- * $Id$
+ * Copyright 2005-2010 Alkaloid Networks LLC (http://projects.alkaloid.net)
  *
- * Copyright 2005-2009 Ben Klang <ben@alkaloid.net>
+ * See the enclosed file COPYING for license information (BSD). If you
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.php.
  *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ * @author  Ben Klang <ben@alkaloid.net>
  */
 @define('SHOUT_BASE', dirname(__FILE__));
 require_once SHOUT_BASE . '/lib/base.php';

diff --git a/shout/index.php b/shout/index.php
index 4097661..ef712e0 100644 (file)
--- a/shout/index.php
+++ b/shout/index.php
@@ -1,15 +1,13 @@
 <?php
 /**
- * $Id$
+ * Copyright 2005-2010 Alkaloid Networks LLC (http://projects.alkaloid.net)
  *
- * Copyright 2005-2006 Ben Klang <ben@alkaloid.net>
+ * See the enclosed file COPYING for license information (BSD). If you
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.php.
  *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- *
- * @package shout
+ * @author  Ben Klang <ben@alkaloid.net>
  */
-
 @define('SHOUT_BASE', dirname(__FILE__));
 $shout_configured = (is_readable(SHOUT_BASE . '/config/conf.php'));
 

diff --git a/shout/lib/Application.php b/shout/lib/Application.php
index acf63fb..069c8ba 100644 (file)
--- a/shout/lib/Application.php
+++ b/shout/lib/Application.php
@@ -1,19 +1,17 @@
 <?php
 /**
- * Vilma application interface.
+ * Shout application interface.
  *
- * This file defines Vilma's application interface.
+ * This file defines Shout's application interface.
  *
- * Copyright 2006-2010 Alkaloid Networks <http://www.alkaloid.net/>
+ * Copyright 2006-2010 Alkaloid Networks (http://projects.alkaloid.net/)
  *
  * See the enclosed file LICENSE for license information (BSD). If you did not
- * did not receive this file, see http://cvs.horde.org/co.php/vilma/LICENSE.
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- *
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.html.
+ * 
  * @author  Ben Klang <ben@alkaloid.net>
- * @package Vilma
+ * @package Shout
  */
 define('SHOUT_BASE', dirname(__FILE__) . '/..');
 

diff --git a/shout/lib/Driver.php b/shout/lib/Driver.php
index 6eac8df..4e81157 100644 (file)
--- a/shout/lib/Driver.php
+++ b/shout/lib/Driver.php
@@ -2,15 +2,13 @@
 /**
  * Shout_Driver:: defines an API for implementing storage backends for Shout.
  *
- * $Id$
+ * Copyright 2005-2010 Alkaloid Networks LLC (http://projects.alkaloid.net)
  *
- * Copyright 2005-2009 Ben Klang <ben@alkaloid.net>
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ * See the enclosed file COPYING for license information (BSD). If you
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.php.
  *
  * @author  Ben Klang <ben@alkaloid.net>
- * @version $Revision: 76 $
  * @since   Shout 0.1
  * @package Shout
  */

diff --git a/shout/lib/Driver/Ldap.php b/shout/lib/Driver/Ldap.php
index 3414a23..6ce248c 100644 (file)
--- a/shout/lib/Driver/Ldap.php
+++ b/shout/lib/Driver/Ldap.php
@@ -1,4 +1,17 @@
 <?php
+/**
+ * Provides the LDAP backend driver for the Shout application.
+ *
+ * Copyright 2005-2010 Alkaloid Networks LLC (http://projects.alkaloid.net)
+ *
+ * See the enclosed file COPYING for license information (BSD). If you
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.php.
+ *
+ * @author  Ben Klang <ben@alkaloid.net>
+ * @since   Shout 0.1
+ * @package Shout
+ */
 
 class Shout_Driver_Ldap extends Shout_Driver
 {

diff --git a/shout/lib/Driver/Sql.php b/shout/lib/Driver/Sql.php
index 5ee6468..4dead64 100644 (file)
--- a/shout/lib/Driver/Sql.php
+++ b/shout/lib/Driver/Sql.php
@@ -1,4 +1,18 @@
 <?php
+/**
+ * Provides the SQL backend driver for the Shout application.
+ *
+ * Copyright 2009-2010 Alkaloid Networks LLC (http://projects.alkaloid.net)
+ *
+ * See the enclosed file COPYING for license information (BSD). If you
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.php.
+ *
+ * @author  Ben Klang <ben@alkaloid.net>
+ * @since   Shout 0.1
+ * @package Shout
+ */
+
 
 class Shout_Driver_Sql extends Shout_Driver
 {

diff --git a/shout/lib/Forms/DeviceForm.php b/shout/lib/Forms/DeviceForm.php
index 0ebd467..ad8f636 100644 (file)
--- a/shout/lib/Forms/DeviceForm.php
+++ b/shout/lib/Forms/DeviceForm.php
@@ -2,10 +2,11 @@
 /**
  * $Id: ExtensionForm.php 502 2009-12-21 04:01:12Z bklang $
  *
- * Copyright 2005-2009 Ben Klang <ben@alkaloid.net>
+ * Copyright 2005-2010 Alkaloid Networks LLC (http://projects.alkaloid.net)
  *
- * See the enclosed file LICENSE for license information (GPL). If you
- * did not receive this file, see http://www.horde.org/licenses/gpl.php.
+ * See the enclosed file LICENSE for license information (BSD). If you
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.php.
  *
  * @package Shout
  */

diff --git a/shout/lib/Forms/ExtensionForm.php b/shout/lib/Forms/ExtensionForm.php
index 83efbe2..20da7a8 100644 (file)
--- a/shout/lib/Forms/ExtensionForm.php
+++ b/shout/lib/Forms/ExtensionForm.php
@@ -2,11 +2,13 @@
 /**
  * $Id$
  *
- * Copyright 2005-2009 Ben Klang <ben@alkaloid.net>
+ * Copyright 2005-2009 Alkaloid Networks LLC (http://projects.alkaloid.net)
  *
- * See the enclosed file LICENSE for license information (GPL). If you
- * did not receive this file, see http://www.horde.org/licenses/gpl.php.
+ * See the enclosed file LICENSE for license information (BSD). If you
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.php.
  *
+ * @author Ben Klang <ben@alkaloid.net>
  * @package Shout
  */
 

diff --git a/shout/lib/Shout.php b/shout/lib/Shout.php
index 09edcb6..c769012 100644 (file)
--- a/shout/lib/Shout.php
+++ b/shout/lib/Shout.php
@@ -1,20 +1,17 @@
 <?php
 /**
- * Shout:: defines an set of classes for the Shout application.
+ * Shout:: defines an set of utility methods for the Shout application.
  *
- * $Id$
+ * Copyright 2005-2010 Alkaloid Networks LLC (http://projects.alkaloid.net)
  *
- * Copyright 2005 Ben Klang <ben@alkaloid.net>
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ * See the enclosed file COPYING for license information (BSD). If you
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.php.
  *
  * @author  Ben Klang <ben@alkaloid.net>
- * @version $Revision: 94 $
  * @since   Shout 0.1
  * @package Shout
  */
-
 class Shout
 {
     var $applist = array();

diff --git a/shout/lib/base.php b/shout/lib/base.php
index a086cca..d3e2737 100644 (file)
--- a/shout/lib/base.php
+++ b/shout/lib/base.php
@@ -2,10 +2,15 @@
 /**
  * Shout base inclusion file.
  *
- * $Id$
+ * Copyright 2005-2010 Alkaloid Networks LLC (http://projects.alkaloid.net)
  *
- * This file brings in all of the dependencies that every Shout
- * script will need and sets up objects that all scripts use.
+ * See the enclosed file COPYING for license information (BSD). If you
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.php.
+ *
+ * @author  Ben Klang <ben@alkaloid.net>
+ * @since   Shout 0.1
+ * @package Shout
  */
 
 if (!defined('SHOUT_BASE')) {

diff --git a/shout/themes/screen.css b/shout/themes/screen.css
index 082ac57..bc062c4 100644 (file)
--- a/shout/themes/screen.css
+++ b/shout/themes/screen.css
@@ -1,3 +1,19 @@
+/**
+ * screen.css defines the styles needed by Shout.
+ *
+ * Copyright 2005-2010 Alkaloid Networks LLC (http://projects.alkaloid.net)
+ *
+ * See the enclosed file COPYING for license information (BSD). If you
+ * did not receive this file, see
+ * http://www.opensource.org/licenses/bsd-license.php.
+ *
+ * @author  Ben Klang <ben@alkaloid.net>
+ * @since   Shout 0.1
+ * @package Shout
+ */
+
+
+
 table {
     width: 100%;
 }
@@ -41,6 +57,11 @@ table {
     left: 24px;
 }
 
+a.addDest
+{
+    font-style: italic;
+}
+
 #extensionDetail {
     left: 200px;
     position: absolute;