diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 829dca4aeaf4bbabf2fdf2179b7eb5d58b475928..5cbd1ed6af9030e3c2327fa7f9f428c6b29e9ef5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="97544618-4bb5-471f-b62a-ec86a2a69f7b" name="Default" comment="">
- <change beforePath="$PROJECT_DIR$/page_user/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/page_user/css/style.css" 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" />
@@ -20,8 +19,8 @@
<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="402">
- <caret line="81" column="28" selection-start-line="81" selection-start-column="28" selection-end-line="81" selection-end-column="28" />
+ <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" />
<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" />
@@ -31,11 +30,29 @@
</provider>
</entry>
</file>
+ <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">
+ <caret line="18" selection-start-line="18" selection-end-line="18" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <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>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="profil.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/page_profile/profil.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="566">
- <caret line="30" column="1" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
+ <state relative-caret-position="24">
+ <caret line="1" lean-forward="true" 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" />
@@ -209,7 +226,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="13084000" />
+ <option name="totallyTimeSpent" value="13733000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1680" height="1050" extended-state="0" />
@@ -255,6 +272,147 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/page_user/user.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="722">
+ <caret line="49" column="61" lean-forward="true" selection-start-line="49" selection-start-column="61" selection-end-line="49" selection-end-column="61" />
+ <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" />
+ <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/page_profile/profil.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-328">
+ <caret line="28" column="1" selection-start-line="28" selection-start-column="1" selection-end-line="28" selection-end-column="1" />
+ <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" />
+ <element signature="n#style#0;n#form#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#form#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/page_user/register.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-65">
+ <caret line="16" column="26" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="26" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/page_user/login.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="660">
+ <caret line="30" column="47" selection-start-line="30" selection-start-column="47" selection-end-line="30" selection-end-column="47" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/page_user/index.php" />
+ <entry file="file://$PROJECT_DIR$/Prototype_MockingBot/webpack/font-icons-2d07ed3776e17a19540f.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1605">
+ <caret line="2875" column="1" selection-start-line="2875" selection-start-column="1" selection-end-line="2875" selection-end-column="1" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/css/style.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="310">
+ <caret line="1448" column="1" selection-start-line="1448" selection-start-column="1" selection-end-line="1448" selection-end-column="1" />
+ </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$/page_welcome/userpage.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="324">
+ <caret line="18" column="118" lean-forward="true" selection-start-line="18" selection-start-column="118" selection-end-line="18" selection-end-column="118" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/API_Twitter/userSuggestions.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="161">
+ <caret line="7" column="22" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="22" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/API_Twitter/userInfosFunctions.php">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/page_welcome/index.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="91">
+ <caret line="31" column="15" lean-forward="true" selection-start-line="31" selection-start-column="15" selection-end-line="31" selection-end-column="15" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/facto.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="750">
+ <caret line="50" column="22" selection-start-line="50" selection-start-column="20" selection-end-line="50" selection-end-column="22" />
+ </state>
+ </provider>
+ </entry>
+ <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" />
+ </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_profile/profil.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="566">
+ <caret line="30" column="1" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
+ <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" />
+ <element signature="n#style#0;n#form#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#form#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
+ </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_user/user.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="471">
+ <caret line="81" column="24" lean-forward="true" selection-start-line="81" selection-start-column="24" selection-end-line="81" selection-end-column="24" />
+ <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" />
+ <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/page_user/user.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2145">
@@ -396,13 +554,6 @@
<entry file="file://$PROJECT_DIR$/page_welcome/login.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/page_welcome/userpage.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="324">
- <caret line="18" column="118" lean-forward="true" selection-start-line="18" selection-start-column="118" selection-end-line="18" selection-end-column="118" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/API_Twitter/userSuggestions.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
@@ -410,9 +561,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/API_Twitter/userInfosFunctions.php">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
<entry file="file://$PROJECT_DIR$/page_welcome/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="91">
@@ -444,10 +592,24 @@
</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" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/page_profile/profil.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="566">
- <caret line="30" column="1" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
+ <state relative-caret-position="24">
+ <caret line="1" lean-forward="true" 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" />
@@ -459,17 +621,17 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/page_user/register.php">
+ <entry file="file://$PROJECT_DIR$/API_Twitter/userInfosFunctions.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 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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/page_user/user.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="402">
- <caret line="81" column="28" selection-start-line="81" selection-start-column="28" selection-end-line="81" selection-end-column="28" />
+ <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" />
<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 b3e03bf256aff222b8d27d907f08d9b9424867e8..a76d7dd044b77730c6f2b34bc4b874fbf5a2e678 100644
--- a/page_user/user.php
+++ b/page_user/user.php
@@ -1,5 +1,6 @@
<?php
require_once('../facto.php');
+require_once('../API_Twitter/userInfosFunctions.php');
session_start();
?>
@@ -52,7 +53,7 @@ session_start();
for($i=0;$i<$datarow;$i++){
$name = $username;
$twitter = $fav[$i]['2'];
- $id = $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>";
}
@@ -79,7 +80,7 @@ session_start();
<script type="text/javascript">
function showId(id){
alert(id);
- location.href="kevin/"+id;
+ location.href="../page_profile/profil.php?id="+id+"&sn=Twitter";
}