From 1d4c8248caf15cf627fa537c334dd0c4334f150c Mon Sep 17 00:00:00 2001 From: Bhanu Date: Fri, 21 Oct 2016 20:44:23 +0530 Subject: [PATCH 019/127] [imad-console] Updates ui/main.js --- ui/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/main.js b/ui/main.js index e22c9454e9..a8ee49a4d0 100644 --- a/ui/main.js +++ b/ui/main.js @@ -1,9 +1,9 @@ console.log('Loaded!'); -var img =document.getElementbyId('madi'); +var img =document.getElementbyId("madi"); var marginleft = 0; var moveleft= function (){ marginleft = marginleft + 3; img.style.marginleft+"px"; -} -img.addEventListener('click',moveleft); \ No newline at end of file +}; +img.addEventListener("click",moveleft); \ No newline at end of file From 0ac59fd1dfbbbbb58da29ec1e0b59328fc6f1837 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Fri, 21 Oct 2016 20:45:19 +0530 Subject: [PATCH 020/127] [imad-console] Updates ui/main.js --- ui/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/main.js b/ui/main.js index a8ee49a4d0..24bc51f5d2 100644 --- a/ui/main.js +++ b/ui/main.js @@ -1,9 +1,9 @@ console.log('Loaded!'); var img =document.getElementbyId("madi"); -var marginleft = 0; +var marginleft = 5; var moveleft= function (){ marginleft = marginleft + 3; - img.style.marginleft+"px"; + img.style.marginLeft+"px"; }; img.addEventListener("click",moveleft); \ No newline at end of file From 14f8b306662ef70efd68df663e4a93d12de2b9dc Mon Sep 17 00:00:00 2001 From: Bhanu Date: Fri, 21 Oct 2016 20:52:55 +0530 Subject: [PATCH 021/127] [imad-console] Updates ui/main.js --- ui/main.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/main.js b/ui/main.js index 24bc51f5d2..a76e479562 100644 --- a/ui/main.js +++ b/ui/main.js @@ -1,9 +1,9 @@ console.log('Loaded!'); -var img =document.getElementbyId("madi"); +var img =document.getElementById("madi"); var marginleft = 5; -var moveleft= function (){ +var moveleft=function(){ marginleft = marginleft + 3; - img.style.marginLeft+"px"; -}; + img.style.marginLeft=marginleft+"px"; +} img.addEventListener("click",moveleft); \ No newline at end of file From bdf64fe59e2840202308a98cea491317fdfab32c Mon Sep 17 00:00:00 2001 From: Bhanu Date: Fri, 21 Oct 2016 20:54:20 +0530 Subject: [PATCH 022/127] [imad-console] Updates ui/main.js --- ui/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/main.js b/ui/main.js index a76e479562..5f8800c3f4 100644 --- a/ui/main.js +++ b/ui/main.js @@ -5,5 +5,5 @@ var marginleft = 5; var moveleft=function(){ marginleft = marginleft + 3; img.style.marginLeft=marginleft+"px"; -} -img.addEventListener("click",moveleft); \ No newline at end of file +}; +img.addEventListener("click", moveleft); \ No newline at end of file From 552750a50fbd79073723875b155ed9da93cecdb3 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Fri, 21 Oct 2016 20:56:37 +0530 Subject: [PATCH 023/127] [imad-console] Updates ui/main.js --- ui/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/main.js b/ui/main.js index 5f8800c3f4..9880f158f5 100644 --- a/ui/main.js +++ b/ui/main.js @@ -2,8 +2,8 @@ console.log('Loaded!'); var img =document.getElementById("madi"); var marginleft = 5; -var moveleft=function(){ +function moveleft(){ marginleft = marginleft + 3; img.style.marginLeft=marginleft+"px"; -}; +} img.addEventListener("click", moveleft); \ No newline at end of file From 8cfb616019a97b0a781e889674698266a8fc8d4a Mon Sep 17 00:00:00 2001 From: Bhanu Date: Fri, 21 Oct 2016 21:01:59 +0530 Subject: [PATCH 024/127] [imad-console] Updates ui/index.html --- ui/index.html | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ui/index.html b/ui/index.html index c455e45f4c..641294a1c5 100644 --- a/ui/index.html +++ b/ui/index.html @@ -12,11 +12,8 @@

Hey stu!.

- - From 7cf5d8a26092fcabaf114b5edf72c3372cf405d5 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Fri, 21 Oct 2016 21:06:55 +0530 Subject: [PATCH 025/127] [imad-console] Updates ui/index.html --- ui/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index 641294a1c5..192bfe3338 100644 --- a/ui/index.html +++ b/ui/index.html @@ -6,7 +6,7 @@ black dug secret

From 2c97ce0a93bd3d828ae55888878bff5958df57f9 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Fri, 21 Oct 2016 21:06:55 +0530 Subject: [PATCH 026/127] [imad-console] Updates ui/main.js --- ui/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/main.js b/ui/main.js index 9880f158f5..f5fd93ecc8 100644 --- a/ui/main.js +++ b/ui/main.js @@ -1,9 +1,9 @@ console.log('Loaded!'); -var img =document.getElementById("madi"); +var imgo =document.getElementsByClassName("img-medium"); var marginleft = 5; function moveleft(){ marginleft = marginleft + 3; - img.style.marginLeft=marginleft+"px"; + img.style.marginLeft="marginleft"; } -img.addEventListener("click", moveleft); \ No newline at end of file +imgo.addEventListener("click", moveleft); \ No newline at end of file From a2dd496c31a172f819f37381757807105fd19047 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Fri, 21 Oct 2016 21:07:07 +0530 Subject: [PATCH 027/127] [imad-console] Updates ui/main.js --- ui/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/main.js b/ui/main.js index f5fd93ecc8..5c512c6dff 100644 --- a/ui/main.js +++ b/ui/main.js @@ -4,6 +4,6 @@ var imgo =document.getElementsByClassName("img-medium"); var marginleft = 5; function moveleft(){ marginleft = marginleft + 3; - img.style.marginLeft="marginleft"; + imgo.style.marginLeft="marginleft"; } imgo.addEventListener("click", moveleft); \ No newline at end of file From b1f5837bbf536ead5c2d168d771ea4d7b9c0f57c Mon Sep 17 00:00:00 2001 From: Bhanu Date: Fri, 21 Oct 2016 21:09:07 +0530 Subject: [PATCH 028/127] [imad-console] Updates ui/main.js --- ui/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/main.js b/ui/main.js index 5c512c6dff..4461663c8f 100644 --- a/ui/main.js +++ b/ui/main.js @@ -4,6 +4,6 @@ var imgo =document.getElementsByClassName("img-medium"); var marginleft = 5; function moveleft(){ marginleft = marginleft + 3; - imgo.style.marginLeft="marginleft"; + imgo.style.marginLeft="marginleft+'px'"; } imgo.addEventListener("click", moveleft); \ No newline at end of file From eb2c27f2efe5e9a26a93d316de43b1014653ba1c Mon Sep 17 00:00:00 2001 From: Bhanu Date: Fri, 21 Oct 2016 21:18:54 +0530 Subject: [PATCH 029/127] [imad-console] Updates ui/index.html --- ui/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/index.html b/ui/index.html index 192bfe3338..cdea613506 100644 --- a/ui/index.html +++ b/ui/index.html @@ -6,14 +6,14 @@ black dug secret

Hey stu!.

- - - + + From b835fbd39f771d78eeee40082e4d2a8884d7b0a7 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Fri, 21 Oct 2016 21:18:57 +0530 Subject: [PATCH 030/127] [imad-console] Updates ui/main.js --- ui/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/main.js b/ui/main.js index 4461663c8f..3cea5e8465 100644 --- a/ui/main.js +++ b/ui/main.js @@ -1,6 +1,6 @@ console.log('Loaded!'); -var imgo =document.getElementsByClassName("img-medium"); +var imgo =document.getElementById("simg"); var marginleft = 5; function moveleft(){ marginleft = marginleft + 3; From 0b6d89efa994f08af41066d63e20a4cd8f0756de Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 00:26:03 +0530 Subject: [PATCH 031/127] [imad-console] Updates server.js --- server.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index 801ae4b7af..d8bdc459b1 100644 --- a/server.js +++ b/server.js @@ -20,7 +20,9 @@ app.get('/ui/article-one.html', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'article-one.html')); }); - +app.get('/ui/main.js', function (req, res) { + res.sendFile(path.join(__dirname, 'ui', 'main.js')); +}); var port = 8080; // Use 8080 for local development because you might already have apache running on 80 app.listen(8080, function () { console.log(`IMAD course app listening on port ${port}!`); From 9afc606598f3dac8edc6c5b81cf028f10a473944 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 00:31:45 +0530 Subject: [PATCH 032/127] [imad-console] Updates ui/main.js --- ui/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/main.js b/ui/main.js index 3cea5e8465..d73ed91119 100644 --- a/ui/main.js +++ b/ui/main.js @@ -1,9 +1,9 @@ console.log('Loaded!'); var imgo =document.getElementById("simg"); -var marginleft = 5; +var h = 5; function moveleft(){ - marginleft = marginleft + 3; - imgo.style.marginLeft="marginleft+'px'"; +h = h + 30; + imgo.style.marginLeft="h+'px'"; } imgo.addEventListener("click", moveleft); \ No newline at end of file From 17f44d32fb10281abc746ff72a0d67e8a8d283eb Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:06:01 +0530 Subject: [PATCH 033/127] [imad-console] Updates ui/index.html --- ui/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index cdea613506..e008c617e7 100644 --- a/ui/index.html +++ b/ui/index.html @@ -6,7 +6,7 @@ black dug secret

From d2eb7f6c9522ed0ef929155d2c9d15f9ab380c93 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:06:02 +0530 Subject: [PATCH 034/127] [imad-console] Updates ui/main.js --- ui/main.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ui/main.js b/ui/main.js index d73ed91119..b4dc6b8a16 100644 --- a/ui/main.js +++ b/ui/main.js @@ -1,9 +1,8 @@ console.log('Loaded!'); -var imgo =document.getElementById("simg"); -var h = 5; +var imgo =document.getElementById("madi"); + function moveleft(){ -h = h + 30; - imgo.style.marginLeft="h+'px'"; + imgo.style.marginLeft="90px"; } imgo.addEventListener("click", moveleft); \ No newline at end of file From 6f5be2db9d220a17da99988e07a28dada09df8b1 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:10:43 +0530 Subject: [PATCH 035/127] [imad-console] Updates ui/main.js --- ui/main.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ui/main.js b/ui/main.js index b4dc6b8a16..27da603a7d 100644 --- a/ui/main.js +++ b/ui/main.js @@ -1,8 +1,11 @@ console.log('Loaded!'); var imgo =document.getElementById("madi"); - +var marginleft=0; +var h=0; function moveleft(){ - imgo.style.marginLeft="90px"; + marginleft= marginleft + 10 ; + h=marginleft + "px"; + imgo.style.marginLeft="h"; } imgo.addEventListener("click", moveleft); \ No newline at end of file From e67881ea4dc965ee924cb863eb055acd42b513dc Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:14:07 +0530 Subject: [PATCH 036/127] [imad-console] Updates ui/main.js --- ui/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/main.js b/ui/main.js index 27da603a7d..2322465a9c 100644 --- a/ui/main.js +++ b/ui/main.js @@ -5,7 +5,7 @@ var marginleft=0; var h=0; function moveleft(){ marginleft= marginleft + 10 ; - h=marginleft + "px"; - imgo.style.marginLeft="h"; + + imgo.style.marginLeft=marginleft + "px" ; } imgo.addEventListener("click", moveleft); \ No newline at end of file From 66f7d54374fe6d67ac2803718823e3635df2c26f Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:16:33 +0530 Subject: [PATCH 037/127] [imad-console] Updates ui/main.js --- ui/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/main.js b/ui/main.js index 2322465a9c..40e479fab0 100644 --- a/ui/main.js +++ b/ui/main.js @@ -3,6 +3,7 @@ console.log('Loaded!'); var imgo =document.getElementById("madi"); var marginleft=0; var h=0; +var interval = setInterval(moveleft,1000); function moveleft(){ marginleft= marginleft + 10 ; From 7f4f70e3e7a81bba4144d3b8c08da89b49881ebb Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:18:07 +0530 Subject: [PATCH 038/127] [imad-console] Updates ui/main.js --- ui/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/main.js b/ui/main.js index 40e479fab0..19bd3aabc5 100644 --- a/ui/main.js +++ b/ui/main.js @@ -3,7 +3,7 @@ console.log('Loaded!'); var imgo =document.getElementById("madi"); var marginleft=0; var h=0; -var interval = setInterval(moveleft,1000); +var interval = setInterval(moveleft,10); function moveleft(){ marginleft= marginleft + 10 ; From 0a28c11d7dc401250b6db06b1919c53df86b244f Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:18:34 +0530 Subject: [PATCH 039/127] [imad-console] Updates ui/main.js --- ui/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/main.js b/ui/main.js index 19bd3aabc5..6167a6cd27 100644 --- a/ui/main.js +++ b/ui/main.js @@ -5,7 +5,7 @@ var marginleft=0; var h=0; var interval = setInterval(moveleft,10); function moveleft(){ - marginleft= marginleft + 10 ; + marginleft= marginleft + 2 ; imgo.style.marginLeft=marginleft + "px" ; } From 0a226bf8245f56f16af26669116a51061b6ec080 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:29:49 +0530 Subject: [PATCH 040/127] [imad-console] Updates ui/index.html --- ui/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/index.html b/ui/index.html index e008c617e7..24c8fda976 100644 --- a/ui/index.html +++ b/ui/index.html @@ -8,6 +8,9 @@

+ +

Hey stu!. From a1221712759af944f6b1c2914f24be01918c30b9 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:29:58 +0530 Subject: [PATCH 041/127] [imad-console] Updates ui/main.js --- ui/main.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/main.js b/ui/main.js index 6167a6cd27..ac47a46f4e 100644 --- a/ui/main.js +++ b/ui/main.js @@ -1,6 +1,7 @@ console.log('Loaded!'); var imgo =document.getElementById("madi"); +var but =document.getElementById("but1"); var marginleft=0; var h=0; var interval = setInterval(moveleft,10); @@ -9,4 +10,9 @@ function moveleft(){ imgo.style.marginLeft=marginleft + "px" ; } -imgo.addEventListener("click", moveleft); \ No newline at end of file +imgo.addEventListener("click", moveleft); +function stop(){ + window.clearInterval(interval); +} + +but1.addEventListener("click" ,stop); \ No newline at end of file From 1bba81cc3248c9b0deaceb61dc638f98ab541278 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:33:25 +0530 Subject: [PATCH 042/127] [imad-console] Updates ui/style.css --- ui/style.css | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index 71a5f6acc1..b5d82ad16b 100644 --- a/ui/style.css +++ b/ui/style.css @@ -19,4 +19,14 @@ body { .img-medium { height: 200px; } - +#btn1{ + + background-color: #4CAF50; /* Green */ + border: none; + color: white; + padding: 15px 32px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 16px; +} From b11dc088406be771ea65b0a80ec8d41c73fb8421 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:34:51 +0530 Subject: [PATCH 043/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index b5d82ad16b..284c1b21a3 100644 --- a/ui/style.css +++ b/ui/style.css @@ -19,7 +19,7 @@ body { .img-medium { height: 200px; } -#btn1{ +#but1{ background-color: #4CAF50; /* Green */ border: none; From 042bcb7040c4fd2b7896e7c5c5ebf15e0da1b0a0 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:38:40 +0530 Subject: [PATCH 044/127] [imad-console] Updates ui/style.css --- ui/style.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ui/style.css b/ui/style.css index 284c1b21a3..d2927fdded 100644 --- a/ui/style.css +++ b/ui/style.css @@ -20,11 +20,10 @@ body { height: 200px; } #but1{ - - background-color: #4CAF50; /* Green */ - border: none; + width:100%; + position:relative; color: white; - padding: 15px 32px; + text-align: center; text-decoration: none; display: inline-block; From dcbc6923191d19c29d59bbb5829561217b52c887 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:39:27 +0530 Subject: [PATCH 045/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index d2927fdded..560d860b9c 100644 --- a/ui/style.css +++ b/ui/style.css @@ -21,7 +21,7 @@ body { } #but1{ width:100%; - position:relative; + position:absolute; color: white; text-align: center; From e15689f2800dc5b3f31af2ffc0042553637df5fa Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:40:21 +0530 Subject: [PATCH 046/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index 560d860b9c..fc40b04ad7 100644 --- a/ui/style.css +++ b/ui/style.css @@ -20,7 +20,7 @@ body { height: 200px; } #but1{ - width:100%; + width:100px; position:absolute; color: white; From eb1b250208f9e664ec2396c28317f378231176eb Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:41:25 +0530 Subject: [PATCH 047/127] [imad-console] Updates ui/style.css --- ui/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/style.css b/ui/style.css index fc40b04ad7..4bf9c4d499 100644 --- a/ui/style.css +++ b/ui/style.css @@ -20,8 +20,8 @@ body { height: 200px; } #but1{ - width:100px; - position:absolute; + + position:relative; color: white; text-align: center; From b97a2e1d3a4ee142c9b71f5738ed1afd19f59230 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:41:51 +0530 Subject: [PATCH 048/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index 4bf9c4d499..4e0e7b863a 100644 --- a/ui/style.css +++ b/ui/style.css @@ -21,7 +21,7 @@ body { } #but1{ - position:relative; + position:relative; color: white; text-align: center; From ff945e855a2c4e27cf0819e12fc51694ec6fad69 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:42:56 +0530 Subject: [PATCH 049/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index 4e0e7b863a..0ef17a9540 100644 --- a/ui/style.css +++ b/ui/style.css @@ -21,7 +21,7 @@ body { } #but1{ - position:relative; + position:absolute; color: white; text-align: center; From a129572a4bb09e882b133e0b06c6e5bfbbb7ab0d Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:44:33 +0530 Subject: [PATCH 050/127] [imad-console] Updates ui/index.html --- ui/index.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/index.html b/ui/index.html index 24c8fda976..77f6135d20 100644 --- a/ui/index.html +++ b/ui/index.html @@ -7,10 +7,11 @@ black dug secret

Hey stu!. From e5039c99943a437b0edb05ca9c7cc93f5f98ffdc Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:44:33 +0530 Subject: [PATCH 051/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index 0ef17a9540..4e0e7b863a 100644 --- a/ui/style.css +++ b/ui/style.css @@ -21,7 +21,7 @@ body { } #but1{ - position:absolute; + position:relative; color: white; text-align: center; From 7a5ba3228c2e30080fc8b35b4b399383c03f28d0 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:45:08 +0530 Subject: [PATCH 052/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index 4e0e7b863a..0ef17a9540 100644 --- a/ui/style.css +++ b/ui/style.css @@ -21,7 +21,7 @@ body { } #but1{ - position:relative; + position:absolute; color: white; text-align: center; From 63fc40274621bb0ac61ab8e40e5fc3de6d5d9fba Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:45:36 +0530 Subject: [PATCH 053/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index 0ef17a9540..ea81dd3087 100644 --- a/ui/style.css +++ b/ui/style.css @@ -21,7 +21,7 @@ body { } #but1{ - position:absolute; + position:fixed; color: white; text-align: center; From 01ed1fdb6e2aa4964f917c0131e8d61d708989dc Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:46:19 +0530 Subject: [PATCH 054/127] [imad-console] Updates ui/index.html --- ui/index.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/index.html b/ui/index.html index 77f6135d20..abe5fcfe3d 100644 --- a/ui/index.html +++ b/ui/index.html @@ -7,13 +7,14 @@ black dug secret

- -

+ +

Hey stu!.

From 60b74b8d9d2394f91494afd0893746b830257bba Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:52:06 +0530 Subject: [PATCH 057/127] [imad-console] Updates ui/main.js --- ui/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/main.js b/ui/main.js index ac47a46f4e..ca29ff2e0f 100644 --- a/ui/main.js +++ b/ui/main.js @@ -15,4 +15,5 @@ function stop(){ window.clearInterval(interval); } -but1.addEventListener("click" ,stop); \ No newline at end of file +but1.addEventListener("click" ,stop); +but1.addEventListener("dblclick" ,moveleft); From 46f6b2ab44b4e212942f877a6189926c64d98e6d Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:56:07 +0530 Subject: [PATCH 058/127] [imad-console] Updates ui/main.js --- ui/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/main.js b/ui/main.js index ca29ff2e0f..a986c10381 100644 --- a/ui/main.js +++ b/ui/main.js @@ -16,4 +16,4 @@ function stop(){ } but1.addEventListener("click" ,stop); -but1.addEventListener("dblclick" ,moveleft); +but1.removeEventListener("dblclick" ,stop); From 4755d16b240b6eed6de499200044b4892375195a Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 01:57:01 +0530 Subject: [PATCH 059/127] [imad-console] Updates ui/main.js --- ui/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/main.js b/ui/main.js index a986c10381..a985474ad3 100644 --- a/ui/main.js +++ b/ui/main.js @@ -16,4 +16,4 @@ function stop(){ } but1.addEventListener("click" ,stop); -but1.removeEventListener("dblclick" ,stop); + From 0d448faa265499b97b7cd2b07e95c90024319d95 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:03:32 +0530 Subject: [PATCH 060/127] [imad-console] Updates ui/article-one.html --- ui/article-one.html | 51 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/ui/article-one.html b/ui/article-one.html index 1e92a8424e..fc5baed723 100644 --- a/ui/article-one.html +++ b/ui/article-one.html @@ -1,7 +1,44 @@ - - - - -

two dog

- - + + + +sampleweb + + + + + + +

LITERATURE

+ +

+this is a sample website + + + + + + + + + + + + + + + + +

YOUR NAME
YOUR COLLEGE NAME
RATE YOUR COLLEGE OUT OF 10

+ + + +

+ + \ No newline at end of file From 4b889e2343981e6388a645bda11e07c13cc82900 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:04:04 +0530 Subject: [PATCH 061/127] [imad-console] Updates ui/style.css --- ui/style.css | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/ui/style.css b/ui/style.css index 49a78e3394..a5a7d1f4f2 100644 --- a/ui/style.css +++ b/ui/style.css @@ -30,3 +30,33 @@ body { font-size: 16px; z-index:1000; } +/* article one css */ +#a1{ + +border : 1px solid black; +padding : 5px; +margin : 2px auto; +background:indigo; +} +#h1{ + +text-align:center; +color:white; +} + +#a2{ +float:left; +margin:30px auto; +padding:5px ; +background:silver; +width:1330px; + +} +footer{ +clear:both; +text-align:center; +padding:5px; +margin:2px auto; +border-top:1px solid blue; +background :indigo; +} From de22c5b046edcec124730af96a82a7434c71a768 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:06:01 +0530 Subject: [PATCH 062/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index a5a7d1f4f2..f9e09ad46f 100644 --- a/ui/style.css +++ b/ui/style.css @@ -47,7 +47,7 @@ color:white; #a2{ float:left; margin:30px auto; -padding:5px ; + background:silver; width:1330px; From a677e19a04309a72568b2e96e153926cddb5aad9 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:06:07 +0530 Subject: [PATCH 063/127] [imad-console] Updates ui/article-one.html --- ui/article-one.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/article-one.html b/ui/article-one.html index fc5baed723..19da973646 100644 --- a/ui/article-one.html +++ b/ui/article-one.html @@ -10,7 +10,7 @@

LITERATURE

From 620b6ab33a1acc8c9df580b6ae292e88566d502b Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:07:16 +0530 Subject: [PATCH 064/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index f9e09ad46f..dec26652f9 100644 --- a/ui/style.css +++ b/ui/style.css @@ -58,5 +58,5 @@ text-align:center; padding:5px; margin:2px auto; border-top:1px solid blue; -background :indigo; +background :blue; } From 7236d9ab92093f851b4970b19373eabfeb2b31e5 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:08:55 +0530 Subject: [PATCH 065/127] [imad-console] Updates ui/style.css --- ui/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/style.css b/ui/style.css index dec26652f9..a7e6eebf76 100644 --- a/ui/style.css +++ b/ui/style.css @@ -36,7 +36,7 @@ body { border : 1px solid black; padding : 5px; margin : 2px auto; -background:indigo; +background-color:indigo; } #h1{ @@ -58,5 +58,5 @@ text-align:center; padding:5px; margin:2px auto; border-top:1px solid blue; -background :blue; +background-color :#b9acac; } From ef5c5aaebd7af1be8d80237905155ee2ef1ac497 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:12:46 +0530 Subject: [PATCH 066/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index a7e6eebf76..102bbdefc9 100644 --- a/ui/style.css +++ b/ui/style.css @@ -48,7 +48,7 @@ color:white; float:left; margin:30px auto; -background:silver; +background-color:silver; width:1330px; } From 4bc32b1065a2e6c74aad383af428ab0f8e4373f7 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:14:32 +0530 Subject: [PATCH 067/127] [imad-console] Updates ui/index.html --- ui/index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/index.html b/ui/index.html index a54e0a0b15..79b9caa8ff 100644 --- a/ui/index.html +++ b/ui/index.html @@ -18,8 +18,7 @@

- + From 6caae9cc940c1bb420e98c85de7b94c4c0b741c2 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:14:49 +0530 Subject: [PATCH 068/127] [imad-console] Updates ui/index.html --- ui/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index 79b9caa8ff..a54e0a0b15 100644 --- a/ui/index.html +++ b/ui/index.html @@ -18,7 +18,8 @@

- + From 77a4fa8ff7a0573cfd9926c879f64af1fd0bcc1f Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:15:14 +0530 Subject: [PATCH 069/127] [imad-console] Updates ui/article-one.html --- ui/article-one.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/article-one.html b/ui/article-one.html index 19da973646..b3050b212e 100644 --- a/ui/article-one.html +++ b/ui/article-one.html @@ -3,7 +3,7 @@ sampleweb - + From 26f680b0b72819a4a53ff9021bf99a438d391206 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:15:36 +0530 Subject: [PATCH 070/127] [imad-console] Updates ui/article-one.html --- ui/article-one.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/article-one.html b/ui/article-one.html index b3050b212e..4d59ee0596 100644 --- a/ui/article-one.html +++ b/ui/article-one.html @@ -2,7 +2,7 @@ sampleweb - + From 23bc33811934a867855b186e316c04efabb71718 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:17:40 +0530 Subject: [PATCH 071/127] [imad-console] Updates ui/style.css --- ui/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/style.css b/ui/style.css index 102bbdefc9..e68157020c 100644 --- a/ui/style.css +++ b/ui/style.css @@ -32,10 +32,10 @@ body { } /* article one css */ #a1{ - -border : 1px solid black; +position:fixed; +border-bottom : 1px solid black; padding : 5px; -margin : 2px auto; +margin : 0 auto; background-color:indigo; } #h1{ From 002e026388a2ddcbc85a79fd16fb68b3dc040ab2 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:18:26 +0530 Subject: [PATCH 072/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index e68157020c..4c60826274 100644 --- a/ui/style.css +++ b/ui/style.css @@ -35,7 +35,7 @@ body { position:fixed; border-bottom : 1px solid black; padding : 5px; -margin : 0 auto; +margin : 5px ; background-color:indigo; } #h1{ From fc5837de27476b7406f0c6ccd529511a92e30c4b Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:22:41 +0530 Subject: [PATCH 073/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index 4c60826274..fd87106610 100644 --- a/ui/style.css +++ b/ui/style.css @@ -32,7 +32,7 @@ body { } /* article one css */ #a1{ -position:fixed; + border-bottom : 1px solid black; padding : 5px; margin : 5px ; From 747480c1716d255b3db6c360e4a1ddf972e87263 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:27:34 +0530 Subject: [PATCH 074/127] [imad-console] Updates ui/article-one.html --- ui/article-one.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ui/article-one.html b/ui/article-one.html index 4d59ee0596..43ac8287b1 100644 --- a/ui/article-one.html +++ b/ui/article-one.html @@ -8,9 +8,8 @@ -

LITERATURE

@@ -39,6 +38,6 @@

LITERATURE

+ \ No newline at end of file From 5428d07ad1357490abb30c9783bebfb22612598f Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:40:26 +0530 Subject: [PATCH 075/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index fd87106610..d630fa63ee 100644 --- a/ui/style.css +++ b/ui/style.css @@ -35,7 +35,7 @@ body { border-bottom : 1px solid black; padding : 5px; -margin : 5px ; +margin : 2px auto ; background-color:indigo; } #h1{ From 924f675793e2b8cb7d4934a6e2509c513fbef9d9 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:41:14 +0530 Subject: [PATCH 076/127] [imad-console] Updates ui/style.css --- ui/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/style.css b/ui/style.css index d630fa63ee..a4cd846cd6 100644 --- a/ui/style.css +++ b/ui/style.css @@ -37,6 +37,7 @@ border-bottom : 1px solid black; padding : 5px; margin : 2px auto ; background-color:indigo; +margin-top:0; } #h1{ From d53227c485aac4fb053252962c7f641770e3d00c Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:43:37 +0530 Subject: [PATCH 077/127] [imad-console] Updates ui/article-one.html --- ui/article-one.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/article-one.html b/ui/article-one.html index 43ac8287b1..9ad671ee4b 100644 --- a/ui/article-one.html +++ b/ui/article-one.html @@ -1,7 +1,9 @@ -sampleweb + + + sampleweb From 3ffaaffc5bd3c6f60c8bbbd591d8d4459903bd90 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:46:48 +0530 Subject: [PATCH 078/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index a4cd846cd6..06f6257b1a 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,4 +1,4 @@ -body { +.body { font-family: sans-serif; background-color: lightgrey; margin-top: 75px; From f81f96ae519ad7b5d9e42bb81f9b1e644d920a13 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:46:48 +0530 Subject: [PATCH 079/127] [imad-console] Updates ui/index.html --- ui/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index a54e0a0b15..fd2fa0c3bd 100644 --- a/ui/index.html +++ b/ui/index.html @@ -3,7 +3,7 @@ - + black dug secret

From afde7a3cc68128bea32b9424aac9b30756ade873 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:49:06 +0530 Subject: [PATCH 080/127] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index 06f6257b1a..6ae42e9434 100644 --- a/ui/style.css +++ b/ui/style.css @@ -47,7 +47,7 @@ color:white; #a2{ float:left; -margin:30px auto; +margin:20px auto; background-color:silver; width:1330px; From a9624d3cafcad1376b6ec7af8fea3325ff065ecb Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 02:50:16 +0530 Subject: [PATCH 081/127] [imad-console] Updates ui/style.css --- ui/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/style.css b/ui/style.css index 6ae42e9434..43bbdf7fa8 100644 --- a/ui/style.css +++ b/ui/style.css @@ -46,11 +46,11 @@ color:white; } #a2{ -float:left; + margin:20px auto; background-color:silver; -width:1330px; + } footer{ From da7ae8cf51579a45e78ff3cd545777dbe27095d0 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 03:12:18 +0530 Subject: [PATCH 082/127] [imad-console] Updates ui/article-one.html --- ui/article-one.html | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/ui/article-one.html b/ui/article-one.html index 9ad671ee4b..ce1e28cfab 100644 --- a/ui/article-one.html +++ b/ui/article-one.html @@ -17,10 +17,12 @@

LITERATURE

this is a sample website +

- + - \ No newline at end of file + + + From 87a3e2baafd41e6dfc3a851510cd8f14f1f19ac2 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 03:21:39 +0530 Subject: [PATCH 083/127] Create article-two.html --- article-two.html | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 article-two.html diff --git a/article-two.html b/article-two.html new file mode 100644 index 0000000000..90531a4b3e --- /dev/null +++ b/article-two.html @@ -0,0 +1,2 @@ + + From 1ccd1927267352f85e7101dac6efb67980b08a9b Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 05:00:15 +0530 Subject: [PATCH 084/127] Create form-one.php --- form-one.php | 1 + 1 file changed, 1 insertion(+) create mode 100644 form-one.php diff --git a/form-one.php b/form-one.php new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/form-one.php @@ -0,0 +1 @@ + From 5b795b640665566b26d32025ffd14e1b76dcb8e8 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 05:33:13 +0530 Subject: [PATCH 085/127] [imad-console] Updates server.js --- server.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server.js b/server.js index d8bdc459b1..288a8f1ab5 100644 --- a/server.js +++ b/server.js @@ -19,6 +19,9 @@ app.get('/ui/madi.png', function (req, res) { app.get('/ui/article-one.html', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'article-one.html')); }); +app.get('/ui/article-two.html', function (req, res) { + res.sendFile(path.join(__dirname, 'ui', 'article-two.html')); +}); app.get('/ui/main.js', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'main.js')); From 26bca4bb770ad2edbca2f3c936ad263cb27c181e Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 05:46:12 +0530 Subject: [PATCH 086/127] [imad-console] Updates article-two.html --- article-two.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/article-two.html b/article-two.html index 90531a4b3e..38fede0dd8 100644 --- a/article-two.html +++ b/article-two.html @@ -1,2 +1,4 @@ + + From 5de49aa7736eb2c18c302752f49fea8df0c1699d Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 05:50:52 +0530 Subject: [PATCH 087/127] [imad-console] Updates ui/article-one.html --- ui/article-one.html | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ui/article-one.html b/ui/article-one.html index ce1e28cfab..9f22b9473c 100644 --- a/ui/article-one.html +++ b/ui/article-one.html @@ -41,16 +41,6 @@

LITERATURE

have a good day ! - From c41439382052aa2aa7ae708c333be511dcbaace8 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 21:49:06 +0530 Subject: [PATCH 088/127] Add files via upload --- new.php | 42 ++++++++++++++++++++++++++++++++++++++++++ newcon.php | 5 +++++ 2 files changed, 47 insertions(+) create mode 100644 new.php create mode 100644 newcon.php diff --git a/new.php b/new.php new file mode 100644 index 0000000000..6e6d69def6 --- /dev/null +++ b/new.php @@ -0,0 +1,42 @@ + + + + +hello + + + + + + + + + \ No newline at end of file diff --git a/newcon.php b/newcon.php new file mode 100644 index 0000000000..26eaeea86b --- /dev/null +++ b/newcon.php @@ -0,0 +1,5 @@ + \ No newline at end of file From 4776ed47d2304c4925ab7426a50f1031a3d82a93 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 21:58:46 +0530 Subject: [PATCH 089/127] [imad-console] Updates server.js --- server.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index 288a8f1ab5..d3536059ef 100644 --- a/server.js +++ b/server.js @@ -20,12 +20,18 @@ app.get('/ui/article-one.html', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'article-one.html')); }); app.get('/ui/article-two.html', function (req, res) { - res.sendFile(path.join(__dirname, 'ui', 'article-two.html')); + res.sendFile(path.join(__dirname, 'article-two.html')); }); app.get('/ui/main.js', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'main.js')); }); +app.get('/newcon.php', function (req, res) { + res.sendFile(path.join(__dirname, 'newcon.php')); +}); +app.get('/new.php', function (req, res) { + res.sendFile(path.join(__dirname, 'ui', 'new.php')); +}); var port = 8080; // Use 8080 for local development because you might already have apache running on 80 app.listen(8080, function () { console.log(`IMAD course app listening on port ${port}!`); From 612b80ea307d6e1da78b9c9e3f99d7feffe51a27 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 21:58:53 +0530 Subject: [PATCH 090/127] [imad-console] Updates ui/index.html --- ui/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/index.html b/ui/index.html index fd2fa0c3bd..77b5694264 100644 --- a/ui/index.html +++ b/ui/index.html @@ -5,6 +5,8 @@ black dug secret +
+ hello

From 141021501b940ef987380ba3687557378538519a Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 22:00:18 +0530 Subject: [PATCH 091/127] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index d3536059ef..19c5015127 100644 --- a/server.js +++ b/server.js @@ -30,7 +30,7 @@ app.get('/newcon.php', function (req, res) { res.sendFile(path.join(__dirname, 'newcon.php')); }); app.get('/new.php', function (req, res) { - res.sendFile(path.join(__dirname, 'ui', 'new.php')); + res.sendFile(path.join(__dirname, 'new.php')); }); var port = 8080; // Use 8080 for local development because you might already have apache running on 80 app.listen(8080, function () { From 210e4dbd713cdd9f474db316cc527d49e9069af2 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 22:08:25 +0530 Subject: [PATCH 092/127] Add files via upload --- neww.php | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 neww.php diff --git a/neww.php b/neww.php new file mode 100644 index 0000000000..6edc5e73c5 --- /dev/null +++ b/neww.php @@ -0,0 +1,42 @@ + + + + +hello + + + + + + + + + \ No newline at end of file From 8afaf1aa331b8b24de199c41b297efe0bb5f53d9 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 22:09:27 +0530 Subject: [PATCH 093/127] [imad-console] Updates ui/index.html --- ui/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index 77b5694264..c2c72d7485 100644 --- a/ui/index.html +++ b/ui/index.html @@ -6,7 +6,7 @@ black dug secret
- hello + hello

From 9f08207175f0645ac1dcd0b41124c158fcea2398 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 22:09:28 +0530 Subject: [PATCH 094/127] [imad-console] Updates server.js --- server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server.js b/server.js index 19c5015127..3fe20c79c9 100644 --- a/server.js +++ b/server.js @@ -29,8 +29,8 @@ app.get('/ui/main.js', function (req, res) { app.get('/newcon.php', function (req, res) { res.sendFile(path.join(__dirname, 'newcon.php')); }); -app.get('/new.php', function (req, res) { - res.sendFile(path.join(__dirname, 'new.php')); +app.get('/neww.php', function (req, res) { + res.sendFile(path.join(__dirname, 'neww.php')); }); var port = 8080; // Use 8080 for local development because you might already have apache running on 80 app.listen(8080, function () { From e2342a3d89c1a9872f3971147efd2dd67fc6f126 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 23:40:44 +0530 Subject: [PATCH 095/127] Add files via upload --- corct.php | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 corct.php diff --git a/corct.php b/corct.php new file mode 100644 index 0000000000..6edc5e73c5 --- /dev/null +++ b/corct.php @@ -0,0 +1,42 @@ + + + + +hello + + + + + + + + + \ No newline at end of file From 9880cca0f4fc0e6278e8631b773aec749f02b656 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 23:43:06 +0530 Subject: [PATCH 096/127] [imad-console] Updates server.js --- server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server.js b/server.js index 3fe20c79c9..b22e88e584 100644 --- a/server.js +++ b/server.js @@ -29,8 +29,8 @@ app.get('/ui/main.js', function (req, res) { app.get('/newcon.php', function (req, res) { res.sendFile(path.join(__dirname, 'newcon.php')); }); -app.get('/neww.php', function (req, res) { - res.sendFile(path.join(__dirname, 'neww.php')); +app.get('/corct.php', function (req, res) { + res.sendFile(path.join(__dirname, 'corct.php')); }); var port = 8080; // Use 8080 for local development because you might already have apache running on 80 app.listen(8080, function () { From 624b6fc4a541e6958b4827dd46b662762bf682f0 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 23:43:06 +0530 Subject: [PATCH 097/127] [imad-console] Updates ui/index.html --- ui/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index c2c72d7485..08f43ed5db 100644 --- a/ui/index.html +++ b/ui/index.html @@ -6,7 +6,7 @@ black dug secret
- hello + hello

From 26ad8d79676488783e0d9bb05744ba5742505add Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 23:49:05 +0530 Subject: [PATCH 098/127] Add files via upload --- corct.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/corct.php b/corct.php index 6edc5e73c5..8ef746eae1 100644 --- a/corct.php +++ b/corct.php @@ -19,14 +19,14 @@ BRANCH - + EMAIL RATE US - + DATE OF BIRTH From 51ee1db5a3fcc5488121392078ca59abd96fed99 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sat, 22 Oct 2016 23:49:58 +0530 Subject: [PATCH 099/127] Add files via upload From 67c22c2c72b20f0300422706c87005568d5d4089 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sun, 23 Oct 2016 23:44:18 +0530 Subject: [PATCH 100/127] Add files via upload --- corct.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/corct.php b/corct.php index 8ef746eae1..85b4c1a55d 100644 --- a/corct.php +++ b/corct.php @@ -10,27 +10,27 @@ -

> +>

form

- + - + - + - + - From fc389b4029a426ff05c08a20de41225a20f1fc04 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sun, 23 Oct 2016 23:44:39 +0530 Subject: [PATCH 101/127] Add files via upload --- corct1.php | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 corct1.php diff --git a/corct1.php b/corct1.php new file mode 100644 index 0000000000..6889f28a74 --- /dev/null +++ b/corct1.php @@ -0,0 +1,7 @@ + + + +Hi +You are years old. + + From 369e98c8362af43ff53ba436840d0ae3a508d0ac Mon Sep 17 00:00:00 2001 From: Bhanu Date: Sun, 23 Oct 2016 23:48:03 +0530 Subject: [PATCH 102/127] [imad-console] Updates server.js --- server.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server.js b/server.js index b22e88e584..399eba4979 100644 --- a/server.js +++ b/server.js @@ -32,6 +32,9 @@ app.get('/newcon.php', function (req, res) { app.get('/corct.php', function (req, res) { res.sendFile(path.join(__dirname, 'corct.php')); }); +app.get('/corct1.php', function (req, res) { + res.sendFile(path.join(__dirname, 'corct1.php')); +}); var port = 8080; // Use 8080 for local development because you might already have apache running on 80 app.listen(8080, function () { console.log(`IMAD course app listening on port ${port}!`); From f3fc75c0fded89d9a408530f049d2b8ede6b924f Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:33:59 +0530 Subject: [PATCH 103/127] [imad-console] Updates ui/index.html --- ui/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/index.html b/ui/index.html index 08f43ed5db..79de77bc30 100644 --- a/ui/index.html +++ b/ui/index.html @@ -5,6 +5,7 @@ black dug secret + square
hello

From 7837febd9838aa7e883a09ecaaa5f483aebc0a01 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:37:38 +0530 Subject: [PATCH 104/127] [imad-console] Updates ui/index.html --- ui/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index 79de77bc30..f8653b2418 100644 --- a/ui/index.html +++ b/ui/index.html @@ -5,7 +5,7 @@ black dug secret - square + square
hello

From 48ee27a568a5e08439e0ac6c2fdf70c54941adfc Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:37:39 +0530 Subject: [PATCH 105/127] [imad-console] Updates server.js --- server.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/server.js b/server.js index 399eba4979..cf0857d61f 100644 --- a/server.js +++ b/server.js @@ -32,9 +32,7 @@ app.get('/newcon.php', function (req, res) { app.get('/corct.php', function (req, res) { res.sendFile(path.join(__dirname, 'corct.php')); }); -app.get('/corct1.php', function (req, res) { - res.sendFile(path.join(__dirname, 'corct1.php')); -}); + var port = 8080; // Use 8080 for local development because you might already have apache running on 80 app.listen(8080, function () { console.log(`IMAD course app listening on port ${port}!`); From 3a06e818b42bbbb4cb8510f3f82d7e274b1aba61 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:38:55 +0530 Subject: [PATCH 106/127] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index cf0857d61f..c1307dcb82 100644 --- a/server.js +++ b/server.js @@ -19,7 +19,7 @@ app.get('/ui/madi.png', function (req, res) { app.get('/ui/article-one.html', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'article-one.html')); }); -app.get('/ui/article-two.html', function (req, res) { +app.get('/article-two.html', function (req, res) { res.sendFile(path.join(__dirname, 'article-two.html')); }); From 478187ac4689cca4e50bb0c3c617156b623d68ad Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:40:36 +0530 Subject: [PATCH 107/127] [imad-console] Updates article-two.html --- article-two.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/article-two.html b/article-two.html index 38fede0dd8..c1b8e6f52f 100644 --- a/article-two.html +++ b/article-two.html @@ -1,4 +1,6 @@ - + + hi + From fed152798e174c6621d94921b4ea771a77388074 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:47:51 +0530 Subject: [PATCH 108/127] Add files via upload --- corct1.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/corct1.php b/corct1.php index 6889f28a74..a0521342c2 100644 --- a/corct1.php +++ b/corct1.php @@ -1,7 +1,12 @@ + Hi -You are years old. +Your branch +email +dob From 87954ac4f5f63d6089dc2748bed4d6b9d379a39f Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:48:08 +0530 Subject: [PATCH 109/127] Add files via upload --- corct.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/corct.php b/corct.php index 85b4c1a55d..9deb42a58e 100644 --- a/corct.php +++ b/corct.php @@ -8,9 +8,10 @@ -> +>

form

NAME
BRANCH
EMAIL
RATE US
DATE OF BIRTH	+

From 21e52548e86f7055e51baa3a7e1b74b864bf82b7 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:48:45 +0530 Subject: [PATCH 110/127] Add files via upload --- newcon1.php | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 newcon1.php diff --git a/newcon1.php b/newcon1.php new file mode 100644 index 0000000000..8f62163bb4 --- /dev/null +++ b/newcon1.php @@ -0,0 +1,9 @@ +conn = pg_connect("host='localhost' port='5432' dbname='bhanu836' user='bhanu836' password='db-bhanu836-69865'") or die("unable to connect database"); +?> +} + +/ \ No newline at end of file From 3f4445bd1a150bb2553381a508c79961034e16a9 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:52:05 +0530 Subject: [PATCH 111/127] Add files via upload --- corct1.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/corct1.php b/corct1.php index a0521342c2..c54dc74969 100644 --- a/corct1.php +++ b/corct1.php @@ -2,7 +2,8 @@ Hi Your branch From d26eaccaa8c24d1ab87a4af3f391e8d4abc5cb44 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:52:20 +0530 Subject: [PATCH 112/127] [imad-console] Updates server.js --- server.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server.js b/server.js index c1307dcb82..6679dc20db 100644 --- a/server.js +++ b/server.js @@ -26,12 +26,15 @@ app.get('/article-two.html', function (req, res) { app.get('/ui/main.js', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'main.js')); }); -app.get('/newcon.php', function (req, res) { - res.sendFile(path.join(__dirname, 'newcon.php')); +app.get('/newcon1.php', function (req, res) { + res.sendFile(path.join(__dirname, 'newcon1.php')); }); app.get('/corct.php', function (req, res) { res.sendFile(path.join(__dirname, 'corct.php')); }); +app.get('/corct1.php', function (req, res) { + res.sendFile(path.join(__dirname, 'corct1.php')); +}); var port = 8080; // Use 8080 for local development because you might already have apache running on 80 app.listen(8080, function () { From 40dc9bf838560591b1a4dcc84a85e434379e65b5 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:54:25 +0530 Subject: [PATCH 113/127] Add files via upload --- corct1.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corct1.php b/corct1.php index c54dc74969..296857de1c 100644 --- a/corct1.php +++ b/corct1.php @@ -2,7 +2,7 @@ Hi From 3dc6585f73cac448d55b0b2afa06bbb8125e3ec1 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:54:40 +0530 Subject: [PATCH 114/127] Add files via upload From d960f691c16067120ff82ca1f93858e52beab81e Mon Sep 17 00:00:00 2001 From: Bhanu Date: Mon, 24 Oct 2016 00:54:52 +0530 Subject: [PATCH 115/127] Add files via upload --- corct.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corct.php b/corct.php index 9deb42a58e..d74cf5b0aa 100644 --- a/corct.php +++ b/corct.php @@ -8,7 +8,7 @@ > From 3bb9066992203b69e386f2816e0d6f23224a7934 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Tue, 25 Oct 2016 15:40:55 +0530 Subject: [PATCH 116/127] Add files via upload --- newcon.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/newcon.php b/newcon.php index 26eaeea86b..74e4771ae8 100644 --- a/newcon.php +++ b/newcon.php @@ -1,5 +1,10 @@ + + + \ No newline at end of file +?> + \ No newline at end of file From 229a58dbc8564169f13c156e65d9bb897a530f98 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Tue, 25 Oct 2016 16:42:35 +0530 Subject: [PATCH 117/127] Add files via upload --- corct.php | 12 ++++++++---- newcon1.php | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/corct.php b/corct.php index d74cf5b0aa..96d54d960f 100644 --- a/corct.php +++ b/corct.php @@ -8,10 +8,10 @@ -> +>

form

@@ -38,6 +38,10 @@

- - +

+Hi +Your branch +email +dob +

\ No newline at end of file diff --git a/newcon1.php b/newcon1.php index 8f62163bb4..e9be6c9e94 100644 --- a/newcon1.php +++ b/newcon1.php @@ -2,7 +2,7 @@ class dbconnection{ var $conn; function dbconnection(){ -$this->conn = pg_connect("host='localhost' port='5432' dbname='bhanu836' user='bhanu836' password='db-bhanu836-69865'") or die("unable to connect database"); +$this->conn = pg_connect("host=localhost port=5432 dbname=bhanu836 password='db-bhanu836-69865' user=bhanu836 ") or die("unable to connect database"); ?> } From abf64e3cec8f6802ea2b3e9f4d0f659be5c03b9e Mon Sep 17 00:00:00 2001 From: Bhanu Date: Tue, 25 Oct 2016 17:28:40 +0530 Subject: [PATCH 118/127] Add files via upload --- corct.php | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/corct.php b/corct.php index 96d54d960f..9ee9e9ad37 100644 --- a/corct.php +++ b/corct.php @@ -11,7 +11,7 @@ include'newcon1.php'; $dbconnection = new dbconnection(); ?> -

> +>

form

@@ -44,4 +44,93 @@ email dob + + + +

PHP Form Validation Example

* required field.

+"> + Name: + * +

+ E-mail: + * +

+ Website: + +

+ Comment: +

+ Gender: + Female + Male + * +

+ + + +Your Input:"; +echo $name; +echo "
"; +echo $email; +echo "
"; +echo $website; +echo "
"; +echo $comment; +echo "
"; +echo $gender; +?> + \ No newline at end of file From 0c3bb25997660d2859e9897cf25e8871b4375e4d Mon Sep 17 00:00:00 2001 From: Bhanu Date: Tue, 25 Oct 2016 17:29:19 +0530 Subject: [PATCH 119/127] Add files via upload From 7fa8770a0070e065c767e3b72d386cd7b63e7943 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Tue, 25 Oct 2016 17:30:49 +0530 Subject: [PATCH 120/127] [imad-console] Updates server.js --- server.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/server.js b/server.js index 6679dc20db..42327a3430 100644 --- a/server.js +++ b/server.js @@ -32,9 +32,6 @@ app.get('/newcon1.php', function (req, res) { app.get('/corct.php', function (req, res) { res.sendFile(path.join(__dirname, 'corct.php')); }); -app.get('/corct1.php', function (req, res) { - res.sendFile(path.join(__dirname, 'corct1.php')); -}); var port = 8080; // Use 8080 for local development because you might already have apache running on 80 app.listen(8080, function () { From b0ecf853481ea64f071380743713ff2ab0137c84 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Tue, 25 Oct 2016 17:32:55 +0530 Subject: [PATCH 121/127] Add files via upload --- corct.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corct.php b/corct.php index 9ee9e9ad37..37c2702c01 100644 --- a/corct.php +++ b/corct.php @@ -4,7 +4,7 @@ hello - + Date: Tue, 25 Oct 2016 17:46:21 +0530 Subject: [PATCH 122/127] Add files via upload --- corct.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/corct.php b/corct.php index 37c2702c01..73ec93f47d 100644 --- a/corct.php +++ b/corct.php @@ -8,8 +8,7 @@ >

form

From eb222c914f6da17c90c8040cac8a7a917d6c2cb9 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Tue, 25 Oct 2016 18:10:08 +0530 Subject: [PATCH 123/127] Add files via upload --- copytst.php | 789 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 789 insertions(+) create mode 100644 copytst.php diff --git a/copytst.php b/copytst.php new file mode 100644 index 0000000000..013dc477a0 --- /dev/null +++ b/copytst.php @@ -0,0 +1,789 @@ + 'value' + * + * @var array + */ + $_where = array(), + /** + * Dynamic type list for order by condition value + */ + $_orderBy = array(), + /** + * Dynamic type list for group by condition value + */ + $_groupBy = array(), + /** + * Dynamic array that holds a combination of where condition/table data value types and parameter references + * + * @var array|null + */ + $_bindParams = null, + /** + * Name of the auto increment column + * + */ + $_lastInsertId = null, + /** + * Variable which holds last statement error + * + * @var string + */ + $_stmtError = null, + /** + * Allows the use of the tableNameToClassName method + * + * @var string + */ + $_autoClass = true, + /** + * Name of table we're performing the action on + * + * @var string + */ + $_tableName, + /** + * Type of fetch to perform + * + * @var string + */ + $_fetchType = PDO::FETCH_ASSOC, + /** + * Fetch argument + * + * @var string + */ + $_fetchArg; + public + /** + * Variable which holds an amount of returned rows during get/getOne/select queries + * + * @var string + */ + $count = 0; + private + /** + * Used for connecting to the database + * + * @var string + */ + $_connstr; + public function __construct($db, $host = localhost:5432, $user = bhanu836, $pass = db-bhanu836-69865){ + $this->_connstr = "pgsql:host=$host user=$user password=$pass dbname=$db options='--client_encoding=UTF8'"; + } + protected function _connect(){ + $this->_conn = new PDO($this->_connstr); + $this->_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING); + } + /** @return PDO */ + public function pdo(){ + if (!$this->_conn){ + $this->_connect(); + } + return $this->_conn; + } + /** + * Method attempts to prepare the SQL query + * and throws an error if there was a problem. + * + * @return PDOStatement + */ + protected function _prepareQuery(){ + try { + $stmt = $this->pdo()->prepare($this->_query); + } + catch (PDOException $e){ + throw new Exception ("Problem preparing query ($this->_query) ".$e->getMessage()); + } + return $stmt; + } + /** + * Function to replace ? with variables from bind variable + * + * @param string $str + * @param Array $vals + * + * @return string + */ + protected function _replacePlaceHolders($str, $vals){ + $i = 0; + $valcount = count($vals); + while (strpos($str, "?") !== false && $i < $valcount){ + $val = $vals[$i++]; + if (is_object($val)){ + $val = '[object]'; + } + else if ($val === null){ + $val = 'NULL'; + } + if (is_string($val)){ + $val = "'$val'"; + } + $str = preg_replace('/\?/', $val, $str, 1); + } + return $str; + } + /** + * Helper function to add variables into bind parameters array + * + * @param string Variable value + */ + protected function _bindParam($value){ + $this->_bindParams[] = $value; + } + /** + * Helper function to add variables into bind parameters array in bulk + * + * @param Array Variable with values + */ + protected function _bindParams($values){ + foreach ($values as $value){ + $this->_bindParam($value); + } + } + /** + * Helper function to add variables into bind parameters array and will return + * its SQL part of the query according to operator in ' $operator ?' + * + * @param array $operator Variable with values + * @param $value + * + * @return string + */ + protected function _buildPair($operator, $value){ + $this->_bindParam($value); + return ' '.$operator.' ? '; + } + /** + * Abstraction method that will build an JOIN part of the query + */ + protected function _buildJoin(){ + if (empty ($this->_join)){ + return; + } + foreach ($this->_join as $data){ + list ($joinType, $joinTable, $joinCondition) = $data; + $this->_query .= " $joinType JOIN ".$this->_escapeTableName($joinTable)." on $joinCondition"; + } + } + protected function _escapeApostrophe($str){ + return preg_replace('~(^|[^\'])\'~', '$1\'\'', $str); + } + /** + * Abstraction method that will build the part of the WHERE conditions + */ + protected function _buildWhere(){ + if (empty ($this->_where)){ + return; + } + //Prepare the where portion of the query + $this->_query .= ' WHERE'; + foreach ($this->_where as $cond){ + list ($concat, $varName, $operator, $val) = $cond; + if (preg_match('~^"?([a-z_\-\d]+)"?(?:->>\'?([\w\d\-]+)\'?)?$~', $varName, $match)){ + $varName = "\"$match[1]\"".(isset($match[2]) ? "->>'".self::_escapeApostrophe($match[2])."'" : ''); + } + $this->_query .= ' '.trim("$concat $varName"); + switch (strtolower($operator)) { + case 'not in': + case 'in': + $comparison = ' '.$operator.' ('; + if (is_object($val)){ + $comparison .= $this->_buildPair("", $val); + } + else { + foreach ($val as $v){ + $comparison .= ' ?,'; + $this->_bindParam($v); + } + } + $this->_query .= rtrim($comparison, ',').' ) '; + break; + case 'not between': + case 'between': + $this->_query .= " $operator ? AND ? "; + $this->_bindParams($val); + break; + case 'not exists': + case 'exists': + $this->_query .= $operator.$this->_buildPair("", $val); + break; + default: + if (is_array($val)){ + $this->_bindParams($val); + } + else if ($val === null){ + $this->_query .= $operator." NULL"; + } + else if ($val != 'DBNULL' || $val == '0'){ + $this->_query .= $this->_buildPair($operator, $val); + } + } + } + $this->_query = rtrim($this->_query); + } + public function _buildDataPairs($tableData, $tableColumns, $isInsert){ + foreach ($tableColumns as $column){ + $value = $tableData[$column]; + if (!$isInsert){ + $this->_query .= "\"$column\" = "; + } + // Simple value + if (!is_array($value)){ + if (is_bool($value)){ + $value = $value ? 'true' : 'false'; + } + $this->_bindParam($value); + $this->_query .= '?, '; + continue; + } + } + $this->_query = rtrim($this->_query, ', '); + } + /** + * Abstraction method that will build an INSERT or UPDATE part of the query + * + * @param array $tableData + */ + protected function _buildInsertQuery($tableData){ + if (!is_array($tableData)){ + return; + } + $isInsert = preg_match('/^[INSERT|REPLACE]/', $this->_query); + $dataColumns = array_keys($tableData); + if ($isInsert){ + $this->_query .= ' ("'.implode($dataColumns, '", "').'") VALUES ('; + } + else $this->_query .= " SET "; + $this->_buildDataPairs($tableData, $dataColumns, $isInsert); + if ($isInsert){ + $this->_query .= ')'; + } + } + /** + * Abstraction method that will build the GROUP BY part of the WHERE statement + * + */ + protected function _buildGroupBy(){ + if (empty ($this->_groupBy)){ + return; + } + $this->_query .= " GROUP BY "; + foreach ($this->_groupBy as $value){ + $this->_query .= "$value, "; + } + $this->_query = rtrim($this->_query, ', ').' '; + } + /** + * Abstraction method that will build the LIMIT part of the WHERE statement + * + */ + protected function _buildOrderBy(){ + if (empty($this->_orderBy)){ + return; + } + $this->_query .= " ORDER BY "; + foreach ($this->_orderBy as $prop => $value){ + if (strtolower(str_replace(' ', '', $prop)) == 'rand()'){ + $this->_query .= 'rand(), '; + } + else $this->_query .= "$prop $value, "; + } + $this->_query = rtrim($this->_query, ', '); + } + /** + * Internal function to build and execute INSERT/REPLACE calls + * + * @param string $tableName The name of the table. + * @param array $insertData Data containing information for inserting into the DB. + * @param $operation + * @param string|null $returnColumn What column to return after insert + * + * @return boolean Boolean indicating whether the insert query was completed succesfully. + */ + private function _buildInsert($tableName, $insertData, $operation, $returnColumn = null){ + $tableName = $this->_escapeTableName($tableName); + $this->_query = "$operation INTO $tableName"; + if (!empty($returnColumn)){ + $returnColumn = trim($returnColumn); + } + $stmt = $this->_buildQuery(null, $insertData, $returnColumn); + $res = $this->_execStatement($stmt); + if ($res === false || $this->count < 1){ + return false; + } + if (!empty($res[0][$returnColumn])){ + return $res[0][$returnColumn]; + } + return true; + } + /** + * Abstraction method that will build the LIMIT part of the WHERE statement + * + * @param integer|array $numRows Array to define SQL limit in format Array ($count, $offset) + * or only $count + */ + protected function _buildLimit($numRows){ + if (!isset($numRows)){ + return; + } + $this->_query .= ' LIMIT '.( + is_array($numRows) + ? (int) $numRows[1].' OFFSET '.(int) $numRows[0] + : (int) $numRows + ); + } + /** + * Abstraction method that will compile the WHERE statement, + * any passed update data, and the desired rows. + * It then builds the SQL query. + * + * @param integer|array $numRows Array to define SQL limit in format Array ($count, $offset) + * or only $count + * @param array $tableData Should contain an array of data for updating the database. + * @param string|null $returning What column to return after inserting + * + * @return PDOStatement Returns the $stmt object. + */ + protected function _buildQuery($numRows = null, $tableData = null, $returning = null){ + $this->_buildJoin(); + $this->_buildInsertQuery($tableData); + if (!empty($returning)){ + $this->_query .= " RETURNING \"$returning\""; + } + $this->_buildWhere(); + $this->_buildGroupBy(); + $this->_buildOrderBy(); + $this->_buildLimit($numRows); + $this->_alterQuery(); + $this->_lastQuery = $this->_replacePlaceHolders($this->_query, $this->_bindParams); + // Prepare query + $stmt = $this->_prepareQuery(); + return $stmt; + } + /** + * Execute raw SQL query. + * + * @param string $query User-provided query to execute. + * @param array $bindParams Variables array to bind to the SQL statement. + * + * @return array Contains the returned rows from the query. + */ + public function rawQuery($query, $bindParams = null){ + $params = array(null); // Create the empty 0 index + $this->_query = $query; + $this->_alterQuery(); + $stmt = $this->_prepareQuery(); + if (empty($bindParams)){ + $this->_bindParams = null; + } + else if (!is_array($bindParams)){ + throw new Exception('$bindParams must be an array'); + } + else { + $this->_bindParams = $bindParams; + } + $res = $this->_execStatement($stmt); + return $res; + } + /** + * Execute rawQuery with specified parameters an return a single row only + * + * @param array $args Arguments to be forwarded to rawQuery + * + * @return array + */ + public function rawQuerySingle(...$args){ + return $this->_singleRow($this->rawQuery(...$args)); + } + /** + * + * @param string $query Contains a user-provided select query. + * @param integer|array $numRows Array to define SQL limit in format Array ($count, $offset) + * + * @return array Contains the returned rows from the query. + */ + public function query($query, $numRows = null){ + $this->_query = $query; + $stmt = $this->_buildQuery($numRows); + $res = $this->_execStatement($stmt); + return $res; + } + /** + * Get number of rows in database table + * + * @param string $table Name of table + * + * @return int + */ + public function count($table){ + return $this->disableAutoClass()->getOne($table, 'COUNT(*)::int as c')['c']; + } + /** + * This method allows you to specify multiple (method chaining optional) AND WHERE statements for SQL queries. + * + * @uses $db->where('id', 7)->where('title', 'MyTitle'); + * + * @param string $whereProp The name of the database field. + * @param mixed $whereValue The value of the database field. + * @param string $operator + * @param string $cond + * + * @return self + */ + public function where($whereProp, $whereValue = 'DBNULL', $operator = '=', $cond = 'AND'){ + if (is_array($whereValue) && ($key = key($whereValue)) != "0"){ + $operator = $key; + $whereValue = $whereValue[$key]; + } + if (count($this->_where) == 0){ + $cond = ''; + } + $this->_where[] = array($cond, $whereProp, $operator, $whereValue); + return $this; + } + /** + * Sets a class to be used as the PDO::fetchAll argument + * + * @param object|string $class + * + * @return self + */ + public function setClass($class){ + $this->_fetchType = PDO::FETCH_CLASS; + $this->_fetchArg = $class; + return $this; + } + /** + * Disabled the tableNameToClassName method + * + * @return self + */ + public function disableAutoClass(){ + $this->_autoClass = false; + return $this; + } + /** + * This method allows you to specify multiple (method chaining optional) OR WHERE statements for SQL queries. + * + * @uses $db->orWhere('id', 7)->orWhere('title', 'MyTitle'); + * + * @param string $whereProp The name of the database field. + * @param mixed $whereValue The value of the database field. + * @param string $operator + * + * @return self + */ + public function orWhere($whereProp, $whereValue = 'DBNULL', $operator = '='){ + return $this->where($whereProp, $whereValue, $operator, 'OR'); + } + /** + * This method allows you to specify multiple (method chaining optional) ORDER BY statements for SQL queries. + * + * @uses $db->orderBy('id', 'desc')->orderBy('name', 'desc'); + * + * @param string $orderByField The name of the database field. + * @param string $orderbyDirection Order direction. + * + * @return self + */ + public function orderBy($orderByField, $orderbyDirection = "DESC"){ + $allowedDirection = array("ASC", "DESC"); + $orderbyDirection = strtoupper(trim($orderbyDirection)); + $orderByField = preg_replace('/[^-a-z0-9\.,_"\*]+/i', '', $orderByField); + if (empty($orderbyDirection) || !in_array($orderbyDirection, $allowedDirection)){ + die ('Wrong order direction: '.$orderbyDirection); + } + $this->_orderBy[$orderByField] = $orderbyDirection; + return $this; + } + /** + * Replacement for the orderBy method, which would screw up complex order statements + * + * @param string $orderstr Raw ordering sting + * @param string $direction Order direction + * + * @return self + */ + public function orderByLiteral($orderstr, $direction = 'ASC'){ + $this->_orderBy[$orderstr] = $direction; + return $this; + } + /** + * A convenient SELECT * function. + * + * @param string $tableName The name of the database table to work with. + * @param int|int[] $numRows Array to define SQL limit in format Array ($count, $offset) + * or only $count + * @param string $columns + * + * @return array Contains the returned rows from the select query. + */ + public function get($tableName, $numRows = null, $columns = null){ + if (empty ($columns)){ + $columns = '*'; + } + $column = is_array($columns) ? implode(', ', $columns) : $columns; + $tableName = $this->_escapeTableName($tableName); + $this->_query = "SELECT $column FROM $tableName"; + $stmt = $this->_buildQuery($numRows); + if ($this->_autoClass) + $this->_tableName = $tableName; + $res = $this->_execStatement($stmt); + return $res; + } + /** + * A convenient SELECT * function to get one record. + * + * @param string $tableName The name of the database table to work with. + * @param string $columns + * + * @return array|object|null + */ + public function getOne($tableName, $columns = '*'){ + $res = $this->get($tableName, 1, $columns); + if (is_array($res) && isset ($res[0])){ + return $res[0]; + } + else if ($res){ + return $res; + } + return null; + } + /** + * A convenient function that returns TRUE if exists at least an element that + * satisfy the where condition specified calling the "where" method before this one. + * + * @param string $tableName The name of the database table to work with. + * + * @return bool + */ + public function has($tableName){ + return $this->count($tableName) >= 1; + } + /** + * Update query. Be sure to first call the "where" method. + * + * @param string $tableName The name of the database table to work with. + * @param array $tableData Array of data to update the desired row. + * + * @return bool + */ + public function update($tableName, $tableData){ + $tableName = $this->_escapeTableName($tableName); + $this->_query = "UPDATE $tableName"; + $stmt = $this->_buildQuery(null, $tableData); + $res = $this->_execStatement($stmt); + return (bool) $res; + } + /** + * Insert method to add new row + * + * @param _buildInsert($tableName, $insertData, 'INSERT', $returnColumn); + } + /** + * Delete query. Call the "where" method first. + * + * @param string $tableName The name of the database table to work with. + * @param integer|array $numRows Array to define SQL limit in format Array ($count, $offset) + * or only $count + * + * @return boolean + */ + public function delete($tableName, $numRows = null){ + $table = $this->_escapeTableName($tableName); + if (count($this->_join)){ + $this->_query = "DELETE ".preg_replace('~^".*"\s+(.*)$~', '$1', $table)." FROM $table"; + } + else { + $this->_query = "DELETE FROM $table"; + } + $stmt = $this->_buildQuery($numRows); + if ($this->_autoClass) + $this->_tableName = $tableName; + $res = $this->_execStatement($stmt); + return $this->count > 0; + } + /** + * This method allows you to concatenate joins for the final SQL statement. + * + * @uses $db->join('table1', 'field1 <> field2', 'LEFT') + * + * @param string $joinTable The name of the table. + * @param string $joinCondition the condition. + * @param string $joinType 'LEFT', 'INNER' etc. + * @param bool $disableAutoClass Disable automatic result conversion to class (since result may contain data from other tables) + * + * @return self + */ + public function join($joinTable, $joinCondition, $joinType = '', $disableAutoClass = true){ + $allowedTypes = array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER'); + $joinType = strtoupper(trim($joinType)); + if ($joinType && !in_array($joinType, $allowedTypes)){ + die("Wrong JOIN type: $joinType"); + } + $joinTable = $this->_escapeTableName($joinTable); + $this->_join[] = array($joinType, $joinTable, $joinCondition); + if ($disableAutoClass) + $this->disableAutoClass(); + return $this; + } + /** + * Method to check if a table exists + * + * @param array $table Table name to check + * + * @returns boolean True if table exists + */ + public function tableExists($table){ + $res = $this->rawQuerySingle("SELECT to_regclass('public.$table') IS NOT NULL as exists"); + return $res['exists']; + } + /** + * @param PDOStatement $stmt Statement to execute + * + * @return bool|array|object[] + */ + protected function _execStatement($stmt){ + $success = $stmt->execute($this->_bindParams); + if ($success !== true){ + $errInfo = $stmt->errorInfo(); + $this->_stmtError = "PDO Error #{$errInfo[1]}: {$errInfo[2]}"; + $result = false; + $this->count = 0; + } + else { + $this->count = $stmt->rowCount(); + $this->_stmtError = null; + if (isset($this->_fetchArg)) + $result = $stmt->fetchAll($this->_fetchType, $this->_fetchArg); + else $result = $stmt->fetchAll($this->_fetchType); + } + $this->_lastQuery = isset($this->_bindParams) + ? $this->_replacePlaceHolders($this->_query, $this->_bindParams) + : $this->_query; + $this->reset(); + return $result; + } + public function reset(){ + $this->_autoClass = true; + $this->_tableName = null; + $this->_fetchType = PDO::FETCH_ASSOC; + $this->_fetchArg = null; + $this->_where = array(); + $this->_join = array(); + $this->_orderBy = array(); + $this->_groupBy = array(); + $this->_bindParams = array(); + $this->_query = null; + $this->_lastInsertId = null; + } + /** + * Get the first entry in a query if it exists, otherwise, return null + * + * @param array $query Array containing the query results + * + * @return array|null + */ + protected function _singleRow($query){ + return empty($query[0]) ? null : $query[0]; + } + /** + * Escapes table name for use in queries + * + * @param string $tableName + * + * @return string + */ + protected function _escapeTableName($tableName){ + return preg_replace('~^"?([a-zA-Z\d_\-]+)"?\s+([a-zA-Z\d]+)$~', '"$1" $2', trim($tableName)); + } + /** + * Replaces some custom shortcuts to make the query valid + */ + protected function _alterQuery(){ + $this->_query = preg_replace('~(\s+)&&(\s+)~', '$1AND$2', $this->_query); + } + /** + * Method returns last executed query + * + * @return string + */ + public function getLastQuery(){ + return $this->_lastQuery; + } + /** + * Return last error message + * + * @return string + */ + public function getLastError(){ + if (!$this->_conn){ + return "No connection has been made yet"; + } + return trim($this->_stmtError); + } + /** + * Returns the class name expected for the table name + * This is a utility function for use in case you want to make your own automatic table<->class bindings using a wrapper class + * + * @param bool $namespaced + * + * @return string|null + */ + public function tableNameToClassName($namespaced = false){ + $className = $this->_tableName; + if (isset($this->_tableName)){ + $className = preg_replace('/s(_|$)/','$1',preg_replace_callback('/(?:^|-)([a-z])/',function($match){ + return strtoupper($match[1]); + },$className)); + $append = $namespaced?'\\':''; + $className = preg_replace_callback('/__([a-z])/',function($match) use ($append){ + return $append.strtoupper($match[1]); + },$className); + } + return $className; + } + /** + * Close connection + */ + public function __destruct(){ + if ($this->_conn){ + $this->_conn = null; + } + } + } + From ec70da6bf12f3e4a231333b725bf33c0ca1acea0 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Tue, 25 Oct 2016 18:14:30 +0530 Subject: [PATCH 124/127] [imad-console] Updates server.js --- server.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server.js b/server.js index 42327a3430..82ffb985d4 100644 --- a/server.js +++ b/server.js @@ -32,6 +32,9 @@ app.get('/newcon1.php', function (req, res) { app.get('/corct.php', function (req, res) { res.sendFile(path.join(__dirname, 'corct.php')); }); +app.get('/copytst.php', function (req, res) { + res.sendFile(path.join(__dirname, 'copytst.php')); +}); var port = 8080; // Use 8080 for local development because you might already have apache running on 80 app.listen(8080, function () { From d107e615ffe53353b22f23bbac86eb146b3c5fde Mon Sep 17 00:00:00 2001 From: Bhanu Date: Tue, 25 Oct 2016 18:14:31 +0530 Subject: [PATCH 125/127] [imad-console] Updates ui/index.html --- ui/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/index.html b/ui/index.html index f8653b2418..28074d8a51 100644 --- a/ui/index.html +++ b/ui/index.html @@ -8,6 +8,7 @@ square
hello + hell

From 78f554bf7a2c74e217aae0fe30d1a3ef4d94f2e2 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Tue, 25 Oct 2016 18:22:19 +0530 Subject: [PATCH 126/127] Add files via upload --- corct.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corct.php b/corct.php index 73ec93f47d..83751958fe 100644 --- a/corct.php +++ b/corct.php @@ -8,7 +8,7 @@ >

form

From e48a14ab84714ba03a262366e895dfc2deb6ebd6 Mon Sep 17 00:00:00 2001 From: Bhanu Date: Tue, 25 Oct 2016 18:32:43 +0530 Subject: [PATCH 127/127] Add files via upload --- corct.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corct.php b/corct.php index 83751958fe..e964b6fbb8 100644 --- a/corct.php +++ b/corct.php @@ -7,8 +7,11 @@ + pdo(); ?> >

ek truck sona nhi bacha paya

ek truck sona nhi bacha paya

two dog

two dog

LITERATURE

LITERATURE

LITERATURE

LITERATURE

LITERATURE

LITERATURE

LITERATURE

form

form

form

form

form

form

form

PHP Form Validation Example

form

form

form