@@ -30,6 +30,7 @@ use Doctrine\DBAL\Connection;

 use NotificationCenter\Model\Notification;

 use Psr\Log\LoggerInterface;

 use Psr\Log\LogLevel;

+use vonRotenberg\MemberfilesBundle\Model\MemberfilesConfigModel;

 class SecureDownloadsJob

 {

@@ -52,17 +53,17 @@ class SecureDownloadsJob

     public function sendFileNotifications(string $scope)

     {

         // Get archives with notifications enabled

-        $Root = PageModel::findBy(array("sd_nc_enable = ?","type = 'root'"),'1');

+        $Configurations = MemberfilesConfigModel::findBy(["hasNotifications = ?", "enabled = ?"], ['1','1']);

-        if ($Root !== null)

+        if ($Configurations !== null)

         {

-            while ($Root->next())

+            while ($Configurations->next())

             {

                 // Do we have new items

                 $Members = $this->db->executeQuery("SELECT s.pid FROM tl_member_secureDownloads s INNER JOIN tl_files f ON f.uuid = s.uuid WHERE s.nc_sent != '1' GROUP BY s.pid");

                 // Load groups and notification models if we have news to share

-                if ($Members->rowCount() && ($Notification = Notification::findByPk($Root->sd_nc_notification)) !== null)

+                if ($Members->rowCount() && ($Notification = Notification::findByPk($Configurations->sd_nc_notification)) !== null)

                 {

                     foreach ($Members->iterateAssociative() as $member)

                     {

@@ -108,72 +109,73 @@ class SecureDownloadsJob

      */

     public function importFiles(string $scope)

     {

-        $objRoots = PageModel::findPublishedRootPages();

+        $projectDir = System::getContainer()->getParameter('kernel.project_dir');

+        $Configurations = MemberfilesConfigModel::findAll();

         $intFileCount = 0;

         // No root pages available

-        if ($objRoots === null)

+        if ($Configurations === null)

         {

             return;

         }

         // Iterate page roots

-        while ($objRoots->next())

+        while ($Configurations->next())

         {

             if (System::getContainer()->getParameter('kernel.debug'))

             {

-                $this->logger->log(LogLevel::DEBUG, sprintf('Starting secure downloads import for %s', $objRoots->title), array('contao' => new ContaoContext(__METHOD__, 'CRON')));

+                $this->logger->log(LogLevel::DEBUG, sprintf('Starting secure downloads import for %s', $Configurations->title), array('contao' => new ContaoContext(__METHOD__, 'CRON')));

             }

             // Continue if secure downloads is disabled

-            if (!$objRoots->secureDownloadsEnabled)

+            if (!$Configurations->enabled)

             {

                 continue;

             }

             // Get folder models

-            $objFolder = FilesModel::findByUuid($objRoots->secureDownloadsSRC);

-            $objTarget = FilesModel::findByUuid($objRoots->secureDownloadsTarget);

+            $Source = FilesModel::findByUuid($Configurations->source);

+            $Target = FilesModel::findByUuid($Configurations->target);

             // Continue if folder doesn't exist

-            if ($objFolder === null || !file_exists(TL_ROOT . "/".$objFolder->path) || $objTarget === null || !file_exists(TL_ROOT . "/".$objTarget->path))

+            if ($Source === null || !file_exists($projectDir . "/".$Source->path) || $Target === null || !file_exists($projectDir . "/".$Target->path))

             {

-                $this->logger->log(LogLevel::WARNING, sprintf('Source or target folder is missing for page root %s. %s %s', $objRoots->title,$objFolder->path,$objTarget->path), array('contao' => new ContaoContext(__METHOD__, 'ERROR')));

+                $this->logger->log(LogLevel::WARNING, sprintf('Source or target folder is missing for page root %s. %s %s', $Configurations->title,$Source->path,$Target->path), array('contao' => new ContaoContext(__METHOD__, 'ERROR')));

                 continue;

             }

             // Read files inside folder

-            $objFiles = FilesModel::findByPid($objFolder->uuid);

+            $Files = FilesModel::findByPid($Source->uuid);

             // Continue if folder is empty

-            if ($objFiles === null)

+            if ($Files === null)

             {

                 continue;

             }

             // Escape single quotes in fragment regexp

-            $objRoots->secureDownloadsRegExp = addcslashes($objRoots->secureDownloadsRegExp,'\'');

+            $Configurations->regexp = addcslashes($Configurations->regexp,'\'');

             // Iterate files

-            while ($objFiles->next())

+            while ($Files->next())

             {

                 // Skip subfolders and special files

-                if ($objFiles->type == 'folder' || strpos($objFiles->name,'.') === 0)

+                if ($Files->type == 'folder' || strpos($Files->name,'.') === 0)

                 {

                     continue;

                 }

                 // Continue if file doesn't exist

-                if (!file_exists(TL_ROOT . "/".$objFiles->path))

+                if (!file_exists($projectDir . "/".$Files->path))

                 {

                     continue;

                 }

-                $objFile = new File($objFiles->path);

+                $objFile = new File($Files->path);

                 // Check for fragments

-                if (!preg_match('/'.$objRoots->secureDownloadsRegExp.'/U',$objFile->filename,$fragments))

+                if (!preg_match('/'.$Configurations->regexp.'/U',$objFile->filename,$fragments))

                 {

                     $this->logger->log(LogLevel::WARNING, sprintf('File "%s" is missing a member fragment or has the wrong syntax.', $objFile->name), array('contao' => new ContaoContext(__METHOD__, 'ERROR')));

                     continue;

@@ -182,7 +184,7 @@ class SecureDownloadsJob

                 // Find member

                 $arrColumns = array();

                 $arrValues = array();

-                foreach (StringUtil::deserialize($objRoots->secureDownloadsFields, true) as $i => $field)

+                foreach (StringUtil::deserialize($Configurations->fields, true) as $i => $field)

                 {

                     $arrColumns[] = "$field = ?";

                     $arrValues[] = $fragments[$i+1];

@@ -196,19 +198,19 @@ class SecureDownloadsJob

                 }

                 // Remove fragments from file name

-                $baseFilename = preg_replace('/'.$objRoots->secureDownloadsRegExp.'/U','',$objFile->filename);

+                $baseFilename = preg_replace('/'.$Configurations->regexp.'/U','',$objFile->filename);

                 $sanitizedFilename = $baseFilename.'.'.$objFile->extension;

                 // Check or create folder structure

                 $strSubFolder = sprintf("%03d",ceil(($objMember->id+1)/100)-1).'/'.$objMember->id;

-                $strTargetFolder = $objTarget->path.'/'.$strSubFolder;

+                $strTargetFolder = $Target->path.'/'.$strSubFolder;

                 $arrFolders = explode('/',$strTargetFolder);

                 $strStartPath = '';

                 foreach ($arrFolders as $folder)

                 {

-                    if (!is_dir(TL_ROOT . '/' . $strStartPath . $folder))

+                    if (!is_dir($projectDir . '/' . $strStartPath . $folder))

                     {

                         Files::getInstance()->mkdir($strStartPath . $folder);

                     }

@@ -217,7 +219,7 @@ class SecureDownloadsJob

                 // Do not overwrite existing files

                 $copyId = 1;

-                while(file_exists(TL_ROOT . "/".$strTargetFolder.'/'.$sanitizedFilename))

+                while(file_exists($projectDir . "/".$strTargetFolder.'/'.$sanitizedFilename))

                 {

                     $sanitizedFilename = $baseFilename.'_'.$copyId++.'.'.$objFile->extension;

                 }