xoops-svn

[xoops-svn] SF.net SVN: xoops:[9427] XoopsModules/contact/branches/voltan/v1.8/contact

[<vo...@us...>]

Revision: 9427
          http://xoops.svn.sourceforge.net/xoops/?rev=9427&view=rev
Author:   voltan1
Date:     2012-05-03 07:15:56 +0000 (Thu, 03 May 2012)
Log Message:
-----------
Add needed options

Modified Paths:
--------------
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php
    XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
    XoopsModules/contact/branches/voltan/v1.8/contact/language/english/admin.php
    XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php
    XoopsModules/contact/branches/voltan/v1.8/contact/templates/admin/contact_contact.html
    XoopsModules/contact/branches/voltan/v1.8/contact/templates/admin/contact_tools.html
    XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php	2012-05-02 21:29:32 UTC (rev 9426)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php	2012-05-03 07:15:56 UTC (rev 9427)
@@ -82,7 +82,7 @@
          $xoopsTpl->assign('replyform', $form->render());
          $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
       } else {
-         redirect_header ( 'contact.php', 3, _AM_CONTACT_EXIST);
+         redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
       }
       $level = 'reply';
 		break;
@@ -125,12 +125,13 @@
 
 		$level = 'doreply';
 		break;
+		
 	case 'view':
 
 		$obj = $contact_handler->get ( $contact_id );
 		
 		if(!$obj) {
-		  redirect_header ( 'contact.php', 3, _AM_CONTACT_EXIST);
+		  redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
 		  exit ();
 		}
 		
@@ -158,16 +159,41 @@
       
 		$level = 'view';
 		break;
-		
-	case 'edit':
-
-		$level = 'edit';
-		break;
 	
 	case 'delete':
+	
+		if ($contact_id > 0) {
+			// Prompt message
+			xoops_confirm(array("id" => $contact_id), 'contact.php?op=dodelete', _AM_CONTACT_MSG_DELETE);
+		} else {
+		   redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+		}	
 
 		$level = 'delete';
-		break;				
+		break;
+		
+	case 'dodelete':
+      
+      if (!$contact_id > 0) {
+			redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+			xoops_cp_footer ();
+			exit ();
+		}
+		
+		$criteria = new CriteriaCompo ();
+		$criteria->add ( new Criteria ( 'contact_id', $contact_id ) );
+		$criteria->add ( new Criteria ( 'contact_cid', $contact_id ), 'OR' );
+
+		if (! $contact_handler->deleteAll($criteria)) {
+			redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETEERROR );
+			xoops_cp_footer ();
+			exit ();
+		}
+		
+		redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETEDO );
+		xoops_cp_footer ();
+		exit ();
+		break;						
 }	
 
 $xoopsTpl->assign('navigation', $admin_class->addNavigation('contact.php'));

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php	2012-05-02 21:29:32 UTC (rev 9426)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php	2012-05-03 07:15:56 UTC (rev 9427)
@@ -22,7 +22,35 @@
 require dirname(__FILE__) . '/header.php';
 // Display Admin header
 xoops_cp_header();
+// Define default value
+$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
 
+switch ($op)
+{
+	case 'list':
+		// prune manager
+		$form = new XoopsThemeForm(_AM_CONTACT_TOOLS_PRUNE, 'tools', 'tools.php', 'post'); 
+		$form->addElement(new XoopsFormTextDateSelect(_AM_CONTACT_TOOLS_PRUNE_BEFORE, 'prune_date', 15,  time()));
+		$onlyreply = new xoopsFormCheckBox('', 'onlyreply');
+		$onlyreply->addOption(1, _AM_CONTACT_TOOLS_PRUNE_REPLYONLY);
+		$form->addElement($onlyreply, false);  
+		$form->addElement(new XoopsFormHidden('op', 'prune'));
+		$form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));	
+		$xoopsTpl->assign('prune', $form->render());
+		break;
+		
+	case 'prune':
+     $timestamp = $contact_handler->Contact_CleanVars( $_REQUEST, 'prune_date', '', 'int' );
+     $onlyreply = $contact_handler->Contact_CleanVars( $_REQUEST, 'onlyreply', 0, 'int' );
+	  $timestamp = strtotime($timestamp);
+	  $count = $contact_handler->Contact_PruneCount($timestamp,$onlyreply);
+     $contact_handler->Contact_DeleteBeforeDate($timestamp,$onlyreply);
+     redirect_header ( 'tools.php', 1, sprintf(_AM_CONTACT_MSG_PRUNE_DELETED,$count) );
+	  xoops_cp_footer ();
+	  exit ();
+	  break; 	
+}	
+
 $xoopsTpl->assign('navigation', $admin_class->addNavigation('tools.php'));
 // Call template file
 $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.html');

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php	2012-05-02 21:29:32 UTC (rev 9426)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php	2012-05-03 07:15:56 UTC (rev 9427)
@@ -334,6 +334,30 @@
 	function getInsertId() {
 		return $this->db->getInsertId ();
 	}	
+	
+  /**
+	* Contact Prune Count
+	*/
+	function Contact_PruneCount($timestamp, $onlyreply) {
+		 $criteria = new CriteriaCompo ();
+		 $criteria->add ( new Criteria ( 'contact_create', $timestamp , '<=' ));
+		 if($onlyreply) {
+			 $criteria->add ( new Criteria ( 'contact_reply', 1 ));
+		 }
+		 return $this->getCount ( $criteria );
+	}
+	
+  /**
+	* Contact Delete Before Date
+	*/
+	function Contact_DeleteBeforeDate($timestamp,$onlyreply) {
+		 $criteria = new CriteriaCompo ();
+		 $criteria->add ( new Criteria ( 'contact_create', $timestamp , '<=' ));
+		 if($onlyreply) {
+			 $criteria->add ( new Criteria ( 'contact_reply', 1 ));
+		 }
+		$this->deleteAll($criteria);
+	}
 
 }
 
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/language/english/admin.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/language/english/admin.php	2012-05-02 21:29:32 UTC (rev 9426)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/language/english/admin.php	2012-05-03 07:15:56 UTC (rev 9427)
@@ -36,5 +36,13 @@
 define("_AM_CONTACT_TITLE","Title");
 define("_AM_CONTACT_INFO","Information");
 
-define("_AM_CONTACT_EXIST","Select Contact not exist");
-?>
+define("_AM_CONTACT_MSG_EXIST","Select Contact not exist");
+define("_AM_CONTACT_MSG_DELETE","Are you sure you want delete this contact and all replys?");
+define("_AM_CONTACT_MSG_DELETEDO","Your selected contact delete");
+define("_AM_CONTACT_MSG_DELETEERROR","Error in delete contact");
+define("_AM_CONTACT_MSG_PRUNE_DELETED","%s contact deleted");
+
+define("_AM_CONTACT_TOOLS_PRUNE","Prune Contacts");
+define("_AM_CONTACT_TOOLS_PRUNE_BEFORE","Prune contacts that were published before");
+define("_AM_CONTACT_TOOLS_PRUNE_REPLYONLY","Only remove contacts who have reply");
+?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php	2012-05-02 21:29:32 UTC (rev 9426)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php	2012-05-03 07:15:56 UTC (rev 9427)
@@ -33,6 +33,8 @@
 define("_MI_CONTACT_FORM_ADDRESS_DESC", "");
 define("_MI_CONTACT_FORM_DEPT", "Select Departments");
 define("_MI_CONTACT_FORM_DEPT_DESC", "");
+define("_MI_CONTACT_FORM_CAPTCHA", "Use Captcha");
+define("_MI_CONTACT_FORM_CAPTCHA_DESC", "");
 
 define("_MI_CONTACT_DEPT", "Departments");
 define("_MI_CONTACT_DEPT_DESC", "Departments allow you to define a department/email combination.  Users selecting<br />"

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/templates/admin/contact_contact.html
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/templates/admin/contact_contact.html	2012-05-02 21:29:32 UTC (rev 9426)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/templates/admin/contact_contact.html	2012-05-03 07:15:56 UTC (rev 9427)
@@ -1,7 +1,6 @@
 <div class="contact">
-<{$navigation}>
 <{if $level == reply}>
-	
+	<{$navigation}>
 	<{if $replylist}>
 	<table class="outer">
 	    <thead>
@@ -19,7 +18,6 @@
 	        <td class="txtcenter width15 xo-actions">
 	            <img class="tooltip" onclick="display_dialog(<{$contact.contact_id}>, true, true, 'slide', 'slide', 300, 700);" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._PREVIEW}>" title="<{$smarty.const._PREVIEW}>" />
 	            <a class="tooltip" title="<{$smarty.const._AM_CONTACT_VIEW}>" href="contact.php?op=view&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons view.png}>" alt="<{$smarty.const._AM_CONTACT_VIEW}>" /></a>
-	            <a class="tooltip" title="<{$smarty.const._EDIT}>" href="contact.php?op=edit&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" /></a>
 	            <a class="tooltip" title="<{$smarty.const._DELETE}>" href="contact.php?op=delete&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" /></a>
 	        </td>
 	    </tr>
@@ -55,6 +53,7 @@
 <{elseif $level == doreply}>
 
 <{elseif $level == view}>
+   <{$navigation}>
 	<table class="outer">
 		<thead>
 		   <th class="width10"><{$smarty.const._AM_CONTACT_TITLE}></th>
@@ -130,7 +129,6 @@
 			 	<td class="bold"><{$smarty.const._AM_CONTACT_ACTION}></td>
 			 	<td class="xo-actions">
 				 	<a class="tooltip" title="<{$smarty.const._AM_CONTACT_REPLY}>" href="contact.php?op=reply&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons mail_reply.png}>" alt="<{$smarty.const._AM_CONTACT_REPLY}>" /></a>
-	            <a class="tooltip" title="<{$smarty.const._EDIT}>" href="contact.php?op=edit&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" /></a>
 	            <a class="tooltip" title="<{$smarty.const._DELETE}>" href="contact.php?op=delete&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" /></a>
 			 	</td>
 		 	</tr>
@@ -155,7 +153,6 @@
 	        <td class="txtcenter width15 xo-actions">
 	            <img class="tooltip" onclick="display_dialog(<{$contact.contact_id}>, true, true, 'slide', 'slide', 300, 700);" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._PREVIEW}>" title="<{$smarty.const._PREVIEW}>" />
 	            <a class="tooltip" title="<{$smarty.const._AM_CONTACT_VIEW}>" href="contact.php?op=view&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons view.png}>" alt="<{$smarty.const._AM_CONTACT_VIEW}>" /></a>
-	            <a class="tooltip" title="<{$smarty.const._EDIT}>" href="contact.php?op=edit&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" /></a>
 	            <a class="tooltip" title="<{$smarty.const._DELETE}>" href="contact.php?op=delete&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" /></a>
 	        </td>
 	    </tr>
@@ -186,13 +183,11 @@
 		</div>
 	<{/foreach}>
 	<{/if}>
-	
-	
-<{elseif $level == edit}>
 
 <{elseif $level == delete}>
 
 <{else}>
+   <{$navigation}>
 	<table class="outer">
 	    <thead>
 	    <th><{$smarty.const._AM_CONTACT_SUBJECT}></th>
@@ -214,7 +209,6 @@
 	            <img class="tooltip" onclick="display_dialog(<{$contact.contact_id}>, true, true, 'slide', 'slide', 300, 700);" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._PREVIEW}>" title="<{$smarty.const._PREVIEW}>" />
 	            <a class="tooltip" title="<{$smarty.const._AM_CONTACT_REPLY}>" href="contact.php?op=reply&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons mail_reply.png}>" alt="<{$smarty.const._AM_CONTACT_REPLY}>" /></a>
 	            <a class="tooltip" title="<{$smarty.const._AM_CONTACT_VIEW}>" href="contact.php?op=view&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons view.png}>" alt="<{$smarty.const._AM_CONTACT_VIEW}>" /></a>
-	            <a class="tooltip" title="<{$smarty.const._EDIT}>" href="contact.php?op=edit&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" /></a>
 	            <a class="tooltip" title="<{$smarty.const._DELETE}>" href="contact.php?op=delete&amp;id=<{$contact.contact_id}>"><img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" /></a>
 	        </td>
 	    </tr>

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/templates/admin/contact_tools.html
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/templates/admin/contact_tools.html	2012-05-02 21:29:32 UTC (rev 9426)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/templates/admin/contact_tools.html	2012-05-03 07:15:56 UTC (rev 9427)
@@ -1,3 +1,4 @@
 <div class="contact">
 <{$navigation}>
+<{if $prune}><{$prune}><{/if}>
 </div>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php	2012-05-02 21:29:32 UTC (rev 9426)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php	2012-05-03 07:15:56 UTC (rev 9427)
@@ -27,9 +27,9 @@
 $modversion['name'] = _MI_CONTACT_NAME;
 $modversion['version'] = 1.8;
 $modversion['description'] = _MI_CONTACT_DESC;
-$modversion['credits'] = '';
-$modversion['author'] = '';
-$modversion['nickname'] = '';
+$modversion['credits'] = 'The XOOPS Project, Mohtava Project';
+$modversion['author'] = 'Hossein Azizabadi <hos...@gm...>';
+$modversion['nickname'] = 'Voltan';
 $modversion['help'] = 'page=help';
 $modversion['license'] = 'GNU GPL 2.0';
 $modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[10127] XoopsModules/contact/branches/voltan/v1.8/contact

[<vo...@us...>]

Revision: 10127
          http://xoops.svn.sourceforge.net/xoops/?rev=10127&view=rev
Author:   voltan1
Date:     2012-08-29 06:21:14 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Add ajax method

Added Paths:
-----------
    XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php
    XoopsModules/contact/branches/voltan/v1.8/contact/docs/ajax.html

Added: XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php	                        (rev 0)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php	2012-08-29 06:21:14 UTC (rev 10127)
@@ -0,0 +1,34 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
+ */
+
+include 'header.php';
+	
+if(!empty($_POST)) {
+	// Info Processing
+   $contact = $contact_handler->Contact_InfoProcessing($_POST);
+   // Save info
+	$obj = $contact_handler->create();
+	$obj->setVars($contact);
+	$contact_handler->insert($obj);
+	// send mail can seet message
+	$message = $contact_handler->Contact_SendMail($contact);
+}
+
+?>
\ No newline at end of file

Added: XoopsModules/contact/branches/voltan/v1.8/contact/docs/ajax.html
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/docs/ajax.html	                        (rev 0)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/docs/ajax.html	2012-08-29 06:21:14 UTC (rev 10127)
@@ -0,0 +1,65 @@
+<script src="<{$xoops_url}>/browse.php?Frameworks/jquery/jquery.js" type="text/javascript"></script>
+<script src="<{$xoops_url}>/browse.php?Frameworks/jquery/plugins/jquery.ui.js" type="text/javascript"></script>
+<link rel="stylesheet" href="<{$xoops_url}>/modules/system/css/ui/base/ui.all.css" type="text/css" />
+<script type="text/javascript">
+$(function() {
+
+	$( "#dialog:ui-dialog" ).dialog( "destroy" );
+	
+
+	
+	var contact_name = $( "#contact_name" ), contact_mail = $( "#contact_mail" ), contact_phone = $( "#contact_phone" ), contact_subject = $( "#contact_subject" ), contact_message = $( "#contact_message" ), contact_uid = $( "#contact_uid" ),
+		allFields = $( [] ).add( contact_name ).add( contact_mail ).add( contact_phone ).add( contact_subject ).add( contact_message ).add( contact_uid ),
+		tips = $( ".validateTips" );
+
+	$( "#dialog-form" ).dialog({
+		autoOpen: false,
+		height: 400,
+		width: 350,
+		modal: true,
+		buttons: {
+			"Contact Us": function() {
+			$.ajax({
+				    type: "POST",
+				    url: "<{$xoops_url}>/modules/contact/ajax.php",
+				    data: allFields,
+				});
+				$( this ).dialog( "close" );
+			},
+			"Cancel": function() {
+				$( this ).dialog( "close" );
+			}
+		},
+		close: function() {
+			allFields.val( "" ).removeClass( "ui-state-error" );
+		}
+	});
+
+	$( "#create-user" )
+		.button()
+		.click(function() {
+			$( "#dialog-form" ).dialog( "open" );
+		});
+});
+</script>
+
+<div class="demo">
+	<div id="dialog-form" title="Contact Us">
+		<p class="validateTips">Contact us</p>
+		<form  enctype="multipart/form-data">
+		   <{xoMemberInfo assign=member_info}>
+			<label for="name">Name</label>
+			<input name="contact_name" title="Name" id="contact_name" size="20" maxlength="255" value="<{$xoops_uname}>" type="text" class="text ui-widget-content ui-corner-all" />
+			<br /><label for="email">Email</label>
+			<input name="contact_mail" title="Email" id="contact_mail" size="20" maxlength="255" value="<{$member_info.email}>" type="text" class="text ui-widget-content ui-corner-all" />
+			<br /><label for="password">Phone</label>
+			<input name="contact_phone" title="Phone" id="contact_phone" size="20" maxlength="255" value="" type="text" class="text ui-widget-content ui-corner-all" />
+			<br /><label for="password">Subject</label>
+			<input name="contact_subject" title="Subject" id="contact_subject" size="20" maxlength="255" value="" type="text" class="text ui-widget-content ui-corner-all" />
+			<br /><label for="password">Comment</label>
+			<textarea name="contact_message" id="contact_message" title="Comment" rows="5" cols="60"></textarea>
+			<input name="contact_uid" id="contact_uid" value="<{$xoops_userid}>" type="hidden">
+		</form>
+	</div>
+	<button id="create-user">Contact Us</button>
+</div>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[10134] XoopsModules/contact/branches/voltan/v1.8/contact

[<be...@us...>]

Revision: 10134
          http://xoops.svn.sourceforge.net/xoops/?rev=10134&view=rev
Author:   beckmi
Date:     2012-08-29 12:30:05 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
fixing English translations

Modified Paths:
--------------
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
    XoopsModules/contact/branches/voltan/v1.8/contact/language/english/admin.php
    XoopsModules/contact/branches/voltan/v1.8/contact/language/english/main.php
    XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php
    XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php	2012-08-29 11:06:54 UTC (rev 10133)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php	2012-08-29 12:30:05 UTC (rev 10134)
@@ -1,88 +1,88 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
- */
-
-// Call header
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
+ */
+
+// Call header
 require dirname(__FILE__) . '/header.php';
-// Display Admin header
+// Display Admin header
 xoops_cp_header();
 // Define default value
 $op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
 $contact_id = $contact_handler->Contact_CleanVars($_REQUEST, 'id', '0', 'int');
 
-// Define scripts
-$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+// Define scripts
+$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
 $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js');
-// Add module stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css');
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js');
+// Add module stylesheet
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
 $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
 
-switch ($op)
+switch ($op)
 {
 	case 'list':
       $contact = array();
-      $contact['perpage'] = '10';
-      $contact['order'] = 'DESC';
+      $contact['perpage'] = '10';
+      $contact['order'] = 'DESC';
       $contact['sort'] = 'contact_id';
         
-      // get limited information
-      if (isset($_REQUEST['limit'])) {
-         $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
-      } else {
-         $contact['limit'] = $contact['perpage'];
-      }
-
-      // get start information
-      if (isset($_REQUEST['start'])) {
-         $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
-      } else {
-         $contact['start'] = 0;
+      // get limited information
+      if (isset($_REQUEST['limit'])) {
+         $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
+      } else {
+         $contact['limit'] = $contact['perpage'];
+      }
+
+      // get start information
+      if (isset($_REQUEST['start'])) {
+         $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
+      } else {
+         $contact['start'] = 0;
       }  
       
       $contact_numrows = $contact_handler->Contact_GetCount('contact_cid');
       $contacts = $contact_handler->Contact_GetAdminList($contact , 'contact_cid');
 
-      if ($contact_numrows > $contact['limit']) {
-         $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
-         $contact_pagenav = $contact_pagenav->renderNav(4);
-      } else {
-         $contact_pagenav = '';
+      if ($contact_numrows > $contact['limit']) {
+         $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
+         $contact_pagenav = $contact_pagenav->renderNav(4);
+      } else {
+         $contact_pagenav = '';
       }
       
-      $xoopsTpl->assign('contacts', $contacts);
+      $xoopsTpl->assign('contacts', $contacts);
       $xoopsTpl->assign('contact_pagenav', $contact_pagenav);
       $level = 'list';  
 		break;
 		
 	case 'reply':
-      if ($contact_id > 0) {
+      if ($contact_id > 0) {
          $obj = $contact_handler->get($contact_id);
          if($obj->getVar('contact_cid') != 0) {
          	redirect_header ( 'contact.php', 3, _AM_CONTACT_CANTREPLY);
-         }	
+         }	
          $form = $obj->Contact_ReplyForm();
          $xoopsTpl->assign('replyform', $form->render());
-         $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
-      } else {
-         redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+         $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
+      } else {
+         redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
       }
       $level = 'reply';
 		break;
@@ -163,11 +163,11 @@
 	case 'delete':
 	
 		if ($contact_id > 0) {
-			// Prompt message
+			// Prompt message
 			xoops_confirm(array("id" => $contact_id), 'contact.php?op=dodelete', _AM_CONTACT_MSG_DELETE);
-		} else {
-		   redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
-		}	
+		} else {
+		   redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+		}	
 
 		$level = 'delete';
 		break;
@@ -190,7 +190,7 @@
 			exit ();
 		}
 		
-		redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETEDO );
+		redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETED );
 		xoops_cp_footer ();
 		exit ();
 		break;						
@@ -199,8 +199,8 @@
 $xoopsTpl->assign('navigation', $admin_class->addNavigation('contact.php'));
 $xoopsTpl->assign('level', $level);
 
-// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
-// Call footer
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
+// Call footer
 require dirname(__FILE__) . '/footer.php';
 ?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/language/english/admin.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/language/english/admin.php	2012-08-29 11:06:54 UTC (rev 10133)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/language/english/admin.php	2012-08-29 12:30:05 UTC (rev 10134)
@@ -1,13 +1,13 @@
-<?php
+<?php
 
 // index
-define("_AM_CONTACT_INDEX_ADMENU1","Contacts");
-define("_AM_CONTACT_INDEX_TOTAL","There are <span class='green'>%s</span> Contact in our database");
+define("_AM_CONTACT_INDEX_ADMENU1","Messages");
+define("_AM_CONTACT_INDEX_TOTAL","There are <span class='green'>%s</span> Messages in our database");
 
 // Contact
 define("_AM_CONTACT_ID","Id");
 define("_AM_CONTACT_SUBJECT","Subject");
-define("_AM_CONTACT_DEPARTMENT","Departmant");
+define("_AM_CONTACT_DEPARTMENT","Department");
 define("_AM_CONTACT_SUBMITTER","Submitter");
 define("_AM_CONTACT_DATE","Date Submitted");
 define("_AM_CONTACT_MESSAGE","Message");
@@ -23,8 +23,8 @@
 define("_AM_CONTACT_ACTION","Action");
 define("_AM_CONTACT_VIEW","View");
 define("_AM_CONTACT_REPLY","Reply");
-define("_AM_CONTACT_HAVEREPLY","Replyd");
-define("_AM_CONTACT_HAVENTREPLY","Not Reply");
+define("_AM_CONTACT_HAVEREPLY","Replied");
+define("_AM_CONTACT_HAVENTREPLY","Not Replied");
 
 define("_AM_CONTACT_FROM","From");
 define("_AM_CONTACT_NAMEFROM","Name");
@@ -36,13 +36,13 @@
 define("_AM_CONTACT_TITLE","Title");
 define("_AM_CONTACT_INFO","Information");
 
-define("_AM_CONTACT_MSG_EXIST","Select Contact not exist");
-define("_AM_CONTACT_MSG_DELETE","Are you sure you want delete this contact and all replys?");
-define("_AM_CONTACT_MSG_DELETEDO","Your selected contact delete");
-define("_AM_CONTACT_MSG_DELETEERROR","Error in delete contact");
-define("_AM_CONTACT_MSG_PRUNE_DELETED","%s contact deleted");
+define("_AM_CONTACT_MSG_EXIST","Selected Message does not exist");
+define("_AM_CONTACT_MSG_DELETE","Are you sure to delete this message and all replies?");
+define("_AM_CONTACT_MSG_DELETED","Your selected message has been deleted");
+define("_AM_CONTACT_MSG_DELETEERROR","Error in deleting message");
+define("_AM_CONTACT_MSG_PRUNE_DELETED","%s messages deleted");
 
-define("_AM_CONTACT_TOOLS_PRUNE","Prune Contacts");
-define("_AM_CONTACT_TOOLS_PRUNE_BEFORE","Prune contacts that were published before");
-define("_AM_CONTACT_TOOLS_PRUNE_REPLYONLY","Only remove contacts who have reply");
+define("_AM_CONTACT_TOOLS_PRUNE","Delete Messages");
+define("_AM_CONTACT_TOOLS_PRUNE_BEFORE","Delete messages that were published before");
+define("_AM_CONTACT_TOOLS_PRUNE_REPLYONLY","Delete only messages with replies");
 ?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/language/english/main.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/language/english/main.php	2012-08-29 11:06:54 UTC (rev 10133)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/language/english/main.php	2012-08-29 12:30:05 UTC (rev 10134)
@@ -11,12 +11,12 @@
 define("_MD_CONTACT_SUBJECT","Subject");
 define("_MD_CONTACT_MESSAGE","Comment");
 define("_MD_CONTACT_DEPARTMENT","Department");
-define("_MD_CONTACT_DEFULTDEP","Contact");
+define("_MD_CONTACT_DEFULTDEP","Contact Us");
 
-define("_MD_CONTACT_MES_SEND","Thank you for Contact Us");
-define("_MD_CONTACT_MES_NOVALIDEMAIL","Your Email is not Valida");
-define("_MD_CONTACT_MES_NOTSAVE","Your Message don't save in our DB");
-define("_MD_CONTACT_MES_SAVEINDB","Your Message save in our DB");
-define("_MD_CONTACT_MES_SENDERROR","Error in send Message");
+define("_MD_CONTACT_MES_SEND","Thank you for Contacting Us");
+define("_MD_CONTACT_MES_NOVALIDEMAIL","Your Email is not Valid");
+define("_MD_CONTACT_MES_NOTSAVE","Sorry, your Message was not saved in our DB");
+define("_MD_CONTACT_MES_SAVEINDB","Your Message has been saved in our DB");
+define("_MD_CONTACT_MES_SENDERROR","Error in sending Message");
 define("_MD_CONTACT_MES_ERROR","Error");
 ?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php	2012-08-29 11:06:54 UTC (rev 10133)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php	2012-08-29 12:30:05 UTC (rev 10134)
@@ -1,21 +1,21 @@
-<?php
-// $Id$
-// Module Info
-
-// The name of this module
-define("_MI_CONTACT_NAME","Contact");
-define("_MI_CONTACT_DESC","Email contact page");
-
-// Admin menu
-define('_MI_CONTACT_MENU_HOME',"Home"); 
+<?php
+// $Id$
+// Module Info
+
+// The name of this module
+define("_MI_CONTACT_NAME","Contact Us");
+define("_MI_CONTACT_DESC","Email contact page");
+
+// Admin menu
+define('_MI_CONTACT_MENU_HOME',"Home"); 
 define("_MI_CONTACT_MENU_HOME_DESC","Go back to Home");
-define('_MI_CONTACT_MENU_CONTACT',"Contact"); 
-define("_MI_CONTACT_MENU_CONTACT_DESC","list of Contact");
-define('_MI_CONTACT_MENU_TOOLS',"Tools"); 
-define("_MI_CONTACT_MENU_TOOLS_DESC","Module Tools");
-define("_MI_CONTACT_MENU_ABOUT",  "About");
-define("_MI_CONTACT_MENU_ABOUT_DESC" , "About this module");
-define("_MI_CONTACT_MENU_HELP","Help");
+define('_MI_CONTACT_MENU_CONTACT',"Messages");
+define("_MI_CONTACT_MENU_CONTACT_DESC","List of Messages");
+define('_MI_CONTACT_MENU_TOOLS',"Tools"); 
+define("_MI_CONTACT_MENU_TOOLS_DESC","Module Tools");
+define("_MI_CONTACT_MENU_ABOUT",  "About");
+define("_MI_CONTACT_MENU_ABOUT_DESC" , "About this module");
+define("_MI_CONTACT_MENU_HELP","Help");
 define("_MI_CONTACT_MENU_HELP_DESC" , "Module help");
 
 // Module Settings
@@ -37,20 +37,20 @@
 define("_MI_CONTACT_FORM_CAPTCHA_DESC","");
 
 define("_MI_CONTACT_DEPT","Departments");
-define("_MI_CONTACT_DEPT_DESC","Departments allow you to define a department/email combination.  Users selecting<br />"
-."from a defined department will have their contact information sent to the corresponding<br />"
-."email address you define.<br /><br />"
-."Define each department/email as follows:<br /><br />"
-."dept1,email1|dept2,email2|dept3,email3 etc. - each department and email must be seperated<br />"
-."by a comma ',', and each department email combination bust be seperated by a pipe '|'");
+define("_MI_CONTACT_DEPT_DESC","Departments allow you to define a department/email combination.  Users selecting<br />"
+."from a defined department will have their contact information sent to the corresponding<br />"
+."email address you define.<br /><br />"
+."Define each department/email as follows:<br /><br />"
+."dept1,email1|dept2,email2|dept3,email3 etc. - each department and email must be separated<br />"
+."by a comma ',', and each department email combination must be separated by a pipe '|'");
 
-define("_MI_CONTACT_PERPAGE","Perpage");
+define("_MI_CONTACT_PERPAGE","Per page");
 define("_MI_CONTACT_PERPAGE_DESC","");
 
 define("_MI_CONTACT_TOPINFO","Header contact form");
-define("_MI_CONTACT_TOPINFO_DESC","Set HTML codes for show in contact page");
+define("_MI_CONTACT_TOPINFO_DESC","Set HTML codes to show in contact page");
 
 define("_MI_CONTACT_HEAD_OPTIONS","Form Options");
 define("_MI_CONTACT_HEAD_ADMIN","Admin setting");
-define("_MI_CONTACT_HEAD_INFO","Information");
+define("_MI_CONTACT_HEAD_INFO","Information");
 ?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php	2012-08-29 11:06:54 UTC (rev 10133)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php	2012-08-29 12:30:05 UTC (rev 10134)
@@ -1,77 +1,77 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
- 
-if (!defined('XOOPS_ROOT_PATH')) {
-	die('XOOPS root path not defined');	
+ 
+if (!defined('XOOPS_ROOT_PATH')) {
+	die('XOOPS root path not defined');	
 }
-
-$moduleDirName = basename( dirname( __FILE__ ) ) ;
-
-$modversion['name'] = _MI_CONTACT_NAME;
-$modversion['version'] = 1.8;
-$modversion['description'] = _MI_CONTACT_DESC;
-$modversion['credits'] = 'The XOOPS Project, Mohtava Project';
-$modversion['author'] = 'Hossein Azizabadi <hos...@gm...>';
-$modversion['nickname'] = 'Voltan';
-$modversion['help'] = 'page=help';
-$modversion['license'] = 'GNU GPL 2.0';
-$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
-$modversion['official'] = 1;
-$modversion['image'] = "images/contact_slogo.png";
+
+$moduleDirName = basename( dirname( __FILE__ ) ) ;
+
+$modversion['name'] = _MI_CONTACT_NAME;
+$modversion['version'] = 1.8;
+$modversion['description'] = _MI_CONTACT_DESC;
+$modversion['credits'] = 'The XOOPS Project, Mohtava Project';
+$modversion['author'] = 'Hossein Azizabadi <hos...@gm...>';
+$modversion['nickname'] = 'Voltan';
+$modversion['help'] = 'page=help';
+$modversion['license'] = 'GNU GPL 2.0';
+$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
+$modversion['official'] = 1;
+$modversion['image'] = "images/contact_slogo.png";
 $modversion['dirname'] = "contact";
-$modversion['onUpdate'] = 'include/function_update.php';
-$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
-$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
+$modversion['onUpdate'] = 'include/functions_update.php';
+$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
+$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
 
 // DB
 $modversion['sqlfile']['mysql'] = "sql/mysql.sql";
-$modversion['tables'][0] = "contact";
-
-//about
-$modversion["module_website_url"] = "http://www.xoops.org/";
-$modversion["module_website_name"] = "XOOPS";
-$modversion["release_date"] = "2012/05/03";
-$modversion["module_status"] = "Beta";
-$modversion["author_website_url"] = "http://www.xoops.org/";
-$modversion["author_website_name"] = "XOOPS";
-$modversion['min_php']='5.2';
-$modversion['min_xoops']='2.5';
-$modversion['min_admin']='1.1';
-
-//Admin things
-$modversion['hasAdmin'] = 1;
-
-// Menu
-$modversion['hasMain'] = 1;
-$modversion['adminindex'] = "admin/index.php";
+$modversion['tables'][0] = "contact";
+
+//about
+$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion["module_website_name"] = "XOOPS";
+$modversion["release_date"] = "2012/05/03";
+$modversion["module_status"] = "Beta";
+$modversion["author_website_url"] = "http://www.xoops.org/";
+$modversion["author_website_name"] = "XOOPS";
+$modversion['min_php']='5.2';
+$modversion['min_xoops']='2.5';
+$modversion['min_admin']='1.1';
+
+//Admin things
+$modversion['hasAdmin'] = 1;
+
+// Menu
+$modversion['hasMain'] = 1;
+$modversion['adminindex'] = "admin/index.php";
 $modversion['adminmenu'] = "admin/menu.php";
-
-// Set to 1 if you want to display menu generated by system module
-$modversion['system_menu'] = 1;
-
-// Templates
-$i = 1;
-$modversion['templates'][$i]['file'] = 'contact_index.html';
-$modversion['templates'][$i]['description'] = '_MI_CONTACT_TEMPLATES';
 
+// Set to 1 if you want to display menu generated by system module
+$modversion['system_menu'] = 1;
+
+// Templates
+$i = 1;
+$modversion['templates'][$i]['file'] = 'contact_index.html';
+$modversion['templates'][$i]['description'] = '_MI_CONTACT_TEMPLATES';
+
 // Settings
 $modversion['config'][] = array(
     'name' => 'break',
@@ -175,5 +175,5 @@
     'description' => '_MI_CONTACT_PERPAGE_DESC',
     'formtype' => 'textbox',
     'valuetype' => 'int',
-    'default' => 10);     
+    'default' => 10);     
 ?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[10175] XoopsModules/contact/branches/voltan/v1.8/contact

[<vo...@us...>]

Revision: 10175
          http://xoops.svn.sourceforge.net/xoops/?rev=10175&view=rev
Author:   voltan1
Date:     2012-09-15 10:45:56 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
Fix send email

Modified Paths:
--------------
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
    XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php	2012-09-13 15:51:26 UTC (rev 10174)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php	2012-09-15 10:45:56 UTC (rev 10175)
@@ -1,88 +1,88 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
- */
-
-// Call header
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
+ */
+
+// Call header
 require dirname(__FILE__) . '/header.php';
-// Display Admin header
+// Display Admin header
 xoops_cp_header();
 // Define default value
 $op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
 $contact_id = $contact_handler->Contact_CleanVars($_REQUEST, 'id', '0', 'int');
 
-// Define scripts
-$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+// Define scripts
+$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
 $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js');
-// Add module stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css');
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js');
+// Add module stylesheet
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
 $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
 
-switch ($op)
+switch ($op)
 {
 	case 'list':
       $contact = array();
-      $contact['perpage'] = '10';
-      $contact['order'] = 'DESC';
+      $contact['perpage'] = '10';
+      $contact['order'] = 'DESC';
       $contact['sort'] = 'contact_id';
         
-      // get limited information
-      if (isset($_REQUEST['limit'])) {
-         $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
-      } else {
-         $contact['limit'] = $contact['perpage'];
-      }
-
-      // get start information
-      if (isset($_REQUEST['start'])) {
-         $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
-      } else {
-         $contact['start'] = 0;
+      // get limited information
+      if (isset($_REQUEST['limit'])) {
+         $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
+      } else {
+         $contact['limit'] = $contact['perpage'];
+      }
+
+      // get start information
+      if (isset($_REQUEST['start'])) {
+         $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
+      } else {
+         $contact['start'] = 0;
       }  
       
       $contact_numrows = $contact_handler->Contact_GetCount('contact_cid');
       $contacts = $contact_handler->Contact_GetAdminList($contact , 'contact_cid');
 
-      if ($contact_numrows > $contact['limit']) {
-         $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
-         $contact_pagenav = $contact_pagenav->renderNav(4);
-      } else {
-         $contact_pagenav = '';
+      if ($contact_numrows > $contact['limit']) {
+         $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
+         $contact_pagenav = $contact_pagenav->renderNav(4);
+      } else {
+         $contact_pagenav = '';
       }
       
-      $xoopsTpl->assign('contacts', $contacts);
+      $xoopsTpl->assign('contacts', $contacts);
       $xoopsTpl->assign('contact_pagenav', $contact_pagenav);
       $level = 'list';  
 		break;
 		
 	case 'reply':
-      if ($contact_id > 0) {
+      if ($contact_id > 0) {
          $obj = $contact_handler->get($contact_id);
          if($obj->getVar('contact_cid') != 0) {
          	redirect_header ( 'contact.php', 3, _AM_CONTACT_CANTREPLY);
-         }	
+         }	
          $form = $obj->Contact_ReplyForm();
          $xoopsTpl->assign('replyform', $form->render());
-         $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
-      } else {
-         redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+         $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
+      } else {
+         redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
       }
       $level = 'reply';
 		break;
@@ -114,7 +114,7 @@
 
 		// send mail can seet message
 		if($sendmail = true) {
-			$message = $contact_handler->Contact_SendMail($contact);
+			$message = $contact_handler->Contact_ReplyMail($contact);
 		} else if ($saveinfo = true) {
 			$message = _MD_CONTACT_MES_SAVEINDB;
 		} else {
@@ -163,11 +163,11 @@
 	case 'delete':
 	
 		if ($contact_id > 0) {
-			// Prompt message
+			// Prompt message
 			xoops_confirm(array("id" => $contact_id), 'contact.php?op=dodelete', _AM_CONTACT_MSG_DELETE);
-		} else {
-		   redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
-		}	
+		} else {
+		   redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+		}	
 
 		$level = 'delete';
 		break;
@@ -190,7 +190,7 @@
 			exit ();
 		}
 		
-		redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETED );
+		redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETEDO );
 		xoops_cp_footer ();
 		exit ();
 		break;						
@@ -199,8 +199,8 @@
 $xoopsTpl->assign('navigation', $admin_class->addNavigation('contact.php'));
 $xoopsTpl->assign('level', $level);
 
-// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
-// Call footer
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
+// Call footer
 require dirname(__FILE__) . '/footer.php';
 ?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php	2012-09-13 15:51:26 UTC (rev 10174)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php	2012-09-15 10:45:56 UTC (rev 10175)
@@ -1,33 +1,33 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
-	die("XOOPS root path not defined");
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
+ */
+
+if (!defined("XOOPS_ROOT_PATH")) {
+	die("XOOPS root path not defined");
 }
 
-class contact extends XoopsObject
+class contact extends XoopsObject
 {
 	
-	function __construct()
-	{
-		$this->XoopsObject();
+	function __construct()
+	{
+		$this->XoopsObject();
 		$this->initVar("contact_id",XOBJ_DTYPE_INT,null,false,11); 
 		$this->initVar("contact_uid",XOBJ_DTYPE_INT,null,false,11);  
 		$this->initVar("contact_cid",XOBJ_DTYPE_INT,null,false,11);
@@ -123,7 +123,7 @@
    	xoops_load('XoopsFormCaptcha');
 		$form->addElement(new XoopsFormCaptcha(), true);
 		
-   	$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+   	$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 		return $form;
 	}	
 	
@@ -141,8 +141,8 @@
 	   $form->addElement ( new XoopsFormText ( _AM_CONTACT_NAMETO, 'contact_nameto', 50, 255, $this->getVar ( 'contact_name' )), true );
 	   $form->addElement ( new XoopsFormText ( _AM_CONTACT_MAILTO, 'contact_mailto', 50, 255, $this->getVar ( 'contact_mail' )), true );
 	   $form->addElement ( new XoopsFormText ( _AM_CONTACT_SUBJECT, 'contact_subject', 50, 255, _RE . $this->getVar ( 'contact_subject' )), true );
-	   $form->addElement(new XoopsFormTextArea ( _AM_CONTACT_MESSAGE, 'contact_message', '', 5, 60 ), true );
-		$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+	   $form->addElement(new XoopsFormTextArea ( _AM_CONTACT_MESSAGE, 'contact_message', '', 5, 60 ), true );
+		$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 		return $form;
 	}	
 	
@@ -161,19 +161,19 @@
 	}
 }
 
-class ContactContactHandler extends XoopsPersistableObjectHandler
-{
-	function __construct(&$db)
-	{
-		parent::__construct($db, "contact", 'contact', 'contact_id', 'contact_mail');
+class ContactContactHandler extends XoopsPersistableObjectHandler
+{
+	function __construct(&$db)
+	{
+		parent::__construct($db, "contact", 'contact', 'contact_id', 'contact_mail');
 	}
 	
-	/**
-	 * Get variables passed by GET or POST method
-	 *
-	 */
-	function Contact_CleanVars(&$global, $key, $default = '', $type = 'int') {
-	
+	/**
+	 * Get variables passed by GET or POST method
+	 *
+	 */
+	function Contact_CleanVars(&$global, $key, $default = '', $type = 'int') {
+	
 	    switch ($type) {
 	        case 'array':
 	            $ret = (isset($global[$key]) && is_array($global[$key])) ? $global[$key] : $default;
@@ -206,7 +206,7 @@
 	    if ($ret === false) {
 	        return $default;
 	    }
-	    return $ret;
+	    return $ret;
 	}
 	
 	function Contact_InfoProcessing($global) {
@@ -232,7 +232,7 @@
 	}
 	
 	function Contact_SendMail($contact) {
-		$xoopsMailer =& xoops_getMailer();
+		$xoopsMailer = xoops_getMailer();
       $xoopsMailer->useMail();
       $xoopsMailer->setToEmails($this->Contact_ToEmails($contact['contact_department']));
       $xoopsMailer->setFromEmail($contact['contact_mail']);
@@ -248,7 +248,7 @@
 	}
 	
 	function Contact_ReplyMail($contact) {
-		$xoopsMailer =& xoops_getMailer();
+		$xoopsMailer = xoops_getMailer();
       $xoopsMailer->useMail();
       $xoopsMailer->setToEmails($contact['contact_mailto']);
       $xoopsMailer->setFromEmail($contact['contact_mail']);
@@ -262,18 +262,18 @@
       }	
       return $message;	
 	}
-	
+
 	function Contact_ToEmails($department = null) {
       global $xoopsConfig;
-		$admin_mail = $xoopsConfig['adminmail'];
-		if($department) {
+      $department_mail[] = $xoopsConfig['adminmail'];
+		if(!empty($department)) {
 			$departments = xoops_getModuleOption('contact_dept','contact');
 			foreach( $departments as $vals ) {
 		      $vale = explode( ',', $vals );
-		      if($department == $vale[0]) $department_mail = $vale[1];
+		      if($department == $vale[0]) $department_mail[] = $vale[1];
 			}
 		}
-      return $admin_mail . ','. $department_mail;
+      return $department_mail;
    }
 	
 	function Contact_AddReply($contact_id) {
@@ -367,5 +367,5 @@
 	}
 
 }
-
+
 ?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[10176] XoopsModules/contact/branches/voltan/v1.8/contact

[<vo...@us...>]

Revision: 10176
          http://xoops.svn.sourceforge.net/xoops/?rev=10176&view=rev
Author:   voltan1
Date:     2012-09-15 10:51:08 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
Update copyright

Modified Paths:
--------------
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php
    XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php
    XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
    XoopsModules/contact/branches/voltan/v1.8/contact/header.php
    XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php
    XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php
    XoopsModules/contact/branches/voltan/v1.8/contact/index.php
    XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
 
 // Call header

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
 
 // Call header

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
  
 xoops_cp_footer();

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
  
 $path = dirname(dirname(dirname(dirname(__FILE__))));

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
 
 // Call header

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
 
 defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
 
 // Call header

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
 
 include 'header.php';

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -14,6 +14,8 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$
  */

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/header.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/header.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/header.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
 
 include "../../mainfile.php";

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
 
 ?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
 
 

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/index.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/index.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/index.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
 
 include 'header.php';

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php	2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php	2012-09-15 10:51:08 UTC (rev 10176)
@@ -14,6 +14,8 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (AKA Voltan)
+ * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$
  */
@@ -28,8 +30,8 @@
 $modversion['version'] = 1.8;
 $modversion['description'] = _MI_CONTACT_DESC;
 $modversion['credits'] = 'The XOOPS Project, Mohtava Project';
-$modversion['author'] = 'Hossein Azizabadi <hos...@gm...>';
-$modversion['nickname'] = 'Voltan';
+$modversion['author'] = 'Kazumi Ono (Onokazu), modified by Trabis, rewrite by Voltan';
+$modversion['nickname'] = 'Kazumi Ono, Trabis, Voltan';
 $modversion['help'] = 'page=help';
 $modversion['license'] = 'GNU GPL 2.0';
 $modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[10191] XoopsModules/contact/branches/voltan/v1.8/contact

[<be...@us...>]

Revision: 10191
          http://xoops.svn.sourceforge.net/xoops/?rev=10191&view=rev
Author:   beckmi
Date:     2012-09-26 09:52:13 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
Small English corrections

Modified Paths:
--------------
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php
    XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php
    XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php
    XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
    XoopsModules/contact/branches/voltan/v1.8/contact/header.php
    XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php
    XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php
    XoopsModules/contact/branches/voltan/v1.8/contact/index.php
    XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php
    XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
  You may not change or alter any portion of this comment or credits
  of supporting developers from this source code or any supporting source code
@@ -14,22 +14,22 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$
- */
-
-// Call header
+ */
+
+// Call header
 require dirname(__FILE__) . '/header.php';
-// Display Admin header
+// Display Admin header
 xoops_cp_header();
 
 $xoopsTpl->assign('navigation', $admin_class->addNavigation('about.php'));
-$xoopsTpl->assign('renderabout', $admin_class->renderabout('6KJ7RW5DR3VTJ', false));
+$xoopsTpl->assign('renderabout', $admin_class->renderabout('6KJ7RW5DR3VTJ', false));
 
-// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.html');
-// Call footer
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.html');
+// Call footer
 require dirname(__FILE__) . '/footer.php';
 ?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
  You may not change or alter any portion of this comment or credits
  of supporting developers from this source code or any supporting source code
@@ -14,77 +14,77 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$
- */
-
-// Call header
+ */
+
+// Call header
 require dirname(__FILE__) . '/header.php';
-// Display Admin header
+// Display Admin header
 xoops_cp_header();
 // Define default value
 $op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
 $contact_id = $contact_handler->Contact_CleanVars($_REQUEST, 'id', '0', 'int');
 
-// Define scripts
-$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+// Define scripts
+$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
 $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js');
-// Add module stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css');
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js');
+// Add module stylesheet
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
 $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
 
-switch ($op)
+switch ($op)
 {
 	case 'list':
       $contact = array();
-      $contact['perpage'] = xoops_getModuleOption('admin_perpage','contact');
-      $contact['order'] = 'DESC';
+      $contact['perpage'] = xoops_getModuleOption('admin_perpage','contact');
+      $contact['order'] = 'DESC';
       $contact['sort'] = 'contact_id';
         
-      // get limited information
-      if (isset($_REQUEST['limit'])) {
-         $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
-      } else {
-         $contact['limit'] = $contact['perpage'];
-      }
-
-      // get start information
-      if (isset($_REQUEST['start'])) {
-         $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
-      } else {
-         $contact['start'] = 0;
+      // get limited information
+      if (isset($_REQUEST['limit'])) {
+         $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
+      } else {
+         $contact['limit'] = $contact['perpage'];
+      }
+
+      // get start information
+      if (isset($_REQUEST['start'])) {
+         $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
+      } else {
+         $contact['start'] = 0;
       }  
       
       $contact_numrows = $contact_handler->Contact_GetCount('contact_cid');
       $contacts = $contact_handler->Contact_GetAdminList($contact , 'contact_cid');
 
-      if ($contact_numrows > $contact['limit']) {
-         $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
-         $contact_pagenav = $contact_pagenav->renderNav(4);
-      } else {
-         $contact_pagenav = '';
+      if ($contact_numrows > $contact['limit']) {
+         $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
+         $contact_pagenav = $contact_pagenav->renderNav(4);
+      } else {
+         $contact_pagenav = '';
       }
       
-      $xoopsTpl->assign('contacts', $contacts);
+      $xoopsTpl->assign('contacts', $contacts);
       $xoopsTpl->assign('contact_pagenav', $contact_pagenav);
       $level = 'list';  
 		break;
 		
 	case 'reply':
-      if ($contact_id > 0) {
+      if ($contact_id > 0) {
          $obj = $contact_handler->get($contact_id);
          if($obj->getVar('contact_cid') != 0) {
          	redirect_header ( 'contact.php', 3, _AM_CONTACT_CANTREPLY);
-         }	
+         }	
          $form = $obj->Contact_ReplyForm();
          $xoopsTpl->assign('replyform', $form->render());
-         $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
-      } else {
-         redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+         $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
+      } else {
+         redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
       }
       $level = 'reply';
 		break;
@@ -165,11 +165,11 @@
 	case 'delete':
 	
 		if ($contact_id > 0) {
-			// Prompt message
+			// Prompt message
 			xoops_confirm(array("id" => $contact_id), 'contact.php?op=dodelete', _AM_CONTACT_MSG_DELETE);
-		} else {
-		   redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
-		}	
+		} else {
+		   redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+		}	
 
 		$level = 'delete';
 		break;
@@ -201,8 +201,8 @@
 $xoopsTpl->assign('navigation', $admin_class->addNavigation('contact.php'));
 $xoopsTpl->assign('level', $level);
 
-// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
-// Call footer
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
+// Call footer
 require dirname(__FILE__) . '/footer.php';
 ?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
  You may not change or alter any portion of this comment or credits
  of supporting developers from this source code or any supporting source code
@@ -14,7 +14,7 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
  You may not change or alter any portion of this comment or credits
  of supporting developers from this source code or any supporting source code
@@ -14,40 +14,40 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$
  */
- 
+ 
 $path = dirname(dirname(dirname(dirname(__FILE__))));
-
-include_once $path . '/mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+
+include_once $path . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
 include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
 include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-global $xoopsModule;
-
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-
-// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
-
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
-$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+global $xoopsModule;
 
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
 // Contact Handler
 $contact_handler = & xoops_getModuleHandler ( 'contact', 'contact' );
 
-// Locad admin menu class
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
-	include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
-}else{
-	redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+// Locad admin menu class
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
+	include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+}else{
+	redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
 }
 
 $admin_class = new ModuleAdmin();
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
  You may not change or alter any portion of this comment or credits
  of supporting developers from this source code or any supporting source code
@@ -14,25 +14,25 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$
- */
-
-// Call header
+ */
+
+// Call header
 require dirname(__FILE__) . '/header.php';
-// Display Admin header
-xoops_cp_header();
+// Display Admin header
+xoops_cp_header();
 
-// Display Admin menu class
+// Display Admin menu class
 $admin_class->addInfoBox(_AM_CONTACT_INDEX_ADMENU1);
-$admin_class->addInfoBoxLine(_AM_CONTACT_INDEX_ADMENU1, _AM_CONTACT_INDEX_TOTAL, $contact_handler->Contact_GetCount('contact_cid'));
+$admin_class->addInfoBoxLine(_AM_CONTACT_INDEX_ADMENU1, _AM_CONTACT_INDEX_TOTAL, $contact_handler->Contact_GetCount('contact_cid'));
 $xoopsTpl->assign('navigation', $admin_class->addNavigation('index.php'));
 $xoopsTpl->assign('renderindex', $admin_class->renderIndex());
 
-// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.html');
-// Call footer
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.html');
+// Call footer
 require dirname(__FILE__) . '/footer.php';
 ?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,23 +1,23 @@
 <?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- 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.
-*/
-
-/**
- * Contact module
- *
- * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
- * @author      Trabis <lus...@gm...>
- * @author      Hossein Azizabadi (AKA Voltan)
- * @version     $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author      Kazumi Ono (aka Onokazu)
+ * @author      Trabis <lus...@gm...>
+ * @author      Hossein Azizabadi (AKA Voltan)
+ * @version     $Id$
  */
 
 defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
@@ -40,12 +40,12 @@
 $adminmenu[$i]["title"] = _MI_CONTACT_MENU_CONTACT;
 $adminmenu[$i]["link"]  = "admin/contact.php";
 $adminmenu[$i]["desc"] = _MI_CONTACT_MENU_CONTACT_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/content.png';
+$adminmenu[$i]["icon"] = $pathIcon32.'/content.png';
 $i++;
 $adminmenu[$i]["title"] = _MI_CONTACT_MENU_TOOLS;
 $adminmenu[$i]["link"]  = "admin/tools.php";
 $adminmenu[$i]["desc"] = _MI_CONTACT_MENU_TOOLS_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/exec.png';
+$adminmenu[$i]["icon"] = $pathIcon32.'/exec.png';
 $i++;
 $adminmenu[$i]["title"] = _MI_CONTACT_MENU_ABOUT;
 $adminmenu[$i]["link"]  = "admin/about.php";

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
  You may not change or alter any portion of this comment or credits
  of supporting developers from this source code or any supporting source code
@@ -14,20 +14,20 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$
- */
-
-// Call header
+ */
+
+// Call header
 require dirname(__FILE__) . '/header.php';
-// Display Admin header
+// Display Admin header
 xoops_cp_header();
 // Define default value
 $op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
 
-switch ($op)
+switch ($op)
 {
 	case 'list':
 		// prune manager
@@ -54,8 +54,8 @@
 }	
 
 $xoopsTpl->assign('navigation', $admin_class->addNavigation('tools.php'));
-// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.html');
-// Call footer
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.html');
+// Call footer
 require dirname(__FILE__) . '/footer.php';
 ?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
  You may not change or alter any portion of this comment or credits
  of supporting developers from this source code or any supporting source code
@@ -14,7 +14,7 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -14,7 +14,7 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/header.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/header.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/header.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
  You may not change or alter any portion of this comment or credits
  of supporting developers from this source code or any supporting source code
@@ -14,7 +14,7 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
  You may not change or alter any portion of this comment or credits
  of supporting developers from this source code or any supporting source code
@@ -14,10 +14,10 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$
- */
+ */
 
 ?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
  You may not change or alter any portion of this comment or credits
  of supporting developers from this source code or any supporting source code
@@ -14,7 +14,7 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$
@@ -47,7 +47,7 @@
 			) ENGINE=MyISAM;";	
 	 	 $db->query($sql); 
 	 }
-
+
 }
 
 ?>
\ No newline at end of file

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/index.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/index.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/index.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
  You may not change or alter any portion of this comment or credits
  of supporting developers from this source code or any supporting source code
@@ -14,7 +14,7 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$
@@ -32,8 +32,8 @@
 
 switch($op) {
 	case 'form': default:
-	   $obj = $contact_handler->create();
-		$form = $obj->Contact_ContactForm($department);
+	   $obj = $contact_handler->create();
+		$form = $obj->Contact_ContactForm($department);
 		$xoopsTpl->assign('form', $form->render());
 		$xoopsTpl->assign('breadcrumb', '<a href="' . XOOPS_URL . '">' . _YOURHOME . '</a>  &raquo; ' . $xoopsModule->name());
 		$xoopsTpl->assign('info', xoops_getModuleOption('contact_info','contact'));
@@ -47,11 +47,11 @@
 		} else {
 			
 			// check captcha	
-		   xoops_load("captcha");
-			$xoopsCaptcha = XoopsCaptcha::getInstance();
-			if ( !$xoopsCaptcha->verify() ) {
+		   xoops_load("captcha");
+			$xoopsCaptcha = XoopsCaptcha::getInstance();
+			if ( !$xoopsCaptcha->verify() ) {
 				redirect_header ( "javascript:history.go(-1)", 1, $xoopsCaptcha->getMessage() );
-				exit();
+				exit();
 			}
 	      
 	      // check email

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -4,15 +4,15 @@
 
 // The name of this module
 define("_MI_CONTACT_NAME","Contact Us");
-define("_MI_CONTACT_DESC","Email contact page");
+define("_MI_CONTACT_DESC","Contact module with email and DB storage");
 
 // Admin menu
 define('_MI_CONTACT_MENU_HOME',"Home"); 
 define("_MI_CONTACT_MENU_HOME_DESC","Go back to Home");
 define('_MI_CONTACT_MENU_CONTACT',"Messages");
 define("_MI_CONTACT_MENU_CONTACT_DESC","List of Messages");
-define('_MI_CONTACT_MENU_TOOLS',"Tools"); 
-define("_MI_CONTACT_MENU_TOOLS_DESC","Module Tools");
+define('_MI_CONTACT_MENU_TOOLS',"Purge");
+define("_MI_CONTACT_MENU_TOOLS_DESC","Purge Tools");
 define("_MI_CONTACT_MENU_ABOUT",  "About");
 define("_MI_CONTACT_MENU_ABOUT_DESC" , "About this module");
 define("_MI_CONTACT_MENU_HELP","Help");
@@ -44,7 +44,7 @@
 ."dept1,email1|dept2,email2|dept3,email3 etc. - each department and email must be separated<br />"
 ."by a comma ',', and each department email combination must be separated by a pipe '|'");
 
-define("_MI_CONTACT_PERPAGE","Per page");
+define("_MI_CONTACT_PERPAGE","Messages per page");
 define("_MI_CONTACT_PERPAGE_DESC","");
 
 define("_MI_CONTACT_TOPINFO","Header contact form");

Modified: XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php	2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php	2012-09-26 09:52:13 UTC (rev 10191)
@@ -14,7 +14,7 @@
  *
  * @copyright   The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author      Kazumi Ono (AKA Voltan)
+ * @author      Kazumi Ono (aka Onokazu)
  * @author      Trabis <lus...@gm...>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @version     $Id$
@@ -30,8 +30,8 @@
 $modversion['version'] = 1.8;
 $modversion['description'] = _MI_CONTACT_DESC;
 $modversion['credits'] = 'The XOOPS Project, Mohtava Project';
-$modversion['author'] = 'Kazumi Ono (Onokazu), modified by Trabis, rewrite by Voltan';
-$modversion['nickname'] = 'Kazumi Ono, Trabis, Voltan';
+$modversion['author'] = 'Kazumi Ono (Onokazu), modified by Trabis, rewritten by Voltan';
+$modversion['nickname'] = '';
 $modversion['help'] = 'page=help';
 $modversion['license'] = 'GNU GPL 2.0';
 $modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.