[xoops-svn] SF.net SVN: xoops-svn:[10474] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules /system

[<du...@us...>]

Revision: 10474
          http://sourceforge.net/p/xoops/svn/10474
Author:   dugris
Date:     2012-12-19 23:02:28 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
Fix rev: 10403 (preferences : Email setup)

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php	2012-12-19 21:49:59 UTC (rev 10473)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php	2012-12-19 23:02:28 UTC (rev 10474)
@@ -46,6 +46,7 @@
 define("_MI_SYSTEM_GENERAL", "General Settings");
 define("_MI_SYSTEM_USERSETTINGS", "User Info Settings");
 define("_MI_SYSTEM_METAFOOTER", "Meta Tags and Footer");
+define("_MI_SYSTEM_MAIL", "Email Setup");
 define("_MI_SYSTEM_CENSOR", "Word Censoring Options");
 define("_MI_SYSTEM_AUTHENTICATION", "Authentication Options");
 define("_MI_SYSTEM_SITEPREFERENCE_ANON", "Anonymous");

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php	2012-12-19 21:49:59 UTC (rev 10473)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php	2012-12-19 23:02:28 UTC (rev 10474)
@@ -195,6 +195,9 @@
 $modversion['configcat']['meta']['name'] = _MI_SYSTEM_METAFOOTER;
 $modversion['configcat']['meta']['description'] = '';
 $i++;
+$modversion['configcat']['mail']['name'] = _MI_SYSTEM_MAIL;
+$modversion['configcat']['mail']['description'] = '';
+$i++;
 $modversion['configcat']['censor']['name'] = _MI_SYSTEM_CENSOR;
 $modversion['configcat']['censor']['description'] = '';
 $i++;
@@ -636,6 +639,72 @@
 $modversion['config'][$i]['valuetype'] = 'text';
 $modversion['config'][$i]['default'] = "Powered by XOOPS &#169; 2001-" . date('Y', time()) . " <a href=\"http://xoops.sourceforge.net\" rel=\"external\" title=\"The XOOPS Project\">The XOOPS Project</a>";
 $i++;
+// Category mail
+$modversion['config'][$i]['name'] = 'from';
+$modversion['config'][$i]['title'] = '_MD_AM_MAILFROM';
+$modversion['config'][$i]['description'] = '_MD_AM_MAILFROMDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '';
+$i++;
+$modversion['config'][$i]['name'] = 'fromname';
+$modversion['config'][$i]['title'] = '_MD_AM_MAILFROMNAME';
+$modversion['config'][$i]['description'] = '_MD_AM_MAILFROMNAMEDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '';
+$i++;
+$modversion['config'][$i]['name'] = 'fromuid';
+$modversion['config'][$i]['title'] = '_MD_AM_MAILFROMUID';
+$modversion['config'][$i]['description'] = '_MD_AM_MAILFROMUIDDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'user';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'mailmethod';
+$modversion['config'][$i]['title'] = '_MD_AM_MAILERMETHOD';
+$modversion['config'][$i]['description'] = '_MD_AM_MAILERMETHODDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['options'] = array('PHP mail()' => 'mail', 'sendmail' => 'sendmail', 'SMTP' => 'smtp', 'SMTPAuth' => 'smtpauth');
+$modversion['config'][$i]['default'] = 'mail';
+$i++;
+$modversion['config'][$i]['name'] = 'sendmailpath';
+$modversion['config'][$i]['title'] = '_MD_AM_SENDMAILPATH';
+$modversion['config'][$i]['description'] = '_MD_AM_SENDMAILPATHDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '/usr/sbin/sendmail';
+$i++;
+$modversion['config'][$i]['name'] = 'smtphost';
+$modversion['config'][$i]['title'] = '_MD_AM_SMTPHOST';
+$modversion['config'][$i]['description'] = '_MD_AM_SMTPHOSTDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'textarea';
+$modversion['config'][$i]['valuetype'] = 'array';
+$modversion['config'][$i]['default'] = 'a:1:{i:0;s:0:\"\";}';
+$i++;
+$modversion['config'][$i]['name'] = 'smtpuser';
+$modversion['config'][$i]['title'] = '_MD_AM_SMTPUSER';
+$modversion['config'][$i]['description'] = '_MD_AM_SMTPUSERDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '';
+$i++;
+$modversion['config'][$i]['name'] = 'smtppass';
+$modversion['config'][$i]['title'] = '_MD_AM_SMTPPASS';
+$modversion['config'][$i]['description'] = '_MD_AM_SMTPPASSDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'password';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '';
+$i++;
 // Category censor
 $modversion['config'][$i]['name'] = 'censor_enable';
 $modversion['config'][$i]['title'] = '_MD_AM_DOCENSOR';