[Vtigercrm-commits] [vtiger-commits] r9931 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Settings/ modules/Settings/language/ modules/Users/ modules/Users/language/ modules/Webmails/

vtigercrm-commits at vtiger.fosslabs.com vtigercrm-commits at vtiger.fosslabs.com
Fri Dec 1 08:19:01 EST 2006 

Author: richie
Date: Fri Dec  1 06:18:44 2006
New Revision: 9931

Log:
* Non admin users are allowed to confifure their own incoming mail server by done these changes

Added:
    vtigercrm/branches/5.0.3/modules/Users/AddMailAccount.php
    vtigercrm/branches/5.0.3/modules/Users/SaveMailAccount.php
Removed:
    vtigercrm/branches/5.0.3/modules/Settings/AddMailAccount.php
    vtigercrm/branches/5.0.3/modules/Settings/SaveMailAccount.php
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl Fri Dec  1 06:18:44 2006
@@ -21,7 +21,7 @@
                         <hr noshade="noshade" size="1"><br>
 
   		<form action="index.php" method="post" name="EditView" id="form">
-			<input type="hidden" name="module" value="Settings">
+			<input type="hidden" name="module" value="Users">
 		  	<input type="hidden" name="action">
   			<input type="hidden" name="server_type" value="email">
 			<input type="hidden" name="record" value="{$ID}">

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl Fri Dec  1 06:18:44 2006
@@ -66,7 +66,7 @@
 </script>
 		{include file='Buttons_List.tpl'}
 <script language="JavaScript" type="text/javascript" src="modules/Emails/Email.js"></script>
-<div id="mailconfchk" class="small" style="position:absolute;display:none;left:350px;top:160px;height:27px;white-space:nowrap;z-index:10000007px;"><font color='red'><b>{$MOD.LBL_CONFIGURE_MAIL_SETTINGS}.<br> {$APP.LBL_PLEASE_CLICK} <a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}">{$APP.LBL_HERE}</a> {$APP.LBL_TO_CONFIGURE}</b></font></div>
+<div id="mailconfchk" class="small" style="position:absolute;display:none;left:350px;top:160px;height:27px;white-space:nowrap;z-index:10000007px;"><font color='red'><b>{$MOD.LBL_CONFIGURE_MAIL_SETTINGS}.<br> {$APP.LBL_PLEASE_CLICK} <a href="index.php?module=Users&action=AddMailAccount&record={$USERID}">{$APP.LBL_HERE}</a> {$APP.LBL_TO_CONFIGURE}</b></font></div>
 <!-- Shadow starts here -->
 <table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
 	<tr>
@@ -96,7 +96,7 @@
 												</td>
 												<td nowrap style="padding-left:20px;padding-right:20px" class=small>
 												<img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />
-							&nbsp;<a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}" >{$MOD.LBL_SETTINGS}</a>
+							&nbsp;<a href="index.php?module=Users&action=AddMailAccount&record={$USERID}" >{$MOD.LBL_SETTINGS}</a>
 												</td>
 											</tr>
 											</table>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Fri Dec  1 06:18:44 2006
@@ -37,7 +37,7 @@
 							</td>
 							<td width="10%">
 								<img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />
-								&nbsp;<a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}" class="webMnu">{$MOD.LBL_SETTINGS}</a>
+								&nbsp;<a href="index.php?module=Users&action=AddMailAccount&record={$USERID}" class="webMnu">{$MOD.LBL_SETTINGS}</a>
 							</td>
 							<!--td width="12%">
 								<img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Dec  1 06:18:44 2006
@@ -510,58 +510,11 @@
 
 'LBL_RSS_CATEGORY'=>'Rss Category',
 
-//Added for Web based Email client integration (post 4.0.1 release)
-
-'LBL_ADD_MAIL_ACCOUNT'=>'Add Mail Account',
-'LBL_NEW_MAIL_ACCOUNT_TITLE'=>'New Mail Account [Alt+M]',
-'LBL_NEW_MAIL_ACCOUNT_KEY'=>'M',
-'LBL_NEW_MAIL_ACCOUNT_LABEL'=>'New Mail Account',
-'LBL_GENERAL_INFO'=>'General Information',
-'LBL_DISPLAY_NAME'=>'Display Name',
-'LBL_MAIL_PROTOCOL'=>'Mail Protocol',
-'LBL_LIST_PASSWORD'=>'Password',
-'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
-'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
-'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server',
-'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
-'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
-'LBL_TEST_BUTTON_KEY'=>'T',
-'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
-'LBL_DEFAULT'=>'Default',
-'LBL_IMAP2'=>'IMAP2',
-'LBL_IMAP4'=>'IMAP4',
-'LBL_POP'=>'POP',
-'LBL_IMAP'=>'IMAP',
-'LBL_MAIL_DISCLAIM'=>'Items marked with <font color="red">*</font> are required<br>Items marked with <font color="red">* *</font> are not fully supported',
-'LBL_SSL_OPTIONS'=>'SSL Options',
-'LBL_TLS'=>'TLS',
-'LBL_NO_TLS'=>'No TLS',
-'LBL_CERT_VAL'=>'Certificate Validations',
-'LBL_INT_MAILER'=>'Use Internal Mailer?',
-'LBL_INT_MAILER_USE'=>'Yes',
-'LBL_INT_MAILER_NOUSE'=>'No',
-'LBL_VAL_SSL_CERT'=>'Validate SSL Cert',
-'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert',
-'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration',
-'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail',
-'LBL_LIST_MAIL_ACCOUNT'=>'  List Mail Account',
 'LBL_USAGEUNIT'=>'Usage Unit',
 'LBL_GLACCT'=>'GL Account',
 'LBL_QUOTE_STAGE'=>'Quote Stage',
 'LBL_CARRIER'=>'Carrier',
 'LBL_TAXCLASS'=>'Tax Class',
-'LBL_MY_DETAILS'=>'My Details',
-'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details',
-'LBL_EMAIL_ID'=>'Email ID',
-'LBL_NAME_EXAMPLE'=>'(example : John Fenner)',
-'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at xyz.com)',
-'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout',
-'LBL_1_MIN'=>'1 minute',
-'LBL_2_MIN'=>'2 minutes',
-'LBL_3_MIN'=>'3 minutes',
-'LBL_4_MIN'=>'4 minutes',
-'LBL_5_MIN'=>'5 minutes',
-'LBL_EMAILS_PER_PAGE'=>'Emails per Page',
 
 //Added for Organization Details (4.2 release)
 'LBL_ORGANIZATION_NAME'=>'Company Name',

Modified: vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php Fri Dec  1 06:18:44 2006
@@ -611,6 +611,56 @@
 
 'LBL_ASSIGN_ROLE'=>'Assign Role',
 
+//Moved from Settings to here for Webmail client integration (for 5.0.3 release)
+
+'LBL_ADD_MAIL_ACCOUNT'=>'Add Mail Account',
+'LBL_NEW_MAIL_ACCOUNT_TITLE'=>'New Mail Account [Alt+M]',
+'LBL_NEW_MAIL_ACCOUNT_KEY'=>'M',
+'LBL_NEW_MAIL_ACCOUNT_LABEL'=>'New Mail Account',
+'LBL_GENERAL_INFO'=>'General Information',
+'LBL_DISPLAY_NAME'=>'Display Name',
+'LBL_MAIL_PROTOCOL'=>'Mail Protocol',
+'LBL_LIST_PASSWORD'=>'Password',
+'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
+'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
+'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server',
+'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
+'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
+'LBL_TEST_BUTTON_KEY'=>'T',
+'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
+'LBL_DEFAULT'=>'Default',
+'LBL_IMAP2'=>'IMAP2',
+'LBL_IMAP4'=>'IMAP4',
+'LBL_POP'=>'POP',
+'LBL_IMAP'=>'IMAP',
+'LBL_MAIL_DISCLAIM'=>'Items marked with <font color="red">*</font> are required<br>Items marked with <font color="red">* *</font> are not fully supported',
+'LBL_SSL_OPTIONS'=>'SSL Options',
+'LBL_TLS'=>'TLS',
+'LBL_NO_TLS'=>'No TLS',
+'LBL_CERT_VAL'=>'Certificate Validations',
+'LBL_INT_MAILER'=>'Use Internal Mailer?',
+'LBL_INT_MAILER_USE'=>'Yes',
+'LBL_INT_MAILER_NOUSE'=>'No',
+'LBL_VAL_SSL_CERT'=>'Validate SSL Cert',
+'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert',
+'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration',
+'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail',
+'LBL_LIST_MAIL_ACCOUNT'=>'  List Mail Account',
+'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details',
+'LBL_MY_DETAILS'=>'My Details',
+'LBL_EMAIL_ID'=>'Email ID',
+'LBL_EMAIL_ADDRESS'=>'Email',
+'LBL_NAME_EXAMPLE'=>'(example : John Fenner)',
+'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at xyz.com)',
+'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout',
+'LBL_1_MIN'=>'1 minute',
+'LBL_2_MIN'=>'2 minutes',
+'LBL_3_MIN'=>'3 minutes',
+'LBL_4_MIN'=>'4 minutes',
+'LBL_5_MIN'=>'5 minutes',
+'LBL_EMAILS_PER_PAGE'=>'Emails per Page',
+
+
 );
 
 ?>

Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Fri Dec  1 06:18:44 2006
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*********************************************************************************
  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
   * ("License"); You may not use this file except in compliance with the License
@@ -167,7 +167,7 @@
 			{
 				global $current_user;
 				$this->db->println("CONNECTION ERROR - Could not be connected to the server using imap_open function through the connection strings $connectString and $connectString1");
-				echo "<br>&nbsp;<b>Could not connect to the server. Please check the server details <a href='index.php?module=Settings&action=AddMailAccount&record=".$current_user->id."'> Here </a></b>";
+				echo "<br>&nbsp;<b>Could not connect to the server. Please check the server details <a href='index.php?module=Users&action=AddMailAccount&record=".$current_user->id."'> Here </a></b>";
 				exit;
 			}
 		}

More information about the vtigercrm-commits mailing list