Merge recent changes from R1 into HEAD

8 files changed, 77 insertions, 16 deletions

diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 905d995..3663e95 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -26,10 +26,10 @@ $tables = array(
 global $gBitInstaller;
 
 foreach( array_keys( $tables ) AS $tableName ) {
-	$gBitInstaller->registerSchemaTable( MESSU_PKG_NAME, $tableName, $tables[$tableName] );
+	$gBitInstaller->registerSchemaTable( MESSAGES_PKG_NAME, $tableName, $tables[$tableName] );
 }
 
-$gBitInstaller->registerPackageInfo( MESSU_PKG_NAME, array(
+$gBitInstaller->registerPackageInfo( MESSAGES_PKG_NAME, array(
 	'description' => "An intra-site messaging system for users.",
 	'license' => '<a href="http://www.gnu.org/licenses/licenses.html#LGPL">LGPL</a>',
 	'version' => '0.1',
@@ -39,8 +39,8 @@ $gBitInstaller->registerPackageInfo( MESSU_PKG_NAME, array(
 
 
 // ### Default User Permissions
-$gBitInstaller->registerUserPermissions( FISHEYE_PKG_NAME, array(
-	array('bit_p_messages', 'Can use the messaging system', 'registered', 'messu'),
+$gBitInstaller->registerUserPermissions( MESSAGES_PKG_NAME, array(
+	array('bit_p_messages', 'Can use the messaging system', 'registered', 'messages'),
 ) );
 
 // ### Indexes
@@ -50,6 +50,6 @@ $indices = array (
 );
 // TODO - SPIDERR - following seems to cause time _decrease_ cause bigint on postgres. need more investigation
 //	'tiki_blog_posts_created_idx' => array( 'table' => 'tiki_blog_posts', 'cols' => 'created', 'opts' => NULL ),
-$gBitInstaller->registerSchemaIndexes( MESSU_PKG_NAME, $indices );
+$gBitInstaller->registerSchemaIndexes( MESSAGES_PKG_NAME, $indices );
 
 ?>
diff --git a/broadcast.php b/broadcast.php
index 27d711d..c18657f 100644
--- a/broadcast.php
+++ b/broadcast.php
@@ -1,10 +1,20 @@
 <?php
-
-// $Header: /cvsroot/bitweaver/_bit_messages/broadcast.php,v 1.1 2005/06/19 04:56:31 bitweaver Exp $
+/**
+* message package modules
+*
+* @author   
+* @version  $Header: /cvsroot/bitweaver/_bit_messages/broadcast.php,v 1.2 2005/06/28 07:45:52 spiderr Exp $
+* @package  messages
+* @subpackage functions
+*/
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+
+/**
+ * required setup
+ */
 require_once( '../bit_setup_inc.php' );
 
 include_once( MESSU_PKG_PATH.'messu_lib.php' );
diff --git a/compose.php b/compose.php
index b10dfbb..08e60c0 100644
--- a/compose.php
+++ b/compose.php
@@ -1,10 +1,20 @@
 <?php
-
-// $Header: /cvsroot/bitweaver/_bit_messages/compose.php,v 1.1 2005/06/19 04:56:31 bitweaver Exp $
+/**
+* message package modules
+*
+* @author   
+* @version  $Header: /cvsroot/bitweaver/_bit_messages/compose.php,v 1.2 2005/06/28 07:45:52 spiderr Exp $
+* @package  messages
+* @subpackage functions
+*/
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+
+/**
+ * required setup
+ */
 require_once( '../bit_setup_inc.php' );
 require_once( MESSU_PKG_PATH.'messu_lib.php' );
 require_once( USERS_PKG_PATH.'BitUser.php' );
diff --git a/contact.php b/contact.php
index 7db2dfb..0b00fa8 100644
--- a/contact.php
+++ b/contact.php
@@ -1,12 +1,20 @@
 <?php
-
-// $Header: /cvsroot/bitweaver/_bit_messages/contact.php,v 1.1 2005/06/19 04:56:31 bitweaver Exp $
+/**
+* message package modules
+*
+* @author   
+* @version  $Header: /cvsroot/bitweaver/_bit_messages/contact.php,v 1.2 2005/06/28 07:45:52 spiderr Exp $
+* @package  messages
+* @subpackage functions
+*/
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 
-// Initialization
+/**
+ * required setup
+ */
 require_once( '../bit_setup_inc.php' );
 
 include_once( MESSU_PKG_PATH.'messu_lib.php' );
diff --git a/icons/pkg_messu.png b/icons/pkg_messages.png
index 280fc92..280fc92 100644
--- a/icons/pkg_messu.png
+++ b/icons/pkg_messages.png
diff --git a/message_box.php b/message_box.php
index faf79bb..82d858f 100644
--- a/message_box.php
+++ b/message_box.php
@@ -1,10 +1,20 @@
 <?php
-
-// $Header: /cvsroot/bitweaver/_bit_messages/message_box.php,v 1.1 2005/06/19 04:56:31 bitweaver Exp $
+/**
+* message package modules
+*
+* @author   
+* @version  $Header: /cvsroot/bitweaver/_bit_messages/message_box.php,v 1.2 2005/06/28 07:45:52 spiderr Exp $
+* @package  messages
+* @subpackage functions
+*/
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+
+/**
+ * required setup
+ */
 require_once( '../bit_setup_inc.php' );
 require_once( MESSU_PKG_PATH.'messu_lib.php' );
 
diff --git a/messu_lib.php b/messu_lib.php
index 0e0d30e..dd26ecf 100644
--- a/messu_lib.php
+++ b/messu_lib.php
@@ -1,5 +1,18 @@
 <?php
+/**
+* message package modules
+*
+* @author   
+* @version  $Revision: 1.2 $
+* @package  messages
+*/
 
+/**
+* Messu base class
+*
+* @package  messages
+* @subpackage  Messu
+*/
 class Messu extends BitBase {
 
 	function Messu() {
diff --git a/read.php b/read.php
index de11603..539011d 100644
--- a/read.php
+++ b/read.php
@@ -1,10 +1,20 @@
 <?php
-
-// $Header: /cvsroot/bitweaver/_bit_messages/read.php,v 1.1 2005/06/19 04:56:31 bitweaver Exp $
+/**
+* message package modules
+*
+* @author   
+* @version  $Header: /cvsroot/bitweaver/_bit_messages/read.php,v 1.2 2005/06/28 07:45:52 spiderr Exp $
+* @package  messages
+* @subpackage functions
+*/
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+
+/**
+ * required setup
+ */
 require_once( '../bit_setup_inc.php' );
 require_once( MESSU_PKG_PATH.'messu_lib.php' );