Changeset 13779 for trunk/administration

Timestamp:

03/11/10 01:27:27 (2 years ago)

Author:

Anton Lesnikov

Message:

Ticket #1839

Location:

trunk/administration

Files:

• js/profiles.js (modified) (1 diff)
• profiles.php (modified) (2 diffs)

trunk/administration/js/profiles.js

@@ -117 +117 @@
     
     if(onSuccess == undefined)
-        onSuccess = function(){}
+        onSuccess = function(){};
 
     $('#adm-mp-members-loading').bx_loading();

trunk/administration/profiles.php

@@ -187 +187 @@
     $aItems = array_merge($aItems, $MySQL->getAll("SELECT 'featured' AS `by`, 'featured' AS `value`, COUNT(`ID`) AS `count` FROM `Profiles` WHERE `Featured`='1'"));
     $aItems = array_merge($aItems, $MySQL->getAll("SELECT 'banned' AS `by`, 'banned' AS `value`, COUNT(`ProfID`) AS `count` FROM `sys_admin_ban_list` WHERE `Time`='0' OR (`Time`<>'0' AND DATE_ADD(`DateTime`, INTERVAL `Time` HOUR)>NOW())"));
-    $aItems = array_merge($aItems, $MySQL->getAll("SELECT 'membership' AS `by`, `tl`.`Name` AS `value`, COUNT(`tlm`.`IDMember`) AS `count` FROM `sys_acl_levels` AS `tl` LEFT JOIN `sys_acl_levels_members` AS `tlm` ON `tl`.`ID`=`tlm`.`IDLevel` WHERE `tl`.`Active`='yes' AND `tl`.`Purchasable`='yes' AND `tlm`.`DateStarts` < NOW() AND (`tlm`.`DateExpires`>NOW() || ISNULL(`tlm`.`DateExpires`)) GROUP BY `tl`.`ID`"));
+    $aItems = array_merge($aItems, $MySQL->getAll("SELECT 'membership' AS `by`, `tl`.`Name` AS `value`, COUNT(`tlm`.`IDMember`) AS `count` FROM `sys_acl_levels` AS `tl` LEFT JOIN `sys_acl_levels_members` AS `tlm` ON `tl`.`ID`=`tlm`.`IDLevel` WHERE `tl`.`Active`='yes' AND (`tl`.`Purchasable`='yes' OR `tl`.`Name`='Promotion') AND `tlm`.`DateStarts` < NOW() AND (`tlm`.`DateExpires`>NOW() || ISNULL(`tlm`.`DateExpires`)) GROUP BY `tl`.`ID`"));
     $aItems = array_merge($aItems, $MySQL->getAll("SELECT 'sex' AS `by`, `Sex` AS `value`, COUNT(`ID`) AS `count` FROM `Profiles` WHERE NOT ISNULL(`Sex`) AND `Sex` <> '' GROUP BY `Sex`"));
     $aItems = array_merge($aItems, $MySQL->getAll("SELECT 'type' AS `by`, 'single' AS `value`, COUNT(`ID`) AS `count` FROM `Profiles` WHERE `Couple`='0'"));
@@ -357 +357 @@
         case 'search':
             $sWhereClause .= " AND (
+                `tp`.`ID` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
                 `tp`.`NickName` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR 
                 `tp`.`Email` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR