style fixes, bug fixes

Admin/Install/Workflow.install.json

@@ -9,7 +9,7 @@
                 "de": "Ueberpruefe Ressourcen"
             },
             "function_type": "Api",
-            "function": "checkResources",
+            "function": "apiCheckResources",
             "module": "OnlineResourceWatcher",
             "inputs": [
                 "unit",

Admin/Installer.php

@@ -18,6 +18,8 @@ use phpOMS\Application\ApplicationAbstract;
 use phpOMS\Config\SettingsInterface;
 use phpOMS\Module\InstallerAbstract;
 use phpOMS\Module\ModuleInfo;
+use phpOMS\System\OperatingSystem;
+use phpOMS\System\SystemType;
 
 /**
  * Installer class.
@@ -42,6 +44,16 @@ final class Installer extends InstallerAbstract
      */
     public static function install(ApplicationAbstract $app, ModuleInfo $info, SettingsInterface $cfgHandler) : void
     {
+        if (OperatingSystem::getSystem() === SystemType::LINUX && !\is_writable('/var/www')) {
+            $app->logger->error(
+                'Directory /var/www is not writable. Please allow the apache user (www-data) to write to this directory.'
+            );
+
+            var_dump('NOT WRITABLE');
+
+            return;
+        }
+
         parent::install($app, $info, $cfgHandler);
 
         if (!\is_dir(__DIR__ . '/../Files')) {

Controller/ApiController.php

@@ -70,21 +70,25 @@ final class ApiController extends Controller
             ->execute();
 
         $path = '';
-        if (\is_dir($basePath = __DIR__ . '/../Files/' . $resource->path . '/' . $resource->lastVersionPath)) {
+        $basePath = __DIR__ . '/../Files/' . $resource->path . '/' . $resource->lastVersionPath;
-            if (\is_file($basePath . '/index.htm')) {
-                $path = 'Modules/OnlineResourceWatcher/Files/' . $resource->path . '/' . $resource->lastVersionPath . '/index.jpg';
-            } else {
-                $files = \scandir($basePath);
-                $path  = '';
 
-                if ($files !== false) {
+        if (\is_file($basePath . '/index.htm')) {
-                    foreach ($files as $file) {
+            $path = 'Modules/OnlineResourceWatcher/Files/' . $resource->path . '/' . $resource->lastVersionPath . '/index.jpg';
-                        if ($file === '.' || $files === '..') {
-                            continue;
-                        }
 
-                        $path = 'Modules/OnlineResourceWatcher/Files/' . $resource->path . '/' . $resource->lastVersionPath . '/' . $file;
+            if (!\is_file(__DIR__ . '/../../../' . $path)) {
+                $path = 'Modules/OnlineResourceWatcher/Files/' . $resource->path . '/' . $resource->lastVersionPath . '/index.htm';
+            }
+        } else {
+            $files = \scandir($basePath);
+            $path  = '';
+
+            if ($files !== false) {
+                foreach ($files as $file) {
+                    if ($file === '.' || $files === '..') {
+                        continue;
                     }
+
+                    $path = 'Modules/OnlineResourceWatcher/Files/' . $resource->path . '/' . $resource->lastVersionPath . '/' . $file;
                 }
             }
         }
@@ -99,7 +103,7 @@ final class ApiController extends Controller
         $internalRequest                  = new HttpRequest();
         $internalRequest->header->account = $request->header->account;
         $internalRequest->setData('path', $path);
-        $this->app->moduleManager->get('Media')->apiMediaExport($internalRequest, $response, ['guard' => __DIR__ . '/../Files']);
+        $this->app->moduleManager->get('Media', 'Api')->apiMediaExport($internalRequest, $response, ['guard' => __DIR__ . '/../Files']);
     }
 
     /**
@@ -115,7 +119,7 @@ final class ApiController extends Controller
     {
         $val = [];
         if (($val['title'] = !$request->hasData('title'))
-            || ($val['uri'] = !$request->hasData('uri'))
+            || ($val['uri'] = (!$request->hasData('uri') || \filter_var($request->getDataString('uri'), \FILTER_VALIDATE_URL) === false))
         ) {
             return $val;
         }
@@ -147,6 +151,9 @@ final class ApiController extends Controller
 
         $resource = $this->createResourceFromRequest($request);
         $this->createModel($request->header->account, $resource, ResourceMapper::class, 'resource', $request->getOrigin());
+
+        $this->checkResources($request, [$resource]);
+
         $this->createStandardCreateResponse($request, $response, $resource);
     }
 
@@ -193,8 +200,16 @@ final class ApiController extends Controller
      */
     public function apiCheckResources(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
-        $this->checkResources($request, $response);
+        /** @var Resource[] $resources */
+        $resources = ResourceMapper::getAll()
+            ->with('owner')
+            ->with('owner/l11n')
+            ->with('inform')
+            ->where('status', ResourceStatus::ACTIVE)
+            ->where('checkedAt', (new \DateTime('now'))->sub(new \DateInterval('PT12H')), '<')
+            ->execute();
 
+        $this->checkResources($request, $resources);
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Resources', 'Resources were checked.', null);
     }
 
@@ -234,18 +249,9 @@ final class ApiController extends Controller
      * @since 1.0.0
      * @todo: implement iterative approach where you can define a "offset" and "limit" to check only a few resources at a time
      */
-    public function checkResources(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : array
+    public function checkResources(RequestAbstract $request, array $resources, mixed $data = null) : array
     {
         $changed = [];
-
-        /** @var Resource[] $resources */
-        $resources = ResourceMapper::getAll()
-            ->with('owner')
-            ->with('owner/l11n')
-            ->with('inform')
-            ->where('status', ResourceStatus::ACTIVE)
-            ->execute();
-
         $toCheck = [];
 
         $basePath = __DIR__ . '/../Files';
@@ -272,7 +278,7 @@ final class ApiController extends Controller
             try {
                 SystemUtils::runProc(
                     OperatingSystem::getSystem() === SystemType::WIN ? 'wget.exe' : 'wget',
-                    '--retry-connrefused --waitretry=1 --read-timeout=10 --timeout=10 --dns-timeout=10 -t 2 --quota=25m --adjust-extension --span-hosts --convert-links --no-directories --restrict-file-names=windows --no-parent ‐‐execute robots=off --limit-rate=5m -U mozilla --accept css,png,jpg,jpeg,gif,htm,html,txt,md,pdf,xls,xlsx,doc,docx --directory-prefix=' . $path . ' ‐‐output-document=index.htm ' . $resource->uri,
+                    '--retry-connrefused --waitretry=1 --read-timeout=10 --timeout=10 --dns-timeout=10 -t 2 --quota=25m --adjust-extension --span-hosts --convert-links --no-directories --restrict-file-names=windows --no-parent ‐‐execute robots=off --limit-rate=5m -U mozilla --accept css,png,jpg,jpeg,gif,htm,html,txt,md,pdf,xls,xlsx,doc,docx --directory-prefix=' . \escapeshellarg($path) . ' ‐‐output-document=index.htm ' . \escapeshellarg($resource->uri),
                     true
                 );
             } catch (\Throwable $t) {
@@ -303,13 +309,16 @@ final class ApiController extends Controller
             ->execute();
 
         // Check downloaded resources
-        // @todo: this may not work correctly because the download runs async.
         $totalCount = \count($toCheck);
         $maxLoops   = (int) \min(60 * 10, $totalCount * 10 / 4);
+        $startTime  = \time();
+        $minTime    = $startTime + \min(10 * $totalCount, 60 * 5); // At least run 10 seconds per element
+        $maxTime    = $startTime + \min(60 * $totalCount, 60 * 60 * 3); // At most run 60 seconds per element
 
-        // @todo: the following code is INSANE, simplify!!!
         $baseLen = \strlen($basePath . '/temp');
         while (!empty($toCheck)) {
+            $time = \time();
+
             foreach ($toCheck as $index => $check) {
                 ++$toCheck[$index]['loop'];
 
@@ -317,7 +326,7 @@ final class ApiController extends Controller
                 $resource = $check['resource'];
 
                 // too many tries
-                if ($check['loop'] > $maxLoops) {
+                if (($check['loop'] > $maxLoops && $time > $minTime) || $time > $maxTime) {
                     $report              = new Report();
                     $report->resource    = $resource->id;
                     $report->versionPath = (string) $check['timestamp'];
@@ -415,19 +424,11 @@ final class ApiController extends Controller
 
                     if ($extension === 'htm') {
                         try {
-                            if (OperatingSystem::getSystem() === SystemType::WIN) {
+                            SystemUtils::runProc(
-                                SystemUtils::runProc(
+                                OperatingSystem::getSystem() === SystemType::WIN ? 'wkhtmltoimage.exe' : 'wkhtmltoimage',
-                                    'firefox.exe',
+                                \escapeshellarg($resource->uri) . ' ' . \escapeshellarg($basePath . '/' . $id . '/' . $check['timestamp'] . '/index.jpg'),
-                                    '---headless --screenshot "' . $basePath . '/' . $id . '/' . $check['timestamp'] . '/index.jpg" ' . $resource->uri,
+                                true
-                                    true
+                            );
-                                );
-                            } else {
-                                SystemUtils::runProc(
-                                    'xvfb-run',
-                                    '--server-args="-screen 0, 1920x1080x24" cutycapt --min-width=1024 --url="' . $resource->uri . '" --out="' . $basePath . '/' . $id . '/' . $check['timestamp'] . '/index.jpg"',
-                                    true
-                                );
-                            }
                         } catch (\Throwable $t) {
                             $this->app->logger->error($t->getMessage());
                         }
@@ -540,19 +541,11 @@ final class ApiController extends Controller
                     // If is htm/html create image
                     if ($extension === 'htm') {
                         try {
-                            if (OperatingSystem::getSystem() === SystemType::WIN) {
+                            SystemUtils::runProc(
-                                SystemUtils::runProc(
+                                OperatingSystem::getSystem() === SystemType::WIN ? 'wkhtmltoimage.exe' : 'wkhtmltoimage',
-                                    'firefox.exe',
+                                \escapeshellarg($resource->uri) . ' ' . \escapeshellarg($basePath . '/' . $id . '/' . $check['timestamp'] . '/index.jpg'),
-                                    '---headless --screenshot "' . $basePath . '/' . $id . '/' . $check['timestamp'] . '/index.jpg" ' . $resource->uri,
+                                true
-                                    true
+                            );
-                                );
-                            } else {
-                                SystemUtils::runProc(
-                                    'xvfb-run',
-                                    '--server-args="-screen 0, 1920x1080x24" cutycapt --min-width=1024 --url="' . $resource->uri . '" --out="' . $basePath . '/' . $id . '/' . $check['timestamp'] . '/index.jpg"',
-                                    true
-                                );
-                            }
                         } catch (\Throwable $t) {
                             $this->app->logger->error($t->getMessage());
                         }
@@ -633,7 +626,14 @@ final class ApiController extends Controller
                 unset($toCheck[$index]);
             }
 
-            \sleep(1);
+            \usleep(100000); // 100ms
+        }
+
+        // make sure that no wkhtmltoimage processes are running
+        if (OperatingSystem::getSystem() === SystemType::LINUX) {
+            SystemUtils::runProc('pkill', '-f wkhtmltoimage', true);
+        } else {
+            SystemUtils::runProc('taskkill', '/F /IM wkhtmltoimage.exe', true);
         }
 
         Directory::delete($basePath . '/temp');

Theme/Backend/resource-list.tpl.php

@@ -83,7 +83,7 @@ $next = $tableView->getNextLink(
                         <td><?= $resource->id; ?>
                         <td><?= $this->printHtml($resource->title); ?>
                         <td><?= $this->printHtml((string) $resource->getStatus()); ?>
-                        <td><?= $this->printHtml($resource->checkedAt->format('Y-m-d H:i')); ?>
+                        <td><?= $this->printHtml($resource->checkedAt?->format('Y-m-d H:i')); ?>
                         <td><?= $this->printHtml($resource->createdAt->format('Y-m-d')); ?>
                 <?php endforeach; ?>
                 <?php if ($count === 0) : ?>

Theme/Backend/resource-single.tpl.php

@@ -42,10 +42,12 @@ $reports = $resource->reports;
                         <input id="iUrl" name="uri" type="text" value="<?= $this->printHtml($resource->uri); ?>" required>
                     </div>
 
+                    <!--
                     <div class="form-group">
                         <label for="iXPath"><?= $this->getHtml('XPath'); ?></label>
                         <input id="iXPath" name="xpath" type="text" value="<?= $this->printHtml($resource->xpath); ?>">
                     </div>
+                    -->
                 </div>
                 <div class="portlet-foot">
                     <input id="iSubmitUser" name="submitUser" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
@@ -75,34 +77,57 @@ $reports = $resource->reports;
 
 <div class="row col-simple">
     <div class="col-xs-12 col-simple">
+        <?php if ($resource->checkedAt !== null) : ?>
         <div class="portlet col-simple">
             <div class="portlet-body col-simple">
-                <div id="resource" class="tabview tab-2 m-editor col-simple">
+                <?php
-                    <ul class="tab-links">
-                        <li><label tabindex="0" for="resource-c-tab-1"><?= $this->getHtml('Preview'); ?></label>
-                        <li><label tabindex="1" for="resource-c-tab-2"><?= $this->getHtml('Comparison'); ?></label>
-                    </ul>
-                    <div class="tab-content col-simple">
-                        <input type="radio" id="resource-c-tab-1" name="tabular-1" checked>
-                        <div class="tab col-simple">
-                            <div class="col-simple">
-                                <div class="col-xs-12 col-simple">
-                                    <section id="mediaFile" class="portlet col-simple">
-                                        <div class="portlet-body col-simple">
-                                            <iframe class="col-simple" id="iRenderFrame" src="<?= UriFactory::build('{/api}orw/resource/render?id=' . $resource->id); ?>" loading="lazy" allowfullscreen></iframe>
-                                        </div>
-                                    </section>
-                                </div>
-                            </div>
-                        </div>
 
-                        <input type="radio" id="resource-c-tab-2" name="tabular-1">
+                    $type = '';
-                        <div class="tab">
+                    $basePath = __DIR__ . '/../../Files/' . $resource->path . '/' . $resource->lastVersionPath;
+                    $path = '';
+                    $webPath = 'Modules/OnlineResourceWatcher/Files/' . $resource->path . '/' . $resource->lastVersionPath;
 
-                        </div>
+                    if (\is_file($basePath . '/index.jpg')) {
-                    </div>
+                        $type = 'img';
-                </div>
+                        $path = $basePath . '/index.jpg';
+                        $webPath .= '/index.jpg';
+                    } else {
+                        $files = \scandir($basePath);
+
+                        if ($files !== false) {
+                            foreach ($files as $file) {
+                                if ($file === '.' || $files === '..') {
+                                    continue;
+                                }
+
+                                $path    = $basePath . '/' . $file;
+                                $webPath .= '/' . $file;
+
+                                if (\stripos($file, '.jpg') !== false
+                                    || \stripos($file, '.jpeg') !== false
+                                    || \stripos($file, '.png') !== false
+                                    || \stripos($file, '.gif') !== false
+                                ) {
+                                    $type = 'img';
+                                    break;
+                                } elseif (\stripos($file, '.pdf') !== false) {
+                                    $type = 'pdf';
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                ?>
+
+                <?php if ($type === 'img') : ?>
+                    <img src="<?= UriFactory::build($webPath); ?>" alt="<?= $this->printHtml($resource->title); ?>">
+                <?php elseif ($type === 'pdf') : ?>
+                    <iframe class="col-simple" id="iRenderFrame" src="Resources/mozilla/Pdf/web/viewer.html?file=<?= \urlencode($webPath); ?>" loading="lazy" allowfullscreen></iframe>
+                <?php else : ?>
+                    <iframe class="col-simple" id="iRenderFrame" src="<?= UriFactory::build('{/api}orw/resource/render?id=' . $resource->id); ?>" loading="lazy" allowfullscreen></iframe>
+                <?php endif; ?>
             </div>
         </div>
+        <?php endif; ?>
     </div>
 </div>