Fixed two parser errors

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index 01a59c5f905075d639a4dcd32db23315b0f89278..70eae0be2d438da8a5079760d4c1c80443fa709e 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -56,35 +56,31 @@ if (getConfig('autopurge_inactive') == 'Y') {
        // Init exclusion list
        // @TODO Rewrite these if() blocks to a filter
        $EXCLUDE_LIST = '';
-       if (isValidUserId(getConfig('def_refid'))) $EXCLUDE_LIST .= ' AND d.`userid` != {?def_refid?}';
+       if (isValidUserId(getConfig('def_refid'))) $EXCLUDE_LIST .= ' AND `userid` != {?def_refid?}';
        // Check for more extensions
-       if (isExtensionActive('beg'))     $EXCLUDE_LIST .= ' AND d.`userid` != {?beg_userid?}';
-       if (isExtensionActive('bonus'))   $EXCLUDE_LIST .= ' AND d.`userid` != {?bonus_userid?}';
-       if (isExtensionActive('doubler')) $EXCLUDE_LIST .= ' AND d.`userid` != {?doubler_userid?}';
+       if (isExtensionActive('beg'))     $EXCLUDE_LIST .= ' AND `userid` != {?beg_userid?}';
+       if (isExtensionActive('bonus'))   $EXCLUDE_LIST .= ' AND `userid` != {?bonus_userid?}';
+       if (isExtensionActive('doubler')) $EXCLUDE_LIST .= ' AND `userid` != {?doubler_userid?}';
 
        // Check for new holiday extension
        if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                // Include only users with no active holiday
-               $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
+               $EXCLUDE_LIST .= " AND `holiday_active`='N'";
        } // END - if
 
        // Check for all accounts
-       $result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online
+       $result_inactive = SQL_QUERY("SELECT
+       `userid`, `email`, `last_online`
 FROM
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       d.status='CONFIRMED' AND
-       d.joined < (UNIX_TIMESTAMP() - %s) AND
-       d.last_online < (UNIX_TIMESTAMP() - %s) AND
-       d.ap_notified < (UNIX_TIMESTAMP() - %s)
-       ".$EXCLUDE_LIST."
+       `status`='CONFIRMED' AND
+       `joined` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
+       `last_online` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
+       `ap_notified` < (UNIX_TIMESTAMP() - {?ap_inactive_since?})
+       " . $EXCLUDE_LIST . "
 ORDER BY
-       d.userid ASC",
-               array(
-                       getApInactiveSince(),
-                       getApInactiveSince(),
-                       getApInactiveSince()
-               ), __FILE__, __LINE__);
+       `userid` ASC", __FILE__, __LINE__);
 
        if (!SQL_HASZERONUMS($result_inactive)) {
                // Prepare variables and constants...
@@ -124,18 +120,18 @@ ORDER BY
 
        // Now let's have a look for inactive accounts we want to delete we newly use the same exclude list
        // here for e.g. excluding holiday users
-       $result_inactive = SQL_QUERY('SELECT
-       d.userid, d.email, d.last_online
+       $result_inactive = SQL_QUERY("SELECT
+       `userid`, `email`, `last_online`
 FROM
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data`
 WHERE
        `status`='CONFIRMED' AND
        `joined` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
        `last_online` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
        `ap_notified` < (UNIX_TIMESTAMP() - {?ap_inactive_time?})
-' . $EXCLUDE_LIST . '
+" . $EXCLUDE_LIST . "
 ORDER BY
-       `userid` ASC', __FILE__, __LINE__);
+       `userid` ASC", __FILE__, __LINE__);
 
        if (!SQL_HASZERONUMS($result_inactive)) {
                // Prepare variable...

diff --git a/inc/filters.php b/inc/filters.php
index 333b5eb34ee9712c4e23410c1031349503f83d02..77a02c56cab62268ca3545ee5b3eaf5722ed7e84 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -262,11 +262,11 @@ function FILTER_RUN_SQLS ($data) {
                                        // Do we have an "ALTER TABLE" command?
                                        if (substr(strtolower($sql), 0, 11) == 'alter table') {
                                                // Analyse the alteration command
-                                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Alterting table: {$sql}");
+                                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Alterting table: ' . $sql . ',enable_codes=' . intval($data['enable_codes']));
                                                SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__, $data['enable_codes']);
                                        } else {
                                                // Run regular SQL command
-                                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Running regular query: {$sql}");
+                                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Running regular query: ' . $sql . ',enable_codes=' . intval($data['enable_codes']);
                                                SQL_QUERY($sql, __FUNCTION__, __LINE__, $data['enable_codes']);
                                        }
                                } // END - if

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index feffa1cfb374d03037e8ce0f7677cbf2c6ae69ac..d51e798a05a686a30f317cdca84d5becae2d3aaf 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -134,7 +134,7 @@ if (isFormSent('add')) {
                SQL_FREERESULT($result);
 
                // Prepare data for the row template
-               $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id'])
+               $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']);
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_edit_cats_row', true, $content);