Fixed logfile writing in installation phase, .revision is now ignored

[mailer.git] / inc / libs / register_functions.php

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index f3af140f191ebcc2fe2716560f745df065fb66cd..157cd16acf1000f35f4ff061d6be8efe10285442 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezielle Funktion fuer register-Erweiterung     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -38,13 +43,15 @@ if (!defined('__SECURITY')) {
 }
 
 //
-function REGISTER_FILL_MUST_CONSTANTS()
-{
-       $result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FUNCTION__, __LINE__);
-       while (list($name, $required) = SQL_FETCHROW($result)) {
+function REGISTER_FILL_MUST_CONSTANTS () {
+       $result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`",
+               __FUNCTION__, __LINE__);
+
+       while ($content = SQL_FETCHARRAY($result)) {
                $value = "";
-               if ($required == "Y") $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
-               $eval = "define('MUST_".strtoupper($name)."', \"".$value."\");";
+               if ($content['field_required'] == "Y") $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
+               // @TODO Rewrite these constants
+               $eval = "define('MUST_".strtoupper($content['field_name'])."', \"".$value."\");";
                eval($eval);
        } // END - while
 
@@ -57,18 +64,16 @@ function REGISTER_FILL_MUST_CONSTANTS()
        define('MUST_BIRTH' , "<div class=\"guest_failed\">&nbsp;(*)</div>");
        define('MUST_MARKER', "<div class=\"guest_failed\">&nbsp;(*)</div>");
 }
+
 //
-function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
-{
+function REGISTER_CHECK_REQUIRED_FIELDS (&$array) {
        $ret = false;
-       foreach ($array as $key => $value)
-       {
-               $result = SQL_QUERY("SELECT field_required FROM `{!_MYSQL_PREFIX!}_must_register` WHERE field_name='".$key."' LIMIT 1", __FUNCTION__, __LINE__);
-               if (SQL_NUMROWS($result) == 1)
-               {
+       foreach ($array as $key => $value) {
+               $result = SQL_QUERY("SELECT field_required FROM `{!_MYSQL_PREFIX!}_must_register` WHERE field_name='".$key."' LIMIT 1",
+                       __FUNCTION__, __LINE__);
+               if (SQL_NUMROWS($result) == 1) {
                        // "Must-line" found
                        list($chk) = SQL_FETCHROW($result);
-                       SQL_FREERESULT($result);
 
                        // Check if extension country is not found (you have to enter the 2-chars long country code) or
                        // if extensions is present check if country code was selected
@@ -81,26 +86,29 @@ function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
                                $ret = true;
                        }
                }
+
+               // Free result
+               SQL_FREERESULT($result);
        }
        return $ret;
 }
+
 //
-function REGISTER_OUTPUT_REQUIRE_CHECK(&$array)
-{
+function REGISTER_OUTPUT_REQUIRE_CHECK (&$array) {
        $result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FUNCTION__, __LINE__);
-       while (list($name, $required) = SQL_FETCHROW($result))
-       {
-               if (($array[$name] == "!") && ($required == "Y")) {
+       while ($content = SQL_FETCHARRAY($result)) {
+               if (($array[$content['field_name']] == "!") && ($content['field_required'] == "Y")) {
                        // Empty entry found
-                       $array[$name] = "";
-                       $OUT = constant('REGISTER_'.strtoupper($name).'_REQUIRED');
+                       $array[$content['field_name']] = "";
+                       $OUT = constant('REGISTER_'.strtoupper($content['field_name']).'_REQUIRED');
                        OUTPUT_HTML("<div class=\"register_failed\">".$OUT."</div>");
-               }
-       }
+               } // END - if
+       } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 }
+
 //
 function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) {
        $OUT = "";
@@ -111,28 +119,32 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) {
 
        // Admins are allowed to see every category...
        if (IS_ADMIN()) $AND = "";
-       $result = SQL_QUERY("SELECT id, cat, visible FROM `{!_MYSQL_PREFIX!}_cats` ".$AND." ORDER BY `sort`", __FUNCTION__, __LINE__);
+
+       // Look for categories
+       $result = SQL_QUERY("SELECT id, cat, visible FROM `{!_MYSQL_PREFIX!}_cats` ".$AND." ORDER BY `sort`",
+               __FUNCTION__, __LINE__);
+
        if (SQL_NUMROWS($result) > 0) {
                // List alle visible modules (or all to the admin)
                $SW = 2;
                $OUT .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n";
-               while (list($id, $cat, $visible) = SQL_FETCHROW($result)) {
+               while ($content = SQL_FETCHARRAY($result)) {
                        // Is the array element not set?
-                       if (!REQUEST_ISSET_POST('cat', $id)) {
+                       if (!REQUEST_ISSET_POST('cat', $content['id'])) {
                                // Then set it
-                               REQUEST_SET_POST(array('cat', $id), "");
+                               REQUEST_SET_POST(array('cat', $content['id']), "");
                        } // END - if
 
                        // Prepare array for the template
                        $content = array(
                                'sw'    => $SW,
-                               'cat'   => $cat,
+                               'cat'   => $content['cat'],
                                'def_y' => "",
                                'def_n' => "",
-                               'id'    => $id,
+                               'id'    => $content['id'],
                        );
 
-                       if ((REQUEST_POST('cat', $id) == "Y") || ((getConfig('register_default') == "Y") && (!REQUEST_ISSET_POST('cat', $id)))) {
+                       if ((REQUEST_POST('cat', $content['id']) == "Y") || ((getConfig('register_default') == "Y") && (!REQUEST_ISSET_POST('cat', $content['id'])))) {
                                $content['def_y'] = " checked=\"checked\"";
                        } else {
                                $content['def_n'] = " checked=\"checked\"";
@@ -151,7 +163,7 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) {
                $OUT .= LOAD_TEMPLATE("admin_settings_saved", true, getMessage('NO_CATEGORIES_VISIBLE'));
        }
 
-       if ($return) {
+       if ($return === true) {
                // Return generated HTML code
                return $OUT;
        } else {