Output the command line signature in only one place in index.php, allowing all other calls to ClineSignature() to be removed (#456)

Author: bramley

public_html/lists/admin/connect.php

@@ -442,14 +442,12 @@ function ClineSignature()
 function ClineError($msg)
 {
     ob_end_clean();
-    echo ClineSignature();
     echo "\nError: $msg\n";
     exit;
 }
 
 function clineUsage($line = '')
 {
-    cl_output(clineSignature());
     cl_output( 'Usage: '.$_SERVER['SCRIPT_FILENAME']." -p page $line".PHP_EOL);
 }
 

public_html/lists/admin/convertstats.php

@@ -6,13 +6,10 @@
     echo '<p class="information">'.$GLOBALS['I18N']->get('Hint: this page also works from commandline').'</p>';
     $limit = 10000;
 } else {
-    @ob_end_clean();
-    echo ClineSignature();
     //# when on cl, doit immediately
     $_GET['doit'] = 'yes';
     //# on commandline handle more
     $limit = 50000;
-    ob_start();
 }
 
 function output($message)

public_html/lists/admin/cron.php

@@ -18,9 +18,6 @@
 
     return;
 }
-
-cl_output(ClineSignature());
-
 $cronJobs = array(
 
     // at a later stage, these should be added

public_html/lists/admin/import.php

@@ -58,7 +58,6 @@
     if (!$cline['l']) {
         echo ClineError('Specify lists to import users to');
     }
-    echo clineSignature();
 
     ob_start();
     $_FILES['import_file'] = array(

public_html/lists/admin/index.php

@@ -182,6 +182,7 @@ function mb_strtolower($string)
 
 $GLOBALS['require_login'] = 1; ## this is no longer configurable and should never have been
 if ($GLOBALS['commandline']) {
+    cl_output(ClineSignature());
     if (!isset($_SERVER['USER']) && count($GLOBALS['commandline_users'])) {
         clineError('USER environment variable is not defined, cannot do access check. Please make sure USER is defined.');
         exit;
@@ -206,7 +207,6 @@ function mb_strtolower($string)
         } elseif (isset($cline['p'])) {
             $_GET['page'] = $cline['p'];
         }
-        cl_output( ClineSignature());
         cl_processtitle('core-'.$_GET['page']);
     } elseif ($cline['p'] && $IsCommandlinePlugin) {
         if (empty($GLOBALS['developer_email']) && isset($cline['p']) && !in_array($cline['p'],
@@ -216,7 +216,6 @@ function mb_strtolower($string)
         } elseif (isset($cline['p'])) {
             $_GET['page'] = $cline['p'];
             $_GET['pi'] = $cline['m'];
-            cl_output( ClineSignature());
             cl_processtitle($_GET['pi'].'-'.$_GET['page']);
         }
     } else {

public_html/lists/admin/initlanguages.php

@@ -9,10 +9,6 @@
 
     return;
 }
-ob_end_clean();
-echo ClineSignature();
-ob_start();
-
 $locale_root = dirname(__FILE__).'/locale/';
 
 $force = isset($cline['f']);

public_html/lists/admin/processbounces.php

@@ -30,10 +30,6 @@
         //# we're in a normal session, so the csrf token should work
         verifyCsrfGetToken();
     }
-} else {
-    ob_end_clean();
-    echo ClineSignature();
-    ob_start();
 }
 
 flush();

public_html/lists/admin/processqueue.php

@@ -19,9 +19,6 @@
         return;
     }
 } else {
-    @ob_end_clean();
-    echo ClineSignature();
-    ob_start();
     include dirname(__FILE__).'/actions/processqueue.php';
 
     return;

public_html/lists/admin/send.php

@@ -124,7 +124,6 @@
 if ($done) {
     if ($GLOBALS['commandline']) {
         ob_end_clean();
-        echo clineSignature();
         echo 'Message with subject '.$_POST['subject'].' was sent to '.$lists."\n";
         exit;
     }

public_html/lists/admin/updatetlds.php

@@ -4,8 +4,6 @@
     @ob_end_flush();
     echo '<p class="information">'.s('This page only works from commandline').'</p>';
     return;
-} else {
-    cl_output(ClineSignature());
 }
 
 if (isset($cline['f'])) {
@@ -14,4 +12,4 @@
     refreshTlds(false);
 }
 $tlds = explode('|', getConfig('internet_tlds'));
-cl_output(s('Now we have %d top level domains',count($tlds)));
+cl_output(s('Now we have %d top level domains',count($tlds)));