show a warning if ajax webcron is detectedg

3 files changed, 32 insertions, 1 deletions

diff --git a/templates/index.php b/templates/index.php
index 7fe58a4c2..9de7932d4 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -16,7 +16,8 @@ script('news', [
 ]);
 ?>
 
-<div id="app" ng-app="News" ng-cloak ng-strict-di ng-controller="AppController as App">
+<div id="app" ng-app="News" ng-cloak ng-strict-di
+    ng-controller="AppController as App">
 
     <div id="global-loading"
         class="icon-loading"
diff --git a/templates/part.content.cronwarning.php b/templates/part.content.cronwarning.php
new file mode 100644
index 000000000..73d833560
--- /dev/null
+++ b/templates/part.content.cronwarning.php
@@ -0,0 +1,29 @@
+<?php if ($_['cronWarning'] === 'ajaxCron') { ?>
+    <div id="cron-warning">
+        <p><?php p($l->t('Ajax cron mode detected! Your feeds will ' .
+            'not be updated correctly. It is recommended to either use ' .
+            'the operating system cron or a custom updater.'
+        )); ?>
+            <ul>
+                <li>
+                    <a href="http://doc.owncloud.org/server/7.0/admin_manual/configuration/background_jobs.html#cron"
+                       target="_blank">
+                    <?php
+                        p($l->t('How to set up the operating system cron'));
+                    ?>
+                    </a>
+                </li>
+                <li>
+                    <a href="https://github.com/owncloud/news/wiki/Custom-Updater"
+                       target="_blank">
+                        <?php
+                            p($l->t('How to set up a custom updater ' .
+                                    '(faster and no possible deadlock) '
+                            ));
+                        ?>
+                    </a>
+                </li>
+            </ul>
+        </p>
+    </div>
+<?php }; ?>
\ No newline at end of file
diff --git a/templates/part.content.php b/templates/part.content.php
index 9ee3ef6be..c0e27f448 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -1,4 +1,5 @@
 <?php print_unescaped($this->inc('part.content.firstrun')) ?>
+<?php print_unescaped($this->inc('part.content.cronwarning')) ?>
 
 <div news-auto-focus="#app-content"
     id="articles"