Early 2018 SurvLoop Upgrades

This commit is largely just keeping OpenPolice updated with recent
SurvLoop upgrades. Better release with updated database seeders still
coming soon.

LICENSE

@@ -1,22 +1,16 @@
-The MIT License (MIT)
+GNU General Public License v3.0 (GPLv3.0)
 
-Copyright (c) 2016 Morgan Lesko
+Copyright (c) 2016-2018 Morgan Lesko
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

README.md

@@ -3,7 +3,7 @@
 
 [![Laravel](https://img.shields.io/badge/Laravel-5.3-orange.svg?style=flat-square)](http://laravel.com)
 [![SurvLoop](https://img.shields.io/badge/SurvLoop-0.0-orange.svg?style=flat-square)](https://github.com/wikiworldorder/survloop)
-[![License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](https://tldrlegal.com/license/mit-license)
+[![License](https://img.shields.io/aur/license/yaourt.svg?style=flat-square)](https://www.gnu.org/licenses/gpl.html)
 
 Open Police is an open-source, open data web app empowering citizens to prepare, file, and track reports of police 
 conduct. The site helps users submit complaints or commendations to appropriate police oversight agencies. By allowing 
@@ -45,9 +45,14 @@ XML included an automatically generated schema, eg.<br />
 
 # <a name="getting-started"></a>Getting Started
 
-Here are instructions if you are new to Laravel, or just want step-by-step instructions on how to install its development environment, Homestead: 
-<a href="https://OpenPoliceComplaints.org/how-to-install-laravel/" target="_blank">OpenPoliceComplaints.org/how-to-install-laravel/</a>.
+Instructions if you are new to Laravel, or just want to install its local development environment, Homestead: 
+<a href="http://wikiworldorder.org/2016/11/26/coding-with-laravel-installing-homestead-on-a-mac/" 
+    target="_blank">WikiWorldOrder.org/2016/11/26/coding-with-laravel-installing-homestead-on-a-mac/</a>.
 
+Instructions if you are new to Laravel, or just want to install it to an online server: 
+<a href="http://wikiworldorder.org/2018/03/15/how-to-install-the-laravel-php-framework-on-digital-ocean/" 
+    target="_blank">WikiWorldOrder.org/2018/03/15/how-to-install-the-laravel-php-framework-on-digital-ocean/</a>.
+
 The instructions below include the needed steps to install SurvLoop, as well as the Open Police system.
 
 * Install Laravel's default user authentication, one required package, and SurvLoop:
@@ -78,6 +83,8 @@ $ nano composer.json
 		...
 		"SurvLoop\\": "vendor/wikiworldorder/survloop/src/",
 		"OpenPolice\\": "vendor/flexyourrights/openpolice/src/",
+		"MatthiasMullie\\Minify\\": "vendor/matthiasmullie/minify/src/",
+		"MatthiasMullie\\PathConverter\\": "vendor/matthiasmullie/path-converter/src/",
 	}
 	...
 },

composer.json

@@ -15,7 +15,7 @@
     	"branching tree",
     	"nodes"
     ],
-    "license": "MIT",
+    "license": "GPL-3.0-or-later",
     "authors": [
         {
             "name": "Morgan Lesko",

src/Controllers/OpenPolice.php

@@ -173,7 +173,7 @@ protected function recordIsEditable($coreTbl, $coreID, $coreRec = [])
         return false;
     }
 
-    protected function getAllPublicCoreIDs($coreTbl = '')
+    public function getAllPublicCoreIDs($coreTbl = '')
     {
         if (trim($coreTbl) == '') $coreTbl = $GLOBALS["SL"]->coreTbl;
         $this->allPublicCoreIDs = $list = [];
@@ -354,6 +354,20 @@ protected function checkNodeConditionsCustom($nID, $condition = '')
                 }
             }
             return 0;
+        } elseif ($condition == '#LawyerInvolved') {
+            if ((isset($this->sessData->dataSets["Complaints"][0]->ComAttorneyHas) 
+                && in_array(trim($this->sessData->dataSets["Complaints"][0]->ComAttorneyHas), ['Y', '?']))
+                || (isset($this->sessData->dataSets["Complaints"][0]->ComAttorneyWant) 
+                && in_array(trim($this->sessData->dataSets["Complaints"][0]->ComAttorneyWant), ['Y', '?']))) {
+                return 1;
+            }
+            if ((isset($this->sessData->dataSets["Complaints"][0]->ComAnyoneCharged) 
+                && in_array(trim($this->sessData->dataSets["Complaints"][0]->ComAnyoneCharged), ['Y', '?']))
+                && (!isset($this->sessData->dataSets["Complaints"][0]->ComAllChargesResolved) 
+                    || trim($this->sessData->dataSets["Complaints"][0]->ComAllChargesResolved) != 'Y')) {
+                return 1;
+            }
+            return 0;
         } elseif ($condition == '#NoSexualAllegation') {
             $noSexAlleg = true;
             if (isset($this->sessData->dataSets["Allegations"]) 
@@ -717,15 +731,12 @@ protected function postNodePublicCustom($nID = -3, $tmpSubTier = [])
                 }
             }
             return false;
-        } elseif ($nID == 16) {
-            $time = $this->postFormTimeStr($nID);
-            $this->sessData->currSessData($nID, $tbl, $fld, 'update', (($time === null) ? null
-                : date("Y-m-d", strtotime($GLOBALS["SL"]->REQ->n15fld)) . ' ' . $time));
-            return true;
-        } elseif ($nID == 17) {
+        } elseif (in_array($nID, [16, 17])) {
             $time = $this->postFormTimeStr($nID);
-            $this->sessData->currSessData($nID, $tbl, $fld, 'update', (($time === null) ? null
-                : date("Y-m-d", strtotime($GLOBALS["SL"]->REQ->n15fld)) . ' ' . $time));
+            $date = date("Y-m-d", strtotime($GLOBALS["SL"]->REQ->n15fld));
+            if ($time === null) $date .= ' 00:00:00';
+            else $date .= ' ' . $time;
+            $this->sessData->currSessData($nID, $tbl, $fld, 'update', $date);
             return true;
         } elseif ($nID == 47) { // Complainant Recorded Incident?
             $this->sessData->dataSets["Civilians"][0]->CivCameraRecord = $GLOBALS["SL"]->REQ->input('n47fld');
@@ -961,7 +972,8 @@ protected function printNodeSessDataOverride($nID = -3, $tmpSubTier = [], $currN
         } elseif ($nID == 39) {
             if ($currNodeSessionData == '') {
                 $user = Auth::user();
-                return [$user->email];
+                if ($user && isset($user->email)) return [$user->email];
+                return [''];
             }
         } elseif ($nID == 576) {
             $lnkRow = $this->sessData->sessChildRowFromParent('LinksCivilianVehicles');
@@ -971,7 +983,7 @@ protected function printNodeSessDataOverride($nID = -3, $tmpSubTier = [], $currN
         } elseif ($nID == 671) { // Officers Used Profanity?
             $currVals = [];
             foreach ($this->sessData->dataSets["Officers"] as $i => $off) {
-                if ($off->OffUsedProfanity == 'Y') $currVals[] = $off->getKey();
+                if (isset($off->OffUsedProfanity) && $off->OffUsedProfanity == 'Y') $currVals[] = $off->getKey();
             }
             return [';' . implode(';', $currVals) . ';'];
         } elseif ($nID == 674) { // Officer Used Profanity?
@@ -987,7 +999,7 @@ protected function printNodeSessDataOverride($nID = -3, $tmpSubTier = [], $currN
             if ($civInd >= 0) {
                 return trim($this->sessData->dataSets["Civilians"][$civInd]->CivUsedProfanity);
             }
-        } elseif ($nID == in_array($nID, [732, 736, 733])) { // Gold Stops & Searches, Multiple Victims
+        } elseif (in_array($nID, [732, 736, 733])) { // Gold Stops & Searches, Multiple Victims
             if (!isset($this->v["firstTimeGoGoldDeets"])) {
                 $chk = SLNodeSavesPage::where('PageSaveSession', $this->coreID)
                     ->where('PageSaveNode', 484)

src/Controllers/OpenPoliceAdmin.php

@@ -124,78 +124,29 @@ protected function tweakAdmMenu($currPage = '')
     {
         //echo '<br /><br /><br />tweakAdmMenu(<pre>'; print_r($this->admMenuData["adminNav"]); echo '</pre>';
         if (isset($this->v["deptSlug"])) {
-            $volunteeringSubMenu = [
-                'javascript:;" id="navBtnContact0',
-                '<b>Verifying Department</b>',
-                '<i class="fa fa-eye" aria-hidden="true"></i>',
-                1,
-                [
-                    [
-                        'javascript:;" id="navBtnContact',
-                        'Contact Info',
-                        '',
-                        1,
-                        []
-                    ], [
-                        'javascript:;" id="navBtnWeb',
-                        'Web & Complaints',
-                        '',
-                        1,
-                        []
-                    ], [
-                        'javascript:;" id="navBtnIA',
-                        'Internal Affairs',
-                        '',
-                        1,
-                        []
-                    ], [
-                        'javascript:;" id="navBtnOver',
-                        'Civilian Oversight',
-                        '',
-                        1,
-                        []
-                    ], [
-                        'javascript:;" id="navBtnSave',
-                        '<span class="btn btn-lg btn-primary"><i class="fa fa-floppy-o"></i> Save All Changes</span>', 
-                        '',
-                        1,
-                        []
-                    ], [
-                        'javascript:;" id="navBtnEdits',
-                        '<span class="gry9">Past Edits:</span>',
-                        '',
-                        1,
-                        []
-                    ], [
-                        'javascript:;" id="navBtnCheck',
-                        '<span class="gry9">Volunteer Checklist</span>',
-                        '',
-                        1,
-                        []
-                    ], [
-                        'javascript:;" id="navBtnPhone',
-                        '<span class="gry9">&nbsp;&nbsp;Sample Phone Script</span>',
-                        '',
-                        1,
-                        []
-                    ], [
-                        'javascript:;" id="navBtnFAQ',
-                        '<span class="gry9">Frequently Asked <i class="fa fa-question"></i>s</span></span>',
-                        '',
-                        1,
-                        []
-                    ]
-                ]
-            ];
-            if ($this->v["user"]->hasRole('administrator|staff|databaser')) {
-                $this->admMenuData["adminNav"][1][] = $volunteeringSubMenu;
-                $this->admMenuData["currNavPos"] = [3, -1, -1, -1];
-            } else { // is Volunteer
-                $volunteeringSubMenu[1] .= ' <span class="pull-right"><i class="fa fa-check"></i></span>';
-                $this->admMenuData["adminNav"][0] = $volunteeringSubMenu;
-                $this->admMenuData["currNavPos"] = [0, -1, -1, -1];
+            for ($j = sizeof($this->admMenuData["adminNav"]); $j--; $j > 0) {
+                $this->admMenuData["adminNav"][$j] = $this->admMenuData["adminNav"][$j-1];
             }
+            $this->admMenuData["adminNav"][0] = $this->admMenuLnk('javascript:;" id="navBtnContact0', 
+                '<b>Verifying Department</b>', '<i class="fa fa-eye" aria-hidden="true"></i>', 1, [
+                $this->admMenuLnk('javascript:;" id="navBtnContact', 'Contact Info'),
+                $this->admMenuLnk('javascript:;" id="navBtnWeb',     'Web & Complaints'),
+                $this->admMenuLnk('javascript:;" id="navBtnIA',      'Internal Affairs'),
+                $this->admMenuLnk('javascript:;" id="navBtnOver',    'Civilian Oversight'),
+                $this->admMenuLnk('javascript:;" id="navBtnSave',    'Save All Changes', 
+                    '<i class="fa fa-floppy-o"></i>'),
+                $this->admMenuLnk('javascript:;" id="navBtnEdits',
+                    '<span class="gry9">Past Edits</span>'),
+                $this->admMenuLnk('javascript:;" id="navBtnCheck',
+                    '<span class="gry9">Volunteer Checklist</span>'),
+                $this->admMenuLnk('javascript:;" id="navBtnPhone',
+                    '<span class="gry9">&nbsp;&nbsp;Sample Phone Script</span>'),
+                $this->admMenuLnk('javascript:;" id="navBtnFAQ',
+                    '<span class="gry9">Frequently Asked <i class="fa fa-question"></i>s</span></span>')
+            ]);
+            //$this->admMenuData["currNavPos"] = [0, -1, -1, -1];
         }
+        /*
         if (!$this->v["user"]->hasRole('administrator|staff|databaser')) {
             if (isset($this->admMenuData["adminNav"][1]) && isset($this->admMenuData["adminNav"][1][1])) {
                 if (!isset($this->v["yourUserInfo"]->UserInfoStars)) {
@@ -206,7 +157,7 @@ protected function tweakAdmMenu($currPage = '')
                 }
             }
         }
-
+        */
         $this->getAdmMenuLoc($currPage);
         return true;
     }

src/Controllers/VolunteerController.php

@@ -88,10 +88,10 @@ protected function tweakAdmMenu($currPage = '')
                 ]
             ];
             if ($this->v["user"]->hasRole('administrator|staff|databaser')) {
-                $this->admMenuData["adminNav"][2][3][3] = $volunteeringSubMenu;
+                //$this->admMenuData["adminNav"][2][3][3] = $volunteeringSubMenu;
             } else { // is Volunteer
-                $volunteeringSubMenu[1] .= ' <span class="pull-right"><i class="fa fa-check"></i></span>';
-                $this->admMenuData["adminNav"][1] = $volunteeringSubMenu;
+                //$volunteeringSubMenu[1] .= ' <span class="pull-right"><i class="fa fa-check"></i></span>';
+                //$this->admMenuData["adminNav"][1] = $volunteeringSubMenu;
             }
         }
         if (!$this->v["user"]->hasRole('administrator|staff|databaser')) {

src/Views/nodes/145-ajax-dept-search.blade.php

@@ -38,7 +38,9 @@ function submitAjaxSearch() {
                 document.getElementById("n{{ $nID }}FldID").value = $(this).attr("id").replace("dept", "");
                 document.getElementById("stepID").value="back";
                 //alert("New Dept: "+document.getElementById("n{{ $nID }}FldID").value);
-                return runFormSub(); 
+                otherFormSub = true;
+                return true;
+                //return runFormSub();
             });
 
             $(document).on("click", "#addNewDept", function() {
@@ -52,7 +54,9 @@ function submitAjaxSearch() {
                 }
                 document.getElementById("n{{ $nID }}FldID").value = -3;
                 document.getElementById("stepID").value="back";
-                return runFormSub(); 
+                otherFormSub = true;
+                return true;
+                //return runFormSub();
             });
 
             $( "#deptNameInID" ).autocomplete({