Disabling error printing (#393)

* Disable error printing based on verbosity flag
apereo · Jul 22, 2021 · 53d5634 · 53d5634
1 parent 4ad1427
commit 53d5634
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/source/CAS.php b/source/CAS.php
@@ -597,8 +597,6 @@ public static function error($msg)
         }
         if (self::$_PHPCAS_VERBOSE) {
             echo "<br />\n<b>phpCAS error</b>: <font color=\"FF0000\"><b>" . __CLASS__ . "::" . $function . '(): ' . htmlentities($msg) . "</b></font> in <b>" . $file . "</b> on line <b>" . $line . "</b><br />\n";
-        } else {
-            echo "<br />\n<b>Error</b>: <font color=\"FF0000\"><b>". DEFAULT_ERROR ."</b><br />\n";
         }
         phpCAS :: trace($msg . ' in ' . $file . 'on line ' . $line );
         phpCAS :: traceEnd();

diff --git a/source/CAS/AuthenticationException.php b/source/CAS/AuthenticationException.php
@@ -72,11 +72,15 @@ public function __construct($client,$failure,$cas_url,$no_response,
         phpCAS::traceBegin();
         $lang = $client->getLangObj();
         $client->printHTMLHeader($lang->getAuthenticationFailed());
-        printf(
-            $lang->getYouWereNotAuthenticated(),
-            htmlentities($client->getURL()),
-            isset($_SERVER['SERVER_ADMIN']) ? $_SERVER['SERVER_ADMIN']:''
-        );
+
+        if (phpCAS::getVerbose()) {
+            printf(
+                $lang->getYouWereNotAuthenticated(),
+                htmlentities($client->getURL()),
+                $_SERVER['SERVER_ADMIN'] ?? ''
+            );
+        }
+
         phpCAS::trace($messages[] = 'CAS URL: '.$cas_url);
         phpCAS::trace($messages[] = 'Authentication failure: '.$failure);
         if ( $no_response ) {

diff --git a/source/CAS/Client.php b/source/CAS/Client.php
@@ -102,6 +102,10 @@ private function _htmlFilterOutput($str)
      */
     public function printHTMLHeader($title)
     {
+        if (!phpCAS::getVerbose()) {
+            return;
+        }
+
         $this->_htmlFilterOutput(
             str_replace(
                 '__TITLE__', $title,
@@ -130,16 +134,17 @@ public function printHTMLHeader($title)
      */
     public function printHTMLFooter()
     {
+        if (!phpCAS::getVerbose()) {
+            return;
+        }
+
         $lang = $this->getLangObj();
-        $this->_htmlFilterOutput(
-            empty($this->_output_footer)?
-            (phpCAS::getVerbose())?
-                '<hr><address>phpCAS __PHPCAS_VERSION__ '
-                .$lang->getUsingServer()
-                .' <a href="__SERVER_BASE_URL__">__SERVER_BASE_URL__</a> (CAS __CAS_VERSION__)</a></address></body></html>'
-                :'</body></html>'
-            :$this->_output_footer
-        );
+        $message = empty($this->_output_footer)
+            ? '<hr><address>phpCAS __PHPCAS_VERSION__ ' . $lang->getUsingServer() .
+              ' <a href="__SERVER_BASE_URL__">__SERVER_BASE_URL__</a> (CAS __CAS_VERSION__)</a></address></body></html>'
+            : $this->_output_footer;
+
+        $this->_htmlFilterOutput($message);
     }
 
     /**