Compare commits
	
		
			4 Commits
		
	
	
		
			11_0_0-25_
			...
			11_0_0-27_
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| fbdf3170ec | |||
| 87d1d072c0 | |||
| d49db26f26 | |||
| c4f9d67abc | 
@@ -0,0 +1,46 @@
 | 
			
		||||
package SrvMngr::Controller::Roundcubepanel;
 | 
			
		||||
 | 
			
		||||
#----------------------------------------------------------------------
 | 
			
		||||
# heading     : System
 | 
			
		||||
# description : Roundcube webmail
 | 
			
		||||
# navigation  : 99999 9999
 | 
			
		||||
#----------------------------------------------------------------------
 | 
			
		||||
#----------------------------------------------------------------------
 | 
			
		||||
# name   : roundcubepanel,    method : get,   url : /roundcubepanel,     ctlact : Roundcubepanel#main
 | 
			
		||||
#
 | 
			
		||||
# routes : end
 | 
			
		||||
#----------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
use strict;
 | 
			
		||||
use warnings;
 | 
			
		||||
 | 
			
		||||
use Mojo::Base 'Mojolicious::Controller';
 | 
			
		||||
 | 
			
		||||
use Locale::gettext;
 | 
			
		||||
use SrvMngr::I18N;
 | 
			
		||||
use SrvMngr qw(theme_list init_session);
 | 
			
		||||
 | 
			
		||||
#use SrvMngr::Model::Main;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
sub main {
 | 
			
		||||
 | 
			
		||||
    my $c = shift;
 | 
			
		||||
    $c->app->log->info($c->log_req);
 | 
			
		||||
 | 
			
		||||
    my $title = $c->l('Roundcube Webmail');
 | 
			
		||||
    my $roundcube_url = $c->param('url');
 | 
			
		||||
    my $roundcube_height = $c->param('height') | 600;
 | 
			
		||||
    $c->stash( title => $title, modul => $roundcube_url, height => $roundcube_height );
 | 
			
		||||
    $c->render(template => 'roundcube');
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
sub getroundcubeurl {
 | 
			
		||||
	my $c = shift;
 | 
			
		||||
	my $url = shift;
 | 
			
		||||
	return "/smanager/roundcube?url=$url";
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
1;
 | 
			
		||||
@@ -76,11 +76,17 @@
 | 
			
		||||
    % 			$actionRemove = "<a href='useraccountsd?CsrfDef=TOKEN&trt=DEL&user=" . $username . "'>" . "<button class='sme-remove-button' title=".l("REMOVE").">".l("REMOVE")."</button></a>"; 
 | 
			
		||||
    %		}
 | 
			
		||||
    %	    }
 | 
			
		||||
    %		
 | 
			
		||||
    %		my $thisdomain = session 'SystemName';
 | 
			
		||||
    %		$thisdomain .= ".".session 'DomainName';
 | 
			
		||||
 | 
			
		||||
    	    <td class='sme-border' style="min-width:35em">
 | 
			
		||||
				<%= $c->render_to_string(inline => $actionModify) %>
 | 
			
		||||
				<%= $c->render_to_string(inline => $actionResetPw) %>
 | 
			
		||||
				<%= $c->render_to_string(inline => $actionLock) %>
 | 
			
		||||
				<%= $c->render_to_string(inline => $actionRemove) %>
 | 
			
		||||
%#				<a href="<%= "https://sme11.thereadclan.me.uk/" %>roundcube?_user=<%= $username %>"><button class="sme-email-button" title="<%= l('EMAIL') %>"><%= l('EMAIL') %></button></a>
 | 
			
		||||
				<a href="<%= "roundcubepanel/?url=https://".$thisdomain."/" %>roundcube?_user=<%= $username %>"><button class="sme-email-button" title="<%= l('EMAIL') %>"><%= l('EMAIL') %></button></a>
 | 
			
		||||
    	    </td>
 | 
			
		||||
    	</tr>
 | 
			
		||||
    %    }
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,39 @@
 | 
			
		||||
% layout 'default', title => "Sme server 2 -  roundcube";
 | 
			
		||||
 | 
			
		||||
% content_for 'module' => begin
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
<div id='roundcube' class='roundcube roundcube-panel'>
 | 
			
		||||
    % if ($config->{debug} == 1) {
 | 
			
		||||
		<p>
 | 
			
		||||
			%= dumper $c->current_route
 | 
			
		||||
		</p>
 | 
			
		||||
    % }
 | 
			
		||||
    % if ( stash 'error' ) {
 | 
			
		||||
    	<br><div class=sme-error>
 | 
			
		||||
			%= $c->render_to_string(inline => stash 'error') 
 | 
			
		||||
		</div>
 | 
			
		||||
    %}
 | 
			
		||||
    <h1> roundcube - <%=$title %></h1><br>
 | 
			
		||||
    <p>If the roundcube panel does not appear after logging in, then please check your password.</p><br />
 | 
			
		||||
 | 
			
		||||
    % my $thisdomain = session 'SystemName';
 | 
			
		||||
    % $thisdomain .= ".".session 'DomainName';
 | 
			
		||||
    % my $url = $c->stash('modul');
 | 
			
		||||
    % my $username = 'admin';
 | 
			
		||||
    % if ($url =~ /[?&]_user=([^&]+)/) {
 | 
			
		||||
	%	$username = $1;
 | 
			
		||||
	%}
 | 
			
		||||
	
 | 
			
		||||
	<a href="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>"><button class="sme-fullwindow1-button" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %></button></a>
 | 
			
		||||
 | 
			
		||||
    % my $height = $c->stash('height') | '600px';
 | 
			
		||||
    % if ($height !~ /px$/) { $height = $height.'px';}
 | 
			
		||||
    % if ($url eq "") {
 | 
			
		||||
	%	$url = "https://".$thisdomain."/roundcube";
 | 
			
		||||
	%}
 | 
			
		||||
	<object id="roundcube" class="roundcube" data="<%=$url %>" style="width:99%;height:<%= $height %>;" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
 | 
			
		||||
</div>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
%end
 | 
			
		||||
@@ -2,7 +2,7 @@ Summary: Sme server  navigation module : manager 2
 | 
			
		||||
%define name smeserver-manager
 | 
			
		||||
Name: %{name}
 | 
			
		||||
%define version 11.0.0
 | 
			
		||||
%define release 25
 | 
			
		||||
%define release 27
 | 
			
		||||
Version: %{version}
 | 
			
		||||
Release: %{release}%{?dist}
 | 
			
		||||
License: GPL
 | 
			
		||||
@@ -113,6 +113,12 @@ true
 | 
			
		||||
%defattr(-,root,root)
 | 
			
		||||
 | 
			
		||||
%changelog
 | 
			
		||||
* Sun Oct 06 2024 Brian Read <brianr@koozali.org> 11.0.0-27.sme
 | 
			
		||||
- Add in change to _user_list.html.ep for access to roundcube email from useraccounts [SME: 12751]
 | 
			
		||||
 | 
			
		||||
* Fri Oct 04 2024 Brian Read <brianr@koozali.org> 11.0.0-26.sme
 | 
			
		||||
- Add in email link to roundcube from user accounts [SME: 12751]
 | 
			
		||||
 | 
			
		||||
* Wed Oct 02 2024 Brian Read <brianr@koozali.org> 11.0.0-25.sme
 | 
			
		||||
- Add in cursor change when save/submit pressed to indicate processing [SME: 12748]
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user