fixing the old project errors
This commit is contained in:
Anas Rashid committed
1 parent
34753111ed
commit
4ff0c03c62
23 files changed
+117
-278
No files matched your search
+9
-13
@@ -1,4 +1,4 @@
|
||||
<?php
|
||||
<?php
|
||||
session_start();
|
||||
if(isset($_SESSION['user']))
|
||||
{
|
||||
@@ -7,26 +7,23 @@
|
||||
else
|
||||
{
|
||||
header("Location: ../views/signinPage.php?message=".urlencode("Login again!"));
|
||||
exit();
|
||||
}
|
||||
require_once("engine.php");
|
||||
require_once("../models/user.php");
|
||||
require_once("../controllers/album.php");
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<?php
|
||||
require_once("engine.php");
|
||||
require_once("../models/user.php");
|
||||
require_once("../controllers/album.php");
|
||||
echo $includes;
|
||||
?>
|
||||
<?php echo $includes; ?>
|
||||
<title>
|
||||
PhotoShare
|
||||
</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<?php
|
||||
echo $navbar;
|
||||
?>
|
||||
<?php echo $navbar; ?>
|
||||
<div class="col-md-2" ></div>
|
||||
<div class="col-md-8" data-spy="scroll" data-target="#mynav">
|
||||
<div class="panel panel-primary">
|
||||
@@ -34,13 +31,12 @@
|
||||
<h3>Create New Albums</h3>
|
||||
</div>
|
||||
<div class="panel panel-body">
|
||||
|
||||
<div class="col-md-12" >
|
||||
<form action="" method="POST">
|
||||
<div class="col-md-12" >
|
||||
<div class="form-group">
|
||||
<label>
|
||||
Album Name :
|
||||
Album Name :
|
||||
</label>
|
||||
<input type="text" name= "name" class="form-control" id="name">
|
||||
</div>
|
||||
@@ -55,4 +51,4 @@
|
||||
</div>
|
||||
<div class="col-md-2" ></div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
@@ -14,20 +14,10 @@
|
||||
<head>
|
||||
<?php
|
||||
require_once("engine.php");
|
||||
require_once("../models/user.php");
|
||||
require_once("../models/photo.php");
|
||||
require_once("../models/album.php");
|
||||
require_once("../models/DataAccessHelper.php");
|
||||
|
||||
echo $includes;
|
||||
|
||||
$imgsrc = array();
|
||||
$rs = photo ::getImageusername($temp['username']);
|
||||
|
||||
foreach($rs as $row)
|
||||
{
|
||||
$imgsrc[] ='data:image/jpg;base64,'.base64_encode( $row['imageFile']);
|
||||
}
|
||||
|
||||
?>
|
||||
<title>
|
||||
|
||||
+2
-16
@@ -57,7 +57,7 @@
|
||||
document.getElementById("comments").innerHTML = xmlhttp.responseText;
|
||||
}
|
||||
};
|
||||
xmlhttp.open("GET", "../controllers/loadComments.php?imgId= '" + id +"'", true);
|
||||
xmlhttp.open("GET", "../controllers/loadComments.php?imgId=" + id, true);
|
||||
xmlhttp.send();
|
||||
|
||||
}
|
||||
@@ -84,23 +84,9 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
$id = 0;
|
||||
$files = glob('c:/xampp/htdocs/webproject/views/images/*'); // get all file names
|
||||
foreach($files as $file)
|
||||
{
|
||||
if(is_file($file))
|
||||
unlink($file);
|
||||
}
|
||||
|
||||
$paths=array();
|
||||
|
||||
foreach($rs as $row)
|
||||
{
|
||||
$paths[]="c:/xampp/htdocs/webproject/views/images/".$row['imgId'].".jpg";
|
||||
file_put_contents("c:/xampp/htdocs/webproject/views/images/".$row['imgId'].".jpg", $row['imageFile']);
|
||||
|
||||
echo '<img class="col-md-3" height="190" width="195" id="'.$row['imgId'].'" src="data:image/jpg;base64,'.base64_encode( $row['imageFile']).'" onclick=\'addcomments(id)\'/>';
|
||||
$id++;
|
||||
echo '<img class="col-md-3" height="190" width="195" id="'.$row['imgId'].'" src="data:image/jpg;base64,'.base64_encode( $row['imageFile']).'" onclick=\'addcomments(this.id)\'/>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
+9
-13
@@ -1,4 +1,4 @@
|
||||
<?php
|
||||
<?php
|
||||
session_start();
|
||||
if(isset($_SESSION['user']))
|
||||
{
|
||||
@@ -7,26 +7,23 @@
|
||||
else
|
||||
{
|
||||
header("Location: ../views/signinPage.php?message=".urlencode("Login again!"));
|
||||
exit();
|
||||
}
|
||||
require_once("engine.php");
|
||||
require_once("../models/user.php");
|
||||
require_once("../controllers/group.php");
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<?php
|
||||
require_once("engine.php");
|
||||
require_once("../models/user.php");
|
||||
require_once("../controllers/group.php");
|
||||
echo $includes;
|
||||
?>
|
||||
<?php echo $includes; ?>
|
||||
<title>
|
||||
PhotoShare
|
||||
</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<?php
|
||||
echo $navbar;
|
||||
?>
|
||||
<?php echo $navbar; ?>
|
||||
<div class="col-md-2" ></div>
|
||||
<div class="col-md-8" data-spy="scroll" data-target="#mynav">
|
||||
<div class="panel panel-primary">
|
||||
@@ -34,13 +31,12 @@
|
||||
<h3>Create New Groups</h3>
|
||||
</div>
|
||||
<div class="panel panel-body">
|
||||
|
||||
<div class="col-md-12" >
|
||||
<form action="" method="POST">
|
||||
<div class="col-md-12" >
|
||||
<div class="form-group">
|
||||
<label>
|
||||
Group Name :
|
||||
Group Name :
|
||||
</label>
|
||||
<input type="text" name= "name" class="form-control" id="name">
|
||||
</div>
|
||||
@@ -55,4 +51,4 @@
|
||||
</div>
|
||||
<div class="col-md-2" ></div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
+16
-21
@@ -1,31 +1,28 @@
|
||||
<?php
|
||||
<?php
|
||||
session_start();
|
||||
if(isset($_SESSION['user'])){
|
||||
$temp=$_SESSION['user'];
|
||||
}
|
||||
else{
|
||||
header("Location: ../views/signinPage.php?message=".urlencode("Login again!"));
|
||||
exit();
|
||||
}
|
||||
require_once("engine.php");
|
||||
require_once("../models/user.php");
|
||||
require_once("../models/group.php");
|
||||
require_once("../controllers/member.php");
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<?php
|
||||
require_once("engine.php");
|
||||
require_once("../models/user.php");
|
||||
require_once("../models/group.php");
|
||||
require_once("../controllers/member.php");
|
||||
echo $includes;
|
||||
?>
|
||||
<?php echo $includes; ?>
|
||||
<title>
|
||||
PhotoShare
|
||||
</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<?php
|
||||
echo $navbar;
|
||||
?>
|
||||
<?php echo $navbar; ?>
|
||||
<div class="col-md-3" ></div>
|
||||
<div class="col-md-6" data-spy="scroll" data-target="#mynav">
|
||||
<div class="panel panel-primary">
|
||||
@@ -36,11 +33,11 @@
|
||||
<form action="" method="POST">
|
||||
<div class="col-md-12 form-group" >
|
||||
<label>
|
||||
Group :
|
||||
Group :
|
||||
</label>
|
||||
<select name = "groups">
|
||||
<?php
|
||||
$rs = group ::getAllUserGroups($temp['username']);
|
||||
$rs = group::getAllUserGroups($temp['username']);
|
||||
if($rs == false)
|
||||
{
|
||||
echo "No Groups are made by You!";
|
||||
@@ -49,7 +46,7 @@
|
||||
{
|
||||
foreach($rs as $row)
|
||||
{
|
||||
echo '<option value="'.$row['gname'].'">'.$row['gname'].'</option>';
|
||||
echo '<option value="'.$row['groupId'].'">'.$row['gname'].'</option>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
@@ -57,11 +54,11 @@
|
||||
</div>
|
||||
<div class="form-group col-md-12">
|
||||
<label>
|
||||
Users :
|
||||
Users :
|
||||
</label>
|
||||
<select name = "users">
|
||||
<?php
|
||||
$rs = user ::loadAll();
|
||||
$rs = user::loadAll();
|
||||
if($rs == false)
|
||||
{
|
||||
echo "No Users are Signed Up!";
|
||||
@@ -76,15 +73,13 @@
|
||||
?>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group col-md-12">
|
||||
<input type="submit" name= "addToGroup" class="btn btn-primary" value="+ to Group" id="addToGroup">
|
||||
</div>
|
||||
<div class="form-group col-md-12">
|
||||
<label>
|
||||
<?php
|
||||
echo $uerror;
|
||||
?>
|
||||
<?php echo $uerror; ?>
|
||||
</label>
|
||||
</div>
|
||||
</form>
|
||||
@@ -94,4 +89,4 @@
|
||||
</div>
|
||||
<div class="col-md-3" ></div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
+2
-16
@@ -57,7 +57,7 @@
|
||||
document.getElementById("comments").innerHTML = xmlhttp.responseText;
|
||||
}
|
||||
};
|
||||
xmlhttp.open("GET", "../controllers/loadComments.php?imgId= '" + id +"'", true);
|
||||
xmlhttp.open("GET", "../controllers/loadComments.php?imgId=" + id, true);
|
||||
xmlhttp.send();
|
||||
|
||||
}
|
||||
@@ -84,23 +84,9 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
$id = 0;
|
||||
$files = glob('c:/xampp/htdocs/webproject/views/images/*'); // get all file names
|
||||
foreach($files as $file)
|
||||
{
|
||||
if(is_file($file))
|
||||
unlink($file);
|
||||
}
|
||||
|
||||
$paths=array();
|
||||
|
||||
foreach($rs as $row)
|
||||
{
|
||||
$paths[]="c:/xampp/htdocs/webproject/views/images/".$row['imgId'].".jpg";
|
||||
file_put_contents("c:/xampp/htdocs/webproject/views/images/".$row['imgId'].".jpg", $row['imageFile']);
|
||||
|
||||
echo '<img class="col-md-3" height="190" width="195" id="'.$row['imgId'].'" src="data:image/jpg;base64,'.base64_encode( $row['imageFile']).'" onclick=\'addcomments(id)\'/>';
|
||||
$id++;
|
||||
echo '<img class="col-md-3" height="190" width="195" id="'.$row['imgId'].'" src="data:image/jpg;base64,'.base64_encode( $row['imageFile']).'" onclick=\'addcomments(this.id)\'/>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
+10
-109
@@ -23,26 +23,9 @@
|
||||
</script>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta charset="utf-8">
|
||||
<title>PhotoShare-Sign in Page</title>
|
||||
</head>
|
||||
<title>PhotoShare-Sign in Page</title>
|
||||
<body class="container" style="background-image:url(css/backImg.jpg)" >
|
||||
<script>
|
||||
window.fbAsyncInit = function() {
|
||||
FB.init({
|
||||
appId : '199354620398049',
|
||||
xfbml : true,
|
||||
version : 'v2.5'
|
||||
});
|
||||
};
|
||||
|
||||
(function(d, s, id){
|
||||
var js, fjs = d.getElementsByTagName(s)[0];
|
||||
if (d.getElementById(id)) {return;}
|
||||
js = d.createElement(s); js.id = id;
|
||||
js.src = "//connect.facebook.net/en_US/sdk.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}(document, 'script', 'facebook-jssdk'));
|
||||
</script>
|
||||
<form action="" method="POST">
|
||||
<div class="col-sm-3">
|
||||
</div>
|
||||
@@ -51,14 +34,14 @@
|
||||
<div class="panel-heading">
|
||||
<div class="panel-title">
|
||||
<h1>
|
||||
<small>
|
||||
<font color="azure" >
|
||||
Join
|
||||
<small>
|
||||
<font color="azure" >
|
||||
Join
|
||||
</font>
|
||||
</small>
|
||||
</small>
|
||||
PhotoShare!
|
||||
<small>
|
||||
<font color="azure" >
|
||||
<font color="azure" >
|
||||
Pick your Clicks...
|
||||
</font>
|
||||
</small>
|
||||
@@ -76,102 +59,20 @@
|
||||
<label for="pwd">
|
||||
Password:
|
||||
</label>
|
||||
<input type="password" name="pass" class="form-control" id="pwd">
|
||||
<input type="password" name="pass" class="form-control" id="pwd">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<input type="submit" id="login" name="login" class="btn btn-primary" value="Login" >
|
||||
<a href="signupPage.php" > Don't have an account? Sign up Here.</a>
|
||||
<a href="signupPage.php"> Don't have an account? Sign up Here.</a>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
|
||||
|
||||
/* INCLUSION OF LIBRARY FILEs*/
|
||||
require_once( 'lib/Facebook/FacebookSession.php');
|
||||
require_once( 'lib/Facebook/FacebookRequest.php' );
|
||||
require_once( 'lib/Facebook/FacebookResponse.php' );
|
||||
require_once( 'lib/Facebook/FacebookSDKException.php' );
|
||||
require_once( 'lib/Facebook/FacebookRequestException.php' );
|
||||
require_once( 'lib/Facebook/FacebookRedirectLoginHelper.php');
|
||||
require_once( 'lib/Facebook/FacebookAuthorizationException.php' );
|
||||
require_once( 'lib/Facebook/GraphObject.php' );
|
||||
require_once( 'lib/Facebook/GraphUser.php' );
|
||||
require_once( 'lib/Facebook/GraphSessionInfo.php' );
|
||||
require_once( 'lib/Facebook/Entities/AccessToken.php');
|
||||
require_once( 'lib/Facebook/HttpClients/FacebookCurl.php' );
|
||||
require_once( 'lib/Facebook/HttpClients/FacebookHttpable.php');
|
||||
require_once( 'lib/Facebook/HttpClients/FacebookCurlHttpClient.php');
|
||||
|
||||
/* USE NAMESPACES */
|
||||
|
||||
use Facebook\FacebookSession;
|
||||
use Facebook\FacebookRedirectLoginHelper;
|
||||
use Facebook\FacebookRequest;
|
||||
use Facebook\FacebookResponse;
|
||||
use Facebook\FacebookSDKException;
|
||||
use Facebook\FacebookRequestException;
|
||||
use Facebook\FacebookAuthorizationException;
|
||||
use Facebook\GraphObject;
|
||||
use Facebook\GraphUser;
|
||||
use Facebook\GraphSessionInfo;
|
||||
use Facebook\FacebookHttpable;
|
||||
use Facebook\FacebookCurlHttpClient;
|
||||
use Facebook\FacebookCurl;
|
||||
|
||||
/*PROCESS*/
|
||||
|
||||
//1.Stat Session
|
||||
//session_start();
|
||||
//check if users wants to logout
|
||||
if(isset($_REQUEST['logout'])){
|
||||
unset($_SESSION['fb_token']);
|
||||
}
|
||||
//2.Use app id,secret and redirect url
|
||||
$app_id = '199354620398049';
|
||||
$app_secret = '6484a761305eeef7fabfbbdc963647e8';
|
||||
$redirect_url='http://localhost/webproject/views/profilePage.php';
|
||||
|
||||
//3.Initialize application, create helper object and get fb sess
|
||||
FacebookSession::setDefaultApplication($app_id,$app_secret);
|
||||
$helper = new FacebookRedirectLoginHelper($redirect_url);
|
||||
$sess = $helper->getSessionFromRedirect();
|
||||
|
||||
//check if facebook session exists
|
||||
if(isset($_SESSION['fb_token'])){
|
||||
$sess = new FacebookSession($_SESSION['fb_token']);
|
||||
}
|
||||
//logout
|
||||
$logout = 'http://localhost/webproject/controllers/logout.php';
|
||||
|
||||
//4. if fb sess exists echo name
|
||||
if(isset($sess)){
|
||||
//create request object,execute and capture response
|
||||
$request = new FacebookRequest($sess, 'GET', '/me');
|
||||
// from response get graph object
|
||||
$response = $request->execute();
|
||||
$graph = $response->getGraphObject(GraphUser::className());
|
||||
// use graph object methods to get user details
|
||||
$name= $graph->getName();
|
||||
$image = 'https://graph.facebook.com/'.$id.'/picture?width=300';
|
||||
$email = $graph->getProperty('email');
|
||||
echo "hi $name <br>";
|
||||
echo "your email is $email <br><Br>";
|
||||
echo "<img src='$image' /><br><br>";
|
||||
echo "<a href='".$logout."'><button>Logout</button></a>";
|
||||
}else{
|
||||
//else echo login
|
||||
echo '<a href='.$helper->getLoginUrl().'>Login with facebook</a>';
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label >
|
||||
<label>
|
||||
<?php echo $error;?>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
@@ -65,8 +65,8 @@
|
||||
});
|
||||
|
||||
</script>
|
||||
<script src="bootstrap.min.js"></script>
|
||||
<script src="angular.min.js"></script>
|
||||
<script src="js/bootstrap.min.js"></script>
|
||||
<script src="js/angular.min.js"></script>
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta charset="utf-8">
|
||||
|
||||
+16
-19
@@ -1,31 +1,28 @@
|
||||
<?php
|
||||
<?php
|
||||
session_start();
|
||||
if(isset($_SESSION['user'])){
|
||||
$temp=$_SESSION['user'];
|
||||
}
|
||||
else{
|
||||
header("Location: ../views/signinPage.php?message=".urlencode("Login again!"));
|
||||
exit();
|
||||
}
|
||||
require_once("engine.php");
|
||||
require_once("../models/user.php");
|
||||
require_once("../models/album.php");
|
||||
require_once("../controllers/upload.php");
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<?php
|
||||
require_once("engine.php");
|
||||
require_once("../models/user.php");
|
||||
require_once("../models/album.php");
|
||||
require_once("../controllers/upload.php");
|
||||
echo $includes;
|
||||
?>
|
||||
<?php echo $includes; ?>
|
||||
<title>
|
||||
PhotoShare
|
||||
</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<?php
|
||||
echo $navbar;
|
||||
?>
|
||||
<?php echo $navbar; ?>
|
||||
<div class="col-md-3" ></div>
|
||||
<div class="col-md-6" data-spy="scroll" data-target="#mynav">
|
||||
<div class="panel panel-primary">
|
||||
@@ -37,19 +34,19 @@
|
||||
<div class="col-md-12" >
|
||||
<div class="form-group">
|
||||
<label>
|
||||
Label :
|
||||
Label :
|
||||
</label>
|
||||
<input type="text" name= "label" class="form-control" id="label">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>
|
||||
Description :
|
||||
Description :
|
||||
</label>
|
||||
<input type="text" name= "description" class="form-control" id="description">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>
|
||||
Public :
|
||||
Public :
|
||||
</label>
|
||||
<select name = "access">
|
||||
<option value='0'>No</option>
|
||||
@@ -58,12 +55,12 @@
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>
|
||||
Album :
|
||||
Album :
|
||||
</label>
|
||||
<select name = "albumName">
|
||||
<option value=''>No Album</option>
|
||||
<?php
|
||||
$rs = album ::getAllUserAlbum($temp['username']);
|
||||
$rs = album::getAllUserAlbum($temp['username']);
|
||||
if($rs == false)
|
||||
{
|
||||
echo "No Albums Present!";
|
||||
@@ -81,11 +78,11 @@
|
||||
<div class="form-group">
|
||||
<input type="file" name= "file" class="btn btn-info" id="file">
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
<input type="submit" name= "upload" class="btn btn-primary" value="Upload" id="upload">
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
<label>
|
||||
<?php echo $uerror;?>
|
||||
@@ -98,4 +95,4 @@
|
||||
</div>
|
||||
<div class="col-md-3" ></div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
Reference in new issue
Block a user