A lot more naming conventions applied

author Roland Häder <roland@mxchange.org>

Wed, 6 Feb 2008 20:38:44 +0000 (20:38 +0000)

committer Roland Häder <roland@mxchange.org>

Wed, 6 Feb 2008 20:38:44 +0000 (20:38 +0000)
author Roland Häder <roland@mxchange.org>
Wed, 6 Feb 2008 20:38:44 +0000 (20:38 +0000)
committer Roland Häder <roland@mxchange.org>
Wed, 6 Feb 2008 20:38:44 +0000 (20:38 +0000)
diff --git a/inc/footer.php b/inc/footer.php

index f502533885cdbb7854e2a24467048afe3ac8efdc..4062ecc36da16186d1d1841715d8de9ba985ffdf 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -47,7 +47,7 @@ if (($FOOTER != "1") && ($FOOTER != "2") && ($CSS != "1"))
         if (((frameset_active) || ($GLOBALS['module'] == "frametester") || ($header < 2)) && (empty($frame)))
         {
                 // Add some non-frameset stuff
         if (((frameset_active) || ($GLOBALS['module'] == "frametester") || ($header < 2)) && (empty($frame)))
         {
                 // Add some non-frameset stuff
-               OUTPUT_HTML ("<NOFRAMES>
+               OUTPUT_HTML("<NOFRAMES>
  <BODY>");
         }
  
  <BODY>");
         }
  
@@ -70,16 +70,16 @@ if (($FOOTER != "1") && ($FOOTER != "2") && ($CSS != "1"))
         if (((frameset_active) || ($GLOBALS['module'] == "frametester")) && ($FOOTER == "1"))
         {
                 // Add the closing NOFRAMES tag
         if (((frameset_active) || ($GLOBALS['module'] == "frametester")) && ($FOOTER == "1"))
         {
                 // Add the closing NOFRAMES tag
-               OUTPUT_HTML ("</NOFRAMES>");
+               OUTPUT_HTML("</NOFRAMES>");
         }
         // And the last closing HTML tag
         }
         // And the last closing HTML tag
-       OUTPUT_HTML ("</HTML>");
+       OUTPUT_HTML("</HTML>");
  
         // Footer has been reached
         $FOOTER = 1;
  
         // Output HTML code
  
         // Footer has been reached
         $FOOTER = 1;
  
         // Output HTML code
-       OUTPUT_HTML ("");
+       OUTPUT_HTML("");
  
         // Close link
         if ($link) { SQL_CLOSE($link, __FILE__, __LINE__); } else { ADD_FATAL(NO_DB_LINK); }
  
         // Close link
         if ($link) { SQL_CLOSE($link, __FILE__, __LINE__); } else { ADD_FATAL(NO_DB_LINK); }
@@ -90,7 +90,7 @@ if (($FOOTER != "1") && ($FOOTER != "2") && ($CSS != "1"))
         $FOOTER = 1;
  
         // Output CSS content
         $FOOTER = 1;
  
         // Output CSS content
-       OUTPUT_HTML ("");
+       OUTPUT_HTML("");
  }
  //
  ?>
  }
  //
  ?>
diff --git a/inc/functions.php b/inc/functions.php

index 6a64288272beb298c040b25443e5d483ab60691c..5c0d7da89b225f026349d799557127d31c281518 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -89,19 +89,19 @@ function OPEN_TABLE($PERCENT = "", $CLASS = "", $ALIGN="left", $VALIGN="", $td_o
    <TD";
         if (!empty($ALIGN)) $OUT .=" align=\"".$ALIGN."\"";
         $OUT .= " class=\"".$CLASS."\">";
    <TD";
         if (!empty($ALIGN)) $OUT .=" align=\"".$ALIGN."\"";
         $OUT .= " class=\"".$CLASS."\">";
-       OUTPUT_HTML ($OUT);
+       OUTPUT_HTML($OUT);
  }
  // Close a table (you may want to add some footer stuff here)
  function CLOSE_TABLE($ADD="")
  {
  }
  // Close a table (you may want to add some footer stuff here)
  function CLOSE_TABLE($ADD="")
  {
-       OUTPUT_HTML ("  </TD>
+       OUTPUT_HTML("  </TD>
  </TR>");
  </TR>");
-       if (!empty($ADD)) OUTPUT_HTML ($ADD);
-       OUTPUT_HTML ("</TABLE>");
+       if (!empty($ADD)) OUTPUT_HTML($ADD);
+       OUTPUT_HTML("</TABLE>");
  }
  
  // Output HTML code directly or "render" it. You addionally switch the new-line character off
  }
  
  // Output HTML code directly or "render" it. You addionally switch the new-line character off
-function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
+function OUTPUT_HTML($HTML, $NEW_LINE = true) {
         // Some global variables
         global $OUTPUT, $FOOTER, $CSS;
  
         // Some global variables
         global $OUTPUT, $FOOTER, $CSS;
  
@@ -342,7 +342,7 @@ function LOAD_TEMPLATE($template, $return=false, $content="")
                  else
                 {
                         // Output direct
                  else
                 {
                         // Output direct
-                       OUTPUT_HTML ($ret);
+                       OUTPUT_HTML($ret);
                 }
         }
          elseif (DEBUG_MODE)
                 }
         }
          elseif (DEBUG_MODE)
@@ -1005,14 +1005,14 @@ function LOAD_URL($URL, $addUrlData=true) {
                 $URL = htmlentities(strip_tags($URL), ENT_QUOTES);
  
                 // Output new location link as anchor
                 $URL = htmlentities(strip_tags($URL), ENT_QUOTES);
  
                 // Output new location link as anchor
-               OUTPUT_HTML ("<A href=\"".$URL."\">".$URL."</A>\n");
+               OUTPUT_HTML("<A href=\"".$URL."\">".$URL."</A>\n");
         } elseif (!headers_sent()) {
                 // Load URL when headers are not sent
                 @header ("Location: ".str_replace("&amp;", "&", $URL));
         } else {
                 // Output error message
                 include(PATH."inc/header.php");
         } elseif (!headers_sent()) {
                 // Load URL when headers are not sent
                 @header ("Location: ".str_replace("&amp;", "&", $URL));
         } else {
                 // Output error message
                 include(PATH."inc/header.php");
-               OUTPUT_HTML (LOAD_URL_ERROR_1.$URL.LOAD_URL_ERROR_2);
+               OUTPUT_HTML(LOAD_URL_ERROR_1.$URL.LOAD_URL_ERROR_2);
                 include(PATH."inc/footer.php");
         }
         exit();
                 include(PATH."inc/footer.php");
         }
         exit();
@@ -1132,22 +1132,22 @@ function array_pk_sort(&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
         $array = $dummy;
  }
  //
         $array = $dummy;
  }
  //
-function ADD_SELECTION($type, $DEFAULT, $PREFIX="", $id="0")
+function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
  {
         global $MONTH_DESCR; $OUT = "";
         if ($type == "yn")
         {
                 // This is a yes/no selection only!
  {
         global $MONTH_DESCR; $OUT = "";
         if ($type == "yn")
         {
                 // This is a yes/no selection only!
-               if ($id > 0) $PREFIX .= "[".$id."]";
-               $OUT .= "    <SELECT name=\"".$PREFIX."\" class=\"register_select\" size=\"1\">\n";
+               if ($id > 0) $prefix .= "[".$id."]";
+               $OUT .= "    <SELECT name=\"".$prefix."\" class=\"register_select\" size=\"1\">\n";
         }
          else
         {
                 // Begin with regular selection box here
         }
          else
         {
                 // Begin with regular selection box here
-               if (!empty($PREFIX)) $PREFIX .= "_";
+               if (!empty($prefix)) $prefix .= "_";
                 $type2 = $type;
                 if ($id > 0) $type2 .= "[".$id."]";
                 $type2 = $type;
                 if ($id > 0) $type2 .= "[".$id."]";
-               $OUT .= "    <SELECT name=\"".strtolower($PREFIX.$type2)."\" class=\"register_select\" size=\"1\">\n";
+               $OUT .= "    <SELECT name=\"".strtolower($prefix.$type2)."\" class=\"register_select\" size=\"1\">\n";
         }
         switch ($type)
         {
         }
         switch ($type)
         {
diff --git a/inc/header.php b/inc/header.php

index e336ea5b6fe0331a2e58d2ab8c46208511d408c7..015b9e43b358b39e8f48b630b5189013185a5dd6 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -106,7 +106,7 @@ if (defined('frameset_active')) {
                 }
  
                 // Closing HEAD tag
                 }
  
                 // Closing HEAD tag
-               if ($CSS != "1") OUTPUT_HTML ("</HEAD>\n");
+               if ($CSS != "1") OUTPUT_HTML("</HEAD>\n");
                 $header = 1;
         }
  
                 $header = 1;
         }
  
diff --git a/inc/install-inc.php b/inc/install-inc.php

index f4146a707e5dee5e7a5b9b72aee5ac0b35fce1d0..94dfbb38a5bf592b30de5a515216b4d1792494f2 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -43,32 +43,25 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
  }
  
  //
  }
  
  //
-function install_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SNEAK=0)
+function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $SNEAK=0)
  {
  {
-       $DONE = false;  $SNEAK++;
+       $done = false;  $SNEAK++;
         if (file_exists($file))
         {
         if (file_exists($file))
         {
-               $search = "CFG: ".$COMMENT;
+               $search = "CFG: ".$comment;
                 $tmp = $file.".tmp";
                 $tmp = $file.".tmp";
-               $fp = @fopen($file, 'r') or OUTPUT_HTML ("<STRONG>READ:</STRONG> ".$file."<BR>");
-               if (is_resource($fp))
-               {
-                       $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML ("<STRONG>WRITE:</STRONG> ".$tmp."<BR>");
-                       if (is_resource($fp_tmp))
-                       {
-                               while (! feof($fp))
-                               {
+               $fp = @fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<BR>");
+               if (is_resource($fp)) {
+                       $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<BR>");
+                       if (is_resource($fp_tmp)) {
+                               while (!feof($fp)) {
                                         $line = fgets ($fp, 10240);
                                         if (strpos($line, $search) > -1) $next = 0;
                                         $line = fgets ($fp, 10240);
                                         if (strpos($line, $search) > -1) $next = 0;
-                                       if ($next > -1)
-                                       {
-                                               if ($next == $SNEAK)
-                                               {
+                                       if ($next > -1) {
+                                               if ($next == $SNEAK) {
                                                         $next = -1;
                                                         $next = -1;
-                                                       $line = $PREFIX.$DATA.$SUFFIX."\n";
-                                               }
-                                                else
-                                               {
+                                                       $line = $prefix.$DATA.$suffix."\n";
+                                               } else {
                                                         $next++;
                                                 }
                                         }
                                                         $next++;
                                                 }
                                         }
@@ -76,27 +69,22 @@ function install_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SNEAK=0)
                                 }
                                 fclose($fp_tmp);
                                 // Finished writing tmp file
                                 }
                                 fclose($fp_tmp);
                                 // Finished writing tmp file
-                               $DONE = true;
+                               $done = true;
                         }
  
                         // Close source directory
                         fclose($fp);
  
                         }
  
                         // Close source directory
                         fclose($fp);
  
-                       if (($DONE) && (is_writeable($file)))
-                       {
+                       if (($done) && (is_writeable($file))) {
                                 // Copy back tmp file and delete tmp :-)
                                 @copy($tmp, $file);
                                 @unlink($tmp);
                                 // Copy back tmp file and delete tmp :-)
                                 @copy($tmp, $file);
                                 @unlink($tmp);
-                       }
-                        else
-                       {
-                               OUTPUT_HTML ("<STRONG>TMP:</STRONG> UNDONE!");
+                       } else {
+                               OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");
                         }
                 }
                         }
                 }
-       }
-        else
-       {
-               OUTPUT_HTML ("<STRONG>404:</STRONG> ".$file."<BR>");
+       } else {
+               OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<BR>");
         }
  }
  
         }
  }
  
@@ -146,12 +134,12 @@ if ((!mxchange_installed) || (!admin_registered))
                 if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";
                 if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
                 {
                 if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";
                 if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
                 {
-                       OUTPUT_HTML ("<SPAN class=\"install_fatal\">");
+                       OUTPUT_HTML("<SPAN class=\"install_fatal\">");
                         foreach ($FATAL as $key=>$err)
                         {
                         foreach ($FATAL as $key=>$err)
                         {
-                               OUTPUT_HTML ("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<BR>\n");
+                               OUTPUT_HTML("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<BR>\n");
                         }
                         }
-                       OUTPUT_HTML ("</SPAN><BR>");
+                       OUTPUT_HTML("</SPAN><BR>");
                 }
                 define('__MYSQL_HOST'  , $mysql['host']);
                 define('__MYSQL_DBASE' , $mysql['dbase']);
                 }
                 define('__MYSQL_HOST'  , $mysql['host']);
                 define('__MYSQL_DBASE' , $mysql['dbase']);
@@ -173,7 +161,7 @@ if ((!mxchange_installed) || (!admin_registered))
                 define('__TITLE_VALUE' , $_POST['title']);
                 define('__SLOGAN_VALUE', $_POST['slogan']);
                 define('__EMAIL_VALUE' , $_POST['email']);
                 define('__TITLE_VALUE' , $_POST['title']);
                 define('__SLOGAN_VALUE', $_POST['slogan']);
                 define('__EMAIL_VALUE' , $_POST['email']);
-               OUTPUT_HTML ("<FORM action=\"".__BURL_ACTION."/install.php?page=finalize\" method=\"POST\" target=\"_self\">
+               OUTPUT_HTML("<FORM action=\"".__BURL_ACTION."/install.php?page=finalize\" method=\"POST\" target=\"_self\">
  <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
  <TR>
    <TD colspan=\"2\" align=\"center\">
  <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
  <TR>
    <TD colspan=\"2\" align=\"center\">
@@ -192,11 +180,11 @@ if ((!mxchange_installed) || (!admin_registered))
    <TD>
      <SELECT name=\"omode\" size=\"1\" class=\"install_select\">
        <OPTION value=\"render\"");
    <TD>
      <SELECT name=\"omode\" size=\"1\" class=\"install_select\">
        <OPTION value=\"render\"");
-               if (OUTPUT_MODE == "render") OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".MODE_RENDER."</OPTION>
+               if (OUTPUT_MODE == "render") OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".MODE_RENDER."</OPTION>
        <OPTION value=\"direct\"");
        <OPTION value=\"direct\"");
-               if (OUTPUT_MODE == "direct") OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".MODE_DIRECT."</OPTION>
+               if (OUTPUT_MODE == "direct") OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".MODE_DIRECT."</OPTION>
      </SELECT>
    </TD>
  </TR>
      </SELECT>
    </TD>
  </TR>
@@ -206,11 +194,11 @@ if ((!mxchange_installed) || (!admin_registered))
    <TD>
      <SELECT name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
        <OPTION value=\"true\"");
    <TD>
      <SELECT name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
        <OPTION value=\"true\"");
-               if (warn_no_pass) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".YES."</OPTION>
+               if (warn_no_pass) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".YES."</OPTION>
        <OPTION value=\"false\"");
        <OPTION value=\"false\"");
-               if (!warn_no_pass) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".NO."</OPTION>
+               if (!warn_no_pass) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".NO."</OPTION>
      </SELECT>
    </TD>
  </TR>
      </SELECT>
    </TD>
  </TR>
@@ -220,11 +208,11 @@ if ((!mxchange_installed) || (!admin_registered))
    <TD>
      <SELECT name=\"wfooter\" size=\"1\" class=\"install_select\">
        <OPTION value=\"true\"");
    <TD>
      <SELECT name=\"wfooter\" size=\"1\" class=\"install_select\">
        <OPTION value=\"true\"");
-               if (WRITE_FOOTER) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".YES."</OPTION>
+               if (WRITE_FOOTER) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".YES."</OPTION>
        <OPTION value=\"false\"");
        <OPTION value=\"false\"");
-               if (!WRITE_FOOTER) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".NO."</OPTION>
+               if (!WRITE_FOOTER) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".NO."</OPTION>
      </SELECT>
    </TD>
  </TR>
      </SELECT>
    </TD>
  </TR>
@@ -234,11 +222,11 @@ if ((!mxchange_installed) || (!admin_registered))
    <TD>
      <SELECT name=\"frameset\" size=\"1\" class=\"install_select\">
        <OPTION value=\"true\"");
    <TD>
      <SELECT name=\"frameset\" size=\"1\" class=\"install_select\">
        <OPTION value=\"true\"");
-               if (frameset_active) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".YES."</OPTION>
+               if (frameset_active) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".YES."</OPTION>
        <OPTION value=\"false\"");
        <OPTION value=\"false\"");
-               if (!frameset_active) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".NO."</OPTION>
+               if (!frameset_active) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".NO."</OPTION>
      </SELECT>
    </TD>
  </TR>
      </SELECT>
    </TD>
  </TR>
@@ -248,11 +236,11 @@ if ((!mxchange_installed) || (!admin_registered))
    <TD>
      <SELECT name=\"blink\" size=\"1\" class=\"install_select\">
        <OPTION value=\"true\"");
    <TD>
      <SELECT name=\"blink\" size=\"1\" class=\"install_select\">
        <OPTION value=\"true\"");
-               if (ENABLE_BACKLINK) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".YES."</OPTION>
+               if (ENABLE_BACKLINK) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".YES."</OPTION>
        <OPTION value=\"false\"");
        <OPTION value=\"false\"");
-               if (!ENABLE_BACKLINK) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".NO."</OPTION>
+               if (!ENABLE_BACKLINK) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".NO."</OPTION>
      </SELECT>
    </TD>
  </TR>
      </SELECT>
    </TD>
  </TR>
@@ -261,9 +249,9 @@ if ((!mxchange_installed) || (!admin_registered))
    <TD colspan=\"2\" align=\"center\">");
                 foreach ($mysql as $key=>$value)
                 {
    <TD colspan=\"2\" align=\"center\">");
                 foreach ($mysql as $key=>$value)
                 {
-                       OUTPUT_HTML ("    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">");
+                       OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">");
                 }
                 }
-               OUTPUT_HTML ("    <INPUT type=\"hidden\" name=\"spath\" value=\"".__SPATH_VALUE."\">
+               OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"spath\" value=\"".__SPATH_VALUE."\">
      <INPUT type=\"hidden\" name=\"burl\" value=\"".__BURL_VALUE."\">
      <INPUT type=\"hidden\" name=\"title\" value=\"".__TITLE_VALUE."\">
      <INPUT type=\"hidden\" name=\"slogan\" value=\"".__SLOGAN_VALUE."\">
      <INPUT type=\"hidden\" name=\"burl\" value=\"".__BURL_VALUE."\">
      <INPUT type=\"hidden\" name=\"title\" value=\"".__TITLE_VALUE."\">
      <INPUT type=\"hidden\" name=\"slogan\" value=\"".__SLOGAN_VALUE."\">
@@ -365,7 +353,7 @@ if ((!mxchange_installed) || (!admin_registered))
                                 define('__BURL_VALUE' , $_POST['burl']);
                                 define('__TITLE_VALUE', $_POST['title']);
  
                                 define('__BURL_VALUE' , $_POST['burl']);
                                 define('__TITLE_VALUE', $_POST['title']);
  
-                               OUTPUT_HTML ("<FORM action=\"".__BURL_ACTION."/install.php?page=2\" method=\"POST\">
+                               OUTPUT_HTML("<FORM action=\"".__BURL_ACTION."/install.php?page=2\" method=\"POST\">
  <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
  <TR>
    <TD align=\"center\">
  <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
  <TR>
    <TD align=\"center\">
@@ -403,7 +391,7 @@ if ((!mxchange_installed) || (!admin_registered))
                  elseif (mxchange_installed)
                 {
                         // Redirection after writing data... :-)
                  elseif (mxchange_installed)
                 {
                         // Redirection after writing data... :-)
-                       OUTPUT_HTML ("<SPAN class=\"install_finished\">".INSTALL_FINISHED."</SPAN><BR>
+                       OUTPUT_HTML("<SPAN class=\"install_finished\">".INSTALL_FINISHED."</SPAN><BR>
  <BR>
  <SPAN class=\"install_security\">".INSTALL_FIN_SECU."</SPAN><BR>
  <BR>
  <BR>
  <SPAN class=\"install_security\">".INSTALL_FIN_SECU."</SPAN><BR>
  <BR>
@@ -421,7 +409,7 @@ if ((!mxchange_installed) || (!admin_registered))
                 break;
  
         default:
                 break;
  
         default:
-               OUTPUT_HTML ("    <STRONG class=\"install_error\">".WRONG_PAGE."</STRONG>");
+               OUTPUT_HTML("    <STRONG class=\"install_error\">".WRONG_PAGE."</STRONG>");
                 break;
         }
  }
                 break;
         }
  }
diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php

index bc6036e6cfa261fda4576808f6016d42bcca83e5..5122ee6140aa9546e383f510e2d66544dcf57f0a 100644 (file)
--- a/inc/libs/payout_functions.php
+++ b/inc/libs/payout_functions.php
@@ -51,7 +51,7 @@ WHERE %s >= min_points
  ORDER BY type", array($POINTS), __FILE__, __LINE__);
                 if (SQL_NUMROWS($result) > 0)
                 {
  ORDER BY type", array($POINTS), __FILE__, __LINE__);
                 if (SQL_NUMROWS($result) > 0)
                 {
-                       OUTPUT_HTML ("<BR><DIV align=\"center\">
+                       OUTPUT_HTML("<BR><DIV align=\"center\">
  <DIV align=\"center\"><STRONG>".PAYOUT_NOW.":</STRONG></DIV><BR>
  <UL>");
                         // Now let's check
  <DIV align=\"center\"><STRONG>".PAYOUT_NOW.":</STRONG></DIV><BR>
  <UL>");
                         // Now let's check
@@ -62,24 +62,24 @@ ORDER BY type", array($POINTS), __FILE__, __LINE__);
                                 {
                                         // Ok we found one
                                         $P = $POINTS * $rate - 0.5;
                                 {
                                         // Ok we found one
                                         $P = $POINTS * $rate - 0.5;
-                                       OUTPUT_HTML ("<LI>".PAYOUT_IN.": <STRONG><A href=\"".URL."/modules.php?module=login&amp;what=payout&amp;payout=".$id."\">".$type." (".PAYOUT_MAX." ".round($P)." ".$type.")</A></STRONG></LI>");
+                                       OUTPUT_HTML("<LI>".PAYOUT_IN.": <STRONG><A href=\"".URL."/modules.php?module=login&amp;what=payout&amp;payout=".$id."\">".$type." (".PAYOUT_MAX." ".round($P)." ".$type.")</A></STRONG></LI>");
                                 }
                         }
  
                         // Free memory
                         SQL_FREERESULT($result);
                                 }
                         }
  
                         // Free memory
                         SQL_FREERESULT($result);
-                       OUTPUT_HTML ("</UL></DIV>");
+                       OUTPUT_HTML("</UL></DIV>");
                 }
                  else
                 {
                         // No payout types setup so far
                 }
                  else
                 {
                         // No payout types setup so far
-                       OUTPUT_HTML ("<P><FONT class=\"guest_failed\">".PAYOUT_NO_PAYOUT_TYPES."</FONT></P>");
+                       OUTPUT_HTML("<P><FONT class=\"guest_failed\">".PAYOUT_NO_PAYOUT_TYPES."</FONT></P>");
                 }
         }
          else
         {
                 // Points is empty
                 }
         }
          else
         {
                 // Points is empty
-               OUTPUT_HTML ("<P><FONT class=\"guest_failed\">".PAYOUT_NO_POINTS_ENTERED."</FONT></P>");
+               OUTPUT_HTML("<P><FONT class=\"guest_failed\">".PAYOUT_NO_POINTS_ENTERED."</FONT></P>");
         }
  }
  //
         }
  }
  //
diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php

index 6126705456b3590aa0e6eed6dfaa1d0c81f7bb54..3c4d42e6f8c03bf32c3afb42a4ae71500f664211 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -98,7 +98,7 @@ function REGISTER_OUTPUT_REQUIRE_CHECK(&$array)
                         $array[$name] = "";
                         $eval = "\$OUT = REGISTER_".strtoupper($name)."_REQUIRED;";
                         eval($eval);
                         $array[$name] = "";
                         $eval = "\$OUT = REGISTER_".strtoupper($name)."_REQUIRED;";
                         eval($eval);
-                       OUTPUT_HTML ("<STRONG><SPAN class=\"register_failed\">".$OUT."</SPAN></STRONG><BR><BR>");
+                       OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".$OUT."</SPAN></STRONG><BR><BR>");
                 }
         }
  
                 }
         }
  
@@ -166,7 +166,7 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false)
          else
         {
                 // Output directly (default)
          else
         {
                 // Output directly (default)
-               OUTPUT_HTML ($OUT);
+               OUTPUT_HTML($OUT);
         }
  }
  //
         }
  }
  //
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php

index 8faadd570efad6352c86ae9d8e9088db4f86fef9..8247227d1a3a87ccb8012aa1eafc3ad30a57161c 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -84,7 +84,7 @@ function alpha($sortby, $colspan, $return=false)
          else
         {
                 // Output generated code
          else
         {
                 // Output generated code
-               OUTPUT_HTML ($OUT);
+               OUTPUT_HTML($OUT);
         }
  }
  //
         }
  }
  //
@@ -130,7 +130,7 @@ function SortLinks($letter, $sortby, $colspan, $return=false)
          else
         {
                 // Output code
          else
         {
                 // Output code
-               OUTPUT_HTML ($OUT);
+               OUTPUT_HTML($OUT);
         }
  }
  //
         }
  }
  //
@@ -195,7 +195,7 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false)
          else
         {
                 // Output code
          else
         {
                 // Output code
-               OUTPUT_HTML ($OUT);
+               OUTPUT_HTML($OUT);
         }
  }
  // Create email link to user's account
         }
  }
  // Create email link to user's account
diff --git a/inc/modules/admin.php b/inc/modules/admin.php

index 5719f09af05de6b5cf520e50e5314fadf848cd50..55b9a3becda352f64b389262c0d84f8ea34b63ba 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -166,7 +166,7 @@ if (!admin_registered)
         if (!empty($_GET['register']))
         {
                 // Registration of first admin is done
         if (!empty($_GET['register']))
         {
                 // Registration of first admin is done
-               if ($_GET['register'] == "done") OUTPUT_HTML ("<STRONG class=\"admin\">".ADMIN_REGISTER_DONE."</STRONG>");
+               if ($_GET['register'] == "done") OUTPUT_HTML("<STRONG class=\"admin\">".ADMIN_REGISTER_DONE."</STRONG>");
         }
  
         // Check if the admin has submitted data or not
         }
  
         // Check if the admin has submitted data or not
@@ -200,7 +200,7 @@ if (!admin_registered)
                         }
                          else
                         {
                         }
                          else
                         {
-                               OUTPUT_HTML ("<STRONG class=\"admin_fatal\">".ADMIN_LOGIN_FAILED."</STRONG>");
+                               OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGIN_FAILED."</STRONG>");
                                 ADD_FATAL(CANNOT_REGISTER_SESS);
                         }
                         break;
                                 ADD_FATAL(CANNOT_REGISTER_SESS);
                         }
                         break;
@@ -315,7 +315,7 @@ if (!admin_registered)
          else
         {
                 // Something went wrong here...
          else
         {
                 // Something went wrong here...
-               OUTPUT_HTML ("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
+               OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
  
                 // Add fatal message
                 ADD_FATAL(CANNOT_UNREG_SESS);
  
                 // Add fatal message
                 ADD_FATAL(CANNOT_UNREG_SESS);
@@ -379,7 +379,7 @@ if (!admin_registered)
                  else
                 {
                         // Login failed (cookies enabled?)
                  else
                 {
                         // Login failed (cookies enabled?)
-                       OUTPUT_HTML ("<STRONG class=\"admin_fatal\">".ADMIN_LOGIN_FAILED."</STRONG>");
+                       OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGIN_FAILED."</STRONG>");
                         ADD_FATAL(CANNOT_RE_REGISTER_SESS);
                 }
                 break;
                         ADD_FATAL(CANNOT_RE_REGISTER_SESS);
                 }
                 break;
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php

index be8b8c1eb63b62b77d96a6c06354f133bf323cb3..0ee1d5157f777e399c84b061539c9b2657ece2d4 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -162,17 +162,17 @@ function CHECK_ADMIN_COOKIES ($admin_login, $password)
         return $ret;
  }
  //
         return $ret;
  }
  //
-function admin_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SEEK=0)
+function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0)
  {
  {
-       $DONE = false;  $SEEK++; $found = false;
+       $done = false;  $seek++; $found = false;
         if (file_exists($file))
         {
         if (file_exists($file))
         {
-               $search = "CFG: ".$COMMENT;
+               $search = "CFG: ".$comment;
                 $tmp = $file.".tmp";
                 $tmp = $file.".tmp";
-               $fp = fopen($file, 'r') or OUTPUT_HTML ("<STRONG>READ:</STRONG> ".$file."<BR>");
+               $fp = fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<BR>");
                 if ($fp)
                 {
                 if ($fp)
                 {
-                       $fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML ("<STRONG>WRITE:</STRONG> ".$tmp."<BR>");
+                       $fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<BR>");
                         if ($fp_tmp)
                         {
                                 while (! feof($fp))
                         if ($fp_tmp)
                         {
                                 while (! feof($fp))
@@ -181,10 +181,10 @@ function admin_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SEEK=0)
                                         if (strpos($line, $search) > -1) { $next = 0; $found = true; }
                                         if ($next > -1)
                                         {
                                         if (strpos($line, $search) > -1) { $next = 0; $found = true; }
                                         if ($next > -1)
                                         {
-                                               if ($next == $SEEK)
+                                               if ($next == $seek)
                                                 {
                                                         $next = -1;
                                                 {
                                                         $next = -1;
-                                                       $line = $PREFIX.$DATA.$SUFFIX."\n";
+                                                       $line = $prefix . $DATA . $suffix."\n";
                                                 }
                                                  else
                                                 {
                                                 }
                                                  else
                                                 {
@@ -195,10 +195,10 @@ function admin_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SEEK=0)
                                 }
                                 fclose($fp_tmp);
                                 // Finished writing tmp file
                                 }
                                 fclose($fp_tmp);
                                 // Finished writing tmp file
-                               $DONE = true;
+                               $done = true;
                         }
                         fclose($fp);
                         }
                         fclose($fp);
-                       if (($DONE) && ($found))
+                       if (($done) && ($found))
                         {
                                 // Copy back tmp file and delete tmp :-)
                                 @copy($tmp, $file);
                         {
                                 // Copy back tmp file and delete tmp :-)
                                 @copy($tmp, $file);
@@ -207,25 +207,25 @@ function admin_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SEEK=0)
                         }
                          elseif (!$found)
                         {
                         }
                          elseif (!$found)
                         {
-                               OUTPUT_HTML ("<STRONG>CHANGE:</STRONG> 404!");
+                               OUTPUT_HTML("<STRONG>CHANGE:</STRONG> 404!");
                                 define ('_FATAL', true);
                         }
                          else
                         {
                                 define ('_FATAL', true);
                         }
                          else
                         {
-                               OUTPUT_HTML ("<STRONG>TMP:</STRONG> UNDONE!");
+                               OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");
                                 define ('_FATAL', true);
                         }
                 }
         }
          else
         {
                                 define ('_FATAL', true);
                         }
                 }
         }
          else
         {
-               OUTPUT_HTML ("<STRONG>404:</STRONG> ".$file."<BR>");
+               OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<BR>");
         }
  }
  //
  function ADMIN_DO_ACTION($wht)
  {
         }
  }
  //
  function ADMIN_DO_ACTION($wht)
  {
-       global $menuDesription, $MTITLE, $CONFIG, $EXTENSIONS, $link, $DATA;
+       global $menuDesription, $menuTitle, $CONFIG, $EXTENSIONS, $link, $DATA;
         //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
         if (EXT_IS_ACTIVE("cache"))
         {
         //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
         if (EXT_IS_ACTIVE("cache"))
         {
@@ -304,12 +304,12 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
  //
  function ADD_ADMIN_MENU($act, $wht,$return=false)
  {
  //
  function ADD_ADMIN_MENU($act, $wht,$return=false)
  {
-       global $_GET, $menuDesription, $MTITLE, $link;
+       global $_GET, $menuDesription, $menuTitle, $link;
         $SUB = false;
  
         // Menu descriptions
         $menuDesription = array();
         $SUB = false;
  
         // Menu descriptions
         $menuDesription = array();
-       $MTITLE = array();
+       $menuTitle = array();
  
         // Build main menu
         $result_main = SQL_QUERY("SELECT action, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE what='' ORDER BY sort, id DESC", __FILE__, __LINE__);
  
         // Build main menu
         $result_main = SQL_QUERY("SELECT action, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE what='' ORDER BY sort, id DESC", __FILE__, __LINE__);
@@ -334,7 +334,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                 if (!$SUB)
                                 {
                                         // Insert compiled menu title and description
                                 if (!$SUB)
                                 {
                                         // Insert compiled menu title and description
-                                       $MTITLE[$menu]        = $title;
+                                       $menuTitle[$menu]        = $title;
                                         $menuDesription[$menu] = $descr;
                                 }
                                 $OUT .= "<TR>
                                         $menuDesription[$menu] = $descr;
                                 }
                                 $OUT .= "<TR>
@@ -364,7 +364,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                 if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))
                                 {
                                         $menuDesription = array();
                                 if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))
                                 {
                                         $menuDesription = array();
-                                       $MTITLE = array(); $SUB = true;
+                                       $menuTitle = array(); $SUB = true;
                                         $OUT .= "<TR>
    <TD width=\"10\" class=\"seperator\">&nbsp;</TD>
    <TD class=\"admin_menu\">
                                         $OUT .= "<TR>
    <TD width=\"10\" class=\"seperator\">&nbsp;</TD>
    <TD class=\"admin_menu\">
@@ -386,7 +386,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                                 if ($ACL)
                                                 {
                                                         // Insert compiled title and description
                                                 if ($ACL)
                                                 {
                                                         // Insert compiled title and description
-                                                       $MTITLE[$wht_sub]        = $title_what;
+                                                       $menuTitle[$wht_sub]        = $title_what;
                                                         $menuDesription[$wht_sub] = $desc_what;
                                                         $OUT .= "<TR>
    <TD class=\"admin_menu\" colspan=\"2\">
                                                         $menuDesription[$wht_sub] = $desc_what;
                                                         $OUT .= "<TR>
    <TD class=\"admin_menu\" colspan=\"2\">
@@ -451,7 +451,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
         if ($return) {
                 return $OUT;
         } else {
         if ($return) {
                 return $OUT;
         } else {
-               OUTPUT_HTML ($OUT);
+               OUTPUT_HTML($OUT);
         }
  }
  //
         }
  }
  //
diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php

index 2a840db9b19c9ed785a1d29d151262805e555814..444d18f04a4028a69f4fea4b7a57e42aa62a8d89 100644 (file)
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -131,7 +131,7 @@ if ($_GET['u_id'] == "all")
          else
         {
                 // User not found!
          else
         {
                 // User not found!
-               OUTPUT_HTML ("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+               OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
         }
  }
   else
         }
  }
   else
diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php

index 803b98bc38c87eca2a147057ca02bf66e2a59825..3a039943e736afd5f45a40eeb191e597ca8944c1 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -55,7 +55,7 @@ if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
  OPEN_TABLE("100%", "admin_content admin_content_align", "");
  
  // List all menu points and make them editable
  OPEN_TABLE("100%", "admin_content admin_content_align", "");
  
  // List all menu points and make them editable
-OUTPUT_HTML ("<BR><BR></FONT>
+OUTPUT_HTML("<BR><BR></FONT>
  <DIV align=\"center\">");
  if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
  {
  <DIV align=\"center\">");
  if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
  {
@@ -302,7 +302,7 @@ WHERE ".$AND." AND id=%d LIMIT 1",
                 LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
         }
  }
                 LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
         }
  }
-OUTPUT_HTML ("</DIV>");
+OUTPUT_HTML("</DIV>");
  CLOSE_TABLE();
  //
  ?>
  CLOSE_TABLE();
  //
  ?>
diff --git a/inc/modules/admin/what-admins_add.php b/inc/modules/admin/what-admins_add.php

index c3073789f19d362504197c4a855bc82d07cd2d06..bb740c380eefb0837e2ce6f4e05cd90b0588cade 100644 (file)
--- a/inc/modules/admin/what-admins_add.php
+++ b/inc/modules/admin/what-admins_add.php
@@ -58,7 +58,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['login'])) && (!empty($_POST['email
                  array($_POST['login'], generateHash($_POST['pass1']), $_POST['email']), __FILE__, __LINE__);
  
                 // Admin login saved
                  array($_POST['login'], generateHash($_POST['pass1']), $_POST['email']), __FILE__, __LINE__);
  
                 // Admin login saved
-               LOAD_TEMPLATE ("admin_settings_saved", false, "<FONT class=\"admin_done\">".ADMIN_ADMINS_ADD_DONE."</FONT>");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<FONT class=\"admin_done\">".ADMIN_ADMINS_ADD_DONE."</FONT>");
  
                 // Remove cache file
                 if (EXT_IS_ACTIVE("cache"))
  
                 // Remove cache file
                 if (EXT_IS_ACTIVE("cache"))
diff --git a/inc/modules/admin/what-config_home.php b/inc/modules/admin/what-config_home.php

index d5806152cf865b930b00b3e635e9f0962c6c3e7d..5a72347a087bfbeb438514ac259d25339cbfe507 100644 (file)
--- a/inc/modules/admin/what-config_home.php
+++ b/inc/modules/admin/what-config_home.php
@@ -54,7 +54,7 @@ case "settings": // Settings related to the index page
         {
                 // Save settings
                 ADMIN_SAVE_SETTINGS($_POST, "_config", "config='0'");
         {
                 // Save settings
                 ADMIN_SAVE_SETTINGS($_POST, "_config", "config='0'");
-               OUTPUT_HTML ("<A href=\"".URL."/modules.php?module=admin&amp;what=config_home&amp;sub=settings\">".ADMIN_CONTINUE_TO_CONFIG."</A>");
+               OUTPUT_HTML("<A href=\"".URL."/modules.php?module=admin&amp;what=config_home&amp;sub=settings\">".ADMIN_CONTINUE_TO_CONFIG."</A>");
         }
          else
         {
         }
          else
         {
diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php

index cfd12d9b582954c5cda65c5f6bea6cdfb8f9a278..22d2bef91ec55cb9331164222abd9c1094fe732a 100644 (file)
--- a/inc/modules/admin/what-config_mods.php
+++ b/inc/modules/admin/what-config_mods.php
@@ -83,7 +83,7 @@ if (isset($_POST['edit']))
         {
                 // Nothing selected
                 LOAD_TEMPLATE("admin_settings_saved", false, MODS_NOTHING_SELECTED);
         {
                 // Nothing selected
                 LOAD_TEMPLATE("admin_settings_saved", false, MODS_NOTHING_SELECTED);
-               OUTPUT_HTML ("<BR>");
+               OUTPUT_HTML("<BR>");
  
                 // Remove maybe confusing data
                 unset($_POST['edit']);
  
                 // Remove maybe confusing data
                 unset($_POST['edit']);
@@ -111,7 +111,7 @@ if (isset($_POST['edit']))
  
         // Entries updated
         LOAD_TEMPLATE("admin_settings_saved", false, MODS_CHANGED);
  
         // Entries updated
         LOAD_TEMPLATE("admin_settings_saved", false, MODS_CHANGED);
-       OUTPUT_HTML ("<BR>");
+       OUTPUT_HTML("<BR>");
  }
  
  if ($SEL == 0)
  }
  
  if ($SEL == 0)
diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php

index ef2ee324cd8112c382c029509a6c5c22ae4184c5..93074ff03e0ba439f8463c51d3c0020464ae01dd 100644 (file)
--- a/inc/modules/admin/what-config_payouts.php
+++ b/inc/modules/admin/what-config_payouts.php
@@ -235,12 +235,12 @@ if ((SQL_NUMROWS($result_mem) > 0) && ($display))
  {
         // Members has requested payouts
         SQL_FREERESULT($result_mem);
  {
         // Members has requested payouts
         SQL_FREERESULT($result_mem);
-       OUTPUT_HTML ("<P><A href=\"".URL."/modules.php?module=admin&amp;what=list_payouts\">".ADMIN_PAYOUT_LIST_REQUESTS."</A></P>");
+       OUTPUT_HTML("<P><A href=\"".URL."/modules.php?module=admin&amp;what=list_payouts\">".ADMIN_PAYOUT_LIST_REQUESTS."</A></P>");
  }
   elseif ($display)
  {
         // No member requests so far
  }
   elseif ($display)
  {
         // No member requests so far
-       OUTPUT_HTML ("<P><STRONG>".ADMIN_PAYOUT_NO_MEMBER_REQUESTS."</STRONG></P>");
+       OUTPUT_HTML("<P><STRONG>".ADMIN_PAYOUT_NO_MEMBER_REQUESTS."</STRONG></P>");
  }
  // Add new paypout type
  if ($display) LOAD_TEMPLATE("admin_payout_add_new");
  }
  // Add new paypout type
  if ($display) LOAD_TEMPLATE("admin_payout_add_new");
diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php

index 91565cf9e3234575182989391ef1fc3b71645895..02ed535f9a92708b8daeb4d51841ba811290c9e5 100644 (file)
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -62,7 +62,7 @@ VALUES ('%s', '%s', '%s', '%s')",
         $_POST['points'],
         $_POST['info']
  ), __FILE__, __LINE__);
         $_POST['points'],
         $_POST['info']
  ), __FILE__, __LINE__);
-                               LOAD_TEMPLATE ("admin_settings_saved", false, RALLYE_PRICE_LEVEL_SAVED);
+                               LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_PRICE_LEVEL_SAVED);
                         }
                          else
                         {
                         }
                          else
                         {
@@ -70,7 +70,7 @@ VALUES ('%s', '%s', '%s', '%s')",
                                 SQL_FREERESULT($result);
  
                                 // Price level found!
                                 SQL_FREERESULT($result);
  
                                 // Price level found!
-                               LOAD_TEMPLATE ("admin_settings_saved", false, RALLYE_PRICE_ALREADY_FOUND);
+                               LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_PRICE_ALREADY_FOUND);
                         }
                 }
         }
                         }
                 }
         }
@@ -88,11 +88,11 @@ VALUES ('%s', '%s', '%s', '%s')",
                         }
  
                         // Output message
                         }
  
                         // Output message
-                       LOAD_TEMPLATE ("admin_settings_saved", false, RALLYE_ENTRIES_DELETED);
+                       LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_ENTRIES_DELETED);
                 }
                  else
                 {
                 }
                  else
                 {
-                       LOAD_TEMPLATE ("admin_settings_saved", false, RALLYE_ENTRIES_NOT_DELETED);
+                       LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_ENTRIES_NOT_DELETED);
                 }
         }
          elseif (isset($_POST['change']))
                 }
         }
          elseif (isset($_POST['change']))
@@ -109,7 +109,7 @@ VALUES ('%s', '%s', '%s', '%s')",
                 }
  
                 // Output message
                 }
  
                 // Output message
-               LOAD_TEMPLATE ("admin_settings_saved", false, RALLYE_ENTRIES_CHANGED);
+               LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_ENTRIES_CHANGED);
         }
  
         if (isset($_POST['edit']))
         }
  
         if (isset($_POST['edit']))
diff --git a/inc/modules/admin/what-config_register.php b/inc/modules/admin/what-config_register.php

index 3dca07b7c99bfbae3717f3603c2097ef148d3576..55b411fb52ad82bc7ab72ce57aaa736ec7e0bd20 100644 (file)
--- a/inc/modules/admin/what-config_register.php
+++ b/inc/modules/admin/what-config_register.php
@@ -49,7 +49,7 @@ if (isset($_POST['ok']))
                 $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_must_register SET field_required='%s' WHERE id=%d AND field_required != '%s' LIMIT 1",
                  array($value, bigintval($id), $value),__FILE__, __LINE__);
         }
                 $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_must_register SET field_required='%s' WHERE id=%d AND field_required != '%s' LIMIT 1",
                  array($value, bigintval($id), $value),__FILE__, __LINE__);
         }
-       LOAD_TEMPLATE ("admin_settings_saved", false, REGISTER_ADMIN_CHANGES_SAVED);
+       LOAD_TEMPLATE("admin_settings_saved", false, REGISTER_ADMIN_CHANGES_SAVED);
  }
  
  // List all register values
  }
  
  // List all register values
diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php

index 136b0f947c738457cc69a636afc5275b44972d0d..60079d8830b61c33bd0b5e85c9dd71ddb0e41536 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -92,7 +92,7 @@ ON s.pool_id=%d LIMIT 1",
                          array(bigintval($stats_id)), __FILE__, __LINE__);
  
                         // Output link for manually removing stats entry
                          array(bigintval($stats_id)), __FILE__, __LINE__);
  
                         // Output link for manually removing stats entry
-                       LOAD_TEMPLATE ("admin_settings_saved", false, "<A href=\"".URL."/modules.php?module=admin&amp;what=del_email&amp;pid=".$_GET['mid']."\">".ADMIN_REMOVE_STATS_ENTRY."</A>");
+                       LOAD_TEMPLATE("admin_settings_saved", false, "<A href=\"".URL."/modules.php?module=admin&amp;what=del_email&amp;pid=".$_GET['mid']."\">".ADMIN_REMOVE_STATS_ENTRY."</A>");
                 }
         }
          else
                 }
         }
          else
@@ -143,7 +143,7 @@ ON s.pool_id=%d LIMIT 1",
   else
  {
         // No mail orders fond
   else
  {
         // No mail orders fond
-       LOAD_TEMPLATE ("admin_settings_saved", false, ADMIN_WRONG_CALL);
+       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_WRONG_CALL);
  }
  CLOSE_TABLE();
  //
  }
  CLOSE_TABLE();
  //
diff --git a/inc/modules/admin/what-del_task.php b/inc/modules/admin/what-del_task.php

index 652798112d9988ed38576f4a7df78d516757f51e..edef52bfd74dc86bb3f9fd8e21bbb5ad58142935 100644 (file)
--- a/inc/modules/admin/what-del_task.php
+++ b/inc/modules/admin/what-del_task.php
@@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
  }
  // Add description as navigation point
  ADD_DESCR("admin", basename(__FILE__));
  }
  // Add description as navigation point
  ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML ("</FONT><BR><BR>");
+OUTPUT_HTML("</FONT><BR><BR>");
  
  //
  ?>
  
  //
  ?>
diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php

index d3a3d24471a4d55d691288ecf7030699af2e2561..9799da4fb5763c3e5549bc33c0bc5418ca812e05 100644 (file)
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -56,12 +56,12 @@ if ((isset($_POST['ok'])) || ((isset($_POST['del'])) && (!empty($_POST['reason']
  
                 // Delete user account
                 DELETE_USER_ACCOUNT(bigintval($_GET['u_id']), $_POST['reason']);
  
                 // Delete user account
                 DELETE_USER_ACCOUNT(bigintval($_GET['u_id']), $_POST['reason']);
-               OUTPUT_HTML ("<STRONG class=\"admin_green\">".ADMIN_DEL_COMPLETED."</STRONG>");
+               OUTPUT_HTML("<STRONG class=\"admin_green\">".ADMIN_DEL_COMPLETED."</STRONG>");
         }
          else
         {
                 // Account does not exists!
         }
          else
         {
                 // Account does not exists!
-               OUTPUT_HTML ("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+               OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
         }
  }
   elseif (!empty($_POST['no']))
         }
  }
   elseif (!empty($_POST['no']))
@@ -97,7 +97,7 @@ if ((isset($_POST['ok'])) || ((isset($_POST['del'])) && (!empty($_POST['reason']
          else
         {
                 // Account does not exists!
          else
         {
                 // Account does not exists!
-               OUTPUT_HTML ("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+               OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
         }
  }
  CLOSE_TABLE();
         }
  }
  CLOSE_TABLE();
diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php

index 8c566cfb1ffb6a1455833ebaa2838b1f25367684..bf98dad7c04761ebe40a2c9bb0805d5537b21220 100644 (file)
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -131,7 +131,7 @@ WHERE id=%d LIMIT 1",
   else
  {
         // No mail orders left in pool
   else
  {
         // No mail orders left in pool
-       OUTPUT_HTML ("<SPAN class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</SPAN>");
+       OUTPUT_HTML("<SPAN class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</SPAN>");
  }
  CLOSE_TABLE();
  //
  }
  CLOSE_TABLE();
  //
diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php

index 657f1273ba686de79e35152305034497e23a86f4..ea524158c7ccf010a82b1254d646e4a2012e9fa7 100644 (file)
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -148,7 +148,7 @@ WHERE userid=%d LIMIT 1",
   else
  {
         // Account does not exists!
   else
  {
         // Account does not exists!
-       OUTPUT_HTML ("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+       OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
  }
  CLOSE_TABLE();
  //
  }
  CLOSE_TABLE();
  //
diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php

index b267cc45b363055da9a7cec9db0d6eb4bf35d83e..1de43e9441be822d656926475d31a7003f492fd5 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -132,7 +132,7 @@ if (SQL_NUMROWS($result) > 0)
   else
  {
         // No mail orders fond
   else
  {
         // No mail orders fond
-       OUTPUT_HTML ("<SPAN class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</SPAN>");
+       OUTPUT_HTML("<SPAN class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</SPAN>");
  }
  //
  ?>
  }
  //
  ?>
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php

index fea0be8d85e3c01b89325c4b6a564a0843bc76bf..0fbd32f90c6894fe6db7ab937449b412bc51b7d1 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -125,7 +125,7 @@ $MAIL = false;
  if (SQL_NUMROWS($result_list) > 0)
  {
         // Mail orders are in pool so we can display them
  if (SQL_NUMROWS($result_list) > 0)
  {
         // Mail orders are in pool so we can display them
-       OUTPUT_HTML ("<DIV align=\"center\">
+       OUTPUT_HTML("<DIV align=\"center\">
  <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\" width=\"99%\">
  <TR>
    <TD colspan=\"3\" align=\"center\" height=\"25\" class=\"admin_title\">
  <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\" width=\"99%\">
  <TR>
    <TD colspan=\"3\" align=\"center\" height=\"25\" class=\"admin_title\">
@@ -158,7 +158,7 @@ if (SQL_NUMROWS($result_list) > 0)
                 }
  
                 // List mail
                 }
  
                 // List mail
-               OUTPUT_HTML ("<TR>
+               OUTPUT_HTML("<TR>
    <TD class=\"bottom top2 right\" width=\"23%\" align=\"center\">
      ".EMAIL_SENDER.":<BR>
      <STRONG class=\"admin_misc\">".ADMIN_USER_PROFILE_LINK($pool[1])."</STRONG>
    <TD class=\"bottom top2 right\" width=\"23%\" align=\"center\">
      ".EMAIL_SENDER.":<BR>
      <STRONG class=\"admin_misc\">".ADMIN_USER_PROFILE_LINK($pool[1])."</STRONG>
@@ -227,13 +227,13 @@ if (SQL_NUMROWS($result_list) > 0)
         if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $CONFIG['mails_page'], false, "3");
  
         // Output footer
         if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $CONFIG['mails_page'], false, "3");
  
         // Output footer
-       OUTPUT_HTML ("</TABLE>
+       OUTPUT_HTML("</TABLE>
  </DIV>");
         $MAIL = true;
         if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL))
         {
                 // Check only if bonus extension is active
  </DIV>");
         $MAIL = true;
         if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL))
         {
                 // Check only if bonus extension is active
-               if (SQL_NUMROWS($result_bonus) > 0) OUTPUT_HTML ("<BR><BR>");
+               if (SQL_NUMROWS($result_bonus) > 0) OUTPUT_HTML("<BR><BR>");
         }
  }
  
         }
  }
  
@@ -243,7 +243,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL))
         if (SQL_NUMROWS($result_bonus) > 0)
         {
                 // Mail orders are in pool so we can display them
         if (SQL_NUMROWS($result_bonus) > 0)
         {
                 // Mail orders are in pool so we can display them
-               OUTPUT_HTML ("<DIV align=\"center\">
+               OUTPUT_HTML("<DIV align=\"center\">
  <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\" width=\"99%\">
  <TR>
    <TD colspan=\"3\" align=\"center\" height=\"25\" class=\"admin_title\">
  <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\" width=\"99%\">
  <TR>
    <TD colspan=\"3\" align=\"center\" height=\"25\" class=\"admin_title\">
@@ -267,7 +267,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL))
                                 $unconfirmed = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus[0]."\">".$unconfirmed."</A></STRONG>";
                         }
  
                                 $unconfirmed = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus[0]."\">".$unconfirmed."</A></STRONG>";
                         }
  
-                       OUTPUT_HTML ("<TR>
+                       OUTPUT_HTML("<TR>
    <TD class=\"bottom top2 right\" colspan=\"2\" width=\"46%\" align=\"center\">
      ".EMAIL_SUBJECT.":<BR>
      <STRONG class=\"admin_misc\">".$bonus[1]."</STRONG>
    <TD class=\"bottom top2 right\" colspan=\"2\" width=\"46%\" align=\"center\">
      ".EMAIL_SUBJECT.":<BR>
      <STRONG class=\"admin_misc\">".$bonus[1]."</STRONG>
@@ -333,7 +333,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL))
                 if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $CONFIG['mails_page'], false, "3");
  
                 // Output footer
                 if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $CONFIG['mails_page'], false, "3");
  
                 // Output footer
-               OUTPUT_HTML ("</TABLE>
+               OUTPUT_HTML("</TABLE>
  </DIV>");
                 $MAIL = true;
         }
  </DIV>");
                 $MAIL = true;
         }
@@ -342,7 +342,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL))
  if (!$MAIL)
  {
         // No mail orders fond
  if (!$MAIL)
  {
         // No mail orders fond
-       OUTPUT_HTML ("<SPAN class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</SPAN>");
+       OUTPUT_HTML("<SPAN class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</SPAN>");
  }
  //
  ?>
  }
  //
  ?>
diff --git a/inc/modules/admin/what-email_stats.php b/inc/modules/admin/what-email_stats.php

index fc5a36192658518340c54c71222caedb5ec8c9fc..5612fce7def6c27f9f5f59891fccd4ba342d34bc 100644 (file)
--- a/inc/modules/admin/what-email_stats.php
+++ b/inc/modules/admin/what-email_stats.php
@@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
  }
  // Add description as navigation point
  ADD_DESCR("admin", basename(__FILE__));
  }
  // Add description as navigation point
  ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML ("</FONT><BR>");
+OUTPUT_HTML("</FONT><BR>");
  
  OPEN_TABLE("100%", "admin_content admin_content_align", "");
  CLOSE_TABLE();
  
  OPEN_TABLE("100%", "admin_content admin_content_align", "");
  CLOSE_TABLE();
diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php

index 0fd97cf399d97775e47accaf4aef1fbb0ff4a1e7..ce0ccaaaf5f378275e44c1ab028124473f170eb4 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -103,9 +103,9 @@ if (!empty($_GET['reg_ext'])) {
                 }
  
                 // Extensions changed
                 }
  
                 // Extensions changed
-               OUTPUT_HTML ("<P align=\"center\">");
+               OUTPUT_HTML("<P align=\"center\">");
                 LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_EXT_CHANGED);
                 LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_EXT_CHANGED);
-               OUTPUT_HTML ("</P>");
+               OUTPUT_HTML("</P>");
         } else {
                 // Edit selected entries
                 $SW = "2"; $OUT = "";
         } else {
                 // Edit selected entries
                 $SW = "2"; $OUT = "";
@@ -277,7 +277,7 @@ case "overview": // List all registered extensions
                 LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_EXTENSION_REGISTERED."</FONT>");
         }
         // Link for checking for new or updated extensions
                 LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_EXTENSION_REGISTERED."</FONT>");
         }
         // Link for checking for new or updated extensions
-       OUTPUT_HTML ("<BR><A href=\"".URL."/modules.php?module=admin&amp;what=extensions&amp;do=search\">".ADMIN_SEARCH_NEW_EXTENSIONS."</A>");
+       OUTPUT_HTML("<BR><A href=\"".URL."/modules.php?module=admin&amp;what=extensions&amp;do=search\">".ADMIN_SEARCH_NEW_EXTENSIONS."</A>");
         break;
  
  case "register": // Register new extension
         break;
  
  case "register": // Register new extension
diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php

index 7e392e0d28d49ee45f9d30e7b70588d133ad9087..460cbb0e815621a77cbf48810bb18409675e6fdd 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
  }
  // Add description as navigation point
  ADD_DESCR("admin", basename(__FILE__));
  }
  // Add description as navigation point
  ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML ("</FONT><BR>");
+OUTPUT_HTML("</FONT><BR>");
  
  OPEN_TABLE("100%", "admin_content admin_content_align", "");
  
  
  OPEN_TABLE("100%", "admin_content admin_content_align", "");
  
diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php

index 1f301e8b0a672f10ac90e56c27c57c84bf663170..5643bc183c9620f4eec49b5083735486f26fc51b 100644 (file)
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -55,7 +55,7 @@ if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
  
  OPEN_TABLE("100%", "admin_content admin_content_align", "");
  // List all menu points and make them editable
  
  OPEN_TABLE("100%", "admin_content admin_content_align", "");
  // List all menu points and make them editable
-OUTPUT_HTML ("<BR><BR></FONT>
+OUTPUT_HTML("<BR><BR></FONT>
  <DIV align=\"center\">");
  if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
  {
  <DIV align=\"center\">");
  if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
  {
@@ -363,7 +363,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                 LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
         }
  }
                 LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
         }
  }
-OUTPUT_HTML ("</DIV>");
+OUTPUT_HTML("</DIV>");
  CLOSE_TABLE();
  //
  ?>
  CLOSE_TABLE();
  //
  ?>
diff --git a/inc/modules/admin/what-holiday_list.php b/inc/modules/admin/what-holiday_list.php

index 9e02cde35ffaa64145be70198c00a461e1261fda..6446e9a8ea91cbb7ba7d1afdeefcd036843e8de3 100644 (file)
--- a/inc/modules/admin/what-holiday_list.php
+++ b/inc/modules/admin/what-holiday_list.php
@@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
  }
  // Add description as navigation point
  ADD_DESCR("admin", basename(__FILE__));
  }
  // Add description as navigation point
  ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML ("</FONT><BR><BR>");
+OUTPUT_HTML("</FONT><BR><BR>");
  
  //
  ?>
  
  //
  ?>
diff --git a/inc/modules/admin/what-holiday_remove.php b/inc/modules/admin/what-holiday_remove.php

index 8d935e23fcaf3319b108f1ece079ecf9746274bc..fe6cddb34a4721497f6cc1c3010bf84ade50729e 100644 (file)
--- a/inc/modules/admin/what-holiday_remove.php
+++ b/inc/modules/admin/what-holiday_remove.php
@@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
  }
  // Add description as navigation point
  ADD_DESCR("admin", basename(__FILE__));
  }
  // Add description as navigation point
  ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML ("</FONT><BR><BR>");
+OUTPUT_HTML("</FONT><BR><BR>");
  
  //
  ?>
  
  //
  ?>
diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php

index f9b7e02e47e9b762098221e7997a749356b508d1..84016ea7903009245bbb8763fc096ca7ef4dd7a1 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -172,7 +172,7 @@ if (!empty($_GET['pid']))
                                  else
                                 {
                                         // Cannot load payout id
                                  else
                                 {
                                         // Cannot load payout id
-                                       OUTPUT_HTML ("<STRONG class=\"admin_failed\">".PAYOUT_FAILED_OBTAIN_PAYOUT_ID."</STRONG>");
+                                       OUTPUT_HTML("<STRONG class=\"admin_failed\">".PAYOUT_FAILED_OBTAIN_PAYOUT_ID."</STRONG>");
                                 }
                         }
                          else
                                 }
                         }
                          else
diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php

index cc8c44946e2aa2c46314ec0ccef0ed9eeae43ad8..3ecc0c7e862ff653e282f052bb18b4c8a8d69f14 100644 (file)
--- a/inc/modules/admin/what-list_refs.php
+++ b/inc/modules/admin/what-list_refs.php
@@ -73,7 +73,7 @@ if (!empty($_GET['u_id']))
                 $result = SQL_QUERY_ESC("SELECT userid, sex, surname, family, email, status, joined FROM "._MYSQL_PREFIX."_user_data WHERE refid=%d ORDER BY userid",
                  array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
  
                 $result = SQL_QUERY_ESC("SELECT userid, sex, surname, family, email, status, joined FROM "._MYSQL_PREFIX."_user_data WHERE refid=%d ORDER BY userid",
                  array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
  
-               OUTPUT_HTML (ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($_GET['u_id'])."".ADMIN_TOTAL_REFS_2.$menge.ADMIN_TOTAL_REFS_3.$menge_lck.ADMIN_TOTAL_REFS_4."<BR><BR>");
+               OUTPUT_HTML(ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($_GET['u_id'])."".ADMIN_TOTAL_REFS_2.$menge.ADMIN_TOTAL_REFS_3.$menge_lck.ADMIN_TOTAL_REFS_4."<BR><BR>");
                 if ($result)
                 {
                         $rows = SQL_NUMROWS($result);
                 if ($result)
                 {
                         $rows = SQL_NUMROWS($result);
diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php

index d2e1fd48fbb58368cb36371178fa95415372f4ff..c257d797f6ffca55e40a41b66cb08666b810046e 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -155,7 +155,7 @@ if (!empty($_GET['u_id']))
                          else
                         {
                                 // Account does not exists!
                          else
                         {
                                 // Account does not exists!
-                               OUTPUT_HTML ("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+                               OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
                         }
                 }
                 if (!empty($URL))
                         }
                 }
                 if (!empty($URL))
@@ -179,7 +179,7 @@ if (!empty($_GET['u_id']))
          else
         {
                 // Account does not exists!
          else
         {
                 // Account does not exists!
-               OUTPUT_HTML ("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+               OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
         }
  }
   else
         }
  }
   else
diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php

index 85844bb5c00ca09b0a84a24ba63ab01c3f07e335..efffe465da0aa292b4742f59af0f252d2f93ea31 100644 (file)
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -75,17 +75,17 @@ if (!empty($_GET['access'])) {
         $dir = PATH.LOGS_BASE."/";
         if (is_dir($dir)) {
                 // logs directory does exist
         $dir = PATH.LOGS_BASE."/";
         if (is_dir($dir)) {
                 // logs directory does exist
-               OUTPUT_HTML ("<OL>");
+               OUTPUT_HTML("<OL>");
                 $handle = @opendir($dir) or mxchange_die("Cannot open directory ".LOGS_BASE."!");
                 while($file = @readdir($handle)) {
                         // We currenly only like files with "access" as prefix, should be more flexible!
                         if (substr($file, 0, 6) == "access") {
                                 // Okay, let us print it out
                 $handle = @opendir($dir) or mxchange_die("Cannot open directory ".LOGS_BASE."!");
                 while($file = @readdir($handle)) {
                         // We currenly only like files with "access" as prefix, should be more flexible!
                         if (substr($file, 0, 6) == "access") {
                                 // Okay, let us print it out
-                               OUTPUT_HTML ("<LI><A href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what']."&access=".urlencode($file)."\">".$file."</A></LI>");
+                               OUTPUT_HTML("<LI><A href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what']."&access=".urlencode($file)."\">".$file."</A></LI>");
                         }
                 }
                 @closedir($handle);
                         }
                 }
                 @closedir($handle);
-               OUTPUT_HTML ("</OL>");
+               OUTPUT_HTML("</OL>");
         }
          else
         {
         }
          else
         {
diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php

index ec086086ad2708faa7204d850bf98b7875af87b1..766509afde475af1206e3fb963f783bcab7ee3fd 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -40,7 +40,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
  }
  // Add desciption as navigation point
  ADD_DESCR("admin", basename(__FILE__));
  }
  // Add desciption as navigation point
  ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML ("</FONT><BR>");
+OUTPUT_HTML("</FONT><BR>");
  
  OPEN_TABLE("100%", "admin_content admin_content_align", "");
  
  
  OPEN_TABLE("100%", "admin_content admin_content_align", "");
  
diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php

index ed7673bb21c052734736ab2fa2590d912914b8ef..b380436a9735c6a9949fbb15726cd4dce064a07d 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -55,7 +55,7 @@ if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
  
  OPEN_TABLE("100%", "admin_content admin_content_align", "");
  // List all menu points and make them editable
  
  OPEN_TABLE("100%", "admin_content admin_content_align", "");
  // List all menu points and make them editable
-OUTPUT_HTML ("<BR><BR></FONT>
+OUTPUT_HTML("<BR><BR></FONT>
  <DIV align=\"center\">");
  if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
  {
  <DIV align=\"center\">");
  if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
  {
@@ -325,7 +325,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                 LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
         }
  }
                 LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
         }
  }
-OUTPUT_HTML ("</DIV>");
+OUTPUT_HTML("</DIV>");
  CLOSE_TABLE();
  //
  ?>
  CLOSE_TABLE();
  //
  ?>
diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php

index 7c443d6d65aeecb1ad503e545adeb6eb56939967..e18bbad546cdfac61b2d76fc69511d2b8eeb0767 100644 (file)
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -69,7 +69,7 @@ if ($JOBS_DONE)
                 {
                         // Prepare content
                         $content = array(
                 {
                         // Prepare content
                         $content = array(
-                               'title' => $MTITLE[$key],
+                               'title' => $menuTitle[$key],
                                 'text'  => $value
                         );
  
                                 'text'  => $value
                         );
  
diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php

index ef60bdb2b0d98f051a6d3e381f0f04e91ef624f8..5445bec1fc4c1cd06ed92c404eb1a91eed93dc38 100644 (file)
--- a/inc/modules/admin/what-send_bonus.php
+++ b/inc/modules/admin/what-send_bonus.php
@@ -130,12 +130,12 @@ VALUES ('%s', '%s', '%s', '%s', '%s', 'NEW', UNIX_TIMESTAMP(), '%s', '%s', '%s',
                 }
  
                 // Mail inserted into bonus pool
                 }
  
                 // Mail inserted into bonus pool
-               LOAD_TEMPLATE ("admin_settings_saved", false, ADMIN_BONUS_SEND);
+               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_SEND);
         }
          else
         {
                 // More entered than can be reached!
         }
          else
         {
                 // More entered than can be reached!
-               LOAD_TEMPLATE ("admin_settings_saved", false, ADMIN_MORE_SELECTED);
+               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MORE_SELECTED);
         }
         if (!empty($URL))
         {
         }
         if (!empty($URL))
         {
@@ -236,7 +236,7 @@ WHERE userid=%d AND status='CONFIRMED' AND receive_mails > 0".$MORE." LIMIT 1",
          else
         {
                 // No cateogries are defined yet
          else
         {
                 // No cateogries are defined yet
-               OUTPUT_HTML ("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_CATS."</SPAN></STRONG>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_CATS."</SPAN></STRONG>");
         }
  }
  
         }
  }
  
diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php

index d08197759dc03ee699f6633a2db529a9a47b8c3b..9c6cc1d8fe11bd209594a2348302d72ba483bf38 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -131,7 +131,7 @@ if ($_GET['u_id'] == "all")
          else
         {
                 // User not found!
          else
         {
                 // User not found!
-               OUTPUT_HTML ("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+               OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
         }
  }
   else
         }
  }
   else
diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php

index aeda0eed62e0a06d16384982ef3b6536a465cc3e..3bd1ce95bfe09d98e7d9896e7b1ca5f4ed858223 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -78,7 +78,7 @@ VALUES ('%s', 'N', '%s')",
  
         // Output message
         LOAD_TEMPLATE("admin_settings_saved", false, $msg);
  
         // Output message
         LOAD_TEMPLATE("admin_settings_saved", false, $msg);
-       OUTPUT_HTML ("<BR>");
+       OUTPUT_HTML("<BR>");
  }
  
  // Initialize array
  }
  
  // Initialize array
diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php

index badd8c36e455c850bf07c19e1661cf2425f03b73..84adf4995bfb9c71b158ee2919edc5d1c6849595 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -237,7 +237,7 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock'])))
          else
         {
                 // Wrong call!
          else
         {
                 // Wrong call!
-               LOAD_TEMPLATE ("admin_settings_saved", false, ADMIN_WRONG_CALL);
+               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_WRONG_CALL);
         }
  }
   else
         }
  }
   else
diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php

index c235fc02eec3a3c867c41a85e980825539931597..f5afcc325e1f71456f8b4a764573aba635fd886a 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -96,7 +96,7 @@ if ($file !="")
                         {
                                 $content = substr(substr($content, 0, $body_end), $body_start);
                                 $content = substr($content, strpos($content, ">") + 1);
                         {
                                 $content = substr(substr($content, 0, $body_end), $body_start);
                                 $content = substr($content, strpos($content, ">") + 1);
-                               OUTPUT_HTML ("<DIV align=\"left\">
+                               OUTPUT_HTML("<DIV align=\"left\">
    ".$content."
  </DIV>");
                         }
    ".$content."
  </DIV>");
                         }
diff --git a/inc/modules/admin/what-user_online.php b/inc/modules/admin/what-user_online.php

index bc44387c0b2318849aa10ea9821d4082bec8935e..a7f4aca9ca9fded06546c46a1bd06e19c229626a 100644 (file)
--- a/inc/modules/admin/what-user_online.php
+++ b/inc/modules/admin/what-user_online.php
@@ -40,7 +40,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
  
  // Add description as navigation point
  ADD_DESCR("admin", basename(__FILE__));
  
  // Add description as navigation point
  ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML ("</FONT><BR><BR>");
+OUTPUT_HTML("</FONT><BR><BR>");
  
  // Count guests, members and admins
  $result_guests  = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_online WHERE is_admin='N' AND is_member='N'", __FILE__, __LINE__);
  
  // Count guests, members and admins
  $result_guests  = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_online WHERE is_admin='N' AND is_member='N'", __FILE__, __LINE__);
diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php

index 236b491fc9b73cf1d079f4d9c8e138ed8b4ec966..ef39806ce35ca4e59d452c445157168e0187eac7 100644 (file)
--- a/inc/modules/admin/what-usr_online.php
+++ b/inc/modules/admin/what-usr_online.php
@@ -85,22 +85,22 @@ if (EXT_IS_ACTIVE("online", true))
                                 // Is a guest
                                 $uid = _IS_GUEST;
                         }
                                 // Is a guest
                                 $uid = _IS_GUEST;
                         }
-                       OUTPUT_HTML ("<TR>
+                       OUTPUT_HTML("<TR>
    <TD align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$id."</TD>
    <TD align=\"center\" width=\"15%\" class=\"switch_sw".$SW." bottom right\">");
                         if ($uid > 0)
                         {
    <TD align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$id."</TD>
    <TD align=\"center\" width=\"15%\" class=\"switch_sw".$SW." bottom right\">");
                         if ($uid > 0)
                         {
-                               OUTPUT_HTML (ADMIN_USER_PROFILE_LINK($uid));
+                               OUTPUT_HTML(ADMIN_USER_PROFILE_LINK($uid));
                         }
                          else
                         {
                         }
                          else
                         {
-                               OUTPUT_HTML ($uid);
+                               OUTPUT_HTML($uid);
                         }
                         if ($ref > 0)
                         {
                                 $ref = ADMIN_USER_PROFILE_LINK($ref);
                         }
                         }
                         if ($ref > 0)
                         {
                                 $ref = ADMIN_USER_PROFILE_LINK($ref);
                         }
-                       OUTPUT_HTML ("</TD>
+                       OUTPUT_HTML("</TD>
    <TD align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$ip."</TD>
    <TD align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$ref."</TD>
    <TD align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$mod."</TD>
    <TD align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$ip."</TD>
    <TD align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$ref."</TD>
    <TD align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$mod."</TD>
diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php

index d034bc87ba9a34d47349a706d9819444a6b2fe4e..8bf1a9c3f0652516217b478182d455876e178771 100644 (file)
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -40,7 +40,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
  
  OPEN_TABLE("500", "guest_login_header dashed", "center");
  
  
  OPEN_TABLE("500", "guest_login_header dashed", "center");
  
-OUTPUT_HTML ("<BR><STRONG>".VALIDATING_LOGIN."</STRONG><BR>");
+OUTPUT_HTML("<BR><STRONG>".VALIDATING_LOGIN."</STRONG><BR>");
  
  if (!empty($GLOBALS['userid']) && !empty($_COOKIE['u_hash']) && !empty($_COOKIE['lifetime']))
  {
  
  if (!empty($GLOBALS['userid']) && !empty($_COOKIE['u_hash']) && !empty($_COOKIE['lifetime']))
  {
diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php

index 1be7dd9d339a344e3af421af4f2f601334359f5c..0b42976a8dde8d19b7ed99c41ebfe17144ac9ee3 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -103,7 +103,7 @@ if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame'])
                 break;
  
         case "test_top":
                 break;
  
         case "test_top":
-               OUTPUT_HTML ("<STRONG class=\"guest_done\">".GUEST_FRAMETESTER_TOP."</SPAN>");
+               OUTPUT_HTML("<STRONG class=\"guest_done\">".GUEST_FRAMETESTER_TOP."</SPAN>");
                 break;
  
         case "back": // Back buttom
                 break;
  
         case "back": // Back buttom
diff --git a/inc/modules/guest/what-agb.php b/inc/modules/guest/what-agb.php

index 060d10625f96e1b414de554699f266660c3a86f5..bf862413d965f75a592ac4e4a75dd55a56d948e5 100644 (file)
--- a/inc/modules/guest/what-agb.php
+++ b/inc/modules/guest/what-agb.php
@@ -41,7 +41,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
  ADD_DESCR ("guest", basename(__FILE__));
  
  OPEN_TABLE("100%", "guest_content_align", "");
  ADD_DESCR ("guest", basename(__FILE__));
  
  OPEN_TABLE("100%", "guest_content_align", "");
-LOAD_TEMPLATE (substr(basename(__FILE__), 5, -4));
+LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4));
  CLOSE_TABLE();
  //
  ?>
  CLOSE_TABLE();
  //
  ?>
diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php

index aa1842c7fc45733bd8aa1f57cc7ccd3d90a3d8af..e9d62de68299d88e5d4e4770aeeea8cfe11e0f20 100644 (file)
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -46,7 +46,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
  // Add description as navigation point
  ADD_DESCR("guest", basename(__FILE__));
  
  // Add description as navigation point
  ADD_DESCR("guest", basename(__FILE__));
  
-OUTPUT_HTML ("<DIV align=\"center\">");
+OUTPUT_HTML("<DIV align=\"center\">");
  
  // Check for possible running rallyes
  $ADMIN = " AND d.is_active='Y'";
  
  // Check for possible running rallyes
  $ADMIN = " AND d.is_active='Y'";
@@ -143,6 +143,6 @@ if (SQL_NUMROWS($result) == 1)
         LOAD_TEMPLATE("guest_no_rallyes");
  }
  //
         LOAD_TEMPLATE("guest_no_rallyes");
  }
  //
-OUTPUT_HTML ("</DIV>");
+OUTPUT_HTML("</DIV>");
  //
  ?>
  //
  ?>
diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php

index 80b313be03ded1128e234fe19c4d3206a81de7d4..e0e3ca9b3e648fe3fab785df4e4d5d544f7170b6 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -357,51 +357,51 @@ array(
  {
         if ($_POST['agree'] == "!")
         {
  {
         if ($_POST['agree'] == "!")
         {
-               OUTPUT_HTML ("<STRONG><SPAN class=\"register_failed\">".HAVE_TO_AGREE."</SPAN></STRONG><BR><BR>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".HAVE_TO_AGREE."</SPAN></STRONG><BR><BR>");
         }
         if ($_POST['addy'] == "!")
         {
         }
         if ($_POST['addy'] == "!")
         {
-               OUTPUT_HTML ("<STRONG><SPAN class=\"register_failed\">".ENTER_EMAIL."</SPAN></STRONG><BR><BR>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_EMAIL."</SPAN></STRONG><BR><BR>");
                 $_POST['addy'] = "";
         }
          elseif ($_POST['addy'] == "?")
         {
                 $_POST['addy'] = "";
         }
          elseif ($_POST['addy'] == "?")
         {
-               OUTPUT_HTML ("<STRONG><SPAN class=\"register_failed\">".EMAIL_ALREADY_DB."</SPAN></STRONG><BR><BR>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".EMAIL_ALREADY_DB."</SPAN></STRONG><BR><BR>");
                 $_POST['addy'] = "";
         }
         if ($_POST['surname'] == "!")
         {
                 $_POST['addy'] = "";
         }
         if ($_POST['surname'] == "!")
         {
-               OUTPUT_HTML ("<STRONG><SPAN class=\"register_failed\">".ENTER_SURNAME."</SPAN></STRONG><BR><BR>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_SURNAME."</SPAN></STRONG><BR><BR>");
                 $_POST['surname'] = "";
         }
         if ($_POST['family_name'] == "!")
         {
                 $_POST['surname'] = "";
         }
         if ($_POST['family_name'] == "!")
         {
-               OUTPUT_HTML ("<STRONG><SPAN class=\"register_failed\">".ENTER_FAMILY."</SPAN></STRONG><BR><BR>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_FAMILY."</SPAN></STRONG><BR><BR>");
                 $_POST['family_name'] = "";
         }
         if (($_POST['pass1'] == "!") && ($_POST['pass2'] == "!"))
         {
                 $_POST['family_name'] = "";
         }
         if (($_POST['pass1'] == "!") && ($_POST['pass2'] == "!"))
         {
-               OUTPUT_HTML ("<STRONG><SPAN class=\"register_failed\">".ENTER_BOTH_PASSWORDS."</SPAN></STRONG><BR><BR>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_BOTH_PASSWORDS."</SPAN></STRONG><BR><BR>");
         }
          elseif ($_POST['pass1'] == "!")
         {
         }
          elseif ($_POST['pass1'] == "!")
         {
-               OUTPUT_HTML ("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS1."</SPAN></STRONG><BR><BR>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS1."</SPAN></STRONG><BR><BR>");
         }
          elseif ($_POST['pass2'] == "!")
         {
         }
          elseif ($_POST['pass2'] == "!")
         {
-               OUTPUT_HTML ("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS2."</SPAN></STRONG><BR><BR>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS2."</SPAN></STRONG><BR><BR>");
         }
         if ($SHORT_PASS)
         {
         }
         if ($SHORT_PASS)
         {
-               OUTPUT_HTML ("<STRONG><SPAN class=\"register_failed\">".SHORT_PASS.": ".$CONFIG['pass_len']."</SPAN></STRONG><BR><BR>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".SHORT_PASS.": ".$CONFIG['pass_len']."</SPAN></STRONG><BR><BR>");
         }
         if ($IP_TIMEOUT)
         {
         }
         if ($IP_TIMEOUT)
         {
-               OUTPUT_HTML ("<STRONG><SPAN class=\"register_failed\">".REMOTE_ADDR_TIMEOUT."</SPAN></STRONG><BR><BR>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".REMOTE_ADDR_TIMEOUT."</SPAN></STRONG><BR><BR>");
         }
         if ((!empty($cats)) && ($cats < $CONFIG['least_cats']))
         {
         }
         if ((!empty($cats)) && ($cats < $CONFIG['least_cats']))
         {
-               OUTPUT_HTML ("<STRONG><SPAN class=\"register_failed\">".CATS_LEAST.": ".$CONFIG['least_cats']."</SPAN></STRONG><BR><BR>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".CATS_LEAST.": ".$CONFIG['least_cats']."</SPAN></STRONG><BR><BR>");
         }
  
         // Generate birthday selection
         }
  
         // Generate birthday selection
diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php

index 523fb8a9790646bcb8802060788f6f490ead08df..7278e3bb976783ce2bc6e380f7fe6cda253376d1 100644 (file)
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -172,7 +172,7 @@ case "MODULES": // TOP10 module clicks
         if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0))
         {
                 // Output header
         if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0))
         {
                 // Output header
-               OUTPUT_HTML ("<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"guest_table dashed\" width=\"310\">
+               OUTPUT_HTML("<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"guest_table dashed\" width=\"310\">
  <TR>
    <TD align=\"center\" class=\"guest_stats_title bottom2\" colspan=\"2\"><STRONG>".GUEST_TOPTEN_STATS."</STRONG></TD>
  </TR>");
  <TR>
    <TD align=\"center\" class=\"guest_stats_title bottom2\" colspan=\"2\"><STRONG>".GUEST_TOPTEN_STATS."</STRONG></TD>
  </TR>");
@@ -181,13 +181,13 @@ case "MODULES": // TOP10 module clicks
         if (SQL_NUMROWS($guest_t10) > 0)
         {
                 // Guest clicks
         if (SQL_NUMROWS($guest_t10) > 0)
         {
                 // Guest clicks
-               OUTPUT_HTML ("<TR>
+               OUTPUT_HTML("<TR>
    <TD align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">".GUEST_TOP_GUEST_STATS."</TD>
  </TR>");
                 $SW = 2;
                 while (list($clicks, $title) = SQL_FETCHROW($guest_t10))
                 {
    <TD align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">".GUEST_TOP_GUEST_STATS."</TD>
  </TR>");
                 $SW = 2;
                 while (list($clicks, $title) = SQL_FETCHROW($guest_t10))
                 {
-                       OUTPUT_HTML ("<TR>
+                       OUTPUT_HTML("<TR>
    <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"right\" width=\"250\">".$title."&nbsp;</TD>
    <TD class=\"switch_sw".$SW." bottom2\" width=\"50\">&nbsp;".$clicks."</TD>
  </TR>");
    <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"right\" width=\"250\">".$title."&nbsp;</TD>
    <TD class=\"switch_sw".$SW." bottom2\" width=\"50\">&nbsp;".$clicks."</TD>
  </TR>");
@@ -197,13 +197,13 @@ case "MODULES": // TOP10 module clicks
         if (SQL_NUMROWS($guest_t10) > 0)
         {
                 // Guest clicks
         if (SQL_NUMROWS($guest_t10) > 0)
         {
                 // Guest clicks
-               OUTPUT_HTML ("<TR>
+               OUTPUT_HTML("<TR>
    <TD align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">".GUEST_TOP_MEMBER_STATS."</TD>
  </TR>");
                 $SW = 2;
                 while (list($clicks, $title) = SQL_FETCHROW($mem_t10))
                 {
    <TD align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">".GUEST_TOP_MEMBER_STATS."</TD>
  </TR>");
                 $SW = 2;
                 while (list($clicks, $title) = SQL_FETCHROW($mem_t10))
                 {
-                       OUTPUT_HTML ("<TR>
+                       OUTPUT_HTML("<TR>
    <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"right\" width=\"250\">".$title."&nbsp;</TD>
    <TD class=\"switch_sw".$SW." bottom2\" width=\"50\">&nbsp;".$clicks."</TD>
  </TR>");
    <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"right\" width=\"250\">".$title."&nbsp;</TD>
    <TD class=\"switch_sw".$SW." bottom2\" width=\"50\">&nbsp;".$clicks."</TD>
  </TR>");
@@ -213,7 +213,7 @@ case "MODULES": // TOP10 module clicks
         if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0))
         {
                 // Output footer
         if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0))
         {
                 // Output footer
-               OUTPUT_HTML ("<TR>
+               OUTPUT_HTML("<TR>
    <TD align=\"center\" class=\"guest_stats_footer\" colspan=\"2\"><A href=\"".URL."/modules.php?module=index&amp;what=stats&amp;mode=".$lmode."\">".$ltitle."</A></TD>
  </TR>
  </TABLE>");
    <TD align=\"center\" class=\"guest_stats_footer\" colspan=\"2\"><A href=\"".URL."/modules.php?module=index&amp;what=stats&amp;mode=".$lmode."\">".$ltitle."</A></TD>
  </TR>
  </TABLE>");
diff --git a/inc/modules/index.php b/inc/modules/index.php

index f73e2c23f99b208726c70d59b5076861ab97ae47..7a3af51f1157d26e5674ea560473c99543c438b6 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -126,7 +126,7 @@ if (($CONFIG['guest_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
         // Some advertising stuff?
         LOAD_TEMPLATE("guest_advert2");
  
         // Some advertising stuff?
         LOAD_TEMPLATE("guest_advert2");
  
-       OUTPUT_HTML ("  </TD>
+       OUTPUT_HTML("  </TD>
  </TR>");
  
         // Goto TOP template
  </TR>");
  
         // Goto TOP template
diff --git a/inc/modules/login.php b/inc/modules/login.php

index 47f34c07f4d458d2e99c81abde79e8dbb871cbc7..5fa5aaf438c8ffcc9aeb79484c959d02799f30de 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -78,7 +78,7 @@ $BLOCK_MODE = false;
  LOAD_TEMPLATE("member_header");
  
  // Adding your title's template here...
  LOAD_TEMPLATE("member_header");
  
  // Adding your title's template here...
-OUTPUT_HTML ("<TR>
+OUTPUT_HTML("<TR>
    <TD class=\"member_menu\">");
  
  // Adding the main content module here
    <TD class=\"member_menu\">");
  
  // Adding the main content module here
@@ -97,7 +97,7 @@ if (($CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
         ADD_MENU("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']);
  }
  
         ADD_MENU("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']);
  }
  
-OUTPUT_HTML ("   </TD>
+OUTPUT_HTML("   </TD>
    <TD valign=\"top\" align=\"center\" rowspan=\"3\" class=\"member_content\">");
  
  $INC_ACTION = sprintf(PATH."inc/modules/member/action-%s.php", $act);
    <TD valign=\"top\" align=\"center\" rowspan=\"3\" class=\"member_content\">");
  
  $INC_ACTION = sprintf(PATH."inc/modules/member/action-%s.php", $act);
@@ -114,7 +114,7 @@ if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_A
  
  if (($CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
  {
  
  if (($CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
  {
-       OUTPUT_HTML ("  <BR></TD>
+       OUTPUT_HTML("  <BR></TD>
  </TR>
  <TR>
    <TD align=\"center\" valign=\"top\" class=\"member_advert\">");
  </TR>
  <TR>
    <TD align=\"center\" valign=\"top\" class=\"member_advert\">");
@@ -123,7 +123,7 @@ if (($CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
         LOAD_TEMPLATE("member_advert");
  }
  
         LOAD_TEMPLATE("member_advert");
  }
  
-OUTPUT_HTML ("  </TD>
+OUTPUT_HTML("  </TD>
  </TR>");
  
  // Load same template for "Goto TOP"
  </TR>");
  
  // Load same template for "Goto TOP"
diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php

index 1d34c43a0fe6aa33f67bc7bc6106850a9ba827a0..fbceeeb4da981e5837adfca4954ac8a2e11f550f 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -49,7 +49,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
  
  // Add description as navigation point
  ADD_DESCR("member", basename(__FILE__));
  
  // Add description as navigation point
  ADD_DESCR("member", basename(__FILE__));
-OUTPUT_HTML ("</FONT><BR>");
+OUTPUT_HTML("</FONT><BR>");
  
  // Autopurge installed?
  $LAST = "%s"; $ONLINE = "";
  
  // Autopurge installed?
  $LAST = "%s"; $ONLINE = "";
diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php

index e967ae56fce39b95e8a56e30f2a27a2080997894..00faebcc6bcbd5bff7d2c7cf7820f4c1d6b3bcd0 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -49,7 +49,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
  
  // Add description as navigation point
  ADD_DESCR("member", basename(__FILE__));
  
  // Add description as navigation point
  ADD_DESCR("member", basename(__FILE__));
-OUTPUT_HTML ("</FONT><BR>");
+OUTPUT_HTML("</FONT><BR>");
  
  if (GET_EXT_VERSION("bonus") >= "0.6.9")
  {
  
  if (GET_EXT_VERSION("bonus") >= "0.6.9")
  {
diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php

index 2d4643f8a71e371fd20eb1418ae0c1c55b8b25ad..b817a4bdf49b92e3c2448c128948ada32ae86a5c 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -98,7 +98,7 @@ if ($VALID)
         // Do we have already submit the form?
         if (!empty($_POST['nickname']))
         {
         // Do we have already submit the form?
         if (!empty($_POST['nickname']))
         {
-               OUTPUT_HTML ("<STRONG class=\"member_failed\">".NICKNAME_IS_INVALID."</STRONG><P></P>");
+               OUTPUT_HTML("<STRONG class=\"member_failed\">".NICKNAME_IS_INVALID."</STRONG><P></P>");
         }
  
         // Load Template
         }
  
         // Load Template
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php

index fd306af3fbc3accf0924319a71af17b5a650a44e..ed6a17beaddceb3254c30cfbc5270e11a1858532 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -782,19 +782,19 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                          else
                         {
                                 // No mail types defined
                          else
                         {
                                 // No mail types defined
-                               OUTPUT_HTML ("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_PAYMENTS."</SPAN></STRONG>");
+                               OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_PAYMENTS."</SPAN></STRONG>");
                         }
                 }
                  else
                 {
                         // No points left!
                         }
                 }
                  else
                 {
                         // No points left!
-                       OUTPUT_HTML ("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_POINTS."</SPAN></STRONG>");
+                       OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_POINTS."</SPAN></STRONG>");
                 }
         }
          else
         {
                 // No cateogries are defined yet
                 }
         }
          else
         {
                 // No cateogries are defined yet
-               OUTPUT_HTML ("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_CATS."</SPAN></STRONG>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_CATS."</SPAN></STRONG>");
         }
  }
   elseif ($mmails == "0")
         }
  }
   elseif ($mmails == "0")
diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php

index 14a9597bc34c068f9ba968a998a5edde83fee3fa..6a95c086fe8fff098ff41cc3176aa60bd8725283 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -50,7 +50,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
  // Add description as navigation point
  ADD_DESCR("member", basename(__FILE__));
  
  // Add description as navigation point
  ADD_DESCR("member", basename(__FILE__));
  
-OUTPUT_HTML ("<DIV align=\"center\">");
+OUTPUT_HTML("<DIV align=\"center\">");
  
  // Check for possible running rallyes
  $ADMIN = " AND d.is_active='Y'";
  
  // Check for possible running rallyes
  $ADMIN = " AND d.is_active='Y'";
@@ -147,6 +147,6 @@ if (SQL_NUMROWS($result) == 1)
         LOAD_TEMPLATE("guest_no_rallyes");
  }
  //
         LOAD_TEMPLATE("guest_no_rallyes");
  }
  //
-OUTPUT_HTML ("</DIV>");
+OUTPUT_HTML("</DIV>");
  //
  ?>
  //
  ?>
diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php

index 6b925bba1b84b51d6baed477fa03c06488550978..aa1ceba425f7004546c0d0c83e4f445043fb2eb6 100644 (file)
--- a/inc/modules/member/what-reflinks.php
+++ b/inc/modules/member/what-reflinks.php
@@ -54,7 +54,7 @@ $result = SQL_QUERY_ESC("SELECT ref_clicks FROM "._MYSQL_PREFIX."_user_data WHER
  list($c) = SQL_FETCHROW($result);
  SQL_FREERESULT($result);
  
  list($c) = SQL_FETCHROW($result);
  SQL_FREERESULT($result);
  
-OUTPUT_HTML ("<FONT class=\"tiny\">".YOUR_PERSONAL_REFLINK.":<BR>
+OUTPUT_HTML("<FONT class=\"tiny\">".YOUR_PERSONAL_REFLINK.":<BR>
  <STRONG><A href=\"".URL."/ref.php?ref=".$GLOBALS['userid']."\" target=\"_blank\">".URL."/ref.php?ref=".$GLOBALS['userid']."</A></STRONG><BR>
  <BR>");
  
  <STRONG><A href=\"".URL."/ref.php?ref=".$GLOBALS['userid']."\" target=\"_blank\">".URL."/ref.php?ref=".$GLOBALS['userid']."</A></STRONG><BR>
  <BR>");
  
@@ -66,20 +66,20 @@ if (EXT_IS_ACTIVE("nickname"))
         if (!empty($nick))
         {
                 // Display nickname link
         if (!empty($nick))
         {
                 // Display nickname link
-               OUTPUT_HTML (NICKNAME_YOUR_REFLINK.":<BR>
+               OUTPUT_HTML(NICKNAME_YOUR_REFLINK.":<BR>
  <STRONG><A href=\"".URL."/ref.php?ref=".$nick."\" target=\"_blank\">".URL."/ref.php?ref=".$nick."</A></STRONG><BR>
  <BR>");
         }
          else
         {
                 // Display link to nickname form
  <STRONG><A href=\"".URL."/ref.php?ref=".$nick."\" target=\"_blank\">".URL."/ref.php?ref=".$nick."</A></STRONG><BR>
  <BR>");
         }
          else
         {
                 // Display link to nickname form
-               OUTPUT_HTML ("<STRONG class=\"guest_note\">".NO_NICKNAME_SET."</STRONG><BR>
+               OUTPUT_HTML("<STRONG class=\"guest_note\">".NO_NICKNAME_SET."</STRONG><BR>
  <A class=\"tiny\" href=\"".URL."/modules.php?module=login&amp;what=nickname\">".PLEASE_CLICK_NICKNAME_FORM."</A>");
         }
  }
  
  // Clicks on your reflink
  <A class=\"tiny\" href=\"".URL."/modules.php?module=login&amp;what=nickname\">".PLEASE_CLICK_NICKNAME_FORM."</A>");
         }
  }
  
  // Clicks on your reflink
-OUTPUT_HTML (YOUR_REFCLICKS.": <STRONG>".$c."</STRONG> ".CLICKS."</FONT><BR><BR>");
+OUTPUT_HTML(YOUR_REFCLICKS.": <STRONG>".$c."</STRONG> ".CLICKS."</FONT><BR><BR>");
  $WHERE = " WHERE visible='Y'";
  if (IS_ADMIN()) $WHERE = "";
  $result = SQL_QUERY("SELECT id, url, alternate, counter, clicks FROM "._MYSQL_PREFIX."_refbanner", __FILE__, __LINE__);
  $WHERE = " WHERE visible='Y'";
  if (IS_ADMIN()) $WHERE = "";
  $result = SQL_QUERY("SELECT id, url, alternate, counter, clicks FROM "._MYSQL_PREFIX."_refbanner", __FILE__, __LINE__);
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php

index 0cc0be7d8001d79fc62f9de73e7c85a0dc8161d5..fdde08146f8c41a753474fdd121448a472bf579e 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -234,44 +234,44 @@ case "new": // Start new transfer
                         }
  
                         // Transfer is completed
                         }
  
                         // Transfer is completed
-                       OUTPUT_HTML ("<P>");
+                       OUTPUT_HTML("<P>");
                         LOAD_TEMPLATE("admin_settings_saved", false, TRANSFER_COMPLETED."<BR><A href=\"".URL."/modules.php?module=login&amp;what=transfer\">".TRANSFER_CONTINUE_OVERVIEW."</A>");
                         LOAD_TEMPLATE("admin_settings_saved", false, TRANSFER_COMPLETED."<BR><A href=\"".URL."/modules.php?module=login&amp;what=transfer\">".TRANSFER_CONTINUE_OVERVIEW."</A>");
-                       OUTPUT_HTML ("</P>");
+                       OUTPUT_HTML("</P>");
                 }
                  elseif (!$valid_code)
                 {
                         // Invalid Touring code!
                 }
                  elseif (!$valid_code)
                 {
                         // Invalid Touring code!
-                       OUTPUT_HTML ("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_CODE."</STRONG></P>");
+                       OUTPUT_HTML("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_CODE."</STRONG></P>");
                         unset($_POST['ok']);
                 }
                  elseif (!$valid_pass)
                 {
                         // Wrong password entered
                         unset($_POST['ok']);
                 }
                  elseif (!$valid_pass)
                 {
                         // Wrong password entered
-                       OUTPUT_HTML ("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_PASSWORD."</STRONG></P>");
+                       OUTPUT_HTML("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_PASSWORD."</STRONG></P>");
                         unset($_POST['ok']);
                 }
                  elseif (!$valid_amount)
                 {
                         // Too much points entered
                         unset($_POST['ok']);
                 }
                  elseif (!$valid_amount)
                 {
                         // Too much points entered
-                       OUTPUT_HTML ("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_POINTS."</STRONG></P>");
+                       OUTPUT_HTML("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_POINTS."</STRONG></P>");
                         unset($_POST['ok']);
                 }
                  elseif (!$valid_reason)
                 {
                         // No transfer reason entered
                         unset($_POST['ok']);
                 }
                  elseif (!$valid_reason)
                 {
                         // No transfer reason entered
-                       OUTPUT_HTML ("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_REASON."</STRONG></P>");
+                       OUTPUT_HTML("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_REASON."</STRONG></P>");
                         unset($_POST['ok']);
                 }
                  elseif (!$valid_recipient)
                 {
                         // No recipient selected
                         unset($_POST['ok']);
                 }
                  elseif (!$valid_recipient)
                 {
                         // No recipient selected
-                       OUTPUT_HTML ("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_RECIPIENT."</STRONG></P>");
+                       OUTPUT_HTML("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_RECIPIENT."</STRONG></P>");
                         unset($_POST['ok']);
                 }
                  elseif (!$valid_data)
                 {
                         // No recipient selected
                         unset($_POST['ok']);
                 }
                  elseif (!$valid_data)
                 {
                         // No recipient selected
-                       OUTPUT_HTML ("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_DATA."</STRONG></P>");
+                       OUTPUT_HTML("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_DATA."</STRONG></P>");
                         unset($_POST['ok']);
                 }
         }
                         unset($_POST['ok']);
                 }
         }
@@ -588,7 +588,7 @@ case "": // Overview page
                 $opt_in = $_POST['opt_in'];
  
                 // "Settings saved..."
                 $opt_in = $_POST['opt_in'];
  
                 // "Settings saved..."
-               OUTPUT_HTML ("<P><STRONG class=\"member_done\">".SETTINGS_SAVED."</STRONG></P>");
+               OUTPUT_HTML("<P><STRONG class=\"member_done\">".SETTINGS_SAVED."</STRONG></P>");
         }
         switch ($opt_in)
         {
         }
         switch ($opt_in)
         {
diff --git a/inc/modules/member/what-welcome.php b/inc/modules/member/what-welcome.php

index 9dc7e4c6cbb716c205f2ad281314fff4d10101cd..71787b967f6bd5be8b7127ddb2297008dffc1111 100644 (file)
--- a/inc/modules/member/what-welcome.php
+++ b/inc/modules/member/what-welcome.php
@@ -44,7 +44,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
  
  // Add description as navigation point
  ADD_DESCR ("member", basename(__FILE__));
  
  // Add description as navigation point
  ADD_DESCR ("member", basename(__FILE__));
-OUTPUT_HTML ("</FONT><BR>");
+OUTPUT_HTML("</FONT><BR>");
  
  // Export data for template
  define('_LAST_ONLINE_VALUE', MAKE_DATETIME($LAST['online']));
  
  // Export data for template
  define('_LAST_ONLINE_VALUE', MAKE_DATETIME($LAST['online']));
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php

index ea9bff0ee3b9387ce02e056024754deea04c9f56..593e21e0295076ec8c555f1c7b1a459850dfe5fe 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -280,14 +280,14 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true)
         if ((!isset($DEPTH)) && (!$return))
         {
                 $DEPTH = "0";
         if ((!isset($DEPTH)) && (!$return))
         {
                 $DEPTH = "0";
-               $PREFIX = "<DIV class=\"you_are_here\">".YOU_ARE_HERE."&nbsp;<STRONG><A class=\"you_are_here\" href=\"".URL."/modules.php?module=".$GLOBALS['module'].$LINK_ADD."\">Home</A></STRONG>";
+               $prefix = "<DIV class=\"you_are_here\">".YOU_ARE_HERE."&nbsp;<STRONG><A class=\"you_are_here\" href=\"".URL."/modules.php?module=".$GLOBALS['module'].$LINK_ADD."\">Home</A></STRONG>";
         }
          else
         {
                 if (!$return) $DEPTH++;
         }
          else
         {
                 if (!$return) $DEPTH++;
-               $PREFIX = "";
+               $prefix = "";
         }
         }
-       $PREFIX .= "&nbsp;-&gt;&nbsp;";
+       $prefix .= "&nbsp;-&gt;&nbsp;";
         if (ereg(".php", $search))
         {
                 $search = substr($search, 0, strpos($search, ".php"));
         if (ereg(".php", $search))
         {
                 $search = substr($search, 0, strpos($search, ".php"));
@@ -306,7 +306,7 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true)
                  elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && ($CONFIG['youre_here'] == 'Y')) || ((IS_ADMIN()) && ($MOD_CHECK == "admin")))
                 {
                         // Output HTML code
                  elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && ($CONFIG['youre_here'] == 'Y')) || ((IS_ADMIN()) && ($MOD_CHECK == "admin")))
                 {
                         // Output HTML code
-                       $OUT = $PREFIX."<STRONG><A class=\"you_are_here\" href=\"".URL."/modules.php?module=".$MOD_CHECK."&amp;".$type."=".$search.$LINK_ADD."\">".$ret."</A></STRONG>\n";
+                       $OUT = $prefix."<STRONG><A class=\"you_are_here\" href=\"".URL."/modules.php?module=".$MOD_CHECK."&amp;".$type."=".$search.$LINK_ADD."\">".$ret."</A></STRONG>\n";
                         //* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*<br />\n";
                         if (($type == "what") || (($type == "action") && (!isset($_GET['what'])) && ($GLOBALS['what'] != "welcome"))) {
                                 //* DEBUG: */ echo __LINE__."+".$type."+<br />\n";
                         //* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*<br />\n";
                         if (($type == "what") || (($type == "action") && (!isset($_GET['what'])) && ($GLOBALS['what'] != "welcome"))) {
                                 //* DEBUG: */ echo __LINE__."+".$type."+<br />\n";
@@ -343,7 +343,7 @@ function ADD_MENU($MODE, $act, $wht)
         //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
         if (SQL_NUMROWS($result_main) > 0)
         {
         //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
         if (SQL_NUMROWS($result_main) > 0)
         {
-               OUTPUT_HTML ("<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"".$MODE."_menu\">");
+               OUTPUT_HTML("<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"".$MODE."_menu\">");
                 // There are menus available, so we simply display them... :)
                 while (list($main_title, $main_action) = SQL_FETCHROW($result_main))
                 {
                 // There are menus available, so we simply display them... :)
                 while (list($main_title, $main_action) = SQL_FETCHROW($result_main))
                 {
@@ -427,19 +427,19 @@ function ADD_MENU($MODE, $act, $wht)
                                 if ((file_exists($INC_BLOCK)) && (is_readable($INC_BLOCK)))
                                 {
                                         // Load include file
                                 if ((file_exists($INC_BLOCK)) && (is_readable($INC_BLOCK)))
                                 {
                                         // Load include file
-                                       if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML ("<TR>
+                                       if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML("<TR>
    <TD class=\"".$MODE."_menu_whats\">");
                                         //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
                                         include ($INC_BLOCK);
                                         //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
    <TD class=\"".$MODE."_menu_whats\">");
                                         //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
                                         include ($INC_BLOCK);
                                         //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
-                                       if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML ("  </TD>
+                                       if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML("  </TD>
  </TR>");
                                 }
                                 //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
                         }
                         $main_cnt++;
                         //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
  </TR>");
                                 }
                                 //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
                         }
                         $main_cnt++;
                         //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
-                       if (SQL_NUMROWS($result_main) > $main_cnt)      OUTPUT_HTML ("<TR><TD class=\"".$MODE."_menu_seperator\"></TD></TR>");
+                       if (SQL_NUMROWS($result_main) > $main_cnt)      OUTPUT_HTML("<TR><TD class=\"".$MODE."_menu_seperator\"></TD></TR>");
                 }
  
                 // Free memory
                 }
  
                 // Free memory
@@ -447,7 +447,7 @@ function ADD_MENU($MODE, $act, $wht)
  
                 // Close table
                 //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
  
                 // Close table
                 //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
-               OUTPUT_HTML ("</TABLE>");
+               OUTPUT_HTML("</TABLE>");
         }
  }
  // This patched function will reduce many SELECT queries for the specified or current admin login
         }
  }
  // This patched function will reduce many SELECT queries for the specified or current admin login
@@ -569,7 +569,7 @@ function ADD_MAX_RECEIVE_LIST($MODE, $default="", $return=false)
          else
         {
                 // Output directly (default)
          else
         {
                 // Output directly (default)
-               OUTPUT_HTML ($OUT);
+               OUTPUT_HTML($OUT);
         }
  }
  //
         }
  }
  //
@@ -1531,7 +1531,7 @@ function META_DESCRIPTION($mod, $wht)
                 // Exclude admin and member's area
                 $DESCR = MAIN_TITLE." ".trim($CONFIG['title_middle'])." ".ADD_DESCR("guest", "what-".$wht, true);
                 unset($DEPTH);
                 // Exclude admin and member's area
                 $DESCR = MAIN_TITLE." ".trim($CONFIG['title_middle'])." ".ADD_DESCR("guest", "what-".$wht, true);
                 unset($DEPTH);
-               OUTPUT_HTML ("<META name=\"description\" content=\"".$DESCR."\">\n");
+               OUTPUT_HTML("<META name=\"description\" content=\"".$DESCR."\">\n");
         }
  }
  //
         }
  }
  //
diff --git a/inc/stylesheet.php b/inc/stylesheet.php

index b63e94db6ed762c4cec93035db7205a5f598a490..38e4e7cd8e659b97d581be414cbcc10a12a0c2a2 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -79,12 +79,12 @@ if (($CSS == "1") || ($CONFIG['css_php'] == "DIRECT"))
                         switch ($CONFIG['css_php'])
                         {
                         case "DIRECT":
                         switch ($CONFIG['css_php'])
                         {
                         case "DIRECT":
-                               OUTPUT_HTML ("<LINK rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/".$BASE."\">");
+                               OUTPUT_HTML("<LINK rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/".$BASE."\">");
                                 break;
  
                         case "FILE":
                                 $load = implode("", file($file));
                                 break;
  
                         case "FILE":
                                 $load = implode("", file($file));
-                               OUTPUT_HTML ($load);
+                               OUTPUT_HTML($load);
                                 break;
                         }
                 }
                                 break;
                         }
                 }
@@ -93,16 +93,16 @@ if (($CSS == "1") || ($CONFIG['css_php'] == "DIRECT"))
   else
  {
         // Now we load all CSS files from css.php!
   else
  {
         // Now we load all CSS files from css.php!
-       OUTPUT_HTML ("<LINK rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/css.php", false);
+       OUTPUT_HTML("<LINK rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/css.php", false);
         if (mxchange_installing)
         {
                 // Default theme first
                 $NEW_THEME = "default";
                 if (!empty($_GET['theme'])) $NEW_THEME = $_GET['theme'];
                 if (!empty($_POST['theme'])) $NEW_THEME = $_POST['theme'];
         if (mxchange_installing)
         {
                 // Default theme first
                 $NEW_THEME = "default";
                 if (!empty($_GET['theme'])) $NEW_THEME = $_GET['theme'];
                 if (!empty($_POST['theme'])) $NEW_THEME = $_POST['theme'];
-               OUTPUT_HTML ("?theme=".$NEW_THEME."&amp;installing=1", false);
+               OUTPUT_HTML("?theme=".$NEW_THEME."&amp;installing=1", false);
         }
         }
-       OUTPUT_HTML ("\">");
+       OUTPUT_HTML("\">");
  }
  
  //
  }
  
  //
diff --git a/mailid_top.php b/mailid_top.php

index a3f52f3601b2245b45abf6f886d890f38100de65..6ba01b401e258f28c31abf04d87b4bcc48991ac1 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -330,28 +330,28 @@ if (defined('mxchange_installed') && (mxchange_installed))
                                                                         break;
                                                                 }
                                                         }
                                                                         break;
                                                                 }
                                                         }
-                                                        else OUTPUT_HTML ("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (6)</STRONG>");
+                                                        else OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (6)</STRONG>");
                                                 }
                                                 }
-                                                else OUTPUT_HTML ("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (5)</STRONG>");
+                                                else OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (5)</STRONG>");
                                         }
                                         }
-                                        else OUTPUT_HTML ("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (4)</STRONG>");
+                                        else OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (4)</STRONG>");
                                 }
                                  else
                                 {
                                         SQL_FREERESULT($result);
                                 }
                                  else
                                 {
                                         SQL_FREERESULT($result);
-                                       OUTPUT_HTML ("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (3)</STRONG>");
+                                       OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (3)</STRONG>");
                                 }
                         }
                          else
                         {
                                 SQL_FREERESULT($result);
                                 }
                         }
                          else
                         {
                                 SQL_FREERESULT($result);
-                               OUTPUT_HTML ("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (2)</STRONG>");
+                               OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (2)</STRONG>");
                         }
                 }
                  else
                 {
                         SQL_FREERESULT($result);
                         }
                 }
                  else
                 {
                         SQL_FREERESULT($result);
-                       OUTPUT_HTML ("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (1)</STRONG>");
+                       OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (1)</STRONG>");
                 }
                 if ($mode != "img")
                 {
                 }
                 if ($mode != "img")
                 {
author	Roland Häder <roland@mxchange.org>
	Wed, 6 Feb 2008 20:38:44 +0000 (20:38 +0000)
committer	Roland Häder <roland@mxchange.org>
	Wed, 6 Feb 2008 20:38:44 +0000 (20:38 +0000)
inc/footer.php		patch \| blob \| history
inc/functions.php		patch \| blob \| history
inc/header.php		patch \| blob \| history
inc/install-inc.php		patch \| blob \| history
inc/libs/payout_functions.php		patch \| blob \| history
inc/libs/register_functions.php		patch \| blob \| history
inc/libs/user_functions.php		patch \| blob \| history
inc/modules/admin.php		patch \| blob \| history
inc/modules/admin/admin-inc.php		patch \| blob \| history
inc/modules/admin/what-add_points.php		patch \| blob \| history
inc/modules/admin/what-adminedit.php		patch \| blob \| history
inc/modules/admin/what-admins_add.php		patch \| blob \| history
inc/modules/admin/what-config_home.php		patch \| blob \| history
inc/modules/admin/what-config_mods.php		patch \| blob \| history
inc/modules/admin/what-config_payouts.php		patch \| blob \| history
inc/modules/admin/what-config_rallye_prices.php		patch \| blob \| history
inc/modules/admin/what-config_register.php		patch \| blob \| history
inc/modules/admin/what-del_email.php		patch \| blob \| history
inc/modules/admin/what-del_task.php		patch \| blob \| history
inc/modules/admin/what-del_user.php		patch \| blob \| history
inc/modules/admin/what-edit_emails.php		patch \| blob \| history
inc/modules/admin/what-edit_user.php		patch \| blob \| history
inc/modules/admin/what-email_archiv.php		patch \| blob \| history
inc/modules/admin/what-email_details.php		patch \| blob \| history
inc/modules/admin/what-email_stats.php		patch \| blob \| history
inc/modules/admin/what-extensions.php		patch \| blob \| history
inc/modules/admin/what-guest_add.php		patch \| blob \| history
inc/modules/admin/what-guestedit.php		patch \| blob \| history
inc/modules/admin/what-holiday_list.php		patch \| blob \| history
inc/modules/admin/what-holiday_remove.php		patch \| blob \| history
inc/modules/admin/what-list_payouts.php		patch \| blob \| history
inc/modules/admin/what-list_refs.php		patch \| blob \| history
inc/modules/admin/what-lock_user.php		patch \| blob \| history
inc/modules/admin/what-logs.php		patch \| blob \| history
inc/modules/admin/what-mem_add.php		patch \| blob \| history
inc/modules/admin/what-memedit.php		patch \| blob \| history
inc/modules/admin/what-overview.php		patch \| blob \| history
inc/modules/admin/what-send_bonus.php		patch \| blob \| history
inc/modules/admin/what-sub_points.php		patch \| blob \| history
inc/modules/admin/what-theme_import.php		patch \| blob \| history
inc/modules/admin/what-unlock_emails.php		patch \| blob \| history
inc/modules/admin/what-usage.php		patch \| blob \| history
inc/modules/admin/what-user_online.php		patch \| blob \| history
inc/modules/admin/what-usr_online.php		patch \| blob \| history
inc/modules/chk_login.php		patch \| blob \| history
inc/modules/frametester.php		patch \| blob \| history
inc/modules/guest/what-agb.php		patch \| blob \| history
inc/modules/guest/what-rallyes.php		patch \| blob \| history
inc/modules/guest/what-register.php		patch \| blob \| history
inc/modules/guest/what-stats.php		patch \| blob \| history
inc/modules/index.php		patch \| blob \| history
inc/modules/login.php		patch \| blob \| history
inc/modules/member/what-beg2.php		patch \| blob \| history
inc/modules/member/what-bonus.php		patch \| blob \| history
inc/modules/member/what-nickname.php		patch \| blob \| history
inc/modules/member/what-order.php		patch \| blob \| history
inc/modules/member/what-rallyes.php		patch \| blob \| history
inc/modules/member/what-reflinks.php		patch \| blob \| history
inc/modules/member/what-transfer.php		patch \| blob \| history
inc/modules/member/what-welcome.php		patch \| blob \| history
inc/mysql-manager.php		patch \| blob \| history
inc/stylesheet.php		patch \| blob \| history
mailid_top.php		patch \| blob \| history