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

mlanthaler: Suppress E_NOTICE when $_REQUESTctf?childID? is not set (e.g. when adding a new member by clicking on "Add member" in the security tab).

Browse Source 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41805 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-14 19:39:59 +00:00
parent 3ee2969cd5
commit c2f57b75de
1 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
code/MemberTableField.php
View File

@ -2,7 +2,7 @@
/** /**
* Enhances {ComplexTableField} with the ability to list groups and given members. * Enhances {ComplexTableField} with the ability to list groups and given members.
* It is based around groups, so it deletes Members from a Group rather than from the entire system. * It is based around groups, so it deletes Members from a Group rather than from the entire system.
* *
* In contrast to the original implementation, the URL-parameters "ParentClass" and "ParentID" are used * In contrast to the original implementation, the URL-parameters "ParentClass" and "ParentID" are used
* to specify "Group" (hardcoded) and the GroupID-relation. * to specify "Group" (hardcoded) and the GroupID-relation.
* *
@ -18,11 +18,11 @@ class MemberTableField extends ComplexTableField {
protected $pageSize; protected $pageSize;
protected $detailFormValidator; protected $detailFormValidator;
protected $group; protected $group;
protected $template = "MemberTableField"; protected $template = "MemberTableField";
static $data_class = "Member"; static $data_class = "Member";
protected $permissions = array( protected $permissions = array(
"add", "add",
"edit", "edit",
@ -45,27 +45,27 @@ class MemberTableField extends ComplexTableField {
} }
function __construct($controller, $name, $group, $members = null, $hidePassword = true, $pageLimit = 10) { function __construct($controller, $name, $group, $members = null, $hidePassword = true, $pageLimit = 10) {
if($group) { if($group) {
if(is_object($group)) { if(is_object($group)) {
$this->group = $group; $this->group = $group;
} else if(is_numeric($group)){ } else if(is_numeric($group)){
$this->group = DataObject::get_by_id('Group',$group); $this->group = DataObject::get_by_id('Group',$group);
} }
} else if(is_numeric($_REQUEST['ctf'][$this->Name()]["ID"])) { } else if(is_numeric($_REQUEST['ctf'][$this->Name()]["ID"])) {
$this->group = DataObject::get_by_id('Group',$_REQUEST['ctf'][$this->Name()]["ID"]); $this->group = DataObject::get_by_id('Group',$_REQUEST['ctf'][$this->Name()]["ID"]);
} }
$sourceClass = $this->stat("data_class"); $sourceClass = $this->stat("data_class");
foreach( self::$addedPermissions as $permission ) foreach( self::$addedPermissions as $permission )
array_push( $this->permissions, $permission ); array_push( $this->permissions, $permission );
$fieldList = array( $fieldList = array(
"FirstName" => "Firstname", "FirstName" => "Firstname",
"Surname" => "Surname", "Surname" => "Surname",
"Email" => "Email" "Email" => "Email"
); );
$csvFieldList = $fieldList; $csvFieldList = $fieldList;
@ -78,7 +78,7 @@ class MemberTableField extends ComplexTableField {
} }
if(!$hidePassword) { if(!$hidePassword) {
$fieldList["Password"] = "Password"; $fieldList["Password"] = "Password";
} }
if(isset($_REQUEST['ctf']['childID']) && $memberID = $_REQUEST['ctf']['childID']) { if(isset($_REQUEST['ctf']['childID']) && $memberID = $_REQUEST['ctf']['childID']) {
@ -90,23 +90,23 @@ class MemberTableField extends ComplexTableField {
$this->detailFormValidator = $SNG_member->getValidator(); $this->detailFormValidator = $SNG_member->getValidator();
$this->pageSize = $pageLimit; $this->pageSize = $pageLimit;
// Legacy: Use setCustomSourceItems() instead. // Legacy: Use setCustomSourceItems() instead.
if($members) { if($members) {
$this->customSourceItems = $this->memberListWithGroupID($members, $group); $this->customSourceItems = $this->memberListWithGroupID($members, $group);
} }
$this->hidePassword = $hidePassword; $this->hidePassword = $hidePassword;
parent::__construct($controller, $name, $sourceClass, $fieldList, $detailFormFields); parent::__construct($controller, $name, $sourceClass, $fieldList, $detailFormFields);
Requirements::javascript("cms/javascript/MemberTableField.js"); Requirements::javascript("cms/javascript/MemberTableField.js");
// construct the filter and sort // construct the filter and sort
if(isset($_REQUEST['MemberOrderByField'])) { if(isset($_REQUEST['MemberOrderByField'])) {
$this->sourceSort = "`" . Convert::raw2sql($_REQUEST['MemberOrderByField']) . "`" . Convert::raw2sql( $_REQUEST['MemberOrderByOrder'] ); $this->sourceSort = "`" . Convert::raw2sql($_REQUEST['MemberOrderByField']) . "`" . Convert::raw2sql( $_REQUEST['MemberOrderByOrder'] );
} }
// search // search
$search = isset($_REQUEST['MemberSearch']) ? Convert::raw2sql($_REQUEST['MemberSearch']) : null; $search = isset($_REQUEST['MemberSearch']) ? Convert::raw2sql($_REQUEST['MemberSearch']) : null;
if(!empty($_REQUEST['MemberSearch'])) { if(!empty($_REQUEST['MemberSearch'])) {
@ -116,7 +116,7 @@ class MemberTableField extends ComplexTableField {
$sourceF .= "`$k` LIKE '%$search%' OR "; $sourceF .= "`$k` LIKE '%$search%' OR ";
$this->sourceFilter[] = substr( $sourceF, 0, -3 ) . ")"; $this->sourceFilter[] = substr( $sourceF, 0, -3 ) . ")";
} }
// filter by groups // filter by groups
// TODO Not implemented yet // TODO Not implemented yet
if(isset($_REQUEST['ctf'][$this->Name()]['GroupID']) && is_numeric($_REQUEST['ctf'][$this->Name()]['GroupID'])) { if(isset($_REQUEST['ctf'][$this->Name()]['GroupID']) && is_numeric($_REQUEST['ctf'][$this->Name()]['GroupID'])) {
@ -126,25 +126,25 @@ class MemberTableField extends ComplexTableField {
// If the table is not clean (without duplication), the total and navigation wil not work well, so uncheck the big line below // If the table is not clean (without duplication), the total and navigation wil not work well, so uncheck the big line below
$this->sourceFilter[] = "`Group_Members`.`ID` IN (SELECT `ID` FROM `Group_Members` WHERE `GroupID`='{$this->group->ID}' GROUP BY `MemberID` HAVING MIN(`ID`))"; $this->sourceFilter[] = "`Group_Members`.`ID` IN (SELECT `ID` FROM `Group_Members` WHERE `GroupID`='{$this->group->ID}' GROUP BY `MemberID` HAVING MIN(`ID`))";
} }
$this->sourceJoin = " INNER JOIN `Group_Members` ON `MemberID`=`Member`.`ID`"; $this->sourceJoin = " INNER JOIN `Group_Members` ON `MemberID`=`Member`.`ID`";
$this->setFieldListCsv( $csvFieldList ); $this->setFieldListCsv( $csvFieldList );
} }
/** /**
* Overridden functions * Overridden functions
*/ */
function sourceID() { function sourceID() {
return $this->group->ID; return $this->group->ID;
} }
function AddLink() { function AddLink() {
return "{$this->PopupBaseLink()}&methodName=add"; return "{$this->PopupBaseLink()}&methodName=add";
} }
function DetailForm() { function DetailForm() {
$ID = Convert::raw2xml($_REQUEST['ctf']['ID']); $ID = Convert::raw2xml($_REQUEST['ctf']['ID']);
$childID = isset($_REQUEST['ctf']['childID']) ? Convert::raw2xml($_REQUEST['ctf']['childID']) : 0; $childID = isset($_REQUEST['ctf']['childID']) ? Convert::raw2xml($_REQUEST['ctf']['childID']) : 0;
@ -162,7 +162,7 @@ class MemberTableField extends ComplexTableField {
// the ID field confuses the Controller-logic in finding the right view for ReferencedField // the ID field confuses the Controller-logic in finding the right view for ReferencedField
$this->detailFormFields->removeByName('ID'); $this->detailFormFields->removeByName('ID');
$this->detailFormFields->push(new HiddenField("ctf[ID]"," ",$ID)); $this->detailFormFields->push(new HiddenField("ctf[ID]"," ",$ID));
// add a namespaced ID instead thats "converted" by saveComplexTableField() // add a namespaced ID instead thats "converted" by saveComplexTableField()
$this->detailFormFields->push(new HiddenField("ctf[childID]","",$childID)); $this->detailFormFields->push(new HiddenField("ctf[childID]","",$childID));
@ -183,7 +183,7 @@ class MemberTableField extends ComplexTableField {
return $form; return $form;
} }
function SearchForm() { function SearchForm() {
$searchFields = new FieldGroup( $searchFields = new FieldGroup(
new TextField('MemberSearch', 'Search'), new TextField('MemberSearch', 'Search'),
@ -191,10 +191,10 @@ class MemberTableField extends ComplexTableField {
new HiddenField('MemberFieldName','',$this->name), new HiddenField('MemberFieldName','',$this->name),
new HiddenField('MemberDontShowPassword','',$this->hidePassword) new HiddenField('MemberDontShowPassword','',$this->hidePassword)
); );
$orderByFields = new FieldGroup( $orderByFields = new FieldGroup(
new LabelField('Order by'), new LabelField('Order by'),
new FieldSet( new FieldSet(
new DropdownField('MemberOrderByField','', array( new DropdownField('MemberOrderByField','', array(
'FirstName' => 'FirstName', 'FirstName' => 'FirstName',
'Surname' => 'Surname', 'Surname' => 'Surname',
@ -206,27 +206,27 @@ class MemberTableField extends ComplexTableField {
)) ))
) )
); );
$groups = DataObject::get('Group'); $groups = DataObject::get('Group');
$groupArray = array('' => 'Any group'); $groupArray = array('' => 'Any group');
foreach( $groups as $group ) { foreach( $groups as $group ) {
$groupArray[$group->ID] = $group->Title; $groupArray[$group->ID] = $group->Title;
} }
$groupFields = new DropdownField('MemberGroup','Filter by group',$groupArray ); $groupFields = new DropdownField('MemberGroup','Filter by group',$groupArray );
$actionFields = new LiteralField('MemberFilterButton','<input type="submit" name="MemberFilterButton" value="Filter" id="MemberFilterButton"/>'); $actionFields = new LiteralField('MemberFilterButton','<input type="submit" name="MemberFilterButton" value="Filter" id="MemberFilterButton"/>');
$fieldContainer = new FieldGroup( $fieldContainer = new FieldGroup(
$searchFields, $searchFields,
// $orderByFields, // $orderByFields,
// $groupFields, // $groupFields,
$actionFields $actionFields
); );
return $fieldContainer->FieldHolder(); return $fieldContainer->FieldHolder();
} }
/** /**
* Add existing member to group rather than creating a new member * Add existing member to group rather than creating a new member
*/ */
@ -237,10 +237,10 @@ class MemberTableField extends ComplexTableField {
if(!is_numeric($data['ctf']['ID'])) { if(!is_numeric($data['ctf']['ID'])) {
FormResponse::status_messsage('Adding failed', 'bad'); FormResponse::status_messsage('Adding failed', 'bad');
} }
$className = $this->stat('data_class'); $className = $this->stat('data_class');
$record = new $className(); $record = new $className();
$record->update($data); $record->update($data);
$record->write(); $record->write();
@ -257,7 +257,7 @@ class MemberTableField extends ComplexTableField {
return FormResponse::respond(); return FormResponse::respond();
} }
/** /**
* Custom delete implementation: * Custom delete implementation:
* Remove member from group rather than from the database * Remove member from group rather than from the database
@ -271,13 +271,13 @@ class MemberTableField extends ComplexTableField {
} else { } else {
user_error("MemberTableField::delete: Bad parameters: Group=$groupID, Member=$memberID", E_USER_ERROR); user_error("MemberTableField::delete: Bad parameters: Group=$groupID, Member=$memberID", E_USER_ERROR);
} }
return FormResponse::respond(); return FormResponse::respond();
} }
/** /**
* ################################# * #################################
* Utility Functions * Utility Functions
@ -286,12 +286,12 @@ class MemberTableField extends ComplexTableField {
function getParentClass() { function getParentClass() {
return "Group"; return "Group";
} }
function getParentIdName($childClass,$parentClass){ function getParentIdName($childClass,$parentClass){
return "GroupID"; return "GroupID";
} }
/** /**
* ################################# * #################################
* Custom Functions * Custom Functions
@ -304,18 +304,18 @@ class MemberTableField extends ComplexTableField {
} }
return $newMembers; return $newMembers;
} }
function setGroup($group) { function setGroup($group) {
$this->group = $group; $this->group = $group;
} }
function setController($controller) { function setController($controller) {
$this->controller = $controller; $this->controller = $controller;
} }
function GetControllerName() { function GetControllerName() {
return $this->controller->class; return $this->controller->class;
} }
/** /**
* Add existing member to group by name (with JS-autocompletion) * Add existing member to group by name (with JS-autocompletion)
*/ */
@ -325,7 +325,7 @@ class MemberTableField extends ComplexTableField {
$fields->push(new TextField($fieldName)); $fields->push(new TextField($fieldName));
} }
$fields->push(new HiddenField("ctf[ID]", null, $this->group->ID)); $fields->push(new HiddenField("ctf[ID]", null, $this->group->ID));
return new TabularStyle(new Form($this->controller,'AddRecordForm', return new TabularStyle(new Form($this->controller,'AddRecordForm',
$fields, $fields,
new FieldSet( new FieldSet(
@ -336,7 +336,7 @@ class MemberTableField extends ComplexTableField {
/** /**
* Cached version for getting the appropraite members for this particular group. * Cached version for getting the appropraite members for this particular group.
* *
* This includes getting inherited groups, such as groups under groups. * This includes getting inherited groups, such as groups under groups.
*/ */
function sourceItems(){ function sourceItems(){
@ -344,8 +344,8 @@ class MemberTableField extends ComplexTableField {
if($this->sourceItems) { if($this->sourceItems) {
return $this->sourceItems; return $this->sourceItems;
} }
// Setup limits // Setup limits
$limitClause = ""; $limitClause = "";
if(isset($_REQUEST['ctf'][$this->Name()]['start']) && is_numeric($_REQUEST['ctf'][$this->Name()]['start'])) { if(isset($_REQUEST['ctf'][$this->Name()]['start']) && is_numeric($_REQUEST['ctf'][$this->Name()]['start'])) {
$limitClause = ($_REQUEST['ctf'][$this->Name()]['start']) . ", {$this->pageSize}"; $limitClause = ($_REQUEST['ctf'][$this->Name()]['start']) . ", {$this->pageSize}";
@ -379,7 +379,7 @@ class MemberTableField extends ComplexTableField {
class MemberTableField_Popup extends ComplexTableField_Popup { class MemberTableField_Popup extends ComplexTableField_Popup {
function __construct($controller, $name, $fields, $sourceClass, $readonly=false, $validator = null) { function __construct($controller, $name, $fields, $sourceClass, $readonly=false, $validator = null) {
// DO NOT CHANGE THE ORDER OF THESE JS FILES. THESE ARE ONLY REQUIRED FOR THIS INSTANCE !!!11onetwo // DO NOT CHANGE THE ORDER OF THESE JS FILES. THESE ARE ONLY REQUIRED FOR THIS INSTANCE !!!11onetwo
parent::__construct($controller, $name, $fields, $sourceClass, $readonly, $validator); parent::__construct($controller, $name, $fields, $sourceClass, $readonly, $validator);
@ -399,9 +399,9 @@ class MemberTableField_Popup extends ComplexTableField_Popup {
} }
$this->saveInto($childObject); $this->saveInto($childObject);
$childObject->write(); $childObject->write();
$childObject->Groups()->add($_REQUEST['ctf']['ID']); $childObject->Groups()->add($_REQUEST['ctf']['ID']);
// if ajax-call in an iframe, close window by javascript, else redirect to referrer // if ajax-call in an iframe, close window by javascript, else redirect to referrer
if(!Director::is_ajax()) { if(!Director::is_ajax()) {
Director::redirect(substr($_SERVER['REQUEST_URI'],0,strpos($_SERVER['REQUEST_URI'],"?"))); Director::redirect(substr($_SERVER['REQUEST_URI'],0,strpos($_SERVER['REQUEST_URI'],"?")));