tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-09-29 12:49:00 +02:00
Code Issues Projects Releases Wiki Activity

mlanthaler: Changed the login messages to reflect the fact that more authentication methods are available.

Browse Source 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41793 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-14 19:26:56 +00:00
parent 19e222b5c2
commit 74214051b8
3 changed files with 242 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

222
code/LeftAndMain.php
View File

@ -8,10 +8,10 @@ abstract class LeftAndMain extends Controller {
static $tree_class = null; static $tree_class = null;
static $extra_menu_items = array(), $removed_menu_items = array(), $replaced_menu_items = array(); static $extra_menu_items = array(), $removed_menu_items = array(), $replaced_menu_items = array();
static $ForceReload; static $ForceReload;
function init() { function init() {
Director::set_site_mode('cms'); Director::set_site_mode('cms');
parent::init(); parent::init();
// Allow customisation of the access check by a decorator // Allow customisation of the access check by a decorator
@ -36,7 +36,7 @@ abstract class LeftAndMain extends Controller {
// Access failure! // Access failure!
if(!$isAllowed) { if(!$isAllowed) {
$messageSet = array( $messageSet = array(
'default' => "Enter your email address and password to access the CMS.", 'default' => "Please choose an authentication method and enter your credentials to access the CMS.",
'alreadyLoggedIn' => "I'm sorry, but you can't access that part of the CMS. If you want to log in as someone else, do so below", 'alreadyLoggedIn' => "I'm sorry, but you can't access that part of the CMS. If you want to log in as someone else, do so below",
'logInAgain' => "You have been logged out of the CMS. If you would like to log in again, enter a username and password below.", 'logInAgain' => "You have been logged out of the CMS. If you would like to log in again, enter a username and password below.",
); );
@ -72,32 +72,32 @@ abstract class LeftAndMain extends Controller {
Requirements::javascript("jsparty/calendar/lang/calendar-en.js"); Requirements::javascript("jsparty/calendar/lang/calendar-en.js");
Requirements::javascript("jsparty/calendar/calendar-setup.js"); Requirements::javascript("jsparty/calendar/calendar-setup.js");
Requirements::css("sapphire/css/CalendarDateField.css"); Requirements::css("sapphire/css/CalendarDateField.css");
Requirements::css("jsparty/calendar/calendar-win2k-1.css"); Requirements::css("jsparty/calendar/calendar-win2k-1.css");
Requirements::javascript('sapphire/javascript/Validator.js'); Requirements::javascript('sapphire/javascript/Validator.js');
Requirements::css("sapphire/css/SubmittedFormReportField.css"); Requirements::css("sapphire/css/SubmittedFormReportField.css");
$dummy = null; $dummy = null;
$this->extend('augmentInit', $dummy); $this->extend('augmentInit', $dummy);
} }
/** /**
* Returns true if the current user can access the CMS * Returns true if the current user can access the CMS
*/ */
function canAccessCMS() { function canAccessCMS() {
$member = Member::currentUser(); $member = Member::currentUser();
if($member) { if($member) {
if($groups = $member->Groups()) { if($groups = $member->Groups()) {
foreach($groups as $group) if($group->CanCMS) return true; foreach($groups as $group) if($group->CanCMS) return true;
} }
} }
return false; return false;
} }
/** /**
* Returns true if the current user has administrative rights in the CMS * Returns true if the current user has administrative rights in the CMS
*/ */
@ -107,33 +107,33 @@ abstract class LeftAndMain extends Controller {
//------------------------------------------------------------------------------------------// //------------------------------------------------------------------------------------------//
// Main controllers // Main controllers
/** /**
* You should implement a Link() function in your subclass of LeftAndMain, * You should implement a Link() function in your subclass of LeftAndMain,
* to point to the URL of that particular controller. * to point to the URL of that particular controller.
*/ */
abstract public function Link(); abstract public function Link();
public function show($params) { public function show($params) {
if($params['ID']) $this->setCurrentPageID($params['ID']); if($params['ID']) $this->setCurrentPageID($params['ID']);
if($params['OtherID']) if($params['OtherID'])
Session::set('currentMember', $params['OtherID']); Session::set('currentMember', $params['OtherID']);
if(Director::is_ajax()) { if(Director::is_ajax()) {
SSViewer::setOption('rewriteHashlinks', false); SSViewer::setOption('rewriteHashlinks', false);
return $this->EditForm()->formHtmlContent(); return $this->EditForm()->formHtmlContent();
} else { } else {
return array(); return array();
} }
} }
public function getitem() { public function getitem() {
$this->setCurrentPageID($_REQUEST['ID']); $this->setCurrentPageID($_REQUEST['ID']);
SSViewer::setOption('rewriteHashlinks', false); SSViewer::setOption('rewriteHashlinks', false);
// Changed 3/11/2006 to not use getLastFormIn because that didn't have _form_action, _form_name, etc. // Changed 3/11/2006 to not use getLastFormIn because that didn't have _form_action, _form_name, etc.
$form = $this->EditForm(); $form = $this->EditForm();
if($form) return $form->formHtmlContent(); if($form) return $form->formHtmlContent();
else return ""; else return "";
@ -145,7 +145,7 @@ abstract class LeftAndMain extends Controller {
//------------------------------------------------------------------------------------------// //------------------------------------------------------------------------------------------//
// Main UI components // Main UI components
/** /**
* Returns the main menu of the CMS. This is also used by init() to work out which sections the user * Returns the main menu of the CMS. This is also used by init() to work out which sections the user
* has access to. * has access to.
@ -155,7 +155,7 @@ abstract class LeftAndMain extends Controller {
if(!Member::currentUserID()) return new DataObjectSet(); if(!Member::currentUserID()) return new DataObjectSet();
// Built-in modules // Built-in modules
// array[0]: Name of the icon // array[0]: Name of the icon
// array[1]: URL to visi // array[1]: URL to visi
// array[2]: The controller class for this menu, used to check permisssions. If blank, it's assumed that this is public, and always shown to // array[2]: The controller class for this menu, used to check permisssions. If blank, it's assumed that this is public, and always shown to
@ -171,7 +171,7 @@ abstract class LeftAndMain extends Controller {
); );
if(!$this->hasReports()) unset($menuSrc['Reports']); if(!$this->hasReports()) unset($menuSrc['Reports']);
// Extra modules // Extra modules
if($removed = $this->stat('removed_menu_items')) { if($removed = $this->stat('removed_menu_items')) {
foreach($removed as $remove) { foreach($removed as $remove) {
@ -183,30 +183,30 @@ abstract class LeftAndMain extends Controller {
} }
} }
} }
// replace menu items // replace menu items
if($replaced = $this->stat('replaced_menu_items') ) { if($replaced = $this->stat('replaced_menu_items') ) {
$newMenu = array(); $newMenu = array();
reset( $menuSrc ); reset( $menuSrc );
for( $i = 0; $i < count( $menuSrc ); $i++ ) { for( $i = 0; $i < count( $menuSrc ); $i++ ) {
$existing = current($menuSrc); $existing = current($menuSrc);
if( $replacement = $replaced[$existing[0]] ) { if( $replacement = $replaced[$existing[0]] ) {
$newMenu = array_merge( $newMenu, $replacement ); $newMenu = array_merge( $newMenu, $replacement );
} else } else
$newMenu = array_merge( $newMenu, array( key( $menuSrc) => current( $menuSrc ) ) ); $newMenu = array_merge( $newMenu, array( key( $menuSrc) => current( $menuSrc ) ) );
next( $menuSrc ); next( $menuSrc );
} }
reset( $menuSrc ); reset( $menuSrc );
$menuSrc = $newMenu; $menuSrc = $newMenu;
} }
// Extra modules // Extra modules
if($extra = $this->stat('extra_menu_items')) { if($extra = $this->stat('extra_menu_items')) {
foreach($extra as $k => $v) { foreach($extra as $k => $v) {
@ -216,9 +216,9 @@ abstract class LeftAndMain extends Controller {
array_splice($menuSrc, count($menuSrc)-2, 0, $extra); array_splice($menuSrc, count($menuSrc)-2, 0, $extra);
} }
// Encode into DO set // Encode into DO set
$menu = new DataObjectSet(); $menu = new DataObjectSet();
$itemsWithPermission = 0; $itemsWithPermission = 0;
foreach($menuSrc as $title => $menuItem) { foreach($menuSrc as $title => $menuItem) {
if(is_numeric($title) && isset($menuItem['title'])) $title = $menuItem['title']; if(is_numeric($title) && isset($menuItem['title'])) $title = $menuItem['title'];
@ -245,8 +245,8 @@ abstract class LeftAndMain extends Controller {
} }
$menu->push(new ArrayData(array( $menu->push(new ArrayData(array(
"Title" => Convert::raw2xml($title), "Title" => Convert::raw2xml($title),
"Code" => $menuItem[0], "Code" => $menuItem[0],
"Link" => $menuItem[1], "Link" => $menuItem[1],
"LinkingMode" => $linkingmode "LinkingMode" => $linkingmode
))); )));
@ -260,7 +260,7 @@ abstract class LeftAndMain extends Controller {
/** /**
* Return a list of appropriate templates for this class, with the given suffix * Return a list of appropriate templates for this class, with the given suffix
*/ */
protected function getTemplatesWithSuffix($suffix) { protected function getTemplatesWithSuffix($suffix) {
$classes = array_reverse(ClassInfo::ancestry($this->class)); $classes = array_reverse(ClassInfo::ancestry($this->class));
foreach($classes as $class) { foreach($classes as $class) {
@ -269,7 +269,7 @@ abstract class LeftAndMain extends Controller {
} }
return $templates; return $templates;
} }
public function Left() { public function Left() {
return $this->renderWith($this->getTemplatesWithSuffix('_left')); return $this->renderWith($this->getTemplatesWithSuffix('_left'));
} }
@ -282,7 +282,7 @@ abstract class LeftAndMain extends Controller {
} }
} }
public function getRecord($id, $className = null) { public function getRecord($id, $className = null) {
if(!$className) $className = $this->stat('tree_class'); if(!$className) $className = $this->stat('tree_class');
return DataObject::get_by_id($className, $rootID); return DataObject::get_by_id($className, $rootID);
@ -292,18 +292,18 @@ abstract class LeftAndMain extends Controller {
$obj = $rootID ? $this->getRecord($rootID) : singleton($className); $obj = $rootID ? $this->getRecord($rootID) : singleton($className);
$obj->markPartialTree(); $obj->markPartialTree();
if($p = $this->currentPage()) $obj->markToExpose($p); if($p = $this->currentPage()) $obj->markToExpose($p);
// getChildrenAsUL is a flexible and complex way of traversing the tree // getChildrenAsUL is a flexible and complex way of traversing the tree
$siteTree = $obj->getChildrenAsUL("", ' $siteTree = $obj->getChildrenAsUL("", '
"<li id=\"record-$child->ID\" class=\"" . $child->CMSTreeClasses($extraArg) . "\">" . "<li id=\"record-$child->ID\" class=\"" . $child->CMSTreeClasses($extraArg) . "\">" .
"<a href=\"" . Director::link(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" " . (($child->canEdit() || $child->canAddChildren()) ? "" : "class=\"disabled\"") . ">" . "<a href=\"" . Director::link(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" " . (($child->canEdit() || $child->canAddChildren()) ? "" : "class=\"disabled\"") . ">" .
($child->TreeTitle()) . ($child->TreeTitle()) .
"</a>" "</a>"
' '
,$this, true); ,$this, true);
// Wrap the root if needs be. // Wrap the root if needs be.
if(!$rootID) { if(!$rootID) {
$rootLink = $this->Link() . '0'; $rootLink = $this->Link() . '0';
@ -314,27 +314,27 @@ abstract class LeftAndMain extends Controller {
$siteTree = "<ul id=\"sitetree\" class=\"tree unformatted\"><li id=\"record-0\" class=\"Root nodelete\"><a href=\"$rootLink\">$treeTitle</a>" $siteTree = "<ul id=\"sitetree\" class=\"tree unformatted\"><li id=\"record-0\" class=\"Root nodelete\"><a href=\"$rootLink\">$treeTitle</a>"
. $siteTree . "</li></ul>"; . $siteTree . "</li></ul>";
} }
return $siteTree; return $siteTree;
} }
public function getsubtree() { public function getsubtree() {
$results = $this->getSiteTreeFor($this->stat('tree_class'), $_REQUEST['ID']); $results = $this->getSiteTreeFor($this->stat('tree_class'), $_REQUEST['ID']);
return substr(trim($results), 4,-5); return substr(trim($results), 4,-5);
} }
/** /**
* Allows you to returns a new data object to the tree (subclass of sitetree) * Allows you to returns a new data object to the tree (subclass of sitetree)
* and updates the tree via javascript. * and updates the tree via javascript.
*/ */
public function returnItemToUser($p) { public function returnItemToUser($p) {
if(Director::is_ajax()) { if(Director::is_ajax()) {
// Prepare the object for insertion. // Prepare the object for insertion.
$parentID = (int)$p->ParentID; $parentID = (int)$p->ParentID;
$id = $p->ID ? $p->ID : "new-$p->class-$p->ParentID"; $id = $p->ID ? $p->ID : "new-$p->class-$p->ParentID";
$treeTitle = Convert::raw2js($p->TreeTitle()); $treeTitle = Convert::raw2js($p->TreeTitle());
$hasChildren = is_numeric( $id ) && $p->AllChildren() ? ' unexpanded' : ''; $hasChildren = is_numeric( $id ) && $p->AllChildren() ? ' unexpanded' : '';
// Ensure there is definitly a node avaliable. if not, append to the home tree. // Ensure there is definitly a node avaliable. if not, append to the home tree.
$response = <<<JS $response = <<<JS
var tree = $('sitetree'); var tree = $('sitetree');
@ -358,7 +358,7 @@ JS;
public function save($urlParams, $form) { public function save($urlParams, $form) {
$className = $this->stat('tree_class'); $className = $this->stat('tree_class');
$result = ''; $result = '';
$id = $_REQUEST['ID']; $id = $_REQUEST['ID'];
if(substr($id,0,3) != 'new') { if(substr($id,0,3) != 'new') {
$record = DataObject::get_one($className, "`$className`.ID = $id"); $record = DataObject::get_one($className, "`$className`.ID = $id");
@ -366,7 +366,7 @@ JS;
$record = $this->getNewItem($id, false); $record = $this->getNewItem($id, false);
} }
// We don't want to save a new version if there are no changes // We don't want to save a new version if there are no changes
$dataFields_new = $form->Fields()->dataFields(); $dataFields_new = $form->Fields()->dataFields();
$dataFields_old = $record->getAllFields(); $dataFields_old = $record->getAllFields();
$changed = false; $changed = false;
@ -374,7 +374,7 @@ JS;
foreach($dataFields_new as $datafield) { foreach($dataFields_new as $datafield) {
// if the form has fields not belonging to the record // if the form has fields not belonging to the record
if(!isset($dataFields_old[$datafield->Name()])) { if(!isset($dataFields_old[$datafield->Name()])) {
$hasNonRecordFields = true; $hasNonRecordFields = true;
} }
// if field-values have changed // if field-values have changed
if(!isset($dataFields_old[$datafield->Name()]) || $dataFields_old[$datafield->Name()] != $datafield->dataValue()) { if(!isset($dataFields_old[$datafield->Name()]) || $dataFields_old[$datafield->Name()] != $datafield->dataValue()) {
@ -391,7 +391,7 @@ JS;
FormResponse::update_status($record->Status); FormResponse::update_status($record->Status);
return FormResponse::respond(); return FormResponse::respond();
} }
$form->dataFieldByName('ID')->Value = 0; $form->dataFieldByName('ID')->Value = 0;
if(isset($urlParams['Sort']) && is_numeric($urlParams['Sort'])) { if(isset($urlParams['Sort']) && is_numeric($urlParams['Sort'])) {
@ -411,13 +411,13 @@ JS;
$originalURLSegment = $record->URLSegment; $originalURLSegment = $record->URLSegment;
$form->saveInto($record, true); $form->saveInto($record, true);
if(is_a($record, "Page")) { if(is_a($record, "Page")) {
$record->Status = ($record->Status == "New page" || $record->Status == "Saved (new)") ? "Saved (new)" : "Saved (update)"; $record->Status = ($record->Status == "New page" || $record->Status == "Saved (new)") ? "Saved (new)" : "Saved (update)";
} }
// $record->write(); // $record->write();
if(Director::is_ajax()) { if(Director::is_ajax()) {
@ -427,7 +427,7 @@ JS;
} }
$title = Convert::raw2js($record->TreeTitle()); $title = Convert::raw2js($record->TreeTitle());
if($added = DataObjectLog::getAdded('SiteTree')) { if($added = DataObjectLog::getAdded('SiteTree')) {
foreach($added as $page) { foreach($added as $page) {
if($page->ID != $record->ID) $result .= $this->addTreeNodeJS($page); if($page->ID != $record->ID) $result .= $this->addTreeNodeJS($page);
@ -446,7 +446,7 @@ JS;
} }
} }
} }
FormResponse::add("$('sitetree').setNodeTitle(\"$record->ID\", \"$title\");"); FormResponse::add("$('sitetree').setNodeTitle(\"$record->ID\", \"$title\");");
$message = "Saved."; $message = "Saved.";
@ -456,16 +456,16 @@ JS;
$record->setClassName( $record->ClassName ); $record->setClassName( $record->ClassName );
$newClass = $record->ClassName; $newClass = $record->ClassName;
$record = $record->newClassInstance( $newClass ); $record = $record->newClassInstance( $newClass );
FormResponse::add("if(\$('sitetree').setNodeIcon) \$('sitetree').setNodeIcon($record->ID, '$originalClass', '$record->ClassName');"); FormResponse::add("if(\$('sitetree').setNodeIcon) \$('sitetree').setNodeIcon($record->ID, '$originalClass', '$record->ClassName');");
} }
// HACK: This should be turned into somethign more general // HACK: This should be turned into somethign more general
if( ($record->class == 'VirtualPage' && $originalURLSegment != $record->URLSegment) || if( ($record->class == 'VirtualPage' && $originalURLSegment != $record->URLSegment) ||
($originalClass != $record->ClassName) || self::$ForceReload == true) { ($originalClass != $record->ClassName) || self::$ForceReload == true) {
FormResponse::add("$('Form_EditForm').getPageFromServer($record->ID);"); FormResponse::add("$('Form_EditForm').getPageFromServer($record->ID);");
} }
if( ($record->class != 'VirtualPage') && $originalURLSegment != $record->URLSegment) { if( ($record->class != 'VirtualPage') && $originalURLSegment != $record->URLSegment) {
$message .= " Changed URL to '$record->URLSegment'"; $message .= " Changed URL to '$record->URLSegment'";
FormResponse::add("\$('Form_EditForm').elements.URLSegment.value = \"$record->URLSegment\";"); FormResponse::add("\$('Form_EditForm').elements.URLSegment.value = \"$record->URLSegment\";");
@ -476,20 +476,20 @@ JS;
if($originalStatus != $record->Status) { if($originalStatus != $record->Status) {
$message .= " Status changed to '$record->Status'"; $message .= " Status changed to '$record->Status'";
} }
$record->write(); $record->write();
$result .= $this->getActionUpdateJS($record); $result .= $this->getActionUpdateJS($record);
FormResponse::status_message($message, "good"); FormResponse::status_message($message, "good");
FormResponse::update_status($record->Status); FormResponse::update_status($record->Status);
} }
return FormResponse::respond(); return FormResponse::respond();
} }
/** /**
* Return a piece of javascript that will update the actions of the main form * Return a piece of javascript that will update the actions of the main form
*/ */
@ -500,12 +500,12 @@ JS;
foreach($tempForm->Actions() as $action) { foreach($tempForm->Actions() as $action) {
$actionList .= $action->Field() . ' '; $actionList .= $action->Field() . ' ';
} }
FormResponse::add("$('Form_EditForm').loadActionsFromString('" . Convert::raw2js($actionList) . "');"); FormResponse::add("$('Form_EditForm').loadActionsFromString('" . Convert::raw2js($actionList) . "');");
return FormResponse::respond(); return FormResponse::respond();
} }
/** /**
* Return JavaScript code to generate a tree node for the given page, if visible * Return JavaScript code to generate a tree node for the given page, if visible
*/ */
@ -514,7 +514,7 @@ JS;
$title = Convert::raw2js($page->TreeTitle()); $title = Convert::raw2js($page->TreeTitle());
$response = <<<JS $response = <<<JS
var newNode = $('sitetree').createTreeNode($page->ID, \"$title\", \"$page->class\"); var newNode = $('sitetree').createTreeNode($page->ID, \"$title\", \"$page->class\");
var parentNode = $('sitetree').getTreeNodeByIdx($parentID); var parentNode = $('sitetree').getTreeNodeByIdx($parentID);
if(parentNode) parentNode.appendTreeNode(newNode);\n" if(parentNode) parentNode.appendTreeNode(newNode);\n"
($selected ? "newNode.selectTreeNode();\n" : "") ; ($selected ? "newNode.selectTreeNode();\n" : "") ;
JS; JS;
@ -525,23 +525,23 @@ JS;
* Return JavaScript code to remove a tree node for the given page, if it exists. * Return JavaScript code to remove a tree node for the given page, if it exists.
*/ */
public function deleteTreeNodeJS($page) { public function deleteTreeNodeJS($page) {
$id = $page->ID ? $page->ID : $page->OldID; $id = $page->ID ? $page->ID : $page->OldID;
$response = <<<JS $response = <<<JS
var node = $('sitetree').getTreeNodeByIdx($id); var node = $('sitetree').getTreeNodeByIdx($id);
if(node && node.parentTreeNode) node.parentTreeNode.removeTreeNode(node); if(node && node.parentTreeNode) node.parentTreeNode.removeTreeNode(node);
$('Form_EditForm').closeIfSetTo($id); $('Form_EditForm').closeIfSetTo($id);
JS; JS;
FormResponse::add($response); FormResponse::add($response);
return FormResponse::respond(); return FormResponse::respond();
} }
/** /**
* Sets a static variable on this class which means the panel will be reloaded. * Sets a static variable on this class which means the panel will be reloaded.
*/ */
static function ForceReload(){ static function ForceReload(){
self::$ForceReload = true; self::$ForceReload = true;
} }
/** /**
* Ajax handler for updating the parent of a tree node * Ajax handler for updating the parent of a tree node
*/ */
@ -549,38 +549,38 @@ JS;
$id = $_REQUEST['ID']; $id = $_REQUEST['ID'];
$parentID = $_REQUEST['ParentID']; $parentID = $_REQUEST['ParentID'];
if($parentID == 'root'){ if($parentID == 'root'){
$parentID = 0; $parentID = 0;
} }
$_REQUEST['ajax'] = 1; $_REQUEST['ajax'] = 1;
if(is_numeric($id) && is_numeric($parentID) && $id != $parentID) { if(is_numeric($id) && is_numeric($parentID) && $id != $parentID) {
$node = DataObject::get_by_id($this->stat('tree_class'), $id); $node = DataObject::get_by_id($this->stat('tree_class'), $id);
if($node){ if($node){
$node->ParentID = $parentID; $node->ParentID = $parentID;
$node->Status = "Saved (update)"; $node->Status = "Saved (update)";
$node->write(); $node->write();
if(is_numeric($_REQUEST['CurrentlyOpenPageID'])) { if(is_numeric($_REQUEST['CurrentlyOpenPageID'])) {
$currentPage = DataObject::get_by_id($this->stat('tree_class'), $_REQUEST['CurrentlyOpenPageID']); $currentPage = DataObject::get_by_id($this->stat('tree_class'), $_REQUEST['CurrentlyOpenPageID']);
if($currentPage) { if($currentPage) {
$cleanupJS = $currentPage->cmsCleanup_parentChanged(); $cleanupJS = $currentPage->cmsCleanup_parentChanged();
} }
} }
FormResponse::status_message('saved', 'good'); FormResponse::status_message('saved', 'good');
FormResponse::add($cleanupJS); FormResponse::add($cleanupJS);
}else{ }else{
FormResponse::status_message("Please Save Page: This page could not be upated because it hasn't been saved yet.","good"); FormResponse::status_message("Please Save Page: This page could not be upated because it hasn't been saved yet.","good");
} }
return FormResponse::respond(); return FormResponse::respond();
} else { } else {
user_error("Error in ajaxupdateparent request; id=$id, parentID=$parentID", E_USER_ERROR); user_error("Error in ajaxupdateparent request; id=$id, parentID=$parentID", E_USER_ERROR);
} }
} }
/** /**
* Ajax handler for updating the order of a number of tree nodes * Ajax handler for updating the order of a number of tree nodes
* $_GET[ID]: An array of node ids in the correct order * $_GET[ID]: An array of node ids in the correct order
@ -591,7 +591,7 @@ JS;
$counter = 0; $counter = 0;
$js = ''; $js = '';
$_REQUEST['ajax'] = 1; $_REQUEST['ajax'] = 1;
if(is_array($_REQUEST['ID'])) { if(is_array($_REQUEST['ID'])) {
$movedNode = DataObject::get_by_id($className, $_REQUEST['MovedNodeID']); $movedNode = DataObject::get_by_id($className, $_REQUEST['MovedNodeID']);
@ -600,10 +600,10 @@ JS;
$movedNode->Sort = ++$counter; $movedNode->Sort = ++$counter;
$movedNode->Status = "Saved (update)"; $movedNode->Status = "Saved (update)";
$movedNode->write(); $movedNode->write();
$title = Convert::raw2js($movedNode->TreeTitle()); $title = Convert::raw2js($movedNode->TreeTitle());
$js .="$('sitetree').setNodeTitle($movedNode->ID, \"$title\")\n"; $js .="$('sitetree').setNodeTitle($movedNode->ID, \"$title\")\n";
// Nodes that weren't "actually moved" shouldn't be registered as having been edited; do a direct SQL update instead // Nodes that weren't "actually moved" shouldn't be registered as having been edited; do a direct SQL update instead
} else if(is_numeric($id)) { } else if(is_numeric($id)) {
++$counter; ++$counter;
@ -623,7 +623,7 @@ JS;
} else { } else {
FormResponse::error("Error in request"); FormResponse::error("Error in request");
} }
return FormResponse::respond(); return FormResponse::respond();
} }
@ -632,7 +632,7 @@ JS;
*/ */
public function deleteitems() { public function deleteitems() {
$ids = split(' *, *', $_REQUEST['csvIDs']); $ids = split(' *, *', $_REQUEST['csvIDs']);
$script = "st = \$('sitetree'); \n"; $script = "st = \$('sitetree'); \n";
foreach($ids as $id) { foreach($ids as $id) {
if(is_numeric($id)) { if(is_numeric($id)) {
@ -641,29 +641,29 @@ JS;
} }
} }
FormResponse::add($script); FormResponse::add($script);
return FormResponse::respond(); return FormResponse::respond();
} }
public function EditForm() { public function EditForm() {
$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : $this->currentPageID(); $id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : $this->currentPageID();
if($id) return $this->getEditForm($id); if($id) return $this->getEditForm($id);
} }
public function printable() { public function printable() {
$id = $_REQUEST['ID'] ? $_REQUEST['ID'] : $this->currentPageID(); $id = $_REQUEST['ID'] ? $_REQUEST['ID'] : $this->currentPageID();
if($id) $form = $this->getEditForm($id); if($id) $form = $this->getEditForm($id);
$form->transform(new PrintableTransformation()); $form->transform(new PrintableTransformation());
$form->actions = null; $form->actions = null;
Requirements::clear(); Requirements::clear();
Requirements::css('cms/css/LeftAndMain_printable.css'); Requirements::css('cms/css/LeftAndMain_printable.css');
return array( return array(
"PrintForm" => $form "PrintForm" => $form
); );
} }
public function currentPageID() { public function currentPageID() {
if(isset($_REQUEST['ID']) && is_numeric($_REQUEST['ID'])) { if(isset($_REQUEST['ID']) && is_numeric($_REQUEST['ID'])) {
return $_REQUEST['ID']; return $_REQUEST['ID'];
@ -675,29 +675,29 @@ JS;
return null; return null;
} }
} }
public function setCurrentPageID($id) { public function setCurrentPageID($id) {
Session::set("{$this->class}.currentPage", $id); Session::set("{$this->class}.currentPage", $id);
} }
public function currentPage() { public function currentPage() {
$id = $this->currentPageID(); $id = $this->currentPageID();
if($id && is_numeric($id)) { if($id && is_numeric($id)) {
return DataObject::get_by_id($this->stat('tree_class'), $id); return DataObject::get_by_id($this->stat('tree_class'), $id);
} }
} }
public function isCurrentPage(DataObject $page) { public function isCurrentPage(DataObject $page) {
return $page->ID == Session::get("{$this->class}.currentPage"); return $page->ID == Session::get("{$this->class}.currentPage");
} }
/** /**
* Return the CMS's HTML-editor toolbar * Return the CMS's HTML-editor toolbar
*/ */
public function EditorToolbar() { public function EditorToolbar() {
return new HtmlEditorField_Toolbar($this, "EditorToolbar"); return new HtmlEditorField_Toolbar($this, "EditorToolbar");
} }
/** /**
* Return the version number of this application * Return the version number of this application
*/ */
@ -705,28 +705,28 @@ JS;
$sapphireVersionFile = file_get_contents('../sapphire/silverstripe_version'); $sapphireVersionFile = file_get_contents('../sapphire/silverstripe_version');
$jspartyVersionFile = file_get_contents('../jsparty/silverstripe_version'); $jspartyVersionFile = file_get_contents('../jsparty/silverstripe_version');
$cmsVersionFile = file_get_contents('../cms/silverstripe_version'); $cmsVersionFile = file_get_contents('../cms/silverstripe_version');
if(strstr($sapphireVersionFile, "/sapphire/trunk")) { if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
$sapphireVersion = "trunk"; $sapphireVersion = "trunk";
} else { } else {
preg_match("/sapphire\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $sapphireVersionFile, $matches); preg_match("/sapphire\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $sapphireVersionFile, $matches);
$sapphireVersion = $matches[1]; $sapphireVersion = $matches[1];
} }
if(strstr($jspartyVersionFile, "/jsparty/trunk")) { if(strstr($jspartyVersionFile, "/jsparty/trunk")) {
$jspartyVersion = "trunk"; $jspartyVersion = "trunk";
} else { } else {
preg_match("/jsparty\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $jspartyVersionFile, $matches); preg_match("/jsparty\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $jspartyVersionFile, $matches);
$jspartyVersion = $matches[1]; $jspartyVersion = $matches[1];
} }
if(strstr($cmsVersionFile, "/cms/trunk")) { if(strstr($cmsVersionFile, "/cms/trunk")) {
$cmsVersion = "trunk"; $cmsVersion = "trunk";
} else { } else {
preg_match("/cms\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $cmsVersionFile, $matches); preg_match("/cms\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $cmsVersionFile, $matches);
$cmsVersion = $matches[1]; $cmsVersion = $matches[1];
} }
if($sapphireVersion == $jspartyVersion && $jspartyVersion == $cmsVersion) { if($sapphireVersion == $jspartyVersion && $jspartyVersion == $cmsVersion) {
return $sapphireVersion; return $sapphireVersion;
} else { } else {
@ -737,7 +737,7 @@ JS;
/** /**
* The application name is customisable by calling * The application name is customisable by calling
* LeftAndMain::setApplicationName("Something New") * LeftAndMain::setApplicationName("Something New")
*/ */
static $application_name = "SilverStripe CMS", $application_logo_text = "SilverStripe CMS"; static $application_name = "SilverStripe CMS", $application_logo_text = "SilverStripe CMS";
static function setApplicationName($name, $logoText = null) { static function setApplicationName($name, $logoText = null) {
self::$application_name = $name; self::$application_name = $name;
@ -751,7 +751,7 @@ JS;
} }
static $application_logo = "cms/images/mainmenu/logo.gif", $application_logo_style = ""; static $application_logo = "cms/images/mainmenu/logo.gif", $application_logo_style = "";
static function setLogo($logo, $logoStyle) { static function setLogo($logo, $logoStyle) {
self::$application_logo = $logo; self::$application_logo = $logo;
self::$application_logo_style = $logoStyle; self::$application_logo_style = $logoStyle;
@ -762,8 +762,8 @@ JS;
} }
/** /**
* Determine if we have reports and need to display the Reports main menu item * Determine if we have reports and need to display the Reports main menu item
* *
* @return boolean * @return boolean
*/ */
function hasReports() { function hasReports() {

234
code/NewsletterAdmin.php
View File

@ -2,9 +2,9 @@
class NewsletterAdmin extends LeftAndMain { class NewsletterAdmin extends LeftAndMain {
static $subitem_class = "Member"; static $subitem_class = "Member";
static $template_path = null; // defaults to (project)/templates/email static $template_path = null; // defaults to (project)/templates/email
public function init() { public function init() {
// Check permissions // Check permissions
// if(!Member::currentUser() || !Member::currentUser()->isAdmin()) Security::permissionFailure($this); // if(!Member::currentUser() || !Member::currentUser()->isAdmin()) Security::permissionFailure($this);
@ -13,7 +13,7 @@ class NewsletterAdmin extends LeftAndMain {
/* /*
if(!$this->can('AdminCMS')) { if(!$this->can('AdminCMS')) {
$messageSet = array( $messageSet = array(
'default' => "Enter your email address and password to access the CMS.", 'default' => "Please choose an authentication method and enter your credentials to access the CMS.",
'alreadyLoggedIn' => "I'm sorry, but you can't access that part of the CMS. If you want to log in as someone else, do so below", 'alreadyLoggedIn' => "I'm sorry, but you can't access that part of the CMS. If you want to log in as someone else, do so below",
'logInAgain' => "You have been logged out of the CMS. If you would like to log in again, enter a username and password below.", 'logInAgain' => "You have been logged out of the CMS. If you would like to log in again, enter a username and password below.",
); );
@ -27,13 +27,13 @@ class NewsletterAdmin extends LeftAndMain {
Requirements::javascript("jsparty/hover.js"); Requirements::javascript("jsparty/hover.js");
Requirements::javascript("jsparty/scriptaculous/controls.js"); Requirements::javascript("jsparty/scriptaculous/controls.js");
Requirements::javascript("cms/javascript/SecurityAdmin.js"); Requirements::javascript("cms/javascript/SecurityAdmin.js");
Requirements::javascript("cms/javascript/LeftAndMain_left.js"); Requirements::javascript("cms/javascript/LeftAndMain_left.js");
Requirements::javascript("cms/javascript/LeftAndMain_right.js"); Requirements::javascript("cms/javascript/LeftAndMain_right.js");
Requirements::javascript("cms/javascript/CMSMain_left.js"); Requirements::javascript("cms/javascript/CMSMain_left.js");
Requirements::javascript("cms/javascript/NewsletterAdmin_left.js"); Requirements::javascript("cms/javascript/NewsletterAdmin_left.js");
Requirements::javascript("cms/javascript/NewsletterAdmin_right.js"); Requirements::javascript("cms/javascript/NewsletterAdmin_right.js");
Requirements::javascript("sapphire/javascript/ProgressBar.js"); Requirements::javascript("sapphire/javascript/ProgressBar.js");
@ -45,7 +45,7 @@ class NewsletterAdmin extends LeftAndMain {
"BaseURL" => Director::absoluteBaseURL(), "BaseURL" => Director::absoluteBaseURL(),
)); ));
} }
// needed for MemberTableField (Requirements not determined before Ajax-Call) // needed for MemberTableField (Requirements not determined before Ajax-Call)
Requirements::javascript("jsparty/greybox/AmiJS.js"); Requirements::javascript("jsparty/greybox/AmiJS.js");
Requirements::javascript("jsparty/greybox/greybox.js"); Requirements::javascript("jsparty/greybox/greybox.js");
@ -59,24 +59,24 @@ class NewsletterAdmin extends LeftAndMain {
public function remove() { public function remove() {
$ids = explode( ',', $_REQUEST['csvIDs'] ); $ids = explode( ',', $_REQUEST['csvIDs'] );
foreach( $ids as $id ) { foreach( $ids as $id ) {
if( preg_match( '/^mailtype_(\d+)$/', $id, $matches ) ) if( preg_match( '/^mailtype_(\d+)$/', $id, $matches ) )
$record = DataObject::get_by_id( 'NewsletterType', $matches[1] ); $record = DataObject::get_by_id( 'NewsletterType', $matches[1] );
else if( preg_match( '/^[a-z]+_\d+_(\d+)$/', $id, $matches ) ) else if( preg_match( '/^[a-z]+_\d+_(\d+)$/', $id, $matches ) )
$record = DataObject::get_by_id( 'Newsletter', $matches[1] ); $record = DataObject::get_by_id( 'Newsletter', $matches[1] );
if($record) { if($record) {
$record->delete(); $record->delete();
} }
FormResponse::add("removeTreeNodeByIdx(\$('sitetree'), '$id' );"); FormResponse::add("removeTreeNodeByIdx(\$('sitetree'), '$id' );");
} }
FormResponse::status_message('Deleted $count items','good'); FormResponse::status_message('Deleted $count items','good');
return FormResponse::respond(); return FormResponse::respond();
} }
public function getformcontent(){ public function getformcontent(){
Session::set('currentPage', $_REQUEST['ID']); Session::set('currentPage', $_REQUEST['ID']);
@ -99,14 +99,14 @@ class NewsletterAdmin extends LeftAndMain {
* Called when a draft or sent newsletter is clicked on the left menu * Called when a draft or sent newsletter is clicked on the left menu
*/ */
public function shownewsletter($params) { public function shownewsletter($params) {
return $this->showWithEditForm( $params, $this->getNewsletterEditForm( $params['ID'] ) ); return $this->showWithEditForm( $params, $this->getNewsletterEditForm( $params['ID'] ) );
} }
/** /**
* Called when a newsletter type is clicked on the left menu * Called when a newsletter type is clicked on the left menu
*/ */
public function showmailtype($params) { public function showmailtype($params) {
return $this->showWithEditForm( $params, $this->getNewsletterTypeEditForm( $params['ID'] ) ); return $this->showWithEditForm( $params, $this->getNewsletterTypeEditForm( $params['ID'] ) );
} }
/** /**
@ -120,9 +120,9 @@ class NewsletterAdmin extends LeftAndMain {
* Called when a 'Sent Items' folder is clicked on the left menu * Called when a 'Sent Items' folder is clicked on the left menu
*/ */
public function showsent($params) { public function showsent($params) {
return $this->ShowNewsletterFolder($params, 'Sent'); return $this->ShowNewsletterFolder($params, 'Sent');
} }
/** /**
* Shows either the 'Sent' or 'Drafts' folder using the NewsletterList template * Shows either the 'Sent' or 'Drafts' folder using the NewsletterList template
*/ */
@ -140,18 +140,18 @@ class NewsletterAdmin extends LeftAndMain {
} }
} }
$draftList = new NewsletterList($type, $mailType, $type); $draftList = new NewsletterList($type, $mailType, $type);
return $draftList->renderWith("NewsletterList"); return $draftList->renderWith("NewsletterList");
} }
public function removenewsletter($params) { public function removenewsletter($params) {
if( !is_numeric( $params['ID'] ) ) if( !is_numeric( $params['ID'] ) )
return ''; return '';
$newsletter = DataObject::get_by_id( 'Newsletter', $params['ID'] ); $newsletter = DataObject::get_by_id( 'Newsletter', $params['ID'] );
$newsletter->delete(); $newsletter->delete();
return 'letter-' . $params['ID']; return 'letter-' . $params['ID'];
} }
private function showWithEditForm( $params, $editForm ) { private function showWithEditForm( $params, $editForm ) {
if(isset($params['ID'])) { if(isset($params['ID'])) {
Session::set('currentPage', $params['ID']); Session::set('currentPage', $params['ID']);
@ -166,11 +166,11 @@ class NewsletterAdmin extends LeftAndMain {
return array(); return array();
} }
} }
public function getEditForm( $id ) { public function getEditForm( $id ) {
return $this->getNewsletterTypeEditForm( $id ); return $this->getNewsletterTypeEditForm( $id );
} }
/** /**
* Get the EditForm * Get the EditForm
*/ */
@ -186,15 +186,15 @@ class NewsletterAdmin extends LeftAndMain {
} }
} }
} }
public function NewsletterEditForm() { public function NewsletterEditForm() {
$id = $_REQUEST['ID'] ? $_REQUEST['ID'] : $this->currentPageID(); $id = $_REQUEST['ID'] ? $_REQUEST['ID'] : $this->currentPageID();
if(!is_numeric($id)) { if(!is_numeric($id)) {
$id = 0; $id = 0;
} }
return $this->getNewsletterEditForm($id); return $this->getNewsletterEditForm($id);
} }
public function TypeEditForm() { public function TypeEditForm() {
$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : $this->currentPageID(); $id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : $this->currentPageID();
if(!is_numeric($id)) { if(!is_numeric($id)) {
@ -206,7 +206,7 @@ class NewsletterAdmin extends LeftAndMain {
$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : $this->currentPageID(); $id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : $this->currentPageID();
return $this->getMailingListEditForm($id); return $this->getMailingListEditForm($id);
} }
public function getNewsletterTypeEditForm($id) { public function getNewsletterTypeEditForm($id) {
if(!is_numeric($id)) { if(!is_numeric($id)) {
$id = Session::get('currentPage'); $id = Session::get('currentPage');
@ -219,10 +219,10 @@ class NewsletterAdmin extends LeftAndMain {
$mailType = DataObject::get_by_id( 'NewsletterType', $id ); $mailType = DataObject::get_by_id( 'NewsletterType', $id );
} }
} }
if(isset($mailType) && is_object($mailType) && $mailType->GroupID) { if(isset($mailType) && is_object($mailType) && $mailType->GroupID) {
$group = DataObject::get_one("Group", "ID = $mailType->GroupID"); $group = DataObject::get_one("Group", "ID = $mailType->GroupID");
} }
if(isset($mailType)) { if(isset($mailType)) {
$fields = new FieldSet( $fields = new FieldSet(
@ -230,15 +230,15 @@ class NewsletterAdmin extends LeftAndMain {
new TextField("FromEmail", "Send newsletters from"), new TextField("FromEmail", "Send newsletters from"),
$templates = new TemplateList("Template","Template", $mailType->Template, self::template_path()) $templates = new TemplateList("Template","Template", $mailType->Template, self::template_path())
); );
$templates->setController($this); $templates->setController($this);
$fields->push($idField = new HiddenField("ID")); $fields->push($idField = new HiddenField("ID"));
$fields->push( new HiddenField( "executeForm", "", "TypeEditForm" ) ); $fields->push( new HiddenField( "executeForm", "", "TypeEditForm" ) );
$idField->setValue($id); $idField->setValue($id);
$actions = new FieldSet(new FormAction('save','Save')); $actions = new FieldSet(new FormAction('save','Save'));
$form = new Form($this, "EditForm", $fields, $actions); $form = new Form($this, "EditForm", $fields, $actions);
$form->loadDataFrom(array( $form->loadDataFrom(array(
'Title' => $mailType->Title, 'Title' => $mailType->Title,
@ -247,7 +247,7 @@ class NewsletterAdmin extends LeftAndMain {
} else { } else {
$form = false; $form = false;
} }
return $form; return $form;
} }
@ -263,10 +263,10 @@ class NewsletterAdmin extends LeftAndMain {
$mailType = DataObject::get_by_id( 'NewsletterType', $id ); $mailType = DataObject::get_by_id( 'NewsletterType', $id );
} }
} }
if(isset($mailType) && is_object($mailType) && $mailType->GroupID) { if(isset($mailType) && is_object($mailType) && $mailType->GroupID) {
$group = DataObject::get_one("Group", "ID = $mailType->GroupID"); $group = DataObject::get_one("Group", "ID = $mailType->GroupID");
} }
if(isset($mailType) && is_object($mailType)) { if(isset($mailType) && is_object($mailType)) {
$fields = new FieldSet( $fields = new FieldSet(
@ -274,7 +274,7 @@ class NewsletterAdmin extends LeftAndMain {
new Tab( "Recipients", new Tab( "Recipients",
$recipients = new MemberTableField( $recipients = new MemberTableField(
$this, $this,
"Recipients", "Recipients",
$group $group
) )
), ),
@ -282,27 +282,27 @@ class NewsletterAdmin extends LeftAndMain {
$importField = new RecipientImportField("ImportFile","Import from file", $group ) $importField = new RecipientImportField("ImportFile","Import from file", $group )
), ),
new Tab("Unsubscribers", new Tab("Unsubscribers",
$unsubscribedList = new UnsubscribedList("Unsubscribed", $mailType) $unsubscribedList = new UnsubscribedList("Unsubscribed", $mailType)
), ),
new Tab("Bounced", new Tab("Bounced",
$bouncedList = new BouncedList("Bounced", $mailType ) $bouncedList = new BouncedList("Bounced", $mailType )
) )
) )
); );
$recipients->setController($this); $recipients->setController($this);
$importField->setController($this); $importField->setController($this);
$unsubscribedList->setController($this); $unsubscribedList->setController($this);
$bouncedList->setController($this); $bouncedList->setController($this);
$importField->setTypeID( $id ); $importField->setTypeID( $id );
$fields->push($idField = new HiddenField("ID")); $fields->push($idField = new HiddenField("ID"));
$fields->push( new HiddenField( "executeForm", "", "MailingListEditForm" ) ); $fields->push( new HiddenField( "executeForm", "", "MailingListEditForm" ) );
$idField->setValue($id); $idField->setValue($id);
$actions = new FieldSet(new FormAction('save','Save')); $actions = new FieldSet(new FormAction('save','Save'));
$form = new Form($this, "MailingListEditForm", $fields, $actions); $form = new Form($this, "MailingListEditForm", $fields, $actions);
$form->loadDataFrom(array( $form->loadDataFrom(array(
'Title' => $mailType->Title, 'Title' => $mailType->Title,
@ -311,11 +311,11 @@ class NewsletterAdmin extends LeftAndMain {
} else { } else {
$form = false; $form = false;
} }
return $form; return $form;
} }
/** /**
* Reloads the list of recipients via ajax * Reloads the list of recipients via ajax
*/ */
@ -324,9 +324,9 @@ class NewsletterAdmin extends LeftAndMain {
$newsletterType = DataObject::get_by_id('NewsletterType', $this->urlParams['ID'] ); $newsletterType = DataObject::get_by_id('NewsletterType', $this->urlParams['ID'] );
$memberList = new MemberTableField($this, "Recipients", $newsletterType->Group() ); $memberList = new MemberTableField($this, "Recipients", $newsletterType->Group() );
return $memberList->FieldHolder(); return $memberList->FieldHolder();
} }
} }
public static function template_path() { public static function template_path() {
if(self::$template_path) return self::$template_path; if(self::$template_path) return self::$template_path;
else return self::$template_path = project() . '/templates/email'; else return self::$template_path = project() . '/templates/email';
@ -334,15 +334,15 @@ class NewsletterAdmin extends LeftAndMain {
/* Does not seem to be used /* Does not seem to be used
public function showdraft( $params ) { public function showdraft( $params ) {
return $this->showWithEditForm( $params, $this->getNewsletterEditForm( $params['ID'] ) ); return $this->showWithEditForm( $params, $this->getNewsletterEditForm( $params['ID'] ) );
} }
*/ */
public function getNewsletterEditForm($myId){ public function getNewsletterEditForm($myId){
$email = DataObject::get_by_id("Newsletter", $myId); $email = DataObject::get_by_id("Newsletter", $myId);
if($email) { if($email) {
$fields = $email->getCMSFields($this); $fields = $email->getCMSFields($this);
$fields->push($idField = new HiddenField("ID")); $fields->push($idField = new HiddenField("ID"));
$idField->setValue($myId); $idField->setValue($myId);
@ -351,52 +351,52 @@ class NewsletterAdmin extends LeftAndMain {
//$fields->push(new HiddenField("executeForm", "", "EditForm") ); //$fields->push(new HiddenField("executeForm", "", "EditForm") );
$actions = new FieldSet(); $actions = new FieldSet();
if( $email->SentDate ) if( $email->SentDate )
$actions->push(new FormAction('send','Resend')); $actions->push(new FormAction('send','Resend'));
else else
$actions->push(new FormAction('send','Send')); $actions->push(new FormAction('send','Send'));
$actions->push(new FormAction('save','Save')); $actions->push(new FormAction('save','Save'));
$form = new Form($this, "NewsletterEditForm", $fields, $actions); $form = new Form($this, "NewsletterEditForm", $fields, $actions);
$form->loadDataFrom($email); $form->loadDataFrom($email);
if($email->Status != 'Draft') { if($email->Status != 'Draft') {
$form->makeReadonly(); $form->makeReadonly();
} }
// user_error( $form->FormAction(), E_USER_ERROR ); // user_error( $form->FormAction(), E_USER_ERROR );
return $form; return $form;
} else { } else {
user_error( 'Unknown Email ID: ' . $myId, E_USER_ERROR ); user_error( 'Unknown Email ID: ' . $myId, E_USER_ERROR );
} }
} }
public function SendProgressBar() { public function SendProgressBar() {
$progressBar = new ProgressBar( 'SendProgressBar', 'Sending emails...' ); $progressBar = new ProgressBar( 'SendProgressBar', 'Sending emails...' );
return $progressBar->FieldHolder(); return $progressBar->FieldHolder();
} }
public function sendnewsletter( /*$data, $form = null*/ ) { public function sendnewsletter( /*$data, $form = null*/ ) {
$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : $_REQUEST['NewsletterID']; $id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : $_REQUEST['NewsletterID'];
if( !$id ) { if( !$id ) {
FormResponse::status_message('No newsletter specified','bad'); FormResponse::status_message('No newsletter specified','bad');
return FormResponse::respond(); return FormResponse::respond();
} }
$newsletter = DataObject::get_by_id("Newsletter", $id); $newsletter = DataObject::get_by_id("Newsletter", $id);
$nlType = $newsletter->getNewsletterType(); $nlType = $newsletter->getNewsletterType();
$e = new Newsletter_Email($nlType); $e = new Newsletter_Email($nlType);
$e->Body = $body = $newsletter->Content; $e->Body = $body = $newsletter->Content;
$e->Subject = $subject = $newsletter->Subject; $e->Subject = $subject = $newsletter->Subject;
// TODO Make this dynamic // TODO Make this dynamic
if( $nlType && $nlType->FromEmail ) if( $nlType && $nlType->FromEmail )
$e->From = $from = $nlType->FromEmail; $e->From = $from = $nlType->FromEmail;
else else
@ -406,7 +406,7 @@ class NewsletterAdmin extends LeftAndMain {
$e->setTemplate( $nlType->Template ); $e->setTemplate( $nlType->Template );
$messageID = base64_encode( $newsletter->ID . '_' . date( 'd-m-Y H:i:s' ) ); $messageID = base64_encode( $newsletter->ID . '_' . date( 'd-m-Y H:i:s' ) );
switch($_REQUEST['SendType']) { switch($_REQUEST['SendType']) {
case "Test": case "Test":
if($_REQUEST['TestEmail']) { if($_REQUEST['TestEmail']) {
@ -415,7 +415,7 @@ class NewsletterAdmin extends LeftAndMain {
FormResponse::status_message('Sent test to ' . $_REQUEST['TestEmail'],'good'); FormResponse::status_message('Sent test to ' . $_REQUEST['TestEmail'],'good');
} else { } else {
FormResponse::status_message('No template selected','bad'); FormResponse::status_message('No template selected','bad');
} }
} else { } else {
FormResponse::status_message('Please enter an email address','bad'); FormResponse::status_message('Please enter an email address','bad');
} }
@ -423,16 +423,16 @@ class NewsletterAdmin extends LeftAndMain {
case "List": case "List":
echo self::sendToList( $subject, $body, $from, $newsletter, $nlType, $messageID ); echo self::sendToList( $subject, $body, $from, $newsletter, $nlType, $messageID );
} }
return FormResponse::respond(); return FormResponse::respond();
} }
static function sendToAddress( $email, $address, $messageID = null ) { static function sendToAddress( $email, $address, $messageID = null ) {
$email->To = $address; $email->To = $address;
$email->send(); $email->send();
} }
static function sendToList( $subject, $body, $from, $newsletter, $nlType, $messageID = null ) { static function sendToList( $subject, $body, $from, $newsletter, $nlType, $messageID = null ) {
$emailProcess = new NewsletterEmailProcess( $subject, $body, $from, $newsletter, $nlType, $messageID ); $emailProcess = new NewsletterEmailProcess( $subject, $body, $from, $newsletter, $nlType, $messageID );
return $emailProcess->start(); return $emailProcess->start();
@ -455,10 +455,10 @@ class NewsletterAdmin extends LeftAndMain {
FormResponse::set_node_title("mailtype_$id", $record->Title); FormResponse::set_node_title("mailtype_$id", $record->Title);
FormResponse::status_message('Saved', 'good'); FormResponse::status_message('Saved', 'good');
return FormResponse::respond(); return FormResponse::respond();
} }
public function savenewsletter($urlParams, $form) { public function savenewsletter($urlParams, $form) {
$id = $_REQUEST['ID']; $id = $_REQUEST['ID'];
@ -467,12 +467,12 @@ class NewsletterAdmin extends LeftAndMain {
// Is the template attached to the type, or the newsletter itself? // Is the template attached to the type, or the newsletter itself?
$type = $record->getNewsletterType(); $type = $record->getNewsletterType();
$record->Subject = $urlParams['Subject']; $record->Subject = $urlParams['Subject'];
$record->Content = $urlParams['Content']; $record->Content = $urlParams['Content'];
$record->write(); $record->write();
$id = 'draft_'.$record->ParentID.'_'.$record->ID; $id = 'draft_'.$record->ParentID.'_'.$record->ID;
FormResponse::set_node_title($id, $record->Title); FormResponse::set_node_title($id, $record->Title);
@ -482,13 +482,13 @@ class NewsletterAdmin extends LeftAndMain {
} }
function NewsletterAdminSiteTree() { function NewsletterAdminSiteTree() {
return $this->getsitetree(); return $this->getsitetree();
} }
function getsitetree() { function getsitetree() {
return $this->renderWith('NewsletterAdmin_SiteTree'); return $this->renderWith('NewsletterAdmin_SiteTree');
} }
public function AddRecordForm() { public function AddRecordForm() {
$m = new MemberTableField($this,"Members", $this->currentPageID()); $m = new MemberTableField($this,"Members", $this->currentPageID());
return $m->AddRecordForm(); return $m->AddRecordForm();
@ -500,7 +500,7 @@ class NewsletterAdmin extends LeftAndMain {
public function autocomplete() { public function autocomplete() {
$fieldName = $this->urlParams['ID']; $fieldName = $this->urlParams['ID'];
$fieldVal = $_REQUEST[$fieldName]; $fieldVal = $_REQUEST[$fieldName];
$matches = DataObject::get("Member","$fieldName LIKE '" . addslashes($fieldVal) . "%'"); $matches = DataObject::get("Member","$fieldName LIKE '" . addslashes($fieldVal) . "%'");
if($matches) { if($matches) {
echo "<ul>"; echo "<ul>";
@ -517,23 +517,23 @@ class NewsletterAdmin extends LeftAndMain {
function savemember() { function savemember() {
$data = $_REQUEST; $data = $_REQUEST;
$className = $this->stat('subitem_class'); $className = $this->stat('subitem_class');
$id = $_REQUEST['ID']; $id = $_REQUEST['ID'];
if($id == 'new') $id = null; if($id == 'new') $id = null;
if($id) { if($id) {
$record = DataObject::get_one($className, "`$className`.ID = $id"); $record = DataObject::get_one($className, "`$className`.ID = $id");
} else { } else {
// send out an email to notify the user that they have been subscribed // send out an email to notify the user that they have been subscribed
$record = new $className(); $record = new $className();
} }
$record->update($data); $record->update($data);
$record->ID = $id; $record->ID = $id;
$record->write(); $record->write();
$record->Groups()->add($data['GroupID']); $record->Groups()->add($data['GroupID']);
$FirstName = Convert::raw2js($record->FirstName); $FirstName = Convert::raw2js($record->FirstName);
@ -550,17 +550,17 @@ class NewsletterAdmin extends LeftAndMain {
JS; JS;
FormResponse::add($response); FormResponse::add($response);
FormResponse::status_message('Saved', 'good'); FormResponse::status_message('Saved', 'good');
return FormResponse::respond(); return FormResponse::respond();
} }
public function NewsletterTypes() { public function NewsletterTypes() {
return DataObject::get("NewsletterType",""); return DataObject::get("NewsletterType","");
} }
public function addgroup() { public function addgroup() {
$parent = $_REQUEST['ParentID'] ? $_REQUEST['ParentID'] : 0; $parent = $_REQUEST['ParentID'] ? $_REQUEST['ParentID'] : 0;
$p = new Group(); $p = new Group();
$p->Title = "New Group"; $p->Title = "New Group";
$p->Code = "new-group"; $p->Code = "new-group";
@ -569,8 +569,8 @@ JS;
$this->returnItemToUser($p); $this->returnItemToUser($p);
} }
public function addtype( $params ) { public function addtype( $params ) {
switch( $_REQUEST['PageType'] ) { switch( $_REQUEST['PageType'] ) {
case 'type': case 'type':
$form = $this->getNewsletterTypeEditForm( $this->newNewsletterType() ); $form = $this->getNewsletterTypeEditForm( $this->newNewsletterType() );
@ -578,36 +578,36 @@ JS;
default: default:
$form = $this->getNewsletterEditForm( $this->newDraft( $_REQUEST['ParentID'] ) ); $form = $this->getNewsletterEditForm( $this->newDraft( $_REQUEST['ParentID'] ) );
} }
return $this->showWithEditForm( $_REQUEST, $form ); return $this->showWithEditForm( $_REQUEST, $form );
} }
public function adddraft( $data, $form ) { public function adddraft( $data, $form ) {
$this->save( $data, $form ); $this->save( $data, $form );
$draftID = $this->newDraft( $_REQUEST['ID'] ); $draftID = $this->newDraft( $_REQUEST['ID'] );
return $this->getNewsletterEditForm( $draftID ); return $this->getNewsletterEditForm( $draftID );
} }
/** /**
* Create a new newsletter type * Create a new newsletter type
*/ */
private function newNewsletterType() { private function newNewsletterType() {
// create a new group for the newsletter // create a new group for the newsletter
$newGroup = new Group(); $newGroup = new Group();
$newGroup->Title = "New mailing list"; $newGroup->Title = "New mailing list";
$newGroup->Code = "new-mailing-list"; $newGroup->Code = "new-mailing-list";
$newGroup->write(); $newGroup->write();
// create the new type // create the new type
$newsletterType = new NewsletterType(); $newsletterType = new NewsletterType();
$newsletterType->Title = 'New newsletter type'; $newsletterType->Title = 'New newsletter type';
$newsletterType->GroupID = $newGroup->ID; $newsletterType->GroupID = $newGroup->ID;
$newsletterType->write(); $newsletterType->write();
// return the contents of the site tree // return the contents of the site tree
return $newsletterType; return $newsletterType;
} }
private function newDraft( $parentID ) { private function newDraft( $parentID ) {
if(!$parentID || !is_numeric( $parentID)) { if(!$parentID || !is_numeric( $parentID)) {
$parent = DataObject::get_one("NewsletterType"); $parent = DataObject::get_one("NewsletterType");
@ -620,62 +620,62 @@ JS;
$newsletter->ParentID = $parentID; $newsletter->ParentID = $parentID;
$newsletter->write(); $newsletter->write();
} else { } else {
user_error( "You must first create a newsletter type before creating a draft", E_USER_ERROR ); user_error( "You must first create a newsletter type before creating a draft", E_USER_ERROR );
} }
return $newsletter->ID; return $newsletter->ID;
} }
public function newmember() { public function newmember() {
Session::clear('currentMember'); Session::clear('currentMember');
$newMemberForm = array( $newMemberForm = array(
"MemberForm" => $this->getMemberForm('new'), "MemberForm" => $this->getMemberForm('new'),
); );
if(Director::is_ajax()) { if(Director::is_ajax()) {
SSViewer::setOption('rewriteHashlinks', false); SSViewer::setOption('rewriteHashlinks', false);
$customised = $this->customise($newMemberForm); $customised = $this->customise($newMemberForm);
$result = $customised->renderWith($this->class . "_rightbottom"); $result = $customised->renderWith($this->class . "_rightbottom");
$parts = split('</?form[^>]*>', $result); $parts = split('</?form[^>]*>', $result);
echo $parts[1]; echo $parts[1];
} else { } else {
return $newMemberForm; return $newMemberForm;
} }
} }
public function EditedMember() { public function EditedMember() {
if(Session::get('currentMember')) if(Session::get('currentMember'))
return DataObject::get_by_id("Member", Session::get('currentMember')); return DataObject::get_by_id("Member", Session::get('currentMember'));
} }
public function Link($action = null) { public function Link($action = null) {
if(!$action) $action = "index"; if(!$action) $action = "index";
return "admin/newsletter/$action/" . $this->currentPageID(); return "admin/newsletter/$action/" . $this->currentPageID();
} }
public function displayfilefield() { public function displayfilefield() {
$id = $this->urlParams['ID']; $id = $this->urlParams['ID'];
return $this->customise( array( 'ID' => $id, "UploadForm" => $this->UploadForm() ) )->renderWith('Newsletter_RecipientImportField'); return $this->customise( array( 'ID' => $id, "UploadForm" => $this->UploadForm() ) )->renderWith('Newsletter_RecipientImportField');
} }
function UploadForm( $id = null ) { function UploadForm( $id = null ) {
if( !$id ) if( !$id )
$id = $this->urlParams['ID']; $id = $this->urlParams['ID'];
$fields = new FieldSet( $fields = new FieldSet(
new FileField( "ImportFile", "" ), new FileField( "ImportFile", "" ),
//new HiddenField( "action_import", "", "1" ), //new HiddenField( "action_import", "", "1" ),
new HiddenField( "ID", "", $id ) new HiddenField( "ID", "", $id )
); );
$actions = new FieldSet( $actions = new FieldSet(
new FormAction( "action_import", "Show contents" ) new FormAction( "action_import", "Show contents" )
); );
return new RecipientImportField_UploadForm( $this, "UploadForm", $fields, $actions ); return new RecipientImportField_UploadForm( $this, "UploadForm", $fields, $actions );
} }
} }

28
code/StaticExporter.php
View File

@ -10,7 +10,7 @@ class StaticExporter extends Controller {
parent::init(); parent::init();
if(!$this->can('AdminCMS')) { if(!$this->can('AdminCMS')) {
$messageSet = array( $messageSet = array(
'default' => "Enter your email address and password to access the CMS.", 'default' => "Please choose an authentication method and enter your credentials to access the CMS.",
'alreadyLoggedIn' => "I'm sorry, but you can't access that part of the CMS. If you want to log in as someone else, do so below", 'alreadyLoggedIn' => "I'm sorry, but you can't access that part of the CMS. If you want to log in as someone else, do so below",
'logInAgain' => "You have been logged out of the CMS. If you would like to log in again, enter a username and password below.", 'logInAgain' => "You have been logged out of the CMS. If you would like to log in again, enter a username and password below.",
); );
@ -18,17 +18,17 @@ class StaticExporter extends Controller {
Security::permissionFailure($this, $messageSet); Security::permissionFailure($this, $messageSet);
} }
} }
function Link($action = null) { function Link($action = null) {
return "StaticExporter/$action"; return "StaticExporter/$action";
} }
function index() { function index() {
echo "<h1>Static exporter</h1>"; echo "<h1>Static exporter</h1>";
echo $this->StaticExportForm()->forTemplate(); echo $this->StaticExportForm()->forTemplate();
} }
function StaticExportForm() { function StaticExportForm() {
return new Form($this, 'StaticExportForm', new FieldSet( return new Form($this, 'StaticExportForm', new FieldSet(
new TextField('folder', 'Folder to export to'), new TextField('folder', 'Folder to export to'),
@ -37,15 +37,15 @@ class StaticExporter extends Controller {
new FormAction('export', 'Export to that folder') new FormAction('export', 'Export to that folder')
)); ));
} }
function export() { function export() {
if($_REQUEST['baseurl']) { if($_REQUEST['baseurl']) {
$base = $_REQUEST['baseurl']; $base = $_REQUEST['baseurl'];
if(substr($base,-1) != '/') $base .= '/'; if(substr($base,-1) != '/') $base .= '/';
Director::setBaseURL($base); Director::setBaseURL($base);
} }
$folder = $_REQUEST['folder']; $folder = $_REQUEST['folder'];
if($folder && file_exists($folder)) { if($folder && file_exists($folder)) {
$pages = DataObject::get("SiteTree"); $pages = DataObject::get("SiteTree");
@ -54,19 +54,19 @@ class StaticExporter extends Controller {
$contentfile = "$folder/$page->URLSegment/index.html"; $contentfile = "$folder/$page->URLSegment/index.html";
echo "<li>$page->URLSegment/index.html"; echo "<li>$page->URLSegment/index.html";
// Make the folder // Make the folder
if(!file_exists($subfolder)) { if(!file_exists($subfolder)) {
mkdir($subfolder); mkdir($subfolder);
chmod($subfolder,02775); chmod($subfolder,02775);
} }
// Run the page // Run the page
Requirements::clear(); Requirements::clear();
$controllerClass = "{$page->class}_Controller"; $controllerClass = "{$page->class}_Controller";
if(class_exists($controllerClass)) { if(class_exists($controllerClass)) {
$controller = new $controllerClass($page); $controller = new $controllerClass($page);
$response = $controller->run( array() ); $response = $controller->run( array() );
$pageContent = $response->getBody(); $pageContent = $response->getBody();
@ -80,9 +80,9 @@ class StaticExporter extends Controller {
} else { } else {
echo "Please specify a folder that exists"; echo "Please specify a folder that exists";
} }
} }
} }
?> ?>