Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[5664] branches/1.0/package/webinterface/altweb
|
From: <abe...@us...> - 2012-09-05 21:19:10
|
Revision: 5664
http://astlinux.svn.sourceforge.net/astlinux/?rev=5664&view=rev
Author: abelbeck
Date: 2012-09-05 21:19:04 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
web interface, Users tab honors a new Prefs tab option to remove voicemail data when a user is deleted, and Voicemail tab, create 'Old' voicemail folder if it doesn't exist
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/prefs.php
branches/1.0/package/webinterface/altweb/admin/users.php
branches/1.0/package/webinterface/altweb/admin/voicemail.php
branches/1.0/package/webinterface/altweb/common/version.php
Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php 2012-09-04 21:28:09 UTC (rev 5663)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php 2012-09-05 21:19:04 UTC (rev 5664)
@@ -240,6 +240,10 @@
$value = 'users_voicemail_hide_pass = yes';
fwrite($fp, $value."\n");
}
+ if (isset($_POST['users_delete_vmdata'])) {
+ $value = 'users_voicemail_delete_vmdata = yes';
+ fwrite($fp, $value."\n");
+ }
$value = 'users_voicemail_context_cmdstr = "'.trim($_POST['voicemail_context']).'"';
fwrite($fp, $value."\n");
$value = 'users_voicemail_reload_cmdstr = "'.trim($_POST['voicemail_reload']).'"';
@@ -780,6 +784,11 @@
putHtml('<tr class="dtrow1"><td style="text-align: right;">');
$sel = (getPREFdef($global_prefs, 'users_voicemail_hide_pass') === 'yes') ? ' checked="checked"' : '';
putHtml('<input type="checkbox" value="users_hide_pass" name="users_hide_pass"'.$sel.' /></td><td colspan="5">Hide Passwords for Voicemail Users Mailboxes</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: right;">');
+ $sel = (getPREFdef($global_prefs, 'users_voicemail_delete_vmdata') === 'yes') ? ' checked="checked"' : '';
+ putHtml('<input type="checkbox" value="users_delete_vmdata" name="users_delete_vmdata"'.$sel.' /></td><td colspan="5">Remove User Voicemail Data when User is Deleted</td></tr>');
+
putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="3">Voicemail Users Context:</td><td colspan="3">');
if (($value = getPREFdef($global_prefs, 'users_voicemail_context_cmdstr')) === '') {
$value = 'default';
Modified: branches/1.0/package/webinterface/altweb/admin/users.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/users.php 2012-09-04 21:28:09 UTC (rev 5663)
+++ branches/1.0/package/webinterface/altweb/admin/users.php 2012-09-05 21:19:04 UTC (rev 5664)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008-2011 Lonnie Abelbeck
+// Copyright (C) 2008-2012 Lonnie Abelbeck
// This is free software, licensed under the GNU General Public License
// version 3 as published by the Free Software Foundation; you can
// redistribute it and/or modify it under the terms of the GNU
@@ -8,6 +8,7 @@
// users.php for AstLinux
// 07-29-2008
+// 09-05-2012, Support Prefs option to remove user VM data when mailbox is deleted
//
// System location of the asterisk voicemail.conf
$VOICEMAILCONF = '/etc/asterisk/voicemail.conf';
@@ -114,6 +115,7 @@
// Function: delVMmailbox
//
function delVMmailbox($context, $mbox, $fname) {
+ global $global_prefs;
shell('sed -i "/^\['.$context.'\]/,/^\[/ s/^'.$mbox.'[ ]*[=][> ]*[-*0-9]*,.*/;deleted;&/" '.$fname.' >/dev/null', $status);
@@ -121,6 +123,14 @@
$status = 1;
} else {
delHTpasswd($mbox);
+ # Optionally remove the local VM data for mbox
+ if (getPREFdef($global_prefs, 'users_voicemail_delete_vmdata') === 'yes') {
+ if ($context !== '' && $mbox !== '') { // Sanity check
+ if (is_dir($VMdata = '/var/spool/asterisk/voicemail/'.$context.'/'.$mbox)) {
+ shell('rm -rf '.$VMdata, $ret_val);
+ }
+ }
+ }
}
return($status);
}
Modified: branches/1.0/package/webinterface/altweb/admin/voicemail.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/voicemail.php 2012-09-04 21:28:09 UTC (rev 5663)
+++ branches/1.0/package/webinterface/altweb/admin/voicemail.php 2012-09-05 21:19:04 UTC (rev 5664)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008 Lonnie Abelbeck
+// Copyright (C) 2008-2012 Lonnie Abelbeck
// This is free software, licensed under the GNU General Public License
// version 3 as published by the Free Software Foundation; you can
// redistribute it and/or modify it under the terms of the GNU
@@ -11,6 +11,7 @@
// 06-04-2008, Added multi-user support
// 07-20-2008, Added special user "staff" permissions
// 07-21-2008, Added externnotify support
+// 09-05-2012, Automatically create "Old" folder if it doesn't exist
//
// System location of the asterisk voicemail directory
$VOICEMAILDIR = '/var/spool/asterisk/voicemail/';
@@ -254,6 +255,10 @@
$msg['folder'] = $tokens[2];
$msg['basename'] = $tokens[3];
if ($msg['folder'] === 'INBOX' && $folder === 'Old') {
+ # Later versions of Asterisk no longer automatically create the "Old" folder
+ if (! is_dir($Old = $msg['dir'].$msg['context'].'/'.$msg['mbox'].'/'.$folder)) {
+ @mkdir($Old, 0755);
+ }
return(moveVMmessage($msg, $folder));
} elseif ($msg['folder'] === 'Old' && $folder === 'INBOX') {
return(moveVMmessage($msg, $folder));
Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php 2012-09-04 21:28:09 UTC (rev 5663)
+++ branches/1.0/package/webinterface/altweb/common/version.php 2012-09-05 21:19:04 UTC (rev 5664)
@@ -1,6 +1,6 @@
<?php
// version.php for AstLinux Alternate Web Interface
-$GUI_VERSION = '1.8.15';
+$GUI_VERSION = '1.8.16';
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
