|
@@ 1524-1531 (lines=8) @@
|
| 1521 |
|
ORDER BY display_order DESC"; |
| 1522 |
|
} else { |
| 1523 |
|
if ($user_id) { |
| 1524 |
|
if ($allowUserEditSetting && !api_is_anonymous()) { |
| 1525 |
|
$cond_user_id = " AND ( |
| 1526 |
|
ip.lastedit_user_id = '".api_get_user_id()."' OR |
| 1527 |
|
((ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) AND (ip.to_group_id='0' OR ip.to_group_id IS NULL)) |
| 1528 |
|
) "; |
| 1529 |
|
} else { |
| 1530 |
|
$cond_user_id = " AND ((ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) AND (ip.to_group_id='0' OR ip.to_group_id IS NULL) ) "; |
| 1531 |
|
} |
| 1532 |
|
|
| 1533 |
|
$sql = "SELECT $select |
| 1534 |
|
FROM $tbl_announcement announcement |
|
@@ 1548-1554 (lines=7) @@
|
| 1545 |
|
AND announcement.session_id IN(0, ".$session_id.") |
| 1546 |
|
ORDER BY display_order DESC"; |
| 1547 |
|
} else { |
| 1548 |
|
if (($allowUserEditSetting && !api_is_anonymous())) { |
| 1549 |
|
$cond_user_id = " AND ( |
| 1550 |
|
ip.lastedit_user_id = '".$user_id."' OR ip.to_group_id='0' OR ip.to_group_id IS NULL |
| 1551 |
|
)"; |
| 1552 |
|
} else { |
| 1553 |
|
$cond_user_id = " AND ip.to_group_id='0' OR ip.to_group_id IS NULL "; |
| 1554 |
|
} |
| 1555 |
|
|
| 1556 |
|
$sql = "SELECT $select |
| 1557 |
|
FROM $tbl_announcement announcement |