Skip to content

Commit

Permalink
Tīmekļa lapas uzlabojumi
Browse files Browse the repository at this point in the history
  • Loading branch information
M4t1ss committed Apr 24, 2020
1 parent 1199986 commit a0656ea
Show file tree
Hide file tree
Showing 11 changed files with 666 additions and 403 deletions.
2 changes: 2 additions & 0 deletions .history-matiss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
_T=20200424_21:07:51_6 grep -r . -e "config,php"
_T=20200424_21:15:42_6 grep -r . -e "config.php"
_T=20200424_21:34:41_6 grep -r . -e "TWITTER_USERNAME"
_T=20200424_22:29:12_6 grep -r . -e "mysql_query"
_T=20200424_22:29:49_6 grep -r . -l -e "mysql_query"
144 changes: 144 additions & 0 deletions alltime.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
<h2 style='margin:auto auto; text-align:center;'>Pēdējo gadu statistika</h2>
<?php
// SQL pieslēgšanās informācija
include "includes/init_sql.php";


// Tvīti pa mēnešiem
$q = mysqli_query($connection, "SELECT COUNT( * ) AS skaits, Y, M
FROM (
SELECT * , Year( created_at ) AS Y, Month( created_at ) AS M
FROM tweets
)t
GROUP BY Y, M
ORDER BY Y ASC , M ASC
");
$dati = array();
while($r=mysqli_fetch_array($q)){
$skaits=$r["skaits"];
$gads=$r["Y"];
$menesis=$r["M"];

$dati[$gads."-".$menesis] = $skaits;
}
?>
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript">
google.load("visualization", "1", {packages:["corechart"]});
google.setOnLoadCallback(drawChart);
function drawChart() {
var data2 = new google.visualization.DataTable();
data2.addColumn('string', 'Laiks');
data2.addColumn('number', 'Tvīti');
data2.addRows(<?php echo count($dati);?>);
<?php
//izdrukā populārākās stundas
$zb = 0;
foreach($dati as $laiks => $skaits) {
echo "data2.setValue(".$zb.", 0, '".$laiks."');";
echo "data2.setValue(".$zb.", 1, ".$skaits.");";
$zb++;
}
?>
var chart2 = new google.visualization.ColumnChart(document.getElementById('stats-hours'));
chart2.draw(data2, {width: 1200, height: 400,'backgroundColor':'transparent'});
}
</script>
<div style="width:1200px;margin:auto auto;" id="stats-hours"></div>
<br/>
<?php
// Ēdieni pa mēnešiem
mysqli_query($connection, "set @num := 0;");
mysqli_query($connection, "set @type := '';");
$q = mysqli_query($connection, 'select vards, periods, skaits
from (
select vards, periods, skaits,
@num := if(@type = periods, @num + 1, 1) as row_number,
@type := periods as dummy
from(
SELECT vards, SUM( skaits ) AS skaits, periods
FROM (
SELECT * , CONCAT(Year( datums ),".",Month( datums ),".") AS periods
FROM vardiDiena
)t
GROUP BY periods, vards
ORDER BY periods ASC, skaits DESC
)z
) as x where x.row_number <= 3
');
echo mysqli_error($connection);
$dati = array();
$visiVardi = array();
$max = 0;
while($r=mysqli_fetch_array($q)){
$vards=$r["vards"];
$skaits=$r["skaits"];
$periods=$r["periods"];
if($periods != "0.0."){
if($r["skaits"] > $max) $max = $r["skaits"] + 1;

$citiDati[$periods][$vards] = $skaits;
$visiVardi[] = $vards;
}
}
$visiVardi = array_unique($visiVardi);
foreach($visiVardi as $vards){
foreach($citiDati as $periods => $value){
if(!isset($citiDati[$periods][$vards])) $citiDati[$periods][$vards] = 0;
}
}
?>
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
<script type="text/javascript">
google.load('visualization', '1', {packages: ['corechart']});
</script>
<script type="text/javascript">
function drawVisualization() {
// Create and populate the data table.
var data = google.visualization.arrayToDataTable([
['x', <?php
$ctr = 1;
array_multisort($visiVardi);
foreach($visiVardi as $vards){
echo "'".$vards."'";
if($ctr < count($visiVardi)) echo ", ";
$ctr++;
}
?>],
<?php
$ctx = 1;
foreach($citiDati as $periods => $value){
echo "[";
$ctr = 1;
echo "'".$periods."',";
ksort($value);
foreach($value as $vards => $skaits){
echo $skaits;
if($ctr < count($value)) echo ", ";
$ctr++;
}
echo "]";
if($ctx < count($citiDati)) echo ", \n";
$ctx++;
}
?>
]);
new google.visualization.LineChart(document.getElementById('visualization')).
draw(data, {curveType: "none",
width: 1200, height: 800,
'chartArea': {'width': '75%', 'height': '85%'},
'backgroundColor':'transparent',
vAxis: {
viewWindowMode:'explicit',
viewWindow:{
max:<?php echo $max; ?>,
min:0
}
}
}
);
}
google.setOnLoadCallback(drawVisualization);
</script><br/><br/><br/>
<div style="text-align:center;font-weight:bold;">Ēdieni</div>
<div id="visualization" style="margin: auto auto; width: 1200px; height: 800px;"></div>
4 changes: 2 additions & 2 deletions auth/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
* A single location to store configuration.
*/

define('CONSUMER_KEY', 'Nnsh0axOixfS4rXXJhH8A');
define('CONSUMER_SECRET', 'LJtOj29gDiHz4Jn5Xjp3bOPxYBXGoSgljJdcu6zn8Q');
define('CONSUMER_KEY', '');
define('CONSUMER_SECRET', '');
define('OAUTH_CALLBACK', 'http://localhost/TwitEdiens/auth/callback.php');
14 changes: 7 additions & 7 deletions draugi.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
require_once('auth/config.php');
if($_GET['unfollow'] && $_GET['unfollow']!=''){
$access_token = $_SESSION['access_token'];
$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
$connection->post('friendships/destroy', array('screen_name' => $_GET['unfollow']));
$connectionT = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
$connectionT->post('friendships/destroy', array('screen_name' => $_GET['unfollow']));
echo "<script type=\"text/javascript\">setTimeout(\"window.location = '?'\",250);</script>";
}

Expand All @@ -29,8 +29,8 @@
//Ja ir pieslēdzies
}else{
$access_token = $_SESSION['access_token'];
$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
$usr = $connection->get('account/verify_credentials');
$connectionT = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
$usr = $connectionT->get('account/verify_credentials');
$krasa=TRUE;
echo "<table id='results' style='margin:auto auto;border-spacing:0px;border:1px solid white;'>";
echo "<tr>
Expand All @@ -41,15 +41,15 @@
//dabū draugu Twitter screen name
$nextCursor = -1;
while ($nextCursor!=0){
$content = $connection->get('statuses/friends', array('cursor' => $nextCursor));
$content = $connectionT->get('friends/list', array('cursor' => $nextCursor));
$nextCursor = $content->{'next_cursor_str'};
for ($i = 0; $i < sizeof($content->{'users'}); $i++) {
$niks = $content->{'users'}[$i]->{'screen_name'};
$vaards = $content->{'users'}[$i]->{'name'};
//Paskatās, vai datubāzē ir tvīti no konkrētā drauga
$q = mysql_query("SELECT created_at FROM tweets where screen_name='$niks' order by created_at desc");
$q = mysqli_query($connection, "SELECT created_at FROM tweets where screen_name='$niks' order by created_at desc");
//Ja kāds tomēr ir
$skaits = mysql_num_rows($q);
$skaits = mysqli_num_rows($q);
if($skaits>0){
//sametam masīvā un sakārtojam masīvu
if($sort=='sk'){
Expand Down
82 changes: 41 additions & 41 deletions draugs.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
//Ja ir pieslēdzies
}else{
$access_token = $_SESSION['access_token'];
$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
$usr = $connection->get('users/show', array('screen_name' => $draugs));
$connectionT = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
$usr = $connectionT->get('users/show', array('screen_name' => $draugs));
$vaards = $usr->{'name'};
}
?>
Expand Down Expand Up @@ -44,8 +44,8 @@
</ul>
<div id="tabs-1">
<?php
$q = mysql_query("SELECT id, text, created_at FROM tweets where screen_name='$draugs' order by created_at desc");
if (mysql_num_rows($q)){
$q = mysqli_query($connection, "SELECT id, text, created_at FROM tweets where screen_name='$draugs' order by created_at desc");
if (mysqli_num_rows($q)){
//visi savāktie konkrētā lietotāja tvīti
$krasa=TRUE;
echo "<table id='results' class='sortable' style='margin:auto auto;border-spacing:0px;border:1px solid white;'>";
Expand All @@ -54,16 +54,16 @@
<th style='width:135px;'>Ēdieni / dzērieni</th>
<th style='width:135px;'>Laiks</th>
</tr>";
while($r=mysql_fetch_array($q)){
while($r=mysqli_fetch_array($q)){
$tvid = $r["id"];
$q2 = mysql_query("SELECT distinct nominativs FROM words where tvits='$tvid' and nominativs!='0'");
$q2 = mysqli_query($connection, "SELECT distinct nominativs FROM words where tvits='$tvid' and nominativs!='0'");
if ($krasa==TRUE) {$kr=" class='even'";}else{$kr="";}
$teksts=$r["text"];
$laiks=$r["created_at"];
$laiks=strtotime($laiks);
$laiks=date("m.d.Y H:i", $laiks);
echo "<tr".$kr."><td>".$teksts."</td><td>";
while($r2=mysql_fetch_array($q2)){echo $r2["nominativs"].", ";};
while($r2=mysqli_fetch_array($q2)){echo $r2["nominativs"].", ";};
echo "</td><td>".$laiks."</td></tr>";
$krasa=!$krasa;
}
Expand All @@ -83,13 +83,13 @@
<div id="tabs-2">
<?php
//cikos un kādās dienās tvītots
$q = mysql_query("SELECT created_at FROM `tweets` WHERE screen_name = '$draugs'");
$q = mysqli_query($connection, "SELECT created_at FROM `tweets` WHERE screen_name = '$draugs'");
?>
<h2 style='margin:auto auto; text-align:center;'>Ēšanas kalendārs</h2>
<br/>
<div style='margin:auto auto;width:500px;'>
<?php
if (mysql_num_rows($q)){
if (mysqli_num_rows($q)){
?>
<h3>Cikos tvīto visbiežāk</h3>
<?php
Expand All @@ -116,7 +116,7 @@
$maxd=0;
for($zb=0;$zb<24;$zb++) $stundas[$zb][skaits]=0;

while($r=mysql_fetch_array($q)){
while($r=mysqli_fetch_array($q)){
$laiks=$r["created_at"];
$laiks=strtotime($laiks);
$diena=date("D", $laiks);
Expand Down Expand Up @@ -206,11 +206,11 @@
<h2 style='margin:auto auto; text-align:center;'>Pieminētie ēdieni / dzērieni</h2>
<br/>
<?php
$vardi = mysql_query("select nominativs from tweets, words where tweets.screen_name = '$draugs' and words.tvits = tweets.id and nominativs != '0'");
if (mysql_num_rows($vardi)){
$vardi = mysqli_query($connection, "select nominativs from tweets, words where tweets.screen_name = '$draugs' and words.tvits = tweets.id and nominativs != '0'");
if (mysqli_num_rows($vardi)){
$cloud = new wordCloud();
//jāuztaisa vēl, lai, uzklikojot uz kādu ēdienu, atvērtu visus tvītus, kas to pieminējuši...
while($r=mysql_fetch_array($vardi)){
while($r=mysqli_fetch_array($vardi)){
$nom = $r["nominativs"];
$cloud->addWord(array('word' => $nom, 'url' => '/vards/'.urlencode($nom)));
}
Expand Down Expand Up @@ -240,24 +240,24 @@ function initialize() {
var map = new google.maps.Map(document.getElementById("map_canvas"), settings);
<?php
$i=0;
$map = mysql_query("SELECT distinct geo, count( * ) skaits FROM `tweets` WHERE geo!='' and screen_name = '$draugs' GROUP BY geo ORDER BY count( * ) DESC");
while($r=mysql_fetch_array($map)){
$map = mysqli_query($connection, "SELECT distinct geo, count( * ) skaits FROM `tweets` WHERE geo!='' and screen_name = '$draugs' GROUP BY geo ORDER BY count( * ) DESC");
while($r=mysqli_fetch_array($map)){
$vieta=$r["geo"];
$skaits=$r["skaits"];
if ($skaits==1) {$tviti=" tvīts";} else {$tviti=" tvīti";}
$irvieta = mysql_query("SELECT * FROM vietas where nosaukums='$vieta'");
if(mysql_num_rows($irvieta)==0){
$irvieta = mysqli_query($connection, "SELECT * FROM vietas where nosaukums='$vieta'");
if(mysqli_num_rows($irvieta)==0){
//ja nav tādas vietas datu bāzē,
//dabū vietas koordinātas
$string = file_get_contents("http://maps.googleapis.com/maps/api/geocode/json?address=".str_replace(" ", "%20",$vieta)."&sensor=true");
$json=json_decode($string, true);
$lat = $json["results"][0]["geometry"]["location"]["lat"];
$lng = $json["results"][0]["geometry"]["location"]["lng"];
if ($lat!=0 && $lng!=0){
$ok = mysql_query("INSERT INTO vietas (nosaukums, lng, lat) VALUES ('$vieta', '$lng', '$lat')");
$ok = mysqli_query($connection, "INSERT INTO vietas (nosaukums, lng, lat) VALUES ('$vieta', '$lng', '$lat')");
}
}else{
$arr=mysql_fetch_array($irvieta);
$arr=mysqli_fetch_array($irvieta);
//ja ir
$lat = $arr['lat'];
$lng = $arr['lng'];
Expand Down Expand Up @@ -294,48 +294,48 @@ function initialize() {
<br/>
<?php
//pozitīvie
$kopa = mysql_query("SELECT count( * ) skaits FROM tweets where emo = 1 and screen_name = '$draugs'");
$r=mysql_fetch_array($kopa);
$kopa = mysqli_query($connection, "SELECT count( * ) skaits FROM tweets where emo = 1 and screen_name = '$draugs'");
$r=mysqli_fetch_array($kopa);
$poz = $r["skaits"];
//negatīvie
$kopa = mysql_query("SELECT count( * ) skaits FROM tweets where emo = 2 and screen_name = '$draugs'");
$r=mysql_fetch_array($kopa);
$kopa = mysqli_query($connection, "SELECT count( * ) skaits FROM tweets where emo = 2 and screen_name = '$draugs'");
$r=mysqli_fetch_array($kopa);
$neg = $r["skaits"];
//neitrālie
$kopa = mysql_query("SELECT count( * ) skaits FROM tweets where emo = 3 and screen_name = '$draugs'");
$r=mysql_fetch_array($kopa);
$kopa = mysqli_query($connection, "SELECT count( * ) skaits FROM tweets where emo = 3 and screen_name = '$draugs'");
$r=mysqli_fetch_array($kopa);
$nei = $r["skaits"];
//Tauki, saldumi
$g1 = mysql_query("SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 1");
$r1=mysql_fetch_array($g1);
$g1 = mysqli_query($connection, "SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 1");
$r1=mysqli_fetch_array($g1);
$g11 = $r1["skaits"];
//Gaļa, olas, zivis
$g2 = mysql_query("SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 2");
$r2=mysql_fetch_array($g2);
$g2 = mysqli_query($connection, "SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 2");
$r2=mysqli_fetch_array($g2);
$g21 = $r2["skaits"];
//Piena produkti
$g3 = mysql_query("SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 3");
$r3=mysql_fetch_array($g3);
$g3 = mysqli_query($connection, "SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 3");
$r3=mysqli_fetch_array($g3);
$g31 = $r3["skaits"];
//Dārzeņi
$g4 = mysql_query("SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 4");
$r4=mysql_fetch_array($g4);
$g4 = mysqli_query($connection, "SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 4");
$r4=mysqli_fetch_array($g4);
$g41 = $r4["skaits"];
//Augļi, ogas
$g5 = mysql_query("SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 5");
$r5=mysql_fetch_array($g5);
$g5 = mysqli_query($connection, "SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 5");
$r5=mysqli_fetch_array($g5);
$g51 = $r5["skaits"];
//Maize, graudaugu produkti, makaroni, rīsi, biezputras, kartupeļi
$g6 = mysql_query("SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 6");
$r6=mysql_fetch_array($g6);
$g6 = mysqli_query($connection, "SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 6");
$r6=mysqli_fetch_array($g6);
$g61 = $r6["skaits"];
//Alkoholisks dzēriens
$g7 = mysql_query("SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 7");
$r7=mysql_fetch_array($g7);
$g7 = mysqli_query($connection, "SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 7");
$r7=mysqli_fetch_array($g7);
$g71 = $r7["skaits"];
//Bezalkoholisks dzēriens
$g8 = mysql_query("SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 8");
$r8=mysql_fetch_array($g8);
$g8 = mysqli_query($connection, "SELECT count( * ) skaits FROM words, tweets where tweets.screen_name = '$draugs' and words.tvits = tweets.id and grupa = 8");
$r8=mysqli_fetch_array($g8);
$g81 = $r8["skaits"];
?>
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
Expand Down
Loading

0 comments on commit a0656ea

Please sign in to comment.