User/Nav/Session Cleanup #1377

DawoudIO · 2016-11-16T06:44:02Z

closes #1112 #1315 #1378
started #947

updated user object boolean types
removed unused use columns
added user object to session
add user object name.
moved admin menu to right nav
moved cvs export to right nav
moved properties to right nav

- updated user object boolean types - removed unused columns - added user object to session - add user object name.

DawoudIO · 2016-11-16T08:26:02Z

crossan007 · 2016-11-16T13:33:54Z

Why is the "logoff / Poweroff" icon highlighted? Is that how you get to this side menu?

crossan007 · 2016-11-17T04:03:06Z

propel/schema.xml

@@ -608,21 +608,18 @@
    <table name="user_usr" idMethod="native" phpName="User">
        <column name="usr_per_ID" phpName="PersonId" type="SMALLINT" size="9" sqlType="mediumint(9) unsigned" primaryKey="true" required="true" defaultValue="0"/>
        <column name="usr_Password" phpName="Password" type="VARCHAR" size="500" required="true" defaultValue=""/>
-        <column name="usr_NeedPasswordChange" phpName="NeedPasswordChange" type="TINYINT" size="3" sqlType="tinyint(3) unsigned" required="true" defaultValue="1"/>
+        <column name="usr_NeedPasswordChange" phpName="NeedPasswordChange" type="BOOLEAN" size="3" sqlType="tinyint(3) unsigned" required="true" defaultValue="1"/>


Boolean size 3? What kind of parallel universe is this?! :-)

I'll fix that

crossan007 · 2016-11-17T04:04:42Z

src/EmailSend.php

@@ -554,7 +554,7 @@ function SendEmail($sSubject, $sMessage, $attachName, $hasAttach, $sRecipient)
        $sSubject = "Email job started at $tTimeStamp";

        $sMessage = "Email job issued by ";
-        $sMessage .= $_SESSION['UserFirstName'].' '.$_SESSION['UserLastName'];
+        $sMessage .= $_SESSION['user']->getName();


crossan007 · 2016-11-17T04:04:58Z

src/FindFundRaiser.php

+  /* @var $currentUser \ChurchCRM\User */
+  $currentUser = $_SESSION['user'];
+  $currentUser->setSearchLimit(FilterInput($_GET["Number"],'int'));
+  $currentUser->save();


crossan007 · 2016-11-17T04:05:36Z

src/Include/Header-function.php

-                         session_var_in_uri, url_parm_name, security_grp 
-                  FROM menuconfig_mcf 
-                  WHERE parent = '$menu' AND active=1 " . $security_matrix . " 
+        $query = "SELECT name, ismenu, content, uri, statustext, session_var, session_var_in_text,


can we ORM this?

MVP :) but Yes we can

crossan007 · 2016-11-17T04:06:50Z

src/Include/Header.php

+  Header_modals();
+  Header_body_scripts();
+
+  $loggedInUserPhoto = $sRootPath . "/api/persons/" . $_SESSION['iUserID'] . "/photo";


would it make sense to have a getUserPhoto(); function for cleaner re-use?

this will help with page load time as there is another thread doing the lookup

crossan007 · 2016-11-17T04:07:42Z

src/Login.php

+      $_SESSION['bFinance'] = $currentUser->isFinanceEnabled();
+      $_SESSION['bNotes'] = $currentUser->isNotesEnabled();
+      $_SESSION['bEditSelf'] = $currentUser->isEditSelfEnabled();
+      $_SESSION['bCanvasser'] = $currentUser->isCanvasserEnabled();


eventually I see us moving away from session variables specific to the permission.....but that's probably not for a while.

I like this cleanup for now.

crossan007 · 2016-11-17T04:09:05Z

src/UserEditor.php

@@ -134,28 +132,28 @@

            if ($undupCount == 0) {
                $sPasswordHashSha256 = hash ("sha256", $sDefault_Pass.$iPersonID);
-                $sSQL = "INSERT INTO user_usr (usr_per_ID, usr_Password, usr_NeedPasswordChange, usr_LastLogin, usr_AddRecords, usr_EditRecords, usr_DeleteRecords, usr_MenuOptions, usr_ManageGroups, usr_Finance, usr_Notes, usr_Communication, usr_Admin, usr_Style, usr_SearchLimit, usr_defaultFY, usr_UserName, usr_EditSelf, usr_Canvasser) VALUES (" . $iPersonID . ",'" . $sPasswordHashSha256 . "',1,'" . date("Y-m-d H:i:s") . "', " . $AddRecords . ", " . $EditRecords . ", " . $DeleteRecords . ", " . $MenuOptions . ", " . $ManageGroups . ", " . $Finance . ", " . $Notes . ", " . $Communication . ", " . $Admin . ", '" . $Style . "', 10," . $defaultFY . ",\"" . $sUserName . "\"," . $EditSelf . "," . $Canvasser . ")";
+                $sSQL = "INSERT INTO user_usr (usr_per_ID, usr_Password, usr_NeedPasswordChange, usr_LastLogin, usr_AddRecords, usr_EditRecords, usr_DeleteRecords, usr_MenuOptions, usr_ManageGroups, usr_Finance, usr_Notes, usr_Admin, usr_Style, usr_SearchLimit, usr_defaultFY, usr_UserName, usr_EditSelf, usr_Canvasser) VALUES (" . $iPersonID . ",'" . $sPasswordHashSha256 . "',1,'" . date("Y-m-d H:i:s") . "', " . $AddRecords . ", " . $EditRecords . ", " . $DeleteRecords . ", " . $MenuOptions . ", " . $ManageGroups . ", " . $Finance . ", " . $Notes . ", " . $Admin . ", '" . $Style . "', 10," . $defaultFY . ",\"" . $sUserName . "\"," . $EditSelf . "," . $Canvasser . ")";


Do you think we can ORM this now?

yes I'll be working on user ORM in another branch

crossan007 · 2016-11-17T04:09:15Z

src/UserEditor.php

        if ($undupCount == 0) {
-                    $sSQL =  "UPDATE user_usr SET usr_AddRecords = " . $AddRecords . ", usr_EditRecords = " . $EditRecords . ", usr_DeleteRecords = " . $DeleteRecords . ", usr_MenuOptions = " . $MenuOptions . ", usr_ManageGroups = " . $ManageGroups . ", usr_Finance = " . $Finance . ", usr_Notes = " . $Notes . ", usr_Communication = " . $Communication . ", usr_Admin = " . $Admin . ", usr_Style = \"" . $Style . "\", usr_UserName = \"" . $sUserName . "\", usr_EditSelf = \"" . $EditSelf . "\", usr_Canvasser = " . $Canvasser . " WHERE usr_per_ID = " . $iPersonID;
+                    $sSQL =  "UPDATE user_usr SET usr_AddRecords = " . $AddRecords . ", usr_EditRecords = " . $EditRecords . ", usr_DeleteRecords = " . $DeleteRecords . ", usr_MenuOptions = " . $MenuOptions . ", usr_ManageGroups = " . $ManageGroups . ", usr_Finance = " . $Finance . ", usr_Notes = " . $Notes . ", usr_Admin = " . $Admin . ", usr_Style = \"" . $Style . "\", usr_UserName = \"" . $sUserName . "\", usr_EditSelf = \"" . $EditSelf . "\", usr_Canvasser = " . $Canvasser . " WHERE usr_per_ID = " . $iPersonID;


crossan007 · 2016-11-17T04:10:33Z

src/mysql/install/Install.sql

@@ -1242,30 +1238,27 @@ INSERT INTO `userconfig_ucfg` (`ucfg_per_id`, `ucfg_id`, `ucfg_name`, `ucfg_valu
 CREATE TABLE `user_usr` (
  `usr_per_ID` mediumint(9) unsigned NOT NULL default '0',
  `usr_Password` varchar(500) NOT NULL default '',
-  `usr_NeedPasswordChange` tinyint(3) unsigned NOT NULL default '1',
+  `usr_NeedPasswordChange` tinyint(1) unsigned NOT NULL default '1',


You got it - 1 here - but 3 in schema.xml ;-)

crossan007 · 2016-11-17T04:11:44Z

src/mysql/install/Install.sql

  `usr_SearchLimit` tinyint(4) default '10',
  `usr_Style` varchar(50) default 'Style.css',
  `usr_showPledges` tinyint(1) NOT NULL default '0',
  `usr_showPayments` tinyint(1) NOT NULL default '0',
  `usr_showSince` date NOT NULL default '0000-00-00',
  `usr_defaultFY` mediumint(9) NOT NULL default '10',
  `usr_currentDeposit` mediumint(9) NOT NULL default '0',
-  `usr_UserName` varchar(32) default NULL,
-  `usr_EditSelf` tinyint(3) unsigned NOT NULL default '0',
+  `usr_UserName` varchar(50) default NULL,


It's 50 here, but only 32 in the schema.xml model definition

crossan007 · 2016-11-17T04:11:56Z

src/mysql/upgrade/2.4.0/2.4.0-user.sql

+
+ALTER TABLE `user_usr`
+CHANGE COLUMN `usr_NeedPasswordChange` `usr_NeedPasswordChange` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1' COMMENT '' ,
+CHANGE COLUMN `usr_UserName` `usr_UserName` VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL COMMENT '',


It's 50 here, but only 32 in the schema.xml model definition

crossan007 · 2016-11-17T04:14:12Z

src/skin/js/Footer.js

    $.ajax({
      url: window.CRM.root + "/api/timerjobs/run",
      type: "POST"
    });
    $(".date-picker").datepicker({format:'yyyy-mm-dd', language: window.CRM.lang});
 });
+
+function showGlobalMessage(message, callOutClass) {


hmmm......Interesting idea.

dschwen · 2016-11-19T01:24:15Z

src/ChurchCRM/model/ChurchCRM/User.php

+
+  public function isCanvasserEnabled()
+  {
+    return ($this->isAdmin() ? true : $this->isCanvasser());


I'd write all those as

return $this->isAdmin() || $this->isEditSelf();

rather than using the ternary ?: operator

all 3 tags are used - Moved settings - moved admin menus - moved Properties menus - moved cvs export

DawoudIO · 2016-11-19T21:35:20Z

need to move the following links to the Right Nav also

DawoudIO added 2 commits November 15, 2016 22:37

user object & session updates

813331d

- updated user object boolean types - removed unused columns - added user object to session - add user object name.

moving headers to header file... not funcations

be6544f

DawoudIO added development enhancement Feature: Users labels Nov 16, 2016

DawoudIO added this to the 2.4.0 milestone Nov 16, 2016

DawoudIO added the In Review label Nov 16, 2016

DawoudIO added 7 commits November 15, 2016 23:17

removed commented code

c338bba

removed commented code

867db65

delete user

2fcaa53

user orm

e76e9fb

global message is now done via JS

d7c66ee

moved settings / tasks to right nav menu

4f8c17c

Admin Nav is now hardcode via icons in the Right Nav

4717846

DawoudIO added do not merge! and removed In Review labels Nov 16, 2016

DawoudIO closed this Nov 16, 2016

DawoudIO reopened this Nov 16, 2016

DawoudIO added the In Review label Nov 16, 2016

DawoudIO added 3 commits November 16, 2016 00:28

check for null before deleteing the user

a51dffd

changed users settings icon

43c8b85

updated font - awesome to 4.7.0

97ec153

crossan007 reviewed Nov 17, 2016

View reviewed changes

Merge branch 'develop' into right-nav-v1

b021b69

dschwen reviewed Nov 19, 2016

View reviewed changes

DawoudIO added 4 commits November 19, 2016 11:00

code review feedback

cfd0a3b

Side Nav bar now has admin and non admin settings.

b4471e9

all 3 tags are used - Moved settings - moved admin menus - moved Properties menus - moved cvs export

Edit Group Types moved to side nav

c94e37a

cleaner nav footer for crm settings

ea4dc57

DawoudIO removed the do not merge! label Nov 19, 2016

DawoudIO added 6 commits November 20, 2016 12:49

Merge branch 'develop' into right-nav-v1

f080f09

Merge branch 'develop' into right-nav-v1

1696182

more cleanup

46034d1

added missing script

dd47764

fixed menus AUTO_INCREMENT

73d74ae

updated nav menus to match install menus

f1d0ed8

This was referenced Nov 21, 2016

Convert User Objects to ORM #947

Closed

login is very slow #1060

Closed

crossan007 mentioned this pull request Nov 22, 2016

Refactor user settings similar to SystemConfig #1428

Closed

Merge branch 'develop' into right-nav-v1

d9064b4

crossan007 merged commit de9ab63 into develop Nov 22, 2016

crossan007 removed the In Review label Nov 22, 2016

crossan007 deleted the right-nav-v1 branch November 22, 2016 03:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

User/Nav/Session Cleanup #1377

User/Nav/Session Cleanup #1377

DawoudIO commented Nov 16, 2016 •

edited

Loading

DawoudIO commented Nov 16, 2016

crossan007 commented Nov 16, 2016

crossan007 Nov 17, 2016

DawoudIO Nov 18, 2016

DawoudIO Nov 19, 2016

crossan007 Nov 17, 2016

crossan007 Nov 17, 2016

crossan007 Nov 17, 2016

DawoudIO Nov 18, 2016 •

edited

Loading

crossan007 Nov 17, 2016

DawoudIO Nov 18, 2016

crossan007 Nov 17, 2016

crossan007 Nov 17, 2016

crossan007 Nov 17, 2016

DawoudIO Nov 18, 2016

crossan007 Nov 17, 2016

crossan007 Nov 17, 2016

crossan007 Nov 17, 2016

DawoudIO Nov 18, 2016

DawoudIO Nov 19, 2016

crossan007 Nov 17, 2016

DawoudIO Nov 19, 2016

crossan007 Nov 17, 2016

dschwen Nov 19, 2016

DawoudIO Nov 19, 2016

DawoudIO Nov 19, 2016

DawoudIO commented Nov 19, 2016 •

edited

Loading

User/Nav/Session Cleanup #1377

User/Nav/Session Cleanup #1377

Conversation

DawoudIO commented Nov 16, 2016 • edited Loading

DawoudIO commented Nov 16, 2016

crossan007 commented Nov 16, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DawoudIO Nov 18, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DawoudIO commented Nov 19, 2016 • edited Loading

DawoudIO commented Nov 16, 2016 •

edited

Loading

DawoudIO Nov 18, 2016 •

edited

Loading

DawoudIO commented Nov 19, 2016 •

edited

Loading