diff --git a/Config/Schema/schema.xml b/Config/Schema/schema.xml new file mode 100644 index 0000000..d78fd3c --- /dev/null +++ b/Config/Schema/schema.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + REFERENCES cm_co_dashboard_widgets(id) + + + + + + + + + + co_dashboard_widget_id + + +
+ \ No newline at end of file diff --git a/Controller/CoGrouperLitesController.php b/Controller/CoGrouperLitesController.php index fb563b0..32cb195 100644 --- a/Controller/CoGrouperLitesController.php +++ b/Controller/CoGrouperLitesController.php @@ -4,9 +4,69 @@ class CoGrouperLitesController extends SDWController { + public $helpers = array('Html', 'Form', 'Flash'); + public $components = array('Flash'); + // Class name, used by Cake public $name = "CoGrouperLites"; - //TODO - need to add the call $this->calculateParentPermissions($roles); for authorization + public $uses = array( + "GrouperLite.CoGrouperLite" + ); + + /** + * Callback after controller methods are invoked but before views are rendered. + * + * @since COmanage Registry v3.2.0 + */ + + function beforeRender() + { + $this->set('title_for_layout', _txt('pl.grouperlite.config.edit.title')); + + parent::beforeRender(); + } + + public function display($id) + { + $cfg = $this->CoGrouperLite->getConfig(); + + $this->set('title_for_layout', _txt('pl.grouperlite.config.display.title')); + // Pass the config so we know which div to overwrite + $this->set('vv_config', $cfg); + } + + + /** + * Authorization for this Controller, called by Auth component + * - precondition: Session.Auth holds data used for authz decisions + * - postcondition: $permissions set with calculated permissions + * + * @since COmanage Registry v3.2.0 + * @return Array Permissions + */ + + function isAuthorized() + { + $roles = $this->Role->calculateCMRoles(); + + // Determine what operations this user can perform + + // Construct the permission set for this user, which will also be passed to the view. + // Ask the parent to calculate the display permission, based on the configuration. + // Note that the display permission is set at the Dashboard, not Dashboard Widget level. + $p = $this->calculateParentPermissions($roles); + + // Delete an existing CO Announcements Widget? + $p['delete'] = ($roles['cmadmin'] || $roles['coadmin']); + + // Edit an existing CO Announcements Widget? + $p['edit'] = ($roles['cmadmin'] || $roles['coadmin']); + + // View an existing CO Announcements Widget? + $p['view'] = ($roles['cmadmin'] || $roles['coadmin']); + $this->set('permissions', $p); + return ($p[$this->action]); + } } \ No newline at end of file diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php index db63416..d5477cd 100644 --- a/Controller/GrouperGroupsController.php +++ b/Controller/GrouperGroupsController.php @@ -9,7 +9,6 @@ class GrouperGroupsController extends GrouperLiteAppController public $components = array('Flash'); public $name = 'GrouperGroups'; - public $userId = 'ryan.mathis@at.internet2.edu'; public function index() { return $this->redirect( @@ -20,7 +19,7 @@ public function index() { public function groupUser() { - $this->set('title', 'Grouper Groups:'); + $this->set('title', _txt('pl.grouperlite.title.root')); //TODO - Change to get userid somehow $this->set('groupergroupsmember', $this->GrouperGroup->optinGroups($this->userId)); } @@ -31,16 +30,17 @@ public function groupInfo() $details = $this->GrouperGroup->groupDescriptions($name); $this->set('groupname', $name); - $this->set('title', 'Group configuration and attributes'); + $this->set('title', _txt('pl.grouperlite.title.groupinfo')); $this->set('groupergroupsdetail', $details[0]); } public function groupOwner() { - $this->set('title', 'Grouper Groups I Manage:'); + $this->set('title', _txt('pl.grouperlite.title.groupowner')); if (isset($this->request->data['search'])){ $searchCriteria = urldecode($this->request->data['search']); $this->set('groupergroupsowner', $this->GrouperGroup->getSearchedGroups($this->userId, $searchCriteria, 'groupOwner')); + $this->set('searchcriteria', $searchCriteria); } else { $this->set('groupergroupsowner', $this->GrouperGroup->ownerGroups($this->userId)); } @@ -49,7 +49,7 @@ public function groupOwner() public function groupOptin() { - $this->set('title', 'Grouper Groups I Can Join:'); + $this->set('title', _txt('pl.grouperlite.title.groupoptin')); if (isset($this->request->data['search'])){ $searchCriteria = urldecode($this->request->data['search']); @@ -62,7 +62,7 @@ public function groupOptin() public function emailListsOptin() { - $this->set('title', 'Email lists'); + $this->set('title', _txt('pl.grouperlite.title.emaillists')); // mock data $this->set('group', array( 'member' => true, @@ -74,7 +74,7 @@ public function emailListsOptin() public function emailListsManaged() { - $this->set('title', 'Email lists I manage'); + $this->set('title', _txt('pl.grouperlite.title.emaillistsmanaged')); // mock data $this->set('group', array( 'member' => true, @@ -86,7 +86,7 @@ public function emailListsManaged() public function emailListInfo() { - $this->set('title', 'Email list configuration and attributes'); + $this->set('title', _txt('pl.grouperlite.title.emaillistsinfo')); // mock data $this->set('groupergroupsdetail', array( 'member' => true, @@ -103,7 +103,7 @@ public function emailListInfo() } public function groupCreateForm() { - $this->set('title', 'Create Grouper Group'); + $this->set('title', _txt('pl.grouperlite.title.groupcreate')); } public function groupCreate() @@ -120,13 +120,13 @@ public function joinGroup() if ($this->request->is('post')) { $name = $this->request->data['GroupName']; if($this->GrouperGroup->joinGroup($this->userId, $name)) { - $this->Flash->success(__('You have been added to the group!')); + $this->Flash->success(_txt('You have been added to the group!')); } else { - $this->Flash->error(__('You are unable to join the group!')); + $this->Flash->error(_txt('You are unable to join the group!')); } return $this->redirect(array('action' => 'groupoptin')); } - $this->Flash->error(__('An error occurred in joining the group, please try again later.')); + $this->Flash->error(_txt('An error occurred in joining the group, please try again later.')); } @@ -135,13 +135,13 @@ public function leaveGroup() if ($this->request->is('post')) { $name = $this->request->data['GroupName']; if($this->GrouperGroup->leaveGroup($this->userId, $name)) { - $this->Flash->success(__('You have been deleted from the group!')); + $this->Flash->success(_txt('You have been deleted from the group!')); } else { - $this->Flash->error(__('You are unable to delete the group!')); + $this->Flash->error(_txt('You are unable to delete the group!')); } return $this->redirect(array('action' => 'groupoptin')); } - $this->Flash->error(__('An error occurred in leaving the group, please try again later.')); + $this->Flash->error(_txt('An error occurred in leaving the group, please try again later.')); } /** diff --git a/Lib/GrouperApiAccess.php b/Lib/GrouperApiAccess.php index c83e57f..dcd7556 100644 --- a/Lib/GrouperApiAccess.php +++ b/Lib/GrouperApiAccess.php @@ -158,33 +158,6 @@ public function getGrouperGroups($queryData) return array(); } - public function searchGrouperGroups($queryData) { - - $subjectID = $queryData['conditions']['userId']; - $search = $queryData['conditions']['search']; - - $groupsFiltered = array( - "WsRestFindGroupsRequest" => array( - "actAsSubjectLookup" => array("subjectId" => $subjectID), - "wsQueryFilter" => array( - "queryFilterType" => "FIND_BY_GROUP_NAME_APPROXIMATE", - "groupName" => $search - ) - ) - ); - - $this->http->setHeader(array('Content-Type' => 'application/json', 'Accept' => 'application/json')); - - $connectionUrl = "{$this->config['fullUrl']}/groups"; - - $results = $this->http->sendRequest('POST', $connectionUrl, json_encode($groupsFiltered)); - - if (isset($results['WsFindGroupsResults']['groupResults']) && $results['WsFindGroupsResults']['groupResults'] != NULL) { - return $results['WsFindGroupsResults']['groupResults']; - } - - return array(); - } public function getGrouperGroupDescription($queryData) { @@ -287,7 +260,7 @@ public function getGroupAttributes($queryData) { "includeAssignmentsOnAssignments" => "T", "wsOwnerGroupLookups" => array( array( - "groupName" => $groupName + "groupName" => $groupName, ) ) ) @@ -298,8 +271,8 @@ public function getGroupAttributes($queryData) { $results = $this->http->sendRequest('POST', $connectionUrl, json_encode($stemToFind)); - if (isset($results['WsGetAttributeAssignmentsResults']['wsAttributeDefNames']) && $results['WsGetAttributeAssignmentsResults']['wsAttributeDefNames'] != NULL) { - return $results['WsGetAttributeAssignmentsResults']['wsAttributeDefNames']; + if (isset($results['WsGetAttributeAssignmentsResults']['wsAttributeAssigns']) && $results['WsGetAttributeAssignmentsResults']['wsAttributeAssigns'] != NULL) { + return $results['WsGetAttributeAssignmentsResults']['wsAttributeAssigns']; } return array(); } diff --git a/Lib/lang.php b/Lib/lang.php new file mode 100644 index 0000000..4f3f031 --- /dev/null +++ b/Lib/lang.php @@ -0,0 +1,73 @@ + 'Grouper Configuration Settings', + 'pl.grouperlite.config.edit.title' => 'Edit Grouper Configuration Settings', + 'pl.grouperlite.config.grouper-url' => 'Grouper URL', + 'pl.grouperlite.config.grouper-version' => 'Grouper Version', + 'pl.grouperlite.config.grouper-un' => 'Username', + 'pl.grouperlite.config.grouper-pw' => 'Password', + + 'pl.grouperlite.crumb.root' => 'Grouper groups', + 'pl.grouperlite.nav.groups' => 'Groups', + 'pl.grouperlite.nav.groups-presided' => 'Groups I preside over', + 'pl.grouperlite.nav.email-lists' => 'Email lists', + 'pl.grouperlite.nav.email-lists-managed' => 'Email lists I manage', + 'pl.grouperlite.nav.create-group' => 'Create group', + + 'pl.grouperlite.title.root' => 'Grouper Groups:', + 'pl.grouperlite.title.groupinfo' => 'Group configuration and attributes', + 'pl.grouperlite.title.groupowner' => 'Grouper Groups I Manage', + 'pl.grouperlite.title.groupoptin' => 'Grouper Groups I Can Join', + 'pl.grouperlite.title.emaillists' => 'Email lists', + 'pl.grouperlite.title.emaillistsmanaged' => 'Email lists I manage', + 'pl.grouperlite.title.emaillistsinfo' => 'Email list configuration and attributes', + 'pl.grouperlite.title.groupcreate' => 'Create Grouper Group', + + 'pl.grouperlite.message.flash.join-group-success' => 'You have been added to the group!', + 'pl.grouperlite.message.flash.join-group-failed' => 'You are unable to join the group!', + 'pl.grouperlite.message.flash.join-group-error' => 'An error occurred in joining the group, please try again later.', + + 'pl.grouperlite.message.flash.leave-group-success' => 'You have been deleted from the group!', + 'pl.grouperlite.message.flash.leave-group-failed' => 'You are unable to delete the group!', + 'pl.grouperlite.message.flash.leave-group-error' => 'An error occurred in leaving the group, please try again later.', + + 'pl.grouperlite.table.name' => 'Name', + 'pl.grouperlite.table.description' => 'Description', + 'pl.grouperlite.table.status' => 'Status', + 'pl.grouperlite.table.action' => 'Action', + + 'pl.grouperlite.value.descr.zerostate' => 'No Description', + 'pl.grouperlite.value.enabled' => 'Enabled', + 'pl.grouperlite.value.disabled' => 'Disabled', + + 'pl.grouperlite.action.join-group' => 'Join group', + 'pl.grouperlite.action.leave-group' => 'Leave group', + 'pl.grouperlite.action.edit-group' => 'Edit', + 'pl.grouperlite.action.disable-group' => 'Disable', + 'pl.grouperlite.action.subscribe' => 'Subscribe', + 'pl.grouperlite.action.unsubscribe' => 'Unsubscribe', + 'pl.grouperlite.action.search' => 'Search', + 'pl.grouperlite.action.remove' => 'Remove', + + 'pl.grouperlite.form.group.template.label' => 'Select a template', + 'pl.grouperlite.form.group.template.empty' => '(choose one)', + 'pl.grouperlite.form.group.name.label' => 'Display name', + 'pl.grouperlite.form.group.name.help' => 'Name is the label that identifies this group, and might change.', + 'pl.grouperlite.form.group.stem.label' => 'Create in this folder:', + 'pl.grouperlite.form.group.stem.help' => 'Enter a folder name.', + 'pl.grouperlite.form.group.description.label' => 'Description:', + 'pl.grouperlite.form.group.description.help' => 'Description contains notes about the group, which could include: what the group represents, why it was created, etc.', + 'pl.grouperlite.form.group.privs.label' => 'Privileges', + 'pl.grouperlite.form.group.privs.label.READ' => 'READ', + 'pl.grouperlite.form.group.privs.label.VIEW' => 'VIEW', + 'pl.grouperlite.form.group.privs.label.OPTIN' => 'OPTIN', + 'pl.grouperlite.form.group.privs.label.OPTOUT' => 'OPTOUT', + 'pl.grouperlite.form.group.privs.label.ATTRIBUTE_READ' => 'ATTRIBUTE READ', + 'pl.grouperlite.form.group.subs.label' => 'Subscribers:', + 'pl.grouperlite.form.group.subs.help' => 'Select subscribers to add to the group.', + 'pl.grouperlite.form.group.subs.placeholder' => 'Search subscribers', + 'pl.grouperlite.form.group.action.save' => 'Save Group', + + 'pl.grouperlite.search.tags.text' => 'Search', +); \ No newline at end of file diff --git a/Model/CoGrouperLite.php b/Model/CoGrouperLite.php index 918bb7f..62e2796 100644 --- a/Model/CoGrouperLite.php +++ b/Model/CoGrouperLite.php @@ -6,6 +6,51 @@ class CoGrouperLite extends CoDashboardWidgetBackend { // Define class name for cake public $name = "CoGrouperLite"; + // Association rules from this model to other models + public $belongsTo = array( + "CoDashboardWidget" + ); + // Add behaviors + public $actsAs = array('Containable'); + + public $hasMany = array( + ); + + public $duplicatableModels = array( + "CoGrouperLite" => array( + "parent" => "CoDashboardWidget", + "fk" => "co_dashboard_widget_id" + ) + ); + + // Validation rules for table elements + public $validate = array( + 'co_dashboard_widget_id' => array( + 'rule' => 'numeric', + 'required' => true, + 'allowEmpty' => false + )/*, + 'connUrl' => array( + 'rule' => 'alphaNumeric', + 'required' => true, + 'allowEmpty' => false + ), + 'connVer' => array( + 'rule' => 'alphaNumeric', + 'required' => true, + 'allowEmpty' => false + ), + 'connUser' => array( + 'rule' => 'alphaNumeric', + 'required' => true, + 'allowEmpty' => false + ), + 'connPass' => array( + 'rule' => 'alphaNumeric', + 'required' => true, + 'allowEmpty' => false + ),*/ + ); } \ No newline at end of file diff --git a/Model/GrouperGroup.php b/Model/GrouperGroup.php index 322899b..a69451a 100644 --- a/Model/GrouperGroup.php +++ b/Model/GrouperGroup.php @@ -32,10 +32,18 @@ class GrouperGroup extends GrouperLiteAppModel ), ); + /** + * @var string + */ + //TODO - get name of Friendly name attribute that can be used for pulling the friendly name + private $friendly = 'sandbox:testAttributeName'; + + public function __construct() { parent::__construct(); $this->grouperAPI = new GrouperApiAccess(); + } public function userGroups($userId) @@ -88,7 +96,24 @@ public function ownerGroups($userId) $args['conditions']['groupType'] = 'Owner'; $args['conditions']['userId'] = $userId; - return $this->grouperAPI->getGrouperGroups($args); + $ownGroups = $this->grouperAPI->getGrouperGroups($args); + + //Now for each group need to pull in friendly name attribute. + foreach ($ownGroups as &$ownGroup) { + $ownGroup['friendlyName'] = $ownGroup['displayName']; + $attributes = $this->grouperAPI->getGroupAttributes(array('conditions' => array('groupName' => $ownGroup['displayName']))); + foreach ($attributes as $attribute) { + if ($attribute['attributeDefNameName'] == $this->friendly) { + if (isset($attribute['wsAttributeAssignValues'][0]['valueSystem'])) { + $ownGroup['friendlyName'] = $attribute['wsAttributeAssignValues'][0]['valueSystem']; + } + break; + } + } + } + + return $ownGroups; + } public function optinGroups($userId) @@ -97,10 +122,11 @@ public function optinGroups($userId) $args['conditions']['groupType'] = 'Optins'; $args['conditions']['userId'] = $userId; - $returnsToJoinOrLeave = $this->grouperAPI->getGrouperGroups($args); + $joinOrLeave = $this->grouperAPI->getGrouperGroups($args); $userGroups = $this->userGroups($userId); - foreach ($returnsToJoinOrLeave as &$groupsJoL) { + //See if Optin group match any of the groups belong to already. + foreach ($joinOrLeave as &$groupsJoL) { foreach ($userGroups as $userGroup) { $groupsJoL['member'] = false; if ($groupsJoL['name'] == $userGroup['name']) { @@ -111,7 +137,21 @@ public function optinGroups($userId) } } - return $returnsToJoinOrLeave; + //Now for each group need to pull in friendly name attribute. + foreach ($joinOrLeave as &$jol) { + $jol['friendlyName'] = $jol['displayName']; + $attributes = $this->grouperAPI->getGroupAttributes(array('conditions' => array('groupName' => $jol['displayName']))); + foreach ($attributes as $attribute) { + if ($attribute['attributeDefNameName'] == $this->friendly) { + if (isset($attribute['wsAttributeAssignValues']['valueSystem'])) { + $jol['friendlyName'] = $attribute['wsAttributeAssignValues']['valueSystem']; + } + break; + } + } + } + + return $joinOrLeave; } public function createGroup($userId, $groupName, $stemName, $groupDesc) @@ -134,12 +174,21 @@ public function getStemGroup($userId, $stemName) { return $this->grouperAPI->getStemGroups($args); } + /** + * Search for Groups/Lists related to Search term. + * Will import all records the user can see and then do search here rather than call Grouper WS Search + * functionality. This is due to the fact that the grouperName is autogenerated and this app needs to search + * attributes which the Grouper WS does not do. + * + * @param $userId + * @param $searchCriteria + * @param $page + * @return array + */ public function getSearchedGroups($userId, $searchCriteria, $page) { $args = array(); $args['conditions']['userId'] = $userId; - $args['conditions']['search'] = $searchCriteria; - $searchResults = $this->grouperAPI->searchGrouperGroups($args); if($page == 'groupOptin') { $pageResults = $this->optinGroups($userId); } elseif ($page == 'groupOwner') { @@ -150,12 +199,10 @@ public function getSearchedGroups($userId, $searchCriteria, $page) { $returnResults = array(); - foreach ($pageResults as $pageGroup) { - foreach ($searchResults as $searchGroup) { - if ($pageGroup['uuid'] == $searchGroup['uuid']) { - $returnResults[] = $pageGroup; - break; - } + foreach($pageResults as $result) { + $match = preg_grep("/$searchCriteria/i", $result); + if (!empty($match)) { + $returnResults[] = $result; } } diff --git a/Model/GrouperLite.php b/Model/GrouperLite.php index 9892b1c..ef785ea 100644 --- a/Model/GrouperLite.php +++ b/Model/GrouperLite.php @@ -8,5 +8,27 @@ class GrouperLite extends AppModel { // Required by COmanage Plugins public $cmPluginType = "dashboardwidget"; + // Association rules from this model to other models + public $belongsTo = array( + ); + + public $hasMany = array( + ); + + // Validation rules for table elements + public $validate = array( + ); + + public function cmPluginMenus() { + return array( + "cogroups" => array( + 'Grouper groups' => array( + 'controller' => "groupergroups", + 'action' => "groupoptin" + ) + ) + ); + } + } \ No newline at end of file diff --git a/View/CoGrouperLites/display.ctp b/View/CoGrouperLites/display.ctp new file mode 100644 index 0000000..4a1090b --- /dev/null +++ b/View/CoGrouperLites/display.ctp @@ -0,0 +1 @@ +you are home \ No newline at end of file diff --git a/View/CoGrouperLites/edit.ctp b/View/CoGrouperLites/edit.ctp new file mode 100644 index 0000000..414142a --- /dev/null +++ b/View/CoGrouperLites/edit.ctp @@ -0,0 +1,71 @@ +name; + $req = Inflector::singularize($model); + + // Add page title & page buttons + $params = array(); + $params['title'] = $title_for_layout; + + // For Authenticators during enrollment + if(!empty($vv_co_enrollment_authenticator) + && ($vv_co_enrollment_authenticator['CoEnrollmentAuthenticator']['required'] == RequiredEnum::Optional) + && !empty($this->request->params['named']['onFinish'])) { + $params['topLinks'][] = $this->Html->link(_txt('op.skip'), + urldecode($this->request->params['named']['onFinish']), + array('class' => 'forwardbutton')); + } + + if(!empty($this->plugin)) { + if(file_exists(APP . "Plugin/" . $this->plugin . "/View/" . $model . "/buttons.inc")) { + include(APP . "Plugin/" . $this->plugin . "/View/" . $model . "/buttons.inc"); + } elseif(file_exists(LOCAL . "Plugin/" . $this->plugin . "/View/" . $model . "/buttons.inc")) { + include(LOCAL . "Plugin/" . $this->plugin . "/View/" . $model . "/buttons.inc"); + } + } else { + if(file_exists(APP . "View/" . $model . "/buttons.inc")) { + include(APP . "View/" . $model . "/buttons.inc"); + } + } + print $this->element("pageTitleAndButtons", $params); + + $submit_label = _txt('op.save'); + print $this->Form->create($req, array('inputDefaults' => array('label' => false, 'div' => false))); + if(!empty($this->plugin)) { + if(file_exists(APP . "Plugin/" . $this->plugin . "/View/" . $model . "/fields.inc")) { + include(APP . "Plugin/" . $this->plugin . "/View/" . $model . "/fields.inc"); + } elseif(file_exists(LOCAL . "Plugin/" . $this->plugin . "/View/" . $model . "/fields.inc")) { + include(LOCAL . "Plugin/" . $this->plugin . "/View/" . $model . "/fields.inc"); + } + } else { + include(APP . "View/" . $model . "/fields.inc"); + } + print $this->Form->end(); +?> diff --git a/View/CoGrouperLites/fields.inc b/View/CoGrouperLites/fields.inc new file mode 100644 index 0000000..334da52 --- /dev/null +++ b/View/CoGrouperLites/fields.inc @@ -0,0 +1,209 @@ + +action === "add" && $permissions['add']); +$editable = ($this->action === "edit" && $permissions['edit']); + +$e = (!$addable && !$editable) ? false : true; + +// We shouldn't get here if we don't have at least read permission, but check just in case + +if (!$e && !$permissions['view']) { + return false; +} + +// Add breadcrumbs +print $this->element("coCrumb"); + +$args = array(); +$args['plugin'] = null; +$args['controller'] = 'co_dashboards'; +$args['action'] = 'index'; +$args['co'] = $cur_co['Co']['id']; +$this->Html->addCrumb(_txt('ct.co_dashboards.pl'), $args); + +$args = array(); +$args['plugin'] = null; +$args['controller'] = 'co_dashboards'; +$args['action'] = 'edit'; +$args[] = $co_grouper_lites[0]['CoDashboardWidget']['co_dashboard_id']; +$this->Html->addCrumb(_txt('ct.co_dashboards.1'), $args); + +$args = array(); +$args['plugin'] = null; +$args['controller'] = 'co_dashboard_widgets'; +$args['action'] = 'index'; +$args['codashboard'] = $co_grouper_lites[0]['CoDashboardWidget']['co_dashboard_id']; +$this->Html->addCrumb(_txt('ct.co_dashboard_widgets.1'), $args); + +$crumbTxt = _txt('op.' . $this->action . '-a', array(filter_var($co_grouper_widgets[0]['CoDashboardWidget']['description'], FILTER_SANITIZE_SPECIAL_CHARS))); +$this->Html->addCrumb($crumbTxt); + +print $this->Form->hidden('co_dashboard_widget_id', array('default' => $vv_dwid)) . "\n"; + +?> + + +
+
+

+
+
\ No newline at end of file diff --git a/View/Elements/Components/navigation.ctp b/View/Elements/Components/navigation.ctp index fc5c06c..8ec8cd1 100644 --- a/View/Elements/Components/navigation.ctp +++ b/View/Elements/Components/navigation.ctp @@ -1,14 +1,9 @@ - \ No newline at end of file diff --git a/View/Elements/Components/optAction.ctp b/View/Elements/Components/optAction.ctp index 723e54d..b80be2e 100644 --- a/View/Elements/Components/optAction.ctp +++ b/View/Elements/Components/optAction.ctp @@ -1,16 +1,9 @@ -
- - Form->hidden('token', array('default' => $vv_petition_token)) . "\n"; - } - ?> +Form->create(false, array( + 'url' => array('controller' => 'groupergroups', 'action' => $action) +)); ?> +Form->hidden('GroupName', array('default' => $group)); ?> -
\ No newline at end of file +Form->end(); ?> \ No newline at end of file diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp index 4be109f..3baffe6 100644 --- a/View/Elements/Components/search.ctp +++ b/View/Elements/Components/search.ctp @@ -1,5 +1,5 @@ - -
+Form->create(false, array( + 'url' => array('controller' => 'groupergroups', 'action' => $active), + 'class' => 'search mb-4' +)); ?>
- + Form->input("search", array('label' => false, 'class' => 'form-control', 'value' => isset($searchcriteria) ? $searchcriteria : '')) ?> +
@@ -32,12 +35,13 @@ $(document).ready(function() {
+ - +Form->end(); ?> diff --git a/View/GrouperGroups/base.ctp b/View/GrouperGroups/base.ctp index 9f47669..9cc7a39 100644 --- a/View/GrouperGroups/base.ctp +++ b/View/GrouperGroups/base.ctp @@ -1,10 +1,19 @@ Html->css('GrouperLite.co-grouper-plugin', array('inline' => false)); +print $this->Html->css('GrouperLite.bootstrap') . "\n "; +print $this->Html->css('GrouperLite.co-grouper-base') . "\n "; +print $this->Html->css('GrouperLite.co-grouper-plugin') . "\n "; +?> + +Html->script('GrouperLite.bootstrap.bundle.js') . "\n "; +print $this->Html->script('GrouperLite.typeahead.bundle.js') . "\n "; + +$this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), array('controller' => 'groupergroups', 'action' => 'groupoptin'), array('prepend' => true)); ?> -
+
-

+

fetch('content'); ?>
\ No newline at end of file diff --git a/View/GrouperGroups/emaillistsmanaged.ctp b/View/GrouperGroups/emaillistsmanaged.ctp index b3b3acc..b9a1204 100644 --- a/View/GrouperGroups/emaillistsmanaged.ctp +++ b/View/GrouperGroups/emaillistsmanaged.ctp @@ -1,14 +1,15 @@ extend('/GrouperGroups/base'); ?> +Html->addCrumb('Email lists I manage'); ?> element('Components/navigation', array('active' => 'emaillistsmanaged', 'create' => true)); ?> element('Components/search', array('active' => 'emaillistsmanaged')); ?>
- - - - + + + + @@ -24,14 +25,16 @@ diff --git a/View/GrouperGroups/emaillistsoptin.ctp b/View/GrouperGroups/emaillistsoptin.ctp index 1fbe173..29b37e8 100644 --- a/View/GrouperGroups/emaillistsoptin.ctp +++ b/View/GrouperGroups/emaillistsoptin.ctp @@ -1,14 +1,18 @@ extend('/GrouperGroups/base'); ?> +Html->addCrumb('Email lists I can join'); ?> element('Components/navigation', array('active' => 'emaillistsoptin')); ?> element('Components/search', array('active' => 'emaillistsoptin')); ?> + +Html->addCrumb('Group Optin/Optout'); ?> +
NameDescriptionStatusAction
- - + + + +
- - - - + + + + @@ -21,14 +25,13 @@ '?' => array('groupname' => urlencode($group['name'])) ) ) ?> - - + + diff --git a/View/GrouperGroups/fields.inc b/View/GrouperGroups/fields.inc new file mode 100644 index 0000000..c4f8018 --- /dev/null +++ b/View/GrouperGroups/fields.inc @@ -0,0 +1,210 @@ + + + + +
+ Form->label(false, _txt('pl.grouperlite.form.group.template.label'), array( + 'for' => 'template-select', + 'class' => "col-sm-3 col-form-label" + )); ?> +
+ Form->input('grouptemplate', array( + 'label' => false, + 'class' => 'custom-select', + 'id' => 'template-select', + 'options' => array('1' => 'Template', '2' => 'Another template', '3' => 'Yet another template'), + 'empty' => _txt('pl.grouperlite.form.group.template.empty') + )); ?> +
+
+
+
+ Form->label(false, _txt('pl.grouperlite.form.group.name.label'), array( + 'for' => 'name', + 'class' => "col-sm-3 col-form-label" + )); ?> +
+ Form->input('name', array( + 'label' => false, + 'class' => 'form-control', + 'id' => 'name' + )); ?> + + + +
+
+ + Form->label(false, _txt('pl.grouperlite.form.group.stem.label'), array( + 'for' => 'folder', + 'class' => "col-sm-3 col-form-label" + )); ?> +
+ Form->input('grouptemplate', array( + 'label' => false, + 'class' => 'form-control', + 'id' => 'folder', + 'default' => 'sandbox:org:unicon:', + 'readonly' => true + )); ?> + + + +
+ + */ ?> +
+ Form->label(false, 'Description:', array( + 'for' => 'descr', + 'class' => "col-sm-3 col-form-label" + )); ?> +
+ Form->textarea('description', array( + 'class' => 'form-control', + 'id' => 'descr', + 'rows' => 5 + )); ?> + + Description contains notes about the group, which could include: what the group represents, why it was created, etc. + +
+
+
+ Privileges: +
+
+ +
+ Form->checkbox('privelages', array( + 'value' => $OPT, + 'class' => 'form-check-input', + 'id' => 'assign-' . $opt, + 'hiddenField' => false + )); ?> + Form->label(false, _txt('pl.grouperlite.form.group.privs.label.' . $opt), array( + 'for' => 'assign-' . $opt, + 'class' => "form-check-label" + )); ?> +
+ +
+
+
+
+ Form->label(false, _txt('pl.grouperlite.form.group.subs.label'), array( + 'for' => 'subscribers', + 'class' => "col-sm-3 col-form-label" + )); ?> +
+ Form->input('grouptemplate', array( + 'label' => false, + 'class' => 'typeahead form-control', + 'id' => 'name', + 'placeholder' => _txt('pl.grouperlite.form.group.subs.placeholder') + )); ?> + + + +
+
+
+
+
+ Form->button(_txt('pl.grouperlite.form.group.action.save'), array( + 'type' => 'submit', + 'class' => 'btn btn-primary btn-lg btn-raised' + )); ?> +
+
+
\ No newline at end of file diff --git a/View/GrouperGroups/groupcreateform.ctp b/View/GrouperGroups/groupcreateform.ctp index a4fb2d3..8b5b086 100644 --- a/View/GrouperGroups/groupcreateform.ctp +++ b/View/GrouperGroups/groupcreateform.ctp @@ -1,256 +1,29 @@ -extend('/GrouperGroups/base'); ?> -
- +$model = $this->name; +?> +
- Form->create(false, array( - 'url' => array('controller' => 'groupergroups', 'action' => 'groupcreate') - )); ?> -
- Form->label(false, 'Select a template', array( - 'for' => 'template-select', - 'class' => "col-sm-3 col-form-label" - )); ?> -
- Form->input('grouptemplate', array( - 'label' => false, - 'class' => 'custom-select', - 'id' => 'template-select', - 'options' => array('1' => 'Template', '2' => 'Another template', '3' => 'Yet another template'), - 'empty' => '(choose one)' - )); ?> -
-
-
-
- Form->label(false, 'Group Name', array( - 'for' => 'name', - 'class' => "col-sm-3 col-form-label" - )); ?> -
- Form->input('grouptemplate', array( - 'label' => false, - 'class' => 'form-control', - 'id' => 'name' - )); ?> - - Name is the label that identifies this group, and might change. - -
-
-
- Form->label(false, 'Create in this folder:', array( - 'for' => 'folder', - 'class' => "col-sm-3 col-form-label" - )); ?> -
- Form->input('grouptemplate', array( - 'label' => false, - 'class' => 'form-control', - 'id' => 'folder', - 'default' => 'sandbox:org:unicon:', - 'readonly' => true - )); ?> - - Enter a folder name. - -
-
-
- Privileges: -
-
-
- Form->checkbox('privelages', array( - 'value' => 'READ', - 'class' => 'form-check-input', - 'id' => 'assign-1', - 'hiddenField' => false - )); ?> - Form->label(false, 'READ', array( - 'for' => 'assign-1', - 'class' => "form-check-label" - )); ?> -
-
- Form->checkbox('privelages', array( - 'value' => 'VIEW', - 'class' => 'form-check-input', - 'id' => 'assign-2', - 'hiddenField' => false - )); ?> - Form->label(false, 'VIEW', array( - 'for' => 'assign-2', - 'class' => "form-check-label" - )); ?> -
-
- Form->checkbox('privelages', array( - 'value' => 'OPTIN', - 'class' => 'form-check-input', - 'id' => 'assign-3', - 'hiddenField' => false - )); ?> - Form->label(false, 'OPTIN', array( - 'for' => 'assign-3', - 'class' => "form-check-label" - )); ?> -
-
- Form->checkbox('privelages', array( - 'value' => 'OPTOUT', - 'class' => 'form-check-input', - 'id' => 'assign-4', - 'hiddenField' => false - )); ?> - Form->label(false, 'OPTOUT', array( - 'for' => 'assign-4', - 'class' => "form-check-label" - )); ?> -
-
- Form->checkbox('privelages', array( - 'value' => 'ATTRIBUTE_READ', - 'class' => 'form-check-input', - 'id' => 'assign-5', - 'hiddenField' => false - )); ?> - Form->label(false, 'ATTRIBUTE READ', array( - 'for' => 'assign-5', - 'class' => "form-check-label" - )); ?> -
-
-
-
-
- Form->label(false, 'Description:', array( - 'for' => 'descr', - 'class' => "col-sm-3 col-form-label" - )); ?> -
- Form->textarea('description', array( - 'class' => 'form-control', - 'id' => 'descr', - 'rows' => 5 - )); ?> - - Description contains notes about the group, which could include: what the group represents, why it was created, etc. - -
-
-
- Form->label(false, 'Subscribers:', array( - 'for' => 'subscribers', - 'class' => "col-sm-3 col-form-label" - )); ?> -
- Form->input('grouptemplate', array( - 'label' => false, - 'class' => 'typeahead form-control', - 'id' => 'name', - 'placeholder' => 'Find subscribers' - )); ?> - - Select subscribers to add to the group. - -
-
-
-
-
- Form->button('Save Group', array( - 'type' => 'submit', - 'class' => 'btn btn-primary btn-lg btn-raised' - )); ?> -
-
-
- Form->end(); ?> + Form->create(false, array( + 'url' => array('controller' => 'groupergroups', 'action' => 'groupcreate') + )); ?> + plugin)) { + if (file_exists(APP . "Plugin/" . $this->plugin . "/View/" . $model . "/fields.inc")) { + include(APP . "Plugin/" . $this->plugin . "/View/" . $model . "/fields.inc"); + } elseif (file_exists(LOCAL . "Plugin/" . $this->plugin . "/View/" . $model . "/fields.inc")) { + include(LOCAL . "Plugin/" . $this->plugin . "/View/" . $model . "/fields.inc"); + } + } else { + include(APP . "View/" . $model . "/fields.inc"); + } + ?> + Form->end(); ?> +
-
-
\ No newline at end of file + \ No newline at end of file diff --git a/View/GrouperGroups/groupinfo.ctp b/View/GrouperGroups/groupinfo.ctp index 1d7424b..d097576 100644 --- a/View/GrouperGroups/groupinfo.ctp +++ b/View/GrouperGroups/groupinfo.ctp @@ -1,4 +1,5 @@ extend('/GrouperGroups/base'); ?> +Html->addCrumb('Group configuration'); ?> extend('/GrouperGroups/base'); ?> +Html->addCrumb('Groups I can join'); ?> element('GrouperLite.Components/navigation', array('active' => 'groupoptin')); ?> element('GrouperLite.Components/search', array('active' => 'groupoptin')); ?>
NameDescriptionStatusAction
- element('Components/optAction', array( - 'member' => $group['member'], - 'action' => $group['member'] ? 'leavegroup' : 'joingroup', - 'group' => $group['name'] - )); ?> +
- - - - + + + + - - + +
NameDescriptionStatusAction
Html->link( - isset($group['name']) ? $group['name'] : "No Name", + isset($group['friendlyName']) ? $group['friendlyName'] : "No Name", array( 'controller' => 'groupergroups', 'action' => 'groupinfo', '?' => array('groupname' => urlencode($group['name'])) ) ) ?> element('GrouperLite.Components/optAction', array( 'member' => $group['member'], diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp index 7a48fcd..5096536 100644 --- a/View/GrouperGroups/groupowner.ctp +++ b/View/GrouperGroups/groupowner.ctp @@ -1,21 +1,22 @@ extend('/GrouperGroups/base'); ?> +Html->addCrumb('Groups I preside over'); ?> element('Components/navigation', array('active' => 'groupowner')); ?> element('Components/search', array('active' => 'groupowner')); ?>
- - - - + + + + diff --git a/View/Layouts/default.ctp b/View/Layouts/default.ctp deleted file mode 100644 index fca4ee9..0000000 --- a/View/Layouts/default.ctp +++ /dev/null @@ -1,54 +0,0 @@ - - - - - Html->charset(); ?> - - <?php echo $this->fetch('title'); ?> - - Html->css('GrouperLite.fonts/Font-Awesome-4.6.3/css/font-awesome.min') . "\n "; - print $this->Html->css('GrouperLite.bootstrap') . "\n "; - print $this->Html->css('GrouperLite.co-grouper-base') . "\n "; - print $this->Html->css('GrouperLite.co-grouper-plugin') . "\n "; - ?> - - Html->script('GrouperLite.jquery-3.5.1.min.js') . "\n "; - print $this->Html->script('GrouperLite.bootstrap.bundle.js') . "\n "; - print $this->Html->script('GrouperLite.typeahead.bundle.js') . "\n "; - ?> - fetch('GrouperLite.meta'); - echo $this->fetch('GrouperLite.css'); - echo $this->fetch('GrouperLite.script'); - ?> - - -
-
- element('GrouperLite.Flash/container'); ?> - fetch('content'); ?> -
-
- element('sql_dump'); ?> - - diff --git a/webroot/css/bootstrap.css b/webroot/css/bootstrap.css index a3171be..194ff4e 100644 --- a/webroot/css/bootstrap.css +++ b/webroot/css/bootstrap.css @@ -10259,5 +10259,4 @@ a.text-dark:hover, a.text-dark:focus { color: inherit; border-color: #dee2e6; } -} -/*# sourceMappingURL=bootstrap.css.map */ \ No newline at end of file +} \ No newline at end of file diff --git a/webroot/css/co-grouper-plugin.css b/webroot/css/co-grouper-plugin.css index e275434..806b5e8 100644 --- a/webroot/css/co-grouper-plugin.css +++ b/webroot/css/co-grouper-plugin.css @@ -85,7 +85,7 @@ a { min-width: 200px; } -#grouper-plugin .table thead th.group.descr { +#grouper-plugin .table thead th.group.description { width: auto; } @@ -204,4 +204,12 @@ a { .tt-cursor { background-color: #EEE; +} + +.input-group > .input.text { + position: relative; + flex: 1 1 auto; + width: 1%; + min-width: 0; + margin-bottom: 0; } \ No newline at end of file diff --git a/webroot/files/users.json b/webroot/files/users.json new file mode 100644 index 0000000..25bea0e --- /dev/null +++ b/webroot/files/users.json @@ -0,0 +1,602 @@ +[ + { + "name": "Galena Munoz", + "email": "ipsum.cursus.vestibulum@urnaconvalliserat.net", + "cou": "Active, Member", + "org": "Eu Corporation" + }, + { + "name": "Doris Santos", + "email": "vitae@non.org", + "cou": "Active, Filesource, Member", + "org": "Aliquam LLC" + }, + { + "name": "Alma English", + "email": "pede.Cum.sociis@telluseu.net", + "cou": "Member, Active, Writer, Filesource", + "org": "Consectetuer Corp." + }, + { + "name": "Halee Finley", + "email": "in.consectetuer.ipsum@parturientmontes.co.uk", + "cou": "Member", + "org": "Felis Ltd" + }, + { + "name": "Austin Hardy", + "email": "iaculis@Donecegestas.co.uk", + "cou": "Writer", + "org": "Nonummy LLP" + }, + { + "name": "Victor Powell", + "email": "nisi@eget.ca", + "cou": "Member, Active", + "org": "Praesent Interdum Ligula PC" + }, + { + "name": "Baxter Estrada", + "email": "in.consequat.enim@vestibulum.co.uk", + "cou": "", + "org": "In Molestie Tortor Corporation" + }, + { + "name": "Carlos Rose", + "email": "elit.elit@non.co.uk", + "cou": "Member, Writer, Filesource, Active", + "org": "Risus Nulla Eget LLP" + }, + { + "name": "Ishmael Patton", + "email": "leo.Morbi@mollisnoncursus.co.uk", + "cou": "Writer, Filesource", + "org": "A Enim Suspendisse Consulting" + }, + { + "name": "Ryder Tanner", + "email": "varius@rutrum.org", + "cou": "Writer, Filesource", + "org": "Ornare Elit Elit Consulting" + }, + { + "name": "Dane Rollins", + "email": "Curabitur.consequat.lectus@Naminterdum.ca", + "cou": "Member", + "org": "Ut Pellentesque Consulting" + }, + { + "name": "Brian Kaufman", + "email": "aliquet.vel@orciluctuset.edu", + "cou": "Filesource, Active", + "org": "Justo Eu Arcu Inc." + }, + { + "name": "Lester Price", + "email": "Integer@idlibero.edu", + "cou": "Writer, Member, Active, Filesource", + "org": "Dapibus Rutrum Justo Incorporated" + }, + { + "name": "Helen Cardenas", + "email": "Curabitur.egestas.nunc@quisdiam.org", + "cou": "Member, Active, Filesource", + "org": "Faucibus Morbi Vehicula Associates" + }, + { + "name": "Hop Holloway", + "email": "non.arcu.Vivamus@nibhvulputate.org", + "cou": "Filesource, Active, Member", + "org": "Nunc Sed Pede Ltd" + }, + { + "name": "Madeson Hendrix", + "email": "viverra@purus.com", + "cou": "", + "org": "Neque Venenatis Consulting" + }, + { + "name": "Amity Navarro", + "email": "tincidunt.Donec@inconsequat.com", + "cou": "Writer", + "org": "Pretium Aliquet Consulting" + }, + { + "name": "Cameron Booth", + "email": "nulla.magna@Quisqueporttitor.net", + "cou": "", + "org": "Fusce Associates" + }, + { + "name": "Sybil Burgess", + "email": "Fusce.feugiat@sem.org", + "cou": "Writer, Member, Filesource, Active", + "org": "Curabitur Corporation" + }, + { + "name": "Otto Cantrell", + "email": "Ut@nonarcu.org", + "cou": "", + "org": "Cursus PC" + }, + { + "name": "Mannix Obrien", + "email": "eu.neque@egestasDuisac.ca", + "cou": "", + "org": "Amet Faucibus Corp." + }, + { + "name": "Marcia Gill", + "email": "molestie.in.tempus@posuere.edu", + "cou": "", + "org": "Et Corp." + }, + { + "name": "Tanek Figueroa", + "email": "diam@arcuSed.org", + "cou": "Active", + "org": "Bibendum Donec Ltd" + }, + { + "name": "Ira Lynn", + "email": "aliquet@consequatpurusMaecenas.edu", + "cou": "Filesource", + "org": "Massa Suspendisse Eleifend Corporation" + }, + { + "name": "Lesley Pittman", + "email": "iaculis.odio@Phasellus.edu", + "cou": "Member, Writer", + "org": "Urna Et Arcu PC" + }, + { + "name": "Len Ryan", + "email": "ut.mi.Duis@sitamet.org", + "cou": "Writer, Filesource, Active", + "org": "Vestibulum Accumsan PC" + }, + { + "name": "Sarah Morton", + "email": "dis.parturient@rhoncusProin.org", + "cou": "Active", + "org": "Amet Consectetuer PC" + }, + { + "name": "Marny Hewitt", + "email": "dapibus@orciquis.ca", + "cou": "Active, Writer", + "org": "Ultricies Consulting" + }, + { + "name": "Abel Lyons", + "email": "Proin.eget.odio@enim.org", + "cou": "Writer", + "org": "Amet Lorem Corporation" + }, + { + "name": "Slade Schneider", + "email": "ante.dictum.cursus@turpisAliquamadipiscing.co.uk", + "cou": "", + "org": "Lacinia Company" + }, + { + "name": "Ashton Arnold", + "email": "velit.justo@velitin.edu", + "cou": "", + "org": "Diam Ltd" + }, + { + "name": "Phelan Goff", + "email": "ullamcorper.viverra.Maecenas@Donecporttitortellus.ca", + "cou": "", + "org": "Faucibus Id Libero Institute" + }, + { + "name": "Graham Underwood", + "email": "Nulla.dignissim.Maecenas@Donecsollicitudin.ca", + "cou": "Filesource, Member", + "org": "Duis Gravida Praesent Ltd" + }, + { + "name": "Alisa Scott", + "email": "ipsum.primis.in@erat.co.uk", + "cou": "Writer, Active", + "org": "Vivamus Non Lorem Inc." + }, + { + "name": "Asher Mccray", + "email": "semper.auctor@nibhAliquamornare.edu", + "cou": "Writer, Member", + "org": "Orci Corporation" + }, + { + "name": "Hanna Salas", + "email": "feugiat@purusactellus.net", + "cou": "", + "org": "Lectus Convallis Industries" + }, + { + "name": "Jeremy Riley", + "email": "Ut.sagittis@necante.ca", + "cou": "Writer", + "org": "Luctus Curabitur LLP" + }, + { + "name": "Violet Trevino", + "email": "vestibulum@nec.edu", + "cou": "", + "org": "Ligula Aenean Gravida Consulting" + }, + { + "name": "Carissa Myers", + "email": "non@rhoncusDonec.co.uk", + "cou": "Member, Filesource", + "org": "Tempor Corporation" + }, + { + "name": "Kadeem Osborn", + "email": "nulla.In@aliquameros.ca", + "cou": "Filesource, Active, Member, Writer", + "org": "Tempus Risus Donec PC" + }, + { + "name": "Kiayada England", + "email": "ultrices.posuere@lectus.net", + "cou": "", + "org": "Orci Institute" + }, + { + "name": "Connor Gardner", + "email": "diam.eu@tortorIntegeraliquam.org", + "cou": "Member, Active, Writer", + "org": "Vulputate Nisi Sem LLP" + }, + { + "name": "Alfonso Casey", + "email": "montes.nascetur.ridiculus@risus.net", + "cou": "Member", + "org": "Sed Eu Nibh Consulting" + }, + { + "name": "Avye Raymond", + "email": "mauris.sapien@tempusrisusDonec.co.uk", + "cou": "Active, Writer, Filesource, Member", + "org": "Amet Ante Incorporated" + }, + { + "name": "Quamar Cross", + "email": "elit.pretium@Sedid.org", + "cou": "", + "org": "Dapibus PC" + }, + { + "name": "Justine Kemp", + "email": "diam@ornare.org", + "cou": "Writer, Filesource", + "org": "Libero At Auctor Associates" + }, + { + "name": "Blair Rush", + "email": "at.velit.Cras@pulvinar.ca", + "cou": "", + "org": "Nulla Tempor Associates" + }, + { + "name": "Jael Travis", + "email": "ut.dolor.dapibus@vestibulumneceuismod.ca", + "cou": "", + "org": "Facilisis Lorem LLC" + }, + { + "name": "Donovan Patel", + "email": "bibendum.ullamcorper@Sedeu.co.uk", + "cou": "Member, Filesource, Writer, Active", + "org": "Ipsum Sodales Incorporated" + }, + { + "name": "Sylvester Brady", + "email": "amet@consequatauctornunc.net", + "cou": "", + "org": "Semper Nam Limited" + }, + { + "name": "Yuri Eaton", + "email": "Nullam.lobortis.quam@Etiamligulatortor.com", + "cou": "", + "org": "Eu Elit Nulla LLP" + }, + { + "name": "Bree Harmon", + "email": "libero.Integer@maurisaliquam.ca", + "cou": "Filesource, Active, Member, Writer", + "org": "Dui In Sodales PC" + }, + { + "name": "Tanek Tucker", + "email": "arcu@Craslorem.org", + "cou": "Active, Member, Filesource", + "org": "Nisl Arcu Company" + }, + { + "name": "Jermaine Stevens", + "email": "luctus@Donec.org", + "cou": "Active, Writer", + "org": "Pellentesque Sed Dictum Corp." + }, + { + "name": "Ira Robinson", + "email": "malesuada.vel@lobortisClass.ca", + "cou": "Active, Member", + "org": "Ac Sem Ut Consulting" + }, + { + "name": "Jocelyn Fulton", + "email": "tristique.senectus.et@faucibusorci.co.uk", + "cou": "Active, Member, Filesource, Writer", + "org": "Ante Ipsum Institute" + }, + { + "name": "Tatyana Kelly", + "email": "a.facilisis.non@tortorat.ca", + "cou": "", + "org": "Donec Feugiat Limited" + }, + { + "name": "Bevis Sanchez", + "email": "Vivamus.rhoncus@leoin.com", + "cou": "Member", + "org": "Condimentum Donec Limited" + }, + { + "name": "Louis Weaver", + "email": "vitae.posuere.at@semper.ca", + "cou": "Filesource, Writer, Member", + "org": "Interdum Ligula Eu Corp." + }, + { + "name": "Jordan Caldwell", + "email": "volutpat@sagittisNullam.co.uk", + "cou": "Filesource", + "org": "Adipiscing PC" + }, + { + "name": "Eleanor Gentry", + "email": "vehicula.Pellentesque.tincidunt@lacusNulla.ca", + "cou": "Filesource, Member, Active", + "org": "Elit Pellentesque A Industries" + }, + { + "name": "Quincy Morgan", + "email": "dictum.eleifend.nunc@velquam.ca", + "cou": "", + "org": "Nec Associates" + }, + { + "name": "Thomas Giles", + "email": "libero@montesnascetur.edu", + "cou": "Writer, Filesource", + "org": "Erat Semper Corp." + }, + { + "name": "Alec Shelton", + "email": "mi.eleifend@purusMaecenaslibero.ca", + "cou": "Active, Member, Writer, Filesource", + "org": "Tincidunt Tempus Risus PC" + }, + { + "name": "Rooney Boyle", + "email": "Mauris.non.dui@posuerecubiliaCurae.org", + "cou": "", + "org": "Tellus Incorporated" + }, + { + "name": "Amela Mcknight", + "email": "odio@tinciduntorci.edu", + "cou": "Filesource", + "org": "Sed Sem Consulting" + }, + { + "name": "Maia Gates", + "email": "vel.arcu@et.org", + "cou": "Filesource", + "org": "Ornare In Faucibus Corporation" + }, + { + "name": "David Sexton", + "email": "Vivamus.non.lorem@euaccumsan.co.uk", + "cou": "Filesource, Writer", + "org": "Suspendisse Sed Company" + }, + { + "name": "Rama Christensen", + "email": "pede.blandit.congue@lectuspede.ca", + "cou": "Writer", + "org": "Primis In Faucibus Institute" + }, + { + "name": "Athena Barnes", + "email": "lobortis.mauris@Nulladignissim.com", + "cou": "Writer, Member, Active, Filesource", + "org": "In Molestie Industries" + }, + { + "name": "Aimee Snow", + "email": "Nunc.pulvinar.arcu@sollicitudin.ca", + "cou": "Active, Filesource, Writer", + "org": "Egestas Blandit LLP" + }, + { + "name": "Emma Thornton", + "email": "mattis.velit.justo@et.net", + "cou": "Writer, Member, Filesource", + "org": "Id Erat Foundation" + }, + { + "name": "Anjolie Craft", + "email": "at.arcu.Vestibulum@mifringillami.net", + "cou": "", + "org": "Nibh Dolor Nonummy LLP" + }, + { + "name": "Hamish Dickerson", + "email": "vitae.odio.sagittis@convallisdolorQuisque.co.uk", + "cou": "", + "org": "Vehicula Aliquet Libero LLC" + }, + { + "name": "Matthew Lindsey", + "email": "orci.Ut@parturientmontes.edu", + "cou": "Member, Active, Filesource, Writer", + "org": "Et Nunc Associates" + }, + { + "name": "Wesley Mckay", + "email": "non.bibendum@molestie.net", + "cou": "Filesource, Member, Active", + "org": "Tempus Non Lacinia Consulting" + }, + { + "name": "Hilary Mcmahon", + "email": "ante.Nunc@magnaLoremipsum.com", + "cou": "Writer", + "org": "Vulputate Eu Associates" + }, + { + "name": "Asher Finley", + "email": "et@orci.edu", + "cou": "Writer", + "org": "Eget Incorporated" + }, + { + "name": "Chantale Whitney", + "email": "neque@lectusrutrum.edu", + "cou": "Filesource, Writer, Member, Active", + "org": "Enim LLP" + }, + { + "name": "Levi Floyd", + "email": "ipsum.porta.elit@aliquetPhasellusfermentum.co.uk", + "cou": "Active, Filesource, Member", + "org": "A Arcu Sed Institute" + }, + { + "name": "Jenna Lane", + "email": "Nulla.facilisi@acrisusMorbi.com", + "cou": "Writer", + "org": "Nisl Limited" + }, + { + "name": "Molly Ratliff", + "email": "Cras@Sed.com", + "cou": "Writer", + "org": "Nulla Integer Vulputate Institute" + }, + { + "name": "Rina Cole", + "email": "pede.sagittis@nibhDonecest.edu", + "cou": "Member, Filesource, Active", + "org": "Sit Corp." + }, + { + "name": "Melanie Buckner", + "email": "tortor@Donecporttitortellus.co.uk", + "cou": "", + "org": "Velit Associates" + }, + { + "name": "Basil Holland", + "email": "Nam.ligula@euodio.ca", + "cou": "", + "org": "Diam Vel Arcu Inc." + }, + { + "name": "Kevin Graves", + "email": "eleifend.nunc.risus@arcuCurabiturut.com", + "cou": "Member, Active, Writer", + "org": "Risus Duis Limited" + }, + { + "name": "Lillith Sears", + "email": "blandit.at.nisi@ametmetus.ca", + "cou": "Member, Filesource, Writer, Active", + "org": "Vitae Inc." + }, + { + "name": "Nehru Roth", + "email": "ultrices.iaculis@mifringilla.com", + "cou": "Active", + "org": "Malesuada LLC" + }, + { + "name": "Alden Hodges", + "email": "faucibus.orci.luctus@accumsan.ca", + "cou": "Filesource", + "org": "Orci Luctus Et Consulting" + }, + { + "name": "Devin Waller", + "email": "aliquam.adipiscing@porttitor.com", + "cou": "", + "org": "Consectetuer Limited" + }, + { + "name": "Lacota Dennis", + "email": "eget@imperdietnecleo.com", + "cou": "", + "org": "Nec Ante Blandit Corporation" + }, + { + "name": "Yvette Ball", + "email": "augue.Sed@velitPellentesque.ca", + "cou": "Filesource, Active, Member", + "org": "Eu Tempor Erat Incorporated" + }, + { + "name": "Nayda Guerra", + "email": "mauris.Morbi.non@necorci.net", + "cou": "Writer, Filesource, Active, Member", + "org": "Nisl Elementum Consulting" + }, + { + "name": "Wang Sexton", + "email": "a@eulacusQuisque.ca", + "cou": "Filesource, Writer", + "org": "Fames Institute" + }, + { + "name": "Ian Hughes", + "email": "ac.libero@dignissimlacus.co.uk", + "cou": "Member", + "org": "Turpis Aliquam Corp." + }, + { + "name": "Galena Marshall", + "email": "ac.libero.nec@luctus.ca", + "cou": "", + "org": "Cursus LLP" + }, + { + "name": "Piper Rowland", + "email": "eu.turpis@Maurisnulla.ca", + "cou": "Active, Member, Writer", + "org": "Nec Luctus Felis Ltd" + }, + { + "name": "Madison Alvarez", + "email": "odio@necanteblandit.org", + "cou": "Filesource, Writer, Member, Active", + "org": "Rhoncus Associates" + }, + { + "name": "Vielka Hunter", + "email": "Maecenas@feugiat.net", + "cou": "Filesource", + "org": "Cum PC" + }, + { + "name": "Michelle Franco", + "email": "Suspendisse.sed.dolor@penatibusetmagnis.net", + "cou": "Member, Writer, Active", + "org": "Vestibulum Lorem Corp." + } +] \ No newline at end of file
NameDescriptionStatusAction
Html->link( - isset($group['name']) ? $group['name'] : "No Name", + isset($group['friendlyName']) ? $group['friendlyName'] : "No Name", array( 'controller' => 'groupergroups', 'action' => 'groupinfo', @@ -34,14 +35,16 @@ - - + + + +