Changeset 873 for trunk/Modules/Chat

Timestamp:

Apr 6, 2020, 11:17:40 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code format.

Location:

trunk/Modules/Chat

Files:

• Chat.php (modified) (5 diffs)
• irc_bot.php (modified) (15 diffs)

trunk/Modules/Chat/Chat.php

@@ -14 +14 @@
   {
     $Num = dechex($Num);
-    return(substr($Num, 4, 2).substr($Num, 2, 2).substr($Num, 0, 2));
+    return (substr($Num, 4, 2).substr($Num, 2, 2).substr($Num, 0, 2));
   }
 
@@ -21 +21 @@
     global $MonthNames;
 
-    if(!$this->System->User->CheckPermission('Chat', 'Display')) return('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('Chat', 'Display')) return ('Nemáte oprávnění');
 
-    if(array_key_exists('date', $_GET)) $Date = $_GET['date'];
+    if (array_key_exists('date', $_GET)) $Date = $_GET['date'];
       else $Date = date('Y-m-d');
     $DateParts = explode('-', $Date);
@@ -35 +35 @@
     $EndDateParts = explode('-', $EndDateTimeParts[0]);
 
-    if(!array_key_exists('year', $_SESSION)) $_SESSION['year'] = date('Y', time());
-    if(array_key_exists('year', $_GET)) $_SESSION['year'] = addslashes($_GET['year']);
+    if (!array_key_exists('year', $_SESSION)) $_SESSION['year'] = date('Y', time());
+    if (array_key_exists('year', $_GET)) $_SESSION['year'] = addslashes($_GET['year']);
 
-    if(!array_key_exists('month', $_SESSION)) $_SESSION['month'] = date('n', time());
-    if(array_key_exists('month', $_GET)) $_SESSION['month'] = addslashes($_GET['month']);
+    if (!array_key_exists('month', $_SESSION)) $_SESSION['month'] = date('n', time());
+    if (array_key_exists('month', $_GET)) $_SESSION['month'] = addslashes($_GET['month']);
 
     $Output = '<div class="ChatHistory">';
-    for($Year = $EndDateParts[0]; $Year >= $StartDateParts[0]; $Year--)
+    for ($Year = $EndDateParts[0]; $Year >= $StartDateParts[0]; $Year--)
     {
-      if($_SESSION['year'] == $Year)
+      if ($_SESSION['year'] == $Year)
       {
         $Output .= '<div class="Year">'.$Year.'<div class="YearContent">';
-        if($Year == $StartDateParts[0]) $StartMonth = ($StartDateParts[1] + 0); else $StartMonth = 1;
-        if($Year == $EndDateParts[0]) $EndMonth = ($EndDateParts[1] + 0); else $EndMonth = 12;
-        for($Month = $EndMonth; $Month >= $StartMonth; $Month--)
+        if ($Year == $StartDateParts[0]) $StartMonth = ($StartDateParts[1] + 0); else $StartMonth = 1;
+        if ($Year == $EndDateParts[0]) $EndMonth = ($EndDateParts[1] + 0); else $EndMonth = 12;
+        for ($Month = $EndMonth; $Month >= $StartMonth; $Month--)
         {
-          if($_SESSION['month'] == $Month)
+          if ($_SESSION['month'] == $Month)
           {
             $Output .= '<div class="Months">'.$MonthNames[$Month].'<span>';
-            if(($Year == $StartDateParts[0]) and ($Month == $StartDateParts[1])) $StartDay = ($StartDateParts[2]+0); else $StartDay = 1;
-            if(($Year == $EndDateParts[0]) and ($Month == $EndDateParts[1])) $EndDay = ($EndDateParts[2]+0); else $EndDay = date('t',mktime(0,0,0,$Month,0,$Year));
-            for($Day = $StartDay; $Day <= $EndDay; $Day++)
+            if (($Year == $StartDateParts[0]) and ($Month == $StartDateParts[1])) $StartDay = ($StartDateParts[2]+0); else $StartDay = 1;
+            if (($Year == $EndDateParts[0]) and ($Month == $EndDateParts[1])) $EndDay = ($EndDateParts[2]+0); else $EndDay = date('t',mktime(0,0,0,$Month,0,$Year));
+            for ($Day = $StartDay; $Day <= $EndDay; $Day++)
             {
               $Text = '<a href="?date='.$Year.'-'.$Month.'-'.$Day.'">'.$Day.'</a> ';
-              if(($DateParts[0] == $Year) and ($DateParts[1] == $Month) and ($DateParts[2] == $Day)) $Text = '<strong>'.$Text.'</strong>';
+              if (($DateParts[0] == $Year) and ($DateParts[1] == $Month) and ($DateParts[2] == $Day)) $Text = '<strong>'.$Text.'</strong>';
               $Output .= $Text;
             }
@@ -72 +72 @@
     $DbResult = $this->Database->select('ChatHistory', 'Nick, Color, Text, UNIX_TIMESTAMP(Time)', "RoomType = 0 AND Time > '".$Date." 00:00:00' AND Time < '".$Date." 23:59:59' ORDER BY Time DESC");
     $Output .= '<div class="ChatHistoryText">';
-    if($DbResult->num_rows > 0)
-    while($Row = $DbResult->fetch_array())
+    if ($DbResult->num_rows > 0)
+    while ($Row = $DbResult->fetch_array())
     {
       $Text = $Row['Text'];;
@@ -81 +81 @@
     else $Output .= 'V daném dni nebyly zaznamenány žádné zprávy.';
     $Output .= '</div>';
-    return($Output);
+    return ($Output);
   }
 }

trunk/Modules/Chat/irc_bot.php

@@ -30 +30 @@
   function Say($Message, $Recipient = '')
   {
-    if($Recipient == '') $Recipient = $this->Channel;
+    if ($Recipient == '') $Recipient = $this->Channel;
     $this->Command(': PRIVMSG '.$Recipient.' :'.$Message);
   }
@@ -43 +43 @@
     global $Database;
 
-    while(!fwrite($this->File, ''))
+    while (!fwrite($this->File, ''))
     {
       $this->Command('JOIN '.$this->Channel);
@@ -51 +51 @@
 
       $LineParts = explode(' ', $Line);
-      if(count($LineParts) > 0)
+      if (count($LineParts) > 0)
       {
-        if($LineParts[0] == 'PING')
+        if ($LineParts[0] == 'PING')
         {
           $this->Command('PONG '.trim($LineParts[1])."\n");
@@ -59 +59 @@
         }
 
-        if(count($LineParts) > 1)
-        {
-          if((trim($LineParts[1]) == 'INVITE') && (substr(trim($LineParts[3]), 0, 2) == ':#'))
+        if (count($LineParts) > 1)
+        {
+          if ((trim($LineParts[1]) == 'INVITE') && (substr(trim($LineParts[3]), 0, 2) == ':#'))
           {
             $CurrentChannel = substr(trim($LineParts[3]), 1);
@@ -78 +78 @@
 
       // Log messages to database
-      if(strpos($Line, 'PRIVMSG') !== false)
+      if (strpos($Line, 'PRIVMSG') !== false)
       {
         $Text = addslashes($Commands[2]);
@@ -91 +91 @@
 
       explode(':', $Line);
-      foreach($Commands as $Index => $Item)
+      foreach ($Commands as $Index => $Item)
         $Commands[$Index] = trim($Item);
 
-      if(count($Commands) >= 2)
+      if (count($Commands) >= 2)
       {
         $Command = $Commands[2];
 
         // Jméno - Pošle vizitku
-        if($Command == $this->Nick)
+        if ($Command == $this->Nick)
         {
           $this->Say('Ahoj lidi, ja jsem '.$this->OwnerName.' bot. Random#: '.rand(0, 10));
@@ -106 +106 @@
 
         // hhelp - vypise tuto napovedu
-        if($Command == 'hhelp')
+        if ($Command == 'hhelp')
         {
           $this->Say('Ja jsem Harvester.');
@@ -124 +124 @@
 
         // hsay:Message - Posle zpravu
-        if($Command == 'hsay')
+        if ($Command == 'hsay')
         {
           $this->Say($Commands[3]);
@@ -131 +131 @@
 
         // hpsay:to:Message - Posle soukromou zpravu kanalu nebo osobe
-        if($Command == 'hpsay')
+        if ($Command == 'hpsay')
         {
           $this->Say($Commands[4], $Commands[3]);
@@ -138 +138 @@
 
         // hcol:to:Message - Posle kolizni zpravu kanalu nebo osobe
-        if($Command == 'hcol')
+        if ($Command == 'hcol')
         {
           $this->Say($Commands[4], $Commands[3]);
@@ -145 +145 @@
 
         // hdo:Command - Posle serveru prikaz
-        if($Command == 'hdo')
+        if ($Command == 'hdo')
         {
           $hdo = explode('hdo:', $Line);
@@ -153 +153 @@
 
         // hpart:Channel - Odpoji se z kanalu
-        if($Command == 'hpart')
+        if ($Command == 'hpart')
         {
           $hdo = explode('hpart:', $Line);
-          if(trim($hdo[1]) != trim($this->Channel))
+          if (trim($hdo[1]) != trim($this->Channel))
           {
             $this->Command('PART :'.trim($hdo[1])."\n");
@@ -164 +164 @@
 
         // hmove:Channel - Zmeni aktivni kanal
-        if($Command == 'hmove')
+        if ($Command == 'hmove')
         {
           $hdo = explode("hmove:", $Line);
-          if(trim($hdo[1]) != trim($$this->Cannel))
+          if (trim($hdo[1]) != trim($$this->Cannel))
           {
             $this->Channel = trim($hdo[1]);
@@ -177 +177 @@
 
         // htime - udaje o casu
-        if($Command == 'htime')
+        if ($Command == 'htime')
         {
           $Date = implode("-", getdate(time()));
@@ -185 +185 @@
 
         // hjoke - Posle nahodny vtip
-        if($Command == 'hjoke')
+        if ($Command == 'hjoke')
         {
           $Joke = ($this->Jokes[rand(0, (sizeof($this->Jokes) - 1))]);