Changeset 32

Timestamp:

Apr 7, 2020, 1:06:13 AM (4 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

Location:

trunk

Files:

• Database.php (modified) (14 diffs)
• Global.php (modified) (11 diffs)
• PrefixMultiplier.php (modified) (4 diffs)
• Run.php (modified) (1 diff)
• index.php (modified) (13 diffs)

trunk/Database.php

@@ -7 +7 @@
 {
   list($usec, $sec) = explode(" ", microtime());
-  return ((float)$usec + (float)$sec);
+  return (float)$usec + (float)$sec;
 }
 
@@ -17 +17 @@
   function fetch_assoc()
   {
-    return($this->PDOStatement->fetch(PDO::FETCH_ASSOC));
+    return $this->PDOStatement->fetch(PDO::FETCH_ASSOC);
   }
 
   function fetch_array()
   {
-    return($this->PDOStatement->fetch(PDO::FETCH_BOTH));
+    return $this->PDOStatement->fetch(PDO::FETCH_BOTH);
   }
 
   function fetch_row()
   {
-    return($this->PDOStatement->fetch(PDO::FETCH_NUM));
+    return $this->PDOStatement->fetch(PDO::FETCH_NUM);
   }
 }
@@ -61 +61 @@
   function Connect($Host, $User, $Password, $Database)
   {
-    if($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
-      else if($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
+    if ($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
+      else if ($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
       else $ConnectionString = '';
     try {
@@ -81 +81 @@
   function Connected()
   {
-    return(isset($this->PDO));
+    return isset($this->PDO);
   }
 
@@ -91 +91 @@
   function query($Query)
   {
-    if(!$this->Connected()) throw new Exception(T('Not connected to database'));
-    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
+    if (!$this->Connected()) throw new Exception(T('Not connected to database'));
+    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
     $this->LastQuery = $Query;
     //echo('a'.$this->ShowSQLQuery.'<'.$QueryStartTime.', '.microtime_float());
-    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
+    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
       $Duration = ' ; '.round(microtime_float() - $QueryStartTime, 4). ' s';
-    if($this->LogSQLQuery == true)
+    if ($this->LogSQLQuery == true)
       file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
-    if($this->ShowSQLQuery == true)
+    if ($this->ShowSQLQuery == true)
       echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; '.
       'padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.$Duration.'</div>'."\n");
     $Result = new DatabaseResult();
     $Result->PDOStatement = $this->PDO->query($Query);
-    if($Result->PDOStatement)
+    if ($Result->PDOStatement)
     {
       $Result->num_rows = $Result->PDOStatement->rowCount();
@@ -112 +112 @@
       $this->Error = $this->PDO->errorInfo();
       $this->Error = $this->Error[2];
-      if(($this->Error != '') and ($this->ShowSQLError == true))
+      if (($this->Error != '') and ($this->ShowSQLError == true))
         echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
         throw new Exception('SQL Error: '.$this->Error.', Query: '.$Query);
     }
-    return($Result);
+    return $Result;
   }
 
   function select($Table, $What = '*', $Condition = 1)
   {
-    return($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));
+    return $this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
   }
 
@@ -139 +139 @@
     $Name = '';
     $Values = '';
-    foreach($Data as $Key => $Value)
+    foreach ($Data as $Key => $Value)
     {
       $Name .= ',`'.$Key.'`';
-      if(!in_array($Value, $this->Functions))
+      if (!in_array($Value, $this->Functions))
       {
-        if(is_null($Value)) $Value = 'NULL';
+        if (is_null($Value)) $Value = 'NULL';
         else $Value = $this->PDO->quote($Value);
       }
@@ -151 +151 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    return('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
+    return 'INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')';
   }
 
@@ -162 +162 @@
   {
     $Values = '';
-    foreach($Data as $Key => $Value)
-    {
-      if(!in_array($Value, $this->Functions))
+    foreach ($Data as $Key => $Value)
+    {
+      if (!in_array($Value, $this->Functions))
       {
-        if(is_null($Value)) $Value = 'NULL';
+        if (is_null($Value)) $Value = 'NULL';
         else $Value = $this->PDO->quote($Value);
       }
@@ -172 +172 @@
     }
     $Values = substr($Values, 2);
-    return('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
+    return 'UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')';
   }
 
@@ -179 +179 @@
     $Name = '';
     $Values = '';
-    foreach($Data as $Key => $Value)
-    {
-      if(!in_array($Value, $this->Functions))
+    foreach ($Data as $Key => $Value)
+    {
+      if (!in_array($Value, $this->Functions))
       {
-        if(is_null($Value)) $Value = 'NULL';
+        if (is_null($Value)) $Value = 'NULL';
         else $Value = $this->PDO->quote($Value);
       }
@@ -203 +203 @@
   function real_escape_string($Text)
   {
-    return(addslashes($Text));
+    return addslashes($Text);
   }
 
   function quote($Text)
   {
-    return($this->PDO->quote($Text));
+    return $this->PDO->quote($Text);
   }
 
@@ -232 +232 @@
       $this->Error = $this->PDO->errorInfo();
       $this->Error = $this->Error[2];
-      if(($this->Error != '') and ($this->ShowSQLError == true))
+      if (($this->Error != '') and ($this->ShowSQLError == true))
         echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
       throw new Exception('SQL Error: '.$this->Error.', Query: '.$Query);
@@ -241 +241 @@
 function TimeToMysqlDateTime($Time)
 {
-  if($Time == NULL) return(NULL);
-    else return(date('Y-m-d H:i:s', $Time));
+  if ($Time == NULL) return NULL;
+    else return date('Y-m-d H:i:s', $Time);
 }
 
 function TimeToMysqlDate($Time)
 {
-  if($Time == NULL) return(NULL);
-    else return(date('Y-m-d', $Time));
+  if ($Time == NULL) return NULL;
+    else return date('Y-m-d', $Time);
 }
 
 function TimeToMysqlTime($Time)
 {
-  if($Time == NULL) return(NULL);
-    else return(date('H:i:s', $Time));
+  if ($Time == NULL) return NULL;
+    else return date('H:i:s', $Time);
 }
 
 function MysqlDateTimeToTime($DateTime)
 {
-  if($DateTime == '') return(NULL);
+  if ($DateTime == '') return NULL;
   $Parts = explode(' ', $DateTime);
   $DateParts = explode('-', $Parts[0]);
   $TimeParts = explode(':', $Parts[1]);
   $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]);
-  return($Result);
+  return $Result;
 }
 
 function MysqlDateToTime($Date)
 {
-  if($Date == '') return(NULL);
-  return(MysqlDateTimeToTime($Date.' 0:0:0'));
+  if ($Date == '') return NULL;
+  return MysqlDateTimeToTime($Date.' 0:0:0');
 }
 
 function MysqlTimeToTime($Time)
 {
-  if($Time == '') return(NULL);
-  return(MysqlDateTimeToTime('0000-00-00 '.$Time));
-}
+  if ($Time == '') return NULL;
+  return MysqlDateTimeToTime('0000-00-00 '.$Time);
+}

trunk/Global.php

@@ -3 +3 @@
 function HumanDate($Time)
 {
-  return(date('j.n.Y', $Time));
+  return date('j.n.Y', $Time);
 }
 
 function HumanDateTime($Time)
 {
-  return(date('j.n.Y H:i:s', $Time));
+  return date('j.n.Y H:i:s', $Time);
 }
 
@@ -22 +22 @@
   $Result = array();
   $Parts = explode('&', $QueryString);
-  foreach($Parts as $Part)
+  foreach ($Parts as $Part)
   {
-    if($Part != '')
+    if ($Part != '')
     {
-      if(!strpos($Part, '=')) $Part .= '=';
+      if (!strpos($Part, '=')) $Part .= '=';
       $Item = explode('=', $Part);
       $Result[$Item[0]] = $Item[1];
     }
   }
-  return($Result);
+  return $Result;
 }
 
@@ -37 +37 @@
 {
   $Parts = array();
-  foreach($QueryStringArray as $Index => $Item)
+  foreach ($QueryStringArray as $Index => $Item)
   {
     if ($Index != 'lvm') $Parts[] = $Index.'='.$Item;
   }
-  return(implode('&', $Parts));
+  return implode('&', $Parts);
 }
 
@@ -55 +55 @@
   $PageCount = floor($TotalCount / $ItemPerPage) + 1;
 
-  if(!array_key_exists('Page', $_SESSION)) $_SESSION['Page'] = 0;
-  if(array_key_exists('page', $_GET)) $_SESSION['Page'] = $_GET['page'] * 1;
-  if($_SESSION['Page'] < 0) $_SESSION['Page'] = 0;
-  if($_SESSION['Page'] >= $PageCount) $_SESSION['Page'] = $PageCount - 1;
+  if (!array_key_exists('Page', $_SESSION)) $_SESSION['Page'] = 0;
+  if (array_key_exists('page', $_GET)) $_SESSION['Page'] = $_GET['page'] * 1;
+  if ($_SESSION['Page'] < 0) $_SESSION['Page'] = 0;
+  if ($_SESSION['Page'] >= $PageCount) $_SESSION['Page'] = $PageCount - 1;
   $CurrentPage = $_SESSION['Page'];
 
@@ -65 +65 @@
 
   $Result = '';
-  if($PageCount > 1)
+  if ($PageCount > 1)
   {
-    if($CurrentPage > 0)
+    if ($CurrentPage > 0)
     {
       $QueryItems['page'] = 0;
@@ -76 +76 @@
     $PagesMax = $PageCount - 1;
     $PagesMin = 0;
-    if($PagesMax > ($CurrentPage + $Around)) $PagesMax = $CurrentPage + $Around;
-    if($PagesMin < ($CurrentPage - $Around))
+    if ($PagesMax > ($CurrentPage + $Around)) $PagesMax = $CurrentPage + $Around;
+    if ($PagesMin < ($CurrentPage - $Around))
     {
       $Result.= ' ... ';
       $PagesMin = $CurrentPage - $Around;
     }
-    for($i = $PagesMin; $i <= $PagesMax; $i++)
+    for ($i = $PagesMin; $i <= $PagesMax; $i++)
     {
-      if($i == $CurrentPage) $Result.= '<strong>'.($i + 1).'</strong> ';
+      if ($i == $CurrentPage) $Result.= '<strong>'.($i + 1).'</strong> ';
       else {
        $QueryItems['page'] = $i;
@@ -90 +90 @@
       }
     }
-    if($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
-    if($CurrentPage < ($PageCount - 1))
+    if ($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
+    if ($CurrentPage < ($PageCount - 1))
     {
       $QueryItems['page'] = ($CurrentPage + 1);
@@ -100 +100 @@
   }
   $Result = '<div style="text-align: center">'.$Result.'</div>';
-  return(array('SQLLimit' => ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage,
+  return array('SQLLimit' => ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage,
     'Page' => $CurrentPage,
     'Output' => $Result,
-  ));
+  );
 }
 
@@ -113 +113 @@
   global $OrderDirSQL, $OrderArrowImage, $Config;
 
-  if(array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
-  if(array_key_exists('OrderDir', $_GET) and (array_key_exists($_GET['OrderDir'], $OrderArrowImage)))
+  if (array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
+  if (array_key_exists('OrderDir', $_GET) and (array_key_exists($_GET['OrderDir'], $OrderArrowImage)))
     $_SESSION['OrderDir'] = $_GET['OrderDir'];
-  if(!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $DefaultColumn;
-  if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;
+  if (!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $DefaultColumn;
+  if (!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;
 
   // Check OrderCol
   $Found = false;
-  foreach($Columns as $Column)
+  foreach ($Columns as $Column)
   {
-    if($Column['Name'] == $_SESSION['OrderCol'])
+    if ($Column['Name'] == $_SESSION['OrderCol'])
     {
       $Found = true;
@@ -129 +129 @@
     }
   }
-  if($Found == false)
+  if ($Found == false)
   {
     $_SESSION['OrderCol'] = $DefaultColumn;
@@ -135 +135 @@
   }
   // Check OrderDir
-  if(($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1)) $_SESSION['OrderDir'] = 0;
+  if (($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1)) $_SESSION['OrderDir'] = 0;
 
   $Result = '';
   $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
-  foreach($Columns as $Index => $Column)
+  foreach ($Columns as $Index => $Column)
   {
     $QueryItems['OrderCol'] = $Column['Name'];
     $QueryItems['OrderDir'] = 1 - $_SESSION['OrderDir'];
-    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.
+    if ($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.
       Link2('/images/'.$OrderArrowImage[$_SESSION['OrderDir']]).'" alt="order arrow"/>';
       else $ArrowImage = '';
-    if($Column['Name'] == '') $Result .= '<th>'.$Column['Title'].'</th>';
+    if ($Column['Name'] == '') $Result .= '<th>'.$Column['Title'].'</th>';
       else $Result .= '<th><a href="?'.SetQueryStringArray($QueryItems).'">'.$Column['Title'].$ArrowImage.'</a></th>';
   }
-  return(array(
+  return array(
     'SQL' => ' ORDER BY `'.$_SESSION['OrderCol'].'` '.$OrderDirSQL[$_SESSION['OrderDir']],
     'Output' => '<tr>'.$Result.'</tr>',
     'Column' => $_SESSION['OrderCol'],
     'Direction' => $_SESSION['OrderDir'],
-  ));
+  );
 }

trunk/PrefixMultiplier.php

@@ -74 +74 @@
   function TruncateDigits($Value, $Digits = 4)
   {
-    for($II = 2; $II > -6; $II--)
+    for ($II = 2; $II > -6; $II--)
     {
-      if($Value >= pow(10, $II))
+      if ($Value >= pow(10, $II))
       {
-        if($Digits < ($II + 1)) $RealDigits = $II + 1;
+        if ($Digits < ($II + 1)) $RealDigits = $II + 1;
           else $RealDigits = $Digits;
         $Value = round($Value / pow(10, $II - $RealDigits + 1)) * pow(10, $II - $RealDigits + 1);
@@ -84 +84 @@
       }
     }
-    return($Value);
+    return $Value;
   }
 
@@ -93 +93 @@
     $Negative = ($Value < 0);
     $Value = abs($Value);
-    if(($Unit == '') and ($PrefixType != 'Time'))
-      return($this->TruncateDigits($Value, $Digits));
+    if (($Unit == '') and ($PrefixType != 'Time'))
+      return $this->TruncateDigits($Value, $Digits);
 
     $I = $PrefixMultipliers[$PrefixType]['BaseIndex'];
-    if($Value == 0) return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
+    if ($Value == 0) return $Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit;
 
-    if($Value > 1)
+    if ($Value > 1)
     {
-      while((($I + 1) <= count($PrefixMultipliers[$PrefixType]['Definition'])) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I + 1][2]) > 1))
+      while ((($I + 1) <= count($PrefixMultipliers[$PrefixType]['Definition'])) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I + 1][2]) > 1))
         $I = $I + 1;
     } else
-    if($Value < 1)
+    if ($Value < 1)
     {
-      while((($I - 1) >= 0) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2]) < 1))
+      while ((($I - 1) >= 0) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2]) < 1))
         $I = $I - 1;
     }
@@ -113 +113 @@
     // Truncate digits count
     $Value = $this->TruncateDigits($Value, $Digits);
-    if($Negative) $Value = -$Value;
-    return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
+    if ($Negative) $Value = -$Value;
+    return $Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit;
   }
 }

trunk/Run.php

@@ -25 +25 @@
       $this->Id = $DbRow['Id'];
     }
-    return($Result);
+    return $Result;
   }
 }

trunk/index.php

@@ -15 +15 @@
   function Link($URL)
   {
-    return($this->Config['BaseURL'].$URL);
+    return $this->Config['BaseURL'].$URL;
   }
 
@@ -83 +83 @@
       '<a href="'.$this->Link('/families/').'">Families</a> '.
       '</div>';
-    return($Output);
+    return $Output;
   }
 
   function ProcessURL()
   {
-    if(array_key_exists('REDIRECT_QUERY_STRING', $_SERVER))
+    if (array_key_exists('REDIRECT_QUERY_STRING', $_SERVER))
       $PathString = $_SERVER['REDIRECT_QUERY_STRING'];
     else $PathString = '';
-    if(substr($PathString, -1, 1) == '/') $PathString = substr($PathString, 0, -1);
+    if (substr($PathString, -1, 1) == '/') $PathString = substr($PathString, 0, -1);
     $PathItems = explode('/', $PathString);
-    if(array_key_exists('REQUEST_URI', $_SERVER) and (strpos($_SERVER['REQUEST_URI'], '?') !== false))
+    if (array_key_exists('REQUEST_URI', $_SERVER) and (strpos($_SERVER['REQUEST_URI'], '?') !== false))
       $_SERVER['QUERY_STRING'] = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], '?') + 1);
     else $_SERVER['QUERY_STRING'] = '';
     parse_str($_SERVER['QUERY_STRING'], $_GET);
-    return($PathItems);
+    return $PathItems;
   }
 
@@ -368 +368 @@
       'ROUND((SELECT TeamStat.Money FROM TeamStat WHERE TeamStat.Team=Team.Id ORDER BY Time DESC LIMIT 1) / (SELECT COUNT(*) FROM Runner WHERE Runner.Team=Team.Id)) AS MoneyRunner',
       $Where.$Order['SQL'].$PageList['SQLLimit']);
-    while($Item = $DbResult->fetch_assoc())
+    while ($Item = $DbResult->fetch_assoc())
     {
       if ($Item['Name'] == '') $Item['Name'] = $TitleItem.' '.$Item['WebId'];
@@ -385 +385 @@
     $Output .= '</div>';
 
-    return($Output);
+    return $Output;
   }
 
@@ -453 +453 @@
       ', (SELECT RunnerStat.Rank FROM RunnerStat WHERE RunnerStat.Runner=Runner.Id ORDER BY Time DESC LIMIT 1) AS Rank',
       $Where.$Order['SQL'].$PageList['SQLLimit']);
-    while($Item = $DbResult->fetch_assoc())
+    while ($Item = $DbResult->fetch_assoc())
     {
       $Output .= '<tr>'.
@@ -471 +471 @@
     $Output .= $this->ShowDaily('Team', $TeamId);
 
-    return($Output);
+    return $Output;
   }
 
@@ -504 +504 @@
       ' FROM '.$Table.'Stat'.
       ' WHERE '.$Where.$Order['SQL'].$PageList['SQLLimit']);
-    while($Item = $DbResult->fetch_assoc())
+    while ($Item = $DbResult->fetch_assoc())
     {
       $Output .= '<tr>'.
@@ -556 +556 @@
       ' FROM ('.$DailyTableMaxId.') AS T4'.
       ' WHERE '.$Where.$Order['SQL'].$PageList['SQLLimit']);
-    while($Item = $DbResult->fetch_assoc())
+    while ($Item = $DbResult->fetch_assoc())
     {
       $Output .= '<tr>'.
@@ -623 +623 @@
       ', (SELECT RunnerStat.Rank FROM RunnerStat WHERE RunnerStat.Runner=Runner.Id ORDER BY Time DESC LIMIT 1) AS Rank',
       $Where.$Order['SQL'].$PageList['SQLLimit']);
-    while($Item = $DbResult->fetch_assoc())
+    while ($Item = $DbResult->fetch_assoc())
     {
       $Output .= '<tr>'.
@@ -638 +638 @@
     $Output .= '</div>';
 
-    return($Output);
+    return $Output;
   }
 
@@ -660 +660 @@
     $Output .= $this->ShowDetailed('Runner', $RunnerId);
     $Output .= $this->ShowDaily('Runner', $RunnerId);
-    return($Output);
+    return $Output;
   }
 
@@ -733 +733 @@
        '<a href="https://app.zdechov.net/teribear/">Source code</a></div>';
     $Output .= '</body></html>';
-    return($Output);
+    return $Output;
   }
 
@@ -757 +757 @@
       $Item = $this->PathItems[0];
       if ($Item == 'sync') $Output .= $this->ShowSync();
-      //else if($this->PathItems[0] == 'empty') $Output .= $this->ShowEmpty();
-      else if($Item == 'runner') $Output .= $this->ShowRunner();
-      else if($Item == 'runners') $Output .= $this->ShowRunners();
-      else if($Item == 'team') $Output .= $this->ShowTeam();
-      else if($Item == 'teams') $Output .= $this->ShowTeams();
-      else if($Item == 'family') $Output .= $this->ShowFamily();
-      else if($Item == 'families') $Output .= $this->ShowFamilies();
+      //else if ($this->PathItems[0] == 'empty') $Output .= $this->ShowEmpty();
+      else if ($Item == 'runner') $Output .= $this->ShowRunner();
+      else if ($Item == 'runners') $Output .= $this->ShowRunners();
+      else if ($Item == 'team') $Output .= $this->ShowTeam();
+      else if ($Item == 'teams') $Output .= $this->ShowTeams();
+      else if ($Item == 'family') $Output .= $this->ShowFamily();
+      else if ($Item == 'families') $Output .= $this->ShowFamilies();
       else $Output .= $this->ShowMain();
     } else $Output .= $this->ShowMain();