tutos-commits Mailing List for TUTOS

Revision: 1253
          http://sourceforge.net/p/tutos/code/1253
Author:   gokohnert
Date:     2014-03-06 20:28:12 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
better crontab 

Modified Paths:
--------------
    trunk/php/admin/crontab_maker.php

Modified: trunk/php/admin/crontab_maker.php
===================================================================
--- trunk/php/admin/crontab_maker.php	2014-03-06 20:18:10 UTC (rev 1252)
+++ trunk/php/admin/crontab_maker.php	2014-03-06 20:28:12 UTC (rev 1253)
@@ -91,15 +91,6 @@
             $rt = '';
             $x = array();
             @exec('crontab -l',$x,$rt);
-            if ($rt != 0) {
-                $r .= '<div class="message">Sorry ! Unable to run crontab on your system.('.$rt.')<br />';
-                foreach ($x as $l) {
-                    $r .= $l."<br />";
-                }
-                $r .= '</div>';
-                //           $r .= $this->DataTableEnd();
-                //           return $r;
-            }
         } else {
             $r .= '<div class="message">Sorry ! Unable to find crontab on your system.<br />';
             $r .= $this->DataTableEnd();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1252
          http://sourceforge.net/p/tutos/code/1252
Author:   gokohnert
Date:     2014-03-06 20:18:10 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
typo 

Modified Paths:
--------------
    trunk/php/admin/crontab_maker.php

Modified: trunk/php/admin/crontab_maker.php
===================================================================
--- trunk/php/admin/crontab_maker.php	2014-03-06 20:15:35 UTC (rev 1251)
+++ trunk/php/admin/crontab_maker.php	2014-03-06 20:18:10 UTC (rev 1252)
@@ -86,7 +86,7 @@
         $r .= '</tr>';
 
 
-        $c = $this->check_cmd('Xcrontab');
+        $c = $this->check_cmd('crontab');
         if ($c != '') {
             $rt = '';
             $x = array();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1251
          http://sourceforge.net/p/tutos/code/1251
Author:   gokohnert
Date:     2014-03-06 20:15:35 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
updated login layout

Modified Paths:
--------------
    trunk/html/default.css
    trunk/html/motd_default.html

Modified: trunk/html/default.css
===================================================================
--- trunk/html/default.css	2014-03-06 20:14:29 UTC (rev 1250)
+++ trunk/html/default.css	2014-03-06 20:15:35 UTC (rev 1251)
@@ -196,7 +196,7 @@
     background-repeat: no-repeat;
     background-position: center;
     font-family: monospace;
-    min-height: 280px;
+    height: 300px;
     min-width: 370px;
     white-space: pre;
 }

Modified: trunk/html/motd_default.html
===================================================================
--- trunk/html/motd_default.html	2014-03-06 20:14:29 UTC (rev 1250)
+++ trunk/html/motd_default.html	2014-03-06 20:15:35 UTC (rev 1251)
@@ -1,6 +1,4 @@
-<!-- $Id$ -->
-<!-- This will be read inside of <PRE> </PRE> -->
-<h1>Congratulations</h1>
+<!-- $Id$ --><!-- This will be read inside of <PRE> </PRE> --><h1>Congratulations</h1>
 you have managed to install <a href="http://www.tutos.org" target="home">TUTOS</a>.
 
 This is the <u>default</u> message of today.
@@ -19,5 +17,4 @@
 
 See <a href="http://wiki.tutos.org" target="doku">TUTOS wiki</a> for uptodate documentation.
 
-<a href="http://validator.w3.org/check?uri=referer"><img border="0" src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a>
-<!-- EOF -->
+<a href="http://validator.w3.org/check?uri=referer"><img border="0" src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a><!-- EOF -->

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1250
          http://sourceforge.net/p/tutos/code/1250
Author:   gokohnert
Date:     2014-03-06 20:14:29 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
better crontab 

Modified Paths:
--------------
    trunk/php/admin/crontab_maker.php

Modified: trunk/php/admin/crontab_maker.php
===================================================================
--- trunk/php/admin/crontab_maker.php	2014-02-24 08:04:18 UTC (rev 1249)
+++ trunk/php/admin/crontab_maker.php	2014-03-06 20:14:29 UTC (rev 1250)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2009 - 2013 by Gero Kohnert
+ *  Copyright 2009 - 2014 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -46,23 +46,29 @@
         global $tutos,$msg,$info;
 
         $r = '';
+        $url = normalize_url(getBaseUrl(true).'../check.php?dbnr='.$_SESSION['dbnr']);
 
-        if ($cmd = $this->check_cmd('php')) {
-            $c = $cmd;
-            $cmd = '*/5 * * * * cd '.dirname(dirname($_SERVER['SCRIPT_FILENAME']));
+        $cmd = "*/5 * * * * \t";
+        if ($c = $this->check_cmd('php')) {
+            $cmd .= 'cd '.dirname(dirname($_SERVER['SCRIPT_FILENAME']));
             $cmd .= '; '.$c .' check.php -dbnr '.$_SESSION['dbnr'];
-        } elseif($cmd = $this->check_cmd('lynx')) {
-            $cmd = '*/5 * * * * '.$cmd;
-            $cmd .= ' -accept_all_cookies -dump '.getBaseUrl(true).'check.php?dbnr='.$_SESSION['dbnr'];
-        } elseif($cmd = $this->check_cmd('wget')) {
-            $cmd = '*/5 * * * * '.$cmd;
-            $cmd .= ' -T 10 -O /dev/null --no-check-certificate '.getBaseUrl(true).'check.php?dbnr='.$_SESSION['dbnr'];
+        } elseif($c = $this->check_cmd('lynx')) {
+            $cmd .= $c;
+            $cmd .= ' -accept_all_cookies -dump '.$url;
+        } elseif($c = $this->check_cmd('wget')) {
+            $cmd .= $c;
+            $cmd .= ' -T 10 -O /dev/null --no-check-certificate '.$url;
         } else {
-            $r = '<div class="message">No suitable programm found (php/lynx/wget)</div>';
+            $r = '<div class="message">No suitable programm to trigger a tutos call was found (php/lynx/wget)</div>';
             return $r;
         }
 
-        $cmd .= ' >> '.normalize_url(dirname($_SERVER['SCRIPT_FILENAME']).'/'.$tutos[errlog]);
+        $cmd .= ' >> ';
+        if (preg_match('#^/#',$tutos[errlog])) {
+            $cmd .= normalize_url($tutos[errlog]);
+        } else {
+            $cmd .= normalize_url(dirname($_SERVER['SCRIPT_FILENAME']).'/'.$tutos[errlog]);
+        }
         $cmd .= ' 2>&1';
 
         $r .= '<form method="POST">';
@@ -73,26 +79,33 @@
 
         $r .= '<tr>';
         $r .= '<td colspan="4">';
-        $r .= 'In order to enable cyclic (every 5 minutes) checks you should add the following line to your crontab.<br />';
-        $r .= '<b>'.$cmd.'</b>';
+        $r .= '<p>Before you run the check script for the first time you should do this manually as the first run might take more than 5 minutes.<br/>Just call this url: <a href="'.$url.'" target="_blank">'.$url.'</a> (opens a new window; a relogin to TUTOS might be forced afterwards)<p />';
+        $r .= '<p>In order to enable cyclic (every 5 minutes) checks you should add the following line to your crontab.<br />';
+        $r .= '<b><pre>'.$cmd.'</pre></b></p>';
         $r .= '</td>';
         $r .= '</tr>';
 
 
-        $rt = '';
-        $x = array();
-        @exec('crontab -l',$x,$rt);
-        /**
-           if ($rt != 0) {
-           $r .= '<div class="message">Sorry ! Unable to find/run crontab on your system.('.$rt.')<br />';
-           foreach ($x as $l) {
-           $r .= $l."<br />";
-           }
-           $r .= '</div>';
-           $r .= $this->DataTableEnd();
-           return $r;
-           }
-        */
+        $c = $this->check_cmd('Xcrontab');
+        if ($c != '') {
+            $rt = '';
+            $x = array();
+            @exec('crontab -l',$x,$rt);
+            if ($rt != 0) {
+                $r .= '<div class="message">Sorry ! Unable to run crontab on your system.('.$rt.')<br />';
+                foreach ($x as $l) {
+                    $r .= $l."<br />";
+                }
+                $r .= '</div>';
+                //           $r .= $this->DataTableEnd();
+                //           return $r;
+            }
+        } else {
+            $r .= '<div class="message">Sorry ! Unable to find crontab on your system.<br />';
+            $r .= $this->DataTableEnd();
+            return $r;
+        }
+
         $orig = '';
         $found = false;
         foreach ($x as $l) {
@@ -108,10 +121,14 @@
             $orig .= "#\n";
             $orig .= "# Call TUTOS check script every 5 minutes \n";
             $orig .= "# (automatically added on ".Date("d.M.Y H:i:s T").")\n";
+            $orig .= "#\n";
+            $orig .= "# send possible mails to:\n";
+            $orig .= "MAILTO=".getenv('APACHE_RUN_USER'). "\n";
+            $orig .= "#\n";
             $orig .= $cmd."\n";
+            $orig .= "#\n";
         }
 
-
         $r .= "<tr><td colspan=\"4\">\n";
         $r .= '<textarea rows="20" cols="'.(10+strlen($cmd)).'" name="crontab">';
         $r .= $orig;
@@ -155,12 +172,12 @@
             $x = '';
             @exec('crontab '.$tmpname,$x,$rt);
             if ($rt != 0) {
-                $msg .= $this->error('could not run crontab with  '.$tmpname);
+                $msg = addLine($msg,'could not run crontab with '.$tmpname);
                 $this->stop = true;
                 return;
             }
             foreach ($x as $l) {
-                $info .= $l.'<br />';
+                $info = addLIne($info,$l);
             }
             unlink($tmpname);
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.