v1.6.00

SKuipers · Feb 1, 2022 · f003a1c · f003a1c
1 parent f6cc526
commit f003a1c
Show file tree

Hide file tree

Showing 24 changed files with 59 additions and 2,228 deletions.
diff --git a/Data Admin/CHANGEDB.php b/Data Admin/CHANGEDB.php
@@ -131,3 +131,8 @@
 $sql[$count][0]="1.5.01" ;
 $sql[$count][1]="";
 
+//v1.6.00
+$count++;
+$sql[$count][0]="1.6.00" ;
+$sql[$count][1]="";
+
diff --git a/Data Admin/CHANGELOG.md b/Data Admin/CHANGELOG.md
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+## [1.6.00] 2022-02-01
+### Fixed
+- Fixed deprecated functions for v23 compatibility. Not backwards compatible.
+
 ## [1.5.01] 2021-09-30
 ### Fixed
 - Removed PHPExcel class, fixed Combine Similar Fields layout

diff --git a/Data Admin/export_run.php b/Data Admin/export_run.php
@@ -18,6 +18,7 @@
 */
 
 use Gibbon\Data\ImportType;
+use Gibbon\Domain\System\SettingGateway;
 
 // Increase max execution time, as this stuff gets big
 ini_set('max_execution_time', 7200);
@@ -45,7 +46,7 @@
     $type = (isset($_GET['type']))? $_GET['type'] : '';
     $importType = ImportType::loadImportType($type, $pdo);
 
-    $checkUserPermissions = getSettingByScope($connection2, 'Data Admin', 'enableUserLevelPermissions');
+    $checkUserPermissions = $container->get(SettingGateway::class)->getSettingByScope('Data Admin', 'enableUserLevelPermissions');
 
     if ($checkUserPermissions == 'Y' && $importType->isImportAccessible($guid, $connection2) == false) {
         echo "<div class='error'>" ;
@@ -236,7 +237,7 @@
 
     $filename = ($dataExport) ? 'DataExport'.'-'.$type : 'DataStructure'.'-'.$type;
 
-    $exportFileType = getSettingByScope($connection2, 'Data Admin', 'exportDefaultFileType');
+    $exportFileType = $container->get(SettingGateway::class)->getSettingByScope('Data Admin', 'exportDefaultFileType');
     if (empty($exportFileType)) {
         $exportFileType = 'Excel2007';
     }

diff --git a/Data Admin/imports/usersBasic.yml b/Data Admin/imports/usersBasic.yml
@@ -60,7 +60,7 @@ table:
         name: "Username"
         desc: "User account name & login"
         args: {filter: nospaces, required: true}
-    password:
+    passwordStrong:
         name: "Password"
         desc: "At least one lowercase and one number, from 8 to 20 chars"
         args: {filter: nospaces, required: true, custom: true, function: generatePassword}

diff --git a/Data Admin/imports/usersFull.yml b/Data Admin/imports/usersFull.yml
@@ -51,7 +51,7 @@ table:
         name: "Username"
         desc: "User account name & login"
         args: {filter: nospaces, required: true}
-    password:
+    passwordStrong:
         name: "Password"
         desc: "At least one lowercase and one number, from 8 to 20 chars"
         args: {filter: nospaces, required: true, custom: true, function: generatePassword}

diff --git a/Data Admin/imports/usersParents.yml b/Data Admin/imports/usersParents.yml
@@ -49,7 +49,7 @@ table:
         name: "Username"
         desc: "User account name & login"
         args: {filter: nospaces, required: true}
-    password:
+    passwordStrong:
         name: "Password"
         desc: "At least one lowercase and one number, from 8 to 20 chars"
         args: {filter: nospaces, required: true, custom: true, function: generatePassword}

diff --git a/Data Admin/imports/usersPasswords.yml b/Data Admin/imports/usersPasswords.yml
@@ -17,7 +17,7 @@ table:
         name: "Username"
         desc: "User account name & login"
         args: {filter: nospaces, required: true}
-    password:
+    passwordStrong:
         name: "Password"
         desc: "At least one lowercase and one number, from 8 to 20 chars"
         args: {filter: nospaces, required: true, custom: true, function: generatePassword}

diff --git a/Data Admin/imports/usersStaff.yml b/Data Admin/imports/usersStaff.yml
@@ -49,7 +49,7 @@ table:
         name: "Username"
         desc: "User account name & login"
         args: {filter: nospaces, required: true}
-    password:
+    passwordStrong:
         name: "Password"
         desc: "At least one lowercase and one number, from 8 to 20 chars"
         args: {filter: nospaces, required: true, custom: true, function: generatePassword}

diff --git a/Data Admin/manifest.php b/Data Admin/manifest.php
@@ -25,7 +25,7 @@
 $entryURL="import_manage.php" ; //The landing page for the unit, used in the main menu
 $type="Additional" ; //Do not change.
 $category="Admin" ; //The main menu area to place the module in
-$version="1.5.01" ; //Version number
+$version="1.6.00" ; //Version number
 $author="Sandra Kuipers" ; //Your name
 $url="https://github.com/SKuipers/" ; //Your URL
 

diff --git a/Data Admin/records_duplicates.php b/Data Admin/records_duplicates.php
@@ -19,6 +19,7 @@
 
 use Gibbon\Data\ImportType;
 use Gibbon\Module\DataAdmin\DatabaseTools;
+use Gibbon\Domain\System\SettingGateway;
 
 // Module Bootstrap
 require __DIR__ . '/module.php';
@@ -88,7 +89,7 @@
         echo "</th>" ;
         echo "</tr>" ;
 
-        $checkUserPermissions = getSettingByScope($connection2, 'Data Admin', 'enableUserLevelPermissions');
+        $checkUserPermissions = $container->get(SettingGateway::class)->getSettingByScope('Data Admin', 'enableUserLevelPermissions');
         $isImportAccessible = ($checkUserPermissions == 'Y' && $importType->isImportAccessible($guid, $connection2) != false);
 
         foreach ($duplicateRecords as $row) {

diff --git a/Data Admin/records_manage.php b/Data Admin/records_manage.php
@@ -19,6 +19,7 @@
 
 use Gibbon\Data\ImportType;
 use Gibbon\Module\DataAdmin\DatabaseTools;
+use Gibbon\Domain\System\SettingGateway;
 
 // Module Bootstrap
 require __DIR__ . '/module.php';
@@ -36,10 +37,11 @@
     echo __('The following Gibbon tables can be exported to Excel. The full table export is still a beta feature, at this time it should not be relied upon as a backup method. <strong>Note:</strong> This list does not represent the entire Gibbon database, only tables with an existing import/export structure.', 'Data Admin');
     echo "</div>" ;
 
-    $databaseTools = new DatabaseTools($gibbon->session, $pdo);
+    $databaseTools = new DatabaseTools($session, $pdo);
 
     // Get a list of available import options
-    $importTypeList = ImportType::loadImportTypeList($pdo, false);
+    $settingGateway = $container->get(SettingGateway::class);
+    $importTypeList = ImportType::loadImportTypeList($settingGateway, $pdo, false);
 
 
     // Get the unique tables used
@@ -57,7 +59,7 @@
         echo __("There are no records to display.") ;
         echo "</div>" ;
     } else {
-        $checkUserPermissions = getSettingByScope($connection2, 'Data Admin', 'enableUserLevelPermissions');
+        $checkUserPermissions = $settingGateway->getSettingByScope('Data Admin', 'enableUserLevelPermissions');
 
         $grouping = '';
         foreach ($importTables as $importType) {

diff --git a/Data Admin/records_orphaned.php b/Data Admin/records_orphaned.php
@@ -19,6 +19,7 @@
 
 use Gibbon\Data\ImportType;
 use Gibbon\Module\DataAdmin\DatabaseTools;
+use Gibbon\Domain\System\SettingGateway;
 
 // Module Bootstrap
 require __DIR__ . '/module.php';
@@ -84,7 +85,7 @@
         echo "</th>" ;
         echo "</tr>" ;
 
-        $checkUserPermissions = getSettingByScope($connection2, 'Data Admin', 'enableUserLevelPermissions');
+        $checkUserPermissions = $container->get(SettingGateway::class)->getSettingByScope('Data Admin', 'enableUserLevelPermissions');
         $isImportAccessible = ($checkUserPermissions == 'Y' && $importType->isImportAccessible($guid, $connection2) != false);
 
         foreach ($orphanedRecords as $row) {

diff --git a/Data Admin/settings.php b/Data Admin/settings.php
@@ -18,6 +18,7 @@
 */
 
 use Gibbon\Forms\Form;
+use Gibbon\Domain\System\SettingGateway;
 
 // Module Bootstrap
 require __DIR__ . '/module.php';
@@ -37,6 +38,8 @@
     $trueIcon = "<img title='" . __('Yes'). "' src='./themes/" . $session->get('gibbonThemeName') . "/img/iconTick.png' width=16 height=16 />";
     $falseIcon = "<img title='" . __('No'). "' src='./themes/" . $session->get('gibbonThemeName') . "/img/iconCross.png' width=16 height=16 />";
 
+    $settingGateway = $container->get(SettingGateway::class);
+
     // Include the module version info, with required versions
     include $session->get('absolutePath').'/modules/'.$session->get('module').'/version.php'; ?>
 
@@ -121,7 +124,7 @@
 			</td>
 			<td class="right">
 				<?php
-					$importsFolder = getSettingByScope($connection2, 'Data Admin', 'importCustomFolderLocation');
+					$importsFolder = $settingGateway->getSettingByScope('Data Admin', 'importCustomFolderLocation');
 					$importsFolderPath = $session->get('absolutePath').'/uploads/'.trim($importsFolder, '/ ');
 
     echo (is_writable($importsFolderPath))? $trueIcon : $falseIcon; ?>
@@ -134,7 +137,7 @@
 			</td>
 			<td class="right">
 				<?php
-					$snapshotFolder = getSettingByScope($connection2, 'Data Admin', 'exportSnapshotsFolderLocation');
+					$snapshotFolder = $settingGateway->getSettingByScope('Data Admin', 'exportSnapshotsFolderLocation');
 					$snapshotFolderPath = $session->get('absolutePath').'/uploads/'.trim($snapshotFolder, '/ ');
 
     echo (is_writable($snapshotFolderPath))? $trueIcon : $falseIcon; ?>
@@ -154,12 +157,12 @@
         'OpenDocument' => __('OpenDocument (.ods)', 'Data Admin'),
         'CSV'          => __('Comma Separated (.csv)', 'Data Admin'),
     );
-    $setting = getSettingByScope($connection2, 'Data Admin', 'exportDefaultFileType', true);
+    $setting = $settingGateway->getSettingByScope('Data Admin', 'exportDefaultFileType', true);
     $row = $form->addRow();
     $row->addLabel($setting['name'], __($setting['nameDisplay']))->description($setting['description']);
     $row->addSelect($setting['name'])->fromArray($fileTypes)->selected($setting['value']);
 
-    $setting = getSettingByScope($connection2, 'Data Admin', 'exportSnapshotsFolderLocation', true);
+    $setting = $settingGateway->getSettingByScope('Data Admin', 'exportSnapshotsFolderLocation', true);
     $row = $form->addRow();
     $row->addLabel($setting['name'], __($setting['nameDisplay']))->description($setting['description']);
     $row->addTextField($setting['name'])->required()->setValue($setting['value']);

diff --git a/Data Admin/snapshot_manage.php b/Data Admin/snapshot_manage.php
@@ -17,6 +17,8 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+use Gibbon\Domain\System\SettingGateway;
+
 // Module Bootstrap
 require __DIR__ . '/module.php';
 
@@ -47,7 +49,7 @@
     }
 
 
-    $snapshotFolder = getSettingByScope($connection2, 'Data Admin', 'exportSnapshotsFolderLocation');
+    $snapshotFolder = $container->get(SettingGateway::class)->getSettingByScope('Data Admin', 'exportSnapshotsFolderLocation');
     $snapshotFolder = '/'.trim($snapshotFolder, '/ ');
 
     $snapshotFolderPath = $session->get('absolutePath').'/uploads'.$snapshotFolder;

diff --git a/Data Admin/snapshot_manage_addProcess.php b/Data Admin/snapshot_manage_addProcess.php
@@ -17,6 +17,8 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+use Gibbon\Domain\System\SettingGateway;
+
 // Gibbon Bootstrap
 include __DIR__ . '/../../gibbon.php';
 
@@ -34,7 +36,7 @@
     //Proceed!
     //Check if file exists
 
-    $snapshotFolder = getSettingByScope($connection2, 'Data Admin', 'exportSnapshotsFolderLocation');
+    $snapshotFolder = $container->get(SettingGateway::class)->getSettingByScope('Data Admin', 'exportSnapshotsFolderLocation');
     $snapshotFolder = '/'.trim($snapshotFolder, '/ ');
 
     $snapshotFolderPath = $session->get('absolutePath').'/uploads'.$snapshotFolder;

diff --git a/Data Admin/snapshot_manage_delete.php b/Data Admin/snapshot_manage_delete.php
@@ -18,6 +18,7 @@
 */
 
 use Gibbon\Forms\Prefab\DeleteForm;
+use Gibbon\Domain\System\SettingGateway;
 
 // Module Bootstrap
 require __DIR__ . '/module.php';
@@ -41,7 +42,7 @@
         echo __("You have not specified one or more required parameters.") ;
         echo "</div>" ;
     } else {
-        $snapshotFolder = getSettingByScope($connection2, 'Data Admin', 'exportSnapshotsFolderLocation');
+        $snapshotFolder = $container->get(SettingGateway::class)->getSettingByScope('Data Admin', 'exportSnapshotsFolderLocation');
         $snapshotFolder = '/'.trim($snapshotFolder, '/ ');
 
         $snapshotFolderPath = $session->get('absolutePath').'/uploads'.$snapshotFolder;

diff --git a/Data Admin/snapshot_manage_deleteProcess.php b/Data Admin/snapshot_manage_deleteProcess.php
@@ -17,6 +17,8 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+use Gibbon\Domain\System\SettingGateway;
+
 // Gibbon Bootstrap
 include __DIR__ . '/../../gibbon.php';
 
@@ -34,7 +36,7 @@
 } else {
     //Proceed!
     //Check if file exists
-    $snapshotFolder = getSettingByScope($connection2, 'Data Admin', 'exportSnapshotsFolderLocation');
+    $snapshotFolder = $container->get(SettingGateway::class)->getSettingByScope('Data Admin', 'exportSnapshotsFolderLocation');
     $snapshotFolder = '/'.trim($snapshotFolder, '/ ');
 
     $snapshotFolderPath = $session->get('absolutePath').'/uploads'.$snapshotFolder;

diff --git a/Data Admin/snapshot_manage_load.php b/Data Admin/snapshot_manage_load.php
@@ -18,6 +18,7 @@
  */
 
 use Gibbon\Forms\Form;
+use Gibbon\Domain\System\SettingGateway;
 
 // Module Bootstrap
 require __DIR__ . '/module.php';
@@ -51,7 +52,7 @@
         echo __("You have not specified one or more required parameters.");
         echo "</div>";
     } else {
-        $snapshotFolder = getSettingByScope($connection2, 'Data Admin', 'exportSnapshotsFolderLocation');
+        $snapshotFolder = $container->get(SettingGateway::class)->getSettingByScope('Data Admin', 'exportSnapshotsFolderLocation');
         $snapshotFolder = '/' . trim($snapshotFolder, '/ ');
 
         $snapshotFolderPath = $session->get('absolutePath') . '/uploads' . $snapshotFolder;

diff --git a/Data Admin/snapshot_manage_loadProcess.php b/Data Admin/snapshot_manage_loadProcess.php
@@ -17,6 +17,8 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+use Gibbon\Domain\System\SettingGateway;
+
 // Gibbon Bootstrap
 include __DIR__ . '/../../gibbon.php';
 
@@ -35,7 +37,7 @@
 } else {
     //Proceed!
     //Check if file exists
-    $snapshotFolder = getSettingByScope($connection2, 'Data Admin', 'exportSnapshotsFolderLocation');
+    $snapshotFolder = $container->get(SettingGateway::class)->getSettingByScope('Data Admin', 'exportSnapshotsFolderLocation');
     $snapshotFolder = '/'.trim($snapshotFolder, '/ ');
 
     $snapshotFolderPath = $session->get('absolutePath').'/uploads'.$snapshotFolder;

diff --git a/Data Admin/src/DatabaseTools.php b/Data Admin/src/DatabaseTools.php
@@ -21,6 +21,7 @@
 
 use Gibbon\Contracts\Database\Connection;
 use Gibbon\Data\ImportType;
+use Gibbon\Contracts\Services\Session;
 
 /**
  * Database Tools class
@@ -50,7 +51,7 @@ class DatabaseTools
      * @param    Gibbon\session
      * @param    Gibbon\Contracts\Database\Connection
      */
-    public function __construct(\Gibbon\Session $session = NULL, Connection $pdo = NULL)
+    public function __construct(Session $session = NULL, Connection $pdo = NULL)
     {
         $this->session = $session;
         $this->pdo = $pdo;