Save the World

-- cgit v1.2.3 From 364d84a18de60459a9d2844cd0c13db140c9b3d1 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Thu, 9 Jun 2016 20:17:04 -0400 Subject: Remove bootstrap grid structure from group view --- app/view/obj/group.view.php | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/app/view/obj/group.view.php b/app/view/obj/group.view.php index 734a826..dde4df1 100644 --- a/app/view/obj/group.view.php +++ b/app/view/obj/group.view.php @@ -25,20 +25,16 @@

group->name?>

group->name?>

- members)) { ?> - - + members)) { ?> + + - members as $member) { ?> - <?=$member->getDisplayName()?>

- -

+ members as $member) { ?> + <?=$member->getDisplayName()?>

-- cgit v1.2.3 From f1bde0978d918b59314777a2e14cde0694f4c43e Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Fri, 10 Jun 2016 00:43:48 -0400 Subject: Add 'go home' button to exception page --- app/view/except/default.view.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/view/except/default.view.php b/app/view/except/default.view.php index 8738a37..01cf123 100644 --- a/app/view/except/default.view.php +++ b/app/view/except/default.view.php @@ -28,13 +28,17 @@

Scrott derped

System internals reported this:

Scrott derped

System internals reported this:

message?>

+ + + Go to Scrott Dashboard +

group->name?>

obj->name?>

members)) { ?> -- cgit v1.2.3 From 78667b156328dfe500330aa3bf83bf84e3116948 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 11 Jun 2016 01:11:23 -0400 Subject: Add function User::getGroups() This function returns all groups the user either owns or is a member of. This is not necessarily the same as all groups the user has access permission to. The *not-yet-implemented* object explorer feature should be used to browse those. --- app/class/user.class.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/class/user.class.php b/app/class/user.class.php index 1185f45..3239568 100644 --- a/app/class/user.class.php +++ b/app/class/user.class.php @@ -15,6 +15,7 @@ */ require_once "class/object.class.php"; +require_once "class/group.class.php"; /* * Application users @@ -230,6 +231,30 @@ class User extends Object return unlink("assets/img/heads/" . $this->guid); } + + /* + * Get all groups this user owns or is a member of + */ + function getGroups() + { + /* owner */ + $query = "SELECT guid FROM object WHERE type = 'group' AND owner = '" . $this->db->esc($this->guid) . "'"; + $result = $this->db->query($query); + + $groups = array(); + + foreach ($result as $g) + $groups[] = new Group($g['guid']); + + /* member */ + $query = "SELECT o.guid FROM object o JOIN obj_member om ON o.guid = om.guid WHERE o.type = 'group' AND member = '" . $this->db->esc($this->guid) . "'"; + $result = $this->db->query($query); + + foreach ($result as $g) + $groups[] = new Group($g['guid']); + + return $groups; + } } ?> -- cgit v1.2.3 From cfb3d059fa1e11bc71b93e21fa3208305d701de7 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 11 Jun 2016 02:02:41 -0400 Subject: Add navbar dropdown for selecting group page to view --- app/view/common/topp.view.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php index 9ec40fa..487cc6d 100644 --- a/app/view/common/topp.view.php +++ b/app/view/common/topp.view.php @@ -41,6 +41,18 @@

+ + obj) ? $mod->obj->name : "Dashboard")?> + + +
- name?>
+
-- cgit v1.2.3 From e0ab905b502e12a17b43e2c7d10e2a48b7b65774 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 12 Jun 2016 15:42:22 -0400 Subject: Add refresh btn to Scrott navbar --- app/view/common/topp.view.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php index 487cc6d..d9e0df0 100644 --- a/app/view/common/topp.view.php +++ b/app/view/common/topp.view.php @@ -41,6 +41,8 @@
Not Logged In
- obj) ? $mod->obj->name : "Dashboard")?> -- cgit v1.2.3 From f8126b70cf8e4c9a744a99a3eb41de158a26a517 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 12 Jun 2016 19:11:04 -0400 Subject: Add functions to Common model for assigning CSS to setting tabs The setting modal window will need to support showing unknown tabs at the beginning of the tab list. These functions handle assigning specific CSS classes to tab-panes ONLY if that tab will appear in the left-most position in the modal's tab list. --- app/model/common.mod.php | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/model/common.mod.php b/app/model/common.mod.php index 07b86df..e478e9d 100644 --- a/app/model/common.mod.php +++ b/app/model/common.mod.php @@ -34,6 +34,8 @@ class CommonModel extends MasterModel function __construct() { parent::__construct(); + $this->first_setting_tab_active = 0; + $this->first_setting_tab_disp = 0; $this->common_handleFormSubmissions($_REQUEST['input'], $_FILES['attachment']); $this->common_deflt(); } @@ -363,6 +365,34 @@ class CommonModel extends MasterModel $this->redirectTo($this->ar() . "/"); } } + + /* + * Set CSS class for the first tab title in the setting modal only + */ + function getSettingModalTabActiveClass() + { + if (!$this->first_setting_tab_active) + { + $this->first_setting_tab_active = 1; + return "active"; + } + + return ""; + } + + /* + * Set CSS classes for the first tab in the setting modal only + */ + function getSettingModalTabDispClasses() + { + if (!$this->first_setting_tab_disp) + { + $this->first_setting_tab_disp = 1; + return "in active"; + } + + return ""; + } } ?> -- cgit v1.2.3 From 16f84185fb4d27ffc1668ec7eeaa339428b03f83 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 12 Jun 2016 19:20:00 -0400 Subject: Update setting modal to use functions added in previous commit --- app/view/common/setting.modal.view.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 68d3e2d..19f5929 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -31,7 +31,7 @@
  - +
  - getCurrentUser()->getDisplayName()?>
  -
  +
  
  -- cgit v1.2.3 From 2adba6a387ac93f750cb795bb39a36077aa7b0de Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 12 Jun 2016 20:27:57 -0400 Subject: Move initialization logic from Obj model into Common model Some logic to initialize the current system object, its owner, and members has been moved into the Common model since this code will be relevant to other views and to support a new feature being added to display additional tabs in the setting modal box. --- app/model/common.mod.php | 11 ++++++++++- app/model/obj.mod.php | 9 +++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/model/common.mod.php b/app/model/common.mod.php index e478e9d..232f0c2 100644 --- a/app/model/common.mod.php +++ b/app/model/common.mod.php @@ -17,6 +17,7 @@ require_once "model/master.mod.php"; require_once "class/form.class.php"; require_once "class/setting.class.php"; +require_once "class/object.class.php"; require_once "class/user.class.php"; require_once "class/group.class.php"; @@ -31,12 +32,20 @@ class CommonModel extends MasterModel /* * Constructor */ - function __construct() + function __construct($guid = null) { parent::__construct(); $this->first_setting_tab_active = 0; $this->first_setting_tab_disp = 0; $this->common_handleFormSubmissions($_REQUEST['input'], $_FILES['attachment']); + + if (!is_null($guid)) + { + $this->obj = new DBObject($guid); + $this->owner = $this->obj->getOwner(); + $this->members = $this->obj->getMembers(); + } + $this->common_deflt(); } diff --git a/app/model/obj.mod.php b/app/model/obj.mod.php index 426e1ac..159c962 100644 --- a/app/model/obj.mod.php +++ b/app/model/obj.mod.php @@ -15,18 +15,15 @@ */ require_once "model/common.mod.php"; -require_once "class/group.class.php"; class ObjModel extends CommonModel { /* - * Initialize a group view + * Constructor */ - function initGroup($guid) + function __construct($guid) { - $this->obj = new Group($guid); - $this->owner = $this->obj->getOwner(); - $this->members = $this->obj->getMembers(); + parent::__construct($guid); } } -- cgit v1.2.3 From 1f39899416ca012d50d261d88b6c2bc86a673212 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 12 Jun 2016 20:50:57 -0400 Subject: Update Obj controller This commit makes the Obj controller compatable with changes introduced in the previous commit. --- app/controller/obj.control.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/controller/obj.control.php b/app/controller/obj.control.php index 74288ee..2154d16 100644 --- a/app/controller/obj.control.php +++ b/app/controller/obj.control.php @@ -16,7 +16,6 @@ require_once "class/controller.class.php"; require_once "model/obj.mod.php"; -require_once "class/object.class.php"; /* * Object viewer, Used to view groups, pads, and more! @@ -28,23 +27,21 @@ class Obj extends Controller */ function handle($argv) { - $mod = new ObjModel(); - $obj = new DBObject($argv[0]); + $mod = new ObjModel($argv[0]); - if (!$obj->canAccess($this->getCurrentUser())) + if (!$mod->obj->canAccess($this->getCurrentUser())) throw new Exception("You do not have permission to access this object"); - switch ($obj->type) + switch ($mod->obj->type) { case "group": - $this->action_group($mod, $obj->guid); + $this->action_group($mod); break; } } - function action_group($mod, $guid) + function action_group($mod) { - $mod->initGroup($guid); include "view/obj/group.view.php"; } } -- cgit v1.2.3 From 076a86c663870be3c4cf6da8059f0f978a7eb3ce Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 12 Jun 2016 21:33:50 -0400 Subject: Add group tab to setting modal Created empty
  for the group setting tab. Also added code to the common model for initializing the $mod->group variable and setting a flag marking what tabs to include in the setting modal (group tab in this case). Added logic to the main setting modal view file for picking up these flags and including appropriate additional content. --- app/model/common.mod.php | 10 ++++++++++ app/view/common/group.setting.modal.view.php | 21 +++++++++++++++++++++ app/view/common/setting.modal.view.php | 10 ++++++++++ 3 files changed, 41 insertions(+) create mode 100644 app/view/common/group.setting.modal.view.php diff --git a/app/model/common.mod.php b/app/model/common.mod.php index 232f0c2..459c53a 100644 --- a/app/model/common.mod.php +++ b/app/model/common.mod.php @@ -71,6 +71,16 @@ class CommonModel extends MasterModel /* Admin all-users settings tab */ $userTbl = new User(); $this->common_settingAllUsers = $userTbl->getAllUsers_orderByAdminByName(); + + /* Setting modal - what tabs to display? */ + if (isset($this->obj)) + { + if ($this->obj->type == "group") + { + $this->group = new Group($this->obj->guid); + $this->common_settingShowTab['group'] = true; + } + } } /* diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php new file mode 100644 index 0000000..e5c096c --- /dev/null +++ b/app/view/common/group.setting.modal.view.php @@ -0,0 +1,21 @@ + + +
  + TODO -- Design this tab. +
  diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 19f5929..2217805 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -31,6 +31,12 @@
  
  + common_settingShowTab['group']) { ?> +
  + group->name?> +
  + +
  getCurrentUser()->getDisplayName()?>
  @@ -42,6 +48,10 @@
  
  + common_settingShowTab['group']) { ?> + + +
  
  -- cgit v1.2.3 From de8dc835d7442a8bdc47d181ee9385fe7d16209d Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 12 Jun 2016 21:48:37 -0400 Subject: Revert "Rename variable" This reverts commit 112a510bb7ba358fd4195b5b2f3c8203ab4fb91d. Conflicts: app/model/obj.mod.php --- app/view/obj/group.view.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/view/obj/group.view.php b/app/view/obj/group.view.php index c75995b..dde4df1 100644 --- a/app/view/obj/group.view.php +++ b/app/view/obj/group.view.php @@ -17,7 +17,7 @@ - Scrott - <?=$mod->obj->name?> + Scrott - <?=$mod->group->name?> @@ -25,7 +25,7 @@
  
  -
  obj->name?>
  +
  group->name?>
  members)) { ?> -- cgit v1.2.3 From 63e56817123810e93a3d5cd0e13a70b8c47cacc5 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Tue, 13 Sep 2016 20:34:15 -0400 Subject: Changes to the handling of indirect variables, properties, and methods To maintain forward compatability with newer versions of PHP (and since my dev environment is now running PHP 7), this patch is made to address the following breaking change from PHP 5: PHP 7 now uses an abstract syntax tree when parsing source files. This has permitted many improvements to the language which were previously impossible due to limitations in the parser used in earlier versions of PHP, but has resulted in the removal of a few special cases for consistency reasons, which has resulted in backward compatibility breaks. Indirect access to variables, properties, and methods will now be evaluated strictly in left-to-right order, as opposed to the previous mix of special cases. --- app/class/form.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/class/form.class.php b/app/class/form.class.php index f0d660a..8bb6506 100644 --- a/app/class/form.class.php +++ b/app/class/form.class.php @@ -123,10 +123,10 @@ class Form foreach ($this->textFields as $fld) { if (isset($input[$fld['name']]) && $input[$fld['name']] != "") - $this->$fld['name'] = htmlEntities($input[$fld['name']], ENT_QUOTES); + $this->{$fld['name']} = htmlEntities($input[$fld['name']], ENT_QUOTES); else if (!is_null($fld['deflt'])) - $this->$fld['name'] = $fld['deflt']; + $this->{$fld['name']} = $fld['deflt']; else if ($fld['req']) $this->logError($fld['name'] . " is required"); @@ -161,11 +161,11 @@ class Form continue; } - $this->$fld['name'] = $input[$fld['name']]; + $this->{$fld['name']} = $input[$fld['name']]; } else if (!is_null($fld['deflt'])) - $this->$fld['name'] = $fld['deflt']; + $this->{$fld['name']} = $fld['deflt']; else if ($fld['req']) $this->logError($fld['name'] . " is required"); @@ -182,11 +182,11 @@ class Form continue; } - $this->$fld['name'] = $input[$fld['name']]; + $this->{$fld['name']} = $input[$fld['name']]; } else if (!is_null($fld['deflt'])) - $this->$fld['name'] = $fld['deflt']; + $this->{$fld['name']} = $fld['deflt']; else if ($fld['req']) $this->logError($fld['name'] . " is required"); -- cgit v1.2.3 From 7fd20cd4e15aec3079377e48f18ba91bbda462eb Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Tue, 13 Sep 2016 23:32:37 -0400 Subject: Move function User::getHeadImage() to Object class Increase the scope of this function so it may be used by groups. --- app/class/object.class.php | 8 ++++++++ app/class/user.class.php | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/class/object.class.php b/app/class/object.class.php index cfc452c..8f64fc4 100644 --- a/app/class/object.class.php +++ b/app/class/object.class.php @@ -593,6 +593,14 @@ abstract class Object extends Framework return false; } + + /* + * Get object's head image + */ + function getHeadImage() + { + return $this->ar() . "/file.php?d=img/heads&f=" . $this->guid; + } } /* diff --git a/app/class/user.class.php b/app/class/user.class.php index 3239568..44b4b5f 100644 --- a/app/class/user.class.php +++ b/app/class/user.class.php @@ -213,14 +213,6 @@ class User extends Object return "glyphicon glyphicon-user"; } - /* - * Get this user's head image - */ - function getHeadImage() - { - return $this->ar() . "/file.php?d=img/heads&f=" . $this->guid; - } - /* * Remove this user's head image */ -- cgit v1.2.3 From 762f14cefdf988fcdc2521cd23092e037b9990e3 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Wed, 14 Sep 2016 00:18:39 -0400 Subject: Add view template for setting object permissions This view template can be included from object setting tab view to display controls for adjusting object permissions. --- app/view/common/permissions.setting.modal.view.php | 80 ++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 app/view/common/permissions.setting.modal.view.php diff --git a/app/view/common/permissions.setting.modal.view.php b/app/view/common/permissions.setting.modal.view.php new file mode 100644 index 0000000..bd4b7cd --- /dev/null +++ b/app/view/common/permissions.setting.modal.view.php @@ -0,0 +1,80 @@ + + +obj->canModifyPermissions($mod->getCurrentUser())) { ?> + Permissions +
  +
  +
  + + obj->perms & 0x100 ? "checked" : "")?> /> Members can modify + +
  + +
  + + obj->perms & 0x080 ? "checked" : "")?> /> Members can modify members + +
  + +
  + + obj->perms & 0x040 ? "checked" : "")?> /> Members can access children + +
  + +
  + + obj->perms & 0x020 ? "checked" : "")?> /> Members can create children + +
  + +
  + + obj->perms & 0x010 ? "checked" : "")?> /> Members can modify children + +
  + +
  + + obj->perms & 0x008 ? "checked" : "")?> /> Members can modify children's members + +
  +
  + +
  +
  + + obj->perms & 0x004 ? "checked" : "")?> /> Public can access + +
  + +
  + + obj->perms & 0x002 ? "checked" : "")?> /> Public can access children + +
  + +
  + + obj->perms & 0x001 ? "checked" : "")?> /> Public can create children + +
  +
  +
  + -- cgit v1.2.3 From fa01eb6b8432b1700a393042bbf6626e420001eb Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Thu, 15 Sep 2016 01:26:51 -0400 Subject: Add view template for transferring the owner of an object --- app/view/common/ownership.setting.modal.view.php | 33 ++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 app/view/common/ownership.setting.modal.view.php diff --git a/app/view/common/ownership.setting.modal.view.php b/app/view/common/ownership.setting.modal.view.php new file mode 100644 index 0000000..857ccb4 --- /dev/null +++ b/app/view/common/ownership.setting.modal.view.php @@ -0,0 +1,33 @@ + + +obj->isOwner($mod->getCurrentUser())) { ?> + Change Owner +
  + + Transfer Ownership + +
  + +
  +
  + Owner Username + +
  +
  + -- cgit v1.2.3 From 0e00677199347f296426b77f48c8423602c56d66 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Thu, 15 Sep 2016 19:46:45 -0400 Subject: Commit work on setting modal groups tab I am committing this change incomplete. I'm stopping work on this particular piece to save some work overall and explore view templating using PHP features. The idea is to define this markup once in just one file, rather than having to duplicate it for each object type. --- app/view/common/group.setting.modal.view.php | 53 +++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php index e5c096c..e2a73e0 100644 --- a/app/view/common/group.setting.modal.view.php +++ b/app/view/common/group.setting.modal.view.php @@ -17,5 +17,56 @@ ?>
  - TODO -- Design this tab. +
  
  + + + + + +
  +
  +
  + Group name + group->canModify($mod->getCurrentUser()) ? "" : "disabled")?> /> +
  +
  + +
  + + + group->canModify($mod->getCurrentUser())) { ?> +
  +
  +