[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11313] property: more on request
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11313] property: more on request |
|
Date: |
Mon, 23 Sep 2013 13:28:41 +0000 |
Revision: 11313
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11313
Author: sigurdne
Date: 2013-09-23 13:28:38 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
property: more on request
Modified Paths:
--------------
trunk/registration/inc/class.soreg.inc.php
trunk/registration/templates/base/config.tpl
Modified: trunk/registration/inc/class.soreg.inc.php
===================================================================
--- trunk/registration/inc/class.soreg.inc.php 2013-09-23 11:22:48 UTC (rev
11312)
+++ trunk/registration/inc/class.soreg.inc.php 2013-09-23 13:28:38 UTC (rev
11313)
@@ -77,8 +77,34 @@
. time() . "', reg_info='" .
base64_encode(serialize($fields))
. "' WHERE
reg_lid='$account_lid'",__LINE__,__FILE__);
+ $smtp = createobject('phpgwapi.send');
+
if ($this->config['activate_account'] ==
'pending_approval' )
{
+
+ $url =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'registration.uipending.index', 'domain' =>
$_REQUEST['logindomain']),false,true);
+ $body = <<<HTML
+
+ New user: {$info['n_given']} {$info['n_family']} is pending approval
for
{$GLOBALS['phpgw_info']['server']['system_name']}::{$GLOBALS['phpgw_info']['server']['site_title']}.
+ Click on the following link to manage pending approvals.
+
+ <a href='$url'>Login.</a>
+
+HTML;
+ $body = nl2br($body);
+ $subject = lang('Account registration');
+ $noreply = 'No reply <noreply@' .
$GLOBALS['phpgw_info']['server']['hostname'] . '>';
+ if($this->config['registration_admin'])
+ {
+ try
+ {
+
$smtp->msg('email',$this->config['registration_admin'],$subject,$body,'','','',$noreply,'','html');
+ }
+ catch(Exception $e)
+ {
+ }
+ }
+
return $this->reg_id;
}
@@ -101,7 +127,7 @@
{$support_email_text} {$support_email}
HTML;
- $body = nl2br($body);
+ $body = nl2br($body);
}
else
{
@@ -136,8 +162,6 @@
$subject = $this->config['subject_confirm'] ?
lang($this->config['subject_confirm']) : lang('Account registration');
$noreply = $this->config['mail_nobody'] ? ('No reply <'
. $this->config['mail_nobody'] . '>') : ('No reply <noreply@' .
$GLOBALS['phpgw_info']['server']['hostname'] . '>');
- $smtp = createobject('phpgwapi.send');
-
try
{
$smtp->msg('email',$fields['email'],$subject,$body,'','','',$noreply,'','html');
Modified: trunk/registration/templates/base/config.tpl
===================================================================
--- trunk/registration/templates/base/config.tpl 2013-09-23 11:22:48 UTC
(rev 11312)
+++ trunk/registration/templates/base/config.tpl 2013-09-23 13:28:38 UTC
(rev 11313)
@@ -82,7 +82,13 @@
<td>{lang_Anonymous_password}:</td>
<td><input type="password" name="newsettings[anonymous_pass]"
value="{value_anonymous_pass}"></td>
</tr>
+
<tr bgcolor="{row_on}">
+ <td>{lang_Email_address_registration_admin}:</td>
+ <td><input name="newsettings[registration_admin]"
value="{value_registration_admin}"></td>
+ </tr>
+
+ <tr bgcolor="{row_on}">
<td>{lang_Email_address_to_send_notices_from}:</td>
<td><input name="newsettings[mail_nobody]"
value="{value_mail_nobody}"></td>
</tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11313] property: more on request,
Sigurd Nes <=