Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Add a parameter to force old-school external email
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdujeu
cdujeu committed Oct 17, 2013
1 parent 6f0c41b commit 14d5eb0
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 11 deletions.
34 changes: 26 additions & 8 deletions core/src/plugins/action.share/class.ShareCenter.js
View file
Expand Up @@ -129,6 +129,9 @@ Class.create("ShareCenter", {
conn.onComplete = function(transport){

oForm.down('div#generate_indicator').hide();
if(this.shareFolderMode == 'minisite_public' || this.shareFolderMode == 'minisite_private'){
oForm.down("#share_result").show();
}
var response = transport.responseText;
if(!response.startsWith('http')){
var iResponse = parseInt(response);
Expand Down Expand Up @@ -243,6 +246,9 @@ Class.create("ShareCenter", {
this._currentRepositoryLink = null;
this._currentRepositoryLabel = null;
if(nodeMeta.get("ajxp_shared")){
if (this.shareFolderMode != 'workspace'){
oForm.down('#share_result').show();
}
oForm.down('div#share_generate').hide();
oForm.down('div#share_unshare').show();
oForm.down('#unshare_button').observe("click", this.performUnshareAction.bind(this));
Expand Down Expand Up @@ -707,7 +713,7 @@ Class.create("ShareCenter", {
}.bind(this));
}
}
if(ajaxplorer.hasPluginOfType("mailer")){
var forceOldSchool = ajaxplorer.getPluginConfigs("ajxp_plugin[@id='action.share']").get("EMAIL_INVITE_EXTERNAL");
var mailerButton;
if(dialogButtonsOrRow.hasClassName('SF_horizontal_fieldsRow')){
if(!dialogButtonsOrRow.down('#mailer_button')){
Expand All @@ -724,6 +730,8 @@ Class.create("ShareCenter", {
unShare.insert({after:mailerButton});
mailerButton.writeAttribute("title", MessageHash["share_center.41"]);
}

if(ajaxplorer.hasPluginOfType("mailer") && !forceOldSchool){
mailerButton.observe("click", function(event){
Event.stop(event);
if(shareType == "file"){
Expand Down Expand Up @@ -751,14 +759,24 @@ Class.create("ShareCenter", {
});
}.bind(this));
}else{

/*
// SEND EMAIL THE OLD WAY?
var email = oForm.down('a[id="email"]');
if (email){
email.setAttribute('href', 'mailto:unknown@unknown.com?Subject=UPLOAD&Body='+transport.responseText);
var subject = encodeURIComponent(MessageHash["share_center.44"].replace("%s", ajaxplorer.appTitle));
var body;
if(shareType == 'file'){
body = dialogButtonsOrRow.down('[name="link_url"]').getValue();
mailerButton.update('<a href="mailto:unknown@unknown.com?Subject='+subject+'&Body='+body+'"> invite</a>');
}else{
body = this.shareFolderMode != 'workspace' ? dialogButtonsOrRow.up('.dialogContent').down('#share_container').getValue() : 'A folder was shared with you';
mailerButton.down('span').update('<a href="mailto:unknown@unknown.com?Subject='+subject+'&Body='+body+'"> invite</a>');
}
*/
mailerButton.down('a').observe("click", function(e){
var body;
if(shareType == 'file'){
body = dialogButtonsOrRow.down('[name="link_url"]').getValue();
}else{
body = this.shareFolderMode != 'workspace' ? dialogButtonsOrRow.up('.dialogContent').down('#share_container').getValue() : 'A folder was shared with you';
}
e.target.href = 'mailto:unknown@unknown.com?Subject='+subject+'&Body='+body;
}.bind(this));

}
},
Expand Down
8 changes: 5 additions & 3 deletions core/src/plugins/action.share/manifest.xml
View file
Expand Up @@ -5,6 +5,7 @@
<global_param name="HASH_MIN_LENGTH" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Minimum length of the generated hash]" label="CONF_MESSAGE[Hash minimum length]" type="integer" default="6"/>
<global_param name="FILE_MAX_EXPIRATION" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Maximum share expiration limit for file, 0 = unlimited]" label="CONF_MESSAGE[Maximum file expiration limit]" type="integer" default="0" expose="true"/>
<global_param name="FILE_MAX_DOWNLOAD" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Maximum download limit for file, 0 = unlimited]" label="CONF_MESSAGE[Maximum file download limit]" type="integer" default="0" expose="true"/>
<global_param name="EMAIL_INVITE_EXTERNAL" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Use external mailer for invitations]" label="CONF_MESSAGE[Force External Mailer]" type="boolean" default="false" expose="true"/>
<global_param name="AVOID_SHARED_FOLDER_SAME_LABEL" group="CONF_MESSAGE[Folder Sharing]" description="CONF_MESSAGE[Disallow users to create shared folders if a workspace already exists with the same label]" label="CONF_MESSAGE[Avoid labels duplication]" type="boolean" default="true"/>
<!--
<global_param name="SHARED_USERS_LIST_MINIMUM" group="CONF_MESSAGE[Shared users configurations]" description="CONF_MESSAGE[Minimum number of characters to start getting results by auto-completion when sharing a folder with other users]" label="CONF_MESSAGE[Autocomplete minimum chars]" type="integer" default="2" expose="true"/>
Expand Down Expand Up @@ -202,7 +203,7 @@
</div>
</div>
</div>
<div style="display:none;position:relative;margin-bottom:0;" id="share_result" class="mode-minipub mode-minipriv">
<div style="display:none;position:relative;margin-bottom:0;" id="share_result" class="">
<div class="dialogContentMainTitle" ajxp_message_id="share_center.29">AJXP_MESSAGE[share_center.29]</div>
<div id="generate_indicator" style="position:absolute;top:2px;right:4px;display:none;"><img src="AJXP_THEME_FOLDER/images/autocompleter-loader.gif"></div>
<textarea id="share_container" style="padding: 4px;width: 266px;height: 33px;margin:0 10px; font-size:13px;"></textarea>
Expand Down Expand Up @@ -258,7 +259,7 @@
<div id="handle_existing_links" class="SF_horizontal_actions SF_horizontal_pastilles"></div>
<div style="clear:left;">
<input type="text" placeholder="Link" name="link_url" id="share_container" class="SF_input SF_number" style="width:230px !important;">
<input type="text" placeholder="Tags" name="link_tag" value="" class="SF_input SF_number" style="width:93px !important;">
<input type="text" placeholder="Tag (Enter to save)" name="link_tag" value="" class="SF_input SF_number" style="width:93px !important;">
</div>
<div id="handle_existing_links" class="SF_horizontal_actions">
<span data-action="remove" class="SF_horizontal_action icon-minus-sign"></span>
Expand Down Expand Up @@ -317,6 +318,7 @@
<img src="AJXP_THEME_FOLDER/images/actions/16/editdelete.png" height="16" width="16" id="stop_sharing_indicator" valign="middle"> <span>AJXP_MESSAGE[share_center.6]</span>
</div>
</div>
<br style="clear:both;"/>
</div>
<div id="target_user_title" class="mode-ws" style="margin-top: 25px;">
<div class="dialogContentMainTitle" ajxp_message_id="share_center.30" style="display:none;">AJXP_MESSAGE[share_center.30]</div>
Expand Down Expand Up @@ -349,7 +351,7 @@
</div>
</div>
</div>
<div style="display:none;position:relative;margin-bottom:0;" id="share_result" class="mode-minipub mode-minipriv">
<div style="display:none;position:relative;margin-bottom:0;" id="share_result" class="">
<div class="dialogContentMainTitle" ajxp_message_id="share_center.29">AJXP_MESSAGE[share_center.29]</div>
<div id="generate_indicator" style="position:absolute;top:2px;right:4px;display:none;"><img src="AJXP_THEME_FOLDER/images/autocompleter-loader.gif"></div>
<input type="text" id="share_container" style="width: 317px; margin:0 5px; font-size:13px;"/>
Expand Down

0 comments on commit 14d5eb0

Please sign in to comment.