@@ -1673,13 +1673,11 @@ discard block |
||
| 1673 | 1673 | values |
| 1674 | 1674 | ('$type', $subtype_id, $owner_guid, $site_guid, $container_guid, |
| 1675 | 1675 | $access_id, $time_created, $now, $now, 'no', '$duplicate_check')"); |
| 1676 | - } |
|
| 1677 | - catch( DatabaseException $e ){ |
|
| 1676 | + } catch( DatabaseException $e ){ |
|
| 1678 | 1677 | error_log("Duplication prevented: " . $e->getMessage()); |
| 1679 | 1678 | return null; |
| 1680 | 1679 | } |
| 1681 | - } |
|
| 1682 | - else{ |
|
| 1680 | + } else{ |
|
| 1683 | 1681 | $result = $this->getDatabase()->insertData("INSERT into {$CONFIG->dbprefix}entities |
| 1684 | 1682 | (type, subtype, owner_guid, site_guid, container_guid, |
| 1685 | 1683 | access_id, time_created, time_updated, last_action, enabled) |
@@ -1687,8 +1685,7 @@ discard block |
||
| 1687 | 1685 | ('$type', $subtype_id, $owner_guid, $site_guid, $container_guid, |
| 1688 | 1686 | $access_id, $time_created, $now, $now, 'no')"); |
| 1689 | 1687 | } |
| 1690 | - } |
|
| 1691 | - else { |
|
| 1688 | + } else { |
|
| 1692 | 1689 | $result = $this->getDatabase()->insertData("INSERT into {$CONFIG->dbprefix}entities |
| 1693 | 1690 | (type, subtype, owner_guid, site_guid, container_guid, |
| 1694 | 1691 | access_id, time_created, time_updated, last_action) |
@@ -214,8 +214,7 @@ |
||
| 214 | 214 | // for the group members search: group guid - should be numeric |
| 215 | 215 | if (!$g = get_input('term', get_input('g'))){ |
| 216 | 216 | $g=0; |
| 217 | - } |
|
| 218 | - else { |
|
| 217 | + } else { |
|
| 219 | 218 | $g = sanitise_string($g); |
| 220 | 219 | |
| 221 | 220 | // replace mysql vars with escaped strings |
@@ -488,7 +488,7 @@ |
||
| 488 | 488 | } else if ( elgg_is_active_plugin('wet4') ) { |
| 489 | 489 | //add translation |
| 490 | 490 | $params['title'] = gc_explode_translation($title,get_current_language()) . ' : ' . elgg_get_config('sitename'); |
| 491 | - }else { |
|
| 491 | + } else { |
|
| 492 | 492 | //add translation |
| 493 | 493 | $params['title'] = $title . ' : ' . elgg_get_config('sitename'); |
| 494 | 494 | } |
@@ -37,8 +37,7 @@ |
||
| 37 | 37 | 'text' => elgg_echo('au_subgroups:add:subgroup'), |
| 38 | 38 | 'is_trusted' => true, |
| 39 | 39 | )); |
| 40 | -} |
|
| 41 | -else { |
|
| 40 | +} else { |
|
| 42 | 41 | $new_link = ''; |
| 43 | 42 | } |
| 44 | 43 | |
@@ -5,8 +5,7 @@ discard block |
||
| 5 | 5 | if ($vars['subgroup_guid']) { |
| 6 | 6 | $subgroup_guid = $vars['subgroup_guid']; |
| 7 | 7 | $subgroup = get_entity($subgroup_guid); |
| 8 | -} |
|
| 9 | -else { |
|
| 8 | +} else { |
|
| 10 | 9 | $subgroup = elgg_get_page_owner_entity(); |
| 11 | 10 | } |
| 12 | 11 | |
@@ -21,8 +20,7 @@ discard block |
||
| 21 | 20 | |
| 22 | 21 | if (empty($vars['q'])) { |
| 23 | 22 | $options['order_by'] = "g.name ASC"; |
| 24 | -} |
|
| 25 | -else { |
|
| 23 | +} else { |
|
| 26 | 24 | $query = sanitize_string($vars['q']); |
| 27 | 25 | $options['wheres'][] = "g.name LIKE '%{$query}%'"; |
| 28 | 26 | } |
@@ -42,8 +40,7 @@ discard block |
||
| 42 | 40 | |
| 43 | 41 | if (can_move_subgroup($subgroup, $groups[$i])) { |
| 44 | 42 | $class = 'au-subgroups-parentable'; |
| 45 | - } |
|
| 46 | - else { |
|
| 43 | + } else { |
|
| 47 | 44 | $class = 'au-subgroups-non-parentable'; |
| 48 | 45 | } |
| 49 | 46 | |
@@ -55,8 +52,7 @@ discard block |
||
| 55 | 52 | } |
| 56 | 53 | |
| 57 | 54 | echo '</div>'; |
| 58 | -} |
|
| 59 | -else { |
|
| 55 | +} else { |
|
| 60 | 56 | echo elgg_echo('au_subgroups:search:noresults'); |
| 61 | 57 | } |
| 62 | 58 | elgg_pop_context(); |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | |
| 32 | 32 | if (!$container->title){ |
| 33 | 33 | $crumbs_title = gc_explode_translation($container->name,$lang); |
| 34 | - }else{ |
|
| 34 | + } else{ |
|
| 35 | 35 | $crumbs_title = gc_explode_translation($container->title,$lang); |
| 36 | 36 | } |
| 37 | 37 | |
@@ -13,7 +13,9 @@ |
||
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | $connection = mysqli_connect($read_settings["host"], $read_settings["user"], $read_settings["password"], $read_settings["database"]); |
| 16 | -if (mysqli_connect_errno($connection)) elgg_log("Failed to connect to MySQL: ".mysqli_connect_errno(), 'NOTICE'); |
|
| 16 | +if (mysqli_connect_errno($connection)) { |
|
| 17 | + elgg_log("Failed to connect to MySQL: ".mysqli_connect_errno(), 'NOTICE'); |
|
| 18 | +} |
|
| 17 | 19 | $result = mysqli_query($connection,$query); |
| 18 | 20 | mysqli_close($connection); |
| 19 | 21 | |
@@ -22,7 +22,9 @@ discard block |
||
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | $connection = mysqli_connect($read_settings["host"], $read_settings["user"], $read_settings["password"], $read_settings["database"]); |
| 25 | - if (mysqli_connect_errno($connection)) elgg_log("cyu - Failed to connect to MySQL: ".mysqli_connect_errno(), 'NOTICE'); |
|
| 25 | + if (mysqli_connect_errno($connection)) { |
|
| 26 | + elgg_log("cyu - Failed to connect to MySQL: ".mysqli_connect_errno(), 'NOTICE'); |
|
| 27 | + } |
|
| 26 | 28 | $result = mysqli_query($connection,$query); |
| 27 | 29 | mysqli_close($connection); |
| 28 | 30 | |
@@ -31,10 +33,11 @@ discard block |
||
| 31 | 33 | { |
| 32 | 34 | $domain = explode('@', strtolower($row['email'])); |
| 33 | 35 | $filter_domain = explode('.', $domain[1]); |
| 34 | - if ($filter_domain[count($filter_domain) - 2].'.'.$filter_domain[count($filter_domain) - 1] === 'gc.ca') |
|
| 35 | - $array_of_users[$row['guid']] = $filter_domain[0]; |
|
| 36 | - else |
|
| 37 | - $array_of_users[$row['guid']] = $domain[1]; |
|
| 36 | + if ($filter_domain[count($filter_domain) - 2].'.'.$filter_domain[count($filter_domain) - 1] === 'gc.ca') { |
|
| 37 | + $array_of_users[$row['guid']] = $filter_domain[0]; |
|
| 38 | + } else { |
|
| 39 | + $array_of_users[$row['guid']] = $domain[1]; |
|
| 40 | + } |
|
| 38 | 41 | } |
| 39 | 42 | $main_json_file = array(); |
| 40 | 43 | $count_members = array(); |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | |
| 20 | 20 | if (!$page_owner->title){ |
| 21 | 21 | $crumbs_title = $page_owner->name; |
| 22 | -}else{ |
|
| 22 | +} else{ |
|
| 23 | 23 | $crumbs_title = gc_explode_translation($page_owner->title, $lang); |
| 24 | 24 | } |
| 25 | 25 | |