update contact page

Angel-Wei · Nov 11, 2020 · 0837c1c · 0837c1c
1 parent 832c517
commit 0837c1c
Show file tree

Hide file tree

Showing 180 changed files with 195 additions and 20 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/Scripts/AC_ActiveX.js b/Scripts/AC_ActiveX.js
diff --git a/Scripts/AC_RunActiveContent.js b/Scripts/AC_RunActiveContent.js
diff --git a/about.html b/about.html
diff --git a/account/profile.php b/account/profile.php
diff --git a/account/profile_update.php b/account/profile_update.php
diff --git a/account/profile_update_check.php b/account/profile_update_check.php
diff --git a/assets/css/bootstrap-theme.css b/assets/css/bootstrap-theme.css
diff --git a/assets/css/bootstrap.min.css b/assets/css/bootstrap.min.css
diff --git a/assets/css/camera.css b/assets/css/camera.css
diff --git a/assets/css/contact_table.css b/assets/css/contact_table.css
diff --git a/assets/css/font-awesome.css b/assets/css/font-awesome.css
diff --git a/assets/css/font-awesome.min.css b/assets/css/font-awesome.min.css
diff --git a/assets/css/isotope.css b/assets/css/isotope.css
diff --git a/assets/css/simple-sidebar.css b/assets/css/simple-sidebar.css
diff --git a/assets/css/style.css b/assets/css/style.css
diff --git a/assets/fonts/KEEP-fontawesome-webfont.eot b/assets/fonts/KEEP-fontawesome-webfont.eot
diff --git a/assets/fonts/KEEP-fontawesome-webfont.svg b/assets/fonts/KEEP-fontawesome-webfont.svg
diff --git a/assets/fonts/KEEP-fontawesome-webfont.ttf b/assets/fonts/KEEP-fontawesome-webfont.ttf
diff --git a/assets/fonts/KEEP-fontawesome-webfont.woff b/assets/fonts/KEEP-fontawesome-webfont.woff
diff --git a/assets/fonts/KEEP-fontawesome.otf b/assets/fonts/KEEP-fontawesome.otf
diff --git a/assets/fonts/fontawesome-webfont.eot b/assets/fonts/fontawesome-webfont.eot
diff --git a/assets/fonts/fontawesome-webfont.svg b/assets/fonts/fontawesome-webfont.svg
diff --git a/assets/fonts/fontawesome-webfont.ttf b/assets/fonts/fontawesome-webfont.ttf
diff --git a/assets/fonts/fontawesome-webfont.woff b/assets/fonts/fontawesome-webfont.woff
diff --git a/assets/fonts/fontawesome-webfont.woff2 b/assets/fonts/fontawesome-webfont.woff2
diff --git a/assets/images/1.jpg b/assets/images/1.jpg
diff --git a/assets/images/about.jpg b/assets/images/about.jpg
diff --git a/assets/images/arrow.png b/assets/images/arrow.png
diff --git a/assets/images/arrows.png b/assets/images/arrows.png
diff --git a/assets/images/bg.png b/assets/images/bg.png
diff --git a/assets/images/bg_header.jpg b/assets/images/bg_header.jpg
diff --git a/assets/images/blank.gif b/assets/images/blank.gif
diff --git a/assets/images/camera-loader.gif b/assets/images/camera-loader.gif
diff --git a/assets/images/camera_skins.png b/assets/images/camera_skins.png
diff --git a/assets/images/favicon.png b/assets/images/favicon.png
diff --git a/assets/images/logo.png b/assets/images/logo.png
diff --git a/assets/images/news1.jpg b/assets/images/news1.jpg
diff --git a/assets/images/news2.jpg b/assets/images/news2.jpg
diff --git a/assets/images/news3.jpg b/assets/images/news3.jpg
diff --git a/assets/images/news4.jpg b/assets/images/news4.jpg
diff --git a/assets/images/photo-1.jpg b/assets/images/photo-1.jpg
diff --git a/assets/images/photo-2.jpg b/assets/images/photo-2.jpg
diff --git a/assets/images/photo-3.jpg b/assets/images/photo-3.jpg
diff --git a/assets/images/photo-4.jpg b/assets/images/photo-4.jpg
diff --git a/assets/images/portfolio/img1.jpg b/assets/images/portfolio/img1.jpg
diff --git a/assets/images/portfolio/img2.jpg b/assets/images/portfolio/img2.jpg
diff --git a/assets/images/portfolio/img3.jpg b/assets/images/portfolio/img3.jpg
diff --git a/assets/images/portfolio/img4.jpg b/assets/images/portfolio/img4.jpg
diff --git a/assets/images/portfolio/img5.jpg b/assets/images/portfolio/img5.jpg
diff --git a/assets/images/portfolio/img6.jpg b/assets/images/portfolio/img6.jpg
diff --git a/assets/images/portfolio/img7.jpg b/assets/images/portfolio/img7.jpg
diff --git a/assets/images/portfolio/img8.jpg b/assets/images/portfolio/img8.jpg
diff --git a/assets/images/portfolio/img9.jpg b/assets/images/portfolio/img9.jpg
diff --git a/assets/images/slides/img1.jpg b/assets/images/slides/img1.jpg
diff --git a/assets/images/slides/img2.jpg b/assets/images/slides/img2.jpg
diff --git a/assets/images/slides/img3.jpg b/assets/images/slides/img3.jpg
diff --git a/assets/js/bootstrap.min.js b/assets/js/bootstrap.min.js
diff --git a/assets/js/camera.min.js b/assets/js/camera.min.js
diff --git a/assets/js/contact_table.js b/assets/js/contact_table.js
@@ -2,7 +2,9 @@ function contact_process($contact_type, $accountid1, $accountid2) {
   var xmlhttp = new XMLHttpRequest();
   xmlhttp.onreadystatechange = function() {//Call a function when the state changes.
        if(xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+           document.location.reload();
            alert(xmlhttp.responseText);
+
        }
   }
   var contact_type = $contact_type; //must predefine variable to be used in $_POST in contact_process.php
@@ -11,19 +13,53 @@ function contact_process($contact_type, $accountid1, $accountid2) {
   xmlhttp.open("GET","add_contact.php?contact_type="+$contact_type
               +"&accountid1="+$accountid1+"&accountid2="+accountid2,true);
   xmlhttp.send();
+
 }
 
 
 function block_user($accountid1, $accountid2) {
   var xmlhttp = new XMLHttpRequest();
   xmlhttp.onreadystatechange = function() {
       if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+          document.location.reload();
           alert(xmlhttp.responseText);
       }
   }
   var accountid1 = $accountid1;
   var accountid2 = $accountid2;
   xmlhttp.open("GET", "add_block.php?accountid1="+$accountid1+"&accountid2="+accountid2, true);
   xmlhttp.send();
+}
+
 
+function contact_remove($contact_type,$accountid1,$accountid2) {
+  var xmlhttp = new XMLHttpRequest();
+  xmlhttp.onreadystatechange = function() {
+      if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+          document.location.reload();
+          alert(xmlhttp.responseText);
+      }
+  }
+  var contact_type = $contact_type;
+  var accountid1 = $accountid1;
+  var accountid2 = $accountid2;
+  xmlhttp.open("GET", "remove_contact.php?contact_type="+$contact_type+"&accountid1="+$accountid1+"&accountid2="+accountid2, true);
+  xmlhttp.send();
+}
+
+
+
+
+function unblock_user($accountid1,$accountid2) {
+  var xmlhttp = new XMLHttpRequest();
+  xmlhttp.onreadystatechange = function() {
+      if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+          document.location.reload();
+          alert(xmlhttp.responseText);
+      }
+  }
+  var accountid1 = $accountid1;
+  var accountid2 = $accountid2;
+  xmlhttp.open("GET", "unblock.php?accountid1="+$accountid1+"&accountid2="+accountid2, true);
+  xmlhttp.send();
 }
diff --git a/assets/js/custom.js b/assets/js/custom.js
diff --git a/assets/js/fancybox/blank.gif b/assets/js/fancybox/blank.gif
diff --git a/assets/js/fancybox/descr.wd3 b/assets/js/fancybox/descr.wd3
diff --git a/assets/js/fancybox/fancybox_loading.gif b/assets/js/fancybox/fancybox_loading.gif
diff --git a/assets/js/fancybox/fancybox_loading_402x.gif b/assets/js/fancybox/fancybox_loading_402x.gif
diff --git a/assets/js/fancybox/fancybox_overlay.png b/assets/js/fancybox/fancybox_overlay.png
diff --git a/assets/js/fancybox/fancybox_sprite.png b/assets/js/fancybox/fancybox_sprite.png
diff --git a/assets/js/fancybox/fancybox_sprite_402x.png b/assets/js/fancybox/fancybox_sprite_402x.png
diff --git a/assets/js/fancybox/jquery.fancybox.css b/assets/js/fancybox/jquery.fancybox.css
diff --git a/assets/js/fancybox/jquery.fancybox.pack.js b/assets/js/fancybox/jquery.fancybox.pack.js
diff --git a/assets/js/google-map.js b/assets/js/google-map.js
diff --git a/assets/js/html5shiv.js b/assets/js/html5shiv.js
diff --git a/assets/js/jquery.cslider.js b/assets/js/jquery.cslider.js
diff --git a/assets/js/jquery.easing.1.3.js b/assets/js/jquery.easing.1.3.js
diff --git a/assets/js/jquery.isotope.min.js b/assets/js/jquery.isotope.min.js
diff --git a/assets/js/jquery.min.js b/assets/js/jquery.min.js
diff --git a/assets/js/jquery.mobile.customized.min.js b/assets/js/jquery.mobile.customized.min.js
diff --git a/assets/js/modernizr-latest.js b/assets/js/modernizr-latest.js
diff --git a/assets/js/respond.min.js b/assets/js/respond.min.js
diff --git a/assets/js/sidebar_menu.js b/assets/js/sidebar_menu.js
diff --git a/browse.php b/browse.php
diff --git a/comment/comment_process.php b/comment/comment_process.php
diff --git a/config.php b/config.php
diff --git a/contact.html b/contact.html
diff --git a/contact/add_block.php b/contact/add_block.php
@@ -3,6 +3,11 @@
 $accountid1 = $_GET['accountid1'];
 $accountid2 = $_GET['accountid2'];
 
+$result = mysql_query( "select * from account where accountid='$accountid2'" );
+$contact_name = mysql_fetch_row($result)[1];
+
 add_block($accountid1, $accountid2);
-  echo "User blocked";
+echo "User $contact_name is blocked";
+
+mysql_free_result($result);
 ?>
diff --git a/contact/add_contact.php b/contact/add_contact.php
@@ -4,12 +4,17 @@
 $accountid1 = $_GET['accountid1'];
 $accountid2 = $_GET['accountid2'];
 
+$result = mysql_query( "select * from account where accountid='$accountid2'" );
+$contact_name = mysql_fetch_row($result)[1];
+
 add_contact($contact_type, $accountid1, $accountid2);
 
 if ($contact_type == '') {
-  echo "Remove from contact list";
+  echo "Removed $contact_name from contact list";
 }
 else {
-  echo "Added to $contact_type list";
+  echo "Added $contact_name to $contact_type list";
 }
- ?>
+
+mysql_free_result($result);
+?>
diff --git a/contact/contact.php b/contact/contact.php
@@ -133,20 +133,63 @@
                               		or die ("get_all_users failed. Could not query the database: <br />". mysql_error());
                               	while($row = mysql_fetch_row($result)) {
                                   $accountid2 = $row[0];
+                                  $result_contact = mysql_query( "select * from contact where accountid1='$accountid1' && accountid2='$accountid2'" );
+                                  $row_contact = mysql_fetch_row($result_contact);
+                                  if (mysql_num_rows($result_contact) != 0) {
+                                    $contact_type = $row_contact[3];
+                                    $block_status = $row_contact[4];
+                                  }
+                                  else {
+                                    $contact_type = 0;
+                                    $block_status = 0;
+                                  }
+
                                   echo "
                                   <tr>
                                       <td class='td1'>$row[1]</td>
                                       <td class='td2'>$row[3]</td>
                                       <td class='td3'>$row[4]</td>
                                       <td class='td4'>
                                       <select name='addContact' onchange='contact_process(this.value,$accountid1,$accountid2)'>
-                                                            <option value=''>Add</option>
-                                                            <option value='Family'>Family</option>;
-                                                            <option value='Friend'>Friend</option>;
-                                          </select><br></td>
-                                      <td class='td5'><a href='#' onclick='block_user($accountid1,$accountid2)' style='color:#cc0000'>Block</a></td>
-                                  </tr>
                                   ";
+                                      if ($contact_type == 0) {
+                                          echo "
+                                              <option value='' selected>Add</option>
+                                              <option value='Family'>Family</option>
+                                              <option value='Friend'>Friend</option>
+                                              </select><br></td>
+                                              ";
+                                      }
+                                      elseif ($contact_type == 1) {
+                                          echo "
+                                              <option value=''>Add</option>
+                                              <option value='Family' selected>Family</option>
+                                              <option value='Friend'>Friend</option>
+                                              </select><br></td>
+                                              ";
+                                      }
+                                      elseif ($contact_type == 2) {
+                                          echo "
+                                              <option value=''>Add</option>
+                                              <option value='Family'>Family</option>
+                                              <option value='Friend' selected>Friend</option>
+                                              </select><br></td>
+                                              ";
+                                      }
+
+                                  if ($block_status == 0) {
+                                    echo "
+                                      <td class='td5'><a href='#' onclick='block_user($accountid1,$accountid2)' style='color:#cc0000'>Block</a></td>
+                                    </tr>
+                                    ";
+                                  }
+                                  else {
+                                    echo "
+                                      <td class='td5' ><i>Blocked</i></td>
+                                    </tr>
+                                    ";
+                                  }
+                                  mysql_free_result($result_contact);
                               	}
                               	mysql_free_result($result);
                                ?>
@@ -157,7 +200,7 @@
 
                         <div class="wrap2" style="margin:0 auto;"> <!--margin:0 auto doesn't work here,but work on below <table>-->
                           <table class="head">
-                            <caption style="font-size:16px;margin-bottom:5px;">Family Contact</caption>
+                            <caption style="font-size:16px;margin-bottom:5px;">Family List</caption>
                             <tr>
                             <th class="th1">Name</th>
                             <th class="th2">Email</th>
@@ -168,20 +211,20 @@
                           <div>
                             <table >
                               <?php
-                                $query = "select * from contact WHERE accountid1='$accountid1'
-                                          && type=1 && block=0";
+                                $query = "select * from contact WHERE accountid1='$accountid1' && type=1";
                                 $result = mysql_query( $query )
                                   or die ("get_family_contact failed. Could not query the database: <br />". mysql_error());
                                 while($row = mysql_fetch_row($result)) {
                                   $accountid2 = $row[2];
                                   $result_contact = mysql_query( "select * from account WHERE accountid='$accountid2'" );
                                   $row_contact = mysql_fetch_row($result_contact);
+                                  $contact_type = "Family";
                                   echo "
                                     <tr>
                                       <td class='td1'> $row_contact[1] </td>
                                       <td class='td2'> $row_contact[3] </td>
                                       <td class='td3'> $row_contact[4] </td>
-                                      <td class='td4'><a href='#' onclick='remove_contact($accountid1,$accountid2)'> Remove </a></td>
+                                      <td class='td4'><a href='#' onclick='contact_remove(1,$accountid1,$accountid2)'> Remove </a></td>
                                     </tr>
                                     ";
                                 mysql_free_result($result_contact);
@@ -196,7 +239,7 @@
 
                         <div class="wrap2" style="margin:0 auto;"> <!--margin:0 auto doesn't work here,but work on below <table>-->
                           <table class="head">
-                            <caption style="font-size:16px;margin-bottom:5px;">Friend Contact</caption>
+                            <caption style="font-size:16px;margin-bottom:5px;">Friend List</caption>
                             <tr>
                             <th class="th1">Name</th>
                             <th class="th2">Email</th>
@@ -207,20 +250,20 @@
                           <div>
                             <table >
                               <?php
-                                $query = "select * from contact WHERE accountid1='$accountid1'
-                                          && type=2 && block=0";
+                                $query = "select * from contact WHERE accountid1='$accountid1' && type=2";
                                 $result = mysql_query( $query )
                                   or die ("get_family_contact failed. Could not query the database: <br />". mysql_error());
                                 while($row = mysql_fetch_row($result)) {
                                   $accountid2 = $row[2];
                                   $result_contact = mysql_query( "select * from account WHERE accountid='$accountid2'" );
                                   $row_contact = mysql_fetch_row($result_contact);
+                                  $contact_type = "Friend";
                                   echo "
                                     <tr>
                                       <td class='td1'> $row_contact[1] </td>
                                       <td class='td2'> $row_contact[3] </td>
                                       <td class='td3'> $row_contact[4] </td>
-                                      <td class='td4'><a href='#' onclick='remove_contact($accountid1,$accountid2)'> Remove </a></td>
+                                      <td class='td4'><a href='#' onclick='contact_remove(2,$accountid1,$accountid2)'> Remove </a></td>
                                     </tr>
                                     ";
                                 mysql_free_result($result_contact);
@@ -233,7 +276,40 @@
                         <br><br>
 
 
-
+                        <div class="wrap2" style="margin:0 auto;"> <!--margin:0 auto doesn't work here,but work on below <table>-->
+                          <table class="head">
+                            <caption style="font-size:16px;margin-bottom:5px;">Blocked List</caption>
+                            <tr>
+                            <th class="th1">Name</th>
+                            <th class="th2">Email</th>
+                            <th class="th3">Sex</th>
+                            <th class="th4">Unblock</th>
+                            </tr>
+                          </table>
+                          <div>
+                            <table >
+                              <?php
+                                $query = "select * from contact WHERE accountid1='$accountid1' && block=1";
+                                $result = mysql_query( $query );
+                                while($row = mysql_fetch_row($result)) {
+                                  $accountid2 = $row[2];
+                                  $result_contact = mysql_query( "select * from account WHERE accountid='$accountid2'" );
+                                  $row_contact = mysql_fetch_row($result_contact);
+                                  echo "
+                                    <tr>
+                                      <td class='td1'> $row_contact[1] </td>
+                                      <td class='td2'> $row_contact[3] </td>
+                                      <td class='td3'> $row_contact[4] </td>
+                                      <td class='td4'><a href='#' onclick='unblock_user($accountid1,$accountid2)'> Unblock </a></td>
+                                    </tr>
+                                    ";
+                                }
+                                mysql_free_result($result);
+                              ?>
+                            </table>
+                          </div>
+                        </div>
+                        <br><br>
 
 
 

diff --git a/contact/remove_contact.php b/contact/remove_contact.php
@@ -0,0 +1,19 @@
+<?php
+include_once "../function.php";
+$contact_type = $_GET['contact_type'];
+$accountid1 = $_GET['accountid1'];
+$accountid2 = $_GET['accountid2'];
+
+$result = mysql_query( "select * from account where accountid='$accountid2'" );
+$contact_name = mysql_fetch_row($result)[1];
+
+remove_contact($accountid1, $accountid2);
+
+if ($contact_type == 1) {
+  echo "Removed $contact_name from the Family list";
+}
+elseif ($contact_type == 2) {
+  echo "Removed $contact_name from the Friend list";
+}
+mysql_free_result($result);
+?>
diff --git a/contact/unblock.php b/contact/unblock.php
@@ -0,0 +1,13 @@
+<?php
+include_once "../function.php";
+$accountid1 = $_GET['accountid1'];
+$accountid2 = $_GET['accountid2'];
+
+$result = mysql_query( "select * from account where accountid='$accountid2'" );
+$contact_name = mysql_fetch_row($result)[1];
+
+unblock($accountid1, $accountid2);
+echo "Unblock $contact_name";
+
+mysql_free_result($result);
+?>
diff --git a/css/default.css b/css/default.css
diff --git a/css/uploadstyle.css b/css/uploadstyle.css
diff --git a/function.php b/function.php
@@ -1,7 +1,14 @@
 <?php
 include "mysqlClass.inc.php";
 
+//used by unblock.php
+function unblock($accountid1, $accountid2) {
+	mysql_query("UPDATE contact SET block=0 WHERE accountid1='$accountid1' && accountid2='$accountid2'");
+}
+
 
+
+//used by add_block.php
 function add_block($accountid1, $accountid2) {
 	$query = "select * from contact where accountid1='$accountid1' && accountid2='$accountid2'";
 	$result = mysql_query( $query )
@@ -46,7 +53,7 @@ function block_or_not($current_user, $uploaded_by)
 	mysql_free_result($result);
 }
 
-//used by contact_process.php, unidirectional relationship: from accountid1 to accountid2
+//used by add_contact.php, unidirectional relationship: from accountid1 to accountid2
 function add_contact($contact_type, $accountid1, $accountid2) {
 	$query = "select * from contact where accountid1='$accountid1' && accountid2='$accountid2'";
 	$result = mysql_query( $query )
@@ -70,6 +77,20 @@ function add_contact($contact_type, $accountid1, $accountid2) {
 	mysql_free_result($result);
 }
 
+
+//used by remove_contact.php
+function remove_contact($accountid1, $accountid2) {
+	$query = "select * from contact where accountid1='$accountid1' && accountid2='$accountid2'";
+	$result = mysql_query( $query )
+	   or die ("remove_contact() failed. Could not query the database: <br />". mysql_error());
+	$count = mysql_num_rows($result);
+
+	mysql_query("UPDATE contact SET type=0 WHERE accountid1='$accountid1' && accountid2='$accountid2'");
+	mysql_free_result($result);
+}
+
+
+
 //used by profile.php
 function get_user_profile($username) {
 	$query = "select * from account where username='$username'";