Build/2.8.2 to develop (#2677)

* kiosk cleanup

* cleanups

* fixes

* tweaks

* don't show new button yet since it's not connected.

* tweak

* Apply fixes from StyleCI

* styleci

* cleanup crmjsom for kiosks namespace

* cleanup kiosk manager assignments

* stopping for hte night

* kiosk manager works now.

* switching kiosk roles works now.

* Merge pull request #2541 from Adnan0703/highlight-selected-datatable-row

Highlight selected dataTable rows

* 2.8.0 text

* download 2.8.0 from poeditor pre 2.8.0 RC0

* fix SQL errors, and get sql version on bug report

* underp system service

* Apply fixes from StyleCI

* Bug/kiosk loop (#2597)

* tweaks

* kiosk tweaks

* Apply fixes from StyleCI

* merging all 2.8.0 sql

fixes  #2590

* added php 7.1 and 5.6

part of #2348

* only deploy for php 7

* no 5.6 for now

* Explicitly test on Linux

* underp space

* underp space

* temp fix create family

* Don't show error if the jqXHR was aborted. (#2610)

* initial refactor

* Better Filter Methods

* line endings

* Apply fixes from StyleCI

* StyleCI manual patch apply

* add tests

* Standardize on display of FamilyString to disambiguate famililes (#2564)

* sort of works, but it's ugly.  don't merge yet.

* should work, but doesnt.

* fix depositslipeditor

* fixing family search in pledges

* fix search

* cleanup

* fixed bHideFriendDate not taken effect (#2614)

* use SystemConfig::getValue

* using getBooleanValue

* 2.8.0 rc2 locale (#2619)

* chmod +x on scripts

* gen file before RC2

* pre-2.8.0 RC2 download

* closes #2472 (#2620)

* added missing use SystemConfig;

* Apply fixes from StyleCI (#2633)

* closes #2634

* fix group datatables

* fix multi select issue

* email debug

* Apply fixes from StyleCI (#2646)

* move docs to wiki (#2641)

* password types were getting the value of the last setting (#2644)

* fix openlp notifications and event loop performance

* remove debug

* Build/2.8.1 starting (#2658)

* move docs to wiki

* add missing 2.8.1

* fixed type setting (#2649)

fixed type setting, will always set even if it is unknown... and fixed verifyFamily type name

* checking for null (#2653)

* Update composer.json (#2631)

upgrading to the latest version which supports php 5.6 please do note that 4.x of the willdurand/geocoder lib does not support 5.6

* starting 2.8.2

* fixed db upgrades

* Fixed RootPath . /

* added admin user check

* Apply fixes from StyleCI

* uncomment family lat/long update

* after 2.8.1

* updated locale file

* updated from po-editor 2.8.0

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 2.8.1 (02/07/2017)
+
+#### Core Functionality
+
+- [**Feature: Groups**][**UI**] Need to double-select rows to highlight [#2621](https://github.com/ChurchCRM/CRM/issues/2621)
+
+#### Inner Beauty:
+
+- [**Backend System**][**Documentation**][**question**] Task Configure HTTPS [#1314](https://github.com/ChurchCRM/CRM/issues/1314)
+- [**development**][**Documentation**] Vagrant Documentation [#1042](https://github.com/ChurchCRM/CRM/issues/1042)
+
+---
+
 ## 2.8.0 (01/07/2017)
 
 #### Enhancements:
@@ -906,28 +919,6 @@
 
 #### Enhancements:
 
-- [**enhancement**] SundaySchool: Create requires lots of clicks  [#470](https://github.com/ChurchCRM/CRM/issues/470)
-- [**enhancement**] General Settings: Miles Option [#207](https://github.com/ChurchCRM/CRM/issues/207)
-
-#### Bug fixes:
-
-- [**bug**] $sPageTitle should be set with gettext [#1100](https://github.com/ChurchCRM/CRM/issues/1100)
-- [**bug**] Person View: Can't remove from group via icon [#1098](https://github.com/ChurchCRM/CRM/issues/1098)
-- [**bug**] FindDepostSlip.php file [#1086](https://github.com/ChurchCRM/CRM/issues/1086)
-- [**bug**] Email Dashboard [Theme] [#1075](https://github.com/ChurchCRM/CRM/issues/1075)
-- [**bug**] WebDAV failures prevent page load [#920](https://github.com/ChurchCRM/CRM/issues/920)
-
-#### Inner Beauty:
-
-- [**development**] What is Canvas05Editor.php [#1102](https://github.com/ChurchCRM/CRM/issues/1102)
-- [**development**] Use ORM In favor of Service Classes [#963](https://github.com/ChurchCRM/CRM/issues/963)
-
----
-
-## 2.2.2 (02/10/2016)
-
-#### Enhancements:
-
 - [**enhancement**] Capture resolution in bug reports [#891](https://github.com/ChurchCRM/CRM/issues/891)
 - [**enhancement**][**Web Report**] Moving up/ transferring students in classes [#856](https://github.com/ChurchCRM/CRM/issues/856)
 - [**enhancement**] Email from Member Dashboard [#848](https://github.com/ChurchCRM/CRM/issues/848)
@@ -953,6 +944,7 @@
 - [**enhancement**] Sunday School: Queries [#479](https://github.com/ChurchCRM/CRM/issues/479)
 - [**enhancement**] Move SundaySchool Reports [#478](https://github.com/ChurchCRM/CRM/issues/478)
 - [**enhancement**] Notes: Covert Notes to Timeline  [#477](https://github.com/ChurchCRM/CRM/issues/477)
+- [**enhancement**] SundaySchool: Create requires lots of clicks  [#470](https://github.com/ChurchCRM/CRM/issues/470)
 - [**bug**][**enhancement**] SundaySchool: Default Roles is Member [#469](https://github.com/ChurchCRM/CRM/issues/469)
 - [**enhancement**] Calendar: Change Member Birthdays to API [#466](https://github.com/ChurchCRM/CRM/issues/466)
 - [**enhancement**] Mailchimp's Generate Email Export should export a person's groups [#457](https://github.com/ChurchCRM/CRM/issues/457)
@@ -982,6 +974,7 @@
 - [**enhancement**] Search by Check Number [#241](https://github.com/ChurchCRM/CRM/issues/241)
 - [**build**][**enhancement**] Switch PDF creation to html2pdf  [#220](https://github.com/ChurchCRM/CRM/issues/220)
 - [**enhancement**] General Settings: Time Zone Dropdown [#208](https://github.com/ChurchCRM/CRM/issues/208)
+- [**enhancement**] General Settings: Miles Option [#207](https://github.com/ChurchCRM/CRM/issues/207)
 - [**bug**][**development**][**enhancement**] Tool Tip Text [#203](https://github.com/ChurchCRM/CRM/issues/203)
 - [**enhancement**] Theme: Fund Raiser [#187](https://github.com/ChurchCRM/CRM/issues/187)
 - [**enhancement**] Main Dashboard is too member focused [#178](https://github.com/ChurchCRM/CRM/issues/178)
@@ -1014,6 +1007,10 @@
 
 #### Bug fixes:
 
+- [**bug**] $sPageTitle should be set with gettext [#1100](https://github.com/ChurchCRM/CRM/issues/1100)
+- [**bug**] Person View: Can't remove from group via icon [#1098](https://github.com/ChurchCRM/CRM/issues/1098)
+- [**bug**] FindDepostSlip.php file [#1086](https://github.com/ChurchCRM/CRM/issues/1086)
+- [**bug**] Email Dashboard [Theme] [#1075](https://github.com/ChurchCRM/CRM/issues/1075)
 - [**bug**] Error during email export [#1072](https://github.com/ChurchCRM/CRM/issues/1072)
 - [**bug**] Backup Database: tar.gz (Include Photos)  [#1067](https://github.com/ChurchCRM/CRM/issues/1067)
 - [**bug**] Permissions: User needs Note access to add Note [#1061](https://github.com/ChurchCRM/CRM/issues/1061)
@@ -1041,6 +1038,7 @@
 - [**bug**][**Web Report**] System settings Input fields are larger than page on mobile [#925](https://github.com/ChurchCRM/CRM/issues/925)
 - [**bug**] Fix Case Sensitive Path in LoadConfigs [#923](https://github.com/ChurchCRM/CRM/issues/923)
 - [**bug**] remove all mysql_ [#922](https://github.com/ChurchCRM/CRM/issues/922)
+- [**bug**] WebDAV failures prevent page load [#920](https://github.com/ChurchCRM/CRM/issues/920)
 - [**bug**] sEnableExternalBackupTarget during database restore [#889](https://github.com/ChurchCRM/CRM/issues/889)
 - [**bug**][**build**][**Installation / Upgrade**][**Platform: Self-Hosted**][**Platform: Shared Hosting**][**question**] File extraction with incorrect 666 permissions [#882](https://github.com/ChurchCRM/CRM/issues/882)
 - [**bug**] Default pictures no longer correct [#873](https://github.com/ChurchCRM/CRM/issues/873)
@@ -1224,6 +1222,8 @@
 
 #### Inner Beauty:
 
+- [**development**] What is Canvas05Editor.php [#1102](https://github.com/ChurchCRM/CRM/issues/1102)
+- [**development**] Use ORM In favor of Service Classes [#963](https://github.com/ChurchCRM/CRM/issues/963)
 - [**bug**][**build**][**Installation / Upgrade**][**Platform: Self-Hosted**][**Platform: Shared Hosting**][**question**] File extraction with incorrect 666 permissions [#882](https://github.com/ChurchCRM/CRM/issues/882)
 - [**build**][**development**][**enhancement**] Add Service Classes to composer Auto Loader  [#824](https://github.com/ChurchCRM/CRM/issues/824)
 - [**bug**][**build**][**question**] vendor directory missing in 2.1.6 tar file [#800](https://github.com/ChurchCRM/CRM/issues/800)

locale/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-21 03:56+0000\n"
+"POT-Creation-Date: 2017-07-02 21:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: AutoPaymentDelete.php:68 AutoPaymentEditor.php:582 BatchWinnerEntry.php:116
+#: AutoPaymentDelete.php:68 AutoPaymentEditor.php:583 BatchWinnerEntry.php:116
 #: CanvassEditor.php:243 Checkin.php:172 Checkin.php:281 Checkin.php:294
 #: DirectoryReports.php:290 DonatedItemEditor.php:300 EventNames.php:234
-#: external/templates/verify/verify-family-info.php:136 FamilyEditor.php:1125
+#: external/templates/verify/verify-family-info.php:139 FamilyEditor.php:1125
 #: FamilyView.php:891 FinancialReports.php:72 FundRaiserEditor.php:147
 #: GroupPropsEditor.php:172 GroupReports.php:87 GroupReports.php:156
 #: LettersAndLabels.php:77 ManageEnvelopes.php:139 MemberRoleChange.php:123
@@ -125,11 +125,11 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: AutoPaymentEditor.php:130
+#: AutoPaymentEditor.php:131
 msgid "Automatic payment configuration for the "
 msgstr ""
 
-#: AutoPaymentEditor.php:581 CanvassEditor.php:242 DepositSlipEditor.php:98
+#: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98
 #: DonatedItemEditor.php:296 FamilyEditor.php:653 FamilyEditor.php:737
 #: FamilyEditor.php:801 FamilyEditor.php:875 FamilyEditor.php:897
 #: FamilyEditor.php:928 FamilyEditor.php:1121 FundRaiserEditor.php:146
@@ -142,7 +142,7 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: AutoPaymentEditor.php:595
+#: AutoPaymentEditor.php:596
 #: ChurchCRM/Emails/verify/FamilyVerificationEmail.php:24
 #: ElectronicPaymentList.php:198
 #: external/templates/registration/family-register-done.php:28
@@ -154,7 +154,7 @@ msgstr ""
 msgid "Family"
 msgstr ""
 
-#: AutoPaymentEditor.php:598 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99
+#: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99
 #: CSVImport.php:275 DonatedItemEditor.php:189 DonatedItemEditor.php:240
 #: eGive.php:341 FamilyEditor.php:1095 GroupEditor.php:91
 #: Include/CountryDropDown.php:6 Include/Functions.php:1074
@@ -166,62 +166,62 @@ msgstr ""
 msgid "Unassigned"
 msgstr ""
 
-#: AutoPaymentEditor.php:618
+#: AutoPaymentEditor.php:619
 msgid "Automatic payment type"
 msgstr ""
 
-#: AutoPaymentEditor.php:631 CanvassEditor.php:198 DepositSlipEditor.php:82
+#: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82
 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241
 #: FundRaiserEditor.php:168 Include/Functions.php:101 PledgeEditor.php:521
 #: SelectDelete.php:217
 msgid "Date"
 msgstr ""
 
-#: AutoPaymentEditor.php:636 ElectronicPaymentList.php:200 FamilyView.php:747
+#: AutoPaymentEditor.php:637 ElectronicPaymentList.php:200 FamilyView.php:747
 #: PledgeEditor.php:523 ReminderReport.php:46 SelectDelete.php:216
 #: sundayschool/SundaySchoolReports.php:161 queryparameters_qrp.php:18
 msgid "Fiscal Year"
 msgstr ""
 
-#: AutoPaymentEditor.php:643
+#: AutoPaymentEditor.php:644
 msgid "Payment amount"
 msgstr ""
 
-#: AutoPaymentEditor.php:648
+#: AutoPaymentEditor.php:649
 msgid "Payment interval (months)"
 msgstr ""
 
-#: AutoPaymentEditor.php:653 ElectronicPaymentList.php:204 FamilyView.php:643
+#: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643
 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215
 msgid "Fund"
 msgstr ""
 
-#: AutoPaymentEditor.php:656 CartToGroup.php:80 EditEventTypes.php:91
+#: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91
 #: EditEventTypes.php:103 EventNames.php:109 EventNames.php:121
 #: EventNames.php:166 GroupReports.php:52 GroupReports.php:147
 #: PersonToGroup.php:70 sundayschool/SundaySchoolReports.php:147
 msgid "None"
 msgstr ""
 
-#: AutoPaymentEditor.php:669
+#: AutoPaymentEditor.php:670
 msgid "inactive"
 msgstr ""
 
-#: AutoPaymentEditor.php:679 CSVExport.php:90 CSVImport.php:215
+#: AutoPaymentEditor.php:680 CSVExport.php:90 CSVImport.php:215
 #: external/templates/registration/family-register-members.php:69
 #: external/templates/verify/enter-info.php:21 PersonEditor.php:608
 #: sundayschool/SundaySchoolDashboard.php:181
 msgid "First Name"
 msgstr ""
 
-#: AutoPaymentEditor.php:684 CSVExport.php:79 CSVImport.php:217
+#: AutoPaymentEditor.php:685 CSVExport.php:79 CSVImport.php:217
 #: external/templates/registration/family-register-members.php:73
 #: external/templates/verify/enter-info.php:25 ManageEnvelopes.php:166
 #: PersonEditor.php:630 sundayschool/SundaySchoolDashboard.php:182
 msgid "Last Name"
 msgstr ""
 
-#: AutoPaymentEditor.php:689 AutoPaymentEditor.php:694 CartToFamily.php:239
+#: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239
 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110
 #: CSVImport.php:221 CSVImport.php:222 DirectoryReports.php:176
 #: DirectoryReports.php:250
@@ -234,42 +234,42 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: AutoPaymentEditor.php:699 CartToFamily.php:249 CSVExport.php:115
+#: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115
 #: CSVImport.php:223 DirectoryReports.php:254
 #: external/templates/registration/family-register.php:41 FamilyEditor.php:678
 #: PersonEditor.php:825 Register.php:48 queryparameteroptions_qpo.php:7
 msgid "City"
 msgstr ""
 
-#: AutoPaymentEditor.php:704 CartToFamily.php:254 CSVExport.php:120
+#: AutoPaymentEditor.php:705 CartToFamily.php:254 CSVExport.php:120
 #: CSVImport.php:224 DirectoryReports.php:258
 #: external/templates/registration/family-register.php:44 FamilyEditor.php:685
 #: PersonEditor.php:845 Register.php:49 queryparameteroptions_qpo.php:6
 msgid "State"
 msgstr ""
 
-#: AutoPaymentEditor.php:709 BackupDatabase.php:67 CartToFamily.php:266
+#: AutoPaymentEditor.php:710 BackupDatabase.php:67 CartToFamily.php:266
 #: CSVExport.php:125 CSVImport.php:225 DirectoryReports.php:262
 #: external/templates/registration/family-register.php:51
 #: external/templates/verify/enter-info.php:29 FamilyEditor.php:695
 #: PersonEditor.php:868 Register.php:50
 msgid "Zip"
 msgstr ""
 
-#: AutoPaymentEditor.php:714 CartToFamily.php:274 CSVExport.php:135
+#: AutoPaymentEditor.php:715 CartToFamily.php:274 CSVExport.php:135
 #: CSVImport.php:226 FamilyEditor.php:705 PersonEditor.php:890 Register.php:51
 msgid "Country"
 msgstr ""
 
-#: AutoPaymentEditor.php:719 ChurchCRM/Reports/PDF_Directory.php:312
+#: AutoPaymentEditor.php:720 ChurchCRM/Reports/PDF_Directory.php:312
 #: ChurchCRM/Reports/PDF_Directory.php:386
 #: ChurchCRM/Reports/PDF_Directory.php:443 DirectoryReports.php:266
 #: external/templates/registration/family-register-members.php:103
 #: Reports/DirectoryReport.php:288 Reports/GroupReport.php:124
 msgid "Phone"
 msgstr ""
 
-#: AutoPaymentEditor.php:724 CartToFamily.php:315 CartView.php:288
+#: AutoPaymentEditor.php:725 CartToFamily.php:315 CartView.php:288
 #: ChurchCRM/Reports/PDF_Directory.php:321
 #: ChurchCRM/Reports/PDF_Directory.php:397
 #: ChurchCRM/Reports/PDF_Directory.php:454 CSVExport.php:155 CSVImport.php:230
@@ -288,36 +288,36 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: AutoPaymentEditor.php:729 ElectronicPaymentList.php:213
+#: AutoPaymentEditor.php:730 ElectronicPaymentList.php:213
 #: FinancialReports.php:267 FindDepositSlip.php:52 PledgeEditor.php:592
 msgid "Credit Card"
 msgstr ""
 
-#: AutoPaymentEditor.php:736
+#: AutoPaymentEditor.php:737
 msgid "Vanco Credit Card Method"
 msgstr ""
 
-#: AutoPaymentEditor.php:744
+#: AutoPaymentEditor.php:745
 msgid "Expiration Month"
 msgstr ""
 
-#: AutoPaymentEditor.php:749
+#: AutoPaymentEditor.php:750
 msgid "Expiration Year"
 msgstr ""
 
-#: AutoPaymentEditor.php:754
+#: AutoPaymentEditor.php:755
 msgid "Bank Name"
 msgstr ""
 
-#: AutoPaymentEditor.php:759
+#: AutoPaymentEditor.php:760
 msgid "Bank Route Number"
 msgstr ""
 
-#: AutoPaymentEditor.php:764
+#: AutoPaymentEditor.php:765
 msgid "Bank Account Number"
 msgstr ""
 
-#: AutoPaymentEditor.php:771
+#: AutoPaymentEditor.php:772
 msgid "Vanco Bank Account Method"
 msgstr ""
 
@@ -3285,7 +3285,7 @@ msgid "Family Verification"
 msgstr ""
 
 #: external/templates/verify/verify-family-info.php:13
-#: external/templates/verify/verify-family-info.php:119
+#: external/templates/verify/verify-family-info.php:122
 #: ManageEnvelopes.php:138
 msgid "Confirm"
 msgstr ""
@@ -3314,23 +3314,23 @@ msgstr ""
 msgid "Age Hidden"
 msgstr ""
 
-#: external/templates/verify/verify-family-info.php:123
+#: external/templates/verify/verify-family-info.php:126
 msgid "Please let us know what information to update if any"
 msgstr ""
 
-#: external/templates/verify/verify-family-info.php:128
+#: external/templates/verify/verify-family-info.php:131
 msgid "Your verification request is complete"
 msgstr ""
 
-#: external/templates/verify/verify-family-info.php:132
+#: external/templates/verify/verify-family-info.php:135
 msgid "We encountered an error submitting with your verification data"
 msgstr ""
 
-#: external/templates/verify/verify-family-info.php:137
+#: external/templates/verify/verify-family-info.php:140
 msgid "Verify"
 msgstr ""
 
-#: external/templates/verify/verify-family-info.php:138
+#: external/templates/verify/verify-family-info.php:141
 msgid "Visit our Site"
 msgstr ""
 

src/ChurchCRM/dto/OpenLPNotification.php

@@ -36,7 +36,8 @@ public function send()
       ),
       "ssl" => array(
           "verify_peer" => false,
-          "allow_self_signed" => false,
+          "verify_peer_name" => false,
+          "allow_self_signed" => true,
       )
     );
     if(SystemConfig::getValue("sOLPUserName"))

src/ChurchCRM/model/ChurchCRM/Family.php

@@ -337,7 +337,7 @@ public function toSearchArray()
       $searchArray=[
           "Id" => $this->getId(),
           "displayName" => $this->getFamilyString(),
-          "uri" => SystemURLs::getRootPath() . 'FamilyView.php?FamilyID=' . $this->getId()
+          "uri" => SystemURLs::getRootPath() . '/FamilyView.php?FamilyID=' . $this->getId()
       ];
       return $searchArray;
     }

src/ChurchCRM/model/ChurchCRM/Token.php

@@ -22,17 +22,16 @@ public function build($type, $referenceId)
         $this->setReferenceId($referenceId);
         $this->setToken(uniqid());
         switch ($type) {
-            case "verify":
+            case "verifyFamily":
                 $this->setValidUntilDate(strtotime("+1 week"));
                 $this->setRemainingUses(5);
-                $this->setType($type);
                 break;
             case "password":
                 $this->setValidUntilDate(strtotime("+1 day"));
                 $this->setRemainingUses(1);
-                $this->setType($type);
                 break;
         }
+        $this->setType($type);
     }