Security line in all includes changed

[mailer.git] / inc / modules / admin / overview-inc.php

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index c55b3909b4fed0d88bb4c6831abfe6ab5c618f20..57d77aa258da85f4a968e68bec8cbfd5971a6e8e 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -104,12 +103,17 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks)
 
                                if (!empty($cacheArray['active_extensions'][$ext])) {
                                        // Maybe we want to keept the current extension active?
-                                       if (($cacheArray['active_extensions'][$ext] == "Y") && (!EXT_IS_ACTIVE($ext, true, true))) {
+                                       if (($cacheArray['active_extensions'][$ext] == "Y") && (!EXT_IS_ACTIVE($ext))) {
                                                // Reactivate this extension!
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='Y' WHERE ext_name='%s' LIMIT 1",
                                                 array($ext), __FILE__, __LINE__);
-                                               EXTENSION_RUN_SQLS(GET_EXT_ID($ext), "activate");
-                                       }
+
+                                               // Extension has been activated?
+                                               if (SQL_AFFECTEDROWS() == 1) {
+                                                       // Then run all queries
+                                                       EXTENSION_RUN_SQLS(GET_EXT_ID($ext), "activate");
+                                               } // END - if
+                                       } // END - if
                                }
                        }
                }
@@ -143,7 +147,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
        if ((isset($_POST['assign'])) && (count($_POST['task']) > 0)) {
                // Assign / do tasks
                $OUT = ""; $SW = 2;
-               foreach ($_POST['task'] as $id=>$sel) {
+               foreach ($_POST['task'] as $id => $sel) {
                        $result_task = SQL_QUERY_ESC("SELECT id, userid, task_type, subject, text, task_created, status, assigned_admin FROM "._MYSQL_PREFIX."_task_system WHERE id=%s AND (assigned_admin='%s' OR (assigned_admin='0' AND status='NEW')) LIMIT 1",
                         array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result_task) == 1) {
@@ -165,13 +169,13 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                }
 
                                if ($uid > 0) {
-                                       $result_user = SQL_QUERY_ESC("SELECT sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+                                       $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                         array(bigintval($uid)), __FILE__, __LINE__);
                                        if (SQL_NUMROWS($result_user) == 1)
                                        {
-                                               list($sex, $sname, $fname, $email) = SQL_FETCHROW($result_user);
+                                               list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
                                                SQL_FREERESULT($result_user);
-                                               $ADD = "<LI>".ADMIN_MEMBER_UID.": <STRONG>".ADMIN_USER_PROFILE_LINK($uid)." (<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_SEX($sex)." ".$sname." ".$fname."</A>)</STRONG></LI>";
+                                               $ADD = "<LI>".ADMIN_MEMBER_UID.": <STRONG>".ADMIN_USER_PROFILE_LINK($uid)." (<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</A>)</STRONG></LI>";
                                        }
                                }
 
@@ -398,7 +402,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                        if (!empty($_POST['unassign']))
                        {
                                // Unassign from tasks
-                               foreach ($_POST['task'] as $id=>$sel)
+                               foreach ($_POST['task'] as $id => $sel)
                                {
                                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",
                                         array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
@@ -407,7 +411,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                         elseif (isset($_POST['del']))
                        {
                                // Delete tasks
-                               foreach ($_POST['task'] as $id=>$sel)
+                               foreach ($_POST['task'] as $id => $sel)
                                {
                                        $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%s AND assigned_admin IN (%s,0) LIMIT 1",
                                         array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);