| @@ -36,13 +36,9 @@ | ||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | $query = 'SELECT '.$columns.' FROM #__acym_list AS list'; |
| 39 | 39 | $queryCount = 'SELECT COUNT(list.id) AS total FROM #__acym_list AS list'; |
| 40 | - if (!empty($settings['join'])) { | |
| 41 | - $join = $this->getJoinForQuery($settings['join']); | |
| 42 | - $query .= $join; | |
| 43 | - $queryCount .= $join; | |
| 44 | - } | |
| 40 | + if (!empty($settings['join'])) $query .= $this->getJoinForQuery($settings['join']); | |
| 45 | 41 | /* |
| 46 | 42 | This query will return for example: |
| 47 | 43 | |
| 48 | 44 | array( |
| @@ -100,16 +96,9 @@ | ||
| 100 | 96 | ]; |
| 101 | 97 | if (empty($allowedStatus[$settings['status']])) { |
| 102 | 98 | die('Injection denied'); |
| 103 | 99 | } |
| 104 | - $statusFilter = 'list.'.$allowedStatus[$settings['status']]; | |
| 105 | - | |
| 106 | - $selectedColumn = empty($settings['join']) ? '' : $this->getSelectedColumnForQuery($settings['join']); | |
| 107 | - if (!empty($selectedColumn)) { | |
| 108 | - $statusFilter .= ' OR '.acym_secureDBColumn($selectedColumn).' IS NOT NULL'; | |
| 109 | - } | |
| 110 | - | |
| 111 | - $filters[] = $statusFilter; | |
| 100 | + $filters[] = 'list.'.$allowedStatus[$settings['status']]; | |
| 112 | 101 | } |
| 113 | 102 | |
| 114 | 103 | if (!empty($settings['where'])) { |
| 115 | 104 | $filters[] = $settings['where']; |
| @@ -222,20 +211,8 @@ | ||
| 222 | 211 | if (strpos($joinType, 'join_user') !== false) { |
| 223 | 212 | $userId = explode('-', $joinType); |
| 224 | 213 | |
| 225 | 214 | return ' LEFT JOIN #__acym_user_has_list as userlist ON list.id = userlist.list_id AND userlist.status = 1 AND userlist.user_id = '.intval($userId[1]); |
| 226 | - } | |
| 227 | - | |
| 228 | - return ''; | |
| 229 | - } | |
| 230 | - | |
| 231 | - private function getSelectedColumnForQuery(string $joinType): string | |
| 232 | - { | |
| 233 | - if (strpos($joinType, 'join_mail') !== false) { | |
| 234 | - return 'maillist.list_id'; | |
| 235 | - } | |
| 236 | - if (strpos($joinType, 'join_user') !== false) { | |
| 237 | - return 'userlist.list_id'; | |
| 238 | 215 | } |
| 239 | 216 | |
| 240 | 217 | return ''; |
| 241 | 218 | } |
