From 17eb6cecc104c0f48a8941e044a7604bc6ced0a5 Mon Sep 17 00:00:00 2001
From: "ziheng.li" <liziheng1996@gmail.com>
Date: Thu, 29 Nov 2018 11:10:04 +0100
Subject: [PATCH] fix a little problem
---
.idea/workspace.xml | 85 ++++++++++++++++++++++++++-------------------
page_user/user.php | 19 +++++-----
2 files changed, 60 insertions(+), 44 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5cbd1ed..d3930db 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="97544618-4bb5-471f-b62a-ec86a2a69f7b" name="Default" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/page_user/user.php" beforeDir="false" afterPath="$PROJECT_DIR$/page_user/user.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -16,11 +17,20 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file leaf-file-name="login.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/page_welcome/login.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1134">
+ <caret line="42" column="2" selection-start-line="42" selection-start-column="2" selection-end-line="42" selection-end-column="22" />
+ </state>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="user.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/page_user/user.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="538">
- <caret line="82" column="58" selection-start-line="82" selection-start-column="58" selection-end-line="82" selection-end-column="58" />
+ <state relative-caret-position="214">
+ <caret line="26" column="74" selection-start-line="26" selection-start-column="74" selection-end-line="26" selection-end-column="74" />
<folding>
<element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#tr#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -33,7 +43,7 @@
<file leaf-file-name="userpage.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/page_welcome/userpage.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="396">
+ <state relative-caret-position="355">
<caret line="18" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
@@ -42,8 +52,8 @@
<file leaf-file-name="userInfosFunctions.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/API_Twitter/userInfosFunctions.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="92">
- <caret line="4" column="18" lean-forward="true" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="18" />
+ <state relative-caret-position="437">
+ <caret line="19" column="28" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="28" />
</state>
</provider>
</entry>
@@ -52,7 +62,7 @@
<entry file="file://$PROJECT_DIR$/page_profile/profil.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="24">
- <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" selection-end-column="54" />
+ <caret line="1" selection-start-line="1" selection-end-line="1" selection-end-column="54" />
<folding>
<element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#button#0;n#!!top" expanded="true" />
@@ -69,7 +79,7 @@
<entry file="file://$PROJECT_DIR$/page_user/register.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="373">
- <caret line="36" column="38" lean-forward="true" selection-start-line="34" selection-start-column="2" selection-end-line="36" selection-end-column="38" />
+ <caret line="36" column="38" selection-start-line="34" selection-start-column="2" selection-end-line="36" selection-end-column="38" />
</state>
</provider>
</entry>
@@ -77,8 +87,8 @@
<file leaf-file-name="login.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/page_user/login.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="433">
- <caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="97" />
+ <state relative-caret-position="654">
+ <caret line="42" column="1" lean-forward="true" selection-start-line="42" selection-start-column="1" selection-end-line="42" selection-end-column="1" />
</state>
</provider>
</entry>
@@ -101,7 +111,7 @@
<entry file="file://$PROJECT_DIR$/page_welcome/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
- <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+ <caret line="23" selection-start-line="23" selection-end-line="23" />
</state>
</provider>
</entry>
@@ -118,6 +128,7 @@
<find>if (!isset($_SESSION['username']))</find>
<find>js</find>
<find>user information</find>
+ <find>unserialize</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -226,7 +237,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="13733000" />
+ <option name="totallyTimeSpent" value="15413000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1680" height="1050" extended-state="0" />
@@ -551,9 +562,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/page_welcome/login.php">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
<entry file="file://$PROJECT_DIR$/API_Twitter/userSuggestions.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
@@ -578,38 +586,24 @@
<entry file="file://$PROJECT_DIR$/page_welcome/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
- <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+ <caret line="23" selection-start-line="23" selection-end-line="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/page_user/logout.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/page_user/login.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="433">
- <caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="97" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/page_user/register.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="373">
- <caret line="36" column="38" lean-forward="true" selection-start-line="34" selection-start-column="2" selection-end-line="36" selection-end-column="38" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/page_welcome/userpage.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="396">
- <caret line="18" selection-start-line="18" selection-end-line="18" />
+ <caret line="36" column="38" selection-start-line="34" selection-start-column="2" selection-end-line="36" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/page_profile/profil.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="24">
- <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" selection-end-column="54" />
+ <caret line="1" selection-start-line="1" selection-end-line="1" selection-end-column="54" />
<folding>
<element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#button#0;n#!!top" expanded="true" />
@@ -621,17 +615,38 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/page_user/login.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="654">
+ <caret line="42" column="1" lean-forward="true" selection-start-line="42" selection-start-column="1" selection-end-line="42" selection-end-column="1" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/page_welcome/login.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1134">
+ <caret line="42" column="2" selection-start-line="42" selection-start-column="2" selection-end-line="42" selection-end-column="22" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/API_Twitter/userInfosFunctions.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="92">
- <caret line="4" column="18" lean-forward="true" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="18" />
+ <state relative-caret-position="437">
+ <caret line="19" column="28" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="28" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/page_welcome/userpage.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="355">
+ <caret line="18" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/page_user/user.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="538">
- <caret line="82" column="58" selection-start-line="82" selection-start-column="58" selection-end-line="82" selection-end-column="58" />
+ <state relative-caret-position="214">
+ <caret line="26" column="74" selection-start-line="26" selection-start-column="74" selection-end-line="26" selection-end-column="74" />
<folding>
<element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#tr#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
diff --git a/page_user/user.php b/page_user/user.php
index a76d7dd..da7d1be 100644
--- a/page_user/user.php
+++ b/page_user/user.php
@@ -24,7 +24,7 @@ session_start();
<div class="w3l-overlay">
<div class="banner-text text-center container">
<table width="400" class="hovertable" align="center" style='text-align:center;background: white' border='1'>
- <tr style="background: #3fcbfe;"><th>name</th><th>twitter</th></tr>
+ <tr style="background: #3fcbfe;"><th>image</th><th>twitter</th></tr>
<?php
session_start();
@@ -46,15 +46,17 @@ session_start();
$user = mysqli_fetch_assoc($result);
$userid = $user['id'];
- $fav = "SELECT * FROM favorites WHERE userid='$userid'";
+ $fav = "SELECT twitter FROM favorites WHERE userid='$userid'";
$result = mysqli_query($db, $fav);
- $fav = mysqli_fetch_all($result);
- $datarow = count($fav); //长度
+ $fav = mysqli_fetch_assoc($result);
+ $favt = unserialize($fav['twitter']);
+
+ $datarow = count($favt);
for($i=0;$i<$datarow;$i++){
- $name = $username;
- $twitter = $fav[$i]['2'];
- $id = getUserId($fav[$i]['2']);
- echo "<tr onclick='showId(this.id)' id=\"$id\" style=\"background: #d4e3e5;\" onmouseover=\"this.style.backgroundColor='#ffff66';\" onmouseout=\"this.style.backgroundColor='#d4e3e5';\"><td>$name</td><td>$twitter</td></tr>";
+ $twitter = getUserScreenName($favt[$i]);
+ $id = $favt[$i];
+ $image = getUserProfileImage($id);
+ echo "<tr onclick='showId(this.id)' id=\"$id\" style=\"background: #d4e3e5;\" onmouseover=\"this.style.backgroundColor='#ffff66';\" onmouseout=\"this.style.backgroundColor='#d4e3e5';\"><td><img src='$image'></td><td>$twitter</td></tr>";
}
@@ -79,7 +81,6 @@ session_start();
<!-- Default-JavaScript-File -->
<script type="text/javascript">
function showId(id){
- alert(id);
location.href="../page_profile/profil.php?id="+id+"&sn=Twitter";
}
--
GitLab