MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'lars-algemeen' into 'master'

Browse Source 
Lars algemeen

See merge request !52
This commit was merged in pull request #56.
This commit is contained in:
Marijn Jansen
2017-01-17 15:13:49 +01:00
parent 429fba997f a8fcbecc2e
commit 0966b3528e
8 changed files with 177 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
website/public/img/notbad.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

1
website/public/js/menu.js
View File

@@ -1,5 +1,6 @@
$(document).ready(function() {
$(".extra-menu-items").hide();
$("#menu-back").hide();
// Show more friends
$("#more-friends-click").click(function() {

1
website/public/template_sql.php
View File

@@ -4,7 +4,6 @@
<body>
<?php
// database gegevens zijn elders opgeslagen
include_once("../queries/connect.php");
include_once("../queries/friendship.php");

5
website/queries/friendship.php
View File

@@ -15,8 +15,9 @@ function selectAllFriends($db, $userID) {
`friendship`.`user1ID` = $userID AND
`friendship`.`user2ID` = `user`.`userID` OR
`friendship`.`user2ID` = $userID AND
`friendship`.`user1ID` = `user`.`userID`"
);
`friendship`.`user1ID` = `user`.`userID` AND
`user`.`role` != 3
");
}

21
website/queries/group_member.php Normal file
View File

@@ -0,0 +1,21 @@
<?php
function selectAllGroupsFromUser($db, $userID) {
return $db->query("
SELECT
`group_page`.`name`,
`group_page`.`picture`
FROM
`group_page`
INNER JOIN
`group_member`
WHERE
`group_member`.`userID` = $userID AND
`group_member`.`groupID` = `group_page`.`groupID` AND
`group_page`.`status` != 0
");
}
?>

56
website/queries/group_page.php Normal file
View File

@@ -0,0 +1,56 @@
<?php
function selectGroupById($db, $groupID) {
return $db->query("
SELECT
`group_page`.`name`,
`group_page`.`picture`,
`group_page`.`description`,
`group_page`.`status`,
`group_page`.`creationdate`
FROM
`group_page`
WHERE
`group_page`.`groupID` = $groupID
");
}
function select20GroupsFromN($db, $n) {
return $db->query("
SELECT
`group_page`.`groupID`,
`group_page`.`name`,
`group_page`.`picture`,
`group_page`.`description`,
`group_page`.`status`,
`group_page`.`creationdate`
FROM
`group_page`
ORDER BY
`group_page`.`name` ASC
LIMIT
$n, 20
");
}
function select20GroupsByStatusFromN($db, $n, $status) {
return $db->query("
SELECT
`group_page`.`groupID`,
`group_page`.`name`,
`group_page`.`picture`,
`group_page`.`description`,
`group_page`.`status`,
`group_page`.`creationdate`
FROM
`group_page`
WHERE
`group_page`.`status` = $status
ORDER BY
`group_page`.`name` ASC
LIMIT
$n, 20
");
}
?>

2
website/views/head.php
View File

@@ -15,6 +15,6 @@
</style>
<?php
include_once("../connect.php");
include_once("../queries/connect.php");
?>

187
website/views/menu.php
View File

File diff suppressed because one or more lines are too long