tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merged from branches/2.3

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79439 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-06-17 11:50:02 +00:00
parent 3f9fd08ceb
commit d82ba048bf
4 changed files with 67 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/sitefeatures/PageComment.php
View File

@ -209,8 +209,8 @@ class PageComment_Controller extends Controller {
if(Permission::check('CMS_ACCESS_CMSMain')) { if(Permission::check('CMS_ACCESS_CMSMain')) {
// if spam protection module exists // if spam protection module exists
if(class_exists('SpamProtecterManager')) { if(class_exists('SpamProtectorManager')) {
SpamProtecterManager::send_feedback($comment, 'spam'); SpamProtectorManager::send_feedback($comment, 'spam');
$comment->setField('IsSpam', true); $comment->setField('IsSpam', true);
$comment->write(); $comment->write();
} }
@ -252,8 +252,8 @@ class PageComment_Controller extends Controller {
if(Permission::check('CMS_ACCESS_CMSMain')) { if(Permission::check('CMS_ACCESS_CMSMain')) {
// if spam protection module exists // if spam protection module exists
if(class_exists('SpamProtecterManager')) { if(class_exists('SpamProtectorManager')) {
SpamProtecterManager::send_feedback($comment, 'ham'); SpamProtectorManager::send_feedback($comment, 'ham');
$comment->setField('IsSpam', false); $comment->setField('IsSpam', false);
$comment->write(); $comment->write();
} }

4
code/sitefeatures/PageCommentInterface.php
View File

@ -181,9 +181,9 @@ class PageCommentInterface extends RequestHandler {
$form->setRedirectToFormOnValidationError(true); $form->setRedirectToFormOnValidationError(true);
// Optional Spam Protection. // Optional Spam Protection.
if(class_exists('SpamProtecterManager')) { if(class_exists('SpamProtectorManager')) {
// Update the form to add the protecter field to it // Update the form to add the protecter field to it
$protecter = SpamProtecterManager::update_form($form); $protecter = SpamProtectorManager::update_form($form);
if($protecter) { if($protecter) {
$protecter->setFieldMapping('Name', 'Comment'); $protecter->setFieldMapping('Name', 'Comment');

4
javascript/CMSMain_upload.js
View File

@ -14,9 +14,7 @@ CMSMain_upload.prototype = {
if(pv.major < 9) return; if(pv.major < 9) return;
// Due to a bug in the flash plugin on Linux and Mac, we need at least version 9.0.64 to use SWFUpload // Due to a bug in the flash plugin on Linux and Mac, we need at least version 9.0.64 to use SWFUpload
if(navigator.appVersion.indexOf("Mac") != -1 || navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) { if(pv.major == 9 && pv.minor == 0 && pv.rev < 64) return;
if(pv.major == 9 && pv.minor == 0 && pv.rev < 64) return;
}
// If those 2 checks pass, we can provide upload capabilities to the user // If those 2 checks pass, we can provide upload capabilities to the user
this.iframe = window.top.document.getElementById('AssetAdmin_upload'); this.iframe = window.top.document.getElementById('AssetAdmin_upload');

122
javascript/TinyMCEImageEnhancement.js
View File

@ -123,68 +123,66 @@ TinyMCEImageEnhancement.prototype = {
// Due to a bug in the flash plugin on Linux and Mac, // Due to a bug in the flash plugin on Linux and Mac,
//we need at least version 9.0.64 to use SWFUpload //we need at least version 9.0.64 to use SWFUpload
// see http://open.silverstripe.com/ticket/3023 // see http://open.silverstripe.com/ticket/3023
if(navigator.appVersion.indexOf("Mac") != -1 || navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) { pv = getFlashPlayerVersion();
pv = getFlashPlayerVersion(); if(pv.major < 9 || pv.major > 9 || (pv.major == 9 && pv.minor == 0 && pv.rev < 64)) {
if(pv.major < 9 || pv.major > 9 || (pv.major == 9 && pv.minor == 0 && pv.rev < 64)) { if($('AddFolderGroup')) $('AddFolderGroup').style.display = 'none';
if($('AddFolderGroup')) $('AddFolderGroup').style.display = 'none'; if($('PipeSeparator')) $('PipeSeparator').style.display = 'none';
if($('PipeSeparator')) $('PipeSeparator').style.display = 'none'; if($('UploadGroup')) $('UploadGroup').style.display = 'none';
if($('UploadGroup')) $('UploadGroup').style.display = 'none'; return;
return; }
}
} if($('FolderID') != null) {
if($('SecurityID')) var securityid=$('SecurityID').value;
if($('FolderID') != null) { else var securityid=null;
if($('SecurityID')) var securityid=$('SecurityID').value; this.upload = new Upload(
else var securityid=null; {
this.upload = new Upload( fileTypes : '*.jpeg;*.jpg;*.jpe;*.png;*.gif;',
{ fileTypesDescription : 'Image files',
fileTypes : '*.jpeg;*.jpg;*.jpe;*.png;*.gif;', fileUploadLimit : '100',
fileTypesDescription : 'Image files', securityID : securityid,
fileUploadLimit : '100', beginUploadOnQueue : true,
securityID : securityid, buildUI : this.addListeners.bind(this),
beginUploadOnQueue : true, fileQueued : this.uploadFileQueuedCallback.bind(this),
buildUI : this.addListeners.bind(this), fileComplete : this.uploadFileCompleteCallback.bind(this),
fileQueued : this.uploadFileQueuedCallback.bind(this), queueComplete : this.uploadQueueCompleteCallback.bind(this)
fileComplete : this.uploadFileCompleteCallback.bind(this), }
queueComplete : this.uploadQueueCompleteCallback.bind(this) );
} }
); },
}
}, uploadFileQueuedCallback: function(file,queueLength) {
this.processInProgress = true;
uploadFileQueuedCallback: function(file,queueLength) { this.upload.setFolderID(this.getParentID());
this.processInProgress = true; $('UploadFiles').innerHTML = "Uploading ... 1/" + this.upload.getFilesToUpload();
this.upload.setFolderID(this.getParentID()); this.upload.startUpload();
$('UploadFiles').innerHTML = "Uploading ... 1/" + this.upload.getFilesToUpload(); },
this.upload.startUpload();
}, uploadFileCompleteCallback: function(file,serverData) {
Element.addClassName($('UploadFiles'),'link');//Safari hack
uploadFileCompleteCallback: function(file,serverData) { $('UploadFiles').innerHTML = 'Uploading ... ' + this.upload.getFilesUploaded() + "/" + this.upload.getFilesToUpload();
Element.addClassName($('UploadFiles'),'link');//Safari hack },
$('UploadFiles').innerHTML = 'Uploading ... ' + this.upload.getFilesUploaded() + "/" + this.upload.getFilesToUpload();
}, uploadQueueCompleteCallback: function() {
this.filesUploaded = this.upload.getFilesUploaded();
uploadQueueCompleteCallback: function() { $('UploadFiles').innerHTML = "upload";
this.filesUploaded = this.upload.getFilesUploaded(); statusMessage('Uploaded ' + this.upload.getFilesUploaded() + ' files','good');
$('UploadFiles').innerHTML = "upload"; if(this.getParentID() != 'root') {
statusMessage('Uploaded ' + this.upload.getFilesUploaded() + ' files','good'); $('Image').ajaxGetFiles(this.getParentID(), null, this.insertImages.bind(this));
if(this.getParentID() != 'root') { }
$('Image').ajaxGetFiles(this.getParentID(), null, this.insertImages.bind(this)); },
}
}, /**
* Iterates over all uploaded images and add them to TinyMCE editor
/** *
* Iterates over all uploaded images and add them to TinyMCE editor * @param transport object
* */
* @param transport object insertImages: function(transport) {
*/ //HACK FOR STRANGE ERROR OCCURING UNDER SAFARI
insertImages: function(transport) { if(transport.responseText == '') {
//HACK FOR STRANGE ERROR OCCURING UNDER SAFARI $('Image').ajaxGetFiles(this.getParentID(), null, this.insertImages.bind(this));
if(transport.responseText == '') { return;
$('Image').ajaxGetFiles(this.getParentID(), null, this.insertImages.bind(this)); }
return; //END OF HACK
}
//END OF HACK
$('Image').reapplyBehaviour(); $('Image').reapplyBehaviour();